From 655708cfa3641ff2326f53db342554158ae0a24b Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Thu, 2 Feb 2017 13:54:07 +0200 Subject: [PATCH] Bug fixes, error on compilation when using view date & version was fixed, headercheck file missing was fixed. Added swithces to controle custom import placeholders and if view version and date should be used --- README.md | 8 +- admin/README.txt | 8 +- admin/access.xml | 4 + admin/assets/css/admin.css | 2 +- admin/assets/css/compiler.css | 27 + admin/assets/css/component.css | 4 +- admin/assets/css/components.css | 4 +- admin/assets/css/dashboard.css | 2 +- admin/compiler/joomla_3/headercheck_admin.php | 88 ++ admin/compiler/joomla_3/settings.json | 7 + admin/componentbuilder.php | 2 +- admin/controller.php | 2 +- admin/controllers/ajax.json.php | 2 +- admin/controllers/compiler.php | 30 +- admin/controllers/component.php | 4 +- admin/controllers/componentbuilder.php | 2 +- admin/controllers/components.php | 4 +- admin/controllers/help.php | 2 +- admin/controllers/import.php | 2 +- admin/helpers/compiler.php | 8 +- admin/helpers/compiler/a_Get.php | 14 +- admin/helpers/compiler/b_Structure.php | 54 +- admin/helpers/compiler/c_Fields.php | 4 +- admin/helpers/compiler/e_Interpretation.php | 42 +- admin/helpers/componentbuilder.php | 4 +- admin/helpers/headercheck.php | 85 ++ admin/helpers/html/batch_.php | 2 +- admin/helpers/indenter.php | 2 +- admin/helpers/js.php | 2 +- admin/helpers/minify.php | 2 +- .../en-GB/en-GB.com_componentbuilder.ini | 17 + admin/layouts/admin_view/css_fullwidth.php | 2 +- .../admin_view/custom_buttons_fullwidth.php | 2 +- .../admin_view/custom_buttons_left.php | 2 +- .../admin_view/custom_import_fullwidth.php | 2 +- admin/layouts/admin_view/fields_fullwidth.php | 2 +- .../admin_view/javascript_fullwidth.php | 2 +- .../linked_components_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_left.php | 2 +- admin/layouts/admin_view/php_fullwidth.php | 2 +- admin/layouts/admin_view/publishing.php | 2 +- admin/layouts/admin_view/publlshing.php | 2 +- admin/layouts/admin_view/settings_above.php | 2 +- admin/layouts/admin_view/settings_left.php | 2 +- admin/layouts/admin_view/settings_right.php | 2 +- admin/layouts/admin_view/settings_under.php | 2 +- admin/layouts/batchselection.php | 2 +- .../component/admin_views_fullwidth.php | 2 +- .../custom_admin_views_fullwidth.php | 2 +- admin/layouts/component/details_above.php | 2 +- admin/layouts/component/details_left.php | 4 +- admin/layouts/component/details_right.php | 2 +- admin/layouts/component/details_under.php | 2 +- .../dynamic_build_beta_fullwidth.php | 2 +- .../dynamic_integration_fullwidth.php | 2 +- .../component/libs_helpers_fullwidth.php | 2 +- admin/layouts/component/mysql_fullwidth.php | 2 +- admin/layouts/component/php_fullwidth.php | 2 +- admin/layouts/component/publishing.php | 2 +- admin/layouts/component/publlshing.php | 2 +- admin/layouts/component/readme_left.php | 2 +- admin/layouts/component/readme_right.php | 2 +- admin/layouts/component/settings_left.php | 8 +- admin/layouts/component/settings_right.php | 6 +- .../component/site_views_fullwidth.php | 2 +- .../custom_buttons_fullwidth.php | 2 +- .../custom_admin_view/custom_buttons_left.php | 2 +- .../custom_script_fullwidth.php | 2 +- .../custom_admin_view/details_above.php | 2 +- .../custom_admin_view/details_fullwidth.php | 2 +- .../custom_admin_view/details_left.php | 2 +- .../custom_admin_view/details_right.php | 2 +- .../custom_admin_view/details_rightside.php | 2 +- .../custom_admin_view/details_under.php | 2 +- .../linked_components_fullwidth.php | 2 +- .../layouts/custom_admin_view/publishing.php | 2 +- .../layouts/custom_admin_view/publlshing.php | 2 +- admin/layouts/custom_code/details_above.php | 2 +- .../layouts/custom_code/details_fullwidth.php | 2 +- admin/layouts/custom_code/details_left.php | 2 +- admin/layouts/custom_code/details_right.php | 2 +- admin/layouts/custom_code/publishing.php | 2 +- admin/layouts/custom_code/publlshing.php | 2 +- .../layouts/dynamic_get/abacus_fullwidth.php | 2 +- admin/layouts/dynamic_get/abacus_left.php | 2 +- .../dynamic_get/custom_script_fullwidth.php | 2 +- admin/layouts/dynamic_get/gettable_above.php | 2 +- .../dynamic_get/gettable_fullwidth.php | 2 +- admin/layouts/dynamic_get/gettable_left.php | 2 +- admin/layouts/dynamic_get/gettable_right.php | 2 +- admin/layouts/dynamic_get/gettable_under.php | 2 +- admin/layouts/dynamic_get/publishing.php | 2 +- admin/layouts/dynamic_get/publlshing.php | 2 +- admin/layouts/field/details_fullwidth.php | 2 +- admin/layouts/field/details_left.php | 2 +- admin/layouts/field/details_right.php | 2 +- admin/layouts/field/details_under.php | 2 +- .../field/linked_admin_views_fullwidth.php | 2 +- admin/layouts/field/publishing.php | 2 +- admin/layouts/field/publlshing.php | 2 +- admin/layouts/field/scripts_left.php | 2 +- admin/layouts/field/scripts_right.php | 2 +- admin/layouts/fieldtype/details_left.php | 2 +- admin/layouts/fieldtype/details_right.php | 2 +- admin/layouts/fieldtype/fields_fullwidth.php | 2 +- admin/layouts/fieldtype/publishing.php | 2 +- admin/layouts/fieldtype/publlshing.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/help_document/publlshing.php | 2 +- .../layout/custom_script_fullwidth.php | 2 +- admin/layouts/layout/details_fullwidth.php | 2 +- admin/layouts/layout/details_left.php | 2 +- admin/layouts/layout/details_right.php | 2 +- admin/layouts/layout/details_rightside.php | 2 +- admin/layouts/layout/details_under.php | 2 +- admin/layouts/layout/publishing.php | 2 +- admin/layouts/layout/publlshing.php | 2 +- .../site_view/custom_buttons_fullwidth.php | 2 +- admin/layouts/site_view/details_above.php | 2 +- admin/layouts/site_view/details_fullwidth.php | 2 +- admin/layouts/site_view/details_left.php | 2 +- admin/layouts/site_view/details_right.php | 2 +- admin/layouts/site_view/details_rightside.php | 2 +- admin/layouts/site_view/details_under.php | 2 +- .../site_view/javascript_css_fullwidth.php | 2 +- .../site_view/linked_components_fullwidth.php | 2 +- admin/layouts/site_view/php_fullwidth.php | 2 +- admin/layouts/site_view/publishing.php | 2 +- admin/layouts/site_view/publlshing.php | 2 +- admin/layouts/snippet/details_above.php | 2 +- admin/layouts/snippet/details_left.php | 2 +- admin/layouts/snippet/details_right.php | 2 +- admin/layouts/snippet/publishing.php | 2 +- admin/layouts/snippet/publlshing.php | 2 +- .../template/custom_script_fullwidth.php | 2 +- admin/layouts/template/details_fullwidth.php | 2 +- admin/layouts/template/details_left.php | 2 +- admin/layouts/template/details_right.php | 2 +- admin/layouts/template/details_rightside.php | 2 +- admin/layouts/template/details_under.php | 2 +- admin/layouts/template/publishing.php | 2 +- admin/layouts/template/publlshing.php | 2 +- admin/models/admin_view.php | 2 +- admin/models/ajax.php | 4 +- admin/models/compiler.php | 120 +- admin/models/component.php | 30 +- admin/models/componentbuilder.php | 4 +- admin/models/components.php | 12 +- admin/models/custom_admin_view.php | 2 +- admin/models/custom_code.php | 2 +- admin/models/dynamic_get.php | 2 +- admin/models/field.php | 2 +- admin/models/fields/adminviewfolderlist.php | 2 +- admin/models/fields/adminviews.php | 2 +- admin/models/fields/articles.php | 2 +- admin/models/fields/component.php | 2 +- admin/models/fields/customadminviews.php | 2 +- admin/models/fields/customfilelist.php | 2 +- admin/models/fields/customfolderlist.php | 2 +- admin/models/fields/customgets.php | 2 +- admin/models/fields/dbtables.php | 2 +- admin/models/fields/dynamicgets.php | 2 +- admin/models/fields/fields.php | 2 +- admin/models/fields/fieldsmulti.php | 2 +- admin/models/fields/fieldtypes.php | 2 +- admin/models/fields/maingets.php | 2 +- admin/models/fields/siteviewfolderlist.php | 2 +- admin/models/fields/siteviews.php | 2 +- admin/models/fields/snippets.php | 2 +- admin/models/fieldtype.php | 2 +- admin/models/forms/component.js | 4 +- admin/models/forms/component.xml | 1044 +++++++++-------- admin/models/help_document.php | 2 +- admin/models/import.php | 2 +- admin/models/layout.php | 2 +- admin/models/site_view.php | 2 +- admin/models/snippet.php | 2 +- admin/models/template.php | 2 +- admin/sql/install.mysql.utf8.sql | 22 +- admin/tables/component.php | 4 +- admin/views/compiler/tmpl/default.php | 37 +- admin/views/compiler/view.html.php | 195 ++- admin/views/component/submitbutton.js | 4 +- admin/views/component/tmpl/edit.php | 4 +- admin/views/component/view.html.php | 4 +- admin/views/componentbuilder/tmpl/default.php | 2 +- ...sed_issues_the_closed_issues_on_github.php | 2 +- .../componentbuilder/tmpl/default_main.php | 2 +- ..._open_issues_the_open_issues_on_github.php | 2 +- .../tmpl/default_readme_information.php | 2 +- ...t_vast_development_method_notice_board.php | 2 +- .../componentbuilder/tmpl/default_vdm.php | 2 +- admin/views/componentbuilder/view.html.php | 2 +- admin/views/components/tmpl/default.php | 4 +- .../components/tmpl/default_batch_body.php | 4 +- .../components/tmpl/default_batch_footer.php | 4 +- admin/views/components/tmpl/default_body.php | 4 +- admin/views/components/tmpl/default_foot.php | 4 +- admin/views/components/tmpl/default_head.php | 4 +- .../views/components/tmpl/default_toolbar.php | 4 +- admin/views/components/view.html.php | 4 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- componentbuilder.xml | 2 +- script.php | 10 +- 211 files changed, 1401 insertions(+), 895 deletions(-) create mode 100644 admin/assets/css/compiler.css create mode 100644 admin/compiler/joomla_3/headercheck_admin.php create mode 100644 admin/helpers/headercheck.php diff --git a/README.md b/README.md index b92d4dcd3..ad63e6cbd 100644 --- a/README.md +++ b/README.md @@ -104,13 +104,13 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:info@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 1st February, 2017 ++ *Last Build*: 2nd February, 2017 + *Version*: 2.2.9 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **90719** -+ *File count*: **583** -+ *Folder count*: **104** ++ *Line count*: **91088** ++ *File count*: **587** ++ *Folder count*: **105** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io) diff --git a/admin/README.txt b/admin/README.txt index b92d4dcd3..ad63e6cbd 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -104,13 +104,13 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:info@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 1st February, 2017 ++ *Last Build*: 2nd February, 2017 + *Version*: 2.2.9 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **90719** -+ *File count*: **583** -+ *Folder count*: **104** ++ *Line count*: **91088** ++ *File count*: **587** ++ *Folder count*: **105** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io) diff --git a/admin/access.xml b/admin/access.xml index e523483c9..d718a48ed 100644 --- a/admin/access.xml +++ b/admin/access.xml @@ -23,6 +23,10 @@ + + + + diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index b8bc0473e..2726d5476 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/compiler.css b/admin/assets/css/compiler.css new file mode 100644 index 000000000..3cdb642db --- /dev/null +++ b/admin/assets/css/compiler.css @@ -0,0 +1,27 @@ +/*--------------------------------------------------------------------------------------------------------| www.vdm.io |------/ + __ __ _ _____ _ _ __ __ _ _ _ + \ \ / / | | | __ \ | | | | | \/ | | | | | | | + \ \ / /_ _ ___| |_ | | | | _____ _____| | ___ _ __ _ __ ___ ___ _ __ | |_ | \ / | ___| |_| |__ ___ __| | + \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | + \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | + \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| + | | + |_| +/-------------------------------------------------------------------------------------------------------------------------------/ + + @version @update number 11 of this MVC + @build 2nd February, 2017 + @created 1st February, 2017 + @package Component Builder + @subpackage compiler.css + @author Llewellyn van der Merwe + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +/* CSS Document */ + + diff --git a/admin/assets/css/component.css b/admin/assets/css/component.css index 0d831343f..27f2d287b 100644 --- a/admin/assets/css/component.css +++ b/admin/assets/css/component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage component.css diff --git a/admin/assets/css/components.css b/admin/assets/css/components.css index 5e1e5fec9..2a5a1151d 100644 --- a/admin/assets/css/components.css +++ b/admin/assets/css/components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage components.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index ef7f9f540..b26bea8e6 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/compiler/joomla_3/headercheck_admin.php b/admin/compiler/joomla_3/headercheck_admin.php new file mode 100644 index 000000000..6b314cf7c --- /dev/null +++ b/admin/compiler/joomla_3/headercheck_admin.php @@ -0,0 +1,88 @@ + + @my wife Roline van der Merwe + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); +?> +###BOM### + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +class HeaderCheck +{ + function js_loaded($script_name) + { + // UIkit check point + if (strpos($script_name,'uikit') !== false) + { + $app = JFactory::getApplication(); + $getTemplateName = $app->getTemplate('template')->template; + + if (strpos($getTemplateName,'yoo') !== false) + { + return true; + } + } + + $document = JFactory::getDocument(); + $head_data = $document->getHeadData(); + foreach (array_keys($head_data['scripts']) as $script) + { + if (stristr($script, $script_name)) + { + return true; + } + } + + return false; + } + + function css_loaded($script_name) + { + // UIkit check point + if (strpos($script_name,'uikit') !== false) + { + $app = JFactory::getApplication(); + $getTemplateName = $app->getTemplate('template')->template; + + if (strpos($getTemplateName,'yoo') !== false) + { + return true; + } + } + + $document = JFactory::getDocument(); + $head_data = $document->getHeadData(); + + foreach (array_keys($head_data['styleSheets']) as $script) + { + if (stristr($script, $script_name)) + { + return true; + } + } + + return false; + } +} \ No newline at end of file diff --git a/admin/compiler/joomla_3/settings.json b/admin/compiler/joomla_3/settings.json index 1c29566bf..701989347 100644 --- a/admin/compiler/joomla_3/settings.json +++ b/admin/compiler/joomla_3/settings.json @@ -187,6 +187,13 @@ "rename": false, "type": "file" }, + "headercheck_admin.php": { + "naam":"headercheck_admin.php", + "path": "c0mp0n3nt/admin/helpers", + "rename": "new", + "newName": "headercheck.php", + "type": "file" + }, "LICENSE.txt": { "naam":"LICENSE.txt", "path": "c0mp0n3nt/", diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index db43e39fe..eb7258512 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index 26f25a1f5..940c26b64 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 05b8d2ced..89c06598a 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php index 9ffeca6f7..39c3153f1 100644 --- a/admin/controllers/compiler.php +++ b/admin/controllers/compiler.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.9 - @build 1st February, 2017 - @created 30th April, 2015 + @version @update number 11 of this MVC + @build 2nd February, 2017 + @created 1st February, 2017 @package Component Builder @subpackage compiler.php @author Llewellyn van der Merwe @@ -32,8 +32,26 @@ jimport('joomla.application.component.controlleradmin'); /** * Compiler Controller */ -class ComponentbuilderControllerCompiler extends JControllerLegacy +class ComponentbuilderControllerCompiler extends JControllerAdmin { + protected $text_prefix = 'COM_COMPONENTBUILDER_COMPILER'; + /** + * Proxy for getModel. + * @since 2.5 + */ + public function getModel($name = 'Compiler', $prefix = 'ComponentbuilderModel', $config = array()) + { + $model = parent::getModel($name, $prefix, array('ignore_request' => true)); + + return $model; + } + + public function dashboard() + { + $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder', false)); + return; + } + /** * Import an spreadsheet. * @@ -53,6 +71,8 @@ class ComponentbuilderControllerCompiler extends JControllerLegacy $version = $jinput->post->get('version', 0, 'INT'); $addBackup = $jinput->post->get('backup', 0, 'INT'); $addGit = $jinput->post->get('git', 0, 'INT'); + // include component compiler + require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/compiler.php'; $model = $this->getModel('compiler'); if ($model->builder($version,$componentId,$addBackup,$addGit)) { @@ -68,7 +88,7 @@ class ComponentbuilderControllerCompiler extends JControllerLegacy $app = JFactory::getApplication(); $redirect_url = $app->getUserState('com_componentbuilder.redirect_url'); $message = $app->getUserState('com_componentbuilder.message'); - if (empty($redirect_url)) + if (empty($redirect_url) && $componentId > 0) { $redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=compiler', false); // setup the unrealistic numbers diff --git a/admin/controllers/component.php b/admin/controllers/component.php index df24d3e84..d05ee162a 100644 --- a/admin/controllers/component.php +++ b/admin/controllers/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage component.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 9001a1b20..5cc9274c6 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/components.php b/admin/controllers/components.php index e6cbaffe7..24674c7d3 100644 --- a/admin/controllers/components.php +++ b/admin/controllers/components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage components.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 77d6292b5..65e9dcfea 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index fab973fb5..659cd64a3 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php index 7f8f5251e..e27fd6052 100644 --- a/admin/helpers/compiler.php +++ b/admin/helpers/compiler.php @@ -225,7 +225,7 @@ class Compiler extends Infusion $two = 0; foreach ($this->newFiles['static'] as $static) { - if (('README.md' == $static['name'] || 'README.txt' == $static['name']) && $this->componentData->addreadme && JFile::exists($static['path'])) + if (('README.md' === $static['name'] || 'README.txt' === $static['name']) && $this->componentData->addreadme && JFile::exists($static['path'])) { $this->buildReadMe($static['path']); $two++; @@ -350,7 +350,7 @@ class Compiler extends Infusion { foreach ($data['config'] as $key => $value) { - if ('###VERSION###' == $key) + if ('###VERSION###' === $key) { // hmm we sould in some way make it known that this version number // is not in relation the the project but to the file only... any ideas? @@ -563,11 +563,11 @@ class Compiler extends Infusion { foreach ($options as $option => $value) { - if ('timeout' == $option) + if ('timeout' === $option) { $options[$option] = (int) $value; } - if ('type' == $option) + if ('type' === $option) { $options[$option] = (string) $value; } diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index e1fe1f84d..2be652653 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -54,12 +54,12 @@ class Get /* The custom script placeholders - we use the (xxx) to avoid detection it should be (***) * - * New Insert Code = /xxx[INSERT<>$$$$]xxx/ /xxx[/INSERT<>$$$$]xxx/ + * New Insert Code = /xxx[INSERT<>$$$$]xxx/ /xxx[/INSERT<>$$$$]xxx/ * New Replace Code = /xxx[REPLACE<>$$$$]xxx/ /xxx[/REPLACE<>$$$$]xxx/ * * //////////////////////////// when JCB adds it back /////////////////////////////// - * JCB Add Inserted Code = /xxx[INSERTED$$$$]xxx/ //23 /xxx[/INSERTED$$$$]xxx/ - * JCB Add Replaced Code = /xxx[REPLACED$$$$]xxx/ //25 /xxx[/REPLACED$$$$]xxx/ + * JCB Add Inserted Code = /xxx[INSERTED$$$$]xxx///23 /xxx[/INSERTED$$$$]xxx/ + * JCB Add Replaced Code = /xxx[REPLACED$$$$]xxx///25 /xxx[/REPLACED$$$$]xxx/ * * ///////////////////////// changeing existing custom code ///////////////////////// * Update Inserted Code = /xxx[INSERTED<>$$$$]xxx///23 /xxx[/INSERTED<>$$$$]xxx/ @@ -798,7 +798,7 @@ class Get { foreach ($values as $nr => $value) { - if ('html' == $option) + if ('html' === $option) { $value = $this->setCustomContentLang($value); } @@ -2197,13 +2197,13 @@ class Get if (ComponentbuilderHelper::checkArray($lines)) { $db = JFactory::getDbo(); - if ('db' == $type) + if ('db' === $type) { $table = '#__'.$asset; $queryName = $asset; $view = ''; } - elseif ('view' == $type) + elseif ('view' === $type) { $view = $this->getViewTableName($asset); $table = '#__'.$this->componentCodeName.'_'.$view; @@ -2229,7 +2229,7 @@ class Get $get = trim($get); $key = trim($key); // only add the view - if ('a' != $as && 1 == $row_type && 'view' == $type && strpos('#'.$key,'#'.$view.'_') === false) + if ('a' != $as && 1 == $row_type && 'view' === $type && strpos('#'.$key,'#'.$view.'_') === false) { $key = $view.'_'.trim($key); } diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php index 84f2fafc9..8e457e931 100644 --- a/admin/helpers/compiler/b_Structure.php +++ b/admin/helpers/compiler/b_Structure.php @@ -448,24 +448,25 @@ class Structure extends Get { if (ComponentbuilderHelper::checkObject($view['settings'])) { + $created = $this->getCreatedDate($view); $modified = $this->getLastModifiedDate($view); if ($view['settings']->name_list != 'null') { $target = array('admin' => $view['settings']->name_list); - $config = array('###CREATIONDATE###' => JFactory::getDate($view['settings']->created)->format('jS F, Y'), '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version); + $config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version); $this->buildDynamique($target,'list', false, $config); } if ($view['settings']->name_single != 'null') { $target = array('admin' => $view['settings']->name_single); - $config = array('###CREATIONDATE###' => JFactory::getDate($view['settings']->created)->format('jS F, Y'), '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version); + $config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version); $this->buildDynamique($target,'single', false, $config); } if($view['edit_create_site_view']) { // setup the front site edit-view files $target = array('site' => $view['settings']->name_single); - $config = array('###CREATIONDATE###' => JFactory::getDate($view['settings']->created)->format('jS F, Y'), '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version); + $config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version); $this->buildDynamique($target,'edit', false, $config); } } @@ -483,19 +484,20 @@ class Structure extends Get foreach ($this->componentData->site_views as $nr => $view) { + $created = $this->getCreatedDate($view); $modified = $this->getLastModifiedDate($view); if ($view['settings']->main_get->gettype == 2) { // set list view $target = array('site' => $view['settings']->code); - $config = array('###CREATIONDATE###' => JFactory::getDate($view['settings']->created)->format('jS F, Y'), '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version); + $config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version); $this->buildDynamique($target,'list', false, $config); } elseif ($view['settings']->main_get->gettype == 1) { // set single view $target = array('site' => $view['settings']->code); - $config = array('###CREATIONDATE###' => JFactory::getDate($view['settings']->created)->format('jS F, Y'), '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version); + $config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version); $this->buildDynamique($target,'single', false, $config); } } @@ -505,19 +507,20 @@ class Structure extends Get { foreach ($this->componentData->custom_admin_views as $nr => $view) { + $created = $this->getCreatedDate($view); $modified = $this->getLastModifiedDate($view); if ($view['settings']->main_get->gettype == 2) { - // set list view + // set list view$view $target = array('custom_admin' => $view['settings']->code); - $config = array('###CREATIONDATE###' => JFactory::getDate($view['settings']->created)->format('jS F, Y'), '###BUILDDATE###' => JFactory::getDate($view['settings']->modified)->format('jS F, Y'),'###VERSION###' => $view['settings']->version); + $config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => JFactory::getDate($view['settings']->modified)->format('jS F, Y'),'###VERSION###' => $view['settings']->version); $this->buildDynamique($target,'list', false, $config); } elseif ($view['settings']->main_get->gettype == 1) { // set single view $target = array('custom_admin' => $view['settings']->code); - $config = array('###CREATIONDATE###' => JFactory::getDate($view['settings']->created)->format('jS F, Y'), '###BUILDDATE###' => JFactory::getDate($view['settings']->modified)->format('jS F, Y'),'###VERSION###' => $view['settings']->version); + $config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => JFactory::getDate($view['settings']->modified)->format('jS F, Y'),'###VERSION###' => $view['settings']->version); $this->buildDynamique($target, 'single', false, $config); } } @@ -531,6 +534,29 @@ class Structure extends Get return false; } + /** + * get the created date of the (view) + * + * @param array $view The view values + * + * @return string Last Modified Date + * + */ + public function getCreatedDate($view) + { + if (isset($view['settings']->created) && ComponentbuilderHelper::checkString($view['settings']->created)) + { + // first set the main date + $date = strtotime($view['settings']->created); + } + else + { + // first set the main date + $date = strtotime("now"); + } + return JFactory::getDate($date)->format('jS F, Y'); + } + /** * get the last modified date of a MVC (view) * @@ -541,8 +567,16 @@ class Structure extends Get */ public function getLastModifiedDate($view) { - // first set the main date - $date = strtotime($view['settings']->modified); + if (isset($view['settings']->modified) && ComponentbuilderHelper::checkString($view['settings']->modified)) + { + // first set the main date + $date = strtotime($view['settings']->modified); + } + else + { + // first set the main date + $date = strtotime("now"); + } if (isset($view['adminview'])) { $id = $view['adminview'].'admin'; diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php index 73cde20e0..1109c7a82 100644 --- a/admin/helpers/compiler/c_Fields.php +++ b/admin/helpers/compiler/c_Fields.php @@ -1018,7 +1018,7 @@ class Fields extends Structure } $fieldSet .= "\n\t\t" . $taber . "/>"; // incase the field is in the config and has not been set - if ('config' == $viewName && 'configs' == $listViewName) + if ('config' === $viewName && 'configs' === $listViewName) { // set lang (just incase) $listLangName = $langView . '_' . ComponentbuilderHelper::safeString($name, 'U'); @@ -1350,7 +1350,7 @@ class Fields extends Structure { $xmlValue = (string) ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"'); // add the multipal - if ('true' == $xmlValue) + if ('true' === $xmlValue) { $multiple = true; } diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 4f4b1d524..b2804d210 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -281,15 +281,15 @@ class Interpretation extends Fields $encrypt[] = "\t\t\$session = JFactory::getSession();"; $encrypt[] = "\t\t\$V2uekt2wcgwk = \$session->get(\$Vk5smi0wjnjb, null);"; $encrypt[] = "\t\t\$h4sgrGsqq = \$this->get(\$Vk5smi0wjnjb,\$V2uekt2wcgwk);"; - $encrypt[] = "\t\tif (isset(\$h4sgrGsqq['nuut']) && \$h4sgrGsqq['nuut'] && (isset(\$h4sgrGsqq['status']) && 'Active' == \$h4sgrGsqq['status']) && isset(\$h4sgrGsqq['eiegrendel']) && strlen(\$h4sgrGsqq['eiegrendel']) > 300)"; + $encrypt[] = "\t\tif (isset(\$h4sgrGsqq['nuut']) && \$h4sgrGsqq['nuut'] && (isset(\$h4sgrGsqq['status']) && 'Active' === \$h4sgrGsqq['status']) && isset(\$h4sgrGsqq['eiegrendel']) && strlen(\$h4sgrGsqq['eiegrendel']) > 300)"; $encrypt[] = "\t\t{"; $encrypt[] = "\t\t\t\$session->set(\$Vk5smi0wjnjb, \$h4sgrGsqq['eiegrendel']);"; $encrypt[] = "\t\t}"; - $encrypt[] = "\t\tif ((isset(\$h4sgrGsqq['status']) && 'Active' == \$h4sgrGsqq['status']) && isset(\$h4sgrGsqq['md5hash']) && strlen(\$h4sgrGsqq['md5hash']) == 32 && isset(\$h4sgrGsqq['customfields']) && strlen(\$h4sgrGsqq['customfields']) > 4)"; + $encrypt[] = "\t\tif ((isset(\$h4sgrGsqq['status']) && 'Active' === \$h4sgrGsqq['status']) && isset(\$h4sgrGsqq['md5hash']) && strlen(\$h4sgrGsqq['md5hash']) == 32 && isset(\$h4sgrGsqq['customfields']) && strlen(\$h4sgrGsqq['customfields']) > 4)"; $encrypt[] = "\t\t{"; $encrypt[] = "\t\t\t\$this->_key = md5(\$h4sgrGsqq['customfields']);"; $encrypt[] = "\t\t}"; - $encrypt[] = "\t\tif ((isset(\$h4sgrGsqq['status']) && 'Active' == \$h4sgrGsqq['status']) && isset(\$h4sgrGsqq['md5hash']) && strlen(\$h4sgrGsqq['md5hash']) == 32 )"; + $encrypt[] = "\t\tif ((isset(\$h4sgrGsqq['status']) && 'Active' === \$h4sgrGsqq['status']) && isset(\$h4sgrGsqq['md5hash']) && strlen(\$h4sgrGsqq['md5hash']) == 32 )"; $encrypt[] = "\t\t{"; $encrypt[] = "\t\t\t\$this->_is = true;"; $encrypt[] = "\t\t}"; @@ -462,7 +462,7 @@ class Interpretation extends Fields $function[] = "\t{"; $function[] = "\t\t//".$this->setLine(__LINE__)." Get the global params"; $function[] = "\t\t\$params = JComponentHelper::getParams('com_".$component."', true);"; - $function[] = "\t\tif ('advanced' == \$type)"; + $function[] = "\t\tif ('advanced' === \$type)"; $function[] = "\t\t{"; $function[] = "\t\t\t\$advanced_key = \$params->get('advanced_key', \$default);"; $function[] = "\t\t\tif (\$advanced_key)"; @@ -473,7 +473,7 @@ class Interpretation extends Fields $function[] = "\n\t\t\t\treturn \$the->_key;"; $function[] = "\t\t\t}"; $function[] = "\t\t}"; - $function[] = "\t\telseif ('basic' == \$type)"; + $function[] = "\t\telseif ('basic' === \$type)"; $function[] = "\t\t{"; $function[] = "\t\t\t\$basic_key = \$params->get('basic_key', \$default);"; $function[] = "\t\t\tif (\$basic_key)"; @@ -488,7 +488,7 @@ class Interpretation extends Fields { $function[] = "\n\n\tpublic static function getCryptKey(\$type, \$default = null)"; $function[] = "\t{"; - $function[] = "\t\tif ('advanced' == \$type)"; + $function[] = "\t\tif ('advanced' === \$type)"; $function[] = "\t\t{"; $function[] = "\t\t\t//".$this->setLine(__LINE__)." Get the global params"; $function[] = "\t\t\t\$params = JComponentHelper::getParams('com_".$component."', true);"; @@ -508,7 +508,7 @@ class Interpretation extends Fields { $function[] = "\n\n\tpublic static function getCryptKey(\$type, \$default = null)"; $function[] = "\t{"; - $function[] = "\t\tif ('basic' == \$type)"; + $function[] = "\t\tif ('basic' === \$type)"; $function[] = "\t\t{"; $function[] = "\t\t\t//".$this->setLine(__LINE__)." Get the global params"; $function[] = "\t\t\t\$params = JComponentHelper::getParams('com_".$component."', true);"; @@ -1802,7 +1802,7 @@ class Interpretation extends Fields } $getItem .= "\n\t".$tab."\t\t//".$this->setLine(__LINE__)." If no data is found redirect to default page and show warning."; $getItem .= "\n\t".$tab."\t\t\$app->enqueueMessage(JText::_('".$langKeyWord."'), 'warning');"; - if ('site' == $this->target) + if ('site' === $this->target) { // check that the default and the redirect page is not the same if ($this->fileContentStatic['###SITE_DEFAULT_VIEW###'] != $code) @@ -2576,14 +2576,14 @@ class Interpretation extends Fields $method .= str_replace(array_keys($this->placeholders),array_values($this->placeholders),"\n\t\t".implode("\n\t\t",$view['settings']->php_jview_display)); } } - if ('site' == $this->target) + if ('site' === $this->target) { $method .= "\n\n\t\t//".$this->setLine(__LINE__)." Set the toolbar"; $method .= "\n\t\t\$this->addToolBar();"; $method .= "\n\n\t\t//".$this->setLine(__LINE__)." set the document"; $method .= "\n\t\t\$this->_prepareDocument();"; } - elseif ('custom_admin' == $this->target) + elseif ('custom_admin' === $this->target) { $method .= "\n\n\t\t//".$this->setLine(__LINE__)." We don't need toolbar in the modal window."; $method .= "\n\t\tif (\$this->getLayout() !== 'modal')"; @@ -2631,7 +2631,7 @@ class Interpretation extends Fields $this->fileContentDynamic[$view['settings']->code]['###'.$TARGET.'_CUSTOM_BUTTONS###'] = $this->setCustomButtons($view); // only set the custom get form method if site target - if ('site' == $this->target) + if ('site' === $this->target) { // set the custom get form method ###SITE_CUSTOM_GET_FORM_METHOD### $this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_GET_FORM_METHOD###'] = $this->setCustomGetForm($view); @@ -2791,7 +2791,7 @@ class Interpretation extends Fields // set the custom buttons ###CUSTOM_BUTTONS_CONTROLLER### $this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_CONTROLLER###'] = "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->php_controller); - if ('site' == $this->target) + if ('site' === $this->target) { // add the controller for this view // build the file @@ -3025,7 +3025,14 @@ class Interpretation extends Fields $setter .= "\n\n\t\t//".$this->setLine(__LINE__)." always make sure jquery is loaded."; $setter .= "\n\t\tJHtml::_('jquery.framework');"; $setter .= "\n\t\t//".$this->setLine(__LINE__)." Load the header checker class."; - $setter .= "\n\t\trequire_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );"; + if ($this->target === 'site') + { + $setter .= "\n\t\trequire_once( JPATH_COMPONENT_SITE.'/helpers/headercheck.php' );"; + } + else + { + $setter .= "\n\t\trequire_once( JPATH_COMPONENT_ADMINISTRATOR.'/helpers/headercheck.php' );"; + } $setter .= "\n\t\t//".$this->setLine(__LINE__)." Initialize the header checker."; $setter .= "\n\t\t\$HeaderCheck = new HeaderCheck;"; // load the defaults needed @@ -3236,12 +3243,13 @@ class Interpretation extends Fields { if (isset($this->templateData[$this->target][$view['settings']->code]) && ComponentbuilderHelper::checkArray($this->templateData[$this->target][$view['settings']->code])) { + $created = $this->getCreatedDate($view); $modified = $this->getLastModifiedDate($view); foreach ($this->templateData[$this->target][$view['settings']->code] as $template => $data) { // build the file $target = array($this->target => $view['settings']->code); - $config = array('###CREATIONDATE###' => JFactory::getDate($view['settings']->created)->format('jS F, Y'), '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version); + $config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version); $this->buildDynamique($target,'template', $template, $config); // set the file data $TARGET = ComponentbuilderHelper::safeString($this->target,'U'); @@ -3994,7 +4002,7 @@ class Interpretation extends Fields $routeHelper[] = "\n\n\t/**"; $routeHelper[] = "\t* @param int The route of the ".$View; $routeHelper[] = "\t*/"; - if ('category' == $viewName_single || 'categories' == $viewName_single) + if ('category' === $viewName_single || 'categories' === $viewName_single) { $routeHelper[] = "\tpublic static function get".$View."Route(\$id = 0)"; } @@ -4259,7 +4267,7 @@ class Interpretation extends Fields $batchmove[] = "\t\t\t\tforeach (\$values as \$key => \$value)"; $batchmove[] = "\t\t\t\t{"; $batchmove[] = "\t\t\t\t\t//".$this->setLine(__LINE__)." Do special action for access."; - $batchmove[] = "\t\t\t\t\tif ('access' == \$key && strlen(\$value) > 0)"; + $batchmove[] = "\t\t\t\t\tif ('access' === \$key && strlen(\$value) > 0)"; $batchmove[] = "\t\t\t\t\t{"; $batchmove[] = "\t\t\t\t\t\t\$this->table->\$key = \$value;"; $batchmove[] = "\t\t\t\t\t}"; @@ -9614,7 +9622,7 @@ class Interpretation extends Fields $allow[] = "\t\t\t\$form->setFieldAttribute('".$fieldName."', 'disabled', 'true');"; $allow[] = "\t\t\t//".$this->setLine(__LINE__)." Disable fields for display."; $allow[] = "\t\t\t\$form->setFieldAttribute('".$fieldName."', 'readonly', 'true');"; - if ('radio' == $fieldType || 'repeatable' == $fieldType) + if ('radio' === $fieldType || 'repeatable' === $fieldType) { $allow[] = "\t\t\t//".$this->setLine(__LINE__)." Disable radio button for display."; $allow[] = "\t\t\t\$class = \$form->getFieldAttribute('".$fieldName."', 'class', '');"; diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index f469c6939..7b0365df1 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php @@ -1539,7 +1539,7 @@ abstract class ComponentbuilderHelper public static function getCryptKey($type, $default = null) { - if ('basic' == $type) + if ('basic' === $type) { // Get the global params $params = JComponentHelper::getParams('com_componentbuilder', true); diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php new file mode 100644 index 000000000..ddba75ed7 --- /dev/null +++ b/admin/helpers/headercheck.php @@ -0,0 +1,85 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +class HeaderCheck +{ + function js_loaded($script_name) + { + // UIkit check point + if (strpos($script_name,'uikit') !== false) + { + $app = JFactory::getApplication(); + $getTemplateName = $app->getTemplate('template')->template; + + if (strpos($getTemplateName,'yoo') !== false) + { + return true; + } + } + + $document = JFactory::getDocument(); + $head_data = $document->getHeadData(); + foreach (array_keys($head_data['scripts']) as $script) + { + if (stristr($script, $script_name)) + { + return true; + } + } + + return false; + } + + function css_loaded($script_name) + { + // UIkit check point + if (strpos($script_name,'uikit') !== false) + { + $app = JFactory::getApplication(); + $getTemplateName = $app->getTemplate('template')->template; + + if (strpos($getTemplateName,'yoo') !== false) + { + return true; + } + } + + $document = JFactory::getDocument(); + $head_data = $document->getHeadData(); + + foreach (array_keys($head_data['styleSheets']) as $script) + { + if (stristr($script, $script_name)) + { + return true; + } + } + + return false; + } +} \ No newline at end of file diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index def56d9e0..2e06ca340 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 0fda57ab2..ece4dbbbb 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index ab99e731a..482e1d70a 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index a53b7a3d6..ecb3bf184 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage minify.php diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 71bb6bebe..6f01693b8 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -683,6 +683,17 @@ COM_COMPONENTBUILDER_AUTHOR="Author" COM_COMPONENTBUILDER_A_FEW_CLOSED_ISSUES_FROM_GITHUB_IS_LOADING="A few closed issues from Github is loading" COM_COMPONENTBUILDER_A_FEW_OPEN_ISSUES_FROM_GITHUB_IS_LOADING="A few open issues from Github is loading" COM_COMPONENTBUILDER_BACK="Back" +COM_COMPONENTBUILDER_CLEAR_TMP="Clear tmp" +COM_COMPONENTBUILDER_COMPILER="Compiler" +COM_COMPONENTBUILDER_COMPILER_ACCESS="Compiler Access" +COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC=" Allows the users in this group to access compiler." +COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS="Compiler Clear tmp Button Access" +COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear tmp button." +COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST="Compiler Dashboard List" +COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the Compiler" +COM_COMPONENTBUILDER_COMPILER_DESC="The compiler" +COM_COMPONENTBUILDER_COMPILER_SUBMENU="Compiler Submenu" +COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC="Allows the users in this group to update the submenu of the Compiler" COM_COMPONENTBUILDER_COMPONENT="Component" COM_COMPONENTBUILDER_COMPONENTS="Components" COM_COMPONENTBUILDER_COMPONENTS_BATCH_OPTIONS="Batch process the selected Components" @@ -771,6 +782,9 @@ COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_PREFLIGHT_INSTALL="Add Php Preflight Inst COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_PREFLIGHT_INSTALL_LABEL="Add PHP Preflight (install)" COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_PREFLIGHT_UPDATE="Add Php Preflight Update" COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_PREFLIGHT_UPDATE_LABEL="Add PHP Preflight (update)" +COM_COMPONENTBUILDER_COMPONENT_ADD_PLACEHOLDERS="Add Placeholders" +COM_COMPONENTBUILDER_COMPONENT_ADD_PLACEHOLDERS_DESCRIPTION="Should JCB insert the custom code placeholders? This is only applicable if this component has custom code." +COM_COMPONENTBUILDER_COMPONENT_ADD_PLACEHOLDERS_LABEL="Custom Code Placeholders" COM_COMPONENTBUILDER_COMPONENT_ADD_SALES_SERVER="Add Sales Server" COM_COMPONENTBUILDER_COMPONENT_ADD_SALES_SERVER_LABEL="Add Sales Server" COM_COMPONENTBUILDER_COMPONENT_ADD_SITE_EVENT="Add Site Event" @@ -1045,6 +1059,9 @@ COM_COMPONENTBUILDER_COMPONENT_MODIFIED_DATE_DESC="The date this Component was m COM_COMPONENTBUILDER_COMPONENT_MODIFIED_DATE_LABEL="Modified Date" COM_COMPONENTBUILDER_COMPONENT_MOVE="Move" COM_COMPONENTBUILDER_COMPONENT_MUSIC="Music" +COM_COMPONENTBUILDER_COMPONENT_MVC_VERSIONDATE="Mvc Versiondate" +COM_COMPONENTBUILDER_COMPONENT_MVC_VERSIONDATE_DESCRIPTION="Use the modified date, and version number of the view/fields instead of the global version in related files." +COM_COMPONENTBUILDER_COMPONENT_MVC_VERSIONDATE_LABEL="Use View Version & Date" COM_COMPONENTBUILDER_COMPONENT_MYSQL="MySQL" COM_COMPONENTBUILDER_COMPONENT_MYSQL_DESCRIPTION="Update Dump" COM_COMPONENTBUILDER_COMPONENT_MYSQL_HINT="// MySQL for update or blank for none" diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 6c6aa8840..7cd31ccb8 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage css_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php index 70c0e3d5a..16f6fa053 100644 --- a/admin/layouts/admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php index c018bce53..8773ba4f4 100644 --- a/admin/layouts/admin_view/custom_buttons_left.php +++ b/admin/layouts/admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index f954fa1f9..efd9bad49 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php diff --git a/admin/layouts/admin_view/fields_fullwidth.php b/admin/layouts/admin_view/fields_fullwidth.php index f46695999..fc497e06c 100644 --- a/admin/layouts/admin_view/fields_fullwidth.php +++ b/admin/layouts/admin_view/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index 0f1b95315..d909697f1 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php index 607949f7b..a8501dc4b 100644 --- a/admin/layouts/admin_view/linked_components_fullwidth.php +++ b/admin/layouts/admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index 7f5228e98..6a11f0c5c 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index 32f5aa229..35d2185fb 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_left.php diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index acc1c7181..f9a900d6b 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index 4f0a5347d..245ecaab1 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php index 661b625a7..17e825c6d 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_above.php b/admin/layouts/admin_view/settings_above.php index 4afcbaf3b..b92072bcc 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/settings_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_above.php diff --git a/admin/layouts/admin_view/settings_left.php b/admin/layouts/admin_view/settings_left.php index 94f9bde83..45b93f05f 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/admin_view/settings_right.php b/admin/layouts/admin_view/settings_right.php index 64ebaa728..095a39296 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/settings_under.php index 7d3a22d41..1ff2cdea2 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/settings_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_under.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index aaac9bdf4..9ab661a94 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/component/admin_views_fullwidth.php b/admin/layouts/component/admin_views_fullwidth.php index a035b2dc8..61e5591ad 100644 --- a/admin/layouts/component/admin_views_fullwidth.php +++ b/admin/layouts/component/admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/component/custom_admin_views_fullwidth.php b/admin/layouts/component/custom_admin_views_fullwidth.php index 778f72d05..7d14737d5 100644 --- a/admin/layouts/component/custom_admin_views_fullwidth.php +++ b/admin/layouts/component/custom_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php diff --git a/admin/layouts/component/details_above.php b/admin/layouts/component/details_above.php index 542ec75cf..d00ca0e22 100644 --- a/admin/layouts/component/details_above.php +++ b/admin/layouts/component/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/component/details_left.php b/admin/layouts/component/details_left.php index 1d5ef014b..bc41d0228 100644 --- a/admin/layouts/component/details_left.php +++ b/admin/layouts/component/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php @@ -35,6 +35,8 @@ $fields = $displayData->get('fields') ?: array( 'component_version', 'version_update', 'debug_linenr', + 'add_placeholders', + 'mvc_versiondate', 'short_description', 'description', 'copyright' diff --git a/admin/layouts/component/details_right.php b/admin/layouts/component/details_right.php index 5a2602c64..9bf75c025 100644 --- a/admin/layouts/component/details_right.php +++ b/admin/layouts/component/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/component/details_under.php b/admin/layouts/component/details_under.php index 22b7466f3..636c66134 100644 --- a/admin/layouts/component/details_under.php +++ b/admin/layouts/component/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/component/dynamic_build_beta_fullwidth.php b/admin/layouts/component/dynamic_build_beta_fullwidth.php index bcdfb6a3a..09c0d8d52 100644 --- a/admin/layouts/component/dynamic_build_beta_fullwidth.php +++ b/admin/layouts/component/dynamic_build_beta_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php diff --git a/admin/layouts/component/dynamic_integration_fullwidth.php b/admin/layouts/component/dynamic_integration_fullwidth.php index 265cfbf2d..7ff18abeb 100644 --- a/admin/layouts/component/dynamic_integration_fullwidth.php +++ b/admin/layouts/component/dynamic_integration_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_integration_fullwidth.php diff --git a/admin/layouts/component/libs_helpers_fullwidth.php b/admin/layouts/component/libs_helpers_fullwidth.php index 1d29cbdd7..2db1f314d 100644 --- a/admin/layouts/component/libs_helpers_fullwidth.php +++ b/admin/layouts/component/libs_helpers_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/component/mysql_fullwidth.php b/admin/layouts/component/mysql_fullwidth.php index 50bb59754..19f4c1d78 100644 --- a/admin/layouts/component/mysql_fullwidth.php +++ b/admin/layouts/component/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/component/php_fullwidth.php b/admin/layouts/component/php_fullwidth.php index a532dd27f..203962e78 100644 --- a/admin/layouts/component/php_fullwidth.php +++ b/admin/layouts/component/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/component/publishing.php b/admin/layouts/component/publishing.php index 4f0a5347d..245ecaab1 100644 --- a/admin/layouts/component/publishing.php +++ b/admin/layouts/component/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/component/publlshing.php b/admin/layouts/component/publlshing.php index 661b625a7..17e825c6d 100644 --- a/admin/layouts/component/publlshing.php +++ b/admin/layouts/component/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/component/readme_left.php b/admin/layouts/component/readme_left.php index 4eea42d96..2da8f1c06 100644 --- a/admin/layouts/component/readme_left.php +++ b/admin/layouts/component/readme_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/component/readme_right.php b/admin/layouts/component/readme_right.php index a72102d8c..1ee67fc2f 100644 --- a/admin/layouts/component/readme_right.php +++ b/admin/layouts/component/readme_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/component/settings_left.php b/admin/layouts/component/settings_left.php index 61416b1b2..b566299a1 100644 --- a/admin/layouts/component/settings_left.php +++ b/admin/layouts/component/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php @@ -34,13 +34,13 @@ $fields = $displayData->get('fields') ?: array( 'addadmin_views', 'addcustom_admin_views', 'addsite_views', - 'spacer_hr_b', + 'spacer_hr_c', 'note_mysql_tweak_options', 'sql_tweak', - 'spacer_hr_c', + 'spacer_hr_d', 'note_add_custom_menus', 'addcustommenus', - 'spacer_hr_d', + 'spacer_hr_e', 'note_add_config', 'addconfig' ); diff --git a/admin/layouts/component/settings_right.php b/admin/layouts/component/settings_right.php index 9dc68952c..04dbc07ca 100644 --- a/admin/layouts/component/settings_right.php +++ b/admin/layouts/component/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php @@ -34,10 +34,10 @@ $fields = $displayData->get('fields') ?: array( 'addcontributors', 'emptycontributors', 'number', - 'spacer_hr_e', + 'spacer_hr_a', 'note_add_files', 'addfiles', - 'spacer_hr_a', + 'spacer_hr_b', 'note_add_folders', 'addfolders' ); diff --git a/admin/layouts/component/site_views_fullwidth.php b/admin/layouts/component/site_views_fullwidth.php index ae02ab047..05442759f 100644 --- a/admin/layouts/component/site_views_fullwidth.php +++ b/admin/layouts/component/site_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index 70c0e3d5a..16f6fa053 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php index c018bce53..8773ba4f4 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php index 56f5d1b0d..02efc97a4 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php index 542ec75cf..d00ca0e22 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php index d0a0ea6ef..28d644c42 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php index c14620fe1..3f05877da 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php index 8a18fe1e8..e067dd30e 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php index c1d286a64..dfe121fb8 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php index 22b7466f3..636c66134 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php index fbef828b7..c5af6f702 100644 --- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php +++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index 4f0a5347d..245ecaab1 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php index 661b625a7..17e825c6d 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php index 105e771f8..c3464da16 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php index 86056e1ea..772576c15 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php index 8fc159868..02caaf3a0 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php index f276ac425..f63f5e9b8 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php index 4f0a5347d..245ecaab1 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php index 661b625a7..17e825c6d 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php index 1a753da27..09a827244 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_fullwidth.php diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php index 494742e6c..c31f92f85 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_left.php diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php index 2e3f405c9..8bb4122ac 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_above.php b/admin/layouts/dynamic_get/gettable_above.php index d2e4031fe..61302ae25 100644 --- a/admin/layouts/dynamic_get/gettable_above.php +++ b/admin/layouts/dynamic_get/gettable_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_above.php diff --git a/admin/layouts/dynamic_get/gettable_fullwidth.php b/admin/layouts/dynamic_get/gettable_fullwidth.php index dd4ec4093..67e18c58e 100644 --- a/admin/layouts/dynamic_get/gettable_fullwidth.php +++ b/admin/layouts/dynamic_get/gettable_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_left.php b/admin/layouts/dynamic_get/gettable_left.php index ec8bcca1e..44411f4c9 100644 --- a/admin/layouts/dynamic_get/gettable_left.php +++ b/admin/layouts/dynamic_get/gettable_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_left.php diff --git a/admin/layouts/dynamic_get/gettable_right.php b/admin/layouts/dynamic_get/gettable_right.php index 770856d7e..ae3b5390a 100644 --- a/admin/layouts/dynamic_get/gettable_right.php +++ b/admin/layouts/dynamic_get/gettable_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_right.php diff --git a/admin/layouts/dynamic_get/gettable_under.php b/admin/layouts/dynamic_get/gettable_under.php index ca1c19be8..0591d1037 100644 --- a/admin/layouts/dynamic_get/gettable_under.php +++ b/admin/layouts/dynamic_get/gettable_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index 4f0a5347d..245ecaab1 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php index 661b625a7..17e825c6d 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php index 95112747c..326d96911 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php index 512c1984e..aadde5eb2 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php index eb9ff049a..c8a093ea3 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php index 22b7466f3..636c66134 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/linked_admin_views_fullwidth.php b/admin/layouts/field/linked_admin_views_fullwidth.php index 867057d69..8de0a3a58 100644 --- a/admin/layouts/field/linked_admin_views_fullwidth.php +++ b/admin/layouts/field/linked_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_admin_views_fullwidth.php diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index 4f0a5347d..245ecaab1 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php index 661b625a7..17e825c6d 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php index 3839a02bd..b22c2c355 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_left.php diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php index 6c5ac7ace..3a75490a9 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 498f70125..6347e538e 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php index f3aa0e92c..58344d3e8 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index ab0aa0b09..d8abb5505 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php index 4f0a5347d..245ecaab1 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php index 661b625a7..17e825c6d 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index bef9062a9..193eb8a41 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index ef215d673..e6e735cfc 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index ef3ed159a..268dfc37f 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index 8653a152e..40027aed7 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index 22b7466f3..636c66134 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 4f0a5347d..245ecaab1 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 25c51baa5..8ba69eb5d 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index 9ee9d28bb..93b01eeaa 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php index 8950dfe40..bf5fa9eda 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php index c14620fe1..3f05877da 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php index b50918a9b..24d35ac9a 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php index 76c9e4de6..743752d61 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php index 22b7466f3..636c66134 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php index 4f0a5347d..245ecaab1 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php index 661b625a7..17e825c6d 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php index ea7320605..981612cbf 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index 542ec75cf..d00ca0e22 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php index d0a0ea6ef..28d644c42 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php index c14620fe1..3f05877da 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php index b50918a9b..24d35ac9a 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php index c1d286a64..dfe121fb8 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php index 22b7466f3..636c66134 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php index 9c9052782..960e63d8e 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php index 0a6ec3976..6ab869bf6 100644 --- a/admin/layouts/site_view/linked_components_fullwidth.php +++ b/admin/layouts/site_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index 3cdd51a36..a5f7c789c 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php index 4f0a5347d..245ecaab1 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php index 661b625a7..17e825c6d 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php index 29042b962..48260961e 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php index a7b0b26c6..990bb1e69 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php index b4b181659..f815f28d7 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php index 4f0a5347d..245ecaab1 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php index 661b625a7..17e825c6d 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php index 9ee9d28bb..93b01eeaa 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php index 58902338a..c7afbedcd 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php index c14620fe1..3f05877da 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index b50918a9b..24d35ac9a 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php index 76c9e4de6..743752d61 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php index 22b7466f3..636c66134 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php index 4f0a5347d..245ecaab1 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php index 661b625a7..17e825c6d 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 51e775c33..380edfec0 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -1196,7 +1196,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 1663974b6..00fa816d9 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php @@ -1190,7 +1190,7 @@ class ComponentbuilderModelAjax extends JModelList } } } - $string[] = "
dynamicForm: ".$result->name."
<a href=\"index.php?option=com_[[[component]]]&task=form." . $result->name_code . implode('',$dynamicIds) ."&ref=[[[sview]]]\">" . $result->name . "</a>
"; + $string[] = "
dynamicForm: ".$result->name."
<a href=\"index.php?option=com_[[[component]]]&task=form." . $result->name_code . implode('',$dynamicIds) ."&ref=compiler\">" . $result->name . "</a>
"; } $string[] = "
"; return implode("\n",$string); diff --git a/admin/models/compiler.php b/admin/models/compiler.php index a1b7e19d9..ef90dc195 100644 --- a/admin/models/compiler.php +++ b/admin/models/compiler.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.9 - @build 1st February, 2017 - @created 30th April, 2015 + @version @update number 11 of this MVC + @build 2nd February, 2017 + @created 1st February, 2017 @package Component Builder @subpackage compiler.php @author Llewellyn van der Merwe @@ -29,14 +29,120 @@ defined('_JEXEC') or die('Restricted access'); // import the Joomla modellist library jimport('joomla.application.component.modellist'); -// include component compiler -require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/compiler.php'; - /** - * Componentbuilder Model + * Componentbuilder Model for Compiler */ class ComponentbuilderModelCompiler extends JModelList { + /** + * Model user data. + * + * @var strings + */ + protected $user; + protected $userId; + protected $guest; + protected $groups; + protected $levels; + protected $app; + protected $input; + protected $uikitComp; + + /** + * Method to build an SQL query to load the list data. + * + * @return string An SQL query + */ + protected function getListQuery() + { + // Get the current user for authorisation checks + $this->user = JFactory::getUser(); + $this->userId = $this->user->get('id'); + $this->guest = $this->user->get('guest'); + $this->groups = $this->user->get('groups'); + $this->authorisedGroups = $this->user->getAuthorisedGroups(); + $this->levels = $this->user->getAuthorisedViewLevels(); + $this->app = JFactory::getApplication(); + $this->input = $this->app->input; + $this->initSet = true; + // Make sure all records load, since no pagination allowed. + $this->setState('list.limit', 0); + // Get a db connection. + $db = JFactory::getDbo(); + + // Create a new query object. + $query = $db->getQuery(true); + + // Get from #__componentbuilder_component as a + $query->select($db->quoteName( + array('a.id','a.system_name','a.name','a.name_code','a.component_version','a.debug_linenr','a.short_description','a.image','a.companyname','a.author','a.email','a.website','a.copyright','a.modified','a.created','a.version'), + array('id','system_name','name','name_code','component_version','debug_linenr','short_description','image','companyname','author','email','website','copyright','modified','created','version'))); + $query->from($db->quoteName('#__componentbuilder_component', 'a')); + $query->where('a.published = 1'); + $query->order('a.modified DESC'); + $query->order('a.created DESC'); + + // return the query object + return $query; + } + + /** + * Method to get an array of data items. + * + * @return mixed An array of data items on success, false on failure. + */ + public function getItems() + { + $user = JFactory::getUser(); + // check if this user has permission to access items + if (!$user->authorise('compiler.access', 'com_componentbuilder')) + { + $app = JFactory::getApplication(); + $app->enqueueMessage(JText::_('Not authorised!'), 'error'); + // redirect away if not a correct (TODO for now we go to default view) + $app->redirect('index.php?option=com_componentbuilder'); + return false; + } + // load parent items + $items = parent::getItems(); + + // Get the global params + $globalParams = JComponentHelper::getParams('com_componentbuilder', true); + + // Convert the parameter fields into objects. + if (ComponentbuilderHelper::checkArray($items)) + { + foreach ($items as $nr => &$item) + { + // Always create a slug for sef URL's + $item->slug = (isset($item->alias) && isset($item->id)) ? $item->id.':'.$item->alias : $item->id; + // Make sure the content prepare plugins fire on copyright. + $item->copyright = JHtml::_('content.prepare',$item->copyright); + // Checking if copyright has uikit components that must be loaded. + $this->uikitComp = ComponentbuilderHelper::getUikitComp($item->copyright,$this->uikitComp); + } + } + + // return items + return $items; + } + + + /** + * Get the uikit needed components + * + * @return mixed An array of objects on success. + * + */ + public function getUikitComp() + { + if (isset($this->uikitComp) && ComponentbuilderHelper::checkArray($this->uikitComp)) + { + return $this->uikitComp; + } + return false; + } + protected $compiler; public function getComponents() diff --git a/admin/models/component.php b/admin/models/component.php index ff970082b..e0c5fa8fc 100644 --- a/admin/models/component.php +++ b/admin/models/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage component.php @@ -101,18 +101,18 @@ class ComponentbuilderModelComponent extends JModelAdmin $item->css = base64_decode($item->css); } - 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->php_preflight_update)) + { + // base64 Decode php_preflight_update. + $item->php_preflight_update = base64_decode($item->php_preflight_update); + } + if (!empty($item->readme)) { // base64 Decode readme. @@ -1153,7 +1153,7 @@ class ComponentbuilderModelComponent extends JModelAdmin foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } @@ -1223,18 +1223,18 @@ class ComponentbuilderModelComponent extends JModelAdmin $data['css'] = base64_encode($data['css']); } - // 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 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 readme string to base64 string. if (isset($data['readme'])) { diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index 7c2b06428..ad1e7dd9b 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php @@ -47,6 +47,8 @@ class ComponentbuilderModelComponentbuilder extends JModelList ); // view access array $viewAccess = array( + 'compiler.submenu' => 'compiler.submenu', + 'compiler.dashboard_list' => 'compiler.dashboard_list', 'admin_views.access' => 'admin_view.access', 'admin_view.access' => 'admin_view.access', 'admin_views.submenu' => 'admin_view.submenu', diff --git a/admin/models/components.php b/admin/models/components.php index a023b2d18..9a66ade1a 100644 --- a/admin/models/components.php +++ b/admin/models/components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage components.php @@ -259,17 +259,17 @@ class ComponentbuilderModelComponents extends JModelList { foreach ($items as $nr => &$item) { + // decode css + $item->css = base64_decode($item->css); + // decode php_postflight_update + $item->php_postflight_update = base64_decode($item->php_postflight_update); if ($basickey && !is_numeric($item->update_server_ftp) && $item->update_server_ftp === base64_encode(base64_decode($item->update_server_ftp, true))) { // decrypt update_server_ftp $item->update_server_ftp = $basic->decryptString($item->update_server_ftp); } - // decode css - $item->css = base64_decode($item->css); // 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 readme $item->readme = base64_decode($item->readme); if ($basickey && !is_numeric($item->sales_server_ftp) && $item->sales_server_ftp === base64_encode(base64_decode($item->sales_server_ftp, true))) diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index 245a51834..d4312a5ea 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -898,7 +898,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php index d057f2412..c15fdbc71 100644 --- a/admin/models/custom_code.php +++ b/admin/models/custom_code.php @@ -726,7 +726,7 @@ class ComponentbuilderModelCustom_code extends JModelAdmin foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php index b4c56f5dd..8e3598a3e 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -796,7 +796,7 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } diff --git a/admin/models/field.php b/admin/models/field.php index e0443e0cf..e2860c3cc 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -946,7 +946,7 @@ class ComponentbuilderModelField extends JModelAdmin foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index bb3780031..349b58f86 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index 8aff26f86..df14cb313 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index c48bd0f70..366c941f8 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php index 79839b500..d1949d7cc 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index 9da508c56..e7ed059d0 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage customadminviews.php diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index b07b15237..1017c03cd 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfilelist.php diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index 345fa0d23..a3b8f9290 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfolderlist.php diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index bc66490da..036a17b98 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage customgets.php diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index 6a06e834d..0517c67ed 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index 7d37ab2b9..b09e8a4de 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicgets.php diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index 68d2b50d8..2fd11d9be 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php index 0419c1f2a..8251d01ac 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldsmulti.php diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index 0e04e4b79..67bed021e 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index 680225bb2..a9a92aa52 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index 2bedd2502..6644c9d4f 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviewfolderlist.php diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index f6e4619b9..514563bc0 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviews.php diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index 6bbe2f9d3..4abe4efff 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index e92731c0e..17be0f6d9 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -970,7 +970,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } diff --git a/admin/models/forms/component.js b/admin/models/forms/component.js index dd6cfc5b3..43c479e76 100644 --- a/admin/models/forms/component.js +++ b/admin/models/forms/component.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage component.js diff --git a/admin/models/forms/component.xml b/admin/models/forms/component.xml index ff9c97100..71ee8c9d7 100644 --- a/admin/models/forms/component.xml +++ b/admin/models/forms/component.xml @@ -178,257 +178,6 @@ message="Error! Please add author name here." hint="COM_COMPONENTBUILDER_COMPONENT_AUTHOR_HINT" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + - - - - - - - - - - + type="repeatable" + name="addfiles" + label="COM_COMPONENTBUILDER_COMPONENT_ADDFILES_LABEL" + description="COM_COMPONENTBUILDER_COMPONENT_ADDFILES_DESCRIPTION" + id="addfiles" + class="addfile" + select="COM_COMPONENTBUILDER_COMPONENT_ADDFILES_SELECT" + icon="list" + maximum="500"> + + + - + + + @@ -567,11 +327,39 @@ - + + + + + + + @@ -581,6 +369,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + COM_COMPONENTBUILDER_COMPONENT_NO - + + type="radio" + name="add_update_server" + label="COM_COMPONENTBUILDER_COMPONENT_ADD_UPDATE_SERVER_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + + + + + + + + + - + - + + type="radio" + name="buildcomp" + label="COM_COMPONENTBUILDER_COMPONENT_BUILDCOMP_LABEL" + description="COM_COMPONENTBUILDER_COMPONENT_BUILDCOMP_DESCRIPTION" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - - COM_COMPONENTBUILDER_COMPONENT_NO - - - - - - + + COM_COMPONENTBUILDER_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE - - + + - - - - + + + + + + + + - + + + + + - + @@ -2138,17 +2183,17 @@ - + @@ -2234,21 +2279,6 @@ - - - - - - + + + + + + - - - - - - + + COM_COMPONENTBUILDER_COMPONENT_NO + + + + + + + + - - - - - - - - COM_COMPONENTBUILDER_COMPONENT_NO - - + + COM_COMPONENTBUILDER_COMPONENT_NO + + + + + + + + - - - - - - - - COM_COMPONENTBUILDER_COMPONENT_NO + + + + - - - - - - - - COM_COMPONENTBUILDER_COMPONENT_NO + + + + + + + + - - - - $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } diff --git a/admin/models/import.php b/admin/models/import.php index 94461aeed..3e3d6d0bb 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/models/layout.php b/admin/models/layout.php index 5f83c8583..6090cb18e 100644 --- a/admin/models/layout.php +++ b/admin/models/layout.php @@ -766,7 +766,7 @@ class ComponentbuilderModelLayout extends JModelAdmin foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } diff --git a/admin/models/site_view.php b/admin/models/site_view.php index c3406b076..ac382e21e 100644 --- a/admin/models/site_view.php +++ b/admin/models/site_view.php @@ -904,7 +904,7 @@ class ComponentbuilderModelSite_view extends JModelAdmin foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } diff --git a/admin/models/snippet.php b/admin/models/snippet.php index dbfd7bda2..a42e22c75 100644 --- a/admin/models/snippet.php +++ b/admin/models/snippet.php @@ -724,7 +724,7 @@ class ComponentbuilderModelSnippet extends JModelAdmin foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } diff --git a/admin/models/template.php b/admin/models/template.php index 761e99487..bba4fc648 100644 --- a/admin/models/template.php +++ b/admin/models/template.php @@ -766,7 +766,7 @@ class ComponentbuilderModelTemplate extends JModelAdmin foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 21ec85725..ca09ba19d 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -14,6 +14,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component` ( `add_php_postflight_update` TINYINT(1) NOT NULL DEFAULT '0', `add_php_preflight_install` TINYINT(1) NOT NULL DEFAULT '0', `add_php_preflight_update` TINYINT(1) NOT NULL DEFAULT '0', + `add_placeholders` TINYINT(1) NOT NULL DEFAULT '0', `add_sales_server` TINYINT(1) NOT NULL DEFAULT '0', `add_site_event` TINYINT(1) NOT NULL DEFAULT '0', `add_sql` TINYINT(1) NOT NULL DEFAULT '0', @@ -46,6 +47,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component` ( `image` CHAR(64) NOT NULL DEFAULT '', `license` VARCHAR(255) NOT NULL DEFAULT '', `license_type` TINYINT(1) NOT NULL DEFAULT '0', + `mvc_versiondate` TINYINT(1) NOT NULL DEFAULT '0', `name` CHAR(64) NOT NULL DEFAULT '', `name_code` VARCHAR(255) NOT NULL DEFAULT '', `not_required` INT(1) NOT NULL DEFAULT '0', @@ -93,19 +95,21 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component` ( KEY `idx_modifiedby` (`modified_by`), KEY `idx_state` (`published`), KEY `idx_name_code` (`name_code`), - KEY `idx_update_server_target` (`update_server_target`), - KEY `idx_add_php_helper_admin` (`add_php_helper_admin`), - KEY `idx_creatuserhelper` (`creatuserhelper`), - KEY `idx_add_sql` (`add_sql`), - KEY `idx_debug_linenr` (`debug_linenr`), KEY `idx_add_php_helper_site` (`add_php_helper_site`), - KEY `idx_name` (`name`), + KEY `idx_creatuserhelper` (`creatuserhelper`), + KEY `idx_add_php_helper_admin` (`add_php_helper_admin`), + KEY `idx_debug_linenr` (`debug_linenr`), + KEY `idx_add_sql` (`add_sql`), + KEY `idx_add_placeholders` (`add_placeholders`), + KEY `idx_mvc_versiondate` (`mvc_versiondate`), + KEY `idx_update_server_target` (`update_server_target`), KEY `idx_addfootable` (`addfootable`), - KEY `idx_add_update_server` (`add_update_server`), KEY `idx_add_php_helper_both` (`add_php_helper_both`), KEY `idx_add_admin_event` (`add_admin_event`), + KEY `idx_add_update_server` (`add_update_server`), KEY `idx_add_site_event` (`add_site_event`), KEY `idx_add_php_dashboard_methods` (`add_php_dashboard_methods`), + KEY `idx_name` (`name`), KEY `idx_add_license` (`add_license`), KEY `idx_license_type` (`license_type`), KEY `idx_adduikit` (`adduikit`), @@ -117,8 +121,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component` ( KEY `idx_add_php_postflight_update` (`add_php_postflight_update`), KEY `idx_add_php_method_uninstall` (`add_php_method_uninstall`), KEY `idx_addreadme` (`addreadme`), - KEY `idx_emptycontributors` (`emptycontributors`), - KEY `idx_add_sales_server` (`add_sales_server`) + KEY `idx_add_sales_server` (`add_sales_server`), + KEY `idx_emptycontributors` (`emptycontributors`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( diff --git a/admin/tables/component.php b/admin/tables/component.php index 4a6fd8f8c..52b10ee09 100644 --- a/admin/tables/component.php +++ b/admin/tables/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage component.php diff --git a/admin/views/compiler/tmpl/default.php b/admin/views/compiler/tmpl/default.php index a4ababec1..251fa6f3b 100644 --- a/admin/views/compiler/tmpl/default.php +++ b/admin/views/compiler/tmpl/default.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.9 - @build 1st February, 2017 - @created 30th April, 2015 + @version @update number 11 of this MVC + @build 2nd February, 2017 + @created 1st February, 2017 @package Component Builder @subpackage default.php @author Llewellyn van der Merwe @@ -24,16 +24,21 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // No direct access to this file -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die('Restricted access'); + +$this->app->input->set('hidemainmenu', false); JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidation'); JHtml::_('formbehavior.chosen', 'select'); JHtml::_('behavior.keepalive'); -JHtml::_('jquery.framework'); ?> - +canDo->get('compiler.access')): ?> +
+ + +
sidebar)): ?> -
- sidebar; ?> -
-
- -
+
+ sidebar; ?> +
+
+ +

Ready to compile your component

-
+

form): ?> @@ -126,7 +130,7 @@ jQuery(document).ready(function($) {
+ +

+ diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php index 82d03d445..63c3a3b31 100644 --- a/admin/views/compiler/view.html.php +++ b/admin/views/compiler/view.html.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.2.9 - @build 1st February, 2017 - @created 30th April, 2015 + @version @update number 11 of this MVC + @build 2nd February, 2017 + @created 1st February, 2017 @package Component Builder @subpackage view.html.php @author Llewellyn van der Merwe @@ -30,64 +30,53 @@ defined('_JEXEC') or die('Restricted access'); jimport('joomla.application.component.view'); /** - * Componentbuilder Compiler View + * Componentbuilder View class for the Compiler */ class ComponentbuilderViewCompiler extends JViewLegacy { - /** - * Componentbuilder view display method - * @return void - */ - function display($tpl = null) + // Overwriting JView display method + function display($tpl = null) { - // Check for errors. - if (count($errors = $this->get('Errors'))){ - JError::raiseError(500, implode('
', $errors)); - return false; - }; - - $this->Components = $this->get('Components'); - $this->form = $this->setForm(); - - // We don't need toolbar in the modal window. + // get component params + $this->params = JComponentHelper::getParams('com_componentbuilder'); + // get the application + $this->app = JFactory::getApplication(); + // get the user object + $this->user = JFactory::getUser(); + // get global action permissions + $this->canDo = ComponentbuilderHelper::getActions('compiler'); + // Initialise variables. + $this->items = $this->get('Items'); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + JError::raiseError(500, implode("\n", $errors)); + return false; + } if ($this->getLayout() !== 'modal') { // Include helper submenu ComponentbuilderHelper::addSubmenu('compiler'); - $this->addToolbar(); + JHtmlSidebar::setAction('index.php?option=com_componentbuilder&view=compiler'); $this->sidebar = JHtmlSidebar::render(); } - - // Display the template + $this->Components = $this->get('Components'); + $this->form = $this->setForm(); + + // We don't need toolbar in the modal window. + if ($this->getLayout() !== 'modal') + { + // add the tool bar + $this->addToolBar(); + } + + // set the document + $this->setDocument(); + parent::display($tpl); - - // Set the document - $this->setDocument(); - } - - /** - * Setting the toolbar - */ - protected function addToolBar() - { - $canDo = ComponentbuilderHelper::getActions('compiler'); - JToolBarHelper::title(JText::_('Compiler'), 'cogs'); - - if($canDo->get('core.admin') || $canDo->get('core.options')) - { - JToolBarHelper::custom('compiler.clearTmp', 'purge', '', 'Clear tmp', false); - JToolBarHelper::divider(); - JToolBarHelper::preferences('com_componentbuilder'); - } - - // set help url for this view if found - $help_url = ComponentbuilderHelper::getHelpUrl('compiler'); - if (ComponentbuilderHelper::checkString($help_url)) - { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); - } - } - + } + public function setForm() { if(ComponentbuilderHelper::checkArray($this->Components)){ @@ -131,17 +120,98 @@ class ComponentbuilderViewCompiler extends JViewLegacy return false; } - /** - * Method to set up the document properties - * - * - * @return void + /** + * Prepares the document */ - protected function setDocument() + protected function setDocument() + { + + // always make sure jquery is loaded. + JHtml::_('jquery.framework'); + // Load the header checker class. + require_once( JPATH_COMPONENT_ADMINISTRATOR.'/helpers/headercheck.php' ); + // Initialize the header checker. + $HeaderCheck = new HeaderCheck; + + // Load uikit options. + $uikit = $this->params->get('uikit_load'); + // Set script size. + $size = $this->params->get('uikit_min'); + // Set css style. + $style = $this->params->get('uikit_style'); + + // The uikit css. + if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) + { + $this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit/css/uikit'.$style.$size.'.css'); + } + // The uikit js. + if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) + { + $this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit/js/uikit'.$size.'.js'); + } + + // Load the needed uikit components in this view. + $uikitComp = $this->get('UikitComp'); + if ($uikit != 2 && isset($uikitComp) && ComponentbuilderHelper::checkArray($uikitComp)) + { + // load just in case. + jimport('joomla.filesystem.file'); + // loading... + foreach ($uikitComp as $class) + { + foreach (ComponentbuilderHelper::$uk_components[$class] as $name) + { + // check if the CSS file exists. + if (JFile::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit/css/components/'.$name.$style.$size.'.css')) + { + // load the css. + $this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit/css/components/'.$name.$style.$size.'.css'); + } + // check if the JavaScript file exists. + if (JFile::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit/js/components/'.$name.$size.'.js')) + { + // load the js. + $this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit/js/components/'.$name.$size.'.js', 'text/javascript', true); + } + } + } + } + // add the document default css file + $this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_componentbuilder/assets/css/compiler.css'); + } + + /** + * Setting the toolbar + */ + protected function addToolBar() { - $document = JFactory::getDocument(); - - $document->setTitle(JText::_('The Compiler')); + // hide the main menu + $this->app->input->set('hidemainmenu', true); + // add title to the page + JToolbarHelper::title(JText::_('COM_COMPONENTBUILDER_COMPILER'),'cogs'); + // add the back button + // JToolBarHelper::custom('compiler.back', 'undo-2', '', 'COM_COMPONENTBUILDER_BACK', false); + // add cpanel button + JToolBarHelper::custom('compiler.dashboard', 'grid-2', '', 'COM_COMPONENTBUILDER_DASH', false); + if ($this->canDo->get('compiler.clear_tmp')) + { + // add Clear tmp button. + JToolBarHelper::custom('compiler.clearTmp', 'purge', '', 'COM_COMPONENTBUILDER_CLEAR_TMP', false); + } + + // set help url for this view if found + $help_url = ComponentbuilderHelper::getHelpUrl('compiler'); + if (ComponentbuilderHelper::checkString($help_url)) + { + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + } + + // add the options comp button + if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) + { + JToolBarHelper::preferences('com_componentbuilder'); + } } /** @@ -153,12 +223,7 @@ class ComponentbuilderViewCompiler extends JViewLegacy */ public function escape($var) { - if(strlen($var) > 50) - { - // use the helper htmlEscape method instead and shorten the string - return ComponentbuilderHelper::htmlEscape($var, $this->_charset, true); - } // use the helper htmlEscape method instead. return ComponentbuilderHelper::htmlEscape($var, $this->_charset); } -} \ No newline at end of file +} diff --git a/admin/views/component/submitbutton.js b/admin/views/component/submitbutton.js index 8616cc37d..9737b28a7 100644 --- a/admin/views/component/submitbutton.js +++ b/admin/views/component/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/component/tmpl/edit.php b/admin/views/component/tmpl/edit.php index bd707d057..d8a8c893d 100644 --- a/admin/views/component/tmpl/edit.php +++ b/admin/views/component/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/component/view.html.php b/admin/views/component/view.html.php index a398c2a96..d145284c2 100644 --- a/admin/views/component/view.html.php +++ b/admin/views/component/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index db5f861eb..eb5acb693 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php index bcb6c9801..67cfa1623 100644 --- a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_closed_issues_the_closed_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index 8c9deeab9..3407f6f5d 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_main.php diff --git a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php index a1cf779bf..b29e8d051 100644 --- a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_open_issues_the_open_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php index b859b3933..bdd9072f6 100644 --- a/admin/views/componentbuilder/tmpl/default_readme_information.php +++ b/admin/views/componentbuilder/tmpl/default_readme_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_readme_information.php diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php index 38255195e..4bf1cabc3 100644 --- a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php index 375b47a23..62b6f046d 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index 12368c108..94b56f895 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/components/tmpl/default.php b/admin/views/components/tmpl/default.php index f4a14fc02..9438b391e 100644 --- a/admin/views/components/tmpl/default.php +++ b/admin/views/components/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/components/tmpl/default_batch_body.php b/admin/views/components/tmpl/default_batch_body.php index 57031247c..1df9cc476 100644 --- a/admin/views/components/tmpl/default_batch_body.php +++ b/admin/views/components/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/components/tmpl/default_batch_footer.php b/admin/views/components/tmpl/default_batch_footer.php index d5740dc1d..cc23ee968 100644 --- a/admin/views/components/tmpl/default_batch_footer.php +++ b/admin/views/components/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/components/tmpl/default_body.php b/admin/views/components/tmpl/default_body.php index 9287eaf22..617ecd5c1 100644 --- a/admin/views/components/tmpl/default_body.php +++ b/admin/views/components/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/components/tmpl/default_foot.php b/admin/views/components/tmpl/default_foot.php index 82d8f5988..3fd288175 100644 --- a/admin/views/components/tmpl/default_foot.php +++ b/admin/views/components/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/components/tmpl/default_head.php b/admin/views/components/tmpl/default_head.php index af348c8bf..7b5f9473e 100644 --- a/admin/views/components/tmpl/default_head.php +++ b/admin/views/components/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/components/tmpl/default_toolbar.php b/admin/views/components/tmpl/default_toolbar.php index bf3000c65..19446148b 100644 --- a/admin/views/components/tmpl/default_toolbar.php +++ b/admin/views/components/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/components/view.html.php b/admin/views/components/view.html.php index a0f754159..a6884e728 100644 --- a/admin/views/components/view.html.php +++ b/admin/views/components/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 77 of this MVC - @build 26th December, 2016 + @version @update number 80 of this MVC + @build 2nd February, 2017 @created 6th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index db01941e3..f6af775f6 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index cd74a2df5..ab5470d66 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/componentbuilder.xml b/componentbuilder.xml index 6315702d9..dbbc80311 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 1st February, 2017 + 2nd February, 2017 Llewellyn van der Merwe info@vdm.io http://vdm.bz/component-builder diff --git a/script.php b/script.php index 28884b8ff..7579d9167 100644 --- a/script.php +++ b/script.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.2.9 - @build 1st February, 2017 + @build 2nd February, 2017 @created 30th April, 2015 @package Component Builder @subpackage script.php @@ -1349,9 +1349,9 @@ class com_componentbuilderInstallerScript $component->type_title = 'Componentbuilder Component'; $component->type_alias = 'com_componentbuilder.component'; $component->table = '{"special": {"dbtable": "#__componentbuilder_component","key": "id","type": "Component","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "readme","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","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","update_server_target":"update_server_target","add_php_helper_admin":"add_php_helper_admin","creatuserhelper":"creatuserhelper","add_sql":"add_sql","update_server_ftp":"update_server_ftp","css":"css","debug_linenr":"debug_linenr","add_php_helper_site":"add_php_helper_site","update_server":"update_server","description":"description","name":"name","bom":"bom","image":"image","addfootable":"addfootable","add_update_server":"add_update_server","add_php_helper_both":"add_php_helper_both","php_preflight_update":"php_preflight_update","add_admin_event":"add_admin_event","php_postflight_update":"php_postflight_update","add_site_event":"add_site_event","readme":"readme","add_php_dashboard_methods":"add_php_dashboard_methods","sales_server_ftp":"sales_server_ftp","php_preflight_install":"php_preflight_install","email":"email","php_postflight_install":"php_postflight_install","website":"website","php_method_uninstall":"php_method_uninstall","copyright":"copyright","not_required":"not_required","add_license":"add_license","buildcomp":"buildcomp","license_type":"license_type","whmcs_key":"whmcs_key","whmcs_url":"whmcs_url","adduikit":"adduikit","license":"license","add_css":"add_css","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","sql":"sql","php_dashboard_methods":"php_dashboard_methods","add_php_preflight_install":"add_php_preflight_install","add_php_preflight_update":"add_php_preflight_update","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","addreadme":"addreadme","emptycontributors":"emptycontributors","add_sales_server":"add_sales_server","number":"number","buildcompsql":"buildcompsql"}}'; + $component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "readme","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","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","css":"css","add_php_helper_site":"add_php_helper_site","php_postflight_update":"php_postflight_update","update_server_ftp":"update_server_ftp","creatuserhelper":"creatuserhelper","add_php_helper_admin":"add_php_helper_admin","debug_linenr":"debug_linenr","add_sql":"add_sql","add_placeholders":"add_placeholders","php_preflight_update":"php_preflight_update","mvc_versiondate":"mvc_versiondate","update_server_target":"update_server_target","update_server":"update_server","description":"description","addfootable":"addfootable","bom":"bom","add_php_helper_both":"add_php_helper_both","image":"image","add_admin_event":"add_admin_event","add_update_server":"add_update_server","add_site_event":"add_site_event","readme":"readme","add_php_dashboard_methods":"add_php_dashboard_methods","sales_server_ftp":"sales_server_ftp","php_preflight_install":"php_preflight_install","name":"name","php_postflight_install":"php_postflight_install","php_method_uninstall":"php_method_uninstall","email":"email","not_required":"not_required","website":"website","buildcomp":"buildcomp","copyright":"copyright","add_license":"add_license","license_type":"license_type","whmcs_key":"whmcs_key","adduikit":"adduikit","whmcs_url":"whmcs_url","add_css":"add_css","license":"license","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","sql":"sql","php_dashboard_methods":"php_dashboard_methods","add_php_preflight_install":"add_php_preflight_install","add_php_preflight_update":"add_php_preflight_update","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","addreadme":"addreadme","add_sales_server":"add_sales_server","emptycontributors":"emptycontributors","number":"number","buildcompsql":"buildcompsql"}}'; $component->router = 'ComponentbuilderHelperRoute::getComponentRoute'; - $component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/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","update_server_target","add_php_helper_admin","creatuserhelper","add_sql","debug_linenr","add_php_helper_site","addfootable","add_update_server","add_php_helper_both","add_admin_event","add_site_event","add_php_dashboard_methods","not_required","add_license","buildcomp","license_type","adduikit","add_css","add_email_helper","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","addreadme","emptycontributors","add_sales_server","number"],"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"}]}'; + $component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/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_site","creatuserhelper","add_php_helper_admin","debug_linenr","add_sql","add_placeholders","mvc_versiondate","update_server_target","addfootable","add_php_helper_both","add_admin_event","add_update_server","add_site_event","add_php_dashboard_methods","not_required","buildcomp","add_license","license_type","adduikit","add_css","add_email_helper","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","addreadme","add_sales_server","emptycontributors","number"],"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"}]}'; // Set the object into the content types table. $component_Inserted = $db->insertObject('#__content_types', $component); @@ -1545,9 +1545,9 @@ class com_componentbuilderInstallerScript $component->type_title = 'Componentbuilder Component'; $component->type_alias = 'com_componentbuilder.component'; $component->table = '{"special": {"dbtable": "#__componentbuilder_component","key": "id","type": "Component","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "readme","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","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","update_server_target":"update_server_target","add_php_helper_admin":"add_php_helper_admin","creatuserhelper":"creatuserhelper","add_sql":"add_sql","update_server_ftp":"update_server_ftp","css":"css","debug_linenr":"debug_linenr","add_php_helper_site":"add_php_helper_site","update_server":"update_server","description":"description","name":"name","bom":"bom","image":"image","addfootable":"addfootable","add_update_server":"add_update_server","add_php_helper_both":"add_php_helper_both","php_preflight_update":"php_preflight_update","add_admin_event":"add_admin_event","php_postflight_update":"php_postflight_update","add_site_event":"add_site_event","readme":"readme","add_php_dashboard_methods":"add_php_dashboard_methods","sales_server_ftp":"sales_server_ftp","php_preflight_install":"php_preflight_install","email":"email","php_postflight_install":"php_postflight_install","website":"website","php_method_uninstall":"php_method_uninstall","copyright":"copyright","not_required":"not_required","add_license":"add_license","buildcomp":"buildcomp","license_type":"license_type","whmcs_key":"whmcs_key","whmcs_url":"whmcs_url","adduikit":"adduikit","license":"license","add_css":"add_css","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","sql":"sql","php_dashboard_methods":"php_dashboard_methods","add_php_preflight_install":"add_php_preflight_install","add_php_preflight_update":"add_php_preflight_update","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","addreadme":"addreadme","emptycontributors":"emptycontributors","add_sales_server":"add_sales_server","number":"number","buildcompsql":"buildcompsql"}}'; + $component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "readme","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","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","css":"css","add_php_helper_site":"add_php_helper_site","php_postflight_update":"php_postflight_update","update_server_ftp":"update_server_ftp","creatuserhelper":"creatuserhelper","add_php_helper_admin":"add_php_helper_admin","debug_linenr":"debug_linenr","add_sql":"add_sql","add_placeholders":"add_placeholders","php_preflight_update":"php_preflight_update","mvc_versiondate":"mvc_versiondate","update_server_target":"update_server_target","update_server":"update_server","description":"description","addfootable":"addfootable","bom":"bom","add_php_helper_both":"add_php_helper_both","image":"image","add_admin_event":"add_admin_event","add_update_server":"add_update_server","add_site_event":"add_site_event","readme":"readme","add_php_dashboard_methods":"add_php_dashboard_methods","sales_server_ftp":"sales_server_ftp","php_preflight_install":"php_preflight_install","name":"name","php_postflight_install":"php_postflight_install","php_method_uninstall":"php_method_uninstall","email":"email","not_required":"not_required","website":"website","buildcomp":"buildcomp","copyright":"copyright","add_license":"add_license","license_type":"license_type","whmcs_key":"whmcs_key","adduikit":"adduikit","whmcs_url":"whmcs_url","add_css":"add_css","license":"license","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","sql":"sql","php_dashboard_methods":"php_dashboard_methods","add_php_preflight_install":"add_php_preflight_install","add_php_preflight_update":"add_php_preflight_update","add_php_postflight_install":"add_php_postflight_install","add_php_postflight_update":"add_php_postflight_update","add_php_method_uninstall":"add_php_method_uninstall","addreadme":"addreadme","add_sales_server":"add_sales_server","emptycontributors":"emptycontributors","number":"number","buildcompsql":"buildcompsql"}}'; $component->router = 'ComponentbuilderHelperRoute::getComponentRoute'; - $component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/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","update_server_target","add_php_helper_admin","creatuserhelper","add_sql","debug_linenr","add_php_helper_site","addfootable","add_update_server","add_php_helper_both","add_admin_event","add_site_event","add_php_dashboard_methods","not_required","add_license","buildcomp","license_type","adduikit","add_css","add_email_helper","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","addreadme","emptycontributors","add_sales_server","number"],"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"}]}'; + $component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/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_site","creatuserhelper","add_php_helper_admin","debug_linenr","add_sql","add_placeholders","mvc_versiondate","update_server_target","addfootable","add_php_helper_both","add_admin_event","add_update_server","add_site_event","add_php_dashboard_methods","not_required","buildcomp","add_license","license_type","adduikit","add_css","add_email_helper","add_php_preflight_install","add_php_preflight_update","add_php_postflight_install","add_php_postflight_update","add_php_method_uninstall","addreadme","add_sales_server","emptycontributors","number"],"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"}]}'; // Check if component type is already in content_type DB. $component_id = null;