diff --git a/README.md b/README.md index 21591790f..1f836f8e3 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.1) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.2) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -125,13 +125,13 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 29th June, 2018 -+ *Version*: 2.8.1 ++ *Last Build*: 6th July, 2018 ++ *Version*: 2.8.2 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **186028** -+ *Field count*: **1054** -+ *File count*: **1237** ++ *Line count*: **186216** ++ *Field count*: **1058** ++ *File count*: **1238** + *Folder count*: **197** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/README.txt b/admin/README.txt index 21591790f..1f836f8e3 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.1) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.2) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -125,13 +125,13 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 29th June, 2018 -+ *Version*: 2.8.1 ++ *Last Build*: 6th July, 2018 ++ *Version*: 2.8.2 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **186028** -+ *Field count*: **1054** -+ *File count*: **1237** ++ *Line count*: **186216** ++ *Field count*: **1058** ++ *File count*: **1238** + *Folder count*: **197** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/config.xml b/admin/config.xml index b05392b0d..c9f56729e 100644 --- a/admin/config.xml +++ b/admin/config.xml @@ -47,6 +47,20 @@ /> + + + + + + COM_COMPONENTBUILDER_CONFIG_JCB_COMMUNITY_PACKAGES - - + + - - + + COM_COMPONENTBUILDER_CONFIG_NO - - + + COM_COMPONENTBUILDER_CONFIG_NEVER_UPDATE - - + + @@ -208,8 +222,8 @@ max="100" step="10" /> - - + + COM_COMPONENTBUILDER_CONFIG_SIMPLEXMLELEMENT_CLASS - - + + - - + + {'add_' . $scripter}) && $view->{'add_' . $scripter} == 1) diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php index f01c17726..c5d0d4da1 100644 --- a/admin/helpers/compiler/c_Fields.php +++ b/admin/helpers/compiler/c_Fields.php @@ -1295,8 +1295,8 @@ class Fields extends Structure else { $optionArray = false; - $field .= PHP_EOL . $this->_t(3) . $taber . ""; $field .= PHP_EOL . $this->_t(2) . $taber . "/>"; + $field .= PHP_EOL . $this->_t(2) . $taber . "" . PHP_EOL; } } elseif ($setType === 'plain') diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 8a8c43eb5..9b0cf47a5 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -10937,6 +10937,8 @@ class Interpretation extends Fields $allow[] = $this->_t(4) . "\$form->setValue(\$redirectedField, null, \$redirectedValue);"; $allow[] = $this->_t(3) . "}"; $allow[] = $this->_t(2) . "}"; + // load custom script if found + $allow[] = $this->getCustomScriptBuilder('php_getform', $viewName_single); // setup the default script $allow[] = PHP_EOL . $this->_t(2) . "return \$form;"; diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index b74544ce0..75c1b9d59 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -424,6 +424,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE="Add Php Before Save" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE_LABEL="Add PHP (save Method - before data modeling)" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT="Add Php Document" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL="Add PHP (custom document script)" +COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETFORM="Add Php Getform" +COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETFORM_LABEL="Add PHP (getForm Method)" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEM="Add Php Getitem" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS="Add Php Getitems" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL="Add Php Getitems After All" @@ -777,6 +779,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_LABEL="PHP List view COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT="Php Document" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION="Add PHP to the document method in the view.html.php file of this view. Do not add the php tags." COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_LABEL="PHP document method" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETFORM="Php Getform" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETFORM_DESCRIPTION="Add PHP Here that should run in the getForm Method. Do not add the php tags." +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETFORM_LABEL="PHP getForm Method
Target (array) $data values & (bool) $loadData & (object) $form. " COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM="Php Getitem" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS="Php Getitems" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL="Php Getitems After All" @@ -2428,6 +2433,8 @@ COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_DESCRIPTION="This is the TXT value to use COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_HINT="v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=PUBLICKEY" COM_COMPONENTBUILDER_CONFIG_DKIM_VALUE_LABEL="Value" COM_COMPONENTBUILDER_CONFIG_DONT_LOAD="Not" +COM_COMPONENTBUILDER_CONFIG_EDITOR_DESCRIPTION="Select the editor you would like to use as the JCB global editor for all custom coding areas." +COM_COMPONENTBUILDER_CONFIG_EDITOR_LABEL="Select an editor" COM_COMPONENTBUILDER_CONFIG_EMAILFROM_DESCRIPTION="The global email address that will be used to send system email." COM_COMPONENTBUILDER_CONFIG_EMAILFROM_HINT="Email Address Here" COM_COMPONENTBUILDER_CONFIG_EMAILFROM_LABEL=" From Email" diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index 32637cb57..28262d538 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -27,6 +27,8 @@ $fields = $displayData->get('fields') ?: array( 'php_getitems_after_all', 'add_php_getlistquery', 'php_getlistquery', + 'add_php_getform', + 'php_getform', 'add_php_before_save', 'php_before_save', 'add_php_save', diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 29a9ee253..dd93e2bda 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -14,7 +14,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->wadfields; +$items = $displayData->waefields; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; diff --git a/admin/layouts/server/linked_components_fullwidth.php b/admin/layouts/server/linked_components_fullwidth.php index 1ebc0da63..843ad66fc 100644 --- a/admin/layouts/server/linked_components_fullwidth.php +++ b/admin/layouts/server/linked_components_fullwidth.php @@ -14,7 +14,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->wanlinked_components; +$items = $displayData->waolinked_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/models/admin_fields.php b/admin/models/admin_fields.php index 1a5ca4e1d..cc326582d 100644 --- a/admin/models/admin_fields.php +++ b/admin/models/admin_fields.php @@ -206,6 +206,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin } } + return $form; } diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php index 182c96f78..3575e0a84 100644 --- a/admin/models/admin_fields_conditions.php +++ b/admin/models/admin_fields_conditions.php @@ -206,6 +206,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin } } + return $form; } diff --git a/admin/models/admin_fields_relations.php b/admin/models/admin_fields_relations.php index 49fd62aac..0fe37b035 100644 --- a/admin/models/admin_fields_relations.php +++ b/admin/models/admin_fields_relations.php @@ -186,6 +186,7 @@ class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin } } + return $form; } diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 8b346660e..c014bbb53 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -86,6 +86,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->metadata = $registry->toArray(); } + if (!empty($item->php_import_headers)) + { + // base64 Decode php_import_headers. + $item->php_import_headers = base64_decode($item->php_import_headers); + } + if (!empty($item->html_import_view)) { // base64 Decode html_import_view. @@ -98,12 +104,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_import_save = base64_decode($item->php_import_save); } - if (!empty($item->php_import_headers)) - { - // base64 Decode php_import_headers. - $item->php_import_headers = base64_decode($item->php_import_headers); - } - if (!empty($item->php_getitem)) { // base64 Decode php_getitem. @@ -134,10 +134,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_getlistquery = base64_decode($item->php_getlistquery); } - if (!empty($item->php_before_save)) + if (!empty($item->php_getform)) { - // base64 Decode php_before_save. - $item->php_before_save = base64_decode($item->php_before_save); + // base64 Decode php_getform. + $item->php_getform = base64_decode($item->php_getform); } if (!empty($item->css_views)) @@ -146,78 +146,84 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->css_views = base64_decode($item->css_views); } + if (!empty($item->php_before_save)) + { + // base64 Decode php_before_save. + $item->php_before_save = base64_decode($item->php_before_save); + } + if (!empty($item->php_save)) { // base64 Decode php_save. $item->php_save = base64_decode($item->php_save); } - if (!empty($item->php_postsavehook)) - { - // base64 Decode php_postsavehook. - $item->php_postsavehook = base64_decode($item->php_postsavehook); - } - if (!empty($item->javascript_view_file)) { // base64 Decode javascript_view_file. $item->javascript_view_file = base64_decode($item->javascript_view_file); } + if (!empty($item->php_postsavehook)) + { + // base64 Decode php_postsavehook. + $item->php_postsavehook = base64_decode($item->php_postsavehook); + } + if (!empty($item->php_allowedit)) { // base64 Decode php_allowedit. $item->php_allowedit = base64_decode($item->php_allowedit); } - if (!empty($item->php_batchcopy)) - { - // base64 Decode php_batchcopy. - $item->php_batchcopy = base64_decode($item->php_batchcopy); - } - if (!empty($item->javascript_view_footer)) { // base64 Decode javascript_view_footer. $item->javascript_view_footer = base64_decode($item->javascript_view_footer); } + if (!empty($item->php_batchcopy)) + { + // base64 Decode php_batchcopy. + $item->php_batchcopy = base64_decode($item->php_batchcopy); + } + if (!empty($item->php_batchmove)) { // base64 Decode php_batchmove. $item->php_batchmove = base64_decode($item->php_batchmove); } - if (!empty($item->php_before_publish)) - { - // base64 Decode php_before_publish. - $item->php_before_publish = base64_decode($item->php_before_publish); - } - if (!empty($item->javascript_views_file)) { // base64 Decode javascript_views_file. $item->javascript_views_file = base64_decode($item->javascript_views_file); } + if (!empty($item->php_before_publish)) + { + // base64 Decode php_before_publish. + $item->php_before_publish = base64_decode($item->php_before_publish); + } + if (!empty($item->php_after_publish)) { // base64 Decode php_after_publish. $item->php_after_publish = base64_decode($item->php_after_publish); } - if (!empty($item->php_before_delete)) - { - // base64 Decode php_before_delete. - $item->php_before_delete = base64_decode($item->php_before_delete); - } - if (!empty($item->javascript_views_footer)) { // base64 Decode javascript_views_footer. $item->javascript_views_footer = base64_decode($item->javascript_views_footer); } + if (!empty($item->php_before_delete)) + { + // base64 Decode php_before_delete. + $item->php_before_delete = base64_decode($item->php_before_delete); + } + if (!empty($item->php_after_delete)) { // base64 Decode php_after_delete. @@ -236,60 +242,68 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_controller = base64_decode($item->php_controller); } - if (!empty($item->sql)) - { - // base64 Decode sql. - $item->sql = base64_decode($item->sql); - } - if (!empty($item->php_model)) { // base64 Decode php_model. $item->php_model = base64_decode($item->php_model); } + if (!empty($item->sql)) + { + // base64 Decode sql. + $item->sql = base64_decode($item->sql); + } + if (!empty($item->php_controller_list)) { // base64 Decode php_controller_list. $item->php_controller_list = base64_decode($item->php_controller_list); } - if (!empty($item->php_import_display)) - { - // base64 Decode php_import_display. - $item->php_import_display = base64_decode($item->php_import_display); - } - if (!empty($item->php_model_list)) { // base64 Decode php_model_list. $item->php_model_list = base64_decode($item->php_model_list); } + if (!empty($item->php_import_display)) + { + // base64 Decode php_import_display. + $item->php_import_display = base64_decode($item->php_import_display); + } + if (!empty($item->php_import)) { // base64 Decode php_import. $item->php_import = base64_decode($item->php_import); } - if (!empty($item->php_import_setdata)) - { - // base64 Decode php_import_setdata. - $item->php_import_setdata = base64_decode($item->php_import_setdata); - } - if (!empty($item->php_ajaxmethod)) { // base64 Decode php_ajaxmethod. $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); } + if (!empty($item->php_import_setdata)) + { + // base64 Decode php_import_setdata. + $item->php_import_setdata = base64_decode($item->php_import_setdata); + } + if (!empty($item->php_import_ext)) { // base64 Decode php_import_ext. $item->php_import_ext = base64_decode($item->php_import_ext); } + 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. @@ -314,14 +328,6 @@ 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->alias_builder)) { // Convert the alias_builder field to an array. @@ -500,6 +506,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin } } + // update all editors to use this components global editor + $global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none'); + $editors = $form->getXml()->xpath("//field[@type='editor']"); + foreach ($editors as $editor) + { + $name = (string) $editor['name']; + $form->setFieldAttribute($name, 'editor', $global_editor); + } + + return $form; } @@ -1180,6 +1196,19 @@ 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'])) { @@ -1219,19 +1248,6 @@ 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 alias_builder items to data. if (isset($data['alias_builder']) && is_array($data['alias_builder'])) { @@ -1271,6 +1287,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['ajax_input'] = ''; } + // Set the php_import_headers string to base64 string. + if (isset($data['php_import_headers'])) + { + $data['php_import_headers'] = base64_encode($data['php_import_headers']); + } + // Set the html_import_view string to base64 string. if (isset($data['html_import_view'])) { @@ -1283,12 +1305,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_import_save'] = base64_encode($data['php_import_save']); } - // Set the php_import_headers string to base64 string. - if (isset($data['php_import_headers'])) - { - $data['php_import_headers'] = base64_encode($data['php_import_headers']); - } - // Set the php_getitem string to base64 string. if (isset($data['php_getitem'])) { @@ -1319,10 +1335,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_getlistquery'] = base64_encode($data['php_getlistquery']); } - // Set the php_before_save string to base64 string. - if (isset($data['php_before_save'])) + // Set the php_getform string to base64 string. + if (isset($data['php_getform'])) { - $data['php_before_save'] = base64_encode($data['php_before_save']); + $data['php_getform'] = base64_encode($data['php_getform']); } // Set the css_views string to base64 string. @@ -1331,78 +1347,84 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['css_views'] = base64_encode($data['css_views']); } + // Set the php_before_save string to base64 string. + if (isset($data['php_before_save'])) + { + $data['php_before_save'] = base64_encode($data['php_before_save']); + } + // Set the php_save string to base64 string. if (isset($data['php_save'])) { $data['php_save'] = base64_encode($data['php_save']); } - // Set the php_postsavehook string to base64 string. - if (isset($data['php_postsavehook'])) - { - $data['php_postsavehook'] = base64_encode($data['php_postsavehook']); - } - // Set the javascript_view_file string to base64 string. if (isset($data['javascript_view_file'])) { $data['javascript_view_file'] = base64_encode($data['javascript_view_file']); } + // Set the php_postsavehook string to base64 string. + if (isset($data['php_postsavehook'])) + { + $data['php_postsavehook'] = base64_encode($data['php_postsavehook']); + } + // Set the php_allowedit string to base64 string. if (isset($data['php_allowedit'])) { $data['php_allowedit'] = base64_encode($data['php_allowedit']); } - // Set the php_batchcopy string to base64 string. - if (isset($data['php_batchcopy'])) - { - $data['php_batchcopy'] = base64_encode($data['php_batchcopy']); - } - // Set the javascript_view_footer string to base64 string. if (isset($data['javascript_view_footer'])) { $data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']); } + // Set the php_batchcopy string to base64 string. + if (isset($data['php_batchcopy'])) + { + $data['php_batchcopy'] = base64_encode($data['php_batchcopy']); + } + // Set the php_batchmove string to base64 string. if (isset($data['php_batchmove'])) { $data['php_batchmove'] = base64_encode($data['php_batchmove']); } - // Set the php_before_publish string to base64 string. - if (isset($data['php_before_publish'])) - { - $data['php_before_publish'] = base64_encode($data['php_before_publish']); - } - // Set the javascript_views_file string to base64 string. if (isset($data['javascript_views_file'])) { $data['javascript_views_file'] = base64_encode($data['javascript_views_file']); } + // Set the php_before_publish string to base64 string. + if (isset($data['php_before_publish'])) + { + $data['php_before_publish'] = base64_encode($data['php_before_publish']); + } + // Set the php_after_publish string to base64 string. if (isset($data['php_after_publish'])) { $data['php_after_publish'] = base64_encode($data['php_after_publish']); } - // Set the php_before_delete string to base64 string. - if (isset($data['php_before_delete'])) - { - $data['php_before_delete'] = base64_encode($data['php_before_delete']); - } - // Set the javascript_views_footer string to base64 string. if (isset($data['javascript_views_footer'])) { $data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']); } + // Set the php_before_delete string to base64 string. + if (isset($data['php_before_delete'])) + { + $data['php_before_delete'] = base64_encode($data['php_before_delete']); + } + // Set the php_after_delete string to base64 string. if (isset($data['php_after_delete'])) { @@ -1421,54 +1443,54 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_controller'] = base64_encode($data['php_controller']); } - // Set the sql string to base64 string. - if (isset($data['sql'])) - { - $data['sql'] = base64_encode($data['sql']); - } - // Set the php_model string to base64 string. if (isset($data['php_model'])) { $data['php_model'] = base64_encode($data['php_model']); } + // Set the sql string to base64 string. + if (isset($data['sql'])) + { + $data['sql'] = base64_encode($data['sql']); + } + // Set the php_controller_list string to base64 string. if (isset($data['php_controller_list'])) { $data['php_controller_list'] = base64_encode($data['php_controller_list']); } - // Set the php_import_display string to base64 string. - if (isset($data['php_import_display'])) - { - $data['php_import_display'] = base64_encode($data['php_import_display']); - } - // Set the php_model_list string to base64 string. if (isset($data['php_model_list'])) { $data['php_model_list'] = base64_encode($data['php_model_list']); } + // Set the php_import_display string to base64 string. + if (isset($data['php_import_display'])) + { + $data['php_import_display'] = base64_encode($data['php_import_display']); + } + // Set the php_import string to base64 string. if (isset($data['php_import'])) { $data['php_import'] = base64_encode($data['php_import']); } - // Set the php_import_setdata string to base64 string. - if (isset($data['php_import_setdata'])) - { - $data['php_import_setdata'] = base64_encode($data['php_import_setdata']); - } - // Set the php_ajaxmethod string to base64 string. if (isset($data['php_ajaxmethod'])) { $data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']); } + // Set the php_import_setdata string to base64 string. + if (isset($data['php_import_setdata'])) + { + $data['php_import_setdata'] = base64_encode($data['php_import_setdata']); + } + // Set the php_import_ext string to base64 string. if (isset($data['php_import_ext'])) { diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index 73ff4638d..099600954 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -244,12 +244,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_import_headers - $item->php_import_headers = base64_decode($item->php_import_headers); // decode php_getitem $item->php_getitem = base64_decode($item->php_getitem); // decode php_getitems @@ -260,56 +260,58 @@ class ComponentbuilderModelAdmin_views extends JModelList $item->css_view = base64_decode($item->css_view); // decode php_getlistquery $item->php_getlistquery = base64_decode($item->php_getlistquery); - // decode php_before_save - $item->php_before_save = base64_decode($item->php_before_save); + // decode php_getform + $item->php_getform = base64_decode($item->php_getform); // decode css_views $item->css_views = base64_decode($item->css_views); + // decode php_before_save + $item->php_before_save = base64_decode($item->php_before_save); // decode php_save $item->php_save = base64_decode($item->php_save); - // decode php_postsavehook - $item->php_postsavehook = base64_decode($item->php_postsavehook); // decode javascript_view_file $item->javascript_view_file = base64_decode($item->javascript_view_file); + // decode php_postsavehook + $item->php_postsavehook = base64_decode($item->php_postsavehook); // decode php_allowedit $item->php_allowedit = base64_decode($item->php_allowedit); - // decode php_batchcopy - $item->php_batchcopy = base64_decode($item->php_batchcopy); // decode javascript_view_footer $item->javascript_view_footer = base64_decode($item->javascript_view_footer); + // decode php_batchcopy + $item->php_batchcopy = base64_decode($item->php_batchcopy); // decode php_batchmove $item->php_batchmove = base64_decode($item->php_batchmove); - // decode php_before_publish - $item->php_before_publish = base64_decode($item->php_before_publish); // decode javascript_views_file $item->javascript_views_file = base64_decode($item->javascript_views_file); + // decode php_before_publish + $item->php_before_publish = base64_decode($item->php_before_publish); // decode php_after_publish $item->php_after_publish = base64_decode($item->php_after_publish); - // decode php_before_delete - $item->php_before_delete = base64_decode($item->php_before_delete); // decode javascript_views_footer $item->javascript_views_footer = base64_decode($item->javascript_views_footer); + // decode php_before_delete + $item->php_before_delete = base64_decode($item->php_before_delete); // decode php_after_delete $item->php_after_delete = base64_decode($item->php_after_delete); // decode php_document $item->php_document = base64_decode($item->php_document); // decode php_controller $item->php_controller = base64_decode($item->php_controller); - // decode sql - $item->sql = base64_decode($item->sql); // decode php_model $item->php_model = base64_decode($item->php_model); + // decode sql + $item->sql = base64_decode($item->sql); // decode php_controller_list $item->php_controller_list = base64_decode($item->php_controller_list); - // decode php_import_display - $item->php_import_display = base64_decode($item->php_import_display); // decode php_model_list $item->php_model_list = base64_decode($item->php_model_list); + // decode php_import_display + $item->php_import_display = base64_decode($item->php_import_display); // decode php_import $item->php_import = base64_decode($item->php_import); - // decode php_import_setdata - $item->php_import_setdata = base64_decode($item->php_import_setdata); // decode php_ajaxmethod $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); + // decode php_import_setdata + $item->php_import_setdata = base64_decode($item->php_import_setdata); // decode php_import_ext $item->php_import_ext = base64_decode($item->php_import_ext); // unset the values we don't want exported. diff --git a/admin/models/component_admin_views.php b/admin/models/component_admin_views.php index b43ae277a..e846e0e3c 100644 --- a/admin/models/component_admin_views.php +++ b/admin/models/component_admin_views.php @@ -217,6 +217,7 @@ class ComponentbuilderModelComponent_admin_views extends JModelAdmin } } + return $form; } diff --git a/admin/models/component_config.php b/admin/models/component_config.php index 55683e1ff..4504f4e88 100644 --- a/admin/models/component_config.php +++ b/admin/models/component_config.php @@ -217,6 +217,7 @@ class ComponentbuilderModelComponent_config extends JModelAdmin } } + return $form; } diff --git a/admin/models/component_custom_admin_menus.php b/admin/models/component_custom_admin_menus.php index 261501f6d..bc585b836 100644 --- a/admin/models/component_custom_admin_menus.php +++ b/admin/models/component_custom_admin_menus.php @@ -217,6 +217,7 @@ class ComponentbuilderModelComponent_custom_admin_menus extends JModelAdmin } } + return $form; } diff --git a/admin/models/component_custom_admin_views.php b/admin/models/component_custom_admin_views.php index 5a5bc8d3f..8efc9b83d 100644 --- a/admin/models/component_custom_admin_views.php +++ b/admin/models/component_custom_admin_views.php @@ -217,6 +217,7 @@ class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin } } + return $form; } diff --git a/admin/models/component_dashboard.php b/admin/models/component_dashboard.php index 99ac42e4e..7417802a9 100644 --- a/admin/models/component_dashboard.php +++ b/admin/models/component_dashboard.php @@ -223,6 +223,7 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin } } + return $form; } diff --git a/admin/models/component_files_folders.php b/admin/models/component_files_folders.php index 5a7c7d138..a80cbb659 100644 --- a/admin/models/component_files_folders.php +++ b/admin/models/component_files_folders.php @@ -242,6 +242,7 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin } } + return $form; } diff --git a/admin/models/component_mysql_tweaks.php b/admin/models/component_mysql_tweaks.php index fe94e30a0..51a119b94 100644 --- a/admin/models/component_mysql_tweaks.php +++ b/admin/models/component_mysql_tweaks.php @@ -217,6 +217,7 @@ class ComponentbuilderModelComponent_mysql_tweaks extends JModelAdmin } } + return $form; } diff --git a/admin/models/component_site_views.php b/admin/models/component_site_views.php index 8f085e8bd..69d246e07 100644 --- a/admin/models/component_site_views.php +++ b/admin/models/component_site_views.php @@ -217,6 +217,7 @@ class ComponentbuilderModelComponent_site_views extends JModelAdmin } } + return $form; } diff --git a/admin/models/component_updates.php b/admin/models/component_updates.php index 50f7e8228..6ec42de73 100644 --- a/admin/models/component_updates.php +++ b/admin/models/component_updates.php @@ -217,6 +217,7 @@ class ComponentbuilderModelComponent_updates extends JModelAdmin } } + return $form; } diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index 8d9acce65..b6358d6de 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -327,6 +327,16 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin } } + // update all editors to use this components global editor + $global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none'); + $editors = $form->getXml()->xpath("//field[@type='editor']"); + foreach ($editors as $editor) + { + $name = (string) $editor['name']; + $form->setFieldAttribute($name, 'editor', $global_editor); + } + + return $form; } diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php index 7c8e3959b..50eb037e0 100644 --- a/admin/models/custom_code.php +++ b/admin/models/custom_code.php @@ -184,6 +184,16 @@ class ComponentbuilderModelCustom_code extends JModelAdmin } } + // update all editors to use this components global editor + $global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none'); + $editors = $form->getXml()->xpath("//field[@type='editor']"); + foreach ($editors as $editor) + { + $name = (string) $editor['name']; + $form->setFieldAttribute($name, 'editor', $global_editor); + } + + return $form; } diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php index 23cdea082..96d32de62 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -334,6 +334,16 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin } } + // update all editors to use this components global editor + $global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none'); + $editors = $form->getXml()->xpath("//field[@type='editor']"); + foreach ($editors as $editor) + { + $name = (string) $editor['name']; + $form->setFieldAttribute($name, 'editor', $global_editor); + } + + return $form; } diff --git a/admin/models/field.php b/admin/models/field.php index ce4d851e4..7a266c62c 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -232,6 +232,7 @@ class ComponentbuilderModelField extends JModelAdmin } } + return $form; } diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index 033170b8d..06a945109 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -125,7 +125,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getWadfields() + public function getWaefields() { // Get the user object. $user = JFactory::getUser(); @@ -207,13 +207,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationWadfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationWaefields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationWadfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationWaefields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationWadfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationWaefields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationWadfields($item->store, 'store'); + $item->store = $this->selectionTranslationWaefields($item->store, 'store'); } } @@ -227,7 +227,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationWadfields($value,$name) + public function selectionTranslationWaefields($value,$name) { // Array of datatype language strings if ($name === 'datatype') @@ -451,6 +451,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin } } + return $form; } diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index 5e0207364..23c22d172 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -33,17 +33,18 @@ jform_vvvvvxuvxi_required = false; jform_vvvvvxvvxj_required = false; jform_vvvvvxwvxk_required = false; jform_vvvvvxxvxl_required = false; -jform_vvvvvybvxm_required = false; -jform_vvvvvybvxn_required = false; -jform_vvvvvybvxo_required = false; -jform_vvvvvybvxp_required = false; -jform_vvvvvybvxq_required = false; -jform_vvvvvybvxr_required = false; -jform_vvvvvybvxs_required = false; -jform_vvvvvydvxt_required = false; -jform_vvvvvydvxu_required = false; -jform_vvvvvydvxv_required = false; -jform_vvvvvydvxw_required = false; +jform_vvvvvxyvxm_required = false; +jform_vvvvvycvxn_required = false; +jform_vvvvvycvxo_required = false; +jform_vvvvvycvxp_required = false; +jform_vvvvvycvxq_required = false; +jform_vvvvvycvxr_required = false; +jform_vvvvvycvxs_required = false; +jform_vvvvvycvxt_required = false; +jform_vvvvvyevxu_required = false; +jform_vvvvvyevxv_required = false; +jform_vvvvvyevxw_required = false; +jform_vvvvvyevxx_required = false; // Initial Script jQuery(document).ready(function() @@ -81,58 +82,61 @@ jQuery(document).ready(function() var add_php_getlistquery_vvvvvxk = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); vvvvvxk(add_php_getlistquery_vvvvvxk); - var add_php_before_save_vvvvvxl = jQuery("#jform_add_php_before_save input[type='radio']:checked").val(); - vvvvvxl(add_php_before_save_vvvvvxl); + var add_php_getform_vvvvvxl = jQuery("#jform_add_php_getform input[type='radio']:checked").val(); + vvvvvxl(add_php_getform_vvvvvxl); - var add_php_save_vvvvvxm = jQuery("#jform_add_php_save input[type='radio']:checked").val(); - vvvvvxm(add_php_save_vvvvvxm); + var add_php_before_save_vvvvvxm = jQuery("#jform_add_php_before_save input[type='radio']:checked").val(); + vvvvvxm(add_php_before_save_vvvvvxm); - var add_php_postsavehook_vvvvvxn = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val(); - vvvvvxn(add_php_postsavehook_vvvvvxn); + var add_php_save_vvvvvxn = jQuery("#jform_add_php_save input[type='radio']:checked").val(); + vvvvvxn(add_php_save_vvvvvxn); - var add_php_allowedit_vvvvvxo = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val(); - vvvvvxo(add_php_allowedit_vvvvvxo); + var add_php_postsavehook_vvvvvxo = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val(); + vvvvvxo(add_php_postsavehook_vvvvvxo); - var add_php_batchcopy_vvvvvxp = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val(); - vvvvvxp(add_php_batchcopy_vvvvvxp); + var add_php_allowedit_vvvvvxp = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val(); + vvvvvxp(add_php_allowedit_vvvvvxp); - var add_php_batchmove_vvvvvxq = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val(); - vvvvvxq(add_php_batchmove_vvvvvxq); + var add_php_batchcopy_vvvvvxq = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val(); + vvvvvxq(add_php_batchcopy_vvvvvxq); - var add_php_before_publish_vvvvvxr = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val(); - vvvvvxr(add_php_before_publish_vvvvvxr); + var add_php_batchmove_vvvvvxr = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val(); + vvvvvxr(add_php_batchmove_vvvvvxr); - var add_php_after_publish_vvvvvxs = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val(); - vvvvvxs(add_php_after_publish_vvvvvxs); + var add_php_before_publish_vvvvvxs = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val(); + vvvvvxs(add_php_before_publish_vvvvvxs); - var add_php_before_delete_vvvvvxt = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val(); - vvvvvxt(add_php_before_delete_vvvvvxt); + var add_php_after_publish_vvvvvxt = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val(); + vvvvvxt(add_php_after_publish_vvvvvxt); - var add_php_after_delete_vvvvvxu = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val(); - vvvvvxu(add_php_after_delete_vvvvvxu); + var add_php_before_delete_vvvvvxu = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val(); + vvvvvxu(add_php_before_delete_vvvvvxu); - var add_php_document_vvvvvxv = jQuery("#jform_add_php_document input[type='radio']:checked").val(); - vvvvvxv(add_php_document_vvvvvxv); + var add_php_after_delete_vvvvvxv = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val(); + vvvvvxv(add_php_after_delete_vvvvvxv); - var add_sql_vvvvvxw = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxw(add_sql_vvvvvxw); + var add_php_document_vvvvvxw = jQuery("#jform_add_php_document input[type='radio']:checked").val(); + vvvvvxw(add_php_document_vvvvvxw); - var source_vvvvvxx = jQuery("#jform_source input[type='radio']:checked").val(); var add_sql_vvvvvxx = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxx(source_vvvvvxx,add_sql_vvvvvxx); + vvvvvxx(add_sql_vvvvvxx); - var source_vvvvvxz = jQuery("#jform_source input[type='radio']:checked").val(); - var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val(); - vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz); + var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val(); + var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val(); + vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy); - var add_custom_import_vvvvvyb = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); - vvvvvyb(add_custom_import_vvvvvyb); + var source_vvvvvya = jQuery("#jform_source input[type='radio']:checked").val(); + var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val(); + vvvvvya(source_vvvvvya,add_sql_vvvvvya); var add_custom_import_vvvvvyc = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); vvvvvyc(add_custom_import_vvvvvyc); - var add_custom_button_vvvvvyd = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); - vvvvvyd(add_custom_button_vvvvvyd); + var add_custom_import_vvvvvyd = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); + vvvvvyd(add_custom_import_vvvvvyd); + + var add_custom_button_vvvvvye = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); + vvvvvye(add_custom_button_vvvvvye); }); // the vvvvvxa function @@ -479,413 +483,444 @@ function vvvvvxk(add_php_getlistquery_vvvvvxk) } // the vvvvvxl function -function vvvvvxl(add_php_before_save_vvvvvxl) +function vvvvvxl(add_php_getform_vvvvvxl) { // set the function logic - if (add_php_before_save_vvvvvxl == 1) + if (add_php_getform_vvvvvxl == 1) { - jQuery('#jform_php_before_save-lbl').closest('.control-group').show(); + jQuery('#jform_php_getform-lbl').closest('.control-group').show(); if (jform_vvvvvxlvwz_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'); + updateFieldRequired('php_getform',0); + jQuery('#jform_php_getform').prop('required','required'); + jQuery('#jform_php_getform').attr('aria-required',true); + jQuery('#jform_php_getform').addClass('required'); jform_vvvvvxlvwz_required = false; } } else { - jQuery('#jform_php_before_save-lbl').closest('.control-group').hide(); + jQuery('#jform_php_getform-lbl').closest('.control-group').hide(); if (!jform_vvvvvxlvwz_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'); + updateFieldRequired('php_getform',1); + jQuery('#jform_php_getform').removeAttr('required'); + jQuery('#jform_php_getform').removeAttr('aria-required'); + jQuery('#jform_php_getform').removeClass('required'); jform_vvvvvxlvwz_required = true; } } } // the vvvvvxm function -function vvvvvxm(add_php_save_vvvvvxm) +function vvvvvxm(add_php_before_save_vvvvvxm) { // set the function logic - if (add_php_save_vvvvvxm == 1) + if (add_php_before_save_vvvvvxm == 1) { - jQuery('#jform_php_save-lbl').closest('.control-group').show(); + jQuery('#jform_php_before_save-lbl').closest('.control-group').show(); if (jform_vvvvvxmvxa_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'); + 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_vvvvvxmvxa_required = false; } } else { - jQuery('#jform_php_save-lbl').closest('.control-group').hide(); + jQuery('#jform_php_before_save-lbl').closest('.control-group').hide(); if (!jform_vvvvvxmvxa_required) { - updateFieldRequired('php_save',1); - jQuery('#jform_php_save').removeAttr('required'); - jQuery('#jform_php_save').removeAttr('aria-required'); - jQuery('#jform_php_save').removeClass('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_vvvvvxmvxa_required = true; } } } // the vvvvvxn function -function vvvvvxn(add_php_postsavehook_vvvvvxn) +function vvvvvxn(add_php_save_vvvvvxn) { // set the function logic - if (add_php_postsavehook_vvvvvxn == 1) + if (add_php_save_vvvvvxn == 1) { - jQuery('#jform_php_postsavehook-lbl').closest('.control-group').show(); + jQuery('#jform_php_save-lbl').closest('.control-group').show(); if (jform_vvvvvxnvxb_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'); + 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_vvvvvxnvxb_required = false; } } else { - jQuery('#jform_php_postsavehook-lbl').closest('.control-group').hide(); + jQuery('#jform_php_save-lbl').closest('.control-group').hide(); if (!jform_vvvvvxnvxb_required) { - updateFieldRequired('php_postsavehook',1); - jQuery('#jform_php_postsavehook').removeAttr('required'); - jQuery('#jform_php_postsavehook').removeAttr('aria-required'); - jQuery('#jform_php_postsavehook').removeClass('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_vvvvvxnvxb_required = true; } } } // the vvvvvxo function -function vvvvvxo(add_php_allowedit_vvvvvxo) +function vvvvvxo(add_php_postsavehook_vvvvvxo) { // set the function logic - if (add_php_allowedit_vvvvvxo == 1) + if (add_php_postsavehook_vvvvvxo == 1) { - jQuery('#jform_php_allowedit-lbl').closest('.control-group').show(); + jQuery('#jform_php_postsavehook-lbl').closest('.control-group').show(); if (jform_vvvvvxovxc_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'); + 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_vvvvvxovxc_required = false; } } else { - jQuery('#jform_php_allowedit-lbl').closest('.control-group').hide(); + jQuery('#jform_php_postsavehook-lbl').closest('.control-group').hide(); if (!jform_vvvvvxovxc_required) { - updateFieldRequired('php_allowedit',1); - jQuery('#jform_php_allowedit').removeAttr('required'); - jQuery('#jform_php_allowedit').removeAttr('aria-required'); - jQuery('#jform_php_allowedit').removeClass('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_vvvvvxovxc_required = true; } } } // the vvvvvxp function -function vvvvvxp(add_php_batchcopy_vvvvvxp) +function vvvvvxp(add_php_allowedit_vvvvvxp) { // set the function logic - if (add_php_batchcopy_vvvvvxp == 1) + if (add_php_allowedit_vvvvvxp == 1) { - jQuery('#jform_php_batchcopy-lbl').closest('.control-group').show(); + jQuery('#jform_php_allowedit-lbl').closest('.control-group').show(); if (jform_vvvvvxpvxd_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'); + 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_vvvvvxpvxd_required = false; } } else { - jQuery('#jform_php_batchcopy-lbl').closest('.control-group').hide(); + jQuery('#jform_php_allowedit-lbl').closest('.control-group').hide(); if (!jform_vvvvvxpvxd_required) { - updateFieldRequired('php_batchcopy',1); - jQuery('#jform_php_batchcopy').removeAttr('required'); - jQuery('#jform_php_batchcopy').removeAttr('aria-required'); - jQuery('#jform_php_batchcopy').removeClass('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_vvvvvxpvxd_required = true; } } } // the vvvvvxq function -function vvvvvxq(add_php_batchmove_vvvvvxq) +function vvvvvxq(add_php_batchcopy_vvvvvxq) { // set the function logic - if (add_php_batchmove_vvvvvxq == 1) + if (add_php_batchcopy_vvvvvxq == 1) { - jQuery('#jform_php_batchmove-lbl').closest('.control-group').show(); + jQuery('#jform_php_batchcopy-lbl').closest('.control-group').show(); if (jform_vvvvvxqvxe_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'); + 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_vvvvvxqvxe_required = false; } } else { - jQuery('#jform_php_batchmove-lbl').closest('.control-group').hide(); + jQuery('#jform_php_batchcopy-lbl').closest('.control-group').hide(); if (!jform_vvvvvxqvxe_required) { - updateFieldRequired('php_batchmove',1); - jQuery('#jform_php_batchmove').removeAttr('required'); - jQuery('#jform_php_batchmove').removeAttr('aria-required'); - jQuery('#jform_php_batchmove').removeClass('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_vvvvvxqvxe_required = true; } } } // the vvvvvxr function -function vvvvvxr(add_php_before_publish_vvvvvxr) +function vvvvvxr(add_php_batchmove_vvvvvxr) { // set the function logic - if (add_php_before_publish_vvvvvxr == 1) + if (add_php_batchmove_vvvvvxr == 1) { - jQuery('#jform_php_before_publish-lbl').closest('.control-group').show(); + jQuery('#jform_php_batchmove-lbl').closest('.control-group').show(); if (jform_vvvvvxrvxf_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'); + 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_vvvvvxrvxf_required = false; } } else { - jQuery('#jform_php_before_publish-lbl').closest('.control-group').hide(); + jQuery('#jform_php_batchmove-lbl').closest('.control-group').hide(); if (!jform_vvvvvxrvxf_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'); + updateFieldRequired('php_batchmove',1); + jQuery('#jform_php_batchmove').removeAttr('required'); + jQuery('#jform_php_batchmove').removeAttr('aria-required'); + jQuery('#jform_php_batchmove').removeClass('required'); jform_vvvvvxrvxf_required = true; } } } // the vvvvvxs function -function vvvvvxs(add_php_after_publish_vvvvvxs) +function vvvvvxs(add_php_before_publish_vvvvvxs) { // set the function logic - if (add_php_after_publish_vvvvvxs == 1) + if (add_php_before_publish_vvvvvxs == 1) { - jQuery('#jform_php_after_publish-lbl').closest('.control-group').show(); + jQuery('#jform_php_before_publish-lbl').closest('.control-group').show(); if (jform_vvvvvxsvxg_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'); + 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_vvvvvxsvxg_required = false; } } else { - jQuery('#jform_php_after_publish-lbl').closest('.control-group').hide(); + jQuery('#jform_php_before_publish-lbl').closest('.control-group').hide(); if (!jform_vvvvvxsvxg_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'); + 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_vvvvvxsvxg_required = true; } } } // the vvvvvxt function -function vvvvvxt(add_php_before_delete_vvvvvxt) +function vvvvvxt(add_php_after_publish_vvvvvxt) { // set the function logic - if (add_php_before_delete_vvvvvxt == 1) + if (add_php_after_publish_vvvvvxt == 1) { - jQuery('#jform_php_before_delete-lbl').closest('.control-group').show(); + jQuery('#jform_php_after_publish-lbl').closest('.control-group').show(); if (jform_vvvvvxtvxh_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'); + 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_vvvvvxtvxh_required = false; } } else { - jQuery('#jform_php_before_delete-lbl').closest('.control-group').hide(); + jQuery('#jform_php_after_publish-lbl').closest('.control-group').hide(); if (!jform_vvvvvxtvxh_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'); + 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_vvvvvxtvxh_required = true; } } } // the vvvvvxu function -function vvvvvxu(add_php_after_delete_vvvvvxu) +function vvvvvxu(add_php_before_delete_vvvvvxu) { // set the function logic - if (add_php_after_delete_vvvvvxu == 1) + if (add_php_before_delete_vvvvvxu == 1) { - jQuery('#jform_php_after_delete-lbl').closest('.control-group').show(); + jQuery('#jform_php_before_delete-lbl').closest('.control-group').show(); if (jform_vvvvvxuvxi_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'); + 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_vvvvvxuvxi_required = false; } } else { - jQuery('#jform_php_after_delete-lbl').closest('.control-group').hide(); + jQuery('#jform_php_before_delete-lbl').closest('.control-group').hide(); if (!jform_vvvvvxuvxi_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'); + 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_vvvvvxuvxi_required = true; } } } // the vvvvvxv function -function vvvvvxv(add_php_document_vvvvvxv) +function vvvvvxv(add_php_after_delete_vvvvvxv) { // set the function logic - if (add_php_document_vvvvvxv == 1) + if (add_php_after_delete_vvvvvxv == 1) { - jQuery('#jform_php_document-lbl').closest('.control-group').show(); + jQuery('#jform_php_after_delete-lbl').closest('.control-group').show(); if (jform_vvvvvxvvxj_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'); + 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_vvvvvxvvxj_required = false; } } else { - jQuery('#jform_php_document-lbl').closest('.control-group').hide(); + jQuery('#jform_php_after_delete-lbl').closest('.control-group').hide(); if (!jform_vvvvvxvvxj_required) { - updateFieldRequired('php_document',1); - jQuery('#jform_php_document').removeAttr('required'); - jQuery('#jform_php_document').removeAttr('aria-required'); - jQuery('#jform_php_document').removeClass('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_vvvvvxvvxj_required = true; } } } // the vvvvvxw function -function vvvvvxw(add_sql_vvvvvxw) +function vvvvvxw(add_php_document_vvvvvxw) { // set the function logic - if (add_sql_vvvvvxw == 1) + if (add_php_document_vvvvvxw == 1) { - jQuery('#jform_source').closest('.control-group').show(); + jQuery('#jform_php_document-lbl').closest('.control-group').show(); if (jform_vvvvvxwvxk_required) { - updateFieldRequired('source',0); - jQuery('#jform_source').prop('required','required'); - jQuery('#jform_source').attr('aria-required',true); - jQuery('#jform_source').addClass('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_vvvvvxwvxk_required = false; } } else { - jQuery('#jform_source').closest('.control-group').hide(); + jQuery('#jform_php_document-lbl').closest('.control-group').hide(); if (!jform_vvvvvxwvxk_required) { - updateFieldRequired('source',1); - jQuery('#jform_source').removeAttr('required'); - jQuery('#jform_source').removeAttr('aria-required'); - jQuery('#jform_source').removeClass('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_vvvvvxwvxk_required = true; } } } // the vvvvvxx function -function vvvvvxx(source_vvvvvxx,add_sql_vvvvvxx) +function vvvvvxx(add_sql_vvvvvxx) { // set the function logic - if (source_vvvvvxx == 2 && add_sql_vvvvvxx == 1) + if (add_sql_vvvvvxx == 1) { - jQuery('#jform_sql').closest('.control-group').show(); + jQuery('#jform_source').closest('.control-group').show(); if (jform_vvvvvxxvxl_required) { - updateFieldRequired('sql',0); - jQuery('#jform_sql').prop('required','required'); - jQuery('#jform_sql').attr('aria-required',true); - jQuery('#jform_sql').addClass('required'); + updateFieldRequired('source',0); + jQuery('#jform_source').prop('required','required'); + jQuery('#jform_source').attr('aria-required',true); + jQuery('#jform_source').addClass('required'); jform_vvvvvxxvxl_required = false; } } else { - jQuery('#jform_sql').closest('.control-group').hide(); + jQuery('#jform_source').closest('.control-group').hide(); if (!jform_vvvvvxxvxl_required) { - updateFieldRequired('sql',1); - jQuery('#jform_sql').removeAttr('required'); - jQuery('#jform_sql').removeAttr('aria-required'); - jQuery('#jform_sql').removeClass('required'); + updateFieldRequired('source',1); + jQuery('#jform_source').removeAttr('required'); + jQuery('#jform_source').removeAttr('aria-required'); + jQuery('#jform_source').removeClass('required'); jform_vvvvvxxvxl_required = true; } } } -// the vvvvvxz function -function vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz) +// the vvvvvxy function +function vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy) { // set the function logic - if (source_vvvvvxz == 1 && add_sql_vvvvvxz == 1) + if (source_vvvvvxy == 2 && add_sql_vvvvvxy == 1) + { + jQuery('#jform_sql').closest('.control-group').show(); + if (jform_vvvvvxyvxm_required) + { + updateFieldRequired('sql',0); + jQuery('#jform_sql').prop('required','required'); + jQuery('#jform_sql').attr('aria-required',true); + jQuery('#jform_sql').addClass('required'); + jform_vvvvvxyvxm_required = false; + } + + } + else + { + jQuery('#jform_sql').closest('.control-group').hide(); + if (!jform_vvvvvxyvxm_required) + { + updateFieldRequired('sql',1); + jQuery('#jform_sql').removeAttr('required'); + jQuery('#jform_sql').removeAttr('aria-required'); + jQuery('#jform_sql').removeClass('required'); + jform_vvvvvxyvxm_required = true; + } + } +} + +// the vvvvvya function +function vvvvvya(source_vvvvvya,add_sql_vvvvvya) +{ + // set the function logic + if (source_vvvvvya == 1 && add_sql_vvvvvya == 1) { jQuery('#jform_addtables-lbl').closest('.control-group').show(); } @@ -895,158 +930,158 @@ function vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz) } } -// the vvvvvyb function -function vvvvvyb(add_custom_import_vvvvvyb) +// the vvvvvyc function +function vvvvvyc(add_custom_import_vvvvvyc) { // set the function logic - if (add_custom_import_vvvvvyb == 1) + if (add_custom_import_vvvvvyc == 1) { jQuery('#jform_html_import_view').closest('.control-group').show(); - if (jform_vvvvvybvxm_required) + if (jform_vvvvvycvxn_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_vvvvvybvxm_required = false; + jform_vvvvvycvxn_required = false; } jQuery('.note_advanced_import').closest('.control-group').show(); jQuery('#jform_php_import_display').closest('.control-group').show(); - if (jform_vvvvvybvxn_required) + if (jform_vvvvvycvxo_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_vvvvvybvxn_required = false; + jform_vvvvvycvxo_required = false; } jQuery('#jform_php_import_ext').closest('.control-group').show(); - if (jform_vvvvvybvxo_required) + if (jform_vvvvvycvxp_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_vvvvvybvxo_required = false; + jform_vvvvvycvxp_required = false; } jQuery('#jform_php_import_headers').closest('.control-group').show(); - if (jform_vvvvvybvxp_required) + if (jform_vvvvvycvxq_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_vvvvvybvxp_required = false; + jform_vvvvvycvxq_required = false; } jQuery('#jform_php_import').closest('.control-group').show(); - if (jform_vvvvvybvxq_required) + if (jform_vvvvvycvxr_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_vvvvvybvxq_required = false; + jform_vvvvvycvxr_required = false; } jQuery('#jform_php_import_save').closest('.control-group').show(); - if (jform_vvvvvybvxr_required) + if (jform_vvvvvycvxs_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_vvvvvybvxr_required = false; + jform_vvvvvycvxs_required = false; } jQuery('#jform_php_import_setdata').closest('.control-group').show(); - if (jform_vvvvvybvxs_required) + if (jform_vvvvvycvxt_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_vvvvvybvxs_required = false; + jform_vvvvvycvxt_required = false; } } else { jQuery('#jform_html_import_view').closest('.control-group').hide(); - if (!jform_vvvvvybvxm_required) + if (!jform_vvvvvycvxn_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_vvvvvybvxm_required = true; + jform_vvvvvycvxn_required = true; } jQuery('.note_advanced_import').closest('.control-group').hide(); jQuery('#jform_php_import_display').closest('.control-group').hide(); - if (!jform_vvvvvybvxn_required) + if (!jform_vvvvvycvxo_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_vvvvvybvxn_required = true; + jform_vvvvvycvxo_required = true; } jQuery('#jform_php_import_ext').closest('.control-group').hide(); - if (!jform_vvvvvybvxo_required) + if (!jform_vvvvvycvxp_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_vvvvvybvxo_required = true; + jform_vvvvvycvxp_required = true; } jQuery('#jform_php_import_headers').closest('.control-group').hide(); - if (!jform_vvvvvybvxp_required) + if (!jform_vvvvvycvxq_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_vvvvvybvxp_required = true; + jform_vvvvvycvxq_required = true; } jQuery('#jform_php_import').closest('.control-group').hide(); - if (!jform_vvvvvybvxq_required) + if (!jform_vvvvvycvxr_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_vvvvvybvxq_required = true; + jform_vvvvvycvxr_required = true; } jQuery('#jform_php_import_save').closest('.control-group').hide(); - if (!jform_vvvvvybvxr_required) + if (!jform_vvvvvycvxs_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_vvvvvybvxr_required = true; + jform_vvvvvycvxs_required = true; } jQuery('#jform_php_import_setdata').closest('.control-group').hide(); - if (!jform_vvvvvybvxs_required) + if (!jform_vvvvvycvxt_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_vvvvvybvxs_required = true; + jform_vvvvvycvxt_required = true; } } } -// the vvvvvyc function -function vvvvvyc(add_custom_import_vvvvvyc) +// the vvvvvyd function +function vvvvvyd(add_custom_import_vvvvvyd) { // set the function logic - if (add_custom_import_vvvvvyc == 0) + if (add_custom_import_vvvvvyd == 0) { jQuery('.note_beginner_import').closest('.control-group').show(); } @@ -1056,51 +1091,51 @@ function vvvvvyc(add_custom_import_vvvvvyc) } } -// the vvvvvyd function -function vvvvvyd(add_custom_button_vvvvvyd) +// the vvvvvye function +function vvvvvye(add_custom_button_vvvvvye) { // set the function logic - if (add_custom_button_vvvvvyd == 1) + if (add_custom_button_vvvvvye == 1) { jQuery('#jform_custom_button-lbl').closest('.control-group').show(); jQuery('#jform_php_controller-lbl').closest('.control-group').show(); - if (jform_vvvvvydvxt_required) + if (jform_vvvvvyevxu_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_vvvvvydvxt_required = false; + jform_vvvvvyevxu_required = false; } jQuery('#jform_php_controller_list-lbl').closest('.control-group').show(); - if (jform_vvvvvydvxu_required) + if (jform_vvvvvyevxv_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_vvvvvydvxu_required = false; + jform_vvvvvyevxv_required = false; } jQuery('#jform_php_model-lbl').closest('.control-group').show(); - if (jform_vvvvvydvxv_required) + if (jform_vvvvvyevxw_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_vvvvvydvxv_required = false; + jform_vvvvvyevxw_required = false; } jQuery('#jform_php_model_list-lbl').closest('.control-group').show(); - if (jform_vvvvvydvxw_required) + if (jform_vvvvvyevxx_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_vvvvvydvxw_required = false; + jform_vvvvvyevxx_required = false; } } @@ -1108,40 +1143,40 @@ function vvvvvyd(add_custom_button_vvvvvyd) { jQuery('#jform_custom_button-lbl').closest('.control-group').hide(); jQuery('#jform_php_controller-lbl').closest('.control-group').hide(); - if (!jform_vvvvvydvxt_required) + if (!jform_vvvvvyevxu_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_vvvvvydvxt_required = true; + jform_vvvvvyevxu_required = true; } jQuery('#jform_php_controller_list-lbl').closest('.control-group').hide(); - if (!jform_vvvvvydvxu_required) + if (!jform_vvvvvyevxv_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_vvvvvydvxu_required = true; + jform_vvvvvyevxv_required = true; } jQuery('#jform_php_model-lbl').closest('.control-group').hide(); - if (!jform_vvvvvydvxv_required) + if (!jform_vvvvvyevxw_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_vvvvvydvxv_required = true; + jform_vvvvvyevxw_required = true; } jQuery('#jform_php_model_list-lbl').closest('.control-group').hide(); - if (!jform_vvvvvydvxw_required) + if (!jform_vvvvvyevxx_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_vvvvvydvxw_required = true; + jform_vvvvvyevxx_required = true; } } } diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index 28b416b74..271ab8760 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -144,11 +144,11 @@ message="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_MESSAGE" hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT" /> - + @@ -158,11 +158,11 @@ - + @@ -172,11 +172,11 @@ - + @@ -186,11 +186,11 @@ - + @@ -208,32 +208,53 @@ description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_DESCRIPTION" directory="" /> - + - + - - - + type="subform" + name="addtables" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_LABEL" + layout="joomla.form.field.subform.repeatable-table" + multiple="true" + icon="list"> +