joomla/Component-Builder
40
26
Fork 12
Code Issues 79 Pull Requests 2 Projects 4 Wiki Activity

fixed import error with version is ignored.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2016-03-10 23:23:23 +02:00
parent 0c30fa7f68
commit 306b6b9787
1485 changed files with 244759 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
admin/helpers/compiler/e_Interpretation.php
View File

@@ -6311,8 +6311,39 @@ class Interpretation extends Fields
// filter by child array field values
if ($key && strpos($key,'-R>') === false && strpos($key,'-A>') !== false)
{
$query .= "\n\n\t\t//".$this->setLine(__LINE__)." Filter by ".$globalKey." Array Field";
$query .= "\n\t\t\$".$globalKey." = \$this->".$globalKey.";";
$query .= "\n\n\t\t\t//".$this->setLine(__LINE__)." Filter by ".$globalKey." Array Field";
$query .= "\n\t\t\t\$".$globalKey." = \$this->".$globalKey.";";
$query .= "\n\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$items) && \$".$globalKey.")";
$query .= "\n\t\t\t{";
$query .= "\n\t\t\t\tforeach (\$items as \$nr => &\$item)";
$query .= "\n\t\t\t\t{";
list($bin,$target) = explode('-A>',$key);
if (ComponentbuilderHelper::checkString($target))
{
$query .= "\n\t\t\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkJson(\$item->".$target."))";
$query .= "\n\t\t\t\t\t{";
$query .= "\n\t\t\t\t\t\t\$item->".$target." = json_decode(\$item->".$target.");";
$query .= "\n\t\t\t\t\t}";
$query .= "\n\t\t\t\t\tif (!in_array(\$".$globalKey.",\$item->".$target."))";
}
else
{
$query .= "\n\t\t\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkJson(\$item->".$_key."))";
$query .= "\n\t\t\t\t\t{";
$query .= "\n\t\t\t\t\t\t\$item->".$_key." = json_decode(\$item->".$_key.");";
$query .= "\n\t\t\t\t\t}";
$query .= "\n\t\t\t\t\tif (!in_array(\$".$globalKey.",\$item->".$_key."))";
}
$query .= "\n\t\t\t\t\t{";
$query .= "\n\t\t\t\t\t\tunset(\$items[\$nr]);";
$query .= "\n\t\t\t\t\t\tcontinue;";
$query .= "\n\t\t\t\t\t}";
$query .= "\n\t\t\t\t}";
$query .= "\n\t\t\t}";
$query .= "\n\t\t\telse";
$query .= "\n\t\t\t{";
$query .= "\n\t\t\t\treturn false;";
$query .= "\n\t\t\t}";
}
// filter by parent repetable field values

12
admin/helpers/componentbuilder.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php
@@ -1115,6 +1115,16 @@ abstract class ComponentbuilderHelper
return $button->input;
}
public static function checkJson($string)
{
if (self::checkString($string))
{
json_decode($string);
return (json_last_error() === JSON_ERROR_NONE);
}
return false;
}
public static function checkObject($object)
{

2
admin/helpers/html/batch_.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage batch_.php

2
admin/helpers/indenter.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage indenter.php

2
admin/helpers/js.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage js.php

2
admin/helpers/minify.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.2
@build 4th March, 2016
@build 10th March, 2016
@created 30th April, 2015
@package Component Builder
@subpackage minify.php