diff --git a/README.md b/README.md index 4f4af5ca4..f407ecda3 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,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 safe 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.8.2) 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.8.3) 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) @@ -125,13 +125,13 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo + *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*: 7th July, 2018 -+ *Version*: 2.8.2 ++ *Last Build*: 8th July, 2018 ++ *Version*: 2.8.3 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **186287** -+ *Field count*: **1058** -+ *File count*: **1238** ++ *Line count*: **186333** ++ *Field count*: **1059** ++ *File count*: **1239** + *Folder count*: **197** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/README.txt b/admin/README.txt index 4f4af5ca4..f407ecda3 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -9,7 +9,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 safe 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.8.2) 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.8.3) 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) @@ -125,13 +125,13 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo + *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*: 7th July, 2018 -+ *Version*: 2.8.2 ++ *Last Build*: 8th July, 2018 ++ *Version*: 2.8.3 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **186287** -+ *Field count*: **1058** -+ *File count*: **1238** ++ *Line count*: **186333** ++ *Field count*: **1059** ++ *File count*: **1239** + *Folder count*: **197** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/config.xml b/admin/config.xml index c9f56729e..f062d1ed7 100644 --- a/admin/config.xml +++ b/admin/config.xml @@ -1031,6 +1031,7 @@ required="false" filter="url" validated="url" + scheme="http,https" message="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_MESSAGE" hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_HINT" /> diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index 02a7f97bc..e141781a8 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -949,6 +949,35 @@ class Get // set the uikit switch $this->uikit = $component->adduikit; + // set whmcs links if needed + if (1 == $component->add_license && (!isset($component->whmcs_buy_link) || !ComponentbuilderHelper::checkString($component->whmcs_buy_link))) + { + // update with the whmcs url + if (isset($component->whmcs_url) && ComponentbuilderHelper::checkString($component->whmcs_url)) + { + $component->whmcs_buy_link = $component->whmcs_url; + } + // use the company website + elseif (isset($component->website) && ComponentbuilderHelper::checkString($component->website)) + { + $component->whmcs_buy_link = $component->website; + $component->whmcs_url = rtrim($component->website, '/').'/whmcs'; + } + // none set + else + { + $component->whmcs_buy_link = '#'; + $component->whmcs_url = '#'; + } + } + // since the license details are not set clear + else + { + $component->whmcs_key = ''; + $component->whmcs_buy_link = ''; + $component->whmcs_url = ''; + } + // set the footable switch if ($component->addfootable) { diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index c1ac790cb..9bf70f36d 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -234,12 +234,12 @@ class Interpretation extends Fields { if (!isset($this->fileContentStatic[$this->hhh . 'HELPER_SITE_LICENSE_LOCK' . $this->hhh])) { - $_VDM = '_' . ComponentbuilderHelper::safeString($this->uniquekey(10), 'U'); + $_WHMCS = '_' . ComponentbuilderHelper::safeString($this->uniquekey(10), 'U'); // add it to the system - $this->fileContentStatic[$this->hhh . 'HELPER_SITE_LICENSE_LOCK' . $this->hhh] = $this->setHelperLicenseLock($_VDM, 'site'); - $this->fileContentStatic[$this->hhh . 'HELPER_LICENSE_LOCK' . $this->hhh] = $this->setHelperLicenseLock($_VDM, 'admin'); - $this->fileContentStatic[$this->hhh . 'LICENSE_LOCKED_INT' . $this->hhh] = $this->setInitLicenseLock($_VDM); - $this->fileContentStatic[$this->hhh . 'LICENSE_LOCKED_DEFINED' . $this->hhh] = PHP_EOL . PHP_EOL . 'defined(\'' . $_VDM . '\') or die(JText:' . ':_(\'NIE_REG_NIE\'));'; + $this->fileContentStatic[$this->hhh . 'HELPER_SITE_LICENSE_LOCK' . $this->hhh] = $this->setHelperLicenseLock($_WHMCS, 'site'); + $this->fileContentStatic[$this->hhh . 'HELPER_LICENSE_LOCK' . $this->hhh] = $this->setHelperLicenseLock($_WHMCS, 'admin'); + $this->fileContentStatic[$this->hhh . 'LICENSE_LOCKED_INT' . $this->hhh] = $this->setInitLicenseLock($_WHMCS); + $this->fileContentStatic[$this->hhh . 'LICENSE_LOCKED_DEFINED' . $this->hhh] = PHP_EOL . PHP_EOL . 'defined(\'' . $_WHMCS . '\') or die(JText:' . ':_(\'NIE_REG_NIE\'));'; } } else @@ -328,12 +328,12 @@ class Interpretation extends Fields $bool[] = $this->_t(2) . "}"; $bool[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the global params"; $bool[] = $this->_t(2) . "\$params = JComponentHelper::getParams('com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "', true);"; - $bool[] = $this->_t(2) . "\$license_key = \$params->get('license_key', null);"; - $bool[] = $this->_t(2) . "if (\$license_key)"; + $bool[] = $this->_t(2) . "\$whmcs_key = \$params->get('whmcs_key', null);"; + $bool[] = $this->_t(2) . "if (\$whmcs_key)"; $bool[] = $this->_t(2) . "{"; $bool[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " load the file"; - $bool[] = $this->_t(3) . "JLoader::import( 'vdm', JPATH_ADMINISTRATOR .'/components/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "');"; - $bool[] = $this->_t(3) . "\$the = new VDM(\$license_key);"; + $bool[] = $this->_t(3) . "JLoader::import( 'whmcs', JPATH_ADMINISTRATOR .'/components/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "');"; + $bool[] = $this->_t(3) . "\$the = new WHMCS(\$whmcs_key);"; $bool[] = $this->_t(3) . "\$this->" . $globalbool . " = \$the->_is;"; $bool[] = $this->_t(3) . "return \$this->" . $globalbool . ";"; $bool[] = $this->_t(2) . "}"; @@ -346,12 +346,12 @@ class Interpretation extends Fields /** * set Helper License Lock * - * @param type $_VDM + * @param type $_WHMCS * @param type $target * * @return string */ - public function setHelperLicenseLock($_VDM, $target) + public function setHelperLicenseLock($_WHMCS, $target) { $helper[] = PHP_EOL . PHP_EOL . $this->_t(1) . "/**"; $helper[] = $this->_t(1) . " * Check if this install has a license."; @@ -360,12 +360,12 @@ class Interpretation extends Fields $helper[] = $this->_t(1) . "{"; $helper[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the global params"; $helper[] = $this->_t(2) . "\$params = JComponentHelper::getParams('com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "', true);"; - $helper[] = $this->_t(2) . "\$license_key = \$params->get('license_key', null);"; - $helper[] = $this->_t(2) . "if (\$license_key)"; + $helper[] = $this->_t(2) . "\$whmcs_key = \$params->get('whmcs_key', null);"; + $helper[] = $this->_t(2) . "if (\$whmcs_key)"; $helper[] = $this->_t(2) . "{"; $helper[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " load the file"; - $helper[] = $this->_t(3) . "JLoader::import( 'vdm', JPATH_ADMINISTRATOR .'/components/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "');"; - $helper[] = $this->_t(3) . "\$the = new VDM(\$license_key);"; + $helper[] = $this->_t(3) . "JLoader::import( 'whmcs', JPATH_ADMINISTRATOR .'/components/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "');"; + $helper[] = $this->_t(3) . "\$the = new WHMCS(\$whmcs_key);"; $helper[] = $this->_t(3) . "return \$the->_is;"; $helper[] = $this->_t(2) . "}"; $helper[] = $this->_t(2) . "return false;"; @@ -377,18 +377,18 @@ class Interpretation extends Fields /** * set Init License Lock * - * @param type $_VDM + * @param type $_WHMCS * * @return string */ - public function setInitLicenseLock($_VDM) + public function setInitLicenseLock($_WHMCS) { - $init[] = PHP_EOL . "if (!defined('" . $_VDM . "'))"; + $init[] = PHP_EOL . "if (!defined('" . $_WHMCS . "'))"; $init[] = "{"; $init[] = $this->_t(1) . "\$allow = " . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::isGenuine();"; $init[] = $this->_t(1) . "if (\$allow)"; $init[] = $this->_t(1) . "{"; - $init[] = $this->_t(2) . "define('" . $_VDM . "', 1);"; + $init[] = $this->_t(2) . "define('" . $_WHMCS . "', 1);"; $init[] = $this->_t(1) . "}"; $init[] = "}"; // return the initializing statement @@ -423,7 +423,7 @@ class Interpretation extends Fields $encrypt[] = "/**"; $encrypt[] = "* " . $this->setLine(__LINE__) . "WHMCS Class "; $encrypt[] = "**/"; - $encrypt[] = PHP_EOL . "class WHMCS"; + $encrypt[] = "class WHMCS"; $encrypt[] = "{"; $encrypt[] = $this->_t(1) . "public \$_key = false;"; $encrypt[] = $this->_t(1) . "public \$_is = false;"; @@ -584,7 +584,9 @@ class Interpretation extends Fields return implode(PHP_EOL, $encrypt); } } - return ''; + // give notice of this issue + $this->app->enqueueMessage(JText::sprintf('The WHMCS class could not be added to this component. You will need to enable the add-on in the Joomla Component area (Add WHMCS)->Yes.', $this->libraries[$id]->name), 'error'); + return "//" . $this->setLine(__LINE__) . " The WHMCS class could not be added to this component." . PHP_EOL . "//" . $this->setLine(__LINE__) . " Please note that you will need to enable the add-on in the Joomla Component area (Add WHMCS)->Yes."; } /** @@ -671,7 +673,7 @@ class Interpretation extends Fields $function[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " WHMCS Encryption Type"; $function[] = $this->_t(2) . "if ('whmcs' === \$type || 'advanced' === \$type)"; $function[] = $this->_t(2) . "{"; - $function[] = $this->_t(3) . "\$key = \$params->get('advanced_key', \$default);"; + $function[] = $this->_t(3) . "\$key = \$params->get('whmcs_key', \$default);"; $function[] = $this->_t(3) . "if (self::checkString(\$key))"; $function[] = $this->_t(3) . "{"; $function[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " load the file"; @@ -6149,7 +6151,7 @@ class Interpretation extends Fields $this->langContent['admin'][$this->langPrefix . '_NOT_FOUND_OR_ACCESS_DENIED'] = "Not found or access denied!"; if ($this->componentData->add_license && $this->componentData->license_type == 3) { - $this->langContent['admin']['NIE_REG_NIE'] = "

License not set for " . $componentName . ".

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

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

License not set for " . $componentName . ".

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

"; } // add the langug files needed to import and export data if ($this->addEximport) @@ -13154,7 +13156,7 @@ class Interpretation extends Fields // these are the coustom settings $this->setCustomControlConfigFieldsets($lang); } - // we cad add more event (timers as we need) + // we can add more event (timers as we need) } public function setSiteControlConfigFieldsets($lang) @@ -13365,40 +13367,6 @@ class Interpretation extends Fields $this->configFieldSets[] = $this->_t(2) . 'name="global_config"'; $this->configFieldSets[] = $this->_t(2) . 'label="' . $lang . '_GLOBAL_LABEL"'; $this->configFieldSets[] = $this->_t(2) . 'description="' . $lang . '_GLOBAL_DESC">'; - // set application update License Key - if ($this->componentData->add_license && 1 != $this->componentData->license_type) - { - // set licence type switch - switch ($this->componentData->license_type) - { - case 2: - // for updates - $this->langContent[$this->lang][$lang . '_LICENSE_KEY_NOTE_LABEL'] = "Your License Key"; - $this->langContent[$this->lang][$lang . '_LICENSE_KEY_NOTE_DESC'] = "To get updates you must add the license key here that you recieved from " . $this->componentData->companyname; - // set the field - $this->configFieldSets[] = $this->_t(2) . ''; - break; - case 3: - // with vdm to lock down ownership - $this->langContent[$this->lang][$lang . '_LICENSE_KEY_NOTE_LABEL'] = "Your License Key"; - $this->langContent[$this->lang][$lang . '_LICENSE_KEY_NOTE_DESC'] = "To use this component you must add the license key here that you recieved from " . $this->componentData->companyname; - // set the field - $this->configFieldSets[] = $this->_t(2) . ''; - break; - } - // setup lang - $this->langContent[$this->lang][$lang . '_LICENSE_KEY_LABEL'] = "License Key"; - $this->langContent[$this->lang][$lang . '_LICENSE_KEY_DESC'] = "Add your license key here."; - // add the field - $this->configFieldSets[] = $this->_t(2) . 'configFieldSets[] = $this->_t(3) . 'type="text"'; - $this->configFieldSets[] = $this->_t(3) . 'label="' . $lang . '_LICENSE_KEY_LABEL"'; - $this->configFieldSets[] = $this->_t(3) . 'description="' . $lang . '_LICENSE_KEY_DESC"'; - $this->configFieldSets[] = $this->_t(3) . 'size="60"'; - $this->configFieldSets[] = $this->_t(3) . 'default=""'; - $this->configFieldSets[] = $this->_t(2) . "/>"; - $this->configFieldSets[] = $this->_t(2) . ''; - } // setup lang $this->langContent[$this->lang][$lang . '_GLOBAL_LABEL'] = "Global"; $this->langContent[$this->lang][$lang . '_GLOBAL_DESC'] = "The Global Parameters"; @@ -14694,44 +14662,51 @@ function vdm_dkim() { // set field lang label and description if ($this->componentData->add_license && $this->componentData->license_type == 3) { - $this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = "License Key"; + $this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = $this->componentData->companyname . " License Key"; $this->langContent[$this->lang][$lang . '_WHMCS_KEY_DESC'] = "Add the license key you recieved from " . $this->componentData->companyname . " here."; } elseif ($this->componentData->add_license && $this->componentData->license_type == 2) { - $this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = "Update Key"; + $this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = $this->componentData->companyname . " Update Key"; $this->langContent[$this->lang][$lang . '_WHMCS_KEY_DESC'] = "Add the update key you recieved from " . $this->componentData->companyname . " here."; } else { - $this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = "WHMCS Key"; + $this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = $this->componentData->companyname . " Key"; $this->langContent[$this->lang][$lang . '_WHMCS_KEY_DESC'] = "Add the key you recieved from " . $this->componentData->companyname . " here."; } // ajust the notice based on license - if (isset($this->whmcsEncryption) && $this->whmcsEncryption) + if ($this->componentData->license_type == 3) { - $this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Field Encryption (whmcs)"; - $this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_DESC'] = "When using this (whmcs) encryption you need to get a key from " . $this->componentData->companyname . ".
Never change this key once it is set! DATA WILL GET CORRUPTED IF YOU DO!"; + $this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " License Key"; + } + elseif ($this->componentData->license_type == 2) + { + $this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " Update Key"; } else { - if ($this->componentData->license_type == 3) + if (isset($this->whmcsEncryption) && $this->whmcsEncryption) { - $this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your License Key"; - } - elseif ($this->componentData->license_type == 2) - { - $this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your Update Key"; + $this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " Field Encryption Key"; } else { - $this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your Key (whmcs)"; + $this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " Key"; } - $this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_DESC'] = "You need to get this key from " . $this->componentData->companyname . "."; + } + // add the description based on global settings + if (isset($this->whmcsEncryption) && $this->whmcsEncryption) + { + $this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_DESC'] = "You need to get this key from " . $this->componentData->companyname . ".
When using the " . $this->componentData->companyname . " field encryption you can never change this key once it is set! DATA WILL GET CORRUPTED IF YOU DO!"; + } + else + { + $this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_DESC'] = "You need to get this key from " . $this->componentData->companyname . "."; } // set the fields $this->configFieldSets[] = $this->_t(2) . ''; - $this->configFieldSets[] = $this->_t(2) . 'configFieldSets[] = $this->_t(2) . 'configFieldSets[] = $this->_t(3) . 'type="text"'; $this->configFieldSets[] = $this->_t(3) . 'label="' . $lang . '_WHMCS_KEY_LABEL"'; $this->configFieldSets[] = $this->_t(3) . 'description="' . $lang . '_WHMCS_KEY_DESC"'; diff --git a/admin/helpers/extrusion/a_mapping.php b/admin/helpers/extrusion/a_mapping.php index c9908193c..468544f92 100644 --- a/admin/helpers/extrusion/a_mapping.php +++ b/admin/helpers/extrusion/a_mapping.php @@ -99,52 +99,64 @@ class Mapping */ public function __construct($data = false) { + // set the app to insure messages can be set + $this->app = JFactory::getApplication(); + // check that we have data if (ComponentbuilderHelper::checkArray($data)) { - if (isset($data['buildcomp']) && 1 == $data['buildcomp'] && isset($data['buildcompsql'])) + // make sure we have an id + if (isset($data['id']) && $data['id'] > 0) { - foreach ($data as $key => $value) + if (isset($data['buildcomp']) && 1 == $data['buildcomp'] && isset($data['buildcompsql'])) { - if (isset($this->setting[$key])) + foreach ($data as $key => $value) { - switch($this->setting[$key]) + if (isset($this->setting[$key])) { - case 'base64': - // set needed value - $this->$key = base64_decode($value); - break; - case 'json': - // set needed value - $this->$key = json_decode($value, true); - break; - case 'safeString': - // set needed value - $this->$key = ComponentbuilderHelper::safeString($value); - break; - default : - $this->$key = $value; - break; + switch($this->setting[$key]) + { + case 'base64': + // set needed value + $this->$key = base64_decode($value); + break; + case 'json': + // set needed value + $this->$key = json_decode($value, true); + break; + case 'safeString': + // set needed value + $this->$key = ComponentbuilderHelper::safeString($value); + break; + default : + $this->$key = $value; + break; + } } } + // get linked admin views + $addadmin_views = ComponentbuilderHelper::getVar('component_admin_views', $data['id'], 'joomla_component', 'addadmin_views'); + if (ComponentbuilderHelper::checkJson($addadmin_views)) + { + $this->addadmin_views = json_decode($addadmin_views, true); + } + // set the map of the views needed + if ($this->setMap()) + { + return true; + } + $this->app->enqueueMessage( + JText::_('No "CREATE TABLE.." were found, please check your sql.'), + 'Error' + ); + return false; } - // get linked admin views - $addadmin_views = ComponentbuilderHelper::getVar('component_admin_views', $data['id'], 'joomla_component', 'addadmin_views'); - if (ComponentbuilderHelper::checkJson($addadmin_views)) - { - $this->addadmin_views = json_decode($addadmin_views, true); - } - // set the map of the views needed - if ($this->setMap()) - { - return true; - } - $this->app->enqueueMessage( - JText::_('No "CREATE TABLE.." were found, please check your sql.'), - 'Error' - ); - return false; + return false; // not set so just return without any error } - return false; // not set so just return without any error + $this->app->enqueueMessage( + JText::_('Please try again, this error usualy happens if it is a new component, beacues we need a component ID to do this build with your sql dump.'), + 'Error' + ); + return false; } $this->app->enqueueMessage( JText::_('Could not find the data needed to continue.'), diff --git a/admin/helpers/extrusion/c_extrusion.php b/admin/helpers/extrusion/c_extrusion.php index fc0660fee..81b2ffed4 100644 --- a/admin/helpers/extrusion/c_extrusion.php +++ b/admin/helpers/extrusion/c_extrusion.php @@ -36,30 +36,19 @@ class Extrusion extends Builder */ public function __construct(&$data) { - // set the app to insure messages can be set - $this->app = JFactory::getApplication(); - // make sure we have an id - if (isset($data['id']) && $data['id'] > 0) + // first we run the perent constructor + if (parent::__construct($data)) { - // first we run the perent constructor - if (parent::__construct($data)) + // link the view data to the component + if ($this->setAdminViews($data['id'])) { - // link the view data to the component - if ($this->setAdminViews($data['id'])) - { - $this->app->enqueueMessage( - JText::_('All the fields and views from your sql dump has been created and linked to this component.'), - 'Success' - ); - return true; - } + $this->app->enqueueMessage( + JText::_('All the fields and views from your sql dump has been created and linked to this component.'), + 'Success' + ); + return true; } - return false; } - $this->app->enqueueMessage( - JText::_('Please try again, this error usualy happens if it is a new component, beacues we need a component ID to do this build with your sql dump.'), - 'Error' - ); return false; } diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 7829e8509..2c73a518b 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -4067,9 +4067,9 @@ COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_DESCRIPTION="This fi COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_LABEL="No Database Require" COM_COMPONENTBUILDER_FIELD_NOTE_SELECT_FIELD_TYPE_DESCRIPTION="Please select a field type that you would like to build." COM_COMPONENTBUILDER_FIELD_NOTE_SELECT_FIELD_TYPE_LABEL="Building a field" -COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION="

