diff --git a/README.md b/README.md index 6d2375f85..9cc72455e 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 10th December, 2017 ++ *Last Build*: 11th December, 2017 + *Version*: 2.6.6 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/README.txt b/admin/README.txt index 6d2375f85..9cc72455e 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -111,7 +111,7 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 10th December, 2017 ++ *Last Build*: 11th December, 2017 + *Version*: 2.6.6 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index b441d1e00..95c336abb 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -251,9 +251,9 @@ class Interpretation extends Fields { $_VDM = '_'.ComponentbuilderHelper::safeString($this->uniquekey(10),'U'); // add it to the system - $this->fileContentStatic['###HELPER_SITE_LICENSE_LOCK###'] = $this->setHelperLincenseLock($_VDM,'site'); - $this->fileContentStatic['###HELPER_LICENSE_LOCK###'] = $this->setHelperLincenseLock($_VDM,'admin'); - $this->fileContentStatic['###LICENSE_LOCKED_INT###'] = $this->setInitLincenseLock($_VDM); + $this->fileContentStatic['###HELPER_SITE_LICENSE_LOCK###'] = $this->setHelperLicenseLock($_VDM,'site'); + $this->fileContentStatic['###HELPER_LICENSE_LOCK###'] = $this->setHelperLicenseLock($_VDM,'admin'); + $this->fileContentStatic['###LICENSE_LOCKED_INT###'] = $this->setInitLicenseLock($_VDM); $this->fileContentStatic['###LICENSE_LOCKED_DEFINED###'] = PHP_EOL.PHP_EOL.'defined(\''.$_VDM.'\') or die(JText::_(\'NIE_REG_NIE\'));'; } } @@ -279,7 +279,7 @@ class Interpretation extends Fields $boolMethod = 'get'.ComponentbuilderHelper::safeString($this->uniquekey(3, false, 'ddd'), 'W'); $globalbool = 'set'.ComponentbuilderHelper::safeString($this->uniquekey(3), 'W'); // add it to the system - $this->fileContentDynamic[$view]['###LICENSE_LOCKED_SET_BOOL###'] = $this->setBoolLincenseLock($boolMethod,$globalbool); + $this->fileContentDynamic[$view]['###LICENSE_LOCKED_SET_BOOL###'] = $this->setBoolLicenseLock($boolMethod,$globalbool); $this->fileContentDynamic[$view]['###LICENSE_LOCKED_CHECK###'] = $this->checkStatmentLicenseLocked($boolMethod); $this->fileContentDynamic[$view]['###LICENSE_TABLE_LOCKED_CHECK###'] = $this->checkStatmentLicenseLocked($boolMethod, '$table'); $this->fileContentDynamic[$view]['###BOOLMETHOD###'] = $boolMethod; @@ -307,7 +307,7 @@ class Interpretation extends Fields return implode(PHP_EOL, $statment); } - public function setBoolLincenseLock($boolMethod,$globalbool) + public function setBoolLicenseLock($boolMethod,$globalbool) { $bool[] = PHP_EOL.PHP_EOL."\t/**"; $bool[] = "\t* The private bool."; @@ -339,7 +339,7 @@ class Interpretation extends Fields return implode(PHP_EOL, $bool); } - public function setHelperLincenseLock($_VDM,$target) + public function setHelperLicenseLock($_VDM,$target) { $helper[] = PHP_EOL.PHP_EOL."\t/**"; $helper[] = "\t* Check if this install has a license."; @@ -362,7 +362,7 @@ class Interpretation extends Fields return implode(PHP_EOL, $helper); } - public function setInitLincenseLock($_VDM) + public function setInitLicenseLock($_VDM) { $init[] = PHP_EOL."if (!defined('".$_VDM."'))"; $init[] = "{"; @@ -2609,10 +2609,10 @@ class Interpretation extends Fields { $decoder_filter = $this->setCustomViewFieldDecodeFilter($get,$decodeFilter,'$item','$items[$nr]',$default['code'],"\t\t"); } - $contnetprepare = ''; + $contentprepare = ''; if (isset($contentprepareChecker) && ComponentbuilderHelper::checkArray($contentprepareChecker)) { - $contnetprepare = $this->setCustomViewFieldonContentPrepareChecker($get,$contentprepareChecker,'$item',$default['code'],"\t\t"); + $contentprepare = $this->setCustomViewFieldonContentPrepareChecker($get,$contentprepareChecker,'$item',$default['code'],"\t\t"); } $uikit = ''; if (isset($uikitChecker) && ComponentbuilderHelper::checkArray($uikitChecker)) @@ -2627,7 +2627,7 @@ class Interpretation extends Fields $joine .= $this->setPlaceholders($joinedString, $placeholders); } } - if (ComponentbuilderHelper::checkString($decoder) || ComponentbuilderHelper::checkString($contnetprepare) || ComponentbuilderHelper::checkString($uikit) || ComponentbuilderHelper::checkString($decoder_filter) || ComponentbuilderHelper::checkString($joine)) + if (ComponentbuilderHelper::checkString($decoder) || ComponentbuilderHelper::checkString($contentprepare) || ComponentbuilderHelper::checkString($uikit) || ComponentbuilderHelper::checkString($decoder_filter) || ComponentbuilderHelper::checkString($joine)) { $methods .= PHP_EOL."\t\t\t\$items = \$db->loadObjectList();"; $methods .= PHP_EOL.PHP_EOL."\t\t\t//".$this->setLine(__LINE__)." Convert the parameter fields into objects."; @@ -2641,9 +2641,9 @@ class Interpretation extends Fields { $methods .= $decoder_filter; } - if (ComponentbuilderHelper::checkString($contnetprepare)) + if (ComponentbuilderHelper::checkString($contentprepare)) { - $methods .= $contnetprepare; + $methods .= $contentprepare; } if (ComponentbuilderHelper::checkString($uikit)) { @@ -5778,7 +5778,7 @@ class Interpretation extends Fields $this->langContent['admin'][$this->langPrefix.'_TRASHED'] = 'Trashed'; if ($this->componentData->add_license && $this->componentData->license_type == 3) { - $this->langContent['admin']['NIE_REG_NIE'] = "

Lincense not set for ".$componentName.".

Notify your administrator!
The lincense can be obtained from ".$this->componentData->companyname.".

"; + $this->langContent['admin']['NIE_REG_NIE'] = "

License not set for ".$componentName.".

Notify your administrator!
The license can be obtained from ".$this->componentData->companyname.".

"; } // add the langug files needed to import and export data if ($this->addEximport) diff --git a/componentbuilder.xml b/componentbuilder.xml index c74b99d31..2c159cdb3 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 10th December, 2017 + 11th December, 2017 Llewellyn van der Merwe joomla@vdm.io http://vdm.bz/component-builder