From d062e03a042f91eb6dac47281e5ad5ec5b9a29de Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Wed, 19 Aug 2020 02:54:09 +0200 Subject: [PATCH] Added the overide option to the linked admin views. Added the option to remove line breaks in all langguage strings. Increased the field size to MEDIUMTEXT for the default input in joomla_module custom_admin_view and site_view. --- README.md | 12 +- admin/README.txt | 12 +- admin/helpers/compiler/a_Get.php | 38 +++- admin/helpers/compiler/e_Interpretation.php | 150 +++++++------ .../en-GB/en-GB.com_componentbuilder.ini | 3 + .../layouts/joomla_component/details_left.php | 4 +- .../joomla_component/details_right.php | 3 +- admin/models/forms/joomla_component.xml | 201 ++++++++++-------- admin/models/joomla_component.php | 7 +- admin/sql/install.mysql.utf8.sql | 10 +- componentbuilder.xml | 6 +- componentbuilder_update_server.xml | 34 +++ script.php | 10 +- 13 files changed, 303 insertions(+), 187 deletions(-) diff --git a/README.md b/README.md index 36fb849ae..da5047b70 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 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.11.4) 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.11.6) 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,13 +144,13 @@ 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*: 13th August, 2020 -+ *Version*: 2.11.4 ++ *Last Build*: 19th August, 2020 ++ *Version*: 2.11.6 + *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*: **283086** -+ *Field count*: **1527** -+ *File count*: **1785** ++ *Line count*: **283148** ++ *Field count*: **1528** ++ *File count*: **1787** + *Folder count*: **295** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/README.txt b/admin/README.txt index 36fb849ae..da5047b70 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 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.11.4) 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.11.6) 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,13 +144,13 @@ 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*: 13th August, 2020 -+ *Version*: 2.11.4 ++ *Last Build*: 19th August, 2020 ++ *Version*: 2.11.6 + *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*: **283086** -+ *Field count*: **1527** -+ *File count*: **1785** ++ *Line count*: **283148** ++ *Field count*: **1528** ++ *File count*: **1787** + *Folder count*: **295** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index aa7b6d73d..1ee211a75 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -102,6 +102,13 @@ class Get */ public $addPlaceholders = false; + /** + * Switch to remove line breaks from language strings + * + * @var bool + */ + public $removeLineBreaks = false; + /** * The placeholders for custom code keys * @@ -814,6 +821,8 @@ class Get { if (isset($config) && count($config)) { + // we do not yet have this set as an option + $config['remove_line_breaks'] = 2; // 2 is global (use the components value) // load application $this->app = JFactory::getApplication(); // Set the params @@ -891,6 +900,14 @@ class Get // set component context $this->componentContext = $this->componentCodeName . '.' . $this->componentID; + // set if language strings line breaks should be removed + $global = ((int) ComponentbuilderHelper::getVar( + 'joomla_component', $this->componentID, 'id', + 'remove_line_breaks' + ) == 1) ? true : false; + $this->removeLineBreaks = ((int) $config['remove_line_breaks'] == 0) + ? false + : (((int) $config['remove_line_breaks'] == 1) ? true : $global); // set if placeholders should be added to customcode $global = ((int) ComponentbuilderHelper::getVar( 'joomla_component', $this->componentID, 'id', @@ -2059,14 +2076,31 @@ class Get )) { $this->langContent[$target][$this->langPrefix . '_' . $language] - = trim($string); + = $this->fixLangString($string); } elseif (!isset($this->langContent[$target][$language])) { - $this->langContent[$target][$language] = trim($string); + $this->langContent[$target][$language] = $this->fixLangString($string); } } + /** + * We need to remove all text breaks from all language strings + * + * @param string $string The language string + * + * @return string + * + */ + public function fixLangString(&$string) + { + if ($this->removeLineBreaks) + { + return trim(str_replace(array(PHP_EOL, "\r", "\n"), '', $string)); + } + return trim($string); + } + /** * Get all Admin View Data * diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 99d8e4639..b9ac83c42 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -13454,63 +13454,81 @@ class Interpretation extends Fields $counter++; } } - $counter = $counter + 2; $data_value = (3 == $this->footableVersion) ? 'data-sort-value' - : 'data-value'; + : 'data-value'; + // add the defaults - $body .= PHP_EOL . $this->_t(2) - . "published == 1):?>"; - $body .= PHP_EOL . $this->_t(3) . ''; - $body .= PHP_EOL . $this->_t(4) - . 'langPrefix . "_PUBLISHED'" . '); ?>">'; - $body .= PHP_EOL . $this->_t(5) . 'langPrefix . "_PUBLISHED'" . '); ?>'; - $body .= PHP_EOL . $this->_t(4) . ''; - $body .= PHP_EOL . $this->_t(3) . ''; + if (!isset($this->fieldsNames[$viewName_single]['published'])) + { + $counter++; + // add the defaults + $body .= PHP_EOL . $this->_t(2) + . "published == 1):?>"; + $body .= PHP_EOL . $this->_t(3) . ''; + $body .= PHP_EOL . $this->_t(4) + . 'langPrefix . "_PUBLISHED'" + . '); ?>">'; + $body .= PHP_EOL . $this->_t(5) . 'langPrefix . "_PUBLISHED'" . '); ?>'; + $body .= PHP_EOL . $this->_t(4) . ''; + $body .= PHP_EOL . $this->_t(3) . ''; - $body .= PHP_EOL . $this->_t(2) - . "published == 0):?>"; - $body .= PHP_EOL . $this->_t(3) . ''; - $body .= PHP_EOL . $this->_t(4) - . 'langPrefix . "_INACTIVE'" . '); ?>">'; - $body .= PHP_EOL . $this->_t(5) . 'langPrefix . "_INACTIVE'" . '); ?>'; - $body .= PHP_EOL . $this->_t(4) . ''; - $body .= PHP_EOL . $this->_t(3) . ''; + $body .= PHP_EOL . $this->_t(2) + . "published == 0):?>"; + $body .= PHP_EOL . $this->_t(3) . ''; + $body .= PHP_EOL . $this->_t(4) + . 'langPrefix . "_INACTIVE'" + . '); ?>">'; + $body .= PHP_EOL . $this->_t(5) . 'langPrefix . "_INACTIVE'" . '); ?>'; + $body .= PHP_EOL . $this->_t(4) . ''; + $body .= PHP_EOL . $this->_t(3) . ''; - $body .= PHP_EOL . $this->_t(2) - . "published == 2):?>"; - $body .= PHP_EOL . $this->_t(3) . ''; - $body .= PHP_EOL . $this->_t(4) - . 'langPrefix . "_ARCHIVED'" . '); ?>">'; - $body .= PHP_EOL . $this->_t(5) . 'langPrefix . "_ARCHIVED'" . '); ?>'; - $body .= PHP_EOL . $this->_t(4) . ''; - $body .= PHP_EOL . $this->_t(3) . ''; + $body .= PHP_EOL . $this->_t(2) + . "published == 2):?>"; + $body .= PHP_EOL . $this->_t(3) . ''; + $body .= PHP_EOL . $this->_t(4) + . 'langPrefix . "_ARCHIVED'" + . '); ?>">'; + $body .= PHP_EOL . $this->_t(5) . 'langPrefix . "_ARCHIVED'" . '); ?>'; + $body .= PHP_EOL . $this->_t(4) . ''; + $body .= PHP_EOL . $this->_t(3) . ''; - $body .= PHP_EOL . $this->_t(2) - . "published == -2):?>"; - $body .= PHP_EOL . $this->_t(3) . ''; - $body .= PHP_EOL . $this->_t(4) - . 'langPrefix . "_TRASHED'" . '); ?>">'; - $body .= PHP_EOL . $this->_t(5) . 'langPrefix . "_TRASHED'" . '); ?>'; - $body .= PHP_EOL . $this->_t(4) . ''; - $body .= PHP_EOL . $this->_t(3) . ''; - $body .= PHP_EOL . $this->_t(2) . ''; + $body .= PHP_EOL . $this->_t(2) + . "published == -2):?>"; + $body .= PHP_EOL . $this->_t(3) . ''; + $body .= PHP_EOL . $this->_t(4) + . 'langPrefix . "_TRASHED'" + . '); ?>">'; + $body .= PHP_EOL . $this->_t(5) . 'langPrefix . "_TRASHED'" . '); ?>'; + $body .= PHP_EOL . $this->_t(4) . ''; + $body .= PHP_EOL . $this->_t(3) . ''; + $body .= PHP_EOL . $this->_t(2) . ''; + } - $body .= PHP_EOL . $this->_t(2) - . ''; - $body .= PHP_EOL . $this->_t(3) . "id; ?>"; - $body .= PHP_EOL . $this->_t(2) . ""; + // add the defaults + if (!isset($this->fieldsNames[$viewName_single]['id'])) + { + $counter++; + $body .= PHP_EOL . $this->_t(2) + . ''; + $body .= PHP_EOL . $this->_t(3) . "id; ?>"; + $body .= PHP_EOL . $this->_t(2) . ""; + } $body .= PHP_EOL . $this->_t(1) . ""; $body .= PHP_EOL . ""; $body .= PHP_EOL . ""; @@ -13714,17 +13732,25 @@ class Interpretation extends Fields ? 'data-hide="phone,tablet"' : 'data-breakpoints="xs sm md"'; $data_type = (2 == $this->footableVersion) ? 'data-type="numeric"' : 'data-type="number"'; - // set default - $head .= PHP_EOL . $this->_t(2) . ''; - $head .= PHP_EOL . $this->_t(3) . ""; - $head .= PHP_EOL . $this->_t(2) . ""; - $head .= PHP_EOL . $this->_t(2) . ''; - $head .= PHP_EOL . $this->_t(3) . ""; - $head .= PHP_EOL . $this->_t(2) . ""; + // add the defaults + if (!isset($this->fieldsNames[$viewName_single]['published'])) + { + $head .= PHP_EOL . $this->_t(2) . ''; + $head .= PHP_EOL . $this->_t(3) . ""; + $head .= PHP_EOL . $this->_t(2) . ""; + } + + // add the defaults + if (!isset($this->fieldsNames[$viewName_single]['id'])) + { + $head .= PHP_EOL . $this->_t(2) . ''; + $head .= PHP_EOL . $this->_t(3) . ""; + $head .= PHP_EOL . $this->_t(2) . ""; + } $head .= PHP_EOL . $this->_t(1) . ""; $head .= PHP_EOL . ""; diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index cb148d833..2637eb170 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -5947,6 +5947,9 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_LABEL="Global Helper Site E COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PUBLISHING="Publishing" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README="Readme" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README_LABEL="README.md" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_REMOVE_LINE_BREAKS="Remove Line Breaks" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_REMOVE_LINE_BREAKS_DESCRIPTION="Should we remove all line breaks ("\r", "\n") from all language strings in this component." +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_REMOVE_LINE_BREAKS_LABEL="Remove line breaks
from language strings" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS="Joomla Component Run Expansion Button Access" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER="Sales Server" diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php index 53dee80cd..7655afa57 100644 --- a/admin/layouts/joomla_component/details_left.php +++ b/admin/layouts/joomla_component/details_left.php @@ -31,13 +31,13 @@ $fields = $displayData->get($fields_tab_layout) ?: array( 'component_version', 'debug_linenr', 'add_placeholders', + 'remove_line_breaks', 'mvc_versiondate', 'note_version_options_one', 'note_version_options_two', 'note_version_options_three', 'short_description', - 'description', - 'copyright' + 'description' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php index 6889e0b66..718bbe56b 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -38,7 +38,8 @@ $fields = $displayData->get($fields_tab_layout) ?: array( 'whmcs_buy_link', 'license', 'bom', - 'image' + 'image', + 'copyright' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); diff --git a/admin/models/forms/joomla_component.xml b/admin/models/forms/joomla_component.xml index e70e433a3..ec7327d5f 100644 --- a/admin/models/forms/joomla_component.xml +++ b/admin/models/forms/joomla_component.xml @@ -292,6 +292,21 @@ + + + + + + - - - - - - - - - + + default="0" + required="true"> @@ -429,15 +417,13 @@ message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_MESSAGE" hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_HINT" /> - + + default="0"> @@ -460,19 +446,21 @@ message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_MESSAGE" hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT" /> - + + type="radio" + name="debug_linenr" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_LABEL" + description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_DESCRIPTION" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - + - - - - + type="textarea" + name="buildcompsql" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMPSQL_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMPSQL_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMPSQL_HINT" + required="true" + /> COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE - + @@ -539,11 +526,11 @@ - + @@ -566,11 +553,11 @@ message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_MESSAGE" hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_HINT" /> - + @@ -595,20 +582,19 @@ message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_MESSAGE" hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_HINT" /> - + - + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES + - + - + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEFAULT + - + @@ -679,11 +666,11 @@ hide_none="true" hide_default="true" /> - + @@ -701,6 +688,34 @@ description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_DESCRIPTION" directory="" /> + + + + + + + + array( 'companyname', @@ -55,7 +55,8 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin 'whmcs_buy_link', 'license', 'bom', - 'image' + 'image', + 'copyright' ), 'above' => array( 'system_name' diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 76e3e7ea5..54dcfed86 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -70,6 +70,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` ( `php_preflight_update` MEDIUMTEXT NOT NULL, `php_site_event` MEDIUMTEXT NOT NULL, `readme` TEXT NOT NULL, + `remove_line_breaks` TINYINT(1) NOT NULL DEFAULT 0, `sales_server` INT(11) NOT NULL DEFAULT 0, `short_description` VARCHAR(255) NOT NULL DEFAULT '', `sql` MEDIUMTEXT NOT NULL, @@ -108,6 +109,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` ( 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`), @@ -115,8 +117,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` ( KEY `idx_addreadme` (`addreadme`), KEY `idx_debug_linenr` (`debug_linenr`), KEY `idx_add_license` (`add_license`), - KEY `idx_add_php_helper_both` (`add_php_helper_both`), 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`), @@ -162,7 +164,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module` ( `class_helper_code` MEDIUMTEXT NOT NULL, `class_helper_header` TEXT NOT NULL, `custom_get` TEXT NOT NULL, - `default` TEXT NOT NULL, + `default` MEDIUMTEXT NOT NULL, `description` TEXT NOT NULL, `fields` TEXT NOT NULL, `guid` VARCHAR(36) NOT NULL DEFAULT '', @@ -476,7 +478,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` ( `css_document` TEXT NOT NULL, `custom_button` TEXT NOT NULL, `custom_get` TEXT NOT NULL, - `default` TEXT NOT NULL, + `default` MEDIUMTEXT NOT NULL, `description` VARCHAR(255) NOT NULL DEFAULT '', `dynamic_get` INT(11) NOT NULL DEFAULT 0, `guid` VARCHAR(36) NOT NULL DEFAULT '', @@ -552,7 +554,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` ( `css_document` TEXT NOT NULL, `custom_button` TEXT NOT NULL, `custom_get` TEXT NOT NULL, - `default` TEXT NOT NULL, + `default` MEDIUMTEXT NOT NULL, `description` VARCHAR(255) NOT NULL DEFAULT '', `dynamic_get` INT(11) NOT NULL DEFAULT 0, `guid` VARCHAR(36) NOT NULL DEFAULT '', diff --git a/componentbuilder.xml b/componentbuilder.xml index fdf4978f3..7fecd3e17 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,15 +1,15 @@ COM_COMPONENTBUILDER - 13th August, 2020 + 19th August, 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.11.4 + 2.11.6 Component Builder (v.2.11.4) +

Component Builder (v.2.11.6)

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 a139216fd..10bb0d0ca 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -968,4 +968,38 @@ http://www.joomlacomponentbuilder.com + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.11.5 + http://www.joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.11.6/JCB_v2.11.6.zip + + + stable + + Llewellyn van der Merwe + http://www.joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.11.6 + http://www.joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.11.6/JCB_v2.11.6.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 e76d0441a..12adeaa52 100644 --- a/script.php +++ b/script.php @@ -6003,9 +6003,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","add_placeholders":"add_placeholders","add_php_helper_site":"add_php_helper_site","add_javascript":"add_javascript","description":"description","dashboard":"dashboard","copyright":"copyright","add_php_postflight_update":"add_php_postflight_update","author":"author","addreadme":"addreadme","email":"email","debug_linenr":"debug_linenr","website":"website","buildcompsql":"buildcompsql","add_license":"add_license","add_php_helper_both":"add_php_helper_both","license_type":"license_type","add_admin_event":"add_admin_event","add_site_event":"add_site_event","whmcs_key":"whmcs_key","add_css_admin":"add_css_admin","whmcs_url":"whmcs_url","dashboard_type":"dashboard_type","whmcs_buy_link":"whmcs_buy_link","add_php_preflight_install":"add_php_preflight_install","license":"license","add_php_postflight_install":"add_php_postflight_install","bom":"bom","add_php_method_uninstall":"add_php_method_uninstall","image":"image","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_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->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","add_placeholders","add_php_helper_site","add_javascript","add_php_postflight_update","addreadme","debug_linenr","add_license","add_php_helper_both","license_type","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","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"}]}'; // Set the object into the content types table. $joomla_component_Inserted = $db->insertObject('#__content_types', $joomla_component); @@ -7428,9 +7428,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","add_placeholders":"add_placeholders","add_php_helper_site":"add_php_helper_site","add_javascript":"add_javascript","description":"description","dashboard":"dashboard","copyright":"copyright","add_php_postflight_update":"add_php_postflight_update","author":"author","addreadme":"addreadme","email":"email","debug_linenr":"debug_linenr","website":"website","buildcompsql":"buildcompsql","add_license":"add_license","add_php_helper_both":"add_php_helper_both","license_type":"license_type","add_admin_event":"add_admin_event","add_site_event":"add_site_event","whmcs_key":"whmcs_key","add_css_admin":"add_css_admin","whmcs_url":"whmcs_url","dashboard_type":"dashboard_type","whmcs_buy_link":"whmcs_buy_link","add_php_preflight_install":"add_php_preflight_install","license":"license","add_php_postflight_install":"add_php_postflight_install","bom":"bom","add_php_method_uninstall":"add_php_method_uninstall","image":"image","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_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->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","add_placeholders","add_php_helper_site","add_javascript","add_php_postflight_update","addreadme","debug_linenr","add_license","add_php_helper_both","license_type","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","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"}]}'; // Check if joomla_component type is already in content_type DB. $joomla_component_id = null; @@ -9213,7 +9213,7 @@ class com_componentbuilderInstallerScript echo ' -

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

'; +

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

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