From b65d868a862c5d61d679ac4b4925944f63982046 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Thu, 10 Dec 2020 03:24:29 +0200 Subject: [PATCH] Added the GUI switch to control the adding of the asset table fix. gh-616 --- README.md | 14 +- admin/README.txt | 14 +- admin/config.xml | 322 ++-- admin/helpers/compiler/a_Get.php | 75 +- admin/helpers/compiler/e_Interpretation.php | 173 +- .../en-GB/en-GB.com_componentbuilder.ini | 16 + .../joomla_component/mysql_fullwidth.php | 3 +- admin/models/forms/joomla_component.xml | 1503 +++++++++-------- admin/models/joomla_component.php | 273 +-- admin/models/joomla_components.php | 70 +- admin/sql/install.mysql.utf8.sql | 46 +- admin/sql/uninstall.mysql.utf8.sql | 10 - admin/sql/updates/mysql/2.12.1.sql | 1 + componentbuilder.xml | 6 +- componentbuilder_update_server.xml | 19 +- script.php | 309 ++-- 16 files changed, 1547 insertions(+), 1307 deletions(-) create mode 100644 admin/sql/updates/mysql/2.12.1.sql diff --git a/README.md b/README.md index 69a4902e5..0dcd34560 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.12.1) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.12.2) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -144,14 +144,14 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 8th December, 2020 -+ *Version*: 2.12.1 ++ *Last Build*: 10th December, 2020 ++ *Version*: 2.12.2 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **289396** -+ *Field count*: **1545** -+ *File count*: **1912** -+ *Folder count*: **310** ++ *Line count*: **289867** ++ *Field count*: **1555** ++ *File count*: **1923** ++ *Folder count*: **316** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com). > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) diff --git a/admin/README.txt b/admin/README.txt index 69a4902e5..0dcd34560 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.12.1) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.12.2) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -144,14 +144,14 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 8th December, 2020 -+ *Version*: 2.12.1 ++ *Last Build*: 10th December, 2020 ++ *Version*: 2.12.2 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **289396** -+ *Field count*: **1545** -+ *File count*: **1912** -+ *Folder count*: **310** ++ *Line count*: **289867** ++ *Field count*: **1555** ++ *File count*: **1923** ++ *Folder count*: **316** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com). > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) diff --git a/admin/config.xml b/admin/config.xml index e2395cdff..dee87c85f 100644 --- a/admin/config.xml +++ b/admin/config.xml @@ -122,16 +122,6 @@ folder="editors" filter="cmd" /> - - - - - - - - - - - - - - - - - - - - COM_COMPONENTBUILDER_CONFIG_NEVER_UPDATE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index f8d72ec54..6c1782b53 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -95,6 +95,20 @@ class Get */ public $compilerPath; + /** + * Switch to add assets table fix + * + * @var int + */ + public $addAssetsTableFix = 1; + + /** + * Switch to add assets table name fix + * + * @var bool + */ + public $addAssetsTableNameFix = false; + /** * Switch to add custom code placeholders * @@ -341,6 +355,13 @@ class Get */ public $componentCodeName; + /** + * The Component Code Name Length + * + * @var int + */ + public $componentCodeNameLength; + /** * The Component ID * @@ -908,6 +929,19 @@ class Get // set component context $this->componentContext = $this->componentCodeName . '.' . $this->componentID; + // set the component name length + $this->componentCodeNameLength = strlen( + $this->componentCodeName + ); + // add assets table fix + $global = (int) $this->params->get( + 'assets_table_fix', 1 + ); + $this->addAssetsTableFix = (($add_assets_table_fix + = (int) ComponentbuilderHelper::getVar( + 'joomla_component', $this->componentID, 'id', + 'assets_table_fix' + )) == 3) ? $global : $add_assets_table_fix; // set if language strings line breaks should be removed $global = ((int) ComponentbuilderHelper::getVar( 'joomla_component', $this->componentID, 'id', @@ -2221,6 +2255,16 @@ class Get ); } + // check the length of the view name (+5 for com_ and _) + $name_length = $this->componentCodeNameLength + strlen( + $view->name_single_code + ) + 5; + // when the name is larger then 49 we need to add the assets table name fix + if ($name_length > 49) + { + $this->addAssetsTableNameFix = true; + } + // set updater $updater = array( 'unique' => array( @@ -4152,7 +4196,8 @@ class Get public function getListViewDefaultOrdering(&$nameListCode) { if (isset($this->viewsDefaultOrdering[$nameListCode]) - && $this->viewsDefaultOrdering[$nameListCode]['add_admin_ordering'] == 1) + && $this->viewsDefaultOrdering[$nameListCode]['add_admin_ordering'] + == 1) { foreach ( $this->viewsDefaultOrdering[$nameListCode]['admin_ordering_fields'] @@ -4165,15 +4210,16 @@ class Get { // just the first field is the based ordering state return array( - 'name' => $order_field_name, + 'name' => $order_field_name, 'direction' => $order_field['direction'] ); } } } + // the default return array( - 'name' => 'a.id', + 'name' => 'a.id', 'direction' => 'DESC' ); } @@ -9152,23 +9198,30 @@ class Get */ public function getModAdminVvvvvvvdm($fieldScriptBucket) { - $form_field_class = array(); + $form_field_class = array(); $form_field_class[] = $this->hhh . 'BOM' . $this->hhh . PHP_EOL; - $form_field_class[] = "//" . $this->setLine(__LINE__) . " No direct access to this file"; + $form_field_class[] = "//" . $this->setLine(__LINE__) + . " No direct access to this file"; $form_field_class[] = "defined('_JEXEC') or die('Restricted access');"; $form_field_class[] = PHP_EOL . "use Joomla\CMS\Form\FormField;"; $form_field_class[] = "use Joomla\CMS\Factory;"; - $form_field_class[] = PHP_EOL . "class JFormFieldModadminvvvvvvvdm extends FormField"; + $form_field_class[] = PHP_EOL + . "class JFormFieldModadminvvvvvvvdm extends FormField"; $form_field_class[] = "{"; - $form_field_class[] = $this->_t(1) . "protected \$type = 'modadminvvvvvvvdm';"; - $form_field_class[] = PHP_EOL . $this->_t(1) . "protected function getLabel()"; + $form_field_class[] = $this->_t(1) + . "protected \$type = 'modadminvvvvvvvdm';"; + $form_field_class[] = PHP_EOL . $this->_t(1) + . "protected function getLabel()"; $form_field_class[] = $this->_t(1) . "{"; $form_field_class[] = $this->_t(2) . "return;"; $form_field_class[] = $this->_t(1) . "}"; - $form_field_class[] = PHP_EOL . $this->_t(1) . "protected function getInput()"; + $form_field_class[] = PHP_EOL . $this->_t(1) + . "protected function getInput()"; $form_field_class[] = $this->_t(1) . "{"; - $form_field_class[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the document"; - $form_field_class[] = $this->_t(2) . "\$document = Factory::getDocument();"; + $form_field_class[] = $this->_t(2) . "//" . $this->setLine(__LINE__) + . " Get the document"; + $form_field_class[] = $this->_t(2) + . "\$document = Factory::getDocument();"; $form_field_class[] = implode(PHP_EOL, $fieldScriptBucket); $form_field_class[] = $this->_t(2) . "return; // noting for now :)"; $form_field_class[] = $this->_t(1) . "}"; diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 61e0e05de..d04fbf46f 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -7968,6 +7968,8 @@ class Interpretation extends Fields $script .= $this->getCustomScriptBuilder( 'php_postflight', 'install', PHP_EOL . PHP_EOL, null, true ); + // add the Intelligent Fix script if needed + $script .= $this->getAssetsTableIntelligentFix(); // add the component install notice if (ComponentbuilderHelper::checkString($script)) { @@ -8128,7 +8130,7 @@ class Interpretation extends Fields $script .= PHP_EOL . $this->_t(3) . "{"; $script .= PHP_EOL . $this->_t(4) . "//" . $this->setLine( __LINE__ - ) . " If succesfully remove " . $viewsCodeName + ) . " If successfully remove " . $viewsCodeName . " add queued success message."; // TODO lang is not translated $script .= PHP_EOL . $this->_t(4) @@ -8164,7 +8166,7 @@ class Interpretation extends Fields $script .= PHP_EOL . $this->_t(3) . "{"; $script .= PHP_EOL . $this->_t(4) . "//" . $this->setLine( __LINE__ - ) . " If succesfully remove " . $viewsCodeName + ) . " If successfully remove " . $viewsCodeName . " add queued success message."; // TODO lang is not translated $script .= PHP_EOL . $this->_t(4) @@ -8238,7 +8240,7 @@ class Interpretation extends Fields $script .= PHP_EOL . $this->_t(3) . "{"; $script .= PHP_EOL . $this->_t(4) . "//" . $this->setLine( __LINE__ - ) . " If succesfully remove " . $viewsCodeName + ) . " If successfully remove " . $viewsCodeName . " add queued success message."; // TODO lang is not translated $script .= PHP_EOL . $this->_t(4) @@ -8314,7 +8316,7 @@ class Interpretation extends Fields $script .= PHP_EOL . $this->_t(3) . "{"; $script .= PHP_EOL . $this->_t(4) . "//" . $this->setLine( __LINE__ - ) . " If succesfully remove " . $viewsCodeName + ) . " If successfully remove " . $viewsCodeName . " add queued success message."; // TODO lang is not translated $script .= PHP_EOL . $this->_t(4) @@ -8349,7 +8351,7 @@ class Interpretation extends Fields $script .= PHP_EOL . $this->_t(3) . "{"; $script .= PHP_EOL . $this->_t(4) . "//" . $this->setLine( __LINE__ - ) . " If succesfully remove " . $viewsCodeName + ) . " If successfully remove " . $viewsCodeName . " add queued success message."; // TODO lang is not translated $script .= PHP_EOL . $this->_t(4) @@ -8384,7 +8386,7 @@ class Interpretation extends Fields $script .= PHP_EOL . $this->_t(3) . "{"; $script .= PHP_EOL . $this->_t(4) . "//" . $this->setLine( __LINE__ - ) . " If succesfully remove " . $viewsCodeName + ) . " If successfully removed " . $viewsCodeName . " add queued success message."; // TODO lang is not translated $script .= PHP_EOL . $this->_t(4) @@ -8482,7 +8484,7 @@ class Interpretation extends Fields $script .= PHP_EOL . $this->_t(2) . "if (\$" . $view . "_done)"; $script .= PHP_EOL . $this->_t(2) . "{"; $script .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__) - . " If succesfully remove " . $component + . " If successfully removed " . $component . " add queued success message."; // TODO lang is not translated $script .= PHP_EOL . $this->_t(3) . "\$app->enqueueMessage(JText:" @@ -8491,6 +8493,8 @@ class Interpretation extends Fields // done $script .= PHP_EOL; } + // add the Intelligent Reversal script if needed + $script .= $this->getAssetsTableIntelligentReversal(); // add the custom uninstall script $script .= $this->getCustomScriptBuilder( 'php_method', 'uninstall', "", null, true, null, PHP_EOL @@ -8499,6 +8503,52 @@ class Interpretation extends Fields return $script; } + /** + * build code for the assets table script intelligent fix + * + * @return string The php to place in script.php + * + */ + protected function getAssetsTableIntelligentFix() + { + // check if we should add the intelligent fix treatment for the assets table + if ($this->addAssetsTableFix == 2 && $this->accessSize <= 400) + { + // reset script + $script = array(); + $script[] = $this->_t(2) . "//" . $this->setLine(__LINE__) + . " Check what size the rules column is now"; + + // done + return PHP_EOL . implode(PHP_EOL, $script); + } + + return ''; + } + + /** + * build code for the assets table script intelligent reversal + * + * @return string The php to place in script.php + * + */ + protected function getAssetsTableIntelligentReversal() + { + // check if we should add the intelligent uninstall treatment for the assets table + if ($this->addAssetsTableFix == 2) + { + // reset script + $script = array(); + $script[] = $this->_t(2) . "//" . $this->setLine(__LINE__) + . " Check for the biggest rules item in the database at this point"; + + // done + return PHP_EOL . implode(PHP_EOL, $script); + } + + return ''; + } + public function setMoveFolderScript() { if ($this->setMoveFolders) @@ -10458,27 +10508,68 @@ class Interpretation extends Fields unset($this->customScriptBuilder['sql']); } + // WHY DO WE NEED AN ASSET TABLE FIX? + // https://www.mysqltutorial.org/mysql-varchar/ + // https://stackoverflow.com/a/15227917/1429677 + // https://forums.mysql.com/read.php?24,105964,105964 + // https://github.com/vdm-io/Joomla-Component-Builder/issues/616#issuecomment-741502980 + // 30 actions each +-20 characters with 8 groups + // that makes 4800 characters and the current Joomla + // column size is varchar(5120) + + // just a little event tracking in classes + // count actions = setAccessSections + // around line206 (infusion call) + // around line26454 (interpretation function) + // first fix = setInstall + // around line1600 (infusion call) + // around line10063 (interpretation function) + // second fix = setUninstallScript + // around line2161 (infusion call) + // around line8030 (interpretation function) + // check if this component needs larger rules // also check if the developer will allow this - // TODO still adding to GUI the needed switches and code - if (1) + // any value above 0 allows for the change to be added + // the access actions length must be checked before this + if ($this->addAssetsTableFix) { - $db .= PHP_EOL; - $db .= PHP_EOL . '--'; - $db .= PHP_EOL - . '--' . $this->setLine( - __LINE__ - ) - . ' Always insure this column rules is large enough for all the access control values.'; - $db .= PHP_EOL . '--'; - $db .= PHP_EOL - . "ALTER TABLE `#__assets` CHANGE `rules` `rules` MEDIUMTEXT NOT NULL COMMENT 'JSON encoded access control.';"; + // 400 actions worse case is larger the 65535 characters + if ($this->accessSize > 400) + { + $db .= PHP_EOL; + $db .= PHP_EOL . '--'; + $db .= PHP_EOL + . '--' . $this->setLine( + __LINE__ + ) + . ' Always insure this column rules is large enough for all the access control values.'; + $db .= PHP_EOL . '--'; + $db .= PHP_EOL + . "ALTER TABLE `#__assets` CHANGE `rules` `rules` MEDIUMTEXT NOT NULL COMMENT 'JSON encoded access control.';"; + } + // smaller then 400 makes TEXT large enough + // only add this option if set to SQL fix + elseif ($this->addAssetsTableFix == 1) + { + $db .= PHP_EOL; + $db .= PHP_EOL . '--'; + $db .= PHP_EOL + . '--' . $this->setLine( + __LINE__ + ) + . ' Always insure this column rules is large enough for all the access control values.'; + $db .= PHP_EOL . '--'; + $db .= PHP_EOL + . "ALTER TABLE `#__assets` CHANGE `rules` `rules` TEXT NOT NULL COMMENT 'JSON encoded access control.';"; + } } // check if this component needs larger names // also check if the developer will allow this - // TODO still adding to GUI the needed switches and code - if (1) + // any value above 0 allows for the change to be added + // the config length must be checked before this + if ($this->addAssetsTableFix && $this->addAssetsTableNameFix) { $db .= PHP_EOL; $db .= PHP_EOL . '--'; @@ -10526,8 +10617,8 @@ class Interpretation extends Fields // check if this component used larger rules // now revert them back on uninstall - // TODO still adding to GUI the needed switches and code - if (1) + // number 1 allows for the change to be reversed + if ($this->addAssetsTableFix == 1) { // https://github.com/joomla/joomla-cms/blob/3.10.0-alpha3/installation/sql/mysql/joomla.sql#L22 // Checked 1st December 2020 (let us know if this changes) @@ -10545,8 +10636,8 @@ class Interpretation extends Fields // check if this component used larger names // now revert them back on uninstall - // TODO still adding to GUI the needed switches and code - if (1) + // number 1 allows for the change to be reversed + if ($this->addAssetsTableFix == 1 && $this->addAssetsTableNameFix) { // https://github.com/joomla/joomla-cms/blob/3.10.0-alpha3/installation/sql/mysql/joomla.sql#L20 // Checked 1st December 2020 (let us know if this changes) @@ -26398,6 +26489,8 @@ function vdm_dkim() { public function setAccessSections() { + // access size counter + $this->accessSize = 12; // ;) // set the default component access values $this->componentHead = array(); $this->componentGlobal = array(); @@ -26432,7 +26525,8 @@ function vdm_dkim() { $this->componentHead[] = $this->_t(2) . ''; - + // the size needs increase + $this->accessSize++; $importTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Import Data', 'U'); $importDesc = $this->langPrefix . '_' @@ -26446,6 +26540,8 @@ function vdm_dkim() { $this->componentHead[] = $this->_t(2) . ''; + // the size needs increase + $this->accessSize++; } // version permission $batchTitle = $this->langPrefix . '_' @@ -26490,6 +26586,8 @@ function vdm_dkim() { { $this->componentHead[] = $this->_t(2) . ' '; + // the size needs increase + $this->accessSize++; } // new custom created by permissions $created_byTitle = $this->langPrefix . '_' @@ -26560,6 +26658,8 @@ function vdm_dkim() { . ''; + // the size needs increase + $this->accessSize++; // add the custom permissions to use the buttons of this view $this->addCustomButtonPermissions( $custom_admin_view['settings'], $customAdminName, @@ -26643,7 +26743,8 @@ function vdm_dkim() { $this->componentGlobal[$sortKey] = $this->_t(2) . ''; - + // the size needs increase + $this->accessSize++; // check if this site view requires access rule to default to public if (isset($site_view['public_access']) && $site_view['public_access'] == 1) @@ -26691,6 +26792,8 @@ function vdm_dkim() { . $_customTab['lang_permission'] . '" description="' . $_customTab['lang_permission_desc'] . '" />'; + // the size needs increase + $this->accessSize++; } } } @@ -26857,13 +26960,21 @@ function vdm_dkim() { // add global to the compnent section $component .= PHP_EOL . implode(PHP_EOL, $this->componentGlobal) . PHP_EOL . $this->_t(1) . ""; - // add views to the compnent section + // add views to the component section $component .= PHP_EOL . implode(PHP_EOL, $componentViews); // be sure to reset again. (memory) $this->componentHead = null; $this->componentGlobal = null; $this->permissionViews = null; + // remove the fix in not needed + if ($this->accessSize < 30) + { + // since we have less than 30 actions + // we do not need the fix for this component + $this->addAssetsTableFix = 0; + } + // return the build return $component; } @@ -26910,6 +27021,8 @@ function vdm_dkim() { . ''; + // the size needs increase + $this->accessSize++; } } } @@ -27248,6 +27361,8 @@ function vdm_dkim() { $this->componentGlobal[$sortKey] = $this->_t(2) . ''; + // the size needs increase + $this->accessSize++; // build permission switch $this->permissionBuilder['global'][$action][$nameView] = $nameView; @@ -27296,6 +27411,8 @@ function vdm_dkim() { $this->componentGlobal[$sortKey] = $this->_t(2) . ''; + // the size needs increase + $this->accessSize++; // build permission switch $this->permissionBuilder['global'][$action][$nameView] = $nameView; diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 601958392..d825f5db3 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -3291,6 +3291,10 @@ COM_COMPONENTBUILDER_CONFIG_ALPHANUMERIC="Alphanumeric" COM_COMPONENTBUILDER_CONFIG_ALPHANUMERICDOT="Alphanumeric+dot" COM_COMPONENTBUILDER_CONFIG_API_DESCRIPTION="This User will be used to log the API call." COM_COMPONENTBUILDER_CONFIG_API_LABEL="API User" +COM_COMPONENTBUILDER_CONFIG_ASSETS_TABLE_FIX_DESCRIPTION="How to apply the assets table fix in JCB.
+SQL (add&remove) this is the default which adds the SQL fix and removes it once the component is uninstalled.
+Intelligent (add&remove+if) same as default, but on uninstall will only remove this fix if no other component needs it. Note that this option will only work with other components that also use the intelligent path." +COM_COMPONENTBUILDER_CONFIG_ASSETS_TABLE_FIX_LABEL="Assets Table Fix" COM_COMPONENTBUILDER_CONFIG_AUTHOR="Author Info" COM_COMPONENTBUILDER_CONFIG_AUTHOR_EMAIL_DESC="The email address of the author of this component." COM_COMPONENTBUILDER_CONFIG_AUTHOR_EMAIL_LABEL="Author Email" @@ -3378,6 +3382,7 @@ COM_COMPONENTBUILDER_CONFIG_CHECK_TIMER_OPTION_SIX="Never" COM_COMPONENTBUILDER_CONFIG_CHECK_TIMER_OPTION_THREE="Once a day" COM_COMPONENTBUILDER_CONFIG_CHECK_TIMER_OPTION_TWO="Every twelve hours" COM_COMPONENTBUILDER_CONFIG_COMPANY="Company" +COM_COMPONENTBUILDER_CONFIG_COMPILER="Compiler" COM_COMPONENTBUILDER_CONFIG_COMPILER_FIELD_BUILDER_TYPE_DESCRIPTION="Select the method to use when building the xml fields in the compiler. The SimpleXMLElement Class is best practice, and String Manipulation is faster and works without special extensions." COM_COMPONENTBUILDER_CONFIG_COMPILER_FIELD_BUILDER_TYPE_LABEL="Field Builder Type
(in compiler)" COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_DESCRIPTION="Here you can set the path to the compiler folder" @@ -3433,6 +3438,7 @@ COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_DESCRIPTION="This is the TXT value to use COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_HINT="v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=PUBLICKEY" COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_LABEL="Value" COM_COMPONENTBUILDER_CONFIG_DONT_LOAD="Not" +COM_COMPONENTBUILDER_CONFIG_DO_NOT_ADD_FIX_EVER="Do not add fix ever" COM_COMPONENTBUILDER_CONFIG_DYNAMIC_GET_JOIN_DB_TABLE="Dynamic Get (join_db_table)" COM_COMPONENTBUILDER_CONFIG_DYNAMIC_GET_JOIN_VIEW_TABLE="Dynamic Get (join_view_table)" COM_COMPONENTBUILDER_CONFIG_EDITOR_DESCRIPTION="Select the editor you would like to use as the JCB global editor for all custom coding areas." @@ -3540,6 +3546,7 @@ COM_COMPONENTBUILDER_CONFIG_GRADIANT_LOAD="Gradient" COM_COMPONENTBUILDER_CONFIG_INACTIVE="Inactive" COM_COMPONENTBUILDER_CONFIG_INSTALL_DESCRIPTION="Component locally" COM_COMPONENTBUILDER_CONFIG_INSTALL_LABEL="Install" +COM_COMPONENTBUILDER_CONFIG_INTELLIGENT_ADDREMOVEIF="Intelligent (add&remove+if)" COM_COMPONENTBUILDER_CONFIG_JCB_COMMUNITY_PACKAGES="JCB Community Packages" COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_DESCRIPTION="Here you can manage what package directories show in the JCB package import area." COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_LABEL="Directories" @@ -3661,6 +3668,7 @@ COM_COMPONENTBUILDER_CONFIG_SMTPSECURE_LABEL="SMTP Security" COM_COMPONENTBUILDER_CONFIG_SMTPUSER_DESCRIPTION="Enter the username for access to the SMTP host." COM_COMPONENTBUILDER_CONFIG_SMTPUSER_HINT="email@demo.com" COM_COMPONENTBUILDER_CONFIG_SMTPUSER_LABEL="SMTP Username" +COM_COMPONENTBUILDER_CONFIG_SQL_ADDREMOVE="SQL (add&remove)" COM_COMPONENTBUILDER_CONFIG_SSL="SSL" COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_DESCRIPTION="How long should the data that is stored in the browser memory remain unchanged before it is removed and updated." COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_LABEL="Update Cycle" @@ -5899,6 +5907,11 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UIKIT_VTWO="Add Uikit v2" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UPDATE_SERVER="Add Update Server" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UPDATE_SERVER_LABEL="Add Update Server" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADMIN_VIEWS="Admin Views" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ASSETS_TABLE_FIX="Assets Table Fix" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ASSETS_TABLE_FIX_DESCRIPTION="How to apply the assets table fix in JCB.
+SQL (add&remove) this is the default which adds the SQL fix and removes it once the component is uninstalled.
+Intelligent (add&remove+if) same as default, but on uninstall will only remove this fix if no other component needs it. Note that this option will only work with other components that also use the intelligent path." +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ASSETS_TABLE_FIX_LABEL="Assets Table Fix" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR="Author" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_DESCRIPTION="The Author's Name & Surname." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_HINT="Author Name & Surname Here" @@ -5984,6 +5997,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_DESCRIPTION="Add Description H COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_HINT="Add Description Here" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_LABEL="Description" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DETAILS="Details" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DO_NOT_ADD_FIX_EVER="Do not add fix ever" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC="Dynamic" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC_BUILD_BETA="Dynamic Build (beta)" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC_INTEGRATION="Dynamic Integration" @@ -6020,6 +6034,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_DESCRIPTION="The component image (pr COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_LABEL="Component Image" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Import JCB Packages Button Access" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC="Allows the users in this group to access the import jcb packages button." +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_INTELLIGENT_ADDREMOVEIF="Intelligent (add&remove+if)" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT="Javascript" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_DESCRIPTION="Add JavaScript for the entire back-end. Do not add the script tags." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_LABEL="Javascript" @@ -6236,6 +6251,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SHOW_DESCRIPTION="Select where you want th COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SHOW_LABEL="Show" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SITE_VIEWS="Site Views" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL="Sql" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_ADDREMOVE="SQL (add&remove)" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_DESCRIPTION="Add your MySQL here!" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_HINT="// Add MySQL Table Dump Here" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_LABEL="MySQL - (Install)" diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php index 5b4b1e38c..8304a42d4 100644 --- a/admin/layouts/joomla_component/mysql_fullwidth.php +++ b/admin/layouts/joomla_component/mysql_fullwidth.php @@ -29,7 +29,8 @@ $fields = $displayData->get($fields_tab_layout) ?: array( 'add_sql', 'sql', 'add_sql_uninstall', - 'sql_uninstall' + 'sql_uninstall', + 'assets_table_fix' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); diff --git a/admin/models/forms/joomla_component.xml b/admin/models/forms/joomla_component.xml index 987d30650..acbbede04 100644 --- a/admin/models/forms/joomla_component.xml +++ b/admin/models/forms/joomla_component.xml @@ -162,72 +162,89 @@ message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_MESSAGE" hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_HINT" /> - + - - - - - - - - - - - - - - + + + + + + + - + @@ -237,36 +254,51 @@ - + - - - - - + type="textarea" + name="description" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_LABEL" + rows="11" + cols="10" + description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_DESCRIPTION" + class="text_area span12" + filter="HTML" + hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_HINT" + /> + - - - - + type="editor" + name="php_postflight_install" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_LABEL" + description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_DESCRIPTION" + width="100%" + height="450px" + cols="15" + rows="30" + buttons="no" + syntax="php" + editor="codemirror|none" + filter="raw" + validate="code" + /> + + + + + + @@ -292,21 +324,74 @@ - + + + + + - - - - + type="editor" + name="php_preflight_install" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_LABEL" + description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_DESCRIPTION" + width="100%" + height="450px" + cols="15" + rows="30" + buttons="no" + syntax="php" + editor="codemirror|none" + filter="raw" + validate="code" + /> + + + + + + + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - + @@ -336,42 +421,6 @@ - - - - - - - - - - - - - - - - + + - + + default="0" + required="true"> @@ -446,21 +485,22 @@ message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_MESSAGE" hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT" /> - + - - - - + type="editor" + name="php_helper_admin" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_LABEL" + description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_ADMIN_DESCRIPTION" + width="100%" + height="550px" + cols="15" + rows="80" + buttons="no" + syntax="php" + editor="codemirror|none" + filter="raw" + validate="code" + /> COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - + - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + type="radio" + name="add_sql" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - + + type="radio" + name="add_sql_uninstall" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_UNINSTALL_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - + + type="list" + name="assets_table_fix" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ASSETS_TABLE_FIX_LABEL" + description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ASSETS_TABLE_FIX_DESCRIPTION" + class="list_class" + multiple="false" + default="3"> + + + + + + array( - 'left' => array( - 'add_update_server', - 'update_server_url', - 'update_server_target', - 'note_update_server_note_ftp', - 'note_update_server_note_zip', - 'note_update_server_note_other', - 'update_server', - 'add_sales_server', - 'sales_server' - ), - 'right' => array( - 'translation_tool', - 'note_crowdin', - 'crowdin_project_identifier', - 'crowdin_project_api_key', - 'crowdin_username', - 'crowdin_account_api_key' - ) - ), 'mysql' => array( 'fullwidth' => array( 'add_sql', 'sql', 'add_sql_uninstall', - 'sql_uninstall' + 'sql_uninstall', + 'assets_table_fix' ) ), 'dash_install' => array( @@ -140,6 +120,27 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin 'php_method_uninstall' ) ), + 'dynamic_integration' => array( + 'left' => array( + 'add_update_server', + 'update_server_url', + 'update_server_target', + 'note_update_server_note_ftp', + 'note_update_server_note_zip', + 'note_update_server_note_other', + 'update_server', + 'add_sales_server', + 'sales_server' + ), + 'right' => array( + 'translation_tool', + 'note_crowdin', + 'crowdin_project_identifier', + 'crowdin_project_api_key', + 'crowdin_username', + 'crowdin_account_api_key' + ) + ), 'readme' => array( 'left' => array( 'addreadme', @@ -339,70 +340,34 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $item->metadata = $registry->toArray(); } - if (!empty($item->buildcompsql)) - { - // base64 Decode buildcompsql. - $item->buildcompsql = base64_decode($item->buildcompsql); - } - - if (!empty($item->php_helper_both)) - { - // base64 Decode php_helper_both. - $item->php_helper_both = base64_decode($item->php_helper_both); - } - - if (!empty($item->php_helper_admin)) - { - // base64 Decode php_helper_admin. - $item->php_helper_admin = base64_decode($item->php_helper_admin); - } - - if (!empty($item->php_admin_event)) - { - // base64 Decode php_admin_event. - $item->php_admin_event = base64_decode($item->php_admin_event); - } - - if (!empty($item->php_helper_site)) - { - // base64 Decode php_helper_site. - $item->php_helper_site = base64_decode($item->php_helper_site); - } - if (!empty($item->php_site_event)) { // base64 Decode php_site_event. $item->php_site_event = base64_decode($item->php_site_event); } - if (!empty($item->javascript)) - { - // base64 Decode javascript. - $item->javascript = base64_decode($item->javascript); - } - if (!empty($item->css_admin)) { // base64 Decode css_admin. $item->css_admin = base64_decode($item->css_admin); } - if (!empty($item->css_site)) + if (!empty($item->php_helper_both)) { - // base64 Decode css_site. - $item->css_site = base64_decode($item->css_site); + // base64 Decode php_helper_both. + $item->php_helper_both = base64_decode($item->php_helper_both); } - if (!empty($item->php_preflight_install)) + if (!empty($item->php_admin_event)) { - // base64 Decode php_preflight_install. - $item->php_preflight_install = base64_decode($item->php_preflight_install); + // base64 Decode php_admin_event. + $item->php_admin_event = base64_decode($item->php_admin_event); } - if (!empty($item->php_preflight_update)) + if (!empty($item->sql_uninstall)) { - // base64 Decode php_preflight_update. - $item->php_preflight_update = base64_decode($item->php_preflight_update); + // base64 Decode sql_uninstall. + $item->sql_uninstall = base64_decode($item->sql_uninstall); } if (!empty($item->php_postflight_install)) @@ -411,10 +376,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $item->php_postflight_install = base64_decode($item->php_postflight_install); } - if (!empty($item->php_postflight_update)) + if (!empty($item->php_preflight_install)) { - // base64 Decode php_postflight_update. - $item->php_postflight_update = base64_decode($item->php_postflight_update); + // base64 Decode php_preflight_install. + $item->php_preflight_install = base64_decode($item->php_preflight_install); } if (!empty($item->php_method_uninstall)) @@ -423,16 +388,52 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $item->php_method_uninstall = base64_decode($item->php_method_uninstall); } + if (!empty($item->php_helper_admin)) + { + // base64 Decode php_helper_admin. + $item->php_helper_admin = base64_decode($item->php_helper_admin); + } + + if (!empty($item->php_helper_site)) + { + // base64 Decode php_helper_site. + $item->php_helper_site = base64_decode($item->php_helper_site); + } + + if (!empty($item->javascript)) + { + // base64 Decode javascript. + $item->javascript = base64_decode($item->javascript); + } + + if (!empty($item->css_site)) + { + // base64 Decode css_site. + $item->css_site = base64_decode($item->css_site); + } + + if (!empty($item->php_preflight_update)) + { + // base64 Decode php_preflight_update. + $item->php_preflight_update = base64_decode($item->php_preflight_update); + } + + if (!empty($item->php_postflight_update)) + { + // base64 Decode php_postflight_update. + $item->php_postflight_update = base64_decode($item->php_postflight_update); + } + if (!empty($item->sql)) { // base64 Decode sql. $item->sql = base64_decode($item->sql); } - if (!empty($item->sql_uninstall)) + if (!empty($item->buildcompsql)) { - // base64 Decode sql_uninstall. - $item->sql_uninstall = base64_decode($item->sql_uninstall); + // base64 Decode buildcompsql. + $item->buildcompsql = base64_decode($item->buildcompsql); } if (!empty($item->readme)) @@ -446,18 +447,18 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin // Get the encryption object. $basic = new FOFEncryptAes($basickey); - if (!empty($item->crowdin_username) && $basickey && !is_numeric($item->crowdin_username) && $item->crowdin_username === base64_encode(base64_decode($item->crowdin_username, true))) - { - // basic decrypt data crowdin_username. - $item->crowdin_username = rtrim($basic->decryptString($item->crowdin_username), "\0"); - } - if (!empty($item->whmcs_key) && $basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true))) { // basic decrypt data whmcs_key. $item->whmcs_key = rtrim($basic->decryptString($item->whmcs_key), "\0"); } + if (!empty($item->crowdin_username) && $basickey && !is_numeric($item->crowdin_username) && $item->crowdin_username === base64_encode(base64_decode($item->crowdin_username, true))) + { + // basic decrypt data crowdin_username. + $item->crowdin_username = rtrim($basic->decryptString($item->crowdin_username), "\0"); + } + if (!empty($item->export_key) && $basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true))) { // basic decrypt data export_key. @@ -1412,70 +1413,34 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $data['addcontributors'] = ''; } - // Set the buildcompsql string to base64 string. - if (isset($data['buildcompsql'])) - { - $data['buildcompsql'] = base64_encode($data['buildcompsql']); - } - - // Set the php_helper_both string to base64 string. - if (isset($data['php_helper_both'])) - { - $data['php_helper_both'] = base64_encode($data['php_helper_both']); - } - - // Set the php_helper_admin string to base64 string. - if (isset($data['php_helper_admin'])) - { - $data['php_helper_admin'] = base64_encode($data['php_helper_admin']); - } - - // Set the php_admin_event string to base64 string. - if (isset($data['php_admin_event'])) - { - $data['php_admin_event'] = base64_encode($data['php_admin_event']); - } - - // Set the php_helper_site string to base64 string. - if (isset($data['php_helper_site'])) - { - $data['php_helper_site'] = base64_encode($data['php_helper_site']); - } - // Set the php_site_event string to base64 string. if (isset($data['php_site_event'])) { $data['php_site_event'] = base64_encode($data['php_site_event']); } - // Set the javascript string to base64 string. - if (isset($data['javascript'])) - { - $data['javascript'] = base64_encode($data['javascript']); - } - // Set the css_admin string to base64 string. if (isset($data['css_admin'])) { $data['css_admin'] = base64_encode($data['css_admin']); } - // Set the css_site string to base64 string. - if (isset($data['css_site'])) + // Set the php_helper_both string to base64 string. + if (isset($data['php_helper_both'])) { - $data['css_site'] = base64_encode($data['css_site']); + $data['php_helper_both'] = base64_encode($data['php_helper_both']); } - // Set the php_preflight_install string to base64 string. - if (isset($data['php_preflight_install'])) + // Set the php_admin_event string to base64 string. + if (isset($data['php_admin_event'])) { - $data['php_preflight_install'] = base64_encode($data['php_preflight_install']); + $data['php_admin_event'] = base64_encode($data['php_admin_event']); } - // Set the php_preflight_update string to base64 string. - if (isset($data['php_preflight_update'])) + // Set the sql_uninstall string to base64 string. + if (isset($data['sql_uninstall'])) { - $data['php_preflight_update'] = base64_encode($data['php_preflight_update']); + $data['sql_uninstall'] = base64_encode($data['sql_uninstall']); } // Set the php_postflight_install string to base64 string. @@ -1484,10 +1449,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $data['php_postflight_install'] = base64_encode($data['php_postflight_install']); } - // Set the php_postflight_update string to base64 string. - if (isset($data['php_postflight_update'])) + // Set the php_preflight_install string to base64 string. + if (isset($data['php_preflight_install'])) { - $data['php_postflight_update'] = base64_encode($data['php_postflight_update']); + $data['php_preflight_install'] = base64_encode($data['php_preflight_install']); } // Set the php_method_uninstall string to base64 string. @@ -1496,16 +1461,52 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']); } + // Set the php_helper_admin string to base64 string. + if (isset($data['php_helper_admin'])) + { + $data['php_helper_admin'] = base64_encode($data['php_helper_admin']); + } + + // Set the php_helper_site string to base64 string. + if (isset($data['php_helper_site'])) + { + $data['php_helper_site'] = base64_encode($data['php_helper_site']); + } + + // Set the javascript string to base64 string. + if (isset($data['javascript'])) + { + $data['javascript'] = base64_encode($data['javascript']); + } + + // Set the css_site string to base64 string. + if (isset($data['css_site'])) + { + $data['css_site'] = base64_encode($data['css_site']); + } + + // Set the php_preflight_update string to base64 string. + if (isset($data['php_preflight_update'])) + { + $data['php_preflight_update'] = base64_encode($data['php_preflight_update']); + } + + // Set the php_postflight_update string to base64 string. + if (isset($data['php_postflight_update'])) + { + $data['php_postflight_update'] = base64_encode($data['php_postflight_update']); + } + // Set the sql string to base64 string. if (isset($data['sql'])) { $data['sql'] = base64_encode($data['sql']); } - // Set the sql_uninstall string to base64 string. - if (isset($data['sql_uninstall'])) + // Set the buildcompsql string to base64 string. + if (isset($data['buildcompsql'])) { - $data['sql_uninstall'] = base64_encode($data['sql_uninstall']); + $data['buildcompsql'] = base64_encode($data['buildcompsql']); } // Set the readme string to base64 string. @@ -1519,18 +1520,18 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin // Get the encryption object $basic = new FOFEncryptAes($basickey); - // Encrypt data crowdin_username. - if (isset($data['crowdin_username']) && $basickey) - { - $data['crowdin_username'] = $basic->encryptString($data['crowdin_username']); - } - // Encrypt data whmcs_key. if (isset($data['whmcs_key']) && $basickey) { $data['whmcs_key'] = $basic->encryptString($data['whmcs_key']); } + // Encrypt data crowdin_username. + if (isset($data['crowdin_username']) && $basickey) + { + $data['crowdin_username'] = $basic->encryptString($data['crowdin_username']); + } + // Encrypt data export_key. if (isset($data['export_key']) && $basickey) { diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php index bf2a8b23b..44a8fa786 100644 --- a/admin/models/joomla_components.php +++ b/admin/models/joomla_components.php @@ -2395,6 +2395,41 @@ class ComponentbuilderModelJoomla_components extends JModelList continue; } + // decode php_site_event + $item->php_site_event = base64_decode($item->php_site_event); + // decode css_admin + $item->css_admin = base64_decode($item->css_admin); + // decode php_helper_both + $item->php_helper_both = base64_decode($item->php_helper_both); + // decode php_admin_event + $item->php_admin_event = base64_decode($item->php_admin_event); + // decode sql_uninstall + $item->sql_uninstall = base64_decode($item->sql_uninstall); + // decode php_postflight_install + $item->php_postflight_install = base64_decode($item->php_postflight_install); + // decode php_preflight_install + $item->php_preflight_install = base64_decode($item->php_preflight_install); + // decode php_method_uninstall + $item->php_method_uninstall = base64_decode($item->php_method_uninstall); + // decode php_helper_admin + $item->php_helper_admin = base64_decode($item->php_helper_admin); + // decode php_helper_site + $item->php_helper_site = base64_decode($item->php_helper_site); + // decode javascript + $item->javascript = base64_decode($item->javascript); + // decode css_site + $item->css_site = base64_decode($item->css_site); + if ($basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true))) + { + // decrypt whmcs_key + $item->whmcs_key = $basic->decryptString($item->whmcs_key); + } + // decode php_preflight_update + $item->php_preflight_update = base64_decode($item->php_preflight_update); + // decode php_postflight_update + $item->php_postflight_update = base64_decode($item->php_postflight_update); + // decode sql + $item->sql = base64_decode($item->sql); if ($basickey && !is_numeric($item->crowdin_username) && $item->crowdin_username === base64_encode(base64_decode($item->crowdin_username, true))) { // decrypt crowdin_username @@ -2402,46 +2437,11 @@ class ComponentbuilderModelJoomla_components extends JModelList } // decode buildcompsql $item->buildcompsql = base64_decode($item->buildcompsql); - if ($basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true))) - { - // decrypt whmcs_key - $item->whmcs_key = $basic->decryptString($item->whmcs_key); - } - // decode php_helper_both - $item->php_helper_both = base64_decode($item->php_helper_both); - // decode php_helper_admin - $item->php_helper_admin = base64_decode($item->php_helper_admin); - // decode php_admin_event - $item->php_admin_event = base64_decode($item->php_admin_event); - // decode php_helper_site - $item->php_helper_site = base64_decode($item->php_helper_site); - // decode php_site_event - $item->php_site_event = base64_decode($item->php_site_event); - // decode javascript - $item->javascript = base64_decode($item->javascript); - // decode css_admin - $item->css_admin = base64_decode($item->css_admin); - // decode css_site - $item->css_site = base64_decode($item->css_site); - // decode php_preflight_install - $item->php_preflight_install = base64_decode($item->php_preflight_install); - // decode php_preflight_update - $item->php_preflight_update = base64_decode($item->php_preflight_update); if ($basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true))) { // decrypt export_key $item->export_key = $basic->decryptString($item->export_key); } - // decode php_postflight_install - $item->php_postflight_install = base64_decode($item->php_postflight_install); - // decode php_postflight_update - $item->php_postflight_update = base64_decode($item->php_postflight_update); - // decode php_method_uninstall - $item->php_method_uninstall = base64_decode($item->php_method_uninstall); - // decode sql - $item->sql = base64_decode($item->sql); - // decode sql_uninstall - $item->sql_uninstall = base64_decode($item->sql_uninstall); // decode readme $item->readme = base64_decode($item->readme); if ($basickey && !is_numeric($item->crowdin_project_api_key) && $item->crowdin_project_api_key === base64_encode(base64_decode($item->crowdin_project_api_key, true))) diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index bb6fe81cd..cb0c5d231 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -26,6 +26,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` ( `addfootable` TINYINT(1) NOT NULL DEFAULT 0, `addreadme` TINYINT(1) NOT NULL DEFAULT 0, `adduikit` TINYINT(1) NOT NULL DEFAULT 0, + `assets_table_fix` TINYINT(1) NOT NULL DEFAULT 3, `author` VARCHAR(255) NOT NULL DEFAULT '', `bom` CHAR(64) NOT NULL DEFAULT '', `buildcomp` TINYINT(1) NOT NULL DEFAULT 0, @@ -103,34 +104,35 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` ( PRIMARY KEY (`id`), KEY `idx_system_name` (`system_name`), KEY `idx_name_code` (`name_code`), - KEY `idx_add_php_helper_admin` (`add_php_helper_admin`), - KEY `idx_addfootable` (`addfootable`), - KEY `idx_add_sql` (`add_sql`), - KEY `idx_add_php_preflight_update` (`add_php_preflight_update`), - KEY `idx_add_css_site` (`add_css_site`), - KEY `idx_mvc_versiondate` (`mvc_versiondate`), KEY `idx_remove_line_breaks` (`remove_line_breaks`), - KEY `idx_add_placeholders` (`add_placeholders`), - KEY `idx_add_php_helper_site` (`add_php_helper_site`), - KEY `idx_add_javascript` (`add_javascript`), - KEY `idx_add_php_postflight_update` (`add_php_postflight_update`), - KEY `idx_addreadme` (`addreadme`), KEY `idx_debug_linenr` (`debug_linenr`), - KEY `idx_add_license` (`add_license`), - KEY `idx_license_type` (`license_type`), - KEY `idx_add_php_helper_both` (`add_php_helper_both`), - KEY `idx_add_admin_event` (`add_admin_event`), - KEY `idx_add_site_event` (`add_site_event`), - KEY `idx_add_css_admin` (`add_css_admin`), - KEY `idx_add_php_preflight_install` (`add_php_preflight_install`), - KEY `idx_add_php_postflight_install` (`add_php_postflight_install`), - KEY `idx_add_php_method_uninstall` (`add_php_method_uninstall`), - KEY `idx_add_sql_uninstall` (`add_sql_uninstall`), - KEY `idx_translation_tool` (`translation_tool`), + KEY `idx_mvc_versiondate` (`mvc_versiondate`), + KEY `idx_add_placeholders` (`add_placeholders`), KEY `idx_add_sales_server` (`add_sales_server`), KEY `idx_add_email_helper` (`add_email_helper`), + KEY `idx_add_license` (`add_license`), + KEY `idx_license_type` (`license_type`), + KEY `idx_addreadme` (`addreadme`), + KEY `idx_translation_tool` (`translation_tool`), + KEY `idx_addfootable` (`addfootable`), + KEY `idx_add_php_helper_both` (`add_php_helper_both`), + KEY `idx_add_php_helper_admin` (`add_php_helper_admin`), + KEY `idx_add_admin_event` (`add_admin_event`), + KEY `idx_add_php_helper_site` (`add_php_helper_site`), + KEY `idx_add_site_event` (`add_site_event`), + KEY `idx_add_javascript` (`add_javascript`), KEY `idx_add_menu_prefix` (`add_menu_prefix`), + KEY `idx_add_css_admin` (`add_css_admin`), KEY `idx_menu_prefix` (`menu_prefix`), + KEY `idx_add_css_site` (`add_css_site`), + KEY `idx_add_php_preflight_install` (`add_php_preflight_install`), + KEY `idx_add_php_preflight_update` (`add_php_preflight_update`), + KEY `idx_add_php_postflight_install` (`add_php_postflight_install`), + KEY `idx_add_php_postflight_update` (`add_php_postflight_update`), + KEY `idx_add_php_method_uninstall` (`add_php_method_uninstall`), + KEY `idx_add_sql` (`add_sql`), + KEY `idx_add_sql_uninstall` (`add_sql_uninstall`), + KEY `idx_assets_table_fix` (`assets_table_fix`), KEY `idx_emptycontributors` (`emptycontributors`), KEY `idx_add_update_server` (`add_update_server`), KEY `idx_update_server_target` (`update_server_target`), diff --git a/admin/sql/uninstall.mysql.utf8.sql b/admin/sql/uninstall.mysql.utf8.sql index 3d73f9f76..5af4b7be1 100644 --- a/admin/sql/uninstall.mysql.utf8.sql +++ b/admin/sql/uninstall.mysql.utf8.sql @@ -48,13 +48,3 @@ DROP TABLE IF EXISTS `#__componentbuilder_joomla_plugin_files_folders_urls`; DROP TABLE IF EXISTS `#__componentbuilder_external_code`; - --- --- Always insure this column rules is reversed to Joomla defaults on uninstall. (as on 1st Dec 2020) --- -ALTER TABLE `#__assets` CHANGE `rules` `rules` varchar(5120) NOT NULL COMMENT 'JSON encoded access control.'; - --- --- Always insure this column name is reversed to Joomla defaults on uninstall. (as on 1st Dec 2020). --- -ALTER TABLE `#__assets` CHANGE `name` `name` VARCHAR(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'The unique name for the asset.'; diff --git a/admin/sql/updates/mysql/2.12.1.sql b/admin/sql/updates/mysql/2.12.1.sql new file mode 100644 index 000000000..151db5231 --- /dev/null +++ b/admin/sql/updates/mysql/2.12.1.sql @@ -0,0 +1 @@ +ALTER TABLE `#__componentbuilder_joomla_component` ADD `assets_table_fix` TINYINT(1) NOT NULL DEFAULT 3 AFTER `adduikit`; diff --git a/componentbuilder.xml b/componentbuilder.xml index fcd85f9ee..9eb3f11e9 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,15 +1,15 @@ COM_COMPONENTBUILDER - 8th December, 2020 + 10th December, 2020 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://www.joomlacomponentbuilder.com Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - 2.12.1 + 2.12.2 Component Builder (v.2.12.1) +

