From e715fa1614b925fae734a04f671fadd5fd06d915 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Mon, 12 Mar 2018 00:36:14 +0200 Subject: [PATCH] Made some changes to insure JCB is stable in PHP7, removed the related translations string from joomla_component view to speed up page load. --- README.md | 4 +- admin/README.txt | 4 +- admin/access.xml | 2 +- admin/compiler/joomla_3/Helper.php | 67 +- admin/compiler/joomla_3/Helper_site.php | 71 +- admin/helpers/compiler/c_Fields.php | 18 +- admin/helpers/componentbuilder.php | 67 +- .../en-GB/en-GB.com_componentbuilder.ini | 5 +- admin/layouts/fieldtype/fields_fullwidth.php | 2 +- .../translation_fullwidth.php | 108 --- .../server/linked_components_fullwidth.php | 2 +- admin/layouts/template/details_right.php | 4 +- admin/models/admin_view.php | 90 +- admin/models/admin_views.php | 12 +- admin/models/custom_admin_view.php | 78 +- admin/models/custom_admin_views.php | 8 +- admin/models/dynamic_get.php | 42 +- admin/models/fields.php | 2 +- admin/models/fieldtype.php | 58 +- admin/models/fieldtypes.php | 18 +- admin/models/forms/admin_fields.xml | 14 +- .../models/forms/admin_fields_conditions.xml | 16 +- admin/models/forms/admin_view.js | 332 +++---- admin/models/forms/admin_view.xml | 416 ++++----- admin/models/forms/component_admin_views.xml | 14 +- .../forms/component_custom_admin_views.xml | 14 +- admin/models/forms/component_dashboard.xml | 22 +- .../models/forms/component_files_folders.xml | 52 +- admin/models/forms/component_site_views.xml | 14 +- admin/models/forms/custom_admin_view.js | 108 +-- admin/models/forms/custom_admin_view.xml | 312 +++---- admin/models/forms/custom_code.js | 36 +- admin/models/forms/custom_code.xml | 86 +- admin/models/forms/dynamic_get.js | 194 ++-- admin/models/forms/dynamic_get.xml | 544 +++++------ admin/models/forms/field.js | 80 +- admin/models/forms/field.xml | 224 ++--- admin/models/forms/fieldtype.xml | 72 +- admin/models/forms/help_document.js | 60 +- admin/models/forms/help_document.xml | 44 +- admin/models/forms/joomla_component.xml | 854 +++++++++--------- admin/models/forms/language_translation.xml | 18 +- admin/models/forms/layout.js | 10 +- admin/models/forms/layout.xml | 90 +- admin/models/forms/library.js | 20 +- admin/models/forms/library.xml | 160 ++-- .../forms/library_files_folders_urls.xml | 218 ++--- admin/models/forms/server.js | 82 +- admin/models/forms/server.xml | 168 ++-- admin/models/forms/site_view.js | 108 +-- admin/models/forms/site_view.xml | 192 ++-- admin/models/forms/snippet.xml | 98 +- admin/models/forms/template.js | 10 +- admin/models/forms/template.xml | 110 +-- admin/models/joomla_component.php | 450 +++------ admin/models/joomla_components.php | 52 +- admin/models/layout.php | 24 +- admin/models/layouts.php | 4 +- admin/models/library.php | 42 +- admin/models/library_files_folders_urls.php | 68 +- admin/models/server.php | 136 +-- admin/models/servers.php | 50 +- admin/models/site_view.php | 102 +-- admin/models/site_views.php | 12 +- admin/models/template.php | 24 +- admin/models/templates.php | 4 +- admin/sql/install.mysql.utf8.sql | 76 +- admin/views/fieldtype/view.html.php | 2 +- admin/views/fieldtypes/tmpl/default_body.php | 6 +- admin/views/fieldtypes/tmpl/default_head.php | 6 +- admin/views/fieldtypes/view.html.php | 2 +- admin/views/joomla_component/tmpl/edit.php | 12 - admin/views/joomla_component/view.html.php | 17 +- admin/views/server/view.html.php | 2 +- script.php | 88 +- site/helpers/componentbuilder.php | 71 +- 76 files changed, 3297 insertions(+), 3407 deletions(-) delete mode 100644 admin/layouts/joomla_component/translation_fullwidth.php diff --git a/README.md b/README.md index 8aa1d87b5..470aee746 100644 --- a/README.md +++ b/README.md @@ -130,9 +130,9 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.6.18 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **184122** ++ *Line count*: **183732** + *Field count*: **1651** -+ *File count*: **1172** ++ *File count*: **1171** + *Folder count*: **189** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/README.txt b/admin/README.txt index 8aa1d87b5..470aee746 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -130,9 +130,9 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.6.18 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **184122** ++ *Line count*: **183732** + *Field count*: **1651** -+ *File count*: **1172** ++ *File count*: **1171** + *Folder count*: **189** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/access.xml b/admin/access.xml index e81f9fc5a..b9769fd7d 100644 --- a/admin/access.xml +++ b/admin/access.xml @@ -473,9 +473,9 @@ + -
diff --git a/admin/compiler/joomla_3/Helper.php b/admin/compiler/joomla_3/Helper.php index ac0351cad..fae8c8cb8 100644 --- a/admin/compiler/joomla_3/Helper.php +++ b/admin/compiler/joomla_3/Helper.php @@ -42,12 +42,12 @@ abstract class ###Component###Helper $manifestUrl = JPATH_ADMINISTRATOR."/components/com_###component###/###component###.xml"; return simplexml_load_file($manifestUrl); } - + /** * Joomla version object **/ protected static $JVersion; - + /** * set/get Joomla version **/ @@ -503,7 +503,7 @@ abstract class ###Component###Helper } return $model; } - + /** * Add to asset Table */ @@ -565,7 +565,7 @@ abstract class ###Component###Helper } return false; } - + /** * Gets the default asset Rules for a component/view. */ @@ -641,7 +641,14 @@ abstract class ###Component###Helper return $button->input; } - + + /** + * Check if have an json string + * + * @input string The json string to check + * + * @returns bool true on success + **/ public static function checkJson($string) { if (self::checkString($string)) @@ -652,15 +659,29 @@ abstract class ###Component###Helper return false; } + /** + * Check if have an object with a length + * + * @input object The object to check + * + * @returns bool true on success + **/ public static function checkObject($object) { - if (isset($object) && is_object($object) && count($object) > 0) + if (isset($object) && is_object($object)) { - return true; + return count((array)$object) > 0; } return false; } + /** + * Check if have an array with a length + * + * @input array The array to check + * + * @returns bool true on success + **/ public static function checkArray($array, $removeEmptyString = false) { if (isset($array) && is_array($array) && count($array) > 0) @@ -682,6 +703,13 @@ abstract class ###Component###Helper return false; } + /** + * Check if have a string with a length + * + * @input string The string to check + * + * @returns bool true on success + **/ public static function checkString($string) { if (isset($string) && is_string($string) && strlen($string) > 0) @@ -690,7 +718,7 @@ abstract class ###Component###Helper } return false; } - + /** * Check if we are connected * Thanks https://stackoverflow.com/a/4860432/1429677 @@ -716,6 +744,13 @@ abstract class ###Component###Helper return $is_conn; } + /** + * Merge an array of array's + * + * @input array The arrays you would like to merge + * + * @returns array on success + **/ public static function mergeArrays($arrays) { if(self::checkArray($arrays)) @@ -739,6 +774,13 @@ abstract class ###Component###Helper return self::shorten($string, $length, $addTip); } + /** + * Shorten a string + * + * @input string The you would like to shorten + * + * @returns string on success + **/ public static function shorten($string, $length = 40, $addTip = true) { if (self::checkString($string)) @@ -773,6 +815,13 @@ abstract class ###Component###Helper return $string; } + /** + * Making strings safe (various ways) + * + * @input string The you would like to make safe + * + * @returns string on success + **/ public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true) { if ($replaceNumbers === true) @@ -900,7 +949,7 @@ abstract class ###Component###Helper // return the string with no numbers remaining. return $string; } - + /** * Convert an integer into an English word string * Thanks to Tom Nicholson diff --git a/admin/compiler/joomla_3/Helper_site.php b/admin/compiler/joomla_3/Helper_site.php index 0ba4442b0..3dc3ae053 100644 --- a/admin/compiler/joomla_3/Helper_site.php +++ b/admin/compiler/joomla_3/Helper_site.php @@ -65,7 +65,7 @@ abstract class ###Component###Helper } return $value; } - + /** * Load the Component xml manifest. **/ @@ -74,12 +74,12 @@ abstract class ###Component###Helper $manifestUrl = JPATH_ADMINISTRATOR."/components/com_###component###/###component###.xml"; return simplexml_load_file($manifestUrl); } - + /** * Joomla version object **/ protected static $JVersion; - + /** * set/get Joomla version **/ @@ -174,7 +174,7 @@ abstract class ###Component###Helper } return $model; } - + /** * Add to asset Table */ @@ -238,7 +238,7 @@ abstract class ###Component###Helper } return false; } - + /** * Gets the default asset Rules for a component/view. */ @@ -441,7 +441,7 @@ abstract class ###Component###Helper } return $id; } - + /** * Get the actions permissions **/ @@ -633,7 +633,14 @@ abstract class ###Component###Helper } return $result; } - + + /** + * Check if have an json string + * + * @input string The json string to check + * + * @returns bool true on success + **/ public static function checkJson($string) { if (self::checkString($string)) @@ -644,15 +651,29 @@ abstract class ###Component###Helper return false; } + /** + * Check if have an object with a length + * + * @input object The object to check + * + * @returns bool true on success + **/ public static function checkObject($object) { - if (isset($object) && is_object($object) && count($object) > 0) + if (isset($object) && is_object($object)) { - return true; + return count((array)$object) > 0; } return false; } + /** + * Check if have an array with a length + * + * @input array The array to check + * + * @returns bool true on success + **/ public static function checkArray($array, $removeEmptyString = false) { if (isset($array) && is_array($array) && count($array) > 0) @@ -674,6 +695,13 @@ abstract class ###Component###Helper return false; } + /** + * Check if have a string with a length + * + * @input string The string to check + * + * @returns bool true on success + **/ public static function checkString($string) { if (isset($string) && is_string($string) && strlen($string) > 0) @@ -682,7 +710,7 @@ abstract class ###Component###Helper } return false; } - + /** * Check if we are connected * Thanks https://stackoverflow.com/a/4860432/1429677 @@ -708,6 +736,13 @@ abstract class ###Component###Helper return $is_conn; } + /** + * Merge an array of array's + * + * @input array The arrays you would like to merge + * + * @returns array on success + **/ public static function mergeArrays($arrays) { if(self::checkArray($arrays)) @@ -731,6 +766,13 @@ abstract class ###Component###Helper return self::shorten($string, $length, $addTip); } + /** + * Shorten a string + * + * @input string The you would like to shorten + * + * @returns string on success + **/ public static function shorten($string, $length = 40, $addTip = true) { if (self::checkString($string)) @@ -765,6 +807,13 @@ abstract class ###Component###Helper return $string; } + /** + * Making strings safe (various ways) + * + * @input string The you would like to make safe + * + * @returns string on success + **/ public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true) { if ($replaceNumbers === true) @@ -892,7 +941,7 @@ abstract class ###Component###Helper // return the string with no numbers remaining. return $string; } - + /** * Convert an integer into an English word string * Thanks to Tom Nicholson diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php index f7fe1ff82..7a731a8f6 100644 --- a/admin/helpers/compiler/c_Fields.php +++ b/admin/helpers/compiler/c_Fields.php @@ -1246,7 +1246,11 @@ class Fields extends Structure $this->tabCounter[$viewName][(int) $field['tab']] = $tabName; if (isset($this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][(int) $field['order_edit']])) { - $size = count($this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][(int) $field['order_edit']]) + 1; + $size = (int) count((array) $this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']]) + 1; + while(isset($this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][$size])) + { + $size++; + } $this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][$size] = $name; } else @@ -1266,7 +1270,11 @@ class Fields extends Structure { if (isset($this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']])) { - $size = count($this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']]) + 1; + $size = (int) count((array) $this->newPublishingFields[$viewName][(int) $field['alignment']]) + 1; + while(isset($this->newPublishingFields[$viewName][(int) $field['alignment']][$size])) + { + $size++; + } $this->newPublishingFields[$viewName][(int) $field['alignment']][$size] = $name; } else @@ -1280,7 +1288,11 @@ class Fields extends Structure $this->tabCounter[$viewName][1] = 'Details'; if (isset($this->layoutBuilder[$viewName]['Details'][(int) $field['alignment']][(int) $field['order_edit']])) { - $size = count($this->layoutBuilder[$viewName]['Details'][(int) $field['alignment']][(int) $field['order_edit']]) + 1; + $size = (int) count((array) $this->layoutBuilder[$viewName]['Details'][(int) $field['alignment']]) + 1; + while(isset($this->layoutBuilder[$viewName]['Details'][(int) $field['alignment']][$size])) + { + $size++; + } $this->layoutBuilder[$viewName]['Details'][(int) $field['alignment']][$size] = $name; } else diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 519361895..99f458f71 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -2502,12 +2502,12 @@ abstract class ComponentbuilderHelper $manifestUrl = JPATH_ADMINISTRATOR."/components/com_componentbuilder/componentbuilder.xml"; return simplexml_load_file($manifestUrl); } - + /** * Joomla version object **/ protected static $JVersion; - + /** * set/get Joomla version **/ @@ -3391,7 +3391,7 @@ abstract class ComponentbuilderHelper } return $model; } - + /** * Add to asset Table */ @@ -3453,7 +3453,7 @@ abstract class ComponentbuilderHelper } return false; } - + /** * Gets the default asset Rules for a component/view. */ @@ -3529,7 +3529,14 @@ abstract class ComponentbuilderHelper return $button->input; } - + + /** + * Check if have an json string + * + * @input string The json string to check + * + * @returns bool true on success + **/ public static function checkJson($string) { if (self::checkString($string)) @@ -3540,15 +3547,29 @@ abstract class ComponentbuilderHelper return false; } + /** + * Check if have an object with a length + * + * @input object The object to check + * + * @returns bool true on success + **/ public static function checkObject($object) { - if (isset($object) && is_object($object) && count($object) > 0) + if (isset($object) && is_object($object)) { - return true; + return count((array)$object) > 0; } return false; } + /** + * Check if have an array with a length + * + * @input array The array to check + * + * @returns bool true on success + **/ public static function checkArray($array, $removeEmptyString = false) { if (isset($array) && is_array($array) && count($array) > 0) @@ -3570,6 +3591,13 @@ abstract class ComponentbuilderHelper return false; } + /** + * Check if have a string with a length + * + * @input string The string to check + * + * @returns bool true on success + **/ public static function checkString($string) { if (isset($string) && is_string($string) && strlen($string) > 0) @@ -3578,7 +3606,7 @@ abstract class ComponentbuilderHelper } return false; } - + /** * Check if we are connected * Thanks https://stackoverflow.com/a/4860432/1429677 @@ -3604,6 +3632,13 @@ abstract class ComponentbuilderHelper return $is_conn; } + /** + * Merge an array of array's + * + * @input array The arrays you would like to merge + * + * @returns array on success + **/ public static function mergeArrays($arrays) { if(self::checkArray($arrays)) @@ -3627,6 +3662,13 @@ abstract class ComponentbuilderHelper return self::shorten($string, $length, $addTip); } + /** + * Shorten a string + * + * @input string The you would like to shorten + * + * @returns string on success + **/ public static function shorten($string, $length = 40, $addTip = true) { if (self::checkString($string)) @@ -3661,6 +3703,13 @@ abstract class ComponentbuilderHelper return $string; } + /** + * Making strings safe (various ways) + * + * @input string The you would like to make safe + * + * @returns string on success + **/ public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true) { if ($replaceNumbers === true) @@ -3788,7 +3837,7 @@ abstract class ComponentbuilderHelper // return the string with no numbers remaining. return $string; } - + /** * Convert an integer into an English word string * Thanks to Tom Nicholson diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index cfca1b413..6a6303696 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -4319,9 +4319,9 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_HINT="codename" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_LABEL="Name in Code" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_MESSAGE="Error! Please add name in code here." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_DESCRIPTION="Enter Name Here" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_HINT="Name Here" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_HINT="Component Name" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_LABEL="Name" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_MESSAGE="Error! Please add name here." +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_MESSAGE="Error! Please add component name here." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NEW="A New Joomla Component" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO="No" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NONE="None" @@ -4502,7 +4502,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_HINT="Coma separated names of fol COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_LABEL="Repository Folders or Files to Ignore" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_DESCRIPTION="During compilation JCB deletes all files and folders from the repository folder, and then adds the newly created files and folders back into the repository folder. Yet there may be files or folders you may not want deleted, like the .git folder, since JCB does not dynamically create that folder and so it will not be placed back, but simply delete it, unless you add it in this text field below, so that it will be ignored, and therefore not deleted in the first place. You can add multiple folders and files, separated by commas. Like: .git, .hg" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_LABEL="Repository Folders or Files to Ignore" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TRANSLATION="Translation" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATES_NOT_READY="Updates (NOT READY!)" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER="Update Server" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_DESCRIPTION="Select your update server for this component." diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 878d60898..5e135e3d6 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->wadfields; +$items = $displayData->wacfields; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; diff --git a/admin/layouts/joomla_component/translation_fullwidth.php b/admin/layouts/joomla_component/translation_fullwidth.php deleted file mode 100644 index 11a586ad2..000000000 --- a/admin/layouts/joomla_component/translation_fullwidth.php +++ /dev/null @@ -1,108 +0,0 @@ - - @github Joomla Component Builder - @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'); - -// set the defaults -$items = $displayData->vwntranslation; -$user = JFactory::getUser(); -$id = $displayData->item->id; -$edit = "index.php?option=com_componentbuilder&view=language_translations&task=language_translation.edit"; - -?> -
- - - - - - - - - - - $item): ?> - authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; - $userChkOut = JFactory::getUser($item->checked_out); - $canDo = ComponentbuilderHelper::getActions('language_translation',$item,'language_translations'); - ?> - - - published == 1):?> - - published == 0):?> - - published == 2):?> - - published == -2):?> - - - - - - -
- - - - - -
- get('language_translation.edit')): ?> - entranslation; ?> - checked_out): ?> - name, $item->checked_out_time, 'language_translations.', $canCheckin); ?> - - -
entranslation; ?>
- - 		- - - - - - - - - - - - - - - - - id; ?> -
- -
- -
- -
diff --git a/admin/layouts/server/linked_components_fullwidth.php b/admin/layouts/server/linked_components_fullwidth.php index 65ab05ca8..2e873c70e 100644 --- a/admin/layouts/server/linked_components_fullwidth.php +++ b/admin/layouts/server/linked_components_fullwidth.php @@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->wanlinked_components; +$items = $displayData->wamlinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index 63354f956..cdf47a26c 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -31,8 +31,8 @@ $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( 'snippet', - 'note_uikit_snippet', - 'note_snippet_usage' + 'note_snippet_usage', + 'note_uikit_snippet' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 2068277b8..b1a2000a3 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -100,14 +100,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->metadata = $registry->toArray(); } - if (!empty($item->addtables)) - { - // Convert the addtables field to an array. - $addtables = new Registry; - $addtables->loadString($item->addtables); - $item->addtables = $addtables->toArray(); - } - if (!empty($item->addpermissions)) { // Convert the addpermissions field to an array. @@ -132,6 +124,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->addlinked_views = $addlinked_views->toArray(); } + if (!empty($item->addtables)) + { + // Convert the addtables field to an array. + $addtables = new Registry; + $addtables->loadString($item->addtables); + $item->addtables = $addtables->toArray(); + } + if (!empty($item->custom_button)) { // Convert the custom_button field to an array. @@ -148,10 +148,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->ajax_input = $ajax_input->toArray(); } - if (!empty($item->php_import_headers)) + if (!empty($item->php_import_save)) { - // base64 Decode php_import_headers. - $item->php_import_headers = base64_decode($item->php_import_headers); + // base64 Decode php_import_save. + $item->php_import_save = base64_decode($item->php_import_save); } if (!empty($item->html_import_view)) @@ -160,16 +160,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->html_import_view = base64_decode($item->html_import_view); } - if (!empty($item->php_import_save)) + if (!empty($item->php_import_headers)) { - // base64 Decode php_import_save. - $item->php_import_save = base64_decode($item->php_import_save); - } - - if (!empty($item->php_getitem)) - { - // base64 Decode php_getitem. - $item->php_getitem = base64_decode($item->php_getitem); + // base64 Decode php_import_headers. + $item->php_import_headers = base64_decode($item->php_import_headers); } if (!empty($item->css_view)) @@ -352,6 +346,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_import_ext = base64_decode($item->php_import_ext); } + if (!empty($item->php_getitem)) + { + // base64 Decode php_getitem. + $item->php_getitem = base64_decode($item->php_getitem); + } + if (empty($item->id)) { @@ -1184,19 +1184,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['system_name'] = $data['name_single']; } - // Set the addtables items to data. - if (isset($data['addtables']) && is_array($data['addtables'])) - { - $addtables = new JRegistry; - $addtables->loadArray($data['addtables']); - $data['addtables'] = (string) $addtables; - } - elseif (!isset($data['addtables'])) - { - // Set the empty addtables to data - $data['addtables'] = ''; - } - // Set the addpermissions items to data. if (isset($data['addpermissions']) && is_array($data['addpermissions'])) { @@ -1236,6 +1223,19 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['addlinked_views'] = ''; } + // Set the addtables items to data. + if (isset($data['addtables']) && is_array($data['addtables'])) + { + $addtables = new JRegistry; + $addtables->loadArray($data['addtables']); + $data['addtables'] = (string) $addtables; + } + elseif (!isset($data['addtables'])) + { + // Set the empty addtables to data + $data['addtables'] = ''; + } + // Set the custom_button items to data. if (isset($data['custom_button']) && is_array($data['custom_button'])) { @@ -1262,10 +1262,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['ajax_input'] = ''; } - // Set the php_import_headers string to base64 string. - if (isset($data['php_import_headers'])) + // Set the php_import_save string to base64 string. + if (isset($data['php_import_save'])) { - $data['php_import_headers'] = base64_encode($data['php_import_headers']); + $data['php_import_save'] = base64_encode($data['php_import_save']); } // Set the html_import_view string to base64 string. @@ -1274,16 +1274,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['html_import_view'] = base64_encode($data['html_import_view']); } - // Set the php_import_save string to base64 string. - if (isset($data['php_import_save'])) + // Set the php_import_headers string to base64 string. + if (isset($data['php_import_headers'])) { - $data['php_import_save'] = base64_encode($data['php_import_save']); - } - - // Set the php_getitem string to base64 string. - if (isset($data['php_getitem'])) - { - $data['php_getitem'] = base64_encode($data['php_getitem']); + $data['php_import_headers'] = base64_encode($data['php_import_headers']); } // Set the css_view string to base64 string. @@ -1464,6 +1458,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin if (isset($data['php_import_ext'])) { $data['php_import_ext'] = base64_encode($data['php_import_ext']); + } + + // Set the php_getitem string to base64 string. + if (isset($data['php_getitem'])) + { + $data['php_getitem'] = base64_encode($data['php_getitem']); } // Set the Params Items to data diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index ddba14a1f..8d898ca38 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -262,14 +262,12 @@ class ComponentbuilderModelAdmin_views extends JModelList continue; } - // decode php_import_headers - $item->php_import_headers = base64_decode($item->php_import_headers); - // decode html_import_view - $item->html_import_view = base64_decode($item->html_import_view); // decode php_import_save $item->php_import_save = base64_decode($item->php_import_save); - // decode php_getitem - $item->php_getitem = base64_decode($item->php_getitem); + // decode html_import_view + $item->html_import_view = base64_decode($item->html_import_view); + // decode php_import_headers + $item->php_import_headers = base64_decode($item->php_import_headers); // decode css_view $item->css_view = base64_decode($item->css_view); // decode php_getitems @@ -330,6 +328,8 @@ class ComponentbuilderModelAdmin_views extends JModelList $item->php_import_setdata = base64_decode($item->php_import_setdata); // decode php_import_ext $item->php_import_ext = base64_decode($item->php_import_ext); + // decode php_getitem + $item->php_getitem = base64_decode($item->php_getitem); // unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index f955f7eb6..f2ca14854 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -100,14 +100,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $item->metadata = $registry->toArray(); } - if (!empty($item->libraries)) - { - // Convert the libraries field to an array. - $libraries = new Registry; - $libraries->loadString($item->libraries); - $item->libraries = $libraries->toArray(); - } - if (!empty($item->ajax_input)) { // Convert the ajax_input field to an array. @@ -116,6 +108,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $item->ajax_input = $ajax_input->toArray(); } + if (!empty($item->libraries)) + { + // Convert the libraries field to an array. + $libraries = new Registry; + $libraries->loadString($item->libraries); + $item->libraries = $libraries->toArray(); + } + if (!empty($item->custom_get)) { // Convert the custom_get field to an array. @@ -132,12 +132,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $item->custom_button = $custom_button->toArray(); } - if (!empty($item->php_document)) - { - // base64 Decode php_document. - $item->php_document = base64_decode($item->php_document); - } - if (!empty($item->php_jview_display)) { // base64 Decode php_jview_display. @@ -150,10 +144,10 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $item->php_view = base64_decode($item->php_view); } - if (!empty($item->php_jview)) + if (!empty($item->php_document)) { - // base64 Decode php_jview. - $item->php_jview = base64_decode($item->php_jview); + // base64 Decode php_document. + $item->php_document = base64_decode($item->php_document); } if (!empty($item->default)) @@ -162,6 +156,12 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $item->default = base64_decode($item->default); } + if (!empty($item->php_jview)) + { + // base64 Decode php_jview. + $item->php_jview = base64_decode($item->php_jview); + } + if (!empty($item->js_document)) { // base64 Decode js_document. @@ -962,19 +962,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin // always reset the snippets $data['snippet'] = 0; - // Set the libraries items to data. - if (isset($data['libraries']) && is_array($data['libraries'])) - { - $libraries = new JRegistry; - $libraries->loadArray($data['libraries']); - $data['libraries'] = (string) $libraries; - } - elseif (!isset($data['libraries'])) - { - // Set the empty libraries to data - $data['libraries'] = ''; - } - // Set the ajax_input items to data. if (isset($data['ajax_input']) && is_array($data['ajax_input'])) { @@ -988,6 +975,19 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $data['ajax_input'] = ''; } + // Set the libraries items to data. + if (isset($data['libraries']) && is_array($data['libraries'])) + { + $libraries = new JRegistry; + $libraries->loadArray($data['libraries']); + $data['libraries'] = (string) $libraries; + } + elseif (!isset($data['libraries'])) + { + // Set the empty libraries to data + $data['libraries'] = ''; + } + // Set the custom_get items to data. if (isset($data['custom_get']) && is_array($data['custom_get'])) { @@ -1014,12 +1014,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $data['custom_button'] = ''; } - // Set the php_document string to base64 string. - if (isset($data['php_document'])) - { - $data['php_document'] = base64_encode($data['php_document']); - } - // Set the php_jview_display string to base64 string. if (isset($data['php_jview_display'])) { @@ -1032,10 +1026,10 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $data['php_view'] = base64_encode($data['php_view']); } - // Set the php_jview string to base64 string. - if (isset($data['php_jview'])) + // Set the php_document string to base64 string. + if (isset($data['php_document'])) { - $data['php_jview'] = base64_encode($data['php_jview']); + $data['php_document'] = base64_encode($data['php_document']); } // Set the default string to base64 string. @@ -1044,6 +1038,12 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $data['default'] = base64_encode($data['default']); } + // Set the php_jview string to base64 string. + if (isset($data['php_jview'])) + { + $data['php_jview'] = base64_encode($data['php_jview']); + } + // Set the js_document string to base64 string. if (isset($data['js_document'])) { diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php index b4b6f9f8b..d574eda5e 100644 --- a/admin/models/custom_admin_views.php +++ b/admin/models/custom_admin_views.php @@ -266,16 +266,16 @@ class ComponentbuilderModelCustom_admin_views extends JModelList continue; } - // decode php_document - $item->php_document = base64_decode($item->php_document); // decode php_jview_display $item->php_jview_display = base64_decode($item->php_jview_display); // decode php_view $item->php_view = base64_decode($item->php_view); - // decode php_jview - $item->php_jview = base64_decode($item->php_jview); + // decode php_document + $item->php_document = base64_decode($item->php_document); // decode default $item->default = base64_decode($item->default); + // decode php_jview + $item->php_jview = base64_decode($item->php_jview); // decode js_document $item->js_document = base64_decode($item->js_document); // decode javascript_file diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php index 5adcf74ec..49be4200e 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -100,14 +100,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin $item->metadata = $registry->toArray(); } - if (!empty($item->join_db_table)) - { - // Convert the join_db_table field to an array. - $join_db_table = new Registry; - $join_db_table->loadString($item->join_db_table); - $item->join_db_table = $join_db_table->toArray(); - } - if (!empty($item->filter)) { // Convert the filter field to an array. @@ -148,6 +140,14 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin $item->join_view_table = $join_view_table->toArray(); } + if (!empty($item->join_db_table)) + { + // Convert the join_db_table field to an array. + $join_db_table = new Registry; + $join_db_table->loadString($item->join_db_table); + $item->join_db_table = $join_db_table->toArray(); + } + if (!empty($item->php_custom_get)) { // base64 Decode php_custom_get. @@ -966,19 +966,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin $data['metadata'] = (string) $metadata; } - // Set the join_db_table items to data. - if (isset($data['join_db_table']) && is_array($data['join_db_table'])) - { - $join_db_table = new JRegistry; - $join_db_table->loadArray($data['join_db_table']); - $data['join_db_table'] = (string) $join_db_table; - } - elseif (!isset($data['join_db_table'])) - { - // Set the empty join_db_table to data - $data['join_db_table'] = ''; - } - // Set the filter items to data. if (isset($data['filter']) && is_array($data['filter'])) { @@ -1044,6 +1031,19 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin $data['join_view_table'] = ''; } + // Set the join_db_table items to data. + if (isset($data['join_db_table']) && is_array($data['join_db_table'])) + { + $join_db_table = new JRegistry; + $join_db_table->loadArray($data['join_db_table']); + $data['join_db_table'] = (string) $join_db_table; + } + elseif (!isset($data['join_db_table'])) + { + // Set the empty join_db_table to data + $data['join_db_table'] = ''; + } + // Set the php_custom_get string to base64 string. if (isset($data['php_custom_get'])) { diff --git a/admin/models/fields.php b/admin/models/fields.php index 187acf80e..db8925421 100644 --- a/admin/models/fields.php +++ b/admin/models/fields.php @@ -313,7 +313,7 @@ class ComponentbuilderModelFields extends JModelList else { $search = $db->quote('%' . $db->escape($search) . '%'); - $query->where('(a.name LIKE '.$search.' OR a.fieldtype LIKE '.$search.' OR g.name LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.xml LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.store LIKE '.$search.')'); + $query->where('(a.name LIKE '.$search.' OR a.fieldtype LIKE '.$search.' OR g.name LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.xml LIKE '.$search.' OR a.store LIKE '.$search.')'); } } diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index 83d087812..9f07998b3 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -129,7 +129,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin $item->tags->getTagIds($item->id, 'com_componentbuilder.fieldtype'); } } - $this->fieldtypevvvw = $item->id; + $this->fieldtypevvvv = $item->id; return $item; } @@ -139,7 +139,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getWadfields() + public function getWacfields() { // Get the user object. $user = JFactory::getUser(); @@ -159,15 +159,15 @@ class ComponentbuilderModelFieldtype extends JModelAdmin $query->select($db->quoteName('g.name','fieldtype_name')); $query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'g') . ' ON (' . $db->quoteName('a.fieldtype') . ' = ' . $db->quoteName('g.id') . ')'); - // Filter by fieldtypevvvw global. - $fieldtypevvvw = $this->fieldtypevvvw; - if (is_numeric($fieldtypevvvw )) + // Filter by fieldtypevvvv global. + $fieldtypevvvv = $this->fieldtypevvvv; + if (is_numeric($fieldtypevvvv )) { - $query->where('a.fieldtype = ' . (int) $fieldtypevvvw ); + $query->where('a.fieldtype = ' . (int) $fieldtypevvvv ); } - elseif (is_string($fieldtypevvvw)) + elseif (is_string($fieldtypevvvv)) { - $query->where('a.fieldtype = ' . $db->quote($fieldtypevvvw)); + $query->where('a.fieldtype = ' . $db->quote($fieldtypevvvv)); } else { @@ -223,13 +223,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationWadfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationWacfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationWadfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationWacfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationWadfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationWacfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationWadfields($item->store, 'store'); + $item->store = $this->selectionTranslationWacfields($item->store, 'store'); } } @@ -243,7 +243,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationWadfields($value,$name) + public function selectionTranslationWacfields($value,$name) { // Array of datatype language strings if ($name === 'datatype') @@ -404,6 +404,22 @@ class ComponentbuilderModelFieldtype extends JModelAdmin $form->setFieldAttribute('name', 'required', 'false'); } } + // Modify the form based on Edit Properties access controls. + if ($id != 0 && (!$user->authorise('fieldtype.edit.properties', 'com_componentbuilder.fieldtype.' . (int) $id)) + || ($id == 0 && !$user->authorise('fieldtype.edit.properties', 'com_componentbuilder'))) + { + // Disable fields for display. + $form->setFieldAttribute('properties', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('properties', 'readonly', 'true'); + if (!$form->getValue('properties')) + { + // Disable fields while saving. + $form->setFieldAttribute('properties', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('properties', 'required', 'false'); + } + } // Modify the form based on Edit Description access controls. if ($id != 0 && (!$user->authorise('fieldtype.edit.description', 'com_componentbuilder.fieldtype.' . (int) $id)) || ($id == 0 && !$user->authorise('fieldtype.edit.description', 'com_componentbuilder'))) @@ -436,22 +452,6 @@ class ComponentbuilderModelFieldtype extends JModelAdmin $form->setFieldAttribute('short_description', 'required', 'false'); } } - // Modify the form based on Edit Properties access controls. - if ($id != 0 && (!$user->authorise('fieldtype.edit.properties', 'com_componentbuilder.fieldtype.' . (int) $id)) - || ($id == 0 && !$user->authorise('fieldtype.edit.properties', 'com_componentbuilder'))) - { - // Disable fields for display. - $form->setFieldAttribute('properties', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('properties', 'readonly', 'true'); - if (!$form->getValue('properties')) - { - // Disable fields while saving. - $form->setFieldAttribute('properties', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('properties', 'required', 'false'); - } - } // Only load these values if no id is found if (0 == $id) { diff --git a/admin/models/fieldtypes.php b/admin/models/fieldtypes.php index bbab3cca7..85147c31f 100644 --- a/admin/models/fieldtypes.php +++ b/admin/models/fieldtypes.php @@ -45,10 +45,10 @@ class ComponentbuilderModelFieldtypes extends JModelList 'a.created_by','created_by', 'a.modified_by','modified_by', 'a.name','name', + 'a.short_description','short_description', 'c.title','category_title', 'c.id', 'category_id', - 'a.catid', 'catid', - 'a.short_description','short_description' + 'a.catid', 'catid' ); } @@ -72,6 +72,9 @@ class ComponentbuilderModelFieldtypes extends JModelList $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name'); $this->setState('filter.name', $name); + $short_description = $this->getUserStateFromRequest($this->context . '.filter.short_description', 'filter_short_description'); + $this->setState('filter.short_description', $short_description); + $category = $app->getUserStateFromRequest($this->context . '.filter.category', 'filter_category'); $this->setState('filter.category', $category); @@ -79,10 +82,7 @@ class ComponentbuilderModelFieldtypes extends JModelList $this->setState('filter.category_id', $categoryId); $catid = $app->getUserStateFromRequest($this->context . '.filter.catid', 'filter_catid'); - $this->setState('filter.catid', $catid); - - $short_description = $this->getUserStateFromRequest($this->context . '.filter.short_description', 'filter_short_description'); - $this->setState('filter.short_description', $short_description); + $this->setState('filter.catid', $catid); $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int'); $this->setState('filter.sorting', $sorting); @@ -197,7 +197,7 @@ class ComponentbuilderModelFieldtypes extends JModelList else { $search = $db->quote('%' . $db->escape($search) . '%'); - $query->where('(a.name LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.description LIKE '.$search.' OR a.short_description LIKE '.$search.')'); + $query->where('(a.name LIKE '.$search.' OR a.description LIKE '.$search.' OR a.short_description LIKE '.$search.' OR a.catid LIKE '.$search.')'); } } @@ -351,10 +351,10 @@ class ComponentbuilderModelFieldtypes extends JModelList $id .= ':' . $this->getState('filter.created_by'); $id .= ':' . $this->getState('filter.modified_by'); $id .= ':' . $this->getState('filter.name'); + $id .= ':' . $this->getState('filter.short_description'); $id .= ':' . $this->getState('filter.category'); $id .= ':' . $this->getState('filter.category_id'); - $id .= ':' . $this->getState('filter.catid'); - $id .= ':' . $this->getState('filter.short_description'); + $id .= ':' . $this->getState('filter.catid'); return parent::getStoreId($id); } diff --git a/admin/models/forms/admin_fields.xml b/admin/models/forms/admin_fields.xml index 1b4cb4744..57fb80c95 100644 --- a/admin/models/forms/admin_fields.xml +++ b/admin/models/forms/admin_fields.xml @@ -89,13 +89,6 @@ required="true" readonly="true" button="false" /> - - + + diff --git a/admin/models/forms/admin_fields_conditions.xml b/admin/models/forms/admin_fields_conditions.xml index 9b12880c8..2ea168e82 100644 --- a/admin/models/forms/admin_fields_conditions.xml +++ b/admin/models/forms/admin_fields_conditions.xml @@ -89,14 +89,6 @@ required="true" readonly="true" button="false" /> - - + + diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index 4991d74e6..851a37ab3 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -23,41 +23,41 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvwzvwo_required = false; -jform_vvvvvxavwp_required = false; -jform_vvvvvxbvwq_required = false; -jform_vvvvvxcvwr_required = false; -jform_vvvvvxdvws_required = false; -jform_vvvvvxevwt_required = false; -jform_vvvvvxfvwu_required = false; -jform_vvvvvxgvwv_required = false; -jform_vvvvvxhvww_required = false; -jform_vvvvvxivwx_required = false; -jform_vvvvvxjvwy_required = false; -jform_vvvvvxkvwz_required = false; -jform_vvvvvxlvxa_required = false; -jform_vvvvvxmvxb_required = false; -jform_vvvvvxnvxc_required = false; -jform_vvvvvxovxd_required = false; -jform_vvvvvxpvxe_required = false; -jform_vvvvvxqvxf_required = false; -jform_vvvvvxrvxg_required = false; -jform_vvvvvxsvxh_required = false; -jform_vvvvvxtvxi_required = false; -jform_vvvvvxuvxj_required = false; -jform_vvvvvxvvxk_required = false; -jform_vvvvvxwvxl_required = false; +jform_vvvvvwzvwn_required = false; +jform_vvvvvxavwo_required = false; +jform_vvvvvxbvwp_required = false; +jform_vvvvvxcvwq_required = false; +jform_vvvvvxdvwr_required = false; +jform_vvvvvxevws_required = false; +jform_vvvvvxfvwt_required = false; +jform_vvvvvxgvwu_required = false; +jform_vvvvvxhvwv_required = false; +jform_vvvvvxivww_required = false; +jform_vvvvvxjvwx_required = false; +jform_vvvvvxkvwy_required = false; +jform_vvvvvxlvwz_required = false; +jform_vvvvvxmvxa_required = false; +jform_vvvvvxnvxb_required = false; +jform_vvvvvxovxc_required = false; +jform_vvvvvxpvxd_required = false; +jform_vvvvvxqvxe_required = false; +jform_vvvvvxrvxf_required = false; +jform_vvvvvxsvxg_required = false; +jform_vvvvvxtvxh_required = false; +jform_vvvvvxuvxi_required = false; +jform_vvvvvxvvxj_required = false; +jform_vvvvvxwvxk_required = false; +jform_vvvvvyavxl_required = false; jform_vvvvvyavxm_required = false; jform_vvvvvyavxn_required = false; jform_vvvvvyavxo_required = false; jform_vvvvvyavxp_required = false; jform_vvvvvyavxq_required = false; jform_vvvvvyavxr_required = false; -jform_vvvvvyavxs_required = false; +jform_vvvvvycvxs_required = false; jform_vvvvvycvxt_required = false; jform_vvvvvycvxu_required = false; jform_vvvvvycvxv_required = false; -jform_vvvvvycvxw_required = false; // Initial Script jQuery(document).ready(function() @@ -156,26 +156,26 @@ function vvvvvwz(add_css_view_vvvvvwz) if (add_css_view_vvvvvwz == 1) { jQuery('#jform_css_view').closest('.control-group').show(); - if (jform_vvvvvwzvwo_required) + if (jform_vvvvvwzvwn_required) { updateFieldRequired('css_view',0); jQuery('#jform_css_view').prop('required','required'); jQuery('#jform_css_view').attr('aria-required',true); jQuery('#jform_css_view').addClass('required'); - jform_vvvvvwzvwo_required = false; + jform_vvvvvwzvwn_required = false; } } else { jQuery('#jform_css_view').closest('.control-group').hide(); - if (!jform_vvvvvwzvwo_required) + if (!jform_vvvvvwzvwn_required) { updateFieldRequired('css_view',1); jQuery('#jform_css_view').removeAttr('required'); jQuery('#jform_css_view').removeAttr('aria-required'); jQuery('#jform_css_view').removeClass('required'); - jform_vvvvvwzvwo_required = true; + jform_vvvvvwzvwn_required = true; } } } @@ -187,26 +187,26 @@ function vvvvvxa(add_css_views_vvvvvxa) if (add_css_views_vvvvvxa == 1) { jQuery('#jform_css_views').closest('.control-group').show(); - if (jform_vvvvvxavwp_required) + if (jform_vvvvvxavwo_required) { updateFieldRequired('css_views',0); jQuery('#jform_css_views').prop('required','required'); jQuery('#jform_css_views').attr('aria-required',true); jQuery('#jform_css_views').addClass('required'); - jform_vvvvvxavwp_required = false; + jform_vvvvvxavwo_required = false; } } else { jQuery('#jform_css_views').closest('.control-group').hide(); - if (!jform_vvvvvxavwp_required) + if (!jform_vvvvvxavwo_required) { updateFieldRequired('css_views',1); jQuery('#jform_css_views').removeAttr('required'); jQuery('#jform_css_views').removeAttr('aria-required'); jQuery('#jform_css_views').removeClass('required'); - jform_vvvvvxavwp_required = true; + jform_vvvvvxavwo_required = true; } } } @@ -218,26 +218,26 @@ function vvvvvxb(add_javascript_view_file_vvvvvxb) if (add_javascript_view_file_vvvvvxb == 1) { jQuery('#jform_javascript_view_file').closest('.control-group').show(); - if (jform_vvvvvxbvwq_required) + if (jform_vvvvvxbvwp_required) { updateFieldRequired('javascript_view_file',0); jQuery('#jform_javascript_view_file').prop('required','required'); jQuery('#jform_javascript_view_file').attr('aria-required',true); jQuery('#jform_javascript_view_file').addClass('required'); - jform_vvvvvxbvwq_required = false; + jform_vvvvvxbvwp_required = false; } } else { jQuery('#jform_javascript_view_file').closest('.control-group').hide(); - if (!jform_vvvvvxbvwq_required) + if (!jform_vvvvvxbvwp_required) { updateFieldRequired('javascript_view_file',1); jQuery('#jform_javascript_view_file').removeAttr('required'); jQuery('#jform_javascript_view_file').removeAttr('aria-required'); jQuery('#jform_javascript_view_file').removeClass('required'); - jform_vvvvvxbvwq_required = true; + jform_vvvvvxbvwp_required = true; } } } @@ -249,26 +249,26 @@ function vvvvvxc(add_javascript_views_file_vvvvvxc) if (add_javascript_views_file_vvvvvxc == 1) { jQuery('#jform_javascript_views_file').closest('.control-group').show(); - if (jform_vvvvvxcvwr_required) + if (jform_vvvvvxcvwq_required) { updateFieldRequired('javascript_views_file',0); jQuery('#jform_javascript_views_file').prop('required','required'); jQuery('#jform_javascript_views_file').attr('aria-required',true); jQuery('#jform_javascript_views_file').addClass('required'); - jform_vvvvvxcvwr_required = false; + jform_vvvvvxcvwq_required = false; } } else { jQuery('#jform_javascript_views_file').closest('.control-group').hide(); - if (!jform_vvvvvxcvwr_required) + if (!jform_vvvvvxcvwq_required) { updateFieldRequired('javascript_views_file',1); jQuery('#jform_javascript_views_file').removeAttr('required'); jQuery('#jform_javascript_views_file').removeAttr('aria-required'); jQuery('#jform_javascript_views_file').removeClass('required'); - jform_vvvvvxcvwr_required = true; + jform_vvvvvxcvwq_required = true; } } } @@ -280,26 +280,26 @@ function vvvvvxd(add_javascript_view_footer_vvvvvxd) if (add_javascript_view_footer_vvvvvxd == 1) { jQuery('#jform_javascript_view_footer').closest('.control-group').show(); - if (jform_vvvvvxdvws_required) + if (jform_vvvvvxdvwr_required) { updateFieldRequired('javascript_view_footer',0); jQuery('#jform_javascript_view_footer').prop('required','required'); jQuery('#jform_javascript_view_footer').attr('aria-required',true); jQuery('#jform_javascript_view_footer').addClass('required'); - jform_vvvvvxdvws_required = false; + jform_vvvvvxdvwr_required = false; } } else { jQuery('#jform_javascript_view_footer').closest('.control-group').hide(); - if (!jform_vvvvvxdvws_required) + if (!jform_vvvvvxdvwr_required) { updateFieldRequired('javascript_view_footer',1); jQuery('#jform_javascript_view_footer').removeAttr('required'); jQuery('#jform_javascript_view_footer').removeAttr('aria-required'); jQuery('#jform_javascript_view_footer').removeClass('required'); - jform_vvvvvxdvws_required = true; + jform_vvvvvxdvwr_required = true; } } } @@ -311,26 +311,26 @@ function vvvvvxe(add_javascript_views_footer_vvvvvxe) if (add_javascript_views_footer_vvvvvxe == 1) { jQuery('#jform_javascript_views_footer').closest('.control-group').show(); - if (jform_vvvvvxevwt_required) + if (jform_vvvvvxevws_required) { updateFieldRequired('javascript_views_footer',0); jQuery('#jform_javascript_views_footer').prop('required','required'); jQuery('#jform_javascript_views_footer').attr('aria-required',true); jQuery('#jform_javascript_views_footer').addClass('required'); - jform_vvvvvxevwt_required = false; + jform_vvvvvxevws_required = false; } } else { jQuery('#jform_javascript_views_footer').closest('.control-group').hide(); - if (!jform_vvvvvxevwt_required) + if (!jform_vvvvvxevws_required) { updateFieldRequired('javascript_views_footer',1); jQuery('#jform_javascript_views_footer').removeAttr('required'); jQuery('#jform_javascript_views_footer').removeAttr('aria-required'); jQuery('#jform_javascript_views_footer').removeClass('required'); - jform_vvvvvxevwt_required = true; + jform_vvvvvxevws_required = true; } } } @@ -343,13 +343,13 @@ function vvvvvxf(add_php_ajax_vvvvvxf) { jQuery('#jform_ajax_input-lbl').closest('.control-group').show(); jQuery('#jform_php_ajaxmethod').closest('.control-group').show(); - if (jform_vvvvvxfvwu_required) + if (jform_vvvvvxfvwt_required) { updateFieldRequired('php_ajaxmethod',0); jQuery('#jform_php_ajaxmethod').prop('required','required'); jQuery('#jform_php_ajaxmethod').attr('aria-required',true); jQuery('#jform_php_ajaxmethod').addClass('required'); - jform_vvvvvxfvwu_required = false; + jform_vvvvvxfvwt_required = false; } } @@ -357,13 +357,13 @@ function vvvvvxf(add_php_ajax_vvvvvxf) { jQuery('#jform_ajax_input-lbl').closest('.control-group').hide(); jQuery('#jform_php_ajaxmethod').closest('.control-group').hide(); - if (!jform_vvvvvxfvwu_required) + if (!jform_vvvvvxfvwt_required) { updateFieldRequired('php_ajaxmethod',1); jQuery('#jform_php_ajaxmethod').removeAttr('required'); jQuery('#jform_php_ajaxmethod').removeAttr('aria-required'); jQuery('#jform_php_ajaxmethod').removeClass('required'); - jform_vvvvvxfvwu_required = true; + jform_vvvvvxfvwt_required = true; } } } @@ -375,26 +375,26 @@ function vvvvvxg(add_php_getitem_vvvvvxg) if (add_php_getitem_vvvvvxg == 1) { jQuery('#jform_php_getitem').closest('.control-group').show(); - if (jform_vvvvvxgvwv_required) + if (jform_vvvvvxgvwu_required) { updateFieldRequired('php_getitem',0); jQuery('#jform_php_getitem').prop('required','required'); jQuery('#jform_php_getitem').attr('aria-required',true); jQuery('#jform_php_getitem').addClass('required'); - jform_vvvvvxgvwv_required = false; + jform_vvvvvxgvwu_required = false; } } else { jQuery('#jform_php_getitem').closest('.control-group').hide(); - if (!jform_vvvvvxgvwv_required) + if (!jform_vvvvvxgvwu_required) { updateFieldRequired('php_getitem',1); jQuery('#jform_php_getitem').removeAttr('required'); jQuery('#jform_php_getitem').removeAttr('aria-required'); jQuery('#jform_php_getitem').removeClass('required'); - jform_vvvvvxgvwv_required = true; + jform_vvvvvxgvwu_required = true; } } } @@ -406,26 +406,26 @@ function vvvvvxh(add_php_getitems_vvvvvxh) if (add_php_getitems_vvvvvxh == 1) { jQuery('#jform_php_getitems').closest('.control-group').show(); - if (jform_vvvvvxhvww_required) + if (jform_vvvvvxhvwv_required) { updateFieldRequired('php_getitems',0); jQuery('#jform_php_getitems').prop('required','required'); jQuery('#jform_php_getitems').attr('aria-required',true); jQuery('#jform_php_getitems').addClass('required'); - jform_vvvvvxhvww_required = false; + jform_vvvvvxhvwv_required = false; } } else { jQuery('#jform_php_getitems').closest('.control-group').hide(); - if (!jform_vvvvvxhvww_required) + if (!jform_vvvvvxhvwv_required) { updateFieldRequired('php_getitems',1); jQuery('#jform_php_getitems').removeAttr('required'); jQuery('#jform_php_getitems').removeAttr('aria-required'); jQuery('#jform_php_getitems').removeClass('required'); - jform_vvvvvxhvww_required = true; + jform_vvvvvxhvwv_required = true; } } } @@ -437,26 +437,26 @@ function vvvvvxi(add_php_getitems_after_all_vvvvvxi) if (add_php_getitems_after_all_vvvvvxi == 1) { jQuery('#jform_php_getitems_after_all').closest('.control-group').show(); - if (jform_vvvvvxivwx_required) + if (jform_vvvvvxivww_required) { updateFieldRequired('php_getitems_after_all',0); jQuery('#jform_php_getitems_after_all').prop('required','required'); jQuery('#jform_php_getitems_after_all').attr('aria-required',true); jQuery('#jform_php_getitems_after_all').addClass('required'); - jform_vvvvvxivwx_required = false; + jform_vvvvvxivww_required = false; } } else { jQuery('#jform_php_getitems_after_all').closest('.control-group').hide(); - if (!jform_vvvvvxivwx_required) + if (!jform_vvvvvxivww_required) { updateFieldRequired('php_getitems_after_all',1); jQuery('#jform_php_getitems_after_all').removeAttr('required'); jQuery('#jform_php_getitems_after_all').removeAttr('aria-required'); jQuery('#jform_php_getitems_after_all').removeClass('required'); - jform_vvvvvxivwx_required = true; + jform_vvvvvxivww_required = true; } } } @@ -468,26 +468,26 @@ function vvvvvxj(add_php_getlistquery_vvvvvxj) if (add_php_getlistquery_vvvvvxj == 1) { jQuery('#jform_php_getlistquery').closest('.control-group').show(); - if (jform_vvvvvxjvwy_required) + if (jform_vvvvvxjvwx_required) { updateFieldRequired('php_getlistquery',0); jQuery('#jform_php_getlistquery').prop('required','required'); jQuery('#jform_php_getlistquery').attr('aria-required',true); jQuery('#jform_php_getlistquery').addClass('required'); - jform_vvvvvxjvwy_required = false; + jform_vvvvvxjvwx_required = false; } } else { jQuery('#jform_php_getlistquery').closest('.control-group').hide(); - if (!jform_vvvvvxjvwy_required) + if (!jform_vvvvvxjvwx_required) { updateFieldRequired('php_getlistquery',1); jQuery('#jform_php_getlistquery').removeAttr('required'); jQuery('#jform_php_getlistquery').removeAttr('aria-required'); jQuery('#jform_php_getlistquery').removeClass('required'); - jform_vvvvvxjvwy_required = true; + jform_vvvvvxjvwx_required = true; } } } @@ -499,26 +499,26 @@ function vvvvvxk(add_php_before_save_vvvvvxk) if (add_php_before_save_vvvvvxk == 1) { jQuery('#jform_php_before_save').closest('.control-group').show(); - if (jform_vvvvvxkvwz_required) + if (jform_vvvvvxkvwy_required) { updateFieldRequired('php_before_save',0); jQuery('#jform_php_before_save').prop('required','required'); jQuery('#jform_php_before_save').attr('aria-required',true); jQuery('#jform_php_before_save').addClass('required'); - jform_vvvvvxkvwz_required = false; + jform_vvvvvxkvwy_required = false; } } else { jQuery('#jform_php_before_save').closest('.control-group').hide(); - if (!jform_vvvvvxkvwz_required) + if (!jform_vvvvvxkvwy_required) { updateFieldRequired('php_before_save',1); jQuery('#jform_php_before_save').removeAttr('required'); jQuery('#jform_php_before_save').removeAttr('aria-required'); jQuery('#jform_php_before_save').removeClass('required'); - jform_vvvvvxkvwz_required = true; + jform_vvvvvxkvwy_required = true; } } } @@ -530,26 +530,26 @@ function vvvvvxl(add_php_save_vvvvvxl) if (add_php_save_vvvvvxl == 1) { jQuery('#jform_php_save').closest('.control-group').show(); - if (jform_vvvvvxlvxa_required) + if (jform_vvvvvxlvwz_required) { updateFieldRequired('php_save',0); jQuery('#jform_php_save').prop('required','required'); jQuery('#jform_php_save').attr('aria-required',true); jQuery('#jform_php_save').addClass('required'); - jform_vvvvvxlvxa_required = false; + jform_vvvvvxlvwz_required = false; } } else { jQuery('#jform_php_save').closest('.control-group').hide(); - if (!jform_vvvvvxlvxa_required) + if (!jform_vvvvvxlvwz_required) { updateFieldRequired('php_save',1); jQuery('#jform_php_save').removeAttr('required'); jQuery('#jform_php_save').removeAttr('aria-required'); jQuery('#jform_php_save').removeClass('required'); - jform_vvvvvxlvxa_required = true; + jform_vvvvvxlvwz_required = true; } } } @@ -561,26 +561,26 @@ function vvvvvxm(add_php_postsavehook_vvvvvxm) if (add_php_postsavehook_vvvvvxm == 1) { jQuery('#jform_php_postsavehook').closest('.control-group').show(); - if (jform_vvvvvxmvxb_required) + if (jform_vvvvvxmvxa_required) { updateFieldRequired('php_postsavehook',0); jQuery('#jform_php_postsavehook').prop('required','required'); jQuery('#jform_php_postsavehook').attr('aria-required',true); jQuery('#jform_php_postsavehook').addClass('required'); - jform_vvvvvxmvxb_required = false; + jform_vvvvvxmvxa_required = false; } } else { jQuery('#jform_php_postsavehook').closest('.control-group').hide(); - if (!jform_vvvvvxmvxb_required) + if (!jform_vvvvvxmvxa_required) { updateFieldRequired('php_postsavehook',1); jQuery('#jform_php_postsavehook').removeAttr('required'); jQuery('#jform_php_postsavehook').removeAttr('aria-required'); jQuery('#jform_php_postsavehook').removeClass('required'); - jform_vvvvvxmvxb_required = true; + jform_vvvvvxmvxa_required = true; } } } @@ -592,26 +592,26 @@ function vvvvvxn(add_php_allowedit_vvvvvxn) if (add_php_allowedit_vvvvvxn == 1) { jQuery('#jform_php_allowedit').closest('.control-group').show(); - if (jform_vvvvvxnvxc_required) + if (jform_vvvvvxnvxb_required) { updateFieldRequired('php_allowedit',0); jQuery('#jform_php_allowedit').prop('required','required'); jQuery('#jform_php_allowedit').attr('aria-required',true); jQuery('#jform_php_allowedit').addClass('required'); - jform_vvvvvxnvxc_required = false; + jform_vvvvvxnvxb_required = false; } } else { jQuery('#jform_php_allowedit').closest('.control-group').hide(); - if (!jform_vvvvvxnvxc_required) + if (!jform_vvvvvxnvxb_required) { updateFieldRequired('php_allowedit',1); jQuery('#jform_php_allowedit').removeAttr('required'); jQuery('#jform_php_allowedit').removeAttr('aria-required'); jQuery('#jform_php_allowedit').removeClass('required'); - jform_vvvvvxnvxc_required = true; + jform_vvvvvxnvxb_required = true; } } } @@ -623,26 +623,26 @@ function vvvvvxo(add_php_batchcopy_vvvvvxo) if (add_php_batchcopy_vvvvvxo == 1) { jQuery('#jform_php_batchcopy').closest('.control-group').show(); - if (jform_vvvvvxovxd_required) + if (jform_vvvvvxovxc_required) { updateFieldRequired('php_batchcopy',0); jQuery('#jform_php_batchcopy').prop('required','required'); jQuery('#jform_php_batchcopy').attr('aria-required',true); jQuery('#jform_php_batchcopy').addClass('required'); - jform_vvvvvxovxd_required = false; + jform_vvvvvxovxc_required = false; } } else { jQuery('#jform_php_batchcopy').closest('.control-group').hide(); - if (!jform_vvvvvxovxd_required) + if (!jform_vvvvvxovxc_required) { updateFieldRequired('php_batchcopy',1); jQuery('#jform_php_batchcopy').removeAttr('required'); jQuery('#jform_php_batchcopy').removeAttr('aria-required'); jQuery('#jform_php_batchcopy').removeClass('required'); - jform_vvvvvxovxd_required = true; + jform_vvvvvxovxc_required = true; } } } @@ -654,26 +654,26 @@ function vvvvvxp(add_php_batchmove_vvvvvxp) if (add_php_batchmove_vvvvvxp == 1) { jQuery('#jform_php_batchmove').closest('.control-group').show(); - if (jform_vvvvvxpvxe_required) + if (jform_vvvvvxpvxd_required) { updateFieldRequired('php_batchmove',0); jQuery('#jform_php_batchmove').prop('required','required'); jQuery('#jform_php_batchmove').attr('aria-required',true); jQuery('#jform_php_batchmove').addClass('required'); - jform_vvvvvxpvxe_required = false; + jform_vvvvvxpvxd_required = false; } } else { jQuery('#jform_php_batchmove').closest('.control-group').hide(); - if (!jform_vvvvvxpvxe_required) + if (!jform_vvvvvxpvxd_required) { updateFieldRequired('php_batchmove',1); jQuery('#jform_php_batchmove').removeAttr('required'); jQuery('#jform_php_batchmove').removeAttr('aria-required'); jQuery('#jform_php_batchmove').removeClass('required'); - jform_vvvvvxpvxe_required = true; + jform_vvvvvxpvxd_required = true; } } } @@ -685,26 +685,26 @@ function vvvvvxq(add_php_before_publish_vvvvvxq) if (add_php_before_publish_vvvvvxq == 1) { jQuery('#jform_php_before_publish').closest('.control-group').show(); - if (jform_vvvvvxqvxf_required) + if (jform_vvvvvxqvxe_required) { updateFieldRequired('php_before_publish',0); jQuery('#jform_php_before_publish').prop('required','required'); jQuery('#jform_php_before_publish').attr('aria-required',true); jQuery('#jform_php_before_publish').addClass('required'); - jform_vvvvvxqvxf_required = false; + jform_vvvvvxqvxe_required = false; } } else { jQuery('#jform_php_before_publish').closest('.control-group').hide(); - if (!jform_vvvvvxqvxf_required) + if (!jform_vvvvvxqvxe_required) { updateFieldRequired('php_before_publish',1); jQuery('#jform_php_before_publish').removeAttr('required'); jQuery('#jform_php_before_publish').removeAttr('aria-required'); jQuery('#jform_php_before_publish').removeClass('required'); - jform_vvvvvxqvxf_required = true; + jform_vvvvvxqvxe_required = true; } } } @@ -716,26 +716,26 @@ function vvvvvxr(add_php_after_publish_vvvvvxr) if (add_php_after_publish_vvvvvxr == 1) { jQuery('#jform_php_after_publish').closest('.control-group').show(); - if (jform_vvvvvxrvxg_required) + if (jform_vvvvvxrvxf_required) { updateFieldRequired('php_after_publish',0); jQuery('#jform_php_after_publish').prop('required','required'); jQuery('#jform_php_after_publish').attr('aria-required',true); jQuery('#jform_php_after_publish').addClass('required'); - jform_vvvvvxrvxg_required = false; + jform_vvvvvxrvxf_required = false; } } else { jQuery('#jform_php_after_publish').closest('.control-group').hide(); - if (!jform_vvvvvxrvxg_required) + if (!jform_vvvvvxrvxf_required) { updateFieldRequired('php_after_publish',1); jQuery('#jform_php_after_publish').removeAttr('required'); jQuery('#jform_php_after_publish').removeAttr('aria-required'); jQuery('#jform_php_after_publish').removeClass('required'); - jform_vvvvvxrvxg_required = true; + jform_vvvvvxrvxf_required = true; } } } @@ -747,26 +747,26 @@ function vvvvvxs(add_php_before_delete_vvvvvxs) if (add_php_before_delete_vvvvvxs == 1) { jQuery('#jform_php_before_delete').closest('.control-group').show(); - if (jform_vvvvvxsvxh_required) + if (jform_vvvvvxsvxg_required) { updateFieldRequired('php_before_delete',0); jQuery('#jform_php_before_delete').prop('required','required'); jQuery('#jform_php_before_delete').attr('aria-required',true); jQuery('#jform_php_before_delete').addClass('required'); - jform_vvvvvxsvxh_required = false; + jform_vvvvvxsvxg_required = false; } } else { jQuery('#jform_php_before_delete').closest('.control-group').hide(); - if (!jform_vvvvvxsvxh_required) + if (!jform_vvvvvxsvxg_required) { updateFieldRequired('php_before_delete',1); jQuery('#jform_php_before_delete').removeAttr('required'); jQuery('#jform_php_before_delete').removeAttr('aria-required'); jQuery('#jform_php_before_delete').removeClass('required'); - jform_vvvvvxsvxh_required = true; + jform_vvvvvxsvxg_required = true; } } } @@ -778,26 +778,26 @@ function vvvvvxt(add_php_after_delete_vvvvvxt) if (add_php_after_delete_vvvvvxt == 1) { jQuery('#jform_php_after_delete').closest('.control-group').show(); - if (jform_vvvvvxtvxi_required) + if (jform_vvvvvxtvxh_required) { updateFieldRequired('php_after_delete',0); jQuery('#jform_php_after_delete').prop('required','required'); jQuery('#jform_php_after_delete').attr('aria-required',true); jQuery('#jform_php_after_delete').addClass('required'); - jform_vvvvvxtvxi_required = false; + jform_vvvvvxtvxh_required = false; } } else { jQuery('#jform_php_after_delete').closest('.control-group').hide(); - if (!jform_vvvvvxtvxi_required) + if (!jform_vvvvvxtvxh_required) { updateFieldRequired('php_after_delete',1); jQuery('#jform_php_after_delete').removeAttr('required'); jQuery('#jform_php_after_delete').removeAttr('aria-required'); jQuery('#jform_php_after_delete').removeClass('required'); - jform_vvvvvxtvxi_required = true; + jform_vvvvvxtvxh_required = true; } } } @@ -809,26 +809,26 @@ function vvvvvxu(add_php_document_vvvvvxu) if (add_php_document_vvvvvxu == 1) { jQuery('#jform_php_document').closest('.control-group').show(); - if (jform_vvvvvxuvxj_required) + if (jform_vvvvvxuvxi_required) { updateFieldRequired('php_document',0); jQuery('#jform_php_document').prop('required','required'); jQuery('#jform_php_document').attr('aria-required',true); jQuery('#jform_php_document').addClass('required'); - jform_vvvvvxuvxj_required = false; + jform_vvvvvxuvxi_required = false; } } else { jQuery('#jform_php_document').closest('.control-group').hide(); - if (!jform_vvvvvxuvxj_required) + if (!jform_vvvvvxuvxi_required) { updateFieldRequired('php_document',1); jQuery('#jform_php_document').removeAttr('required'); jQuery('#jform_php_document').removeAttr('aria-required'); jQuery('#jform_php_document').removeClass('required'); - jform_vvvvvxuvxj_required = true; + jform_vvvvvxuvxi_required = true; } } } @@ -840,26 +840,26 @@ function vvvvvxv(add_sql_vvvvvxv) if (add_sql_vvvvvxv == 1) { jQuery('#jform_source').closest('.control-group').show(); - if (jform_vvvvvxvvxk_required) + if (jform_vvvvvxvvxj_required) { updateFieldRequired('source',0); jQuery('#jform_source').prop('required','required'); jQuery('#jform_source').attr('aria-required',true); jQuery('#jform_source').addClass('required'); - jform_vvvvvxvvxk_required = false; + jform_vvvvvxvvxj_required = false; } } else { jQuery('#jform_source').closest('.control-group').hide(); - if (!jform_vvvvvxvvxk_required) + if (!jform_vvvvvxvvxj_required) { updateFieldRequired('source',1); jQuery('#jform_source').removeAttr('required'); jQuery('#jform_source').removeAttr('aria-required'); jQuery('#jform_source').removeClass('required'); - jform_vvvvvxvvxk_required = true; + jform_vvvvvxvvxj_required = true; } } } @@ -871,26 +871,26 @@ function vvvvvxw(source_vvvvvxw,add_sql_vvvvvxw) if (source_vvvvvxw == 2 && add_sql_vvvvvxw == 1) { jQuery('#jform_sql').closest('.control-group').show(); - if (jform_vvvvvxwvxl_required) + if (jform_vvvvvxwvxk_required) { updateFieldRequired('sql',0); jQuery('#jform_sql').prop('required','required'); jQuery('#jform_sql').attr('aria-required',true); jQuery('#jform_sql').addClass('required'); - jform_vvvvvxwvxl_required = false; + jform_vvvvvxwvxk_required = false; } } else { jQuery('#jform_sql').closest('.control-group').hide(); - if (!jform_vvvvvxwvxl_required) + if (!jform_vvvvvxwvxk_required) { updateFieldRequired('sql',1); jQuery('#jform_sql').removeAttr('required'); jQuery('#jform_sql').removeAttr('aria-required'); jQuery('#jform_sql').removeClass('required'); - jform_vvvvvxwvxl_required = true; + jform_vvvvvxwvxk_required = true; } } } @@ -916,142 +916,142 @@ function vvvvvya(add_custom_import_vvvvvya) if (add_custom_import_vvvvvya == 1) { jQuery('#jform_html_import_view').closest('.control-group').show(); - if (jform_vvvvvyavxm_required) + if (jform_vvvvvyavxl_required) { updateFieldRequired('html_import_view',0); jQuery('#jform_html_import_view').prop('required','required'); jQuery('#jform_html_import_view').attr('aria-required',true); jQuery('#jform_html_import_view').addClass('required'); - jform_vvvvvyavxm_required = false; + jform_vvvvvyavxl_required = false; } jQuery('.note_advanced_import').closest('.control-group').show(); jQuery('#jform_php_import_display').closest('.control-group').show(); - if (jform_vvvvvyavxn_required) + if (jform_vvvvvyavxm_required) { updateFieldRequired('php_import_display',0); jQuery('#jform_php_import_display').prop('required','required'); jQuery('#jform_php_import_display').attr('aria-required',true); jQuery('#jform_php_import_display').addClass('required'); - jform_vvvvvyavxn_required = false; + jform_vvvvvyavxm_required = false; } jQuery('#jform_php_import_ext').closest('.control-group').show(); - if (jform_vvvvvyavxo_required) + if (jform_vvvvvyavxn_required) { updateFieldRequired('php_import_ext',0); jQuery('#jform_php_import_ext').prop('required','required'); jQuery('#jform_php_import_ext').attr('aria-required',true); jQuery('#jform_php_import_ext').addClass('required'); - jform_vvvvvyavxo_required = false; + jform_vvvvvyavxn_required = false; } jQuery('#jform_php_import_headers').closest('.control-group').show(); - if (jform_vvvvvyavxp_required) + if (jform_vvvvvyavxo_required) { updateFieldRequired('php_import_headers',0); jQuery('#jform_php_import_headers').prop('required','required'); jQuery('#jform_php_import_headers').attr('aria-required',true); jQuery('#jform_php_import_headers').addClass('required'); - jform_vvvvvyavxp_required = false; + jform_vvvvvyavxo_required = false; } jQuery('#jform_php_import').closest('.control-group').show(); - if (jform_vvvvvyavxq_required) + if (jform_vvvvvyavxp_required) { updateFieldRequired('php_import',0); jQuery('#jform_php_import').prop('required','required'); jQuery('#jform_php_import').attr('aria-required',true); jQuery('#jform_php_import').addClass('required'); - jform_vvvvvyavxq_required = false; + jform_vvvvvyavxp_required = false; } jQuery('#jform_php_import_save').closest('.control-group').show(); - if (jform_vvvvvyavxr_required) + if (jform_vvvvvyavxq_required) { updateFieldRequired('php_import_save',0); jQuery('#jform_php_import_save').prop('required','required'); jQuery('#jform_php_import_save').attr('aria-required',true); jQuery('#jform_php_import_save').addClass('required'); - jform_vvvvvyavxr_required = false; + jform_vvvvvyavxq_required = false; } jQuery('#jform_php_import_setdata').closest('.control-group').show(); - if (jform_vvvvvyavxs_required) + if (jform_vvvvvyavxr_required) { updateFieldRequired('php_import_setdata',0); jQuery('#jform_php_import_setdata').prop('required','required'); jQuery('#jform_php_import_setdata').attr('aria-required',true); jQuery('#jform_php_import_setdata').addClass('required'); - jform_vvvvvyavxs_required = false; + jform_vvvvvyavxr_required = false; } } else { jQuery('#jform_html_import_view').closest('.control-group').hide(); - if (!jform_vvvvvyavxm_required) + if (!jform_vvvvvyavxl_required) { updateFieldRequired('html_import_view',1); jQuery('#jform_html_import_view').removeAttr('required'); jQuery('#jform_html_import_view').removeAttr('aria-required'); jQuery('#jform_html_import_view').removeClass('required'); - jform_vvvvvyavxm_required = true; + jform_vvvvvyavxl_required = true; } jQuery('.note_advanced_import').closest('.control-group').hide(); jQuery('#jform_php_import_display').closest('.control-group').hide(); - if (!jform_vvvvvyavxn_required) + if (!jform_vvvvvyavxm_required) { updateFieldRequired('php_import_display',1); jQuery('#jform_php_import_display').removeAttr('required'); jQuery('#jform_php_import_display').removeAttr('aria-required'); jQuery('#jform_php_import_display').removeClass('required'); - jform_vvvvvyavxn_required = true; + jform_vvvvvyavxm_required = true; } jQuery('#jform_php_import_ext').closest('.control-group').hide(); - if (!jform_vvvvvyavxo_required) + if (!jform_vvvvvyavxn_required) { updateFieldRequired('php_import_ext',1); jQuery('#jform_php_import_ext').removeAttr('required'); jQuery('#jform_php_import_ext').removeAttr('aria-required'); jQuery('#jform_php_import_ext').removeClass('required'); - jform_vvvvvyavxo_required = true; + jform_vvvvvyavxn_required = true; } jQuery('#jform_php_import_headers').closest('.control-group').hide(); - if (!jform_vvvvvyavxp_required) + if (!jform_vvvvvyavxo_required) { updateFieldRequired('php_import_headers',1); jQuery('#jform_php_import_headers').removeAttr('required'); jQuery('#jform_php_import_headers').removeAttr('aria-required'); jQuery('#jform_php_import_headers').removeClass('required'); - jform_vvvvvyavxp_required = true; + jform_vvvvvyavxo_required = true; } jQuery('#jform_php_import').closest('.control-group').hide(); - if (!jform_vvvvvyavxq_required) + if (!jform_vvvvvyavxp_required) { updateFieldRequired('php_import',1); jQuery('#jform_php_import').removeAttr('required'); jQuery('#jform_php_import').removeAttr('aria-required'); jQuery('#jform_php_import').removeClass('required'); - jform_vvvvvyavxq_required = true; + jform_vvvvvyavxp_required = true; } jQuery('#jform_php_import_save').closest('.control-group').hide(); - if (!jform_vvvvvyavxr_required) + if (!jform_vvvvvyavxq_required) { updateFieldRequired('php_import_save',1); jQuery('#jform_php_import_save').removeAttr('required'); jQuery('#jform_php_import_save').removeAttr('aria-required'); jQuery('#jform_php_import_save').removeClass('required'); - jform_vvvvvyavxr_required = true; + jform_vvvvvyavxq_required = true; } jQuery('#jform_php_import_setdata').closest('.control-group').hide(); - if (!jform_vvvvvyavxs_required) + if (!jform_vvvvvyavxr_required) { updateFieldRequired('php_import_setdata',1); jQuery('#jform_php_import_setdata').removeAttr('required'); jQuery('#jform_php_import_setdata').removeAttr('aria-required'); jQuery('#jform_php_import_setdata').removeClass('required'); - jform_vvvvvyavxs_required = true; + jform_vvvvvyavxr_required = true; } } } @@ -1078,43 +1078,43 @@ function vvvvvyc(add_custom_button_vvvvvyc) { jQuery('#jform_custom_button-lbl').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); - if (jform_vvvvvycvxt_required) + if (jform_vvvvvycvxs_required) { updateFieldRequired('php_controller',0); jQuery('#jform_php_controller').prop('required','required'); jQuery('#jform_php_controller').attr('aria-required',true); jQuery('#jform_php_controller').addClass('required'); - jform_vvvvvycvxt_required = false; + jform_vvvvvycvxs_required = false; } jQuery('#jform_php_controller_list').closest('.control-group').show(); - if (jform_vvvvvycvxu_required) + if (jform_vvvvvycvxt_required) { updateFieldRequired('php_controller_list',0); jQuery('#jform_php_controller_list').prop('required','required'); jQuery('#jform_php_controller_list').attr('aria-required',true); jQuery('#jform_php_controller_list').addClass('required'); - jform_vvvvvycvxu_required = false; + jform_vvvvvycvxt_required = false; } jQuery('#jform_php_model').closest('.control-group').show(); - if (jform_vvvvvycvxv_required) + if (jform_vvvvvycvxu_required) { updateFieldRequired('php_model',0); jQuery('#jform_php_model').prop('required','required'); jQuery('#jform_php_model').attr('aria-required',true); jQuery('#jform_php_model').addClass('required'); - jform_vvvvvycvxv_required = false; + jform_vvvvvycvxu_required = false; } jQuery('#jform_php_model_list').closest('.control-group').show(); - if (jform_vvvvvycvxw_required) + if (jform_vvvvvycvxv_required) { updateFieldRequired('php_model_list',0); jQuery('#jform_php_model_list').prop('required','required'); jQuery('#jform_php_model_list').attr('aria-required',true); jQuery('#jform_php_model_list').addClass('required'); - jform_vvvvvycvxw_required = false; + jform_vvvvvycvxv_required = false; } } @@ -1122,40 +1122,40 @@ function vvvvvyc(add_custom_button_vvvvvyc) { jQuery('#jform_custom_button-lbl').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); - if (!jform_vvvvvycvxt_required) + if (!jform_vvvvvycvxs_required) { updateFieldRequired('php_controller',1); jQuery('#jform_php_controller').removeAttr('required'); jQuery('#jform_php_controller').removeAttr('aria-required'); jQuery('#jform_php_controller').removeClass('required'); - jform_vvvvvycvxt_required = true; + jform_vvvvvycvxs_required = true; } jQuery('#jform_php_controller_list').closest('.control-group').hide(); - if (!jform_vvvvvycvxu_required) + if (!jform_vvvvvycvxt_required) { updateFieldRequired('php_controller_list',1); jQuery('#jform_php_controller_list').removeAttr('required'); jQuery('#jform_php_controller_list').removeAttr('aria-required'); jQuery('#jform_php_controller_list').removeClass('required'); - jform_vvvvvycvxu_required = true; + jform_vvvvvycvxt_required = true; } jQuery('#jform_php_model').closest('.control-group').hide(); - if (!jform_vvvvvycvxv_required) + if (!jform_vvvvvycvxu_required) { updateFieldRequired('php_model',1); jQuery('#jform_php_model').removeAttr('required'); jQuery('#jform_php_model').removeAttr('aria-required'); jQuery('#jform_php_model').removeClass('required'); - jform_vvvvvycvxv_required = true; + jform_vvvvvycvxu_required = true; } jQuery('#jform_php_model_list').closest('.control-group').hide(); - if (!jform_vvvvvycvxw_required) + if (!jform_vvvvvycvxv_required) { updateFieldRequired('php_model_list',1); jQuery('#jform_php_model_list').removeAttr('required'); jQuery('#jform_php_model_list').removeAttr('aria-required'); jQuery('#jform_php_model_list').removeClass('required'); - jform_vvvvvycvxw_required = true; + jform_vvvvvycvxv_required = true; } } } diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index a01895ae5..9613ed584 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -130,16 +130,10 @@ filter="HTML" message="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_MESSAGE" hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT" /> - - - + @@ -147,22 +141,10 @@ - - - - - + @@ -170,11 +152,10 @@ - + @@ -182,10 +163,10 @@ - + @@ -193,6 +174,35 @@ + + + + + + + + + + COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE - - - - - - - - + + COM_COMPONENTBUILDER_ADMIN_VIEW_ADD - - - - - - - - - - -