joomla/Component-Builder
39
25
Fork 11
Code Issues 76 Pull Requests Projects 4 Wiki Activity

Resolved gh-360 by adding the blob data type as an option for data types. Resolved gh-362 by adding the nested subform compatibility to subforms in JCB. Resolved gh-365 by improving the customscript validation search of save of custom code area. Added email validation to the email helper script.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2019-01-14 17:32:23 +02:00
parent b7a5cb7285
commit 4e2c51c303
14 changed files with 310 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
admin/helpers/componentbuilder.php
View File

@ -1354,9 +1354,15 @@ abstract class ComponentbuilderHelper
{
$it = new RecursiveDirectoryIterator($dir);
$it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
// remove ending /
$dir = rtrim($dir, '/');
// now loop the files & folders
foreach ($it as $file)
{
if ('.' === $file->getBasename() || '..' === $file->getBasename()) continue;
// set file dir
$file_dir = $file->getPathname();
// check if this is a dir or a file
if ($file->isDir())
{
$keeper = false;
@ -1364,7 +1370,7 @@ abstract class ComponentbuilderHelper
{
foreach ($ignore as $keep)
{
if (strpos($file->getPathname(), $dir.'/'.$keep) !== false)
if (strpos($file_dir, $dir.'/'.$keep) !== false)
{
$keeper = true;
}
@ -1374,7 +1380,7 @@ abstract class ComponentbuilderHelper
{
continue;
}
JFolder::delete($file->getPathname());
JFolder::delete($file_dir);
}
else
{
@ -1383,7 +1389,7 @@ abstract class ComponentbuilderHelper
{
foreach ($ignore as $keep)
{
if (strpos($file->getPathname(), $dir.'/'.$keep) !== false)
if (strpos($file_dir, $dir.'/'.$keep) !== false)
{
$keeper = true;
}
@ -1393,9 +1399,10 @@ abstract class ComponentbuilderHelper
{
continue;
}
JFile::delete($file->getPathname());
JFile::delete($file_dir);
}
}
// delete the root folder if not ignore found
if (!self::checkArray($ignore))
{
return JFolder::delete($dir);