"
COM_COMPONENTBUILDER_DATE="Date"
COM_COMPONENTBUILDER_DEBUG_LINE_NUMBERS="Debug (line numbers)"
+COM_COMPONENTBUILDER_DETAILS="Details"
COM_COMPONENTBUILDER_DOES_THIS_PACKAGE_REQUIRE_A_KEY_TO_INSTALL="Does this package require a key to install"
COM_COMPONENTBUILDER_DOWNLOAD="download"
COM_COMPONENTBUILDER_DYNAMIC_GET="Dynamic Get"
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
index 9da821953..f3c9677cb 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
@@ -1,18 +1,66 @@
COM_COMPONENTBUILDER="Component Builder"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS="Admins Fields Access"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS_DESC="Allows the users in this group to access access admins fields"
COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE="Admins Fields Batch Use"
COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admins fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS="Admins Fields Conditions Access"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS_DESC="Allows the users in this group to access access admins fields conditions"
COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE="Admins Fields Conditions Batch Use"
COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE="Admins Fields Conditions Create"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE_DESC="Allows the users in this group to create create admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE="Admins Fields Conditions Delete"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE_DESC="Allows the users in this group to delete delete admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT="Admins Fields Conditions Edit"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY="Admins Fields Conditions Edit Created By"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE="Admins Fields Conditions Edit Created Date"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_DESC="Allows the users in this group to edit the admin fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN="Admins Fields Conditions Edit Own"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admins fields conditions created by them"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE="Admins Fields Conditions Edit State"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin fields conditions"
COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION="Admins Fields Conditions Edit Version"
COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE="Admins Fields Create"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE_DESC="Allows the users in this group to create create admins fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE="Admins Fields Delete"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE_DESC="Allows the users in this group to delete delete admins fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT="Admins Fields Edit"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY="Admins Fields Edit Created By"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admins fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE="Admins Fields Edit Created Date"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admins fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_DESC="Allows the users in this group to edit the admin fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN="Admins Fields Edit Own"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admins fields created by them"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE="Admins Fields Edit State"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin fields"
COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION="Admins Fields Edit Version"
COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admins fields"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS="Admin Views Access"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS_DESC="Allows the users in this group to access access admin views"
COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE="Admin Views Batch Use"
COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admin views"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE="Admin Views Create"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE_DESC="Allows the users in this group to create create admin views"
COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD="Admin Views Dashboard Add"
COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the admin view"
COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST="Admin Views Dashboard List"
COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the admin view"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE="Admin Views Delete"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE_DESC="Allows the users in this group to delete delete admin views"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT="Admin Views Edit"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY="Admin Views Edit Created By"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admin views"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE="Admin Views Edit Created Date"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admin views"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESC="Allows the users in this group to edit the admin view"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN="Admin Views Edit Own"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admin views created by them"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE="Admin Views Edit State"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin view"
COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION="Admin Views Edit Version"
COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admin views"
COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT="Admin Views Export"
diff --git a/admin/layouts/admin_fields/fields_above.php b/admin/layouts/admin_fields/fields_above.php
index 23ec9f312..0c596d8d3 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 12th October, 2017
+ @build 13th 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 69aeab513..550fba1c1 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 12th October, 2017
+ @build 13th 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 fb681cf40..3d87e360d 100644
--- a/admin/layouts/admin_fields/publishing.php
+++ b/admin/layouts/admin_fields/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 ad942d2f1..727b044ff 100644
--- a/admin/layouts/admin_fields/publlshing.php
+++ b/admin/layouts/admin_fields/publlshing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 0b6ff91d1..7171f3638 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 12th October, 2017
+ @build 13th 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 282485ce4..a6043c13f 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 12th October, 2017
+ @build 13th 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 fb681cf40..3d87e360d 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 12th October, 2017
+ @build 13th 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 ad942d2f1..727b044ff 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 12th October, 2017
+ @build 13th 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 723bff5bc..e0820f63b 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 12th October, 2017
+ @build 13th 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 dcfd33f63..682d05925 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 12th October, 2017
+ @build 13th 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 2725c535c..2fae75522 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 12th October, 2017
+ @build 13th 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 c60c1a6d6..197d3d232 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 12th October, 2017
+ @build 13th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage custom_import_fullwidth.php
@@ -27,30 +27,112 @@
defined('_JEXEC') or die('Restricted access');
-$form = $displayData->getForm();
-
-$fields = $displayData->get('fields') ?: array(
- 'note_beginner_import',
- 'note_advanced_import',
- 'add_custom_import',
- 'php_import_display',
- 'html_import_view',
- 'php_import',
- 'php_import_setdata',
- 'php_import_save',
- 'php_import_ext'
-);
+// set the defaults
+$items = $displayData->vxzcustom_import;
+$user = JFactory::getUser();
+$id = $displayData->item->id;
+$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
?>
- get('core.edit')): ?>
+ get('admin_view.edit')): ?>
escape($item->system_name); ?>
checked_out): ?>
name, $item->checked_out_time, 'admin_views.', $canCheckin); ?>
diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php
index 22a7f2d94..a72ba8cbd 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 12th October, 2017
+ @build 13th 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 f23dac70d..f05c54994 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 12th October, 2017
+ @build 13th 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 cc99d2903..2a8282eea 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 12th October, 2017
+ @build 13th 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 29575f88c..ebd7d7f84 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 12th October, 2017
+ @build 13th 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 21469c10a..1d11bc093 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 12th October, 2017
+ @build 13th 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 59b12684e..f79f0247d 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 12th October, 2017
+ @build 13th 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 c0c76492c..9cf159784 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 12th October, 2017
+ @build 13th 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 fdf3c095a..25db77e86 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 12th October, 2017
+ @build 13th 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 1ce02c258..feacbbe9e 100644
--- a/admin/layouts/joomla_component/metadata.php
+++ b/admin/layouts/joomla_component/metadata.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 33e3b0c57..30ad472d0 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 12th October, 2017
+ @build 13th 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 50884943e..acb709273 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 12th October, 2017
+ @build 13th 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 d5c295540..b48e51357 100644
--- a/admin/layouts/joomla_component/publishing.php
+++ b/admin/layouts/joomla_component/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 a4bed1ca4..5272dfcae 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 12th October, 2017
+ @build 13th 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 7c5b9c3bc..636e40a43 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 12th October, 2017
+ @build 13th 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 0e1305dab..04b6946c0 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 12th October, 2017
+ @build 13th 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 b97449d7c..93a2558e2 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 12th October, 2017
+ @build 13th 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 ae8b3114b..650dca686 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 12th October, 2017
+ @build 13th 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 96a982f3f..fb613ac6d 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 12th October, 2017
+ @build 13th 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 9401a56e4..4c09bab1a 100644
--- a/admin/layouts/language/details_left.php
+++ b/admin/layouts/language/details_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 62441e6d3..ec59fd56f 100644
--- a/admin/layouts/language/details_right.php
+++ b/admin/layouts/language/details_right.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 fb681cf40..3d87e360d 100644
--- a/admin/layouts/language/publishing.php
+++ b/admin/layouts/language/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 ad942d2f1..727b044ff 100644
--- a/admin/layouts/language/publlshing.php
+++ b/admin/layouts/language/publlshing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 b5b4aef34..b25a2cc83 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 12th October, 2017
+ @build 13th 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 eb1d0117a..64acb9121 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 12th October, 2017
+ @build 13th 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 fb681cf40..3d87e360d 100644
--- a/admin/layouts/language_translation/publishing.php
+++ b/admin/layouts/language_translation/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 ad942d2f1..727b044ff 100644
--- a/admin/layouts/language_translation/publlshing.php
+++ b/admin/layouts/language_translation/publlshing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 32ecee070..4fb14add5 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 12th October, 2017
+ @build 13th 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 54b2f1ee2..16a2d5dca 100644
--- a/admin/layouts/layout/details_fullwidth.php
+++ b/admin/layouts/layout/details_fullwidth.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 6df1fb844..d761d08cf 100644
--- a/admin/layouts/layout/details_left.php
+++ b/admin/layouts/layout/details_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 9b2e232c3..f5696cacd 100644
--- a/admin/layouts/layout/details_right.php
+++ b/admin/layouts/layout/details_right.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 d462afb5f..9cfff0555 100644
--- a/admin/layouts/layout/details_rightside.php
+++ b/admin/layouts/layout/details_rightside.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 21469c10a..1d11bc093 100644
--- a/admin/layouts/layout/details_under.php
+++ b/admin/layouts/layout/details_under.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 fb681cf40..3d87e360d 100644
--- a/admin/layouts/layout/publishing.php
+++ b/admin/layouts/layout/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 ad942d2f1..727b044ff 100644
--- a/admin/layouts/layout/publlshing.php
+++ b/admin/layouts/layout/publlshing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 969ef17a5..8fb1b677f 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 12th October, 2017
+ @build 13th 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 04b569c28..5e761dd58 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 12th October, 2017
+ @build 13th 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 208628d3f..60f066d6a 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 12th October, 2017
+ @build 13th 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 f23dac70d..f05c54994 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 12th October, 2017
+ @build 13th 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 cf0e1f4c9..6b7444ac5 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 12th October, 2017
+ @build 13th 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 e97d5302c..3bdbc32ad 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 12th October, 2017
+ @build 13th 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 9b2e232c3..f5696cacd 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 12th October, 2017
+ @build 13th 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 199ef5937..a7487da57 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 12th October, 2017
+ @build 13th 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 21469c10a..1d11bc093 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 12th October, 2017
+ @build 13th 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 055a6e300..e2879e9ad 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 12th October, 2017
+ @build 13th 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 cfb7fcb47..836b25b8b 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 12th October, 2017
+ @build 13th 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 754c7f23e..ab45d3b36 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 12th October, 2017
+ @build 13th 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 fb681cf40..3d87e360d 100644
--- a/admin/layouts/site_view/publishing.php
+++ b/admin/layouts/site_view/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 ad942d2f1..727b044ff 100644
--- a/admin/layouts/site_view/publlshing.php
+++ b/admin/layouts/site_view/publlshing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 35bc05647..0f2766aa2 100644
--- a/admin/layouts/snippet/details_above.php
+++ b/admin/layouts/snippet/details_above.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 f1ba0a275..f37672112 100644
--- a/admin/layouts/snippet/details_left.php
+++ b/admin/layouts/snippet/details_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 72b9af6c0..38f0d35f0 100644
--- a/admin/layouts/snippet/details_right.php
+++ b/admin/layouts/snippet/details_right.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 fb681cf40..3d87e360d 100644
--- a/admin/layouts/snippet/publishing.php
+++ b/admin/layouts/snippet/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 ad942d2f1..727b044ff 100644
--- a/admin/layouts/snippet/publlshing.php
+++ b/admin/layouts/snippet/publlshing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 32ecee070..4fb14add5 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 12th October, 2017
+ @build 13th 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 f874474c4..d0e0f82fc 100644
--- a/admin/layouts/template/details_fullwidth.php
+++ b/admin/layouts/template/details_fullwidth.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 6df1fb844..d761d08cf 100644
--- a/admin/layouts/template/details_left.php
+++ b/admin/layouts/template/details_left.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 9b2e232c3..f5696cacd 100644
--- a/admin/layouts/template/details_right.php
+++ b/admin/layouts/template/details_right.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 d462afb5f..9cfff0555 100644
--- a/admin/layouts/template/details_rightside.php
+++ b/admin/layouts/template/details_rightside.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 21469c10a..1d11bc093 100644
--- a/admin/layouts/template/details_under.php
+++ b/admin/layouts/template/details_under.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 fb681cf40..3d87e360d 100644
--- a/admin/layouts/template/publishing.php
+++ b/admin/layouts/template/publishing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 ad942d2f1..727b044ff 100644
--- a/admin/layouts/template/publlshing.php
+++ b/admin/layouts/template/publlshing.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage publlshing.php
diff --git a/admin/models/admin_fields.php b/admin/models/admin_fields.php
index 2c8aa3729..146b0fc58 100644
--- a/admin/models/admin_fields.php
+++ b/admin/models/admin_fields.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 16 of this MVC
- @build 12th October, 2017
+ @version @update number 21 of this MVC
+ @build 13th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage admin_fields.php
@@ -101,6 +101,26 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
$addfields = new Registry;
$addfields->loadString($item->addfields);
$item->addfields = $addfields->toArray();
+ }
+
+ // check what type of field array we have here (should be subform... but just incase)
+ // This could happen due to huge data sets
+ if (isset($item->addfields) && isset($item->addfields['field']))
+ {
+ $bucket = array();
+ foreach($item->addfields as $option => $values)
+ {
+ foreach($values as $nr => $value)
+ {
+ $bucket['addfields'.$nr][$option] = $value;
+ }
+ }
+ $item->addfields = $bucket;
+ // update the fields in the DB
+ $fieldsUpdate = new stdClass();
+ $fieldsUpdate->id = (int) $item->id;
+ $fieldsUpdate->addfields = json_encode($bucket);
+ $this->_db->updateObject('#__componentbuilder_admin_fields', $fieldsUpdate, 'id');
}
if (!empty($item->id))
@@ -150,8 +170,8 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
// Check for existing item.
// Modify the form based on Edit State access controls.
- if ($id != 0 && (!$user->authorise('core.edit.state', 'com_componentbuilder.admin_fields.' . (int) $id))
- || ($id == 0 && !$user->authorise('core.edit.state', 'com_componentbuilder')))
+ if ($id != 0 && (!$user->authorise('admin_fields.edit.state', 'com_componentbuilder.admin_fields.' . (int) $id))
+ || ($id == 0 && !$user->authorise('admin_fields.edit.state', 'com_componentbuilder')))
{
// Disable fields for display.
$form->setFieldAttribute('ordering', 'disabled', 'true');
@@ -167,7 +187,8 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
$form->setValue('created_by', null, $user->id);
}
// Modify the form based on Edit Creaded By access controls.
- if (!$user->authorise('core.edit.created_by', 'com_componentbuilder'))
+ if ($id != 0 && (!$user->authorise('admin_fields.edit.created_by', 'com_componentbuilder.admin_fields.' . (int) $id))
+ || ($id == 0 && !$user->authorise('admin_fields.edit.created_by', 'com_componentbuilder')))
{
// Disable fields for display.
$form->setFieldAttribute('created_by', 'disabled', 'true');
@@ -177,7 +198,8 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
$form->setFieldAttribute('created_by', 'filter', 'unset');
}
// Modify the form based on Edit Creaded Date access controls.
- if (!$user->authorise('core.edit.created', 'com_componentbuilder'))
+ if ($id != 0 && (!$user->authorise('admin_fields.edit.created', 'com_componentbuilder.admin_fields.' . (int) $id))
+ || ($id == 0 && !$user->authorise('admin_fields.edit.created', 'com_componentbuilder')))
{
// Disable fields for display.
$form->setFieldAttribute('created', 'disabled', 'true');
@@ -231,7 +253,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
$user = JFactory::getUser();
// The record has been set. Check the record permissions.
- return $user->authorise('core.delete', 'com_componentbuilder.admin_fields.' . (int) $record->id);
+ return $user->authorise('admin_fields.delete', 'com_componentbuilder.admin_fields.' . (int) $record->id);
}
return false;
}
@@ -253,14 +275,14 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
if ($recordId)
{
// The record has been set. Check the record permissions.
- $permission = $user->authorise('core.edit.state', 'com_componentbuilder.admin_fields.' . (int) $recordId);
+ $permission = $user->authorise('admin_fields.edit.state', 'com_componentbuilder.admin_fields.' . (int) $recordId);
if (!$permission && !is_null($permission))
{
return false;
}
}
// In the absense of better information, revert to the component permissions.
- return parent::canEditState($record);
+ return $user->authorise('admin_fields.edit.state', 'com_componentbuilder');
}
/**
@@ -275,8 +297,9 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
protected function allowEdit($data = array(), $key = 'id')
{
// Check specific edit permission then general edit permission.
+ $user = JFactory::getUser();
- return JFactory::getUser()->authorise('core.edit', 'com_componentbuilder.admin_fields.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or parent::allowEdit($data, $key);
+ return $user->authorise('admin_fields.edit', 'com_componentbuilder.admin_fields.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('admin_fields.edit', 'com_componentbuilder');
}
/**
@@ -528,7 +551,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
$this->canDo = ComponentbuilderHelper::getActions('admin_fields');
}
- if (!$this->canDo->get('core.create') || !$this->canDo->get('core.batch'))
+ if (!$this->canDo->get('admin_fields.create') && !$this->canDo->get('admin_fields.batch'))
{
return false;
}
@@ -543,7 +566,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
{
$values['published'] = 0;
}
- elseif (isset($values['published']) && !$this->canDo->get('core.edit.state'))
+ elseif (isset($values['published']) && !$this->canDo->get('admin_fields.edit.state'))
{
$values['published'] = 0;
}
@@ -560,7 +583,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
// only allow copy if user may edit this item.
- if (!$this->user->authorise('core.edit', $contexts[$pk]))
+ if (!$this->user->authorise('admin_fields.edit', $contexts[$pk]))
{
@@ -677,14 +700,14 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
$this->canDo = ComponentbuilderHelper::getActions('admin_fields');
}
- if (!$this->canDo->get('core.edit') && !$this->canDo->get('core.batch'))
+ if (!$this->canDo->get('admin_fields.edit') && !$this->canDo->get('admin_fields.batch'))
{
$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
return false;
}
// make sure published only updates if user has the permission.
- if (isset($values['published']) && !$this->canDo->get('core.edit.state'))
+ if (isset($values['published']) && !$this->canDo->get('admin_fields.edit.state'))
{
unset($values['published']);
}
@@ -694,7 +717,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
// Parent exists so we proceed
foreach ($pks as $pk)
{
- if (!$this->user->authorise('core.edit', $contexts[$pk]))
+ if (!$this->user->authorise('admin_fields.edit', $contexts[$pk]))
{
$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php
index 87be74748..05609d174 100644
--- a/admin/models/admin_fields_conditions.php
+++ b/admin/models/admin_fields_conditions.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 7 of this MVC
- @build 12th October, 2017
+ @version @update number 14 of this MVC
+ @build 13th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage admin_fields_conditions.php
@@ -101,6 +101,26 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
$addconditions = new Registry;
$addconditions->loadString($item->addconditions);
$item->addconditions = $addconditions->toArray();
+ }
+
+ // check what type of conditions array we have here (should be subform... but just incase)
+ // This could happen due to huge data sets
+ if (isset($item->addconditions) && isset($item->addconditions['target_field']))
+ {
+ $bucket = array();
+ foreach($item->addconditions as $option => $values)
+ {
+ foreach($values as $nr => $value)
+ {
+ $bucket['addconditions'.$nr][$option] = $value;
+ }
+ }
+ $item->addconditions = $bucket;
+ // update the fields
+ $conditionsUpdate = new stdClass();
+ $conditionsUpdate->id = (int) $item->id;
+ $conditionsUpdate->addconditions = json_encode($bucket);
+ $this->_db->updateObject('#__componentbuilder_admin_fields_conditions', $conditionsUpdate, 'id');
}
if (!empty($item->id))
@@ -150,8 +170,8 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
// Check for existing item.
// Modify the form based on Edit State access controls.
- if ($id != 0 && (!$user->authorise('core.edit.state', 'com_componentbuilder.admin_fields_conditions.' . (int) $id))
- || ($id == 0 && !$user->authorise('core.edit.state', 'com_componentbuilder')))
+ if ($id != 0 && (!$user->authorise('admin_fields_conditions.edit.state', 'com_componentbuilder.admin_fields_conditions.' . (int) $id))
+ || ($id == 0 && !$user->authorise('admin_fields_conditions.edit.state', 'com_componentbuilder')))
{
// Disable fields for display.
$form->setFieldAttribute('ordering', 'disabled', 'true');
@@ -167,7 +187,8 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
$form->setValue('created_by', null, $user->id);
}
// Modify the form based on Edit Creaded By access controls.
- if (!$user->authorise('core.edit.created_by', 'com_componentbuilder'))
+ if ($id != 0 && (!$user->authorise('admin_fields_conditions.edit.created_by', 'com_componentbuilder.admin_fields_conditions.' . (int) $id))
+ || ($id == 0 && !$user->authorise('admin_fields_conditions.edit.created_by', 'com_componentbuilder')))
{
// Disable fields for display.
$form->setFieldAttribute('created_by', 'disabled', 'true');
@@ -177,7 +198,8 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
$form->setFieldAttribute('created_by', 'filter', 'unset');
}
// Modify the form based on Edit Creaded Date access controls.
- if (!$user->authorise('core.edit.created', 'com_componentbuilder'))
+ if ($id != 0 && (!$user->authorise('admin_fields_conditions.edit.created', 'com_componentbuilder.admin_fields_conditions.' . (int) $id))
+ || ($id == 0 && !$user->authorise('admin_fields_conditions.edit.created', 'com_componentbuilder')))
{
// Disable fields for display.
$form->setFieldAttribute('created', 'disabled', 'true');
@@ -231,7 +253,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
$user = JFactory::getUser();
// The record has been set. Check the record permissions.
- return $user->authorise('core.delete', 'com_componentbuilder.admin_fields_conditions.' . (int) $record->id);
+ return $user->authorise('admin_fields_conditions.delete', 'com_componentbuilder.admin_fields_conditions.' . (int) $record->id);
}
return false;
}
@@ -253,14 +275,14 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
if ($recordId)
{
// The record has been set. Check the record permissions.
- $permission = $user->authorise('core.edit.state', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId);
+ $permission = $user->authorise('admin_fields_conditions.edit.state', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId);
if (!$permission && !is_null($permission))
{
return false;
}
}
// In the absense of better information, revert to the component permissions.
- return parent::canEditState($record);
+ return $user->authorise('admin_fields_conditions.edit.state', 'com_componentbuilder');
}
/**
@@ -275,8 +297,9 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
protected function allowEdit($data = array(), $key = 'id')
{
// Check specific edit permission then general edit permission.
+ $user = JFactory::getUser();
- return JFactory::getUser()->authorise('core.edit', 'com_componentbuilder.admin_fields_conditions.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or parent::allowEdit($data, $key);
+ return $user->authorise('admin_fields_conditions.edit', 'com_componentbuilder.admin_fields_conditions.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('admin_fields_conditions.edit', 'com_componentbuilder');
}
/**
@@ -528,7 +551,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
$this->canDo = ComponentbuilderHelper::getActions('admin_fields_conditions');
}
- if (!$this->canDo->get('core.create') || !$this->canDo->get('core.batch'))
+ if (!$this->canDo->get('admin_fields_conditions.create') && !$this->canDo->get('admin_fields_conditions.batch'))
{
return false;
}
@@ -543,7 +566,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
{
$values['published'] = 0;
}
- elseif (isset($values['published']) && !$this->canDo->get('core.edit.state'))
+ elseif (isset($values['published']) && !$this->canDo->get('admin_fields_conditions.edit.state'))
{
$values['published'] = 0;
}
@@ -560,7 +583,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
// only allow copy if user may edit this item.
- if (!$this->user->authorise('core.edit', $contexts[$pk]))
+ if (!$this->user->authorise('admin_fields_conditions.edit', $contexts[$pk]))
{
@@ -677,14 +700,14 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
$this->canDo = ComponentbuilderHelper::getActions('admin_fields_conditions');
}
- if (!$this->canDo->get('core.edit') && !$this->canDo->get('core.batch'))
+ if (!$this->canDo->get('admin_fields_conditions.edit') && !$this->canDo->get('admin_fields_conditions.batch'))
{
$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
return false;
}
// make sure published only updates if user has the permission.
- if (isset($values['published']) && !$this->canDo->get('core.edit.state'))
+ if (isset($values['published']) && !$this->canDo->get('admin_fields_conditions.edit.state'))
{
unset($values['published']);
}
@@ -694,7 +717,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
// Parent exists so we proceed
foreach ($pks as $pk)
{
- if (!$this->user->authorise('core.edit', $contexts[$pk]))
+ if (!$this->user->authorise('admin_fields_conditions.edit', $contexts[$pk]))
{
$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index 3be57afe9..94beb47e6 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 136 of this MVC
- @build 12th October, 2017
+ @version @update number 141 of this MVC
+ @build 13th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage admin_view.php
@@ -148,10 +148,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$item->ajax_input = $ajax_input->toArray();
}
- if (!empty($item->php_after_delete))
+ if (!empty($item->php_getitems))
{
- // base64 Decode php_after_delete.
- $item->php_after_delete = base64_decode($item->php_after_delete);
+ // base64 Decode php_getitems.
+ $item->php_getitems = base64_decode($item->php_getitems);
+ }
+
+ if (!empty($item->php_batchmove))
+ {
+ // base64 Decode php_batchmove.
+ $item->php_batchmove = base64_decode($item->php_batchmove);
}
if (!empty($item->php_save))
@@ -160,6 +166,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$item->php_save = base64_decode($item->php_save);
}
+ if (!empty($item->php_after_delete))
+ {
+ // base64 Decode php_after_delete.
+ $item->php_after_delete = base64_decode($item->php_after_delete);
+ }
+
if (!empty($item->php_getlistquery))
{
// base64 Decode php_getlistquery.
@@ -178,12 +190,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$item->php_after_publish = base64_decode($item->php_after_publish);
}
- if (!empty($item->php_getitems))
- {
- // base64 Decode php_getitems.
- $item->php_getitems = base64_decode($item->php_getitems);
- }
-
if (!empty($item->php_import))
{
// base64 Decode php_import.
@@ -208,12 +214,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$item->php_postsavehook = base64_decode($item->php_postsavehook);
}
- if (!empty($item->php_batchmove))
- {
- // base64 Decode php_batchmove.
- $item->php_batchmove = base64_decode($item->php_batchmove);
- }
-
if (!empty($item->php_batchcopy))
{
// base64 Decode php_batchcopy.
@@ -383,7 +383,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
- public function getVxzlinked_components()
+ public function getVxzcustom_import()
{
// Get the user object.
$user = JFactory::getUser();
@@ -490,8 +490,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
// Check for existing item.
// Modify the form based on Edit State access controls.
- if ($id != 0 && (!$user->authorise('core.edit.state', 'com_componentbuilder.admin_view.' . (int) $id))
- || ($id == 0 && !$user->authorise('core.edit.state', 'com_componentbuilder')))
+ if ($id != 0 && (!$user->authorise('admin_view.edit.state', 'com_componentbuilder.admin_view.' . (int) $id))
+ || ($id == 0 && !$user->authorise('admin_view.edit.state', 'com_componentbuilder')))
{
// Disable fields for display.
$form->setFieldAttribute('ordering', 'disabled', 'true');
@@ -507,7 +507,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$form->setValue('created_by', null, $user->id);
}
// Modify the form based on Edit Creaded By access controls.
- if (!$user->authorise('core.edit.created_by', 'com_componentbuilder'))
+ if ($id != 0 && (!$user->authorise('admin_view.edit.created_by', 'com_componentbuilder.admin_view.' . (int) $id))
+ || ($id == 0 && !$user->authorise('admin_view.edit.created_by', 'com_componentbuilder')))
{
// Disable fields for display.
$form->setFieldAttribute('created_by', 'disabled', 'true');
@@ -517,7 +518,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$form->setFieldAttribute('created_by', 'filter', 'unset');
}
// Modify the form based on Edit Creaded Date access controls.
- if (!$user->authorise('core.edit.created', 'com_componentbuilder'))
+ if ($id != 0 && (!$user->authorise('admin_view.edit.created', 'com_componentbuilder.admin_view.' . (int) $id))
+ || ($id == 0 && !$user->authorise('admin_view.edit.created', 'com_componentbuilder')))
{
// Disable fields for display.
$form->setFieldAttribute('created', 'disabled', 'true');
@@ -571,7 +573,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$user = JFactory::getUser();
// The record has been set. Check the record permissions.
- return $user->authorise('core.delete', 'com_componentbuilder.admin_view.' . (int) $record->id);
+ return $user->authorise('admin_view.delete', 'com_componentbuilder.admin_view.' . (int) $record->id);
}
return false;
}
@@ -593,14 +595,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
if ($recordId)
{
// The record has been set. Check the record permissions.
- $permission = $user->authorise('core.edit.state', 'com_componentbuilder.admin_view.' . (int) $recordId);
+ $permission = $user->authorise('admin_view.edit.state', 'com_componentbuilder.admin_view.' . (int) $recordId);
if (!$permission && !is_null($permission))
{
return false;
}
}
// In the absense of better information, revert to the component permissions.
- return parent::canEditState($record);
+ return $user->authorise('admin_view.edit.state', 'com_componentbuilder');
}
/**
@@ -615,8 +617,9 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
protected function allowEdit($data = array(), $key = 'id')
{
// Check specific edit permission then general edit permission.
+ $user = JFactory::getUser();
- return JFactory::getUser()->authorise('core.edit', 'com_componentbuilder.admin_view.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or parent::allowEdit($data, $key);
+ return $user->authorise('admin_view.edit', 'com_componentbuilder.admin_view.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('admin_view.edit', 'com_componentbuilder');
}
/**
@@ -904,7 +907,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$this->canDo = ComponentbuilderHelper::getActions('admin_view');
}
- if (!$this->canDo->get('core.create') || !$this->canDo->get('core.batch'))
+ if (!$this->canDo->get('admin_view.create') && !$this->canDo->get('admin_view.batch'))
{
return false;
}
@@ -919,7 +922,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
{
$values['published'] = 0;
}
- elseif (isset($values['published']) && !$this->canDo->get('core.edit.state'))
+ elseif (isset($values['published']) && !$this->canDo->get('admin_view.edit.state'))
{
$values['published'] = 0;
}
@@ -936,7 +939,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
// only allow copy if user may edit this item.
- if (!$this->user->authorise('core.edit', $contexts[$pk]))
+ if (!$this->user->authorise('admin_view.edit', $contexts[$pk]))
{
@@ -1051,14 +1054,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$this->canDo = ComponentbuilderHelper::getActions('admin_view');
}
- if (!$this->canDo->get('core.edit') && !$this->canDo->get('core.batch'))
+ if (!$this->canDo->get('admin_view.edit') && !$this->canDo->get('admin_view.batch'))
{
$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
return false;
}
// make sure published only updates if user has the permission.
- if (isset($values['published']) && !$this->canDo->get('core.edit.state'))
+ if (isset($values['published']) && !$this->canDo->get('admin_view.edit.state'))
{
unset($values['published']);
}
@@ -1068,7 +1071,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
// Parent exists so we proceed
foreach ($pks as $pk)
{
- if (!$this->user->authorise('core.edit', $contexts[$pk]))
+ if (!$this->user->authorise('admin_view.edit', $contexts[$pk]))
{
$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
@@ -1241,10 +1244,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$data['ajax_input'] = '';
}
- // Set the php_after_delete string to base64 string.
- if (isset($data['php_after_delete']))
+ // Set the php_getitems string to base64 string.
+ if (isset($data['php_getitems']))
{
- $data['php_after_delete'] = base64_encode($data['php_after_delete']);
+ $data['php_getitems'] = base64_encode($data['php_getitems']);
+ }
+
+ // Set the php_batchmove string to base64 string.
+ if (isset($data['php_batchmove']))
+ {
+ $data['php_batchmove'] = base64_encode($data['php_batchmove']);
}
// Set the php_save string to base64 string.
@@ -1253,6 +1262,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$data['php_save'] = base64_encode($data['php_save']);
}
+ // Set the php_after_delete string to base64 string.
+ if (isset($data['php_after_delete']))
+ {
+ $data['php_after_delete'] = base64_encode($data['php_after_delete']);
+ }
+
// Set the php_getlistquery string to base64 string.
if (isset($data['php_getlistquery']))
{
@@ -1271,12 +1286,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$data['php_after_publish'] = base64_encode($data['php_after_publish']);
}
- // Set the php_getitems string to base64 string.
- if (isset($data['php_getitems']))
- {
- $data['php_getitems'] = base64_encode($data['php_getitems']);
- }
-
// Set the php_import string to base64 string.
if (isset($data['php_import']))
{
@@ -1301,12 +1310,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$data['php_postsavehook'] = base64_encode($data['php_postsavehook']);
}
- // Set the php_batchmove string to base64 string.
- if (isset($data['php_batchmove']))
- {
- $data['php_batchmove'] = base64_encode($data['php_batchmove']);
- }
-
// Set the php_batchcopy string to base64 string.
if (isset($data['php_batchcopy']))
{
diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php
index 7f62d32cd..8ab537601 100644
--- a/admin/models/admin_views.php
+++ b/admin/models/admin_views.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 136 of this MVC
- @build 12th October, 2017
+ @version @update number 141 of this MVC
+ @build 13th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage admin_views.php
@@ -113,7 +113,24 @@ class ComponentbuilderModelAdmin_views extends JModelList
$this->checkInNow();
// load parent items
- $items = parent::getItems();
+ $items = parent::getItems();
+
+ // set values to display correctly.
+ if (ComponentbuilderHelper::checkArray($items))
+ {
+ // get user object.
+ $user = JFactory::getUser();
+ foreach ($items as $nr => &$item)
+ {
+ $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder'));
+ if (!$access)
+ {
+ unset($items[$nr]);
+ continue;
+ }
+
+ }
+ }
// return items
return $items;
@@ -213,20 +230,31 @@ class ComponentbuilderModelAdmin_views extends JModelList
// set values to display correctly.
if (ComponentbuilderHelper::checkArray($items))
{
+ // get user object.
+ $user = JFactory::getUser();
foreach ($items as $nr => &$item)
{
- // decode php_after_delete
- $item->php_after_delete = base64_decode($item->php_after_delete);
+ $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder'));
+ if (!$access)
+ {
+ unset($items[$nr]);
+ continue;
+ }
+
+ // decode php_getitems
+ $item->php_getitems = base64_decode($item->php_getitems);
+ // decode php_batchmove
+ $item->php_batchmove = base64_decode($item->php_batchmove);
// decode php_save
$item->php_save = base64_decode($item->php_save);
+ // decode php_after_delete
+ $item->php_after_delete = base64_decode($item->php_after_delete);
// decode php_getlistquery
$item->php_getlistquery = base64_decode($item->php_getlistquery);
// decode php_allowedit
$item->php_allowedit = base64_decode($item->php_allowedit);
// decode php_after_publish
$item->php_after_publish = base64_decode($item->php_after_publish);
- // decode php_getitems
- $item->php_getitems = base64_decode($item->php_getitems);
// decode php_import
$item->php_import = base64_decode($item->php_import);
// decode php_getitems_after_all
@@ -235,8 +263,6 @@ class ComponentbuilderModelAdmin_views extends JModelList
$item->php_before_save = base64_decode($item->php_before_save);
// decode php_postsavehook
$item->php_postsavehook = base64_decode($item->php_postsavehook);
- // decode php_batchmove
- $item->php_batchmove = base64_decode($item->php_batchmove);
// decode php_batchcopy
$item->php_batchcopy = base64_decode($item->php_batchcopy);
// decode php_before_publish
diff --git a/admin/models/admins_fields.php b/admin/models/admins_fields.php
index b375ff59e..8af1845df 100644
--- a/admin/models/admins_fields.php
+++ b/admin/models/admins_fields.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 16 of this MVC
- @build 12th October, 2017
+ @version @update number 21 of this MVC
+ @build 13th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage admins_fields.php
@@ -99,7 +99,24 @@ class ComponentbuilderModelAdmins_fields extends JModelList
$this->checkInNow();
// load parent items
- $items = parent::getItems();
+ $items = parent::getItems();
+
+ // set values to display correctly.
+ if (ComponentbuilderHelper::checkArray($items))
+ {
+ // get user object.
+ $user = JFactory::getUser();
+ foreach ($items as $nr => &$item)
+ {
+ $access = ($user->authorise('admin_fields.access', 'com_componentbuilder.admin_fields.' . (int) $item->id) && $user->authorise('admin_fields.access', 'com_componentbuilder'));
+ if (!$access)
+ {
+ unset($items[$nr]);
+ continue;
+ }
+
+ }
+ }
// return items
return $items;
diff --git a/admin/models/admins_fields_conditions.php b/admin/models/admins_fields_conditions.php
index 36979f431..4883cf0c8 100644
--- a/admin/models/admins_fields_conditions.php
+++ b/admin/models/admins_fields_conditions.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 7 of this MVC
- @build 12th October, 2017
+ @version @update number 14 of this MVC
+ @build 13th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage admins_fields_conditions.php
@@ -99,7 +99,24 @@ class ComponentbuilderModelAdmins_fields_conditions extends JModelList
$this->checkInNow();
// load parent items
- $items = parent::getItems();
+ $items = parent::getItems();
+
+ // set values to display correctly.
+ if (ComponentbuilderHelper::checkArray($items))
+ {
+ // get user object.
+ $user = JFactory::getUser();
+ foreach ($items as $nr => &$item)
+ {
+ $access = ($user->authorise('admin_fields_conditions.access', 'com_componentbuilder.admin_fields_conditions.' . (int) $item->id) && $user->authorise('admin_fields_conditions.access', 'com_componentbuilder'));
+ if (!$access)
+ {
+ unset($items[$nr]);
+ continue;
+ }
+
+ }
+ }
// return items
return $items;
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index b58ba619f..2c2435f15 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage ajax.php
diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php
index 398a23be7..b540dc7ff 100644
--- a/admin/models/componentbuilder.php
+++ b/admin/models/componentbuilder.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php
@@ -54,6 +54,9 @@ class ComponentbuilderModelComponentbuilder extends JModelList
'joomla_components.submenu' => 'joomla_component.submenu',
'joomla_components.dashboard_list' => 'joomla_component.dashboard_list',
'joomla_component.dashboard_add' => 'joomla_component.dashboard_add',
+ 'admin_view.create' => 'admin_view.create',
+ 'admin_views.access' => 'admin_view.access',
+ 'admin_view.access' => 'admin_view.access',
'admin_views.submenu' => 'admin_view.submenu',
'admin_views.dashboard_list' => 'admin_view.dashboard_list',
'admin_view.dashboard_add' => 'admin_view.dashboard_add',
@@ -124,7 +127,13 @@ class ComponentbuilderModelComponentbuilder extends JModelList
'help_document.access' => 'help_document.access',
'help_documents.submenu' => 'help_document.submenu',
'help_documents.dashboard_list' => 'help_document.dashboard_list',
- 'help_document.dashboard_add' => 'help_document.dashboard_add');
+ 'help_document.dashboard_add' => 'help_document.dashboard_add',
+ 'admin_fields.create' => 'admin_fields.create',
+ 'admins_fields.access' => 'admin_fields.access',
+ 'admin_fields.access' => 'admin_fields.access',
+ 'admin_fields_conditions.create' => 'admin_fields_conditions.create',
+ 'admins_fields_conditions.access' => 'admin_fields_conditions.access',
+ 'admin_fields_conditions.access' => 'admin_fields_conditions.access');
foreach($viewGroups as $group => $views)
{
$i = 0;
diff --git a/admin/models/field.php b/admin/models/field.php
index 3604b418a..bff97fa66 100644
--- a/admin/models/field.php
+++ b/admin/models/field.php
@@ -166,6 +166,23 @@ class ComponentbuilderModelField extends JModelAdmin
{
$items = $db->loadObjectList();
+ // set values to display correctly.
+ if (ComponentbuilderHelper::checkArray($items))
+ {
+ // get user object.
+ $user = JFactory::getUser();
+ foreach ($items as $nr => &$item)
+ {
+ $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder'));
+ if (!$access)
+ {
+ unset($items[$nr]);
+ continue;
+ }
+
+ }
+ }
+
// Filter by addfieldsvvwc in this Repetable Field
if (ComponentbuilderHelper::checkArray($items) && isset($this->addfieldsvvwc))
{
diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php
index 208ef6616..995749d30 100644
--- a/admin/models/fields/adminviewfolderlist.php
+++ b/admin/models/fields/adminviewfolderlist.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 077fcc271..042704d80 100644
--- a/admin/models/fields/adminviews.php
+++ b/admin/models/fields/adminviews.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage adminviews.php
@@ -79,7 +79,7 @@ class JFormFieldAdminviews extends JFormFieldList
}
$user = JFactory::getUser();
// only add if user allowed to create admin_view
- if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+ if ($user->authorise('admin_view.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
{
// build Create button
$buttonNamee = trim($buttonName);
@@ -92,7 +92,7 @@ class JFormFieldAdminviews extends JFormFieldList
';
}
// only add if user allowed to edit admin_view
- if (($buttonName === 'admin_view' || $buttonName === 'admin_views') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+ if (($buttonName === 'admin_view' || $buttonName === 'admin_views') && $user->authorise('admin_view.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
{
// build edit button
$buttonNamee = trim($buttonName);
diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php
index c14e6d885..07238581b 100644
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 ccb86a672..e8a915b16 100644
--- a/admin/models/fields/component.php
+++ b/admin/models/fields/component.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 66bdb14d5..7d6b9a6ae 100644
--- a/admin/models/fields/components.php
+++ b/admin/models/fields/components.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 4b64cd33f..415eebcb4 100644
--- a/admin/models/fields/customadminviews.php
+++ b/admin/models/fields/customadminviews.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 bc69b8833..b007a9ef5 100644
--- a/admin/models/fields/customfilelist.php
+++ b/admin/models/fields/customfilelist.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 666be06d7..51418843b 100644
--- a/admin/models/fields/customfolderlist.php
+++ b/admin/models/fields/customfolderlist.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 09df4d3f5..e1eda63ec 100644
--- a/admin/models/fields/customgets.php
+++ b/admin/models/fields/customgets.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 e60ed4939..a727528f3 100644
--- a/admin/models/fields/dbtables.php
+++ b/admin/models/fields/dbtables.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 28f9e2073..cbb6ee87b 100644
--- a/admin/models/fields/dynamicget.php
+++ b/admin/models/fields/dynamicget.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 5cfac4ced..4cd91a92f 100644
--- a/admin/models/fields/dynamicgets.php
+++ b/admin/models/fields/dynamicgets.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 cbeb0dca4..772ce5fb2 100644
--- a/admin/models/fields/fields.php
+++ b/admin/models/fields/fields.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fields.php
diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php
index 731c207cc..5c6ac133b 100644
--- a/admin/models/fields/fieldsmulti.php
+++ b/admin/models/fields/fieldsmulti.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fieldsmulti.php
diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php
index fba9ce108..a70833672 100644
--- a/admin/models/fields/fieldtypes.php
+++ b/admin/models/fields/fieldtypes.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 3ae998a9f..805bcd530 100644
--- a/admin/models/fields/ftps.php
+++ b/admin/models/fields/ftps.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 877ca35ea..5fea9c660 100644
--- a/admin/models/fields/lang.php
+++ b/admin/models/fields/lang.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 b18f26dbb..8b6718eb8 100644
--- a/admin/models/fields/maingets.php
+++ b/admin/models/fields/maingets.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage maingets.php
diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php
index e1a17660e..b155075ab 100644
--- a/admin/models/fields/siteviewfolderlist.php
+++ b/admin/models/fields/siteviewfolderlist.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 dac3d1c10..b69a51766 100644
--- a/admin/models/fields/siteviews.php
+++ b/admin/models/fields/siteviews.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th 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 7ba01126e..3eb187395 100644
--- a/admin/models/fields/snippets.php
+++ b/admin/models/fields/snippets.php
@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
- @build 12th October, 2017
+ @build 13th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage snippets.php
diff --git a/admin/models/fields/viewtabs.php b/admin/models/fields/viewtabs.php
new file mode 100644
index 000000000..39b441769
--- /dev/null
+++ b/admin/models/fields/viewtabs.php
@@ -0,0 +1,183 @@
+
+ @copyright Copyright (C) 2015. All Rights Reserved
+ @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+
+ Builds Complex Joomla Components
+
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Viewtabs Form Field class for the Componentbuilder component
+ */
+class JFormFieldViewtabs extends JFormFieldList
+{
+ /**
+ * The viewtabs field type.
+ *
+ * @var string
+ */
+ public $type = 'viewtabs';
+ /**
+ * Override to add new button
+ *
+ * @return string The field input markup.
+ *
+ * @since 3.2
+ */
+ protected function getInput()
+ {
+ // see if we should add buttons
+ $setButton = $this->getAttribute('button');
+ // get html
+ $html = parent::getInput();
+ // if true set button
+ if ($setButton === 'true')
+ {
+ $button = array();
+ $script = array();
+ $buttonName = $this->getAttribute('name');
+ // get the input from url
+ $app = JFactory::getApplication();
+ $jinput = $app->input;
+ // get the view name & id
+ $values = $jinput->getArray(array(
+ 'id' => 'int',
+ 'view' => 'word'
+ ));
+ // check if new item
+ $ref = '';
+ $refJ = '';
+ if (!is_null($values['id']) && strlen($values['view']))
+ {
+ // only load referal if not new item.
+ $ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
+ $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
+ }
+ $user = JFactory::getUser();
+ // only add if user allowed to create admin_view
+ if ($user->authorise('admin_view.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+ {
+ // build Create button
+ $buttonNamee = trim($buttonName);
+ $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
+ $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
+ $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
+ $buttonNamee = ucfirst(strtolower($buttonNamee));
+ $button[] = '
+ ';
+ }
+ // only add if user allowed to edit admin_view
+ if (($buttonName === 'admin_view' || $buttonName === 'admin_views') && $user->authorise('admin_view.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+ {
+ // build edit button
+ $buttonNamee = trim($buttonName);
+ $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
+ $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
+ $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
+ $buttonNamee = ucfirst(strtolower($buttonNamee));
+ $button[] = '
+ ';
+ // build script
+ $script[] = "
+ jQuery(document).ready(function() {
+ jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
+ e.preventDefault();
+ var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
+ ".$buttonName."Button(".$buttonName."Value);
+ });
+ var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
+ ".$buttonName."Button(".$buttonName."Value);
+ });
+ function ".$buttonName."Button(value) {
+ if (value > 0) {
+ // hide the create button
+ jQuery('#".$buttonName."Create').hide();
+ // show edit button
+ jQuery('#".$buttonName."Edit').show();
+ var url = 'index.php?option=com_componentbuilder&view=admin_views&task=admin_view.edit&id='+value+'".$refJ."';
+ jQuery('#".$buttonName."Edit').attr('href', url);
+ } else {
+ // show the create button
+ jQuery('#".$buttonName."Create').show();
+ // hide edit button
+ jQuery('#".$buttonName."Edit').hide();
+ }
+ }";
+ }
+ // check if button was created for admin_view field.
+ if (is_array($button) && count($button) > 0)
+ {
+ // Load the needed script.
+ $document = JFactory::getDocument();
+ $document->addScriptDeclaration(implode(' ',$script));
+ // return the button attached to input field.
+ return '
' .$html . implode('',$button).'
';
+ }
+ }
+ return $html;
+ }
+
+ /**
+ * Method to get a list of options for a list input.
+ *
+ * @return array An array of JHtml options.
+ */
+ public function getOptions()
+ {
+ // get the input from url
+ $jinput = JFactory::getApplication()->input;
+ // get the view name & id
+ $fieldsID = $jinput->getInt('id', 0);
+ $db = JFactory::getDBO();
+ $query = $db->getQuery(true);
+ $query->select($db->quoteName(array('a.id','a.addtabs'),array('id','addtabs')));
+ $query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
+ $query->join('LEFT', $db->quoteName('#__componentbuilder_admin_fields', 'b') . ' ON (' . $db->quoteName('a.id') . ' = ' . $db->quoteName('b.admin_view') . ')');
+ $query->where($db->quoteName('a.published') . ' >= 1');
+ $query->where($db->quoteName('b.id') . ' = ' . (int) $fieldsID);
+ $query->order('a.addtabs ASC');
+ $db->setQuery((string)$query);
+ $item = $db->loadObject();
+ $options = array();
+ if (isset($item->addtabs) && strlen($item->addtabs) > 5)
+ {
+ $items = json_decode($item->addtabs, true);
+ $nr = 1;
+ foreach($items as $itemName)
+ {
+ $options[] = JHtml::_('select.option', $nr, $itemName['name']);
+ $nr++;
+ }
+ }
+ else
+ {
+ $options[] = JHtml::_('select.option', 1, JText::_('COM_COMPONENTBUILDER_DETAILS'));
+ }
+ return $options;
+ }
+}
diff --git a/admin/models/forms/admin_fields.js b/admin/models/forms/admin_fields.js
index 9cf522a5d..928ed138a 100644
--- a/admin/models/forms/admin_fields.js
+++ b/admin/models/forms/admin_fields.js
@@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 16 of this MVC
- @build 12th October, 2017
+ @version @update number 21 of this MVC
+ @build 13th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage admin_fields.js
diff --git a/admin/models/forms/admin_fields.xml b/admin/models/forms/admin_fields.xml
index ad594989f..9aa2bbc66 100644
--- a/admin/models/forms/admin_fields.xml
+++ b/admin/models/forms/admin_fields.xml
@@ -112,7 +112,7 @@
name="field"
label="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_LABEL"
description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_DESCRIPTION"
- class="fieldMedium"
+ class="list_class"
multiple="false"
required="false"
button="false"
@@ -200,18 +200,17 @@
description="COM_COMPONENTBUILDER_ADMIN_FIELDS_LINK_DESCRIPTION"
class="inputbox"
/>
-
+
diff --git a/admin/models/forms/admin_fields_conditions.js b/admin/models/forms/admin_fields_conditions.js
index 8622ccdac..3c8108173 100644
--- a/admin/models/forms/admin_fields_conditions.js
+++ b/admin/models/forms/admin_fields_conditions.js
@@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 7 of this MVC
- @build 12th October, 2017
+ @version @update number 14 of this MVC
+ @build 13th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage admin_fields_conditions.js
diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js
index 89b4c3c6c..6ed7119c5 100644
--- a/admin/models/forms/admin_view.js
+++ b/admin/models/forms/admin_view.js
@@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 136 of this MVC
- @build 12th October, 2017
+ @version @update number 141 of this MVC
+ @build 13th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage admin_view.js
@@ -1210,36 +1210,6 @@ function addButtonID(type,where){
})
}
-function getFieldSelectOptions_server(fieldId){
- var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldSelectOptions&format=json";
- if(token.length > 0 && fieldId > 0){
- var request = 'token='+token+'&id='+fieldId;
- }
- return jQuery.ajax({
- type: 'GET',
- url: getUrl,
- dataType: 'jsonp',
- data: request,
- jsonp: 'callback'
- });
-}
-
-function getFieldSelectOptions(fieldKey, table_, nr_){
- // first check if the field is set
- if(jQuery("#jform_addconditions"+table_+"_addconditions"+fieldKey+nr_+"_match_field").length) {
- var fieldId = jQuery("#jform_addconditions"+table_+"_addconditions"+fieldKey+nr_+"_match_field option:selected").val();
- getFieldSelectOptions_server(fieldId).done(function(result) {
- if(result){
- jQuery('textarea#jform_addconditions'+table_+'_addconditions'+fieldKey+nr_+'_match_options').val(result);
- }
- else
- {
- jQuery('textarea#jform_addconditions'+table_+'_addconditions'+fieldKey+nr_+'_match_options').val('');
- }
- });
- }
-}
-
function getTableColumns_server(tableName){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.tableColumns&format=json";
if(token.length > 0 && tableName.length > 0){
diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml
index 1966c1cc8..92b12974c 100644
--- a/admin/models/forms/admin_view.xml
+++ b/admin/models/forms/admin_view.xml
@@ -140,6 +140,69 @@
message="Error! Please add some short description here."
hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT"
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY
-
+
@@ -193,6 +284,19 @@
filter="HTML"
hint="COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_HINT"
/>
+
+
+
+
+
+
COM_COMPONENTBUILDER_ADMIN_VIEW_REMOVE
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
+
@@ -431,17 +476,17 @@
/>
-
+
@@ -523,51 +568,6 @@
/>
-
-
-
-
-
-
-
- loadObjectList();
+ // set values to display correctly.
+ if (ComponentbuilderHelper::checkArray($items))
+ {
+ // get user object.
+ $user = JFactory::getUser();
+ foreach ($items as $nr => &$item)
+ {
+ $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder'));
+ if (!$access)
+ {
+ unset($items[$nr]);
+ continue;
+ }
+
+ }
+ }
+
// Filter by id Repetable Field
$idvvvv = json_decode($this->idvvvv,true);
if (ComponentbuilderHelper::checkArray($items) && isset($idvvvv) && ComponentbuilderHelper::checkArray($idvvvv))
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index 2973d4c02..2a802b4ec 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -233,8 +233,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
KEY `idx_name_single` (`name_single`),
KEY `idx_name_list` (`name_list`),
KEY `idx_type` (`type`),
- KEY `idx_add_fadein` (`add_fadein`),
KEY `idx_source` (`source`),
+ KEY `idx_add_fadein` (`add_fadein`),
KEY `idx_add_css_view` (`add_css_view`),
KEY `idx_add_css_views` (`add_css_views`),
KEY `idx_add_php_getitems` (`add_php_getitems`),
diff --git a/admin/tables/admin_fields.php b/admin/tables/admin_fields.php
index 3844b96b0..be7966ad2 100644
--- a/admin/tables/admin_fields.php
+++ b/admin/tables/admin_fields.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 16 of this MVC
- @build 12th October, 2017
+ @version @update number 21 of this MVC
+ @build 13th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage admin_fields.php
diff --git a/admin/tables/admin_fields_conditions.php b/admin/tables/admin_fields_conditions.php
index 325ed90f1..2e9a91d8e 100644
--- a/admin/tables/admin_fields_conditions.php
+++ b/admin/tables/admin_fields_conditions.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 7 of this MVC
- @build 12th October, 2017
+ @version @update number 14 of this MVC
+ @build 13th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage admin_fields_conditions.php
diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php
index 36b2716ec..11ec3bec8 100644
--- a/admin/tables/admin_view.php
+++ b/admin/tables/admin_view.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 136 of this MVC
- @build 12th October, 2017
+ @version @update number 141 of this MVC
+ @build 13th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage admin_view.php
diff --git a/admin/views/admin_fields/submitbutton.js b/admin/views/admin_fields/submitbutton.js
index 54a0326b1..c21683f90 100644
--- a/admin/views/admin_fields/submitbutton.js
+++ b/admin/views/admin_fields/submitbutton.js
@@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 16 of this MVC
- @build 12th October, 2017
+ @version @update number 21 of this MVC
+ @build 13th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage submitbutton.js
diff --git a/admin/views/admin_fields/tmpl/edit.php b/admin/views/admin_fields/tmpl/edit.php
index bfdc5fa9f..36dccbac8 100644
--- a/admin/views/admin_fields/tmpl/edit.php
+++ b/admin/views/admin_fields/tmpl/edit.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 16 of this MVC
- @build 12th October, 2017
+ @version @update number 21 of this MVC
+ @build 13th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage edit.php
@@ -73,7 +73,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
- canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?>
+ canDo->get('admin_fields.delete') || $this->canDo->get('admin_fields.edit.created_by') || $this->canDo->get('admin_fields.edit.state') || $this->canDo->get('admin_fields.edit.created')) : ?>
diff --git a/admin/views/admin_fields/view.html.php b/admin/views/admin_fields/view.html.php
index 3df6e00d9..97ea09447 100644
--- a/admin/views/admin_fields/view.html.php
+++ b/admin/views/admin_fields/view.html.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 16 of this MVC
- @build 12th October, 2017
+ @version @update number 21 of this MVC
+ @build 13th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage view.html.php
@@ -95,12 +95,12 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy
// Built the actions for new and existing records.
if ($this->refid || $this->ref)
{
- if ($this->canDo->get('core.create') && $isNew)
+ if ($this->canDo->get('admin_fields.create') && $isNew)
{
// We can create the record.
JToolBarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE');
}
- elseif ($this->canDo->get('core.edit'))
+ elseif ($this->canDo->get('admin_fields.edit'))
{
// We can save the record.
JToolBarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE');
@@ -121,7 +121,7 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy
if ($isNew)
{
// For new records, check the create permission.
- if ($this->canDo->get('core.create'))
+ if ($this->canDo->get('admin_fields.create'))
{
JToolBarHelper::apply('admin_fields.apply', 'JTOOLBAR_APPLY');
JToolBarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE');
@@ -131,24 +131,24 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy
}
else
{
- if ($this->canDo->get('core.edit'))
+ if ($this->canDo->get('admin_fields.edit'))
{
// We can save the new record
JToolBarHelper::apply('admin_fields.apply', 'JTOOLBAR_APPLY');
JToolBarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE');
// We can save this record, but check the create permission to see
// if we can return to make a new one.
- if ($this->canDo->get('core.create'))
+ if ($this->canDo->get('admin_fields.create'))
{
JToolBarHelper::custom('admin_fields.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
}
}
$canVersion = ($this->canDo->get('core.version') && $this->canDo->get('admin_fields.version'));
- if ($this->state->params->get('save_history', 1) && $this->canDo->get('core.edit') && $canVersion)
+ if ($this->state->params->get('save_history', 1) && $this->canDo->get('admin_fields.edit') && $canVersion)
{
JToolbarHelper::versions('com_componentbuilder.admin_fields', $this->item->id);
}
- if ($this->canDo->get('core.create'))
+ if ($this->canDo->get('admin_fields.create'))
{
JToolBarHelper::custom('admin_fields.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);
}
diff --git a/admin/views/admin_fields_conditions/submitbutton.js b/admin/views/admin_fields_conditions/submitbutton.js
index 77f5ff29d..ffe514063 100644
--- a/admin/views/admin_fields_conditions/submitbutton.js
+++ b/admin/views/admin_fields_conditions/submitbutton.js
@@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 7 of this MVC
- @build 12th October, 2017
+ @version @update number 14 of this MVC
+ @build 13th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage submitbutton.js
diff --git a/admin/views/admin_fields_conditions/tmpl/edit.php b/admin/views/admin_fields_conditions/tmpl/edit.php
index 9d7cef97c..901a67fbb 100644
--- a/admin/views/admin_fields_conditions/tmpl/edit.php
+++ b/admin/views/admin_fields_conditions/tmpl/edit.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 7 of this MVC
- @build 12th October, 2017
+ @version @update number 14 of this MVC
+ @build 13th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage edit.php
@@ -73,7 +73,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
diff --git a/admin/views/admin_fields_conditions/view.html.php b/admin/views/admin_fields_conditions/view.html.php
index 1b57c25f3..a680033b8 100644
--- a/admin/views/admin_fields_conditions/view.html.php
+++ b/admin/views/admin_fields_conditions/view.html.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 7 of this MVC
- @build 12th October, 2017
+ @version @update number 14 of this MVC
+ @build 13th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage view.html.php
@@ -95,12 +95,12 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy
// Built the actions for new and existing records.
if ($this->refid || $this->ref)
{
- if ($this->canDo->get('core.create') && $isNew)
+ if ($this->canDo->get('admin_fields_conditions.create') && $isNew)
{
// We can create the record.
JToolBarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE');
}
- elseif ($this->canDo->get('core.edit'))
+ elseif ($this->canDo->get('admin_fields_conditions.edit'))
{
// We can save the record.
JToolBarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE');
@@ -121,7 +121,7 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy
if ($isNew)
{
// For new records, check the create permission.
- if ($this->canDo->get('core.create'))
+ if ($this->canDo->get('admin_fields_conditions.create'))
{
JToolBarHelper::apply('admin_fields_conditions.apply', 'JTOOLBAR_APPLY');
JToolBarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE');
@@ -131,24 +131,24 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy
}
else
{
- if ($this->canDo->get('core.edit'))
+ if ($this->canDo->get('admin_fields_conditions.edit'))
{
// We can save the new record
JToolBarHelper::apply('admin_fields_conditions.apply', 'JTOOLBAR_APPLY');
JToolBarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE');
// We can save this record, but check the create permission to see
// if we can return to make a new one.
- if ($this->canDo->get('core.create'))
+ if ($this->canDo->get('admin_fields_conditions.create'))
{
JToolBarHelper::custom('admin_fields_conditions.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
}
}
$canVersion = ($this->canDo->get('core.version') && $this->canDo->get('admin_fields_conditions.version'));
- if ($this->state->params->get('save_history', 1) && $this->canDo->get('core.edit') && $canVersion)
+ if ($this->state->params->get('save_history', 1) && $this->canDo->get('admin_fields_conditions.edit') && $canVersion)
{
JToolbarHelper::versions('com_componentbuilder.admin_fields_conditions', $this->item->id);
}
- if ($this->canDo->get('core.create'))
+ if ($this->canDo->get('admin_fields_conditions.create'))
{
JToolBarHelper::custom('admin_fields_conditions.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);
}
diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js
index cae0aeee3..a574d91eb 100644
--- a/admin/views/admin_view/submitbutton.js
+++ b/admin/views/admin_view/submitbutton.js
@@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 136 of this MVC
- @build 12th October, 2017
+ @version @update number 141 of this MVC
+ @build 13th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage submitbutton.js
diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php
index 6c6ee899b..142428597 100644
--- a/admin/views/admin_view/tmpl/edit.php
+++ b/admin/views/admin_view/tmpl/edit.php
@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
- @version @update number 136 of this MVC
- @build 12th October, 2017
+ @version @update number 141 of this MVC
+ @build 13th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage edit.php
@@ -58,18 +58,28 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');