When using the WHMCS encryption you need to get a WHMCS key from:
https://www.vdm.io, or your own WHMCS install.

Please note that you will need to enable the add-on in the Joomla Component area (Add WHMCS)->Yes.

You can get more info about the WHMCS licensing add-on at the following links.

Helpful Links:
-https://www.whmcs.com/addons/licensing-addon/
-http://docs.whmcs.com/Licensing_Addon/

" +COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION="

When using the WHMCS encryption you need to get a WHMCS key from:
https://www.vdm.io, or your own WHMCS install.

Please note that you will need to enable the add-on in the Joomla Component area (Add WHMCS)->Yes.

You can get more info about the WHMCS licensing add-on at the following links.

Helpful Links:
+https://www.whmcs.com/software-licensing/
+http://docs.whmcs.com/Licensing_Addon/

Support JCB and use our affiliate link (https://www.whmcs.com/members/aff.php?aff=37513) to sign-up with WHMCS.

" COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_LABEL="The WHMCS Encryption" COM_COMPONENTBUILDER_FIELD_NOT_NULL="NOT NULL" COM_COMPONENTBUILDER_FIELD_NOT_REQUIRED="Not Required" @@ -4678,7 +4678,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL="The ZIP COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_ONE_DESCRIPTION="Use the modified date, and version number of the view/fields instead of the global version in related files." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_THREE_DESCRIPTION="Use only the first numbers from your global version. This is useful if you are using git. Since all document will not then be updated, with version change, with each compilation when major or minor updates are made." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_TWO_DESCRIPTION="Use only the first two numbers from your global version. This is useful if you are using git. Since all document will not then be updated, with version change, with each compilation when only a minor update is made." -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_DESCRIPTION="You can use WHMCS licensing addon in your component
Helpful Links
https://www.whmcs.com/addons/licensing-addon/
http://docs.whmcs.com/Licensing_Addon" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_DESCRIPTION="You can use WHMCS licensing addon in your component
Helpful Links
https://www.whmcs.com/software-licensing/
http://docs.whmcs.com/Licensing_Addon
Support JCB and use our affiliate link (https://www.whmcs.com/members/aff.php?aff=37513) to sign-up with WHMCS." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_LABEL="Licensing addon module for WHMCS" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOT_REQUIRED="Not Required" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NUMBER="Number" @@ -4782,6 +4782,11 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_DESCRIPTION="Enter website address COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT="http://www.example.com" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_LABEL="Website" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_MESSAGE="Error! Please add website here." +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK="Whmcs Buy Link" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_DESCRIPTION="Enter link where your WHMCS License key can be bought." +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_HINT="http://www.example.com/buy-whmcs-key" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_LABEL="Buy Link
(to get WHMCS License Key)" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_MESSAGE="Error! Please add link here." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_ENCRYPTION_ONLY_TO_LOCK_DATAFIELDS="WHMCS encryption (only to lock data/fields)" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY="Whmcs Key" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_DESCRIPTION="Add your WHMCS Secret Key here that is needed for this license" diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php index 250fe3c8c..783a77c7a 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -25,6 +25,7 @@ $fields = $displayData->get('fields') ?: array( 'note_whmcs_lisencing_note', 'whmcs_key', 'whmcs_url', + 'whmcs_buy_link', 'license', 'bom', 'image' diff --git a/admin/models/forms/joomla_component.js b/admin/models/forms/joomla_component.js index 9057f4e4f..ac4135ffa 100644 --- a/admin/models/forms/joomla_component.js +++ b/admin/models/forms/joomla_component.js @@ -549,12 +549,14 @@ function vvvvvwk(add_license_vvvvvwk) jQuery('.note_whmcs_lisencing_note').closest('.control-group').show(); jQuery('#jform_whmcs_key').closest('.control-group').show(); jQuery('#jform_whmcs_url').closest('.control-group').show(); + jQuery('#jform_whmcs_buy_link').closest('.control-group').show(); } else { jQuery('.note_whmcs_lisencing_note').closest('.control-group').hide(); jQuery('#jform_whmcs_key').closest('.control-group').hide(); jQuery('#jform_whmcs_url').closest('.control-group').hide(); + jQuery('#jform_whmcs_buy_link').closest('.control-group').hide(); } } diff --git a/admin/models/forms/joomla_component.xml b/admin/models/forms/joomla_component.xml index fa623a050..7f396f838 100644 --- a/admin/models/forms/joomla_component.xml +++ b/admin/models/forms/joomla_component.xml @@ -191,12 +191,12 @@ message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_MESSAGE" hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_HINT" /> - + - + + + - - - + + + - - - + - - - + type="list" + name="adduikit" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDUIKIT_LABEL" + description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDUIKIT_DESCRIPTION" + class="btn-group btn-group-yesno" + default="0"> + + + + + + + @@ -372,12 +353,12 @@ - + - + @@ -404,27 +385,80 @@ - + + + + + + + + + - + @@ -449,24 +483,23 @@ message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_MESSAGE" hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_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" + required="true" + validate="code" + /> - + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE - + - - - - + + + + - - + + - + + + + + - + - - - - - - COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OTHER - + - - - - + type="media" + name="image" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_LABEL" + description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_DESCRIPTION" + directory="" + /> - - - + + required="true"> + + + + + + + + + + - - COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_FOOTABLE_VTWO - - + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - - + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - - + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - - + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - - + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - - + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - - + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO + + + + + + + + - - - - - - - - COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC - - + + + + + + + + + + - + @@ -1009,11 +1053,11 @@ message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JOOMLA_SOURCE_LINK_MESSAGE" hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JOOMLA_SOURCE_LINK_HINT" /> - + @@ -1035,25 +1079,10 @@ required="false" filter="url" validated="url" + scheme="http,https" message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_MESSAGE" hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_HINT" /> - - - - - - - - COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - - + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO + + + + + + + + @@ -1196,11 +1242,11 @@ - + @@ -1224,14 +1270,13 @@ - + + default="0"> @@ -1249,25 +1294,10 @@ max="40" step="1" /> - - - - - - - - - - + + - - + + - - + + - - + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - - + + - - - - - - + + metadata = $registry->toArray(); } - if (!empty($item->php_preflight_update)) + if (!empty($item->php_preflight_install)) { - // base64 Decode php_preflight_update. - $item->php_preflight_update = base64_decode($item->php_preflight_update); + // base64 Decode php_preflight_install. + $item->php_preflight_install = base64_decode($item->php_preflight_install); } - if (!empty($item->css_site)) + if (!empty($item->php_postflight_install)) { - // base64 Decode css_site. - $item->css_site = base64_decode($item->css_site); + // base64 Decode php_postflight_install. + $item->php_postflight_install = base64_decode($item->php_postflight_install); } - if (!empty($item->php_helper_site)) + if (!empty($item->css_admin)) { - // base64 Decode php_helper_site. - $item->php_helper_site = base64_decode($item->php_helper_site); + // base64 Decode css_admin. + $item->css_admin = base64_decode($item->css_admin); } - if (!empty($item->javascript)) + if (!empty($item->php_method_uninstall)) { - // base64 Decode javascript. - $item->javascript = base64_decode($item->javascript); + // base64 Decode php_method_uninstall. + $item->php_method_uninstall = base64_decode($item->php_method_uninstall); } - if (!empty($item->php_helper_admin)) + if (!empty($item->sql_uninstall)) { - // base64 Decode php_helper_admin. - $item->php_helper_admin = base64_decode($item->php_helper_admin); - } - - if (!empty($item->readme)) - { - // base64 Decode readme. - $item->readme = base64_decode($item->readme); - } - - 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->php_helper_both)) - { - // base64 Decode php_helper_both. - $item->php_helper_both = base64_decode($item->php_helper_both); + // base64 Decode sql_uninstall. + $item->sql_uninstall = base64_decode($item->sql_uninstall); } if (!empty($item->php_admin_event)) @@ -152,34 +128,58 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $item->php_site_event = base64_decode($item->php_site_event); } - if (!empty($item->css_admin)) + if (!empty($item->php_helper_both)) { - // base64 Decode css_admin. - $item->css_admin = base64_decode($item->css_admin); + // 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_helper_admin)) { - // base64 Decode php_preflight_install. - $item->php_preflight_install = base64_decode($item->php_preflight_install); + // base64 Decode php_helper_admin. + $item->php_helper_admin = base64_decode($item->php_helper_admin); } - if (!empty($item->php_postflight_install)) + if (!empty($item->php_helper_site)) { - // base64 Decode php_postflight_install. - $item->php_postflight_install = base64_decode($item->php_postflight_install); + // base64 Decode php_helper_site. + $item->php_helper_site = base64_decode($item->php_helper_site); } - if (!empty($item->php_method_uninstall)) + if (!empty($item->javascript)) { - // base64 Decode php_method_uninstall. - $item->php_method_uninstall = base64_decode($item->php_method_uninstall); + // base64 Decode javascript. + $item->javascript = base64_decode($item->javascript); } - if (!empty($item->sql_uninstall)) + if (!empty($item->css_site)) { - // base64 Decode sql_uninstall. - $item->sql_uninstall = base64_decode($item->sql_uninstall); + // 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->readme)) + { + // base64 Decode readme. + $item->readme = base64_decode($item->readme); } if (!empty($item->buildcompsql)) @@ -1071,58 +1071,34 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $data['addcontributors'] = ''; } - // Set the php_preflight_update string to base64 string. - if (isset($data['php_preflight_update'])) + // Set the php_preflight_install string to base64 string. + if (isset($data['php_preflight_install'])) { - $data['php_preflight_update'] = base64_encode($data['php_preflight_update']); + $data['php_preflight_install'] = base64_encode($data['php_preflight_install']); } - // Set the css_site string to base64 string. - if (isset($data['css_site'])) + // Set the php_postflight_install string to base64 string. + if (isset($data['php_postflight_install'])) { - $data['css_site'] = base64_encode($data['css_site']); + $data['php_postflight_install'] = base64_encode($data['php_postflight_install']); } - // Set the php_helper_site string to base64 string. - if (isset($data['php_helper_site'])) + // Set the css_admin string to base64 string. + if (isset($data['css_admin'])) { - $data['php_helper_site'] = base64_encode($data['php_helper_site']); + $data['css_admin'] = base64_encode($data['css_admin']); } - // Set the javascript string to base64 string. - if (isset($data['javascript'])) + // Set the php_method_uninstall string to base64 string. + if (isset($data['php_method_uninstall'])) { - $data['javascript'] = base64_encode($data['javascript']); + $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'])) + // Set the sql_uninstall string to base64 string. + if (isset($data['sql_uninstall'])) { - $data['php_helper_admin'] = base64_encode($data['php_helper_admin']); - } - - // Set the readme string to base64 string. - if (isset($data['readme'])) - { - $data['readme'] = base64_encode($data['readme']); - } - - // 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 php_helper_both string to base64 string. - if (isset($data['php_helper_both'])) - { - $data['php_helper_both'] = base64_encode($data['php_helper_both']); + $data['sql_uninstall'] = base64_encode($data['sql_uninstall']); } // Set the php_admin_event string to base64 string. @@ -1137,34 +1113,58 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $data['php_site_event'] = base64_encode($data['php_site_event']); } - // Set the css_admin string to base64 string. - if (isset($data['css_admin'])) + // Set the php_helper_both string to base64 string. + if (isset($data['php_helper_both'])) { - $data['css_admin'] = base64_encode($data['css_admin']); + $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_helper_admin string to base64 string. + if (isset($data['php_helper_admin'])) { - $data['php_preflight_install'] = base64_encode($data['php_preflight_install']); + $data['php_helper_admin'] = base64_encode($data['php_helper_admin']); } - // Set the php_postflight_install string to base64 string. - if (isset($data['php_postflight_install'])) + // Set the php_helper_site string to base64 string. + if (isset($data['php_helper_site'])) { - $data['php_postflight_install'] = base64_encode($data['php_postflight_install']); + $data['php_helper_site'] = base64_encode($data['php_helper_site']); } - // Set the php_method_uninstall string to base64 string. - if (isset($data['php_method_uninstall'])) + // Set the javascript string to base64 string. + if (isset($data['javascript'])) { - $data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']); + $data['javascript'] = base64_encode($data['javascript']); } - // Set the sql_uninstall string to base64 string. - if (isset($data['sql_uninstall'])) + // Set the css_site string to base64 string. + if (isset($data['css_site'])) { - $data['sql_uninstall'] = base64_encode($data['sql_uninstall']); + $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 readme string to base64 string. + if (isset($data['readme'])) + { + $data['readme'] = base64_encode($data['readme']); } // Set the buildcompsql string to base64 string. diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php index 2e38a5667..a9d1023cd 100644 --- a/admin/models/joomla_components.php +++ b/admin/models/joomla_components.php @@ -1918,43 +1918,43 @@ class ComponentbuilderModelJoomla_components extends JModelList continue; } - // decode php_preflight_update - $item->php_preflight_update = base64_decode($item->php_preflight_update); - // decode css_site - $item->css_site = base64_decode($item->css_site); - // decode php_helper_site - $item->php_helper_site = base64_decode($item->php_helper_site); - // decode javascript - $item->javascript = base64_decode($item->javascript); - // decode php_helper_admin - $item->php_helper_admin = base64_decode($item->php_helper_admin); - // decode readme - $item->readme = base64_decode($item->readme); - // decode php_postflight_update - $item->php_postflight_update = base64_decode($item->php_postflight_update); - // decode sql - $item->sql = base64_decode($item->sql); - // decode php_helper_both - $item->php_helper_both = base64_decode($item->php_helper_both); + // decode php_preflight_install + $item->php_preflight_install = base64_decode($item->php_preflight_install); + // decode php_postflight_install + $item->php_postflight_install = base64_decode($item->php_postflight_install); + // decode css_admin + $item->css_admin = base64_decode($item->css_admin); + // decode php_method_uninstall + $item->php_method_uninstall = base64_decode($item->php_method_uninstall); + // decode sql_uninstall + $item->sql_uninstall = base64_decode($item->sql_uninstall); // decode php_admin_event $item->php_admin_event = base64_decode($item->php_admin_event); // 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_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_install - $item->php_preflight_install = base64_decode($item->php_preflight_install); - // decode php_postflight_install - $item->php_postflight_install = base64_decode($item->php_postflight_install); - // decode php_method_uninstall - $item->php_method_uninstall = base64_decode($item->php_method_uninstall); - // decode sql_uninstall - $item->sql_uninstall = base64_decode($item->sql_uninstall); + // 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); + // decode readme + $item->readme = base64_decode($item->readme); if ($basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true))) { // decrypt export_key diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index bee93a285..29259a3d8 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -74,6 +74,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` ( `update_server_target` TINYINT(1) NOT NULL DEFAULT 0, `update_server_url` VARCHAR(255) NOT NULL DEFAULT '', `website` CHAR(255) NOT NULL DEFAULT '', + `whmcs_buy_link` VARCHAR(255) NOT NULL DEFAULT '', `whmcs_key` VARCHAR(255) NOT NULL DEFAULT '', `whmcs_url` VARCHAR(255) NOT NULL DEFAULT '', `params` text NOT NULL DEFAULT '', @@ -99,15 +100,16 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` ( KEY `idx_state` (`published`), KEY `idx_system_name` (`system_name`), KEY `idx_name_code` (`name_code`), + KEY `idx_adduikit` (`adduikit`), + KEY `idx_add_update_server` (`add_update_server`), KEY `idx_add_placeholders` (`add_placeholders`), KEY `idx_mvc_versiondate` (`mvc_versiondate`), - KEY `idx_add_email_helper` (`add_email_helper`), KEY `idx_debug_linenr` (`debug_linenr`), - KEY `idx_adduikit` (`adduikit`), + KEY `idx_add_email_helper` (`add_email_helper`), KEY `idx_add_license` (`add_license`), KEY `idx_license_type` (`license_type`), KEY `idx_update_server_target` (`update_server_target`), - KEY `idx_add_update_server` (`add_update_server`), + KEY `idx_creatuserhelper` (`creatuserhelper`), KEY `idx_addfootable` (`addfootable`), KEY `idx_add_php_helper_both` (`add_php_helper_both`), KEY `idx_add_php_helper_admin` (`add_php_helper_admin`), @@ -123,11 +125,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` ( 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_emptycontributors` (`emptycontributors`), KEY `idx_add_sql_uninstall` (`add_sql_uninstall`), + KEY `idx_emptycontributors` (`emptycontributors`), KEY `idx_addreadme` (`addreadme`), - KEY `idx_add_sales_server` (`add_sales_server`), - KEY `idx_creatuserhelper` (`creatuserhelper`) + KEY `idx_add_sales_server` (`add_sales_server`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( @@ -1514,7 +1515,7 @@ INSERT INTO `#__componentbuilder_field` (`id`, `add_css_view`, `add_css_views`, (196, '', '', '', '', '', '', '', '', '', 64, '', 'VARCHAR', '', '', '', 'Mobile Phone', 'NOT NULL', '', 23, '\"\"', 1, '2015-04-07 22:12:58', '2016-03-28 14:00:02', 2, '', 7), (199, '', '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Name', 'NOT NULL', '', 24, '\"\"', 1, '2015-03-19 17:30:59', '2017-10-25 20:26:02', 8, '', 4), (203, '', '', '', '', '', '', '', '', '', 1, '', 'INT', '', '', '', 'Not Required', 'NOT NULL', '', 9, '\"\"', 1, '2015-05-08 16:19:16', '2015-08-25 21:15:22', 1, '', 19), -(280, '', '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Website', 'NOT NULL', '', 27, '\"\"', 1, '2015-04-08 00:36:16', '2015-08-25 21:15:22', 1, '', 105), +(280, '', '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Website', 'NOT NULL', '', 27, '\"\"', 1, '2015-04-08 00:36:16', '2018-07-08 00:11:05', 2, '', 105), (682, '', '', '', '', '', '', '', '', '', 1, '', 'TINYINT', 2, '', '', 'Add More', 'NOT NULL', '', 17, '\"\"', 1, '2015-08-05 01:18:20', '2018-03-30 09:30:45', 4, '', 196), (1011, '', '', '', '', '', '', '', 'Other', '0000-00-00', '', '', 'DATE', '', '', '', 'Date of Birth', 'NOT NULL', '', 1, '\"\"', 1, '2015-12-07 01:47:32', '2015-12-07 02:15:24', 3, '', 649); diff --git a/admin/sql/updates/mysql/2.8.2.sql b/admin/sql/updates/mysql/2.8.2.sql new file mode 100644 index 000000000..250f0ec1c --- /dev/null +++ b/admin/sql/updates/mysql/2.8.2.sql @@ -0,0 +1 @@ +ALTER TABLE `#__componentbuilder_joomla_component` ADD `whmcs_buy_link` VARCHAR(255) NOT NULL DEFAULT '' AFTER `website`; diff --git a/componentbuilder.xml b/componentbuilder.xml index 6bc2639a8..567377eef 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,15 +1,15 @@ COM_COMPONENTBUILDER - 7th July, 2018 + 8th July, 2018 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://www.joomlacomponentbuilder.com Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - 2.8.2 + 2.8.3 Component Builder (v.2.8.2) +

Component Builder (v.2.8.3)

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 adb99ee2e..999f8359c 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -424,4 +424,21 @@ http://www.joomlacomponentbuilder.com + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.8.3 + http://www.joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.8.3/JCB_v2.8.3.zip + + + stable + + Llewellyn van der Merwe + http://www.joomlacomponentbuilder.com + + \ No newline at end of file diff --git a/script.php b/script.php index fb64f064a..7b8dfe7f7 100644 --- a/script.php +++ b/script.php @@ -3368,9 +3368,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_preflight_update","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","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","php_preflight_update":"php_preflight_update","css_site":"css_site","php_helper_site":"php_helper_site","javascript":"javascript","php_helper_admin":"php_helper_admin","readme":"readme","buildcomp":"buildcomp","copyright":"copyright","add_placeholders":"add_placeholders","description":"description","mvc_versiondate":"mvc_versiondate","php_postflight_update":"php_postflight_update","add_email_helper":"add_email_helper","sql":"sql","debug_linenr":"debug_linenr","email":"email","adduikit":"adduikit","website":"website","php_helper_both":"php_helper_both","add_license":"add_license","php_admin_event":"php_admin_event","license_type":"license_type","php_site_event":"php_site_event","css_admin":"css_admin","whmcs_key":"whmcs_key","whmcs_url":"whmcs_url","php_preflight_install":"php_preflight_install","license":"license","php_postflight_install":"php_postflight_install","bom":"bom","php_method_uninstall":"php_method_uninstall","image":"image","sql_uninstall":"sql_uninstall","update_server_target":"update_server_target","add_update_server":"add_update_server","update_server":"update_server","not_required":"not_required","sales_server":"sales_server","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_css_admin":"add_css_admin","toignore":"toignore","add_css_site":"add_css_site","dashboard_type":"dashboard_type","dashboard":"dashboard","export_key":"export_key","add_php_preflight_install":"add_php_preflight_install","joomla_source_link":"joomla_source_link","add_php_preflight_update":"add_php_preflight_update","export_buy_link":"export_buy_link","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","emptycontributors":"emptycontributors","add_sql_uninstall":"add_sql_uninstall","number":"number","addreadme":"addreadme","update_server_url":"update_server_url","add_sales_server":"add_sales_server","creatuserhelper":"creatuserhelper","buildcompsql":"buildcompsql","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_preflight_install","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","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","php_preflight_install":"php_preflight_install","php_postflight_install":"php_postflight_install","css_admin":"css_admin","sales_server":"sales_server","adduikit":"adduikit","add_update_server":"add_update_server","copyright":"copyright","add_placeholders":"add_placeholders","description":"description","mvc_versiondate":"mvc_versiondate","php_method_uninstall":"php_method_uninstall","debug_linenr":"debug_linenr","sql_uninstall":"sql_uninstall","php_admin_event":"php_admin_event","php_site_event":"php_site_event","php_helper_both":"php_helper_both","add_email_helper":"add_email_helper","email":"email","php_helper_admin":"php_helper_admin","website":"website","php_helper_site":"php_helper_site","add_license":"add_license","javascript":"javascript","license_type":"license_type","css_site":"css_site","whmcs_key":"whmcs_key","php_preflight_update":"php_preflight_update","whmcs_url":"whmcs_url","php_postflight_update":"php_postflight_update","whmcs_buy_link":"whmcs_buy_link","sql":"sql","license":"license","readme":"readme","bom":"bom","update_server_target":"update_server_target","image":"image","update_server":"update_server","not_required":"not_required","buildcomp":"buildcomp","creatuserhelper":"creatuserhelper","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_css_admin":"add_css_admin","add_css_site":"add_css_site","toignore":"toignore","dashboard_type":"dashboard_type","dashboard":"dashboard","add_php_preflight_install":"add_php_preflight_install","export_key":"export_key","add_php_preflight_update":"add_php_preflight_update","joomla_source_link":"joomla_source_link","add_php_postflight_install":"add_php_postflight_install","export_buy_link":"export_buy_link","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","add_sql_uninstall":"add_sql_uninstall","emptycontributors":"emptycontributors","addreadme":"addreadme","number":"number","update_server_url":"update_server_url","add_sales_server":"add_sales_server","buildcompsql":"buildcompsql","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","buildcomp","add_placeholders","mvc_versiondate","add_email_helper","debug_linenr","adduikit","add_license","license_type","update_server_target","add_update_server","update_server","not_required","sales_server","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","emptycontributors","add_sql_uninstall","number","addreadme","add_sales_server","creatuserhelper"],"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": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_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","sales_server","adduikit","add_update_server","add_placeholders","mvc_versiondate","debug_linenr","add_email_helper","add_license","license_type","update_server_target","update_server","not_required","buildcomp","creatuserhelper","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","emptycontributors","addreadme","number","add_sales_server"],"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": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"}]}'; // Set the object into the content types table. $joomla_component_Inserted = $db->insertObject('#__content_types', $joomla_component); @@ -3802,9 +3802,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_preflight_update","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","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","php_preflight_update":"php_preflight_update","css_site":"css_site","php_helper_site":"php_helper_site","javascript":"javascript","php_helper_admin":"php_helper_admin","readme":"readme","buildcomp":"buildcomp","copyright":"copyright","add_placeholders":"add_placeholders","description":"description","mvc_versiondate":"mvc_versiondate","php_postflight_update":"php_postflight_update","add_email_helper":"add_email_helper","sql":"sql","debug_linenr":"debug_linenr","email":"email","adduikit":"adduikit","website":"website","php_helper_both":"php_helper_both","add_license":"add_license","php_admin_event":"php_admin_event","license_type":"license_type","php_site_event":"php_site_event","css_admin":"css_admin","whmcs_key":"whmcs_key","whmcs_url":"whmcs_url","php_preflight_install":"php_preflight_install","license":"license","php_postflight_install":"php_postflight_install","bom":"bom","php_method_uninstall":"php_method_uninstall","image":"image","sql_uninstall":"sql_uninstall","update_server_target":"update_server_target","add_update_server":"add_update_server","update_server":"update_server","not_required":"not_required","sales_server":"sales_server","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_css_admin":"add_css_admin","toignore":"toignore","add_css_site":"add_css_site","dashboard_type":"dashboard_type","dashboard":"dashboard","export_key":"export_key","add_php_preflight_install":"add_php_preflight_install","joomla_source_link":"joomla_source_link","add_php_preflight_update":"add_php_preflight_update","export_buy_link":"export_buy_link","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","emptycontributors":"emptycontributors","add_sql_uninstall":"add_sql_uninstall","number":"number","addreadme":"addreadme","update_server_url":"update_server_url","add_sales_server":"add_sales_server","creatuserhelper":"creatuserhelper","buildcompsql":"buildcompsql","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_preflight_install","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","component_version":"component_version","short_description":"short_description","companyname":"companyname","author":"author","php_preflight_install":"php_preflight_install","php_postflight_install":"php_postflight_install","css_admin":"css_admin","sales_server":"sales_server","adduikit":"adduikit","add_update_server":"add_update_server","copyright":"copyright","add_placeholders":"add_placeholders","description":"description","mvc_versiondate":"mvc_versiondate","php_method_uninstall":"php_method_uninstall","debug_linenr":"debug_linenr","sql_uninstall":"sql_uninstall","php_admin_event":"php_admin_event","php_site_event":"php_site_event","php_helper_both":"php_helper_both","add_email_helper":"add_email_helper","email":"email","php_helper_admin":"php_helper_admin","website":"website","php_helper_site":"php_helper_site","add_license":"add_license","javascript":"javascript","license_type":"license_type","css_site":"css_site","whmcs_key":"whmcs_key","php_preflight_update":"php_preflight_update","whmcs_url":"whmcs_url","php_postflight_update":"php_postflight_update","whmcs_buy_link":"whmcs_buy_link","sql":"sql","license":"license","readme":"readme","bom":"bom","update_server_target":"update_server_target","image":"image","update_server":"update_server","not_required":"not_required","buildcomp":"buildcomp","creatuserhelper":"creatuserhelper","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_css_admin":"add_css_admin","add_css_site":"add_css_site","toignore":"toignore","dashboard_type":"dashboard_type","dashboard":"dashboard","add_php_preflight_install":"add_php_preflight_install","export_key":"export_key","add_php_preflight_update":"add_php_preflight_update","joomla_source_link":"joomla_source_link","add_php_postflight_install":"add_php_postflight_install","export_buy_link":"export_buy_link","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","add_sql":"add_sql","add_sql_uninstall":"add_sql_uninstall","emptycontributors":"emptycontributors","addreadme":"addreadme","number":"number","update_server_url":"update_server_url","add_sales_server":"add_sales_server","buildcompsql":"buildcompsql","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","buildcomp","add_placeholders","mvc_versiondate","add_email_helper","debug_linenr","adduikit","add_license","license_type","update_server_target","add_update_server","update_server","not_required","sales_server","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","emptycontributors","add_sql_uninstall","number","addreadme","add_sales_server","creatuserhelper"],"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": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_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","sales_server","adduikit","add_update_server","add_placeholders","mvc_versiondate","debug_linenr","add_email_helper","add_license","license_type","update_server_target","update_server","not_required","buildcomp","creatuserhelper","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","emptycontributors","addreadme","number","add_sales_server"],"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": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"}]}'; // Check if joomla_component type is already in content_type DB. $joomla_component_id = null; @@ -4991,7 +4991,7 @@ class com_componentbuilderInstallerScript echo ' -

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

'; +

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

'; } }