Component Builder (v.2.12.2)

The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time. diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml index 64805c7bc..abcd8ed98 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -993,7 +993,24 @@ 2.12.1 http://www.joomlacomponentbuilder.com - https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.12.1/JCB_v2.12.1.zip + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.12.2/JCB_v2.12.2.zip + + + stable + + Llewellyn van der Merwe + http://www.joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.12.2 + http://www.joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.12.2/JCB_v2.12.2.zip stable diff --git a/script.php b/script.php index d9d91b920..e27fc33a8 100644 --- a/script.php +++ b/script.php @@ -75,7 +75,7 @@ class com_componentbuilderInstallerScript $joomla_component_done = $db->execute(); if ($joomla_component_done) { - // If succesfully remove Joomla_component add queued success message. + // If successfully remove Joomla_component add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_component) type alias was removed from the #__content_type table')); } @@ -90,7 +90,7 @@ class com_componentbuilderInstallerScript $joomla_component_done = $db->execute(); if ($joomla_component_done) { - // If succesfully remove Joomla_component add queued success message. + // If successfully remove Joomla_component add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_component) type alias was removed from the #__contentitem_tag_map table')); } @@ -105,7 +105,7 @@ class com_componentbuilderInstallerScript $joomla_component_done = $db->execute(); if ($joomla_component_done) { - // If succesfully remove Joomla_component add queued success message. + // If successfully removed Joomla_component add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_component) type alias was removed from the #__ucm_content table')); } @@ -161,7 +161,7 @@ class com_componentbuilderInstallerScript $joomla_module_done = $db->execute(); if ($joomla_module_done) { - // If succesfully remove Joomla_module add queued success message. + // If successfully remove Joomla_module add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_module) type alias was removed from the #__content_type table')); } @@ -176,7 +176,7 @@ class com_componentbuilderInstallerScript $joomla_module_done = $db->execute(); if ($joomla_module_done) { - // If succesfully remove Joomla_module add queued success message. + // If successfully remove Joomla_module add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_module) type alias was removed from the #__contentitem_tag_map table')); } @@ -191,7 +191,7 @@ class com_componentbuilderInstallerScript $joomla_module_done = $db->execute(); if ($joomla_module_done) { - // If succesfully remove Joomla_module add queued success message. + // If successfully removed Joomla_module add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_module) type alias was removed from the #__ucm_content table')); } @@ -247,7 +247,7 @@ class com_componentbuilderInstallerScript $joomla_plugin_done = $db->execute(); if ($joomla_plugin_done) { - // If succesfully remove Joomla_plugin add queued success message. + // If successfully remove Joomla_plugin add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_plugin) type alias was removed from the #__content_type table')); } @@ -262,7 +262,7 @@ class com_componentbuilderInstallerScript $joomla_plugin_done = $db->execute(); if ($joomla_plugin_done) { - // If succesfully remove Joomla_plugin add queued success message. + // If successfully remove Joomla_plugin add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_plugin) type alias was removed from the #__contentitem_tag_map table')); } @@ -277,7 +277,7 @@ class com_componentbuilderInstallerScript $joomla_plugin_done = $db->execute(); if ($joomla_plugin_done) { - // If succesfully remove Joomla_plugin add queued success message. + // If successfully removed Joomla_plugin add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_plugin) type alias was removed from the #__ucm_content table')); } @@ -333,7 +333,7 @@ class com_componentbuilderInstallerScript $admin_view_done = $db->execute(); if ($admin_view_done) { - // If succesfully remove Admin_view add queued success message. + // If successfully remove Admin_view add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.admin_view) type alias was removed from the #__content_type table')); } @@ -348,7 +348,7 @@ class com_componentbuilderInstallerScript $admin_view_done = $db->execute(); if ($admin_view_done) { - // If succesfully remove Admin_view add queued success message. + // If successfully remove Admin_view add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.admin_view) type alias was removed from the #__contentitem_tag_map table')); } @@ -363,7 +363,7 @@ class com_componentbuilderInstallerScript $admin_view_done = $db->execute(); if ($admin_view_done) { - // If succesfully remove Admin_view add queued success message. + // If successfully removed Admin_view add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.admin_view) type alias was removed from the #__ucm_content table')); } @@ -419,7 +419,7 @@ class com_componentbuilderInstallerScript $custom_admin_view_done = $db->execute(); if ($custom_admin_view_done) { - // If succesfully remove Custom_admin_view add queued success message. + // If successfully remove Custom_admin_view add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.custom_admin_view) type alias was removed from the #__content_type table')); } @@ -434,7 +434,7 @@ class com_componentbuilderInstallerScript $custom_admin_view_done = $db->execute(); if ($custom_admin_view_done) { - // If succesfully remove Custom_admin_view add queued success message. + // If successfully remove Custom_admin_view add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.custom_admin_view) type alias was removed from the #__contentitem_tag_map table')); } @@ -449,7 +449,7 @@ class com_componentbuilderInstallerScript $custom_admin_view_done = $db->execute(); if ($custom_admin_view_done) { - // If succesfully remove Custom_admin_view add queued success message. + // If successfully removed Custom_admin_view add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.custom_admin_view) type alias was removed from the #__ucm_content table')); } @@ -505,7 +505,7 @@ class com_componentbuilderInstallerScript $site_view_done = $db->execute(); if ($site_view_done) { - // If succesfully remove Site_view add queued success message. + // If successfully remove Site_view add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.site_view) type alias was removed from the #__content_type table')); } @@ -520,7 +520,7 @@ class com_componentbuilderInstallerScript $site_view_done = $db->execute(); if ($site_view_done) { - // If succesfully remove Site_view add queued success message. + // If successfully remove Site_view add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.site_view) type alias was removed from the #__contentitem_tag_map table')); } @@ -535,7 +535,7 @@ class com_componentbuilderInstallerScript $site_view_done = $db->execute(); if ($site_view_done) { - // If succesfully remove Site_view add queued success message. + // If successfully removed Site_view add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.site_view) type alias was removed from the #__ucm_content table')); } @@ -591,7 +591,7 @@ class com_componentbuilderInstallerScript $template_done = $db->execute(); if ($template_done) { - // If succesfully remove Template add queued success message. + // If successfully remove Template add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.template) type alias was removed from the #__content_type table')); } @@ -606,7 +606,7 @@ class com_componentbuilderInstallerScript $template_done = $db->execute(); if ($template_done) { - // If succesfully remove Template add queued success message. + // If successfully remove Template add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.template) type alias was removed from the #__contentitem_tag_map table')); } @@ -621,7 +621,7 @@ class com_componentbuilderInstallerScript $template_done = $db->execute(); if ($template_done) { - // If succesfully remove Template add queued success message. + // If successfully removed Template add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.template) type alias was removed from the #__ucm_content table')); } @@ -677,7 +677,7 @@ class com_componentbuilderInstallerScript $layout_done = $db->execute(); if ($layout_done) { - // If succesfully remove Layout add queued success message. + // If successfully remove Layout add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.layout) type alias was removed from the #__content_type table')); } @@ -692,7 +692,7 @@ class com_componentbuilderInstallerScript $layout_done = $db->execute(); if ($layout_done) { - // If succesfully remove Layout add queued success message. + // If successfully remove Layout add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.layout) type alias was removed from the #__contentitem_tag_map table')); } @@ -707,7 +707,7 @@ class com_componentbuilderInstallerScript $layout_done = $db->execute(); if ($layout_done) { - // If succesfully remove Layout add queued success message. + // If successfully removed Layout add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.layout) type alias was removed from the #__ucm_content table')); } @@ -763,7 +763,7 @@ class com_componentbuilderInstallerScript $dynamic_get_done = $db->execute(); if ($dynamic_get_done) { - // If succesfully remove Dynamic_get add queued success message. + // If successfully remove Dynamic_get add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.dynamic_get) type alias was removed from the #__content_type table')); } @@ -778,7 +778,7 @@ class com_componentbuilderInstallerScript $dynamic_get_done = $db->execute(); if ($dynamic_get_done) { - // If succesfully remove Dynamic_get add queued success message. + // If successfully remove Dynamic_get add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.dynamic_get) type alias was removed from the #__contentitem_tag_map table')); } @@ -793,7 +793,7 @@ class com_componentbuilderInstallerScript $dynamic_get_done = $db->execute(); if ($dynamic_get_done) { - // If succesfully remove Dynamic_get add queued success message. + // If successfully removed Dynamic_get add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.dynamic_get) type alias was removed from the #__ucm_content table')); } @@ -849,7 +849,7 @@ class com_componentbuilderInstallerScript $custom_code_done = $db->execute(); if ($custom_code_done) { - // If succesfully remove Custom_code add queued success message. + // If successfully remove Custom_code add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.custom_code) type alias was removed from the #__content_type table')); } @@ -864,7 +864,7 @@ class com_componentbuilderInstallerScript $custom_code_done = $db->execute(); if ($custom_code_done) { - // If succesfully remove Custom_code add queued success message. + // If successfully remove Custom_code add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.custom_code) type alias was removed from the #__contentitem_tag_map table')); } @@ -879,7 +879,7 @@ class com_componentbuilderInstallerScript $custom_code_done = $db->execute(); if ($custom_code_done) { - // If succesfully remove Custom_code add queued success message. + // If successfully removed Custom_code add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.custom_code) type alias was removed from the #__ucm_content table')); } @@ -935,7 +935,7 @@ class com_componentbuilderInstallerScript $class_property_done = $db->execute(); if ($class_property_done) { - // If succesfully remove Class_property add queued success message. + // If successfully remove Class_property add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.class_property) type alias was removed from the #__content_type table')); } @@ -950,7 +950,7 @@ class com_componentbuilderInstallerScript $class_property_done = $db->execute(); if ($class_property_done) { - // If succesfully remove Class_property add queued success message. + // If successfully remove Class_property add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.class_property) type alias was removed from the #__contentitem_tag_map table')); } @@ -965,7 +965,7 @@ class com_componentbuilderInstallerScript $class_property_done = $db->execute(); if ($class_property_done) { - // If succesfully remove Class_property add queued success message. + // If successfully removed Class_property add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.class_property) type alias was removed from the #__ucm_content table')); } @@ -1021,7 +1021,7 @@ class com_componentbuilderInstallerScript $class_method_done = $db->execute(); if ($class_method_done) { - // If succesfully remove Class_method add queued success message. + // If successfully remove Class_method add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.class_method) type alias was removed from the #__content_type table')); } @@ -1036,7 +1036,7 @@ class com_componentbuilderInstallerScript $class_method_done = $db->execute(); if ($class_method_done) { - // If succesfully remove Class_method add queued success message. + // If successfully remove Class_method add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.class_method) type alias was removed from the #__contentitem_tag_map table')); } @@ -1051,7 +1051,7 @@ class com_componentbuilderInstallerScript $class_method_done = $db->execute(); if ($class_method_done) { - // If succesfully remove Class_method add queued success message. + // If successfully removed Class_method add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.class_method) type alias was removed from the #__ucm_content table')); } @@ -1107,7 +1107,7 @@ class com_componentbuilderInstallerScript $placeholder_done = $db->execute(); if ($placeholder_done) { - // If succesfully remove Placeholder add queued success message. + // If successfully remove Placeholder add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.placeholder) type alias was removed from the #__content_type table')); } @@ -1122,7 +1122,7 @@ class com_componentbuilderInstallerScript $placeholder_done = $db->execute(); if ($placeholder_done) { - // If succesfully remove Placeholder add queued success message. + // If successfully remove Placeholder add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.placeholder) type alias was removed from the #__contentitem_tag_map table')); } @@ -1137,7 +1137,7 @@ class com_componentbuilderInstallerScript $placeholder_done = $db->execute(); if ($placeholder_done) { - // If succesfully remove Placeholder add queued success message. + // If successfully removed Placeholder add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.placeholder) type alias was removed from the #__ucm_content table')); } @@ -1193,7 +1193,7 @@ class com_componentbuilderInstallerScript $library_done = $db->execute(); if ($library_done) { - // If succesfully remove Library add queued success message. + // If successfully remove Library add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.library) type alias was removed from the #__content_type table')); } @@ -1208,7 +1208,7 @@ class com_componentbuilderInstallerScript $library_done = $db->execute(); if ($library_done) { - // If succesfully remove Library add queued success message. + // If successfully remove Library add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.library) type alias was removed from the #__contentitem_tag_map table')); } @@ -1223,7 +1223,7 @@ class com_componentbuilderInstallerScript $library_done = $db->execute(); if ($library_done) { - // If succesfully remove Library add queued success message. + // If successfully removed Library add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.library) type alias was removed from the #__ucm_content table')); } @@ -1279,7 +1279,7 @@ class com_componentbuilderInstallerScript $snippet_done = $db->execute(); if ($snippet_done) { - // If succesfully remove Snippet add queued success message. + // If successfully remove Snippet add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.snippet) type alias was removed from the #__content_type table')); } @@ -1294,7 +1294,7 @@ class com_componentbuilderInstallerScript $snippet_done = $db->execute(); if ($snippet_done) { - // If succesfully remove Snippet add queued success message. + // If successfully remove Snippet add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.snippet) type alias was removed from the #__contentitem_tag_map table')); } @@ -1309,7 +1309,7 @@ class com_componentbuilderInstallerScript $snippet_done = $db->execute(); if ($snippet_done) { - // If succesfully remove Snippet add queued success message. + // If successfully removed Snippet add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.snippet) type alias was removed from the #__ucm_content table')); } @@ -1365,7 +1365,7 @@ class com_componentbuilderInstallerScript $validation_rule_done = $db->execute(); if ($validation_rule_done) { - // If succesfully remove Validation_rule add queued success message. + // If successfully remove Validation_rule add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.validation_rule) type alias was removed from the #__content_type table')); } @@ -1380,7 +1380,7 @@ class com_componentbuilderInstallerScript $validation_rule_done = $db->execute(); if ($validation_rule_done) { - // If succesfully remove Validation_rule add queued success message. + // If successfully remove Validation_rule add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.validation_rule) type alias was removed from the #__contentitem_tag_map table')); } @@ -1395,7 +1395,7 @@ class com_componentbuilderInstallerScript $validation_rule_done = $db->execute(); if ($validation_rule_done) { - // If succesfully remove Validation_rule add queued success message. + // If successfully removed Validation_rule add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.validation_rule) type alias was removed from the #__ucm_content table')); } @@ -1451,7 +1451,7 @@ class com_componentbuilderInstallerScript $field_done = $db->execute(); if ($field_done) { - // If succesfully remove Field add queued success message. + // If successfully remove Field add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.field) type alias was removed from the #__content_type table')); } @@ -1466,7 +1466,7 @@ class com_componentbuilderInstallerScript $field_done = $db->execute(); if ($field_done) { - // If succesfully remove Field add queued success message. + // If successfully remove Field add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.field) type alias was removed from the #__contentitem_tag_map table')); } @@ -1481,7 +1481,7 @@ class com_componentbuilderInstallerScript $field_done = $db->execute(); if ($field_done) { - // If succesfully remove Field add queued success message. + // If successfully removed Field add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.field) type alias was removed from the #__ucm_content table')); } @@ -1537,7 +1537,7 @@ class com_componentbuilderInstallerScript $field_catid_done = $db->execute(); if ($field_catid_done) { - // If succesfully remove Field catid add queued success message. + // If successfully remove Field catid add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.field.category) type alias was removed from the #__content_type table')); } @@ -1552,7 +1552,7 @@ class com_componentbuilderInstallerScript $field_catid_done = $db->execute(); if ($field_catid_done) { - // If succesfully remove Field catid add queued success message. + // If successfully remove Field catid add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.field.category) type alias was removed from the #__contentitem_tag_map table')); } @@ -1567,7 +1567,7 @@ class com_componentbuilderInstallerScript $field_catid_done = $db->execute(); if ($field_catid_done) { - // If succesfully remove Field catid add queued success message. + // If successfully removed Field catid add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.field.category) type alias was removed from the #__ucm_content table')); } @@ -1623,7 +1623,7 @@ class com_componentbuilderInstallerScript $fieldtype_done = $db->execute(); if ($fieldtype_done) { - // If succesfully remove Fieldtype add queued success message. + // If successfully remove Fieldtype add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.fieldtype) type alias was removed from the #__content_type table')); } @@ -1638,7 +1638,7 @@ class com_componentbuilderInstallerScript $fieldtype_done = $db->execute(); if ($fieldtype_done) { - // If succesfully remove Fieldtype add queued success message. + // If successfully remove Fieldtype add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.fieldtype) type alias was removed from the #__contentitem_tag_map table')); } @@ -1653,7 +1653,7 @@ class com_componentbuilderInstallerScript $fieldtype_done = $db->execute(); if ($fieldtype_done) { - // If succesfully remove Fieldtype add queued success message. + // If successfully removed Fieldtype add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.fieldtype) type alias was removed from the #__ucm_content table')); } @@ -1709,7 +1709,7 @@ class com_componentbuilderInstallerScript $fieldtype_catid_done = $db->execute(); if ($fieldtype_catid_done) { - // If succesfully remove Fieldtype catid add queued success message. + // If successfully remove Fieldtype catid add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.fieldtype.category) type alias was removed from the #__content_type table')); } @@ -1724,7 +1724,7 @@ class com_componentbuilderInstallerScript $fieldtype_catid_done = $db->execute(); if ($fieldtype_catid_done) { - // If succesfully remove Fieldtype catid add queued success message. + // If successfully remove Fieldtype catid add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.fieldtype.category) type alias was removed from the #__contentitem_tag_map table')); } @@ -1739,7 +1739,7 @@ class com_componentbuilderInstallerScript $fieldtype_catid_done = $db->execute(); if ($fieldtype_catid_done) { - // If succesfully remove Fieldtype catid add queued success message. + // If successfully removed Fieldtype catid add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.fieldtype.category) type alias was removed from the #__ucm_content table')); } @@ -1795,7 +1795,7 @@ class com_componentbuilderInstallerScript $language_translation_done = $db->execute(); if ($language_translation_done) { - // If succesfully remove Language_translation add queued success message. + // If successfully remove Language_translation add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.language_translation) type alias was removed from the #__content_type table')); } @@ -1810,7 +1810,7 @@ class com_componentbuilderInstallerScript $language_translation_done = $db->execute(); if ($language_translation_done) { - // If succesfully remove Language_translation add queued success message. + // If successfully remove Language_translation add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.language_translation) type alias was removed from the #__contentitem_tag_map table')); } @@ -1825,7 +1825,7 @@ class com_componentbuilderInstallerScript $language_translation_done = $db->execute(); if ($language_translation_done) { - // If succesfully remove Language_translation add queued success message. + // If successfully removed Language_translation add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.language_translation) type alias was removed from the #__ucm_content table')); } @@ -1881,7 +1881,7 @@ class com_componentbuilderInstallerScript $language_done = $db->execute(); if ($language_done) { - // If succesfully remove Language add queued success message. + // If successfully remove Language add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.language) type alias was removed from the #__content_type table')); } @@ -1896,7 +1896,7 @@ class com_componentbuilderInstallerScript $language_done = $db->execute(); if ($language_done) { - // If succesfully remove Language add queued success message. + // If successfully remove Language add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.language) type alias was removed from the #__contentitem_tag_map table')); } @@ -1911,7 +1911,7 @@ class com_componentbuilderInstallerScript $language_done = $db->execute(); if ($language_done) { - // If succesfully remove Language add queued success message. + // If successfully removed Language add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.language) type alias was removed from the #__ucm_content table')); } @@ -1967,7 +1967,7 @@ class com_componentbuilderInstallerScript $server_done = $db->execute(); if ($server_done) { - // If succesfully remove Server add queued success message. + // If successfully remove Server add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.server) type alias was removed from the #__content_type table')); } @@ -1982,7 +1982,7 @@ class com_componentbuilderInstallerScript $server_done = $db->execute(); if ($server_done) { - // If succesfully remove Server add queued success message. + // If successfully remove Server add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.server) type alias was removed from the #__contentitem_tag_map table')); } @@ -1997,7 +1997,7 @@ class com_componentbuilderInstallerScript $server_done = $db->execute(); if ($server_done) { - // If succesfully remove Server add queued success message. + // If successfully removed Server add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.server) type alias was removed from the #__ucm_content table')); } @@ -2053,7 +2053,7 @@ class com_componentbuilderInstallerScript $help_document_done = $db->execute(); if ($help_document_done) { - // If succesfully remove Help_document add queued success message. + // If successfully remove Help_document add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.help_document) type alias was removed from the #__content_type table')); } @@ -2068,7 +2068,7 @@ class com_componentbuilderInstallerScript $help_document_done = $db->execute(); if ($help_document_done) { - // If succesfully remove Help_document add queued success message. + // If successfully remove Help_document add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.help_document) type alias was removed from the #__contentitem_tag_map table')); } @@ -2083,7 +2083,7 @@ class com_componentbuilderInstallerScript $help_document_done = $db->execute(); if ($help_document_done) { - // If succesfully remove Help_document add queued success message. + // If successfully removed Help_document add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.help_document) type alias was removed from the #__ucm_content table')); } @@ -2139,7 +2139,7 @@ class com_componentbuilderInstallerScript $admin_fields_done = $db->execute(); if ($admin_fields_done) { - // If succesfully remove Admin_fields add queued success message. + // If successfully remove Admin_fields add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.admin_fields) type alias was removed from the #__content_type table')); } @@ -2154,7 +2154,7 @@ class com_componentbuilderInstallerScript $admin_fields_done = $db->execute(); if ($admin_fields_done) { - // If succesfully remove Admin_fields add queued success message. + // If successfully remove Admin_fields add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.admin_fields) type alias was removed from the #__contentitem_tag_map table')); } @@ -2169,7 +2169,7 @@ class com_componentbuilderInstallerScript $admin_fields_done = $db->execute(); if ($admin_fields_done) { - // If succesfully remove Admin_fields add queued success message. + // If successfully removed Admin_fields add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.admin_fields) type alias was removed from the #__ucm_content table')); } @@ -2225,7 +2225,7 @@ class com_componentbuilderInstallerScript $admin_fields_conditions_done = $db->execute(); if ($admin_fields_conditions_done) { - // If succesfully remove Admin_fields_conditions add queued success message. + // If successfully remove Admin_fields_conditions add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.admin_fields_conditions) type alias was removed from the #__content_type table')); } @@ -2240,7 +2240,7 @@ class com_componentbuilderInstallerScript $admin_fields_conditions_done = $db->execute(); if ($admin_fields_conditions_done) { - // If succesfully remove Admin_fields_conditions add queued success message. + // If successfully remove Admin_fields_conditions add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.admin_fields_conditions) type alias was removed from the #__contentitem_tag_map table')); } @@ -2255,7 +2255,7 @@ class com_componentbuilderInstallerScript $admin_fields_conditions_done = $db->execute(); if ($admin_fields_conditions_done) { - // If succesfully remove Admin_fields_conditions add queued success message. + // If successfully removed Admin_fields_conditions add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.admin_fields_conditions) type alias was removed from the #__ucm_content table')); } @@ -2311,7 +2311,7 @@ class com_componentbuilderInstallerScript $admin_fields_relations_done = $db->execute(); if ($admin_fields_relations_done) { - // If succesfully remove Admin_fields_relations add queued success message. + // If successfully remove Admin_fields_relations add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.admin_fields_relations) type alias was removed from the #__content_type table')); } @@ -2326,7 +2326,7 @@ class com_componentbuilderInstallerScript $admin_fields_relations_done = $db->execute(); if ($admin_fields_relations_done) { - // If succesfully remove Admin_fields_relations add queued success message. + // If successfully remove Admin_fields_relations add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.admin_fields_relations) type alias was removed from the #__contentitem_tag_map table')); } @@ -2341,7 +2341,7 @@ class com_componentbuilderInstallerScript $admin_fields_relations_done = $db->execute(); if ($admin_fields_relations_done) { - // If succesfully remove Admin_fields_relations add queued success message. + // If successfully removed Admin_fields_relations add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.admin_fields_relations) type alias was removed from the #__ucm_content table')); } @@ -2397,7 +2397,7 @@ class com_componentbuilderInstallerScript $admin_custom_tabs_done = $db->execute(); if ($admin_custom_tabs_done) { - // If succesfully remove Admin_custom_tabs add queued success message. + // If successfully remove Admin_custom_tabs add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.admin_custom_tabs) type alias was removed from the #__content_type table')); } @@ -2412,7 +2412,7 @@ class com_componentbuilderInstallerScript $admin_custom_tabs_done = $db->execute(); if ($admin_custom_tabs_done) { - // If succesfully remove Admin_custom_tabs add queued success message. + // If successfully remove Admin_custom_tabs add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.admin_custom_tabs) type alias was removed from the #__contentitem_tag_map table')); } @@ -2427,7 +2427,7 @@ class com_componentbuilderInstallerScript $admin_custom_tabs_done = $db->execute(); if ($admin_custom_tabs_done) { - // If succesfully remove Admin_custom_tabs add queued success message. + // If successfully removed Admin_custom_tabs add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.admin_custom_tabs) type alias was removed from the #__ucm_content table')); } @@ -2483,7 +2483,7 @@ class com_componentbuilderInstallerScript $component_admin_views_done = $db->execute(); if ($component_admin_views_done) { - // If succesfully remove Component_admin_views add queued success message. + // If successfully remove Component_admin_views add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_admin_views) type alias was removed from the #__content_type table')); } @@ -2498,7 +2498,7 @@ class com_componentbuilderInstallerScript $component_admin_views_done = $db->execute(); if ($component_admin_views_done) { - // If succesfully remove Component_admin_views add queued success message. + // If successfully remove Component_admin_views add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_admin_views) type alias was removed from the #__contentitem_tag_map table')); } @@ -2513,7 +2513,7 @@ class com_componentbuilderInstallerScript $component_admin_views_done = $db->execute(); if ($component_admin_views_done) { - // If succesfully remove Component_admin_views add queued success message. + // If successfully removed Component_admin_views add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_admin_views) type alias was removed from the #__ucm_content table')); } @@ -2569,7 +2569,7 @@ class com_componentbuilderInstallerScript $component_site_views_done = $db->execute(); if ($component_site_views_done) { - // If succesfully remove Component_site_views add queued success message. + // If successfully remove Component_site_views add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_site_views) type alias was removed from the #__content_type table')); } @@ -2584,7 +2584,7 @@ class com_componentbuilderInstallerScript $component_site_views_done = $db->execute(); if ($component_site_views_done) { - // If succesfully remove Component_site_views add queued success message. + // If successfully remove Component_site_views add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_site_views) type alias was removed from the #__contentitem_tag_map table')); } @@ -2599,7 +2599,7 @@ class com_componentbuilderInstallerScript $component_site_views_done = $db->execute(); if ($component_site_views_done) { - // If succesfully remove Component_site_views add queued success message. + // If successfully removed Component_site_views add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_site_views) type alias was removed from the #__ucm_content table')); } @@ -2655,7 +2655,7 @@ class com_componentbuilderInstallerScript $component_custom_admin_views_done = $db->execute(); if ($component_custom_admin_views_done) { - // If succesfully remove Component_custom_admin_views add queued success message. + // If successfully remove Component_custom_admin_views add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_custom_admin_views) type alias was removed from the #__content_type table')); } @@ -2670,7 +2670,7 @@ class com_componentbuilderInstallerScript $component_custom_admin_views_done = $db->execute(); if ($component_custom_admin_views_done) { - // If succesfully remove Component_custom_admin_views add queued success message. + // If successfully remove Component_custom_admin_views add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_custom_admin_views) type alias was removed from the #__contentitem_tag_map table')); } @@ -2685,7 +2685,7 @@ class com_componentbuilderInstallerScript $component_custom_admin_views_done = $db->execute(); if ($component_custom_admin_views_done) { - // If succesfully remove Component_custom_admin_views add queued success message. + // If successfully removed Component_custom_admin_views add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_custom_admin_views) type alias was removed from the #__ucm_content table')); } @@ -2741,7 +2741,7 @@ class com_componentbuilderInstallerScript $component_updates_done = $db->execute(); if ($component_updates_done) { - // If succesfully remove Component_updates add queued success message. + // If successfully remove Component_updates add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_updates) type alias was removed from the #__content_type table')); } @@ -2756,7 +2756,7 @@ class com_componentbuilderInstallerScript $component_updates_done = $db->execute(); if ($component_updates_done) { - // If succesfully remove Component_updates add queued success message. + // If successfully remove Component_updates add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_updates) type alias was removed from the #__contentitem_tag_map table')); } @@ -2771,7 +2771,7 @@ class com_componentbuilderInstallerScript $component_updates_done = $db->execute(); if ($component_updates_done) { - // If succesfully remove Component_updates add queued success message. + // If successfully removed Component_updates add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_updates) type alias was removed from the #__ucm_content table')); } @@ -2827,7 +2827,7 @@ class com_componentbuilderInstallerScript $component_mysql_tweaks_done = $db->execute(); if ($component_mysql_tweaks_done) { - // If succesfully remove Component_mysql_tweaks add queued success message. + // If successfully remove Component_mysql_tweaks add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_mysql_tweaks) type alias was removed from the #__content_type table')); } @@ -2842,7 +2842,7 @@ class com_componentbuilderInstallerScript $component_mysql_tweaks_done = $db->execute(); if ($component_mysql_tweaks_done) { - // If succesfully remove Component_mysql_tweaks add queued success message. + // If successfully remove Component_mysql_tweaks add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_mysql_tweaks) type alias was removed from the #__contentitem_tag_map table')); } @@ -2857,7 +2857,7 @@ class com_componentbuilderInstallerScript $component_mysql_tweaks_done = $db->execute(); if ($component_mysql_tweaks_done) { - // If succesfully remove Component_mysql_tweaks add queued success message. + // If successfully removed Component_mysql_tweaks add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_mysql_tweaks) type alias was removed from the #__ucm_content table')); } @@ -2913,7 +2913,7 @@ class com_componentbuilderInstallerScript $component_custom_admin_menus_done = $db->execute(); if ($component_custom_admin_menus_done) { - // If succesfully remove Component_custom_admin_menus add queued success message. + // If successfully remove Component_custom_admin_menus add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_custom_admin_menus) type alias was removed from the #__content_type table')); } @@ -2928,7 +2928,7 @@ class com_componentbuilderInstallerScript $component_custom_admin_menus_done = $db->execute(); if ($component_custom_admin_menus_done) { - // If succesfully remove Component_custom_admin_menus add queued success message. + // If successfully remove Component_custom_admin_menus add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_custom_admin_menus) type alias was removed from the #__contentitem_tag_map table')); } @@ -2943,7 +2943,7 @@ class com_componentbuilderInstallerScript $component_custom_admin_menus_done = $db->execute(); if ($component_custom_admin_menus_done) { - // If succesfully remove Component_custom_admin_menus add queued success message. + // If successfully removed Component_custom_admin_menus add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_custom_admin_menus) type alias was removed from the #__ucm_content table')); } @@ -2999,7 +2999,7 @@ class com_componentbuilderInstallerScript $component_config_done = $db->execute(); if ($component_config_done) { - // If succesfully remove Component_config add queued success message. + // If successfully remove Component_config add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_config) type alias was removed from the #__content_type table')); } @@ -3014,7 +3014,7 @@ class com_componentbuilderInstallerScript $component_config_done = $db->execute(); if ($component_config_done) { - // If succesfully remove Component_config add queued success message. + // If successfully remove Component_config add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_config) type alias was removed from the #__contentitem_tag_map table')); } @@ -3029,7 +3029,7 @@ class com_componentbuilderInstallerScript $component_config_done = $db->execute(); if ($component_config_done) { - // If succesfully remove Component_config add queued success message. + // If successfully removed Component_config add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_config) type alias was removed from the #__ucm_content table')); } @@ -3085,7 +3085,7 @@ class com_componentbuilderInstallerScript $component_dashboard_done = $db->execute(); if ($component_dashboard_done) { - // If succesfully remove Component_dashboard add queued success message. + // If successfully remove Component_dashboard add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_dashboard) type alias was removed from the #__content_type table')); } @@ -3100,7 +3100,7 @@ class com_componentbuilderInstallerScript $component_dashboard_done = $db->execute(); if ($component_dashboard_done) { - // If succesfully remove Component_dashboard add queued success message. + // If successfully remove Component_dashboard add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_dashboard) type alias was removed from the #__contentitem_tag_map table')); } @@ -3115,7 +3115,7 @@ class com_componentbuilderInstallerScript $component_dashboard_done = $db->execute(); if ($component_dashboard_done) { - // If succesfully remove Component_dashboard add queued success message. + // If successfully removed Component_dashboard add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_dashboard) type alias was removed from the #__ucm_content table')); } @@ -3171,7 +3171,7 @@ class com_componentbuilderInstallerScript $component_files_folders_done = $db->execute(); if ($component_files_folders_done) { - // If succesfully remove Component_files_folders add queued success message. + // If successfully remove Component_files_folders add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_files_folders) type alias was removed from the #__content_type table')); } @@ -3186,7 +3186,7 @@ class com_componentbuilderInstallerScript $component_files_folders_done = $db->execute(); if ($component_files_folders_done) { - // If succesfully remove Component_files_folders add queued success message. + // If successfully remove Component_files_folders add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_files_folders) type alias was removed from the #__contentitem_tag_map table')); } @@ -3201,7 +3201,7 @@ class com_componentbuilderInstallerScript $component_files_folders_done = $db->execute(); if ($component_files_folders_done) { - // If succesfully remove Component_files_folders add queued success message. + // If successfully removed Component_files_folders add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_files_folders) type alias was removed from the #__ucm_content table')); } @@ -3257,7 +3257,7 @@ class com_componentbuilderInstallerScript $component_placeholders_done = $db->execute(); if ($component_placeholders_done) { - // If succesfully remove Component_placeholders add queued success message. + // If successfully remove Component_placeholders add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_placeholders) type alias was removed from the #__content_type table')); } @@ -3272,7 +3272,7 @@ class com_componentbuilderInstallerScript $component_placeholders_done = $db->execute(); if ($component_placeholders_done) { - // If succesfully remove Component_placeholders add queued success message. + // If successfully remove Component_placeholders add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_placeholders) type alias was removed from the #__contentitem_tag_map table')); } @@ -3287,7 +3287,7 @@ class com_componentbuilderInstallerScript $component_placeholders_done = $db->execute(); if ($component_placeholders_done) { - // If succesfully remove Component_placeholders add queued success message. + // If successfully removed Component_placeholders add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_placeholders) type alias was removed from the #__ucm_content table')); } @@ -3343,7 +3343,7 @@ class com_componentbuilderInstallerScript $component_plugins_done = $db->execute(); if ($component_plugins_done) { - // If succesfully remove Component_plugins add queued success message. + // If successfully remove Component_plugins add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_plugins) type alias was removed from the #__content_type table')); } @@ -3358,7 +3358,7 @@ class com_componentbuilderInstallerScript $component_plugins_done = $db->execute(); if ($component_plugins_done) { - // If succesfully remove Component_plugins add queued success message. + // If successfully remove Component_plugins add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_plugins) type alias was removed from the #__contentitem_tag_map table')); } @@ -3373,7 +3373,7 @@ class com_componentbuilderInstallerScript $component_plugins_done = $db->execute(); if ($component_plugins_done) { - // If succesfully remove Component_plugins add queued success message. + // If successfully removed Component_plugins add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_plugins) type alias was removed from the #__ucm_content table')); } @@ -3429,7 +3429,7 @@ class com_componentbuilderInstallerScript $component_modules_done = $db->execute(); if ($component_modules_done) { - // If succesfully remove Component_modules add queued success message. + // If successfully remove Component_modules add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_modules) type alias was removed from the #__content_type table')); } @@ -3444,7 +3444,7 @@ class com_componentbuilderInstallerScript $component_modules_done = $db->execute(); if ($component_modules_done) { - // If succesfully remove Component_modules add queued success message. + // If successfully remove Component_modules add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_modules) type alias was removed from the #__contentitem_tag_map table')); } @@ -3459,7 +3459,7 @@ class com_componentbuilderInstallerScript $component_modules_done = $db->execute(); if ($component_modules_done) { - // If succesfully remove Component_modules add queued success message. + // If successfully removed Component_modules add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.component_modules) type alias was removed from the #__ucm_content table')); } @@ -3515,7 +3515,7 @@ class com_componentbuilderInstallerScript $snippet_type_done = $db->execute(); if ($snippet_type_done) { - // If succesfully remove Snippet_type add queued success message. + // If successfully remove Snippet_type add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.snippet_type) type alias was removed from the #__content_type table')); } @@ -3530,7 +3530,7 @@ class com_componentbuilderInstallerScript $snippet_type_done = $db->execute(); if ($snippet_type_done) { - // If succesfully remove Snippet_type add queued success message. + // If successfully remove Snippet_type add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.snippet_type) type alias was removed from the #__contentitem_tag_map table')); } @@ -3545,7 +3545,7 @@ class com_componentbuilderInstallerScript $snippet_type_done = $db->execute(); if ($snippet_type_done) { - // If succesfully remove Snippet_type add queued success message. + // If successfully removed Snippet_type add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.snippet_type) type alias was removed from the #__ucm_content table')); } @@ -3601,7 +3601,7 @@ class com_componentbuilderInstallerScript $library_config_done = $db->execute(); if ($library_config_done) { - // If succesfully remove Library_config add queued success message. + // If successfully remove Library_config add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.library_config) type alias was removed from the #__content_type table')); } @@ -3616,7 +3616,7 @@ class com_componentbuilderInstallerScript $library_config_done = $db->execute(); if ($library_config_done) { - // If succesfully remove Library_config add queued success message. + // If successfully remove Library_config add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.library_config) type alias was removed from the #__contentitem_tag_map table')); } @@ -3631,7 +3631,7 @@ class com_componentbuilderInstallerScript $library_config_done = $db->execute(); if ($library_config_done) { - // If succesfully remove Library_config add queued success message. + // If successfully removed Library_config add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.library_config) type alias was removed from the #__ucm_content table')); } @@ -3687,7 +3687,7 @@ class com_componentbuilderInstallerScript $library_files_folders_urls_done = $db->execute(); if ($library_files_folders_urls_done) { - // If succesfully remove Library_files_folders_urls add queued success message. + // If successfully remove Library_files_folders_urls add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.library_files_folders_urls) type alias was removed from the #__content_type table')); } @@ -3702,7 +3702,7 @@ class com_componentbuilderInstallerScript $library_files_folders_urls_done = $db->execute(); if ($library_files_folders_urls_done) { - // If succesfully remove Library_files_folders_urls add queued success message. + // If successfully remove Library_files_folders_urls add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.library_files_folders_urls) type alias was removed from the #__contentitem_tag_map table')); } @@ -3717,7 +3717,7 @@ class com_componentbuilderInstallerScript $library_files_folders_urls_done = $db->execute(); if ($library_files_folders_urls_done) { - // If succesfully remove Library_files_folders_urls add queued success message. + // If successfully removed Library_files_folders_urls add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.library_files_folders_urls) type alias was removed from the #__ucm_content table')); } @@ -3773,7 +3773,7 @@ class com_componentbuilderInstallerScript $class_extends_done = $db->execute(); if ($class_extends_done) { - // If succesfully remove Class_extends add queued success message. + // If successfully remove Class_extends add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.class_extends) type alias was removed from the #__content_type table')); } @@ -3788,7 +3788,7 @@ class com_componentbuilderInstallerScript $class_extends_done = $db->execute(); if ($class_extends_done) { - // If succesfully remove Class_extends add queued success message. + // If successfully remove Class_extends add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.class_extends) type alias was removed from the #__contentitem_tag_map table')); } @@ -3803,7 +3803,7 @@ class com_componentbuilderInstallerScript $class_extends_done = $db->execute(); if ($class_extends_done) { - // If succesfully remove Class_extends add queued success message. + // If successfully removed Class_extends add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.class_extends) type alias was removed from the #__ucm_content table')); } @@ -3859,7 +3859,7 @@ class com_componentbuilderInstallerScript $joomla_module_updates_done = $db->execute(); if ($joomla_module_updates_done) { - // If succesfully remove Joomla_module_updates add queued success message. + // If successfully remove Joomla_module_updates add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_module_updates) type alias was removed from the #__content_type table')); } @@ -3874,7 +3874,7 @@ class com_componentbuilderInstallerScript $joomla_module_updates_done = $db->execute(); if ($joomla_module_updates_done) { - // If succesfully remove Joomla_module_updates add queued success message. + // If successfully remove Joomla_module_updates add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_module_updates) type alias was removed from the #__contentitem_tag_map table')); } @@ -3889,7 +3889,7 @@ class com_componentbuilderInstallerScript $joomla_module_updates_done = $db->execute(); if ($joomla_module_updates_done) { - // If succesfully remove Joomla_module_updates add queued success message. + // If successfully removed Joomla_module_updates add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_module_updates) type alias was removed from the #__ucm_content table')); } @@ -3945,7 +3945,7 @@ class com_componentbuilderInstallerScript $joomla_module_files_folders_urls_done = $db->execute(); if ($joomla_module_files_folders_urls_done) { - // If succesfully remove Joomla_module_files_folders_urls add queued success message. + // If successfully remove Joomla_module_files_folders_urls add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_module_files_folders_urls) type alias was removed from the #__content_type table')); } @@ -3960,7 +3960,7 @@ class com_componentbuilderInstallerScript $joomla_module_files_folders_urls_done = $db->execute(); if ($joomla_module_files_folders_urls_done) { - // If succesfully remove Joomla_module_files_folders_urls add queued success message. + // If successfully remove Joomla_module_files_folders_urls add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_module_files_folders_urls) type alias was removed from the #__contentitem_tag_map table')); } @@ -3975,7 +3975,7 @@ class com_componentbuilderInstallerScript $joomla_module_files_folders_urls_done = $db->execute(); if ($joomla_module_files_folders_urls_done) { - // If succesfully remove Joomla_module_files_folders_urls add queued success message. + // If successfully removed Joomla_module_files_folders_urls add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_module_files_folders_urls) type alias was removed from the #__ucm_content table')); } @@ -4031,7 +4031,7 @@ class com_componentbuilderInstallerScript $joomla_plugin_group_done = $db->execute(); if ($joomla_plugin_group_done) { - // If succesfully remove Joomla_plugin_group add queued success message. + // If successfully remove Joomla_plugin_group add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_plugin_group) type alias was removed from the #__content_type table')); } @@ -4046,7 +4046,7 @@ class com_componentbuilderInstallerScript $joomla_plugin_group_done = $db->execute(); if ($joomla_plugin_group_done) { - // If succesfully remove Joomla_plugin_group add queued success message. + // If successfully remove Joomla_plugin_group add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_plugin_group) type alias was removed from the #__contentitem_tag_map table')); } @@ -4061,7 +4061,7 @@ class com_componentbuilderInstallerScript $joomla_plugin_group_done = $db->execute(); if ($joomla_plugin_group_done) { - // If succesfully remove Joomla_plugin_group add queued success message. + // If successfully removed Joomla_plugin_group add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_plugin_group) type alias was removed from the #__ucm_content table')); } @@ -4117,7 +4117,7 @@ class com_componentbuilderInstallerScript $joomla_plugin_updates_done = $db->execute(); if ($joomla_plugin_updates_done) { - // If succesfully remove Joomla_plugin_updates add queued success message. + // If successfully remove Joomla_plugin_updates add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_plugin_updates) type alias was removed from the #__content_type table')); } @@ -4132,7 +4132,7 @@ class com_componentbuilderInstallerScript $joomla_plugin_updates_done = $db->execute(); if ($joomla_plugin_updates_done) { - // If succesfully remove Joomla_plugin_updates add queued success message. + // If successfully remove Joomla_plugin_updates add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_plugin_updates) type alias was removed from the #__contentitem_tag_map table')); } @@ -4147,7 +4147,7 @@ class com_componentbuilderInstallerScript $joomla_plugin_updates_done = $db->execute(); if ($joomla_plugin_updates_done) { - // If succesfully remove Joomla_plugin_updates add queued success message. + // If successfully removed Joomla_plugin_updates add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_plugin_updates) type alias was removed from the #__ucm_content table')); } @@ -4203,7 +4203,7 @@ class com_componentbuilderInstallerScript $joomla_plugin_files_folders_urls_done = $db->execute(); if ($joomla_plugin_files_folders_urls_done) { - // If succesfully remove Joomla_plugin_files_folders_urls add queued success message. + // If successfully remove Joomla_plugin_files_folders_urls add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_plugin_files_folders_urls) type alias was removed from the #__content_type table')); } @@ -4218,7 +4218,7 @@ class com_componentbuilderInstallerScript $joomla_plugin_files_folders_urls_done = $db->execute(); if ($joomla_plugin_files_folders_urls_done) { - // If succesfully remove Joomla_plugin_files_folders_urls add queued success message. + // If successfully remove Joomla_plugin_files_folders_urls add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_plugin_files_folders_urls) type alias was removed from the #__contentitem_tag_map table')); } @@ -4233,7 +4233,7 @@ class com_componentbuilderInstallerScript $joomla_plugin_files_folders_urls_done = $db->execute(); if ($joomla_plugin_files_folders_urls_done) { - // If succesfully remove Joomla_plugin_files_folders_urls add queued success message. + // If successfully removed Joomla_plugin_files_folders_urls add queued success message. $app->enqueueMessage(JText::_('The (com_componentbuilder.joomla_plugin_files_folders_urls) type alias was removed from the #__ucm_content table')); } @@ -4277,10 +4277,11 @@ class com_componentbuilderInstallerScript $joomla_plugin_files_folders_urls_done = $db->execute(); if ($joomla_plugin_files_folders_urls_done) { - // If succesfully remove componentbuilder add queued success message. + // If successfully removed componentbuilder add queued success message. $app->enqueueMessage(JText::_('All related items was removed from the #__assets table')); } + // Check for the biggest rules item in the database at this point // Set db if not set already. if (!isset($db)) @@ -6003,9 +6004,9 @@ class com_componentbuilderInstallerScript $joomla_component->type_title = 'Componentbuilder Joomla_component'; $joomla_component->type_alias = 'com_componentbuilder.joomla_component'; $joomla_component->table = '{"special": {"dbtable": "#__componentbuilder_joomla_component","key": "id","type": "Joomla_component","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_helper_both","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","short_description":"short_description","companyname":"companyname","add_php_helper_admin":"add_php_helper_admin","addfootable":"addfootable","crowdin_username":"crowdin_username","update_server_url":"update_server_url","add_sql":"add_sql","add_php_preflight_update":"add_php_preflight_update","add_css_site":"add_css_site","mvc_versiondate":"mvc_versiondate","remove_line_breaks":"remove_line_breaks","add_placeholders":"add_placeholders","add_php_helper_site":"add_php_helper_site","add_javascript":"add_javascript","description":"description","dashboard":"dashboard","author":"author","add_php_postflight_update":"add_php_postflight_update","email":"email","addreadme":"addreadme","website":"website","debug_linenr":"debug_linenr","add_license":"add_license","buildcompsql":"buildcompsql","license_type":"license_type","add_php_helper_both":"add_php_helper_both","add_admin_event":"add_admin_event","whmcs_key":"whmcs_key","add_site_event":"add_site_event","whmcs_url":"whmcs_url","add_css_admin":"add_css_admin","whmcs_buy_link":"whmcs_buy_link","dashboard_type":"dashboard_type","license":"license","add_php_preflight_install":"add_php_preflight_install","bom":"bom","add_php_postflight_install":"add_php_postflight_install","image":"image","add_php_method_uninstall":"add_php_method_uninstall","copyright":"copyright","add_sql_uninstall":"add_sql_uninstall","translation_tool":"translation_tool","component_version":"component_version","add_sales_server":"add_sales_server","not_required":"not_required","crowdin_project_identifier":"crowdin_project_identifier","add_email_helper":"add_email_helper","php_helper_both":"php_helper_both","php_helper_admin":"php_helper_admin","php_admin_event":"php_admin_event","php_helper_site":"php_helper_site","php_site_event":"php_site_event","add_menu_prefix":"add_menu_prefix","javascript":"javascript","menu_prefix":"menu_prefix","css_admin":"css_admin","css_site":"css_site","toignore":"toignore","php_preflight_install":"php_preflight_install","php_preflight_update":"php_preflight_update","export_key":"export_key","php_postflight_install":"php_postflight_install","joomla_source_link":"joomla_source_link","php_postflight_update":"php_postflight_update","export_buy_link":"export_buy_link","php_method_uninstall":"php_method_uninstall","sql":"sql","sql_uninstall":"sql_uninstall","readme":"readme","emptycontributors":"emptycontributors","add_update_server":"add_update_server","number":"number","update_server_target":"update_server_target","update_server":"update_server","sales_server":"sales_server","crowdin_project_api_key":"crowdin_project_api_key","crowdin_account_api_key":"crowdin_account_api_key","creatuserhelper":"creatuserhelper","buildcomp":"buildcomp","adduikit":"adduikit","guid":"guid","name":"name"}}'; + $joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_site_event","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","short_description":"short_description","companyname":"companyname","php_site_event":"php_site_event","css_admin":"css_admin","php_helper_both":"php_helper_both","php_admin_event":"php_admin_event","sql_uninstall":"sql_uninstall","remove_line_breaks":"remove_line_breaks","description":"description","php_postflight_install":"php_postflight_install","debug_linenr":"debug_linenr","mvc_versiondate":"mvc_versiondate","php_preflight_install":"php_preflight_install","crowdin_project_identifier":"crowdin_project_identifier","php_method_uninstall":"php_method_uninstall","component_version":"component_version","add_placeholders":"add_placeholders","add_sales_server":"add_sales_server","author":"author","email":"email","add_email_helper":"add_email_helper","website":"website","php_helper_admin":"php_helper_admin","add_license":"add_license","php_helper_site":"php_helper_site","license_type":"license_type","javascript":"javascript","css_site":"css_site","whmcs_key":"whmcs_key","whmcs_url":"whmcs_url","php_preflight_update":"php_preflight_update","whmcs_buy_link":"whmcs_buy_link","php_postflight_update":"php_postflight_update","license":"license","sql":"sql","bom":"bom","addreadme":"addreadme","image":"image","update_server_url":"update_server_url","copyright":"copyright","not_required":"not_required","translation_tool":"translation_tool","crowdin_username":"crowdin_username","buildcompsql":"buildcompsql","addfootable":"addfootable","add_php_helper_both":"add_php_helper_both","add_php_helper_admin":"add_php_helper_admin","add_admin_event":"add_admin_event","add_php_helper_site":"add_php_helper_site","add_site_event":"add_site_event","add_javascript":"add_javascript","add_menu_prefix":"add_menu_prefix","add_css_admin":"add_css_admin","menu_prefix":"menu_prefix","add_css_site":"add_css_site","dashboard_type":"dashboard_type","dashboard":"dashboard","toignore":"toignore","add_php_preflight_install":"add_php_preflight_install","add_php_preflight_update":"add_php_preflight_update","add_php_postflight_install":"add_php_postflight_install","export_key":"export_key","add_php_postflight_update":"add_php_postflight_update","joomla_source_link":"joomla_source_link","add_php_method_uninstall":"add_php_method_uninstall","export_buy_link":"export_buy_link","add_sql":"add_sql","add_sql_uninstall":"add_sql_uninstall","assets_table_fix":"assets_table_fix","readme":"readme","emptycontributors":"emptycontributors","add_update_server":"add_update_server","number":"number","update_server_target":"update_server_target","update_server":"update_server","sales_server":"sales_server","crowdin_project_api_key":"crowdin_project_api_key","crowdin_account_api_key":"crowdin_account_api_key","creatuserhelper":"creatuserhelper","buildcomp":"buildcomp","adduikit":"adduikit","guid":"guid","name":"name"}}'; $joomla_component->router = 'ComponentbuilderHelperRoute::getJoomla_componentRoute'; - $joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_helper_admin","addfootable","add_sql","add_php_preflight_update","add_css_site","mvc_versiondate","remove_line_breaks","add_placeholders","add_php_helper_site","add_javascript","add_php_postflight_update","addreadme","debug_linenr","add_license","license_type","add_php_helper_both","add_admin_event","add_site_event","add_css_admin","dashboard_type","add_php_preflight_install","add_php_postflight_install","add_php_method_uninstall","add_sql_uninstall","translation_tool","add_sales_server","add_email_helper","emptycontributors","add_update_server","number","update_server_target","update_server","sales_server","creatuserhelper","buildcomp","adduikit"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"}]}'; + $joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","remove_line_breaks","debug_linenr","mvc_versiondate","add_placeholders","add_sales_server","add_email_helper","add_license","license_type","addreadme","translation_tool","addfootable","add_php_helper_both","add_php_helper_admin","add_admin_event","add_php_helper_site","add_site_event","add_javascript","add_css_admin","add_css_site","dashboard_type","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_sql","add_sql_uninstall","assets_table_fix","emptycontributors","add_update_server","number","update_server_target","update_server","sales_server","creatuserhelper","buildcomp","adduikit"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $joomla_component_Inserted = $db->insertObject('#__content_types', $joomla_component); @@ -6591,7 +6592,7 @@ class com_componentbuilderInstallerScript $query = $db->getQuery(true); // Field to update. $fields = array( - $db->quoteName('params') . ' = ' . $db->quote('{"autorName":"Llewellyn van der Merwe","autorEmail":"llewellyn@joomlacomponentbuilder.com","subform_layouts":"default","editor":"none","manage_jcb_package_directories":"2","add_menu_prefix":"1","menu_prefix":"»","minify":"0","set_browser_storage":"1","storage_time_to_live":"global","language":"en-GB","percentagelanguageadd":"50","export_language_strings":"1","compiler_field_builder_type":"2","field_name_builder":"1","type_name_builder":"1","development_method":"1","expansion":"0","return_options_build":"2","cronjob_backup_type":"1","cronjob_backup_server":"0","backup_package_name":"JCB_Backup_[YEAR]_[MONTH]_[DAY]","export_license":"GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html","export_copyright":"Copyright (C) 2015. All Rights Reserved","check_in":"-1 day","save_history":"1","history_limit":"10","uikit_load":"1","uikit_min":"","uikit_style":""}'), + $db->quoteName('params') . ' = ' . $db->quote('{"autorName":"Llewellyn van der Merwe","autorEmail":"llewellyn@joomlacomponentbuilder.com","subform_layouts":"default","editor":"none","manage_jcb_package_directories":"2","set_browser_storage":"1","storage_time_to_live":"global","add_menu_prefix":"1","menu_prefix":"»","minify":"0","language":"en-GB","percentagelanguageadd":"50","export_language_strings":"1","assets_table_fix":"1","compiler_field_builder_type":"2","field_name_builder":"1","type_name_builder":"1","development_method":"1","expansion":"0","return_options_build":"2","cronjob_backup_type":"1","cronjob_backup_server":"0","backup_package_name":"JCB_Backup_[YEAR]_[MONTH]_[DAY]","export_license":"GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html","export_copyright":"Copyright (C) 2015. All Rights Reserved","check_in":"-1 day","save_history":"1","history_limit":"10","uikit_load":"1","uikit_min":"","uikit_style":""}'), ); // Condition. $conditions = array( @@ -7428,9 +7429,9 @@ class com_componentbuilderInstallerScript $joomla_component->type_title = 'Componentbuilder Joomla_component'; $joomla_component->type_alias = 'com_componentbuilder.joomla_component'; $joomla_component->table = '{"special": {"dbtable": "#__componentbuilder_joomla_component","key": "id","type": "Joomla_component","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_helper_both","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","short_description":"short_description","companyname":"companyname","add_php_helper_admin":"add_php_helper_admin","addfootable":"addfootable","crowdin_username":"crowdin_username","update_server_url":"update_server_url","add_sql":"add_sql","add_php_preflight_update":"add_php_preflight_update","add_css_site":"add_css_site","mvc_versiondate":"mvc_versiondate","remove_line_breaks":"remove_line_breaks","add_placeholders":"add_placeholders","add_php_helper_site":"add_php_helper_site","add_javascript":"add_javascript","description":"description","dashboard":"dashboard","author":"author","add_php_postflight_update":"add_php_postflight_update","email":"email","addreadme":"addreadme","website":"website","debug_linenr":"debug_linenr","add_license":"add_license","buildcompsql":"buildcompsql","license_type":"license_type","add_php_helper_both":"add_php_helper_both","add_admin_event":"add_admin_event","whmcs_key":"whmcs_key","add_site_event":"add_site_event","whmcs_url":"whmcs_url","add_css_admin":"add_css_admin","whmcs_buy_link":"whmcs_buy_link","dashboard_type":"dashboard_type","license":"license","add_php_preflight_install":"add_php_preflight_install","bom":"bom","add_php_postflight_install":"add_php_postflight_install","image":"image","add_php_method_uninstall":"add_php_method_uninstall","copyright":"copyright","add_sql_uninstall":"add_sql_uninstall","translation_tool":"translation_tool","component_version":"component_version","add_sales_server":"add_sales_server","not_required":"not_required","crowdin_project_identifier":"crowdin_project_identifier","add_email_helper":"add_email_helper","php_helper_both":"php_helper_both","php_helper_admin":"php_helper_admin","php_admin_event":"php_admin_event","php_helper_site":"php_helper_site","php_site_event":"php_site_event","add_menu_prefix":"add_menu_prefix","javascript":"javascript","menu_prefix":"menu_prefix","css_admin":"css_admin","css_site":"css_site","toignore":"toignore","php_preflight_install":"php_preflight_install","php_preflight_update":"php_preflight_update","export_key":"export_key","php_postflight_install":"php_postflight_install","joomla_source_link":"joomla_source_link","php_postflight_update":"php_postflight_update","export_buy_link":"export_buy_link","php_method_uninstall":"php_method_uninstall","sql":"sql","sql_uninstall":"sql_uninstall","readme":"readme","emptycontributors":"emptycontributors","add_update_server":"add_update_server","number":"number","update_server_target":"update_server_target","update_server":"update_server","sales_server":"sales_server","crowdin_project_api_key":"crowdin_project_api_key","crowdin_account_api_key":"crowdin_account_api_key","creatuserhelper":"creatuserhelper","buildcomp":"buildcomp","adduikit":"adduikit","guid":"guid","name":"name"}}'; + $joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_site_event","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","short_description":"short_description","companyname":"companyname","php_site_event":"php_site_event","css_admin":"css_admin","php_helper_both":"php_helper_both","php_admin_event":"php_admin_event","sql_uninstall":"sql_uninstall","remove_line_breaks":"remove_line_breaks","description":"description","php_postflight_install":"php_postflight_install","debug_linenr":"debug_linenr","mvc_versiondate":"mvc_versiondate","php_preflight_install":"php_preflight_install","crowdin_project_identifier":"crowdin_project_identifier","php_method_uninstall":"php_method_uninstall","component_version":"component_version","add_placeholders":"add_placeholders","add_sales_server":"add_sales_server","author":"author","email":"email","add_email_helper":"add_email_helper","website":"website","php_helper_admin":"php_helper_admin","add_license":"add_license","php_helper_site":"php_helper_site","license_type":"license_type","javascript":"javascript","css_site":"css_site","whmcs_key":"whmcs_key","whmcs_url":"whmcs_url","php_preflight_update":"php_preflight_update","whmcs_buy_link":"whmcs_buy_link","php_postflight_update":"php_postflight_update","license":"license","sql":"sql","bom":"bom","addreadme":"addreadme","image":"image","update_server_url":"update_server_url","copyright":"copyright","not_required":"not_required","translation_tool":"translation_tool","crowdin_username":"crowdin_username","buildcompsql":"buildcompsql","addfootable":"addfootable","add_php_helper_both":"add_php_helper_both","add_php_helper_admin":"add_php_helper_admin","add_admin_event":"add_admin_event","add_php_helper_site":"add_php_helper_site","add_site_event":"add_site_event","add_javascript":"add_javascript","add_menu_prefix":"add_menu_prefix","add_css_admin":"add_css_admin","menu_prefix":"menu_prefix","add_css_site":"add_css_site","dashboard_type":"dashboard_type","dashboard":"dashboard","toignore":"toignore","add_php_preflight_install":"add_php_preflight_install","add_php_preflight_update":"add_php_preflight_update","add_php_postflight_install":"add_php_postflight_install","export_key":"export_key","add_php_postflight_update":"add_php_postflight_update","joomla_source_link":"joomla_source_link","add_php_method_uninstall":"add_php_method_uninstall","export_buy_link":"export_buy_link","add_sql":"add_sql","add_sql_uninstall":"add_sql_uninstall","assets_table_fix":"assets_table_fix","readme":"readme","emptycontributors":"emptycontributors","add_update_server":"add_update_server","number":"number","update_server_target":"update_server_target","update_server":"update_server","sales_server":"sales_server","crowdin_project_api_key":"crowdin_project_api_key","crowdin_account_api_key":"crowdin_account_api_key","creatuserhelper":"creatuserhelper","buildcomp":"buildcomp","adduikit":"adduikit","guid":"guid","name":"name"}}'; $joomla_component->router = 'ComponentbuilderHelperRoute::getJoomla_componentRoute'; - $joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_helper_admin","addfootable","add_sql","add_php_preflight_update","add_css_site","mvc_versiondate","remove_line_breaks","add_placeholders","add_php_helper_site","add_javascript","add_php_postflight_update","addreadme","debug_linenr","add_license","license_type","add_php_helper_both","add_admin_event","add_site_event","add_css_admin","dashboard_type","add_php_preflight_install","add_php_postflight_install","add_php_method_uninstall","add_sql_uninstall","translation_tool","add_sales_server","add_email_helper","emptycontributors","add_update_server","number","update_server_target","update_server","sales_server","creatuserhelper","buildcomp","adduikit"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"}]}'; + $joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","remove_line_breaks","debug_linenr","mvc_versiondate","add_placeholders","add_sales_server","add_email_helper","add_license","license_type","addreadme","translation_tool","addfootable","add_php_helper_both","add_php_helper_admin","add_admin_event","add_php_helper_site","add_site_event","add_javascript","add_css_admin","add_css_site","dashboard_type","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","add_sql","add_sql_uninstall","assets_table_fix","emptycontributors","add_update_server","number","update_server_target","update_server","sales_server","creatuserhelper","buildcomp","adduikit"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"}]}'; // Check if joomla_component type is already in content_type DB. $joomla_component_id = null; @@ -9213,7 +9214,7 @@ class com_componentbuilderInstallerScript echo ' -

Upgrade to Version 2.12.1 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 2.12.2 Was Successful! Let us know if anything is not working as expected.

'; // Set db if not set already. if (!isset($db))