diff --git a/README.md b/README.md index 8b29db15c..4cce98539 100644 --- a/README.md +++ b/README.md @@ -110,11 +110,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 18th October, 2017 ++ *Last Build*: 20th October, 2017 + *Version*: 2.5.8 + *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*: **125731** ++ *Line count*: **125744** + *File count*: **742** + *Folder count*: **129** diff --git a/admin/README.txt b/admin/README.txt index 8b29db15c..4cce98539 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -110,11 +110,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 18th October, 2017 ++ *Last Build*: 20th October, 2017 + *Version*: 2.5.8 + *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*: **125731** ++ *Line count*: **125744** + *File count*: **742** + *Folder count*: **129** diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index d40af0500..bfd5d74e8 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index bd4174456..21790800d 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/css/dynamic_get.css b/admin/assets/css/dynamic_get.css index e0e69cc8f..46879470f 100644 --- a/admin/assets/css/dynamic_get.css +++ b/admin/assets/css/dynamic_get.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.css diff --git a/admin/assets/css/dynamic_gets.css b/admin/assets/css/dynamic_gets.css index 90aa92346..aa575fae5 100644 --- a/admin/assets/css/dynamic_gets.css +++ b/admin/assets/css/dynamic_gets.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_gets.css diff --git a/admin/assets/css/joomla_component.css b/admin/assets/css/joomla_component.css index 4e81ea98e..3ffeda6e0 100644 --- a/admin/assets/css/joomla_component.css +++ b/admin/assets/css/joomla_component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.css diff --git a/admin/assets/css/joomla_components.css b/admin/assets/css/joomla_components.css index ad88aa789..a2f003053 100644 --- a/admin/assets/css/joomla_components.css +++ b/admin/assets/css/joomla_components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index fd3b3493e..e365d231c 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.js diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index 4cb07f498..6838233b8 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index 8dea4a695..1a6c50d24 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 8f3faa2c4..349e822a2 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 9d0432ac6..e8c6ffc16 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/dynamic_get.php b/admin/controllers/dynamic_get.php index 6189df66a..6d799bfbd 100644 --- a/admin/controllers/dynamic_get.php +++ b/admin/controllers/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php index d6f1725cb..81c77b8e8 100644 --- a/admin/controllers/dynamic_gets.php +++ b/admin/controllers/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index c04591f67..fc73a9b6f 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index ae3b0d585..e9735891e 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/import_joomla_components.php b/admin/controllers/import_joomla_components.php index 9ba5ea2db..fbdc1be7f 100644 --- a/admin/controllers/import_joomla_components.php +++ b/admin/controllers/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php index 7e8f2a8e7..e3fbb2369 100644 --- a/admin/controllers/joomla_component.php +++ b/admin/controllers/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php index 19f85a8ed..a379ac037 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index 0573cce2b..64e040c4f 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -1703,7 +1703,7 @@ class Get * * @param int $id The view ID * @param string $table The view table - * + * * @return oject The view data * */ diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 8f806661a..0f302b720 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/helpers/componentbuilderemail.php b/admin/helpers/componentbuilderemail.php index dff973ffb..11220b47a 100644 --- a/admin/helpers/componentbuilderemail.php +++ b/admin/helpers/componentbuilderemail.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilderemail.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index fda934257..fb57b6bcf 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index a867826ec..b3b44346e 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index efd1ebc21..2622fb522 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index eec7ea1d1..a37ea87e9 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 6c1f3addb..abe7b43ed 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 1fe68482e..504b6648a 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -856,28 +856,22 @@ COM_COMPONENTBUILDER_BACKUP_LOCAL_DATA_FIRST="Backup Local Data First" COM_COMPONENTBUILDER_BACKUP_WAS_DONE_SUCCESSFULLY="Backup was done successfully" COM_COMPONENTBUILDER_BADMIN_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BADMIN_VIEWB_SO_THE_IDS_WAS_REMOVED="Admin view in %s has id mismatch of selected admin view. So the id:%s was removed!" COM_COMPONENTBUILDER_BASIC_METHOD="Basic Method" -COM_COMPONENTBUILDER_BCOMPONENT_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BCOMPONENTB_SO_THE_IDS_WAS_REMOVED="Component in %s has id mismatch of selected component. So the id:%s was removed!" COM_COMPONENTBUILDER_BCONFIG_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BFIELDB_SO_THE_IDS_WAS_REMOVED="Config in %s has id mismatch of selected field. So the id:%s was removed!" COM_COMPONENTBUILDER_BCUSTOM_ADMIN_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BCUSTOM_ADMIN_VIEWB_SO_THE_IDS_WAS_REMOVED="Custom admin view in %s has id mismatch of selected custom admin view. So the id:%s was removed!" COM_COMPONENTBUILDER_BCUSTOM_FILESB_NOT_MOVE_TO_CORRECT_LOCATION="Custom files not move to correct location!" -COM_COMPONENTBUILDER_BCUSTOM_GET_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BDYNAMIC_GETB_SO_THE_IDS_WAS_REMOVED="Custom get in %s has id mismatch of selected dynamic get. So the id:%s was removed!" -COM_COMPONENTBUILDER_BDYNAMIC_GETB_IDS_MISMATCH_IN_BSB="Dynamic get id:%s mismatch in %s." COM_COMPONENTBUILDER_BE_CAUTIOUS_DO_NOT_CONTINUE_UNLESS_YOU_TRUST_THE_ORIGIN_OF_THIS_PACKAGE="Be cautious! Do not continue unless you trust the origin of this package!" -COM_COMPONENTBUILDER_BFIELD_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BADMIN_VIEWB_SO_THE_IDS_WAS_REMOVED="Field in %s has id mismatch of selected admin view. So the id:%s was removed!" COM_COMPONENTBUILDER_BFIELD_TYPEB_IDS_MISMATCH_IN_BSB="Field type id:%s mismatch in %s." COM_COMPONENTBUILDER_BFIELD_TYPEB_NOT_SET_FOR_BSB="Field type not set for %s." COM_COMPONENTBUILDER_BGET_THE_KEY_FROMB_A_CLASSBTN_BTNPRIMARY_HREFS_TARGET_BLANK_TITLEGET_A_KEY_FROM_SSA="Get the key from %s" COM_COMPONENTBUILDER_BIMAGESB_NOT_MOVE_TO_CORRECT_LOCATION="Images not move to correct location!" -COM_COMPONENTBUILDER_BMAIN_GETB_IDS_MISMATCH_IN_BSB="Main get id:%s mismatch in %s." -COM_COMPONENTBUILDER_BMAIN_GETB_NOT_SET_FOR_BSB="Main get not set for %s." -COM_COMPONENTBUILDER_BREPEATABLEB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_EMREMOVEDEM_FROM_THE_FIELD="Repeatable id:%s mismatch in field:%s, and was removed from the field." +COM_COMPONENTBUILDER_BMULTIPLE_FIELD_REPEATABLE_MODEB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_EMREMOVEDEM_FROM_THE_FIELD="Multiple Field (repeatable mode) id:%s mismatch in field:%s, and was removed from the field." +COM_COMPONENTBUILDER_BSBS_IN_BSB_HAS_ID_MISMATCH_SO_THE_BSB_WAS_REMOVED="%s->%s in %s has id mismatch. So the %s was removed!" COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS="%s could not be imported%s" COM_COMPONENTBUILDER_BSB_EMCOMPONENT_DETAILSEM="%s component details" -COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_SO_THE_IDS_WAS_REMOVED="%s has id mismatch. So the id:%s was removed!" +COM_COMPONENTBUILDER_BSB_HAS_BEEN_IMPORTED="%s has been imported!" +COM_COMPONENTBUILDER_BSB_HAS_BEEN_UPDATED="%s has been updated!" COM_COMPONENTBUILDER_BSITE_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BSITE_VIEWB_SO_THE_IDS_WAS_REMOVED="Site view in %s has id mismatch of selected site view. So the id:%s was removed!" -COM_COMPONENTBUILDER_BSNIPPETB_IDS_MISMATCH_IN_BSB="Snippet id:%s mismatch in %s." COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED_FOR_THE_FIRST_TIME="Button to create %s will show once %s is saved for the first time." -COM_COMPONENTBUILDER_BVIEW_TABLE_MAINB_IDS_MISMATCH_IN_BSB="View table main id:%s mismatch in %s." COM_COMPONENTBUILDER_CHAIN="Chain" COM_COMPONENTBUILDER_CHECK_YOUR_OWNER_DETAILS_IT_HAS_NOT_BEEN_SET_OPEN_THE_JCB_GLOBAL_OPTIONS_GO_TO_THE_COMPANY_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="Check your owner details, it has not been set. Open the JCB Global Options, go to the Company tab and add the correct company details there." COM_COMPONENTBUILDER_CLEAR_TMP="Clear tmp" diff --git a/admin/layouts/admin_fields/fields_above.php b/admin/layouts/admin_fields/fields_above.php index 99c1e6aa7..9e61e72a7 100644 --- a/admin/layouts/admin_fields/fields_above.php +++ b/admin/layouts/admin_fields/fields_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_above.php diff --git a/admin/layouts/admin_fields/fields_fullwidth.php b/admin/layouts/admin_fields/fields_fullwidth.php index 45b638211..c70763c94 100644 --- a/admin/layouts/admin_fields/fields_fullwidth.php +++ b/admin/layouts/admin_fields/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/admin_fields/publishing.php b/admin/layouts/admin_fields/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/admin_fields/publishing.php +++ b/admin/layouts/admin_fields/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_fields/publlshing.php b/admin/layouts/admin_fields/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/admin_fields/publlshing.php +++ b/admin/layouts/admin_fields/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_fields_conditions/conditions_above.php b/admin/layouts/admin_fields_conditions/conditions_above.php index 913d8aa96..1c8421ef8 100644 --- a/admin/layouts/admin_fields_conditions/conditions_above.php +++ b/admin/layouts/admin_fields_conditions/conditions_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage conditions_above.php diff --git a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php index b838137d1..68e5f629c 100644 --- a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php +++ b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage conditions_fullwidth.php diff --git a/admin/layouts/admin_fields_conditions/publishing.php b/admin/layouts/admin_fields_conditions/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/admin_fields_conditions/publishing.php +++ b/admin/layouts/admin_fields_conditions/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_fields_conditions/publlshing.php b/admin/layouts/admin_fields_conditions/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/admin_fields_conditions/publlshing.php +++ b/admin/layouts/admin_fields_conditions/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index b31527ac6..98c56d307 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 32182a945..524507c63 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 5140fe1eb..1943b6a00 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 fc256068d..5c54400db 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.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php diff --git a/admin/layouts/admin_view/details_above.php b/admin/layouts/admin_view/details_above.php index 3f0d3cf5f..c3abf1866 100644 --- a/admin/layouts/admin_view/details_above.php +++ b/admin/layouts/admin_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/admin_view/details_left.php b/admin/layouts/admin_view/details_left.php index 5594a83fa..beeeb1249 100644 --- a/admin/layouts/admin_view/details_left.php +++ b/admin/layouts/admin_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/admin_view/details_right.php b/admin/layouts/admin_view/details_right.php index 57269517c..c9eb90ea3 100644 --- a/admin/layouts/admin_view/details_right.php +++ b/admin/layouts/admin_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/admin_view/details_under.php b/admin/layouts/admin_view/details_under.php index 889420ac1..5b2b24f66 100644 --- a/admin/layouts/admin_view/details_under.php +++ b/admin/layouts/admin_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/admin_view/fields_conditions_fullwidth.php b/admin/layouts/admin_view/fields_conditions_fullwidth.php index 4721808b4..4746a0da3 100644 --- a/admin/layouts/admin_view/fields_conditions_fullwidth.php +++ b/admin/layouts/admin_view/fields_conditions_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_fullwidth.php diff --git a/admin/layouts/admin_view/fields_conditions_left.php b/admin/layouts/admin_view/fields_conditions_left.php index 4a8369360..45454fb0c 100644 --- a/admin/layouts/admin_view/fields_conditions_left.php +++ b/admin/layouts/admin_view/fields_conditions_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_left.php diff --git a/admin/layouts/admin_view/fields_conditions_right.php b/admin/layouts/admin_view/fields_conditions_right.php index 1b398833c..ffcc671de 100644 --- a/admin/layouts/admin_view/fields_conditions_right.php +++ b/admin/layouts/admin_view/fields_conditions_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_right.php diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index 26bf0bcf2..d0c7bab24 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 f51512ab9..4745da795 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 9e1ce3c36..861df5159 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 ab6fe7518..f857eb5bd 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 96d96c163..b2ec70ebc 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 2e7948dc2..979e11f42 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_fullwidth.php b/admin/layouts/admin_view/settings_fullwidth.php index 20a1397fa..449100827 100644 --- a/admin/layouts/admin_view/settings_fullwidth.php +++ b/admin/layouts/admin_view/settings_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_fullwidth.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 215533f39..e5f637e40 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index 0ce7624d4..31bc44240 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 5140fe1eb..1943b6a00 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 78cc790a9..025b27fd0 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 3f0d3cf5f..c3abf1866 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 1249082a5..21b529eed 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 b9627de85..356259a6e 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 709b247ea..cea59422e 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 a4e820159..2feb0423b 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 889420ac1..5b2b24f66 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 c949bc189..eddee645d 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 2e7948dc2..979e11f42 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 d765da109..185c82ce8 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 b961095e9..a9f1bcabc 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 d27972f4c..4593d0445 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 bd88cd8d8..4c691af70 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php index 889420ac1..5b2b24f66 100644 --- a/admin/layouts/custom_code/details_under.php +++ b/admin/layouts/custom_code/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 2e7948dc2..979e11f42 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 9667a78c9..bc2352829 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 787910eea..30be370b9 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 7930df713..8805741e7 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.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/joint_fullwidth.php b/admin/layouts/dynamic_get/joint_fullwidth.php index 12f29a181..e48658bf3 100644 --- a/admin/layouts/dynamic_get/joint_fullwidth.php +++ b/admin/layouts/dynamic_get/joint_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage joint_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_above.php b/admin/layouts/dynamic_get/main_above.php index 961a49c79..883efc488 100644 --- a/admin/layouts/dynamic_get/main_above.php +++ b/admin/layouts/dynamic_get/main_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_above.php diff --git a/admin/layouts/dynamic_get/main_fullwidth.php b/admin/layouts/dynamic_get/main_fullwidth.php index adba39823..2c4e298db 100644 --- a/admin/layouts/dynamic_get/main_fullwidth.php +++ b/admin/layouts/dynamic_get/main_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_left.php b/admin/layouts/dynamic_get/main_left.php index ca665cf03..b2e0c254e 100644 --- a/admin/layouts/dynamic_get/main_left.php +++ b/admin/layouts/dynamic_get/main_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_left.php diff --git a/admin/layouts/dynamic_get/main_right.php b/admin/layouts/dynamic_get/main_right.php index 360932843..073d79db6 100644 --- a/admin/layouts/dynamic_get/main_right.php +++ b/admin/layouts/dynamic_get/main_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_right.php diff --git a/admin/layouts/dynamic_get/main_under.php b/admin/layouts/dynamic_get/main_under.php index a89f15030..7963b0e95 100644 --- a/admin/layouts/dynamic_get/main_under.php +++ b/admin/layouts/dynamic_get/main_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 2e7948dc2..979e11f42 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 9ee3eb8e7..a1ebb183b 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 1cfb02f0b..559c834e0 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 7f6781020..20d2a7278 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 889420ac1..5b2b24f66 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 2e7948dc2..979e11f42 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 67e79798e..260d306f6 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 50337b63c..d910ef3f8 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_fullwidth.php b/admin/layouts/fieldtype/details_fullwidth.php index 82d15dd76..dc37cfa90 100644 --- a/admin/layouts/fieldtype/details_fullwidth.php +++ b/admin/layouts/fieldtype/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 9227835c0..7edd5c76b 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 5dbbc4049..d485a61cc 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 0b0d7e544..e648ba43e 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 2e7948dc2..979e11f42 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/ftp/details_above.php b/admin/layouts/ftp/details_above.php index 1a0e4d787..63a78bd5a 100644 --- a/admin/layouts/ftp/details_above.php +++ b/admin/layouts/ftp/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/ftp/details_fullwidth.php b/admin/layouts/ftp/details_fullwidth.php index 1cb2131d7..4efc112fd 100644 --- a/admin/layouts/ftp/details_fullwidth.php +++ b/admin/layouts/ftp/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php index b15977a4c..8fbecd518 100644 --- a/admin/layouts/ftp/linked_components_fullwidth.php +++ b/admin/layouts/ftp/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/ftp/publishing.php b/admin/layouts/ftp/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/ftp/publishing.php +++ b/admin/layouts/ftp/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/ftp/publlshing.php b/admin/layouts/ftp/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/ftp/publlshing.php +++ b/admin/layouts/ftp/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 c2054f3af..2f4a2fe4f 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 5fd45c230..c21aa69f1 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 f2b12ed4e..a36ceed8d 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 d559e943a..6e6d6c87b 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 889420ac1..5b2b24f66 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 2e7948dc2..979e11f42 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/joomla_component/admin_views_fullwidth.php b/admin/layouts/joomla_component/admin_views_fullwidth.php index 20f8c31da..affd61f9e 100644 --- a/admin/layouts/joomla_component/admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php index 4dc374cf3..c8ef5d768 100644 --- a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php index 3f0d3cf5f..c3abf1866 100644 --- a/admin/layouts/joomla_component/details_above.php +++ b/admin/layouts/joomla_component/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php index a554d1acb..6de7dd96a 100644 --- a/admin/layouts/joomla_component/details_left.php +++ b/admin/layouts/joomla_component/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php index 7e7571990..39721c8f3 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/joomla_component/details_under.php b/admin/layouts/joomla_component/details_under.php index 889420ac1..5b2b24f66 100644 --- a/admin/layouts/joomla_component/details_under.php +++ b/admin/layouts/joomla_component/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php index ba3fbcbab..61c9b35ab 100644 --- a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php index a5c2ab8fe..33e0137a1 100644 --- a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_integration_fullwidth.php diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php index 8006650fb..c4914ff90 100644 --- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php +++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/joomla_component/metadata.php b/admin/layouts/joomla_component/metadata.php index e4fbf9487..174f1a19b 100644 --- a/admin/layouts/joomla_component/metadata.php +++ b/admin/layouts/joomla_component/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage metadata.php diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php index 6751d3424..f9c2695f6 100644 --- a/admin/layouts/joomla_component/mysql_fullwidth.php +++ b/admin/layouts/joomla_component/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/joomla_component/php_fullwidth.php b/admin/layouts/joomla_component/php_fullwidth.php index 64355465d..b64ec0ccd 100644 --- a/admin/layouts/joomla_component/php_fullwidth.php +++ b/admin/layouts/joomla_component/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/joomla_component/publishing.php b/admin/layouts/joomla_component/publishing.php index 7a82c1c75..90be72273 100644 --- a/admin/layouts/joomla_component/publishing.php +++ b/admin/layouts/joomla_component/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php index 944d41330..3e2221aff 100644 --- a/admin/layouts/joomla_component/readme_left.php +++ b/admin/layouts/joomla_component/readme_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/joomla_component/readme_right.php b/admin/layouts/joomla_component/readme_right.php index 661d3e022..3fa3b302b 100644 --- a/admin/layouts/joomla_component/readme_right.php +++ b/admin/layouts/joomla_component/readme_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/joomla_component/settings_left.php b/admin/layouts/joomla_component/settings_left.php index c9b474957..0bdc0287a 100644 --- a/admin/layouts/joomla_component/settings_left.php +++ b/admin/layouts/joomla_component/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php index 264d3dce0..a27ecca0e 100644 --- a/admin/layouts/joomla_component/settings_right.php +++ b/admin/layouts/joomla_component/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php index 49b290bd5..d27b37289 100644 --- a/admin/layouts/joomla_component/site_views_fullwidth.php +++ b/admin/layouts/joomla_component/site_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/joomla_component/translation_fullwidth.php b/admin/layouts/joomla_component/translation_fullwidth.php index f2c3317d2..8ee24c7da 100644 --- a/admin/layouts/joomla_component/translation_fullwidth.php +++ b/admin/layouts/joomla_component/translation_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage translation_fullwidth.php diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php index d69ac871d..259fa1157 100644 --- a/admin/layouts/language/details_left.php +++ b/admin/layouts/language/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/language/details_right.php b/admin/layouts/language/details_right.php index af652e5f5..386c4044f 100644 --- a/admin/layouts/language/details_right.php +++ b/admin/layouts/language/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/language/publishing.php b/admin/layouts/language/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/language/publishing.php +++ b/admin/layouts/language/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language/publlshing.php b/admin/layouts/language/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/language/publlshing.php +++ b/admin/layouts/language/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/language_translation/details_above.php b/admin/layouts/language_translation/details_above.php index 77ebff8e1..1af7819cb 100644 --- a/admin/layouts/language_translation/details_above.php +++ b/admin/layouts/language_translation/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/language_translation/details_fullwidth.php b/admin/layouts/language_translation/details_fullwidth.php index e87180fef..3c68a0536 100644 --- a/admin/layouts/language_translation/details_fullwidth.php +++ b/admin/layouts/language_translation/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/language_translation/publishing.php b/admin/layouts/language_translation/publishing.php index 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/language_translation/publishing.php +++ b/admin/layouts/language_translation/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language_translation/publlshing.php b/admin/layouts/language_translation/publlshing.php index 2e7948dc2..979e11f42 100644 --- a/admin/layouts/language_translation/publlshing.php +++ b/admin/layouts/language_translation/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 d77820355..6b68deade 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 8fe98ce36..27249e024 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 7c7cf9e46..1c99798ab 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 fdf234cbb..fae90925f 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 f40f46d70..0110e2439 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 889420ac1..5b2b24f66 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 2e7948dc2..979e11f42 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 aa27bef37..4bbfa9ec5 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.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/custom_buttons_left.php b/admin/layouts/site_view/custom_buttons_left.php index 353e66db0..093c249f0 100644 --- a/admin/layouts/site_view/custom_buttons_left.php +++ b/admin/layouts/site_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/site_view/custom_buttons_right.php b/admin/layouts/site_view/custom_buttons_right.php index cdabf8dab..7e7b82d32 100644 --- a/admin/layouts/site_view/custom_buttons_right.php +++ b/admin/layouts/site_view/custom_buttons_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_right.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index 3f0d3cf5f..c3abf1866 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 1249082a5..21b529eed 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 b9627de85..356259a6e 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 fdf234cbb..fae90925f 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 a4e820159..2feb0423b 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 889420ac1..5b2b24f66 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 784418553..7b897e9f3 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 eb6f25487..4c33f5016 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 fa49bcd45..9bef8eede 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 2e7948dc2..979e11f42 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 e63a33228..d1c38ca9d 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 5ee6b611e..0eefb5500 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 5e2fc19ca..e47dc84a8 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 2e7948dc2..979e11f42 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 d77820355..6b68deade 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 7e8b67097..83df7489e 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 7c7cf9e46..1c99798ab 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 fdf234cbb..fae90925f 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 f40f46d70..0110e2439 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 889420ac1..5b2b24f66 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 49a10da7c..b6c0d3f1f 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 2e7948dc2..979e11f42 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index b42fbc32c..3075281bc 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php @@ -1169,7 +1169,7 @@ class ComponentbuilderModelAjax extends JModelList unset($result->php_calculation); } // name the main var based on view - if ($view == 'template') + if ('template' === $view || 'site_view' === $view) { switch ($result->gettype) { diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index afe2e4d49..d815ef3e4 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php index 0f8403f14..0c561c3a0 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/models/dynamic_gets.php b/admin/models/dynamic_gets.php index 6c07983eb..5ecc96b95 100644 --- a/admin/models/dynamic_gets.php +++ b/admin/models/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 77f3a9749..948ab3331 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 6ac5ba989..720337861 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 67e9c86bf..49c387925 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 f76f01deb..907468023 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/fields/components.php b/admin/models/fields/components.php index 89a695c53..0e8712c79 100644 --- a/admin/models/fields/components.php +++ b/admin/models/fields/components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index 9d3f8bee9..ef032fc95 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 2bf7bc6ce..bebe5e3f3 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 0af3853e9..0e2cce6b8 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 d561ff363..452988d33 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 370071deb..86b027ccc 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicget.php b/admin/models/fields/dynamicget.php index 4f53d0d01..90f70d3f3 100644 --- a/admin/models/fields/dynamicget.php +++ b/admin/models/fields/dynamicget.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicget.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index 2e29a5392..fa24590dc 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 4cfe4f1b9..f37c14ab7 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index 86af29bb7..98c2e8746 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/ftps.php b/admin/models/fields/ftps.php index 09bcdd966..045b42153 100644 --- a/admin/models/fields/ftps.php +++ b/admin/models/fields/ftps.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ftps.php diff --git a/admin/models/fields/lang.php b/admin/models/fields/lang.php index fd352cce7..d025e410c 100644 --- a/admin/models/fields/lang.php +++ b/admin/models/fields/lang.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage lang.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index c32c1747f..a3bdccab3 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/matchfield.php b/admin/models/fields/matchfield.php index d9e06f843..4b143d0a2 100644 --- a/admin/models/fields/matchfield.php +++ b/admin/models/fields/matchfield.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage matchfield.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index 6caeef95b..b86f93a79 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 a4fd6d283..4c128b10c 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 d05fb9add..9975c16af 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fields/targetfields.php b/admin/models/fields/targetfields.php index a7665e834..20f358dd6 100644 --- a/admin/models/fields/targetfields.php +++ b/admin/models/fields/targetfields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage targetfields.php diff --git a/admin/models/fields/viewtabs.php b/admin/models/fields/viewtabs.php index bbd258cdf..ec6b94c81 100644 --- a/admin/models/fields/viewtabs.php +++ b/admin/models/fields/viewtabs.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage viewtabs.php diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js index 518d54d1a..ab9cf8720 100644 --- a/admin/models/forms/dynamic_get.js +++ b/admin/models/forms/dynamic_get.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.js diff --git a/admin/models/forms/joomla_component.js b/admin/models/forms/joomla_component.js index fcc62509e..023c73b8f 100644 --- a/admin/models/forms/joomla_component.js +++ b/admin/models/forms/joomla_component.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.js diff --git a/admin/models/import.php b/admin/models/import.php index cb7b7583e..2bddbf916 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php index 94d54f3a3..dfedd2285 100644 --- a/admin/models/import_joomla_components.php +++ b/admin/models/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php @@ -81,6 +81,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } protected $app; + protected $dir = false; + protected $data = false; protected $target = false; protected $newID = array(); protected $forceUpdate = 0; @@ -241,11 +243,11 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // get the zip adapter $zip = JArchive::getAdapter('zip'); // set the directory name - $dir = JFile::stripExt($package['dir']); + $this->dir = JFile::stripExt($package['dir']); // unzip the package - $zip->extract($package['dir'], $dir); + $zip->extract($package['dir'], $this->dir); // check for database file - $infoFile = $dir . '/info.vdm'; + $infoFile = $this->dir . '/info.vdm'; if (JFile::exists($infoFile)) { // load the data @@ -264,7 +266,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } } } - ComponentbuilderHelper::removeFolder($dir); + ComponentbuilderHelper::removeFolder($this->dir); } } return false; @@ -549,15 +551,15 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy if (JFile::exists($package['dir'])) { // set the directory name - $dir = JFile::stripExt($package['dir']); + $this->dir = JFile::stripExt($package['dir']); // check for database file - $dbFile = $dir . '/db.vdm'; + $dbFile = $this->dir . '/db.vdm'; if (!JFile::exists($dbFile)) { // get the zip adapter $zip = JArchive::getAdapter('zip'); // unzip the package - $zip->extract($package['dir'], $dir); + $zip->extract($package['dir'], $this->dir); } // check again if (JFile::exists($dbFile)) @@ -566,21 +568,21 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy if ($data = @file_get_contents($dbFile)) { // prep the data - if ($data = $this->extractData($data)) + if ($this->extractData($data)) { - if (isset($data['joomla_component']) && ComponentbuilderHelper::checkArray($data['joomla_component'])) + if (isset($this->data['joomla_component']) && ComponentbuilderHelper::checkArray($this->data['joomla_component'])) { // save the smart data - if ($this->saveSmartComponents($data, $dir)) + if ($this->saveSmartComponents()) { - ComponentbuilderHelper::removeFolder($dir); + ComponentbuilderHelper::removeFolder($this->dir); return true; } } } } } - ComponentbuilderHelper::removeFolder($dir); + ComponentbuilderHelper::removeFolder($this->dir); } } } @@ -617,7 +619,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy $data = @unserialize($data); if ($data !== false) { - return $data; + // set the data global + $this->data = $data; + return true; } $this->app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_HTWODATA_IS_CORRUPTHTWOTHIS_COULD_BE_DUE_TO_KEY_ERROR_OR_BROKEN_PACKAGE'), 'error'); return false; @@ -629,89 +633,87 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy /** * Save the smart components * - * @param array $data The values to save - * * @return boolean false on failure * **/ - protected function saveSmartComponents($data, $dir) + protected function saveSmartComponents() { // get user object $this->user = JFactory::getUser(); // set some defaults $this->today = JFactory::getDate()->toSql(); // we first store the fieldtype - if (!$this->saveSmartItems($data, 'fieldtype')) + if (!$this->saveSmartItems('fieldtype')) { return false; } // we then store the field - if (!$this->saveSmartItems($data, 'field')) + if (!$this->saveSmartItems('field')) { return false; } // we then store the admin_view - if (!$this->saveSmartItems($data, 'admin_view')) - { - return false; - } - // we then store the admin_fields - if (!$this->saveSmartItems($data, 'admin_fields')) - { - return false; - } - // we then store the admin_fields_conditions - if (!$this->saveSmartItems($data, 'admin_fields_conditions')) + if (!$this->saveSmartItems('admin_view')) { return false; } // we then store the snippet - if (!$this->saveSmartItems($data, 'snippet')) + if (!$this->saveSmartItems('snippet')) { return false; } // we then store the dynamic_get - if (!$this->saveSmartItems($data, 'dynamic_get')) + if (!$this->saveSmartItems('dynamic_get')) { return false; } // we then store the custom_admin_view - if (!$this->saveSmartItems($data, 'custom_admin_view')) + if (!$this->saveSmartItems('custom_admin_view')) { return false; } // we then store the site_view - if (!$this->saveSmartItems($data, 'site_view')) + if (!$this->saveSmartItems('site_view')) { return false; } // we then store the template - if (!$this->saveSmartItems($data, 'template')) + if (!$this->saveSmartItems('template')) { return false; } // we then store the layout - if (!$this->saveSmartItems($data, 'layout')) + if (!$this->saveSmartItems('layout')) { return false; } // we then store the components - if (!$this->saveSmartItems($data, 'joomla_component')) + if (!$this->saveSmartItems('joomla_component')) { return false; } // we then store the languages - if (!$this->saveSmartItems($data, 'language')) + if (!$this->saveSmartItems('language')) { return false; } // we then store the language translations - if (!$this->saveSmartItems($data, 'language_translation')) + if (!$this->saveSmartItems('language_translation')) { return false; } // we then store the custom_code - if (!$this->saveSmartItems($data, 'custom_code')) + if (!$this->saveSmartItems('custom_code')) + { + return false; + } + // we then store the admin_fields + if (!$this->saveSmartItems('admin_fields')) + { + return false; + } + // we then store the admin_fields_conditions + if (!$this->saveSmartItems('admin_fields_conditions')) { return false; } @@ -720,7 +722,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // finally move the old datasets $this->moveDivergedData(); // lets move all the files to its correct location - if (!$this->moveSmartStuff($dir)) + if (!$this->moveSmartStuff()) { return false; } @@ -728,17 +730,102 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } /** - * Move the smart content (files & folders) into place + * Save the smart items * - * @param string $dir The path to the folders + * @param string $type The type of values * * @return boolean false on failure * **/ - protected function moveSmartStuff($dir) + protected function saveSmartItems($table) + { + $success = true; + if (isset($this->data[$table]) && ComponentbuilderHelper::checkArray($this->data[$table])) + { + // get global action permissions + $canDo = ComponentbuilderHelper::getActions($table); + $canEdit = $canDo->get('core.edit'); + $canState = $canDo->get('core.edit.state'); + $canCreate = $canDo->get('core.create'); + // set id keeper + if (!isset($this->newID[$table])) + { + $this->newID[$table] = array(); + } + foreach ($this->data[$table] as $item) + { + $oldID = (int) $item->id; + // first check if exist + if ($local = $this->getLocalItem($item, $table, 1)) + { + $dbDate = strtotime($item->modified); + $localDate = strtotime($local->modified); + // okay we have it local (check if the version is newer) + if ($this->forceUpdate == 1 || $dbDate > $localDate) + { + // add some local values to item to combine + if ($table === 'language_translation') + { + $item->localComponents = $local->components; + $item->localTranslation = $local->translation; + } + // make sure we have the correct ID set + $item->id = $local->id; + // yes it is newer, lets update (or is being forced) + if ($canEdit && $id = $this->updateLocalItem($item, $table, $canState)) + { + // we had success in + $this->newID[$table][$oldID] = (int) $id; + // to debug if your mismatching is to much (TODO) we can add a debugging switch later + // $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_HAS_BEEN_UPDATED', $table.' id:'.$oldID . '->' . $id), 'success'); + } + else + { + $notice = '!'; + if (!$canEdit) + { + $notice = JText::sprintf("COM_COMPONENTBUILDER__SINCE_YOU_DONT_HAVE_PERMISSION_TO_EDIT_S", $table); + } + $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS', $table.' id:'.$oldID, $notice), 'error'); + } + } + // insure to load the local ID to link imported values with it + if (!isset($this->newID[$table][$oldID])) + { + $this->newID[$table][$oldID] = (int) $local->id; + } + } + elseif ($canCreate && $id = $this->addLocalItem($item, $table)) + { + // not found in local db so add + $this->newID[$table][$oldID] = (int) $id; + // to debug if your mismatching is to much + // $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_HAS_BEEN_IMPORTED', $table.' id:'.$oldID . '->' . $id), 'success'); + } + else + { + $notice = '!'; + if (!$canCreate) + { + $notice = JText::sprintf("COM_COMPONENTBUILDER__SINCE_YOU_DONT_HAVE_PERMISSION_TO_CREATE_S", $table); + } + $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS', $table.' id:'.$oldID, $notice), 'error'); + } + } + } + return $success; + } + + /** + * Move the smart content (files & folders) into place + * + * @return boolean false on failure + * + **/ + protected function moveSmartStuff() { // make sure to first unlock files - $this->unLockFiles($dir); + $this->unLockFiles($this->dir); // set params $params = JComponentHelper::getParams('com_componentbuilder'); // set custom folder path @@ -746,7 +833,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy $imagesPath = str_replace('//', '/', JPATH_SITE . '/images'); $success = true; // check if we have custom files - $customDir = str_replace('//', '/', $dir . '/custom'); + $customDir = str_replace('//', '/', $this->dir . '/custom'); if (JFolder::exists($customDir)) { // great we have some custom stuff lets move it @@ -757,7 +844,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } } // check if we have images - $imageDir = str_replace('//', '/', $dir . '/images'); + $imageDir = str_replace('//', '/', $this->dir . '/images'); if (JFolder::exists($imageDir)) { // great we have some images lets move them @@ -775,7 +862,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy * * @return void */ - protected function unLockFiles(&$dir) + protected function unLockFiles() { // lock the data if set if(ComponentbuilderHelper::checkString($this->sleutle) && strlen($this->sleutle) == 32) @@ -784,14 +871,14 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // we must first store the current working directory $joomla = getcwd(); // setup the type path - $customPath = str_replace('//', '/', $dir . '/custom'); + $customPath = str_replace('//', '/', $this->dir . '/custom'); // go to the custom folder if found if (JFolder::exists($customPath)) { $this->unlock($customPath, $unlocker); } // setup the type path - $imagesPath = str_replace('//', '/', $dir . '/images'); + $imagesPath = str_replace('//', '/', $this->dir . '/images'); // go to the custom folder if found if (JFolder::exists($imagesPath)) { @@ -830,92 +917,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } } - /** - * Save the smart items - * - * @param array $items The values to save - * @param string $type The type of values - * - * @return boolean false on failure - * - **/ - protected function saveSmartItems(&$items, $type) - { - $success = true; - if (isset($items[$type]) && ComponentbuilderHelper::checkArray($items[$type])) - { - // get global action permissions - $canDo = ComponentbuilderHelper::getActions($type); - $canEdit = $canDo->get('core.edit'); - $canState = $canDo->get('core.edit.state'); - $canCreate = $canDo->get('core.create'); - // set id keeper - if (!isset($this->newID[$type])) - { - $this->newID[$type] = array(); - } - foreach ($items[$type] as $item) - { - $oldID = $item->id; - // first check if exist - if ($local = $this->getLocalItem($item, $type, 1)) - { - $dbDate = strtotime($item->modified); - $localDate = strtotime($local->modified); - // okay we have it local (check if the version is newer) - if ($this->forceUpdate == 1 || $dbDate > $localDate) - { - // add some local values to item to combine - if ($type === 'language_translation') - { - $item->localComponents = $local->components; - $item->localTranslation = $local->translation; - } - // make sure we have the correct ID set - $item->id = $local->id; - // yes it is newer, lets update (or is being forced) - if ($canEdit && $id = $this->updateLocalItem($item, $type, $canState)) - { - $this->newID[$type][$oldID] = $id; - } - else - { - $notice = '!'; - if (!$canEdit) - { - $notice = JText::sprintf("COM_COMPONENTBUILDER__SINCE_YOU_DONT_HAVE_PERMISSION_TO_EDIT_S", $type); - } - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS', $type.' id:'.$oldID, $notice), 'error'); - } - } - else - { - $this->newID[$type][$oldID] = $local->id; - } - } - elseif ($canCreate && $id = $this->addLocalItem($item, $type)) - { - // not found in local db so add - $this->newID[$type][$oldID] = $id; - } - else - { - $notice = '!'; - if (!$canCreate) - { - $notice = JText::sprintf("COM_COMPONENTBUILDER__SINCE_YOU_DONT_HAVE_PERMISSION_TO_CREATE_S", $type); - } - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS', $type.' id:'.$oldID, $notice), 'error'); - } - } - } - return $success; - } - /** * Update some items after all * - * * @return void * **/ @@ -954,13 +958,13 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy $bucket = array(); foreach ($fieldsSets as $id) { - if (isset($this->newID['field'][$id])) + if (isset($this->newID['field'][(int) $id])) { - $bucket[] = $this->newID['field'][$id]; + $bucket[] = $this->newID['field'][(int) $id]; } else { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BREPEATABLEB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_EMREMOVEDEM_FROM_THE_FIELD', $id, $field), 'warning'); + $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BMULTIPLE_FIELD_REPEATABLE_MODEB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_EMREMOVEDEM_FROM_THE_FIELD', $id, $field), 'warning'); } } if (ComponentbuilderHelper::checkArray($bucket)) @@ -988,9 +992,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // update the addlinked_views foreach ($this->updateAfter['adminview'] as $adminview) { - if (isset($this->newID['admin_view'][$adminview])) + if (isset($this->newID['admin_view'][(int) $adminview])) { - $adminview = $this->newID['admin_view'][$adminview]; + $adminview = $this->newID['admin_view'][(int) $adminview]; } // get the field from db if ($addlinked_views = ComponentbuilderHelper::getVar('admin_view', $adminview, 'id', 'addlinked_views')) @@ -1050,27 +1054,32 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy /* * Convert repeatable field to subform * - * @param array $array The array to convert + * @param array $item The array to convert * @param string $name The main field name * @param array $updater The updater (dynamic) option * * @return array */ - protected function convertRepeatable($array, $name) + protected function convertRepeatable($item, $name) { - $bucket = array(); - foreach ($array as $key => $values) + // continue only if we have an array + if (ComponentbuilderHelper::checkArray($item)) { - foreach ($values as $nr => $value) + $bucket = array(); + foreach ($item as $key => $values) { - if (!isset($bucket[$name . $nr]) || !ComponentbuilderHelper::checkArray($bucket[$name . $nr])) + foreach ($values as $nr => $value) { - $bucket[$name . $nr] = array(); + if (!isset($bucket[$name . $nr]) || !ComponentbuilderHelper::checkArray($bucket[$name . $nr])) + { + $bucket[$name . $nr] = array(); + } + $bucket[$name . $nr][$key] = $value; } - $bucket[$name . $nr][$key] = $value; } + return $bucket; } - return $bucket; + return $item; } /* @@ -1081,26 +1090,27 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy * * @return void */ - protected function convertRepeatableFields(&$item, $updater) + protected function convertRepeatableFields($object, $updater) { // update the repeatable fields foreach ($updater as $up => $sleutel) { - if (isset($item->{$up}) && ComponentbuilderHelper::checkJson($item->{$up})) + if (isset($object->{$up}) && ComponentbuilderHelper::checkJson($object->{$up})) { - $updateArray = json_decode($item->{$up}, true); + $updateArray = json_decode($object->{$up}, true); // check if this is old values for repeatable fields if (ComponentbuilderHelper::checkArray($updateArray) && isset($updateArray[$sleutel])) { // load it back - $item->{$up} = json_encode($this->convertRepeatable($updateArray, $up)); + $object->{$up} = json_encode($this->convertRepeatable($updateArray, $up)); } } - elseif (isset($item->{$up})) + elseif (isset($object->{$up})) { - unset($item->{$up}); + unset($object->{$up}); } } + return $object; } /** @@ -1155,45 +1165,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy { if (isset($value[$target])) { - // update the target - if (!ComponentbuilderHelper::checkArray($value[$target])) - { - if (isset($this->newID[$target_type][$value[$target]])) - { - $value[$target] = $this->newID[$target_type][$value[$target]]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_SO_THE_IDS_WAS_REMOVED', ComponentbuilderHelper::safeString($target_type, 'Ww') . '->' . ComponentbuilderHelper::safeString($target, 'Ww') .' in ('.ComponentbuilderHelper::safeString($table, 'w').':'.$item->id.')', $value[$target]), 'warning'); - $value[$target] = ''; - } - } - elseif (ComponentbuilderHelper::checkArray($value[$target])) - { - // the bucket to load the items back - $bucket = array(); - foreach ($value[$target] as $id) - { - if (!is_numeric($id)) - { - continue; - } - if (isset($this->newID[$target_type][$id])) - { - $bucket[] = $this->newID[$target_type][$id]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_SO_THE_IDS_WAS_REMOVED', ComponentbuilderHelper::safeString($target_type, 'Ww') . '->' . ComponentbuilderHelper::safeString($target, 'Ww') .' in ('.ComponentbuilderHelper::safeString($table, 'w').':'.$item->id.')', $id), 'warning'); - $bucket[] = ''; - } - } - // set ids back - if (ComponentbuilderHelper::checkArray($bucket)) - { - $value[$target] = $bucket; - } - } + $value = $this->setNewID($value, $target, $target_type, $table); } } } @@ -1205,6 +1177,169 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy return $values; } + /** + * Set the new ID + * + * @param array $item The values to update the IDs in + * @param string $target The target field + * @param string $type The table of that field + * @param string $table The table these values belong to + * + * @return boolean True on success + * + */ + protected function setNewID($item, $target, $type, $table) + { + $isJson = false; + if (ComponentbuilderHelper::checkJson($item)) + { + $item = json_decode($item, true); + $isJson = true; + } + if (ComponentbuilderHelper::checkArray($item)) + { + // set item ID + $itemId = (isset($item['id'])) ? $item['id'] : 'newItem'; + // check if it is json + $isJsonTarget = false; + if (ComponentbuilderHelper::checkJson($item[$target])) + { + $item[$target] = json_decode($item[$target], true); + $isJsonTarget = true; + } + // update the target + if (ComponentbuilderHelper::checkString($item[$target]) || is_numeric($item[$target])) + { + if ($item[$target] == 0) + { + $item[$target] = ''; + } + elseif (isset($this->newID[$type][(int) $item[$target]])) + { + $item[$target] = $this->newID[$type][(int) $item[$target]]; + } + else + { + $this->enqueueIdMismatchMessage($item[$target], $itemId, $target, $type, $table); + $item[$target] = ''; + } + } + elseif (ComponentbuilderHelper::checkArray($item[$target])) + { + // the bucket to load the items back + $bucket = array(); + foreach ($item[$target] as $nr => $id) + { + if ($id == 0) + { + continue; + } + elseif ((ComponentbuilderHelper::checkString($id) || is_numeric($id)) && isset($this->newID[$type][(int) $id])) + { + $bucket[] = $this->newID[$type][(int) $id]; + } + else + { + $this->enqueueIdMismatchMessage($id, $itemId, $target, $type, $table); + } + } + // set ids back + if (ComponentbuilderHelper::checkArray($bucket)) + { + $item[$target] = $bucket; + } + } + // convert back to json + if ($isJsonTarget) + { + $item[$target] = json_encode($item[$target]); + } + } + elseif (ComponentbuilderHelper::checkObject($item)) + { + // set item ID + $itemId = (isset($item->id)) ? $item->id : 'newItem'; + // check if it is json + $isJsonTarget = false; + if (ComponentbuilderHelper::checkJson($item->{$target})) + { + $item->{$target} = json_decode($item->{$target}, true); + $isJsonTarget = true; + } + // update the target + if (ComponentbuilderHelper::checkString($item->{$target}) || is_numeric($item->{$target})) + { + if ($item->{$target} == 0) + { + $item->{$target} = ''; + } + elseif (isset($this->newID[$type][(int) $item->{$target}])) + { + $item->{$target} = $this->newID[$type][(int) $item->{$target}]; + } + else + { + $this->enqueueIdMismatchMessage($item->{$target}, $itemId, $target, $type, $table); + $item->{$target} = ''; + } + } + elseif (ComponentbuilderHelper::checkArray($item->{$target})) + { + // the bucket to load the items back + $bucket = array(); + foreach ($item->{$target} as $id) + { + if ($id == 0) + { + continue; + } + elseif ((ComponentbuilderHelper::checkString($id) || is_numeric($id)) && isset($this->newID[$type][(int) $id])) + { + $bucket[] = $this->newID[$type][(int) $id]; + } + else + { + $this->enqueueIdMismatchMessage($id, $itemId, $target, $type, $table); + $bucket[] = ''; + } + } + // set ids back + if (ComponentbuilderHelper::checkArray($bucket)) + { + $item->{$target} = $bucket; + } + } + // convert back to json + if ($isJsonTarget) + { + $item->{$target} = json_encode($item->{$target}); + } + } + // return as json if received as json + if ($isJson) + { + return json_encode($item); + } + return $item; + } + + /** + * Set the new ID + * + * @param int $id The field ID + * @param int $itemId The item ID + * @param string $target The target field + * @param string $type The table of that field + * @param string $table The table these values belong to + * + * @return void + * + */ + protected function enqueueIdMismatchMessage($id, $itemId, $target, $type, $table) + { + $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSBS_IN_BSB_HAS_ID_MISMATCH_SO_THE_BSB_WAS_REMOVED', ComponentbuilderHelper::safeString($type, 'Ww'), ComponentbuilderHelper::safeString($target, 'Ww') , ComponentbuilderHelper::safeString($table, 'w').':'.$itemId, $type . ':' . $id), 'warning'); + } + /** * Prep the item * @@ -1241,13 +1376,13 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy 'properties' => 'name' ); // update the repeatable fields - $this->convertRepeatableFields($item, $updaterR); + $item = $this->convertRepeatableFields($item, $updaterR); break; case 'field': // update the fieldtype - if (isset($item->fieldtype) && is_numeric($item->fieldtype) && $item->fieldtype > 0 && isset($this->newID['fieldtype'][$item->fieldtype])) + if (isset($item->fieldtype) && is_numeric($item->fieldtype) && $item->fieldtype > 0 && isset($this->newID['fieldtype'][(int) $item->fieldtype])) { - $item->fieldtype = $this->newID['fieldtype'][$item->fieldtype]; + $item->fieldtype = $this->newID['fieldtype'][(int) $item->fieldtype]; // update multi field values if ($this->checkMultiFields($item->fieldtype)) { @@ -1267,17 +1402,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy break; case 'dynamic_get': // update the view_table_main ID - if (isset($item->main_source) && $item->main_source == 1 && isset($item->view_table_main) && is_numeric($item->view_table_main) && $item->view_table_main > 0) + if (isset($item->main_source) && $item->main_source == 1) { - if (isset($this->newID['admin_view'][$item->view_table_main])) - { - $item->view_table_main = $this->newID['admin_view'][$item->view_table_main]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BVIEW_TABLE_MAINB_IDS_MISMATCH_IN_BSB', $item->view_table_main, ComponentbuilderHelper::safeString($type, 'w').':'.$item->id), 'error'); - return false; - } + $item = $this->setNewID($item, 'view_table_main', 'admin_view', $type); } // repeatable fields to update $updaterR = array( @@ -1290,7 +1417,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy 'filter' => 'filter_type' ); // update the repeatable fields - $this->convertRepeatableFields($item, $updaterR); + $item = $this->convertRepeatableFields($item, $updaterR); // subform fields to target $updaterT = array( // subformfield => field => type_value @@ -1302,114 +1429,20 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy case 'layout': case 'template': // update the dynamic_get - if (isset($item->dynamic_get) && is_numeric($item->dynamic_get) && $item->dynamic_get > 0 && isset($this->newID['dynamic_get'][$item->dynamic_get])) - { - $item->dynamic_get = $this->newID['dynamic_get'][$item->dynamic_get]; - } - elseif (!is_numeric($item->dynamic_get) || $item->dynamic_get == 0) - { - unset($item->dynamic_get); - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BDYNAMIC_GETB_IDS_MISMATCH_IN_BSB', $item->dynamic_get, ComponentbuilderHelper::safeString($type, 'w').':'.$item->id), 'warning'); - unset($item->dynamic_get); - } + $item = $this->setNewID($item, 'dynamic_get', 'dynamic_get', $type); // update the snippet - if (isset($item->snippet) && is_numeric($item->snippet) && $item->snippet > 0 && isset($this->newID['snippet'][$item->snippet])) - { - $item->snippet = $this->newID['snippet'][$item->snippet]; - } - elseif (!is_numeric($item->snippet) || $item->snippet == 0) - { - unset($item->snippet); - } - else - { - // $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSNIPPETB_IDS_MISMATCH_IN_BSB', $item->snippet, ComponentbuilderHelper::safeString($type, 'w').':'.$item->id), 'warning'); - // unset($item->snippet); - } + $item = $this->setNewID($item, 'snippet', 'snippet', $type); break; case 'custom_admin_view': case 'site_view': // update the main_get - if (isset($item->main_get) && is_numeric($item->main_get) && $item->main_get > 0 && isset($this->newID['dynamic_get'][$item->main_get])) - { - $item->main_get = $this->newID['dynamic_get'][$item->main_get]; - } - elseif (!is_numeric($item->main_get) || $item->main_get == 0) - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BMAIN_GETB_NOT_SET_FOR_BSB', ComponentbuilderHelper::safeString($type, 'w').':'.$item->id), 'warning'); - unset($item->main_get); - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BMAIN_GETB_IDS_MISMATCH_IN_BSB', $item->main_get, ComponentbuilderHelper::safeString($type, 'w').':'.$item->id), 'error'); - return false; - } + $item = $this->setNewID($item, 'main_get', 'dynamic_get', $type); // update the dynamic_get - if (isset($item->dynamic_get) && is_numeric($item->dynamic_get) && $item->dynamic_get > 0 && isset($this->newID['dynamic_get'][$item->dynamic_get])) - { - $item->dynamic_get = $this->newID['dynamic_get'][$item->dynamic_get]; - } - elseif (!is_numeric($item->dynamic_get) || $item->dynamic_get == 0) - { - unset($item->dynamic_get); - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BDYNAMIC_GETB_IDS_MISMATCH_IN_BSB', $item->dynamic_get, ComponentbuilderHelper::safeString($type, 'w').':'.$item->id), 'warning'); - unset($item->dynamic_get); - } + $item = $this->setNewID($item, 'dynamic_get', 'dynamic_get', $type); // update the custom_get - if (isset($item->custom_get) && ComponentbuilderHelper::checkJson($item->custom_get)) - { - $custom_get = json_decode($item->custom_get, true); - foreach ($custom_get as $nr => $get) - { - if (!is_numeric($get)) - { - continue; - } - // update the custom_get - if (isset($this->newID['dynamic_get'][$get])) - { - $custom_get[$nr] = $this->newID['dynamic_get'][$get]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BCUSTOM_GET_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BDYNAMIC_GETB_SO_THE_IDS_WAS_REMOVED', '('.ComponentbuilderHelper::safeString($type, 'w').':'.$item->id.')', $get), 'warning'); - unset($custom_get[$nr]); - } - } - // load it back if there is any remaining - if (ComponentbuilderHelper::checkArray($custom_get)) - { - $item->custom_get = json_encode( (object) $custom_get); - } - else - { - unset($item->custom_get); - } - } - else - { - unset($item->custom_get); - } + $item = $this->setNewID($item, 'custom_get', 'dynamic_get', $type); // update the snippet - if (isset($item->snippet) && is_numeric($item->snippet) && $item->snippet > 0 && isset($this->newID['snippet'][$item->snippet])) - { - $item->snippet = $this->newID['snippet'][$item->snippet]; - } - elseif (!is_numeric($item->snippet) || $item->snippet == 0) - { - unset($item->snippet); - } - else - { - // $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BSNIPPETB_IDS_MISMATCH_IN_BSB', $item->snippet, ComponentbuilderHelper::safeString($type, 'w').':'.$item->id), 'warning'); - // unset($item->snippet); - } + $item = $this->setNewID($item, 'snippet', 'snippet', $type); // repeatable fields to update $updaterR = array( // repeatablefield => checker @@ -1417,7 +1450,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy 'custom_button' => 'name' ); // update the repeatable fields - $this->convertRepeatableFields($item, $updaterR); + $item = $this->convertRepeatableFields($item, $updaterR); break; case 'admin_view': // we must clear the demo content (since it was not moved as far as we know) TODO @@ -1476,7 +1509,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy 'addpermissions' => 'action' ); // update the repeatable fields - $this->convertRepeatableFields($item, $updaterR); + $item = $this->convertRepeatableFields($item, $updaterR); break; case 'joomla_component': // update the addconfig @@ -1490,9 +1523,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy continue; } // update the addconfig - if (isset($this->newID['field'][$id])) + if (isset($this->newID['field'][(int) $id])) { - $addconfig['field'][$nr] = $this->newID['field'][$id]; + $addconfig['field'][$nr] = $this->newID['field'][(int) $id]; } else { @@ -1514,9 +1547,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy continue; } // update the addadmin_views - if (isset($this->newID['admin_view'][$id])) + if (isset($this->newID['admin_view'][(int) $id])) { - $addadmin_views['adminview'][$nr] = $this->newID['admin_view'][$id]; + $addadmin_views['adminview'][$nr] = $this->newID['admin_view'][(int) $id]; } else { @@ -1542,9 +1575,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy continue; } // update the addcustom_admin_views - if (isset($this->newID['custom_admin_view'][$id])) + if (isset($this->newID['custom_admin_view'][(int) $id])) { - $addcustom_admin_views['customadminview'][$nr] = $this->newID['custom_admin_view'][$id]; + $addcustom_admin_views['customadminview'][$nr] = $this->newID['custom_admin_view'][(int) $id]; } else { @@ -1566,9 +1599,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy continue; } // update the addsite_views - if (isset($this->newID['site_view'][$id])) + if (isset($this->newID['site_view'][(int) $id])) { - $addsite_views['siteview'][$nr] = $this->newID['site_view'][$id]; + $addsite_views['siteview'][$nr] = $this->newID['site_view'][(int) $id]; } else { @@ -1582,47 +1615,18 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy break; case 'custom_code': // update the component ID where needed - if (isset($item->component) && $item->component > 0) - { - if (isset($this->newID['joomla_component'][$item->component])) - { - $item->component = $this->newID['joomla_component'][$item->component]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BCOMPONENT_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BCOMPONENTB_SO_THE_IDS_WAS_REMOVED', '('.ComponentbuilderHelper::safeString($type, 'w').':'.$item->id.')', $item->component), 'warning'); - unset($item->component); - } - } + $item = $this->setNewID($item, 'component', 'joomla_component', $type); break; case 'language_translation': // update the component ID where needed - if (isset($item->components) && ComponentbuilderHelper::checkJson($item->components)) - { - $components = json_decode($item->components, true); - foreach ($components as $nr => $id) - { - if (!is_numeric($id)) - { - continue; - } - // update the components - if (isset($this->newID['joomla_component'][$id])) - { - $components[$nr] = $this->newID['joomla_component'][$id]; - } - else - { - unset($components[$nr]); - } - } - } + $item = $this->setNewID($item, 'component', 'joomla_component', $type); // load the local components if found if (isset($item->localComponents) && ComponentbuilderHelper::checkJson($item->localComponents)) { - if (!isset($components)) + $components = array(); + if (isset($item->components) && ComponentbuilderHelper::checkJson($item->components)) { - $components= array(); + $components = json_decode($item->components, true); } $localComponents = json_decode($item->localComponents, true); foreach ($localComponents as $lid) @@ -1725,18 +1729,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy case 'admin_fields': case 'admin_fields_conditions': // update the admin_view ID where needed - if (isset($item->admin_view) && $item->admin_view > 0) - { - if (isset($this->newID['admin_view'][$item->admin_view])) - { - $item->admin_view = $this->newID['admin_view'][$item->admin_view]; - } - else - { - $this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_BFIELD_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BADMIN_VIEWB_SO_THE_IDS_WAS_REMOVED', '('.ComponentbuilderHelper::safeString($type, 'w').':'.$item->id.')', $item->admin_view), 'warning'); - unset($item->admin_view); - } - } + $item = $this->setNewID($item, 'admin_view', 'admin_view', $type); + // set the updater if ('admin_fields' === $type) { // repeatable fields to update @@ -1770,7 +1764,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } // update the repeatable fields - $this->convertRepeatableFields($item, $updaterR); + $item = $this->convertRepeatableFields($item, $updaterR); // update the subform ids $this->updateSubformsIDs($item, $type, $updaterT); @@ -1791,7 +1785,10 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy break; case 'add': // remove the ID - unset($item->id); + if (isset($item->id)) + { + unset($item->id); + } // set values to follow the adding conventions $item->created_by = $this->user->id; $item->modified_by = $this->user->id; @@ -2101,7 +2098,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // get by admin_view (since there should only be one of each name) $getter = array('admin_view'); $this->specialValue = array(); - $this->specialValue['admin_view'] = $this->newID['admin_view'][$item->admin_view]; + $this->specialValue['admin_view'] = $this->newID['admin_view'][(int) $item->admin_view]; break; case 'fieldtype': // get by name (since there should only be one of each name) @@ -2119,11 +2116,11 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // get by id name.. $getter = array('name','datatype','store','indexes','null_switch'); // lets try to add the fieldtype - if (isset($item->fieldtype) && is_numeric($item->fieldtype) && $item->fieldtype > 0 && isset($this->newID['fieldtype'][$item->fieldtype]) && $this->newID['fieldtype'][$item->fieldtype] > 0) + if (isset($item->fieldtype) && is_numeric($item->fieldtype) && $item->fieldtype > 0 && isset($this->newID['fieldtype'][(int) $item->fieldtype]) && $this->newID['fieldtype'][(int) $item->fieldtype] > 0) { $getter[] = 'fieldtype'; $this->specialValue = array(); - $this->specialValue['fieldtype'] = $this->newID['fieldtype'][$item->fieldtype]; + $this->specialValue['fieldtype'] = $this->newID['fieldtype'][(int) $item->fieldtype]; $retryAgain = 2; } else @@ -2137,11 +2134,11 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy // get by name, system_name and codename $getter = array('name', 'system_name', 'codename'); // lets try to add the main_get - if (isset($item->main_get) && is_numeric($item->main_get) && $item->main_get > 0 && isset($this->newID['dynamic_get'][$item->main_get]) && $this->newID['dynamic_get'][$item->main_get] > 0) + if (isset($item->main_get) && is_numeric($item->main_get) && $item->main_get > 0 && isset($this->newID['dynamic_get'][(int) $item->main_get]) && $this->newID['dynamic_get'][(int) $item->main_get] > 0) { $getter[] = 'main_get'; $this->specialValue = array(); - $this->specialValue['main_get'] = $this->newID['dynamic_get'][$item->main_get]; + $this->specialValue['main_get'] = $this->newID['dynamic_get'][(int) $item->main_get]; } break; case 'template': diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php index f233a1a7c..e278b814d 100644 --- a/admin/models/joomla_component.php +++ b/admin/models/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php index 7b6e7bac2..35bdc87b1 100644 --- a/admin/models/joomla_components.php +++ b/admin/models/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php @@ -81,16 +81,10 @@ class ComponentbuilderModelJoomla_components extends JModelList protected $tempPath; protected $customPath; protected $smartExport = array(); - protected $templateIds = array(); - protected $dynamicGetIds = array(); - protected $adminViewIds = array(); - protected $fieldTypeIds = array(); - protected $snippetIds = array(); - protected $layoutIds = array(); - protected $customCodeIds = array(); + protected $exportIDs = array(); protected $customCodeM = array(); - protected $fieldTypes = array(); - protected $isMultiple = array(); + protected $fieldTypes = array(); + protected $isMultiple = array(); /** * Method to build the export package @@ -280,43 +274,43 @@ class ComponentbuilderModelJoomla_components extends JModelList $this->smartExport['joomla_component'][$item->id] = $item; } // add fields and conditions - if (ComponentbuilderHelper::checkArray($this->adminViewIds)) + if (isset($this->exportIDs['admin_view']) && ComponentbuilderHelper::checkArray($this->exportIDs['admin_view'])) { - $this->setData('admin_fields', $this->adminViewIds, 'id'); - $this->setData('admin_fields_conditions', $this->adminViewIds, 'id'); + $this->setData('admin_fields', array_values($this->exportIDs['admin_view']), 'admin_view'); + $this->setData('admin_fields_conditions', array_values($this->exportIDs['admin_view']), 'admin_view'); } // add field types - if (ComponentbuilderHelper::checkArray($this->fieldTypeIds)) + if (isset($this->exportIDs['fieldtype']) && ComponentbuilderHelper::checkArray($this->exportIDs['fieldtype'])) { - $this->setData('fieldtype', $this->fieldTypeIds, 'id'); - } - // add dynamic get - if (ComponentbuilderHelper::checkArray($this->dynamicGetIds)) - { - $this->setData('dynamic_get', $this->dynamicGetIds, 'id'); - } - // add snippets - if (ComponentbuilderHelper::checkArray($this->snippetIds)) - { - $this->setData('snippet', $this->snippetIds, 'id'); + $this->setData('fieldtype', array_values($this->exportIDs['fieldtype']), 'id'); } // add templates - if (ComponentbuilderHelper::checkArray($this->templateIds)) + if (isset($this->exportIDs['template']) && ComponentbuilderHelper::checkArray($this->exportIDs['template'])) { - $this->setData('template', $this->templateIds, 'id'); + $this->setData('template', array_values($this->exportIDs['template']), 'id'); } // add layouts - if (ComponentbuilderHelper::checkArray($this->layoutIds)) + if (isset($this->exportIDs['layout']) && ComponentbuilderHelper::checkArray($this->exportIDs['layout'])) { - $this->setData('layout', $this->layoutIds, 'id'); + $this->setData('layout', array_values($this->exportIDs['layout']), 'id'); + } + // add dynamic get + if (isset($this->exportIDs['dynamic_get']) && ComponentbuilderHelper::checkArray($this->exportIDs['dynamic_get'])) + { + $this->setData('dynamic_get', array_values($this->exportIDs['dynamic_get']), 'id'); + } + // add snippets + if (isset($this->exportIDs['snippet']) && ComponentbuilderHelper::checkArray($this->exportIDs['snippet'])) + { + $this->setData('snippet', array_values($this->exportIDs['snippet']), 'id'); } // add custom code - if (ComponentbuilderHelper::checkArray($this->customCodeIds)) + if (isset($this->exportIDs['custom_code']) && ComponentbuilderHelper::checkArray($this->exportIDs['custom_code'])) { - $this->setData('custom_code', $this->customCodeIds, 'id'); + $this->setData('custom_code', array_values($this->exportIDs['custom_code']), 'id'); } // has any data been set - if (ComponentbuilderHelper::checkArray($this->smartExport['joomla_component'])) + if (isset($this->smartExport['joomla_component']) && ComponentbuilderHelper::checkArray($this->smartExport['joomla_component'])) { // set the folder and move the files of each component to the folder return $this->smartExportBuilder(); @@ -327,6 +321,39 @@ class ComponentbuilderModelJoomla_components extends JModelList return false; } + /** + * Set export IDs. + * + * @return void. + */ + protected function setExportIDs($value, $table) + { + // check if table has been set + if (!isset($this->exportIDs[$table])) + { + $this->exportIDs[$table] = array(); + } + // convert if value is in json + if (ComponentbuilderHelper::checkJson($value)) + { + $value = json_decode($value, true); + } + // now update the fields + if (ComponentbuilderHelper::checkArray($value)) + { + foreach ($value as $id) + { + if ((ComponentbuilderHelper::checkString($id) || is_numeric($id)) && 0 !== (int) $id) + { + $this->exportIDs[$table][(int) $id] = (int) $id; + } + } + } + elseif ((ComponentbuilderHelper::checkString($value) || is_numeric($value)) && 0 !== (int) $value) + { + $this->exportIDs[$table][(int) $value] = (int) $value; + } + } /** * Method to get ids. @@ -439,11 +466,11 @@ class ComponentbuilderModelJoomla_components extends JModelList // reset the global array if ('template' === $table) { - $this->templateIds = array(); + $this->exportIDs['template'] = array(); } elseif ('layout' === $table) { - $this->layoutIds = array(); + $this->exportIDs['layout'] = array(); } // start loading the data if (!isset($this->smartExport[$table])) @@ -454,7 +481,7 @@ class ComponentbuilderModelJoomla_components extends JModelList foreach ($items as $nr => &$item) { // set the data per id only once - if (isset($this->smartExport[$table][$item->id])) + if (!isset($item->id) || 0 === (int) $item->id || isset($this->smartExport[$table][$item->id])) { continue; } @@ -466,7 +493,7 @@ class ComponentbuilderModelJoomla_components extends JModelList if ('admin_view' === $table) { // add fields & conditions - $this->adminViewIds[$item->id] = $item->id; + $this->setExportIDs($item->id, 'admin_view'); // admin icon $this->moveIt(array('image' => array($item->icon)), 'image'); // admin icon_add @@ -484,7 +511,7 @@ class ComponentbuilderModelJoomla_components extends JModelList if ('field' === $table) { // add field types - $this->fieldTypeIds[$item->fieldtype] = $item->fieldtype; + $this->setExportIDs($item->fieldtype, 'fieldtype'); // check if this field has multiple fields if ($this->checkMultiFields($item->fieldtype)) { @@ -517,30 +544,27 @@ class ComponentbuilderModelJoomla_components extends JModelList { if (isset($item->{'add_'.$scripter}) && $item->{'add_'.$scripter} == 1) { - $this->getTemplateLayout($item->$scripter); + $this->getTemplateLayout($item->{$scripter}); } } // add dynamic gets - $this->dynamicGetIds[$item->main_get] = $item->main_get; - if (ComponentbuilderHelper::checkArray($item->custom_get)) - { - foreach ($item->custom_get as $custom_get) - { - // add dynamic gets - $this->dynamicGetIds[$custom_get] = $custom_get; - } - } + $this->setExportIDs($item->main_get, 'dynamic_get'); + $this->setExportIDs($item->custom_get, 'dynamic_get'); + $this->setExportIDs($item->dynamic_get, 'dynamic_get'); + // move the icon if ('custom_admin_view' === $table && isset($item->icon)) { // view icon $this->moveIt(array('image' => array($item->icon)), 'image'); } // add snippets - $this->snippetIds[$item->snippet] = $item->snippet; + $this->setExportIDs((int) $item->snippet, 'snippet'); } // actions to take if table is template and layout if ('layout' === $table || 'template' === $table) { + // add snippets + $this->setExportIDs((int) $item->snippet, 'snippet'); // search for templates & layouts $this->getTemplateLayout(base64_decode($item->$table), $this->user); // add search array templates and layouts @@ -549,9 +573,7 @@ class ComponentbuilderModelJoomla_components extends JModelList $this->getTemplateLayout($item->php_view, $this->user); } // add dynamic gets - $this->dynamicGetIds[$item->dynamic_get] = $item->dynamic_get; - // add snippets - $this->snippetIds[$item->snippet] = $item->snippet; + $this->setExportIDs((int) $item->dynamic_get, 'dynamic_get'); } } } @@ -882,9 +904,9 @@ class ComponentbuilderModelJoomla_components extends JModelList $data = $this->getDataWithAlias($template, 'template'); if (ComponentbuilderHelper::checkArray($data)) { - if (!isset($this->templateIds[$data['id']])) + if (!isset($this->exportIDs['template']) || !isset($this->exportIDs['template'][$data['id']])) { - $this->templateIds[$data['id']] = $data['id']; + $this->setExportIDs($data['id'], 'template'); // call self to get child data $again[] = $data['html']; $again[] = $data['php_view']; @@ -917,9 +939,9 @@ class ComponentbuilderModelJoomla_components extends JModelList $data = $this->getDataWithAlias($layout, 'layout'); if (ComponentbuilderHelper::checkArray($data)) { - if (!isset($this->layoutIds[$data['id']])) + if (!isset($this->exportIDs['layout']) && !isset($this->exportIDs['layout'][$data['id']])) { - $this->layoutIds[$data['id']] = $data['id']; + $this->setExportIDs($data['id'], 'layout'); // call self to get child data $again[] = $data['html']; $again[] = $data['php_view']; @@ -938,14 +960,14 @@ class ComponentbuilderModelJoomla_components extends JModelList if ($user) { // add templates - if (ComponentbuilderHelper::checkArray($this->templateIds)) + if (isset($this->exportIDs['template']) && ComponentbuilderHelper::checkArray($this->exportIDs['template'])) { - $this->setData('template', $this->templateIds, 'id'); + $this->setData('template', array_values($this->exportIDs['template']), 'id'); } // add layouts - if (ComponentbuilderHelper::checkArray($this->layoutIds)) + if (isset($this->exportIDs['layout']) && ComponentbuilderHelper::checkArray($this->exportIDs['layout'])) { - $this->setData('layout', $this->layoutIds, 'id'); + $this->setData('layout', array_values($this->exportIDs['layout']), 'id'); } } } @@ -1029,13 +1051,13 @@ class ComponentbuilderModelJoomla_components extends JModelList // if numeric add to ids if (is_numeric($func)) { - $this->customCodeIds[$func] = (int) $func; + $this->setExportIDs($func, 'custom_code'); } elseif (ComponentbuilderHelper::checkString($func)) { if ($funcID = ComponentbuilderHelper::getVar('custom_code', $func, 'function_name', 'id')) { - $this->customCodeIds[$funcID] = (int) $funcID; + $this->setExportIDs($funcID, 'custom_code'); } } } diff --git a/admin/tables/dynamic_get.php b/admin/tables/dynamic_get.php index 6fe77d5fd..569080be3 100644 --- a/admin/tables/dynamic_get.php +++ b/admin/tables/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/tables/joomla_component.php b/admin/tables/joomla_component.php index 1a5df82a1..2e129bbbd 100644 --- a/admin/tables/joomla_component.php +++ b/admin/tables/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index afb5df3e4..d070d81d3 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php index 7a3e5eac9..d4c143a11 100644 --- a/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_issues_the_closed_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php index deeab391e..09fd300f2 100644 --- a/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_issues_the_open_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index 1a7e61c5e..188a3c016 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_main.php diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php index 0f353921a..97984f9c7 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.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_readme_information.php diff --git a/admin/views/componentbuilder/tmpl/default_releases_information.php b/admin/views/componentbuilder/tmpl/default_releases_information.php index cdae5540c..00dcad660 100644 --- a/admin/views/componentbuilder/tmpl/default_releases_information.php +++ b/admin/views/componentbuilder/tmpl/default_releases_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_releases_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 ec851c2f6..09ec04782 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.5.8 - @build 18th October, 2017 + @build 20th October, 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 da8c1f34c..0e3ccfe49 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php diff --git a/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php b/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php index f54c4d1d6..ade771655 100644 --- a/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php +++ b/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_wiki_tutorials.php diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index 63cbe4226..6d3128558 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/dynamic_get/submitbutton.js b/admin/views/dynamic_get/submitbutton.js index 1f5ef61de..4256a50ee 100644 --- a/admin/views/dynamic_get/submitbutton.js +++ b/admin/views/dynamic_get/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/dynamic_get/tmpl/edit.php b/admin/views/dynamic_get/tmpl/edit.php index 0584172a1..11b9abff4 100644 --- a/admin/views/dynamic_get/tmpl/edit.php +++ b/admin/views/dynamic_get/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/dynamic_get/view.html.php b/admin/views/dynamic_get/view.html.php index 35f860f47..98084a69a 100644 --- a/admin/views/dynamic_get/view.html.php +++ b/admin/views/dynamic_get/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/dynamic_gets/tmpl/default.php b/admin/views/dynamic_gets/tmpl/default.php index 60f659741..8a6e00fed 100644 --- a/admin/views/dynamic_gets/tmpl/default.php +++ b/admin/views/dynamic_gets/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/dynamic_gets/tmpl/default_batch_body.php b/admin/views/dynamic_gets/tmpl/default_batch_body.php index 0f29180ff..636c62ce5 100644 --- a/admin/views/dynamic_gets/tmpl/default_batch_body.php +++ b/admin/views/dynamic_gets/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/dynamic_gets/tmpl/default_batch_footer.php b/admin/views/dynamic_gets/tmpl/default_batch_footer.php index 039cf167c..50bcb4568 100644 --- a/admin/views/dynamic_gets/tmpl/default_batch_footer.php +++ b/admin/views/dynamic_gets/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/dynamic_gets/tmpl/default_body.php b/admin/views/dynamic_gets/tmpl/default_body.php index bef9e6c3d..977d59b04 100644 --- a/admin/views/dynamic_gets/tmpl/default_body.php +++ b/admin/views/dynamic_gets/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/dynamic_gets/tmpl/default_foot.php b/admin/views/dynamic_gets/tmpl/default_foot.php index 8b4593900..384434b17 100644 --- a/admin/views/dynamic_gets/tmpl/default_foot.php +++ b/admin/views/dynamic_gets/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/dynamic_gets/tmpl/default_head.php b/admin/views/dynamic_gets/tmpl/default_head.php index d30f1a7c7..c526367de 100644 --- a/admin/views/dynamic_gets/tmpl/default_head.php +++ b/admin/views/dynamic_gets/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/dynamic_gets/tmpl/default_toolbar.php b/admin/views/dynamic_gets/tmpl/default_toolbar.php index 0e30a2b12..85d6e8c09 100644 --- a/admin/views/dynamic_gets/tmpl/default_toolbar.php +++ b/admin/views/dynamic_gets/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st May, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php index 8eaecfdc7..939ed3918 100644 --- a/admin/views/dynamic_gets/view.html.php +++ b/admin/views/dynamic_gets/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 97 of this MVC - @build 12th October, 2017 + @version @update number 98 of this MVC + @build 20th October, 2017 @created 21st 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 bfacaef2d..ddbeb00c6 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 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 585f7e5e3..eb4ef9fc7 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/import_joomla_components/tmpl/default.php b/admin/views/import_joomla_components/tmpl/default.php index 839a1b049..923ea5f7b 100644 --- a/admin/views/import_joomla_components/tmpl/default.php +++ b/admin/views/import_joomla_components/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php index 69be01db1..86bb54a0e 100644 --- a/admin/views/import_joomla_components/view.html.php +++ b/admin/views/import_joomla_components/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/joomla_component/submitbutton.js b/admin/views/joomla_component/submitbutton.js index 34dd5862e..30b1c09f4 100644 --- a/admin/views/joomla_component/submitbutton.js +++ b/admin/views/joomla_component/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/joomla_component/tmpl/edit.php b/admin/views/joomla_component/tmpl/edit.php index 08c810165..70bca640f 100644 --- a/admin/views/joomla_component/tmpl/edit.php +++ b/admin/views/joomla_component/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/joomla_component/view.html.php b/admin/views/joomla_component/view.html.php index 32040e236..23fec6c0e 100644 --- a/admin/views/joomla_component/view.html.php +++ b/admin/views/joomla_component/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/joomla_components/tmpl/default.php b/admin/views/joomla_components/tmpl/default.php index 1a8ca16ed..060cd0bac 100644 --- a/admin/views/joomla_components/tmpl/default.php +++ b/admin/views/joomla_components/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/joomla_components/tmpl/default_batch_body.php b/admin/views/joomla_components/tmpl/default_batch_body.php index b0e06ce45..e216ec82c 100644 --- a/admin/views/joomla_components/tmpl/default_batch_body.php +++ b/admin/views/joomla_components/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/joomla_components/tmpl/default_batch_footer.php b/admin/views/joomla_components/tmpl/default_batch_footer.php index cfc51b604..6c3189335 100644 --- a/admin/views/joomla_components/tmpl/default_batch_footer.php +++ b/admin/views/joomla_components/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/joomla_components/tmpl/default_body.php b/admin/views/joomla_components/tmpl/default_body.php index 27a982194..d7bcd56a0 100644 --- a/admin/views/joomla_components/tmpl/default_body.php +++ b/admin/views/joomla_components/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/joomla_components/tmpl/default_foot.php b/admin/views/joomla_components/tmpl/default_foot.php index c9a950003..42c5cac83 100644 --- a/admin/views/joomla_components/tmpl/default_foot.php +++ b/admin/views/joomla_components/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/joomla_components/tmpl/default_head.php b/admin/views/joomla_components/tmpl/default_head.php index 9313296c1..cdde05eba 100644 --- a/admin/views/joomla_components/tmpl/default_head.php +++ b/admin/views/joomla_components/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/joomla_components/tmpl/default_toolbar.php b/admin/views/joomla_components/tmpl/default_toolbar.php index 5939a38e5..68c44225e 100644 --- a/admin/views/joomla_components/tmpl/default_toolbar.php +++ b/admin/views/joomla_components/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php index 2a3fedddd..a81803343 100644 --- a/admin/views/joomla_components/view.html.php +++ b/admin/views/joomla_components/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 439 of this MVC - @build 18th October, 2017 + @version @update number 473 of this MVC + @build 20th October, 2017 @created 6th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/componentbuilder.xml b/componentbuilder.xml index 7424f69dc..2844fd5a7 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 18th October, 2017 + 20th October, 2017 Llewellyn van der Merwe joomla@vdm.io http://vdm.bz/component-builder diff --git a/script.php b/script.php index adf9ad29c..8bf896ae5 100644 --- a/script.php +++ b/script.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage script.php diff --git a/site/assets/css/site.css b/site/assets/css/site.css index e4660bd83..8bac53ad4 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site.css diff --git a/site/assets/js/site.js b/site/assets/js/site.js index 0b9f8a9c5..265fa5103 100644 --- a/site/assets/js/site.js +++ b/site/assets/js/site.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site.js diff --git a/site/componentbuilder.php b/site/componentbuilder.php index 3938a7874..2db24e62d 100644 --- a/site/componentbuilder.php +++ b/site/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/site/controller.php b/site/controller.php index 7f97061dd..e01169c0e 100644 --- a/site/controller.php +++ b/site/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/site/controllers/api.php b/site/controllers/api.php index 56193db55..79dcfc636 100644 --- a/site/controllers/api.php +++ b/site/controllers/api.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage api.php diff --git a/site/controllers/help.php b/site/controllers/help.php index 7f9ebbc7d..658f89394 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/site/helpers/category.php b/site/helpers/category.php index f108f5b92..9b1366222 100644 --- a/site/helpers/category.php +++ b/site/helpers/category.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage category.php diff --git a/site/helpers/categoryfields.php b/site/helpers/categoryfields.php index 5547a0efd..9f47db8f2 100644 --- a/site/helpers/categoryfields.php +++ b/site/helpers/categoryfields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage categoryfields.php diff --git a/site/helpers/categoryfieldtypes.php b/site/helpers/categoryfieldtypes.php index e10473df5..43d88f2e7 100644 --- a/site/helpers/categoryfieldtypes.php +++ b/site/helpers/categoryfieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage categoryfieldtypes.php diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index 7d48a0a04..7695a6846 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index fda934257..fb57b6bcf 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 79a6e8e37..d8ba7868d 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage route.php diff --git a/site/router.php b/site/router.php index 243c9cdc8..8cfc83224 100644 --- a/site/router.php +++ b/site/router.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage router.php diff --git a/site/views/api/submitbutton.js b/site/views/api/submitbutton.js index 98cc09745..4b42d026f 100644 --- a/site/views/api/submitbutton.js +++ b/site/views/api/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 18th October, 2017 + @build 20th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js