From 2af4b8cf50234c20a8d5fd4fc0a7572dca342b17 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Mon, 8 Jul 2019 18:05:54 +0200 Subject: [PATCH] Removed required from all code/editor field to improve the behavior of the codemirror editor. Improved the token validation via Ajax. --- README.md | 4 +- admin/README.txt | 4 +- admin/assets/images/icons/servers.png | Bin 12108 -> 13981 bytes admin/assets/js/get_snippets.js | 16 +- .../joomla_3/JControllerLegacyAjax.php | 2 +- .../joomla_3/JControllerLegacyAjaxSite.php | 2 +- admin/controllers/ajax.json.php | 2 +- admin/helpers/componentbuilder.php | 59 ++ admin/layouts/fieldtype/fields_fullwidth.php | 2 +- .../server/linked_components_fullwidth.php | 2 +- admin/models/custom_admin_view.php | 36 - admin/models/fieldtype.php | 12 +- admin/models/forms/admin_fields_conditions.js | 5 +- admin/models/forms/admin_fields_relations.js | 8 +- admin/models/forms/admin_view.js | 688 ++---------------- admin/models/forms/admin_view.xml | 30 - admin/models/forms/component_dashboard.js | 4 +- admin/models/forms/custom_admin_view.js | 264 +------ admin/models/forms/custom_admin_view.xml | 12 - admin/models/forms/custom_code.js | 44 +- admin/models/forms/custom_code.xml | 1 - admin/models/forms/dynamic_get.js | 283 ++----- admin/models/forms/dynamic_get.xml | 7 - admin/models/forms/field.js | 138 +--- admin/models/forms/field.xml | 4 - admin/models/forms/fieldtype.js | 74 +- admin/models/forms/help_document.js | 69 +- admin/models/forms/help_document.xml | 1 - admin/models/forms/joomla_component.js | 362 ++------- admin/models/forms/joomla_component.xml | 14 - admin/models/forms/language_translation.js | 2 +- admin/models/forms/layout.js | 66 +- admin/models/forms/layout.xml | 2 - admin/models/forms/library.js | 40 +- admin/models/forms/placeholder.js | 1 - admin/models/forms/server.js | 90 +-- admin/models/forms/site_view.js | 264 +------ admin/models/forms/site_view.xml | 12 - admin/models/forms/template.js | 70 +- admin/models/forms/template.xml | 2 - admin/models/forms/validation_rule.js | 12 +- admin/models/layout.php | 36 - admin/models/server.php | 18 +- admin/models/site_view.php | 36 - admin/models/template.php | 36 - .../admin_fields_conditions/tmpl/edit.php | 19 +- .../admin_fields_relations/tmpl/edit.php | 25 +- admin/views/compiler/tmpl/default.php | 29 +- admin/views/compiler/view.html.php | 4 +- admin/views/component_dashboard/tmpl/edit.php | 25 +- admin/views/custom_admin_view/tmpl/edit.php | 19 +- admin/views/custom_code/tmpl/edit.php | 19 +- admin/views/dynamic_get/tmpl/edit.php | 21 +- admin/views/fieldtype/tmpl/edit.php | 19 + admin/views/fieldtype/view.html.php | 2 +- admin/views/get_snippets/tmpl/default.php | 19 +- admin/views/languages/tmpl/default.php | 2 +- admin/views/layout/tmpl/edit.php | 81 ++- admin/views/library/tmpl/edit.php | 2 +- admin/views/placeholder/tmpl/edit.php | 19 +- admin/views/server/view.html.php | 2 +- admin/views/site_view/tmpl/edit.php | 19 +- admin/views/template/tmpl/edit.php | 19 +- admin/views/validation_rule/tmpl/edit.php | 21 +- componentbuilder.xml | 2 +- site/helpers/componentbuilder.php | 59 ++ 66 files changed, 870 insertions(+), 2393 deletions(-) diff --git a/README.md b/README.md index d62f0765e..b2a86bc53 100644 --- a/README.md +++ b/README.md @@ -146,11 +146,11 @@ TODO + *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*: 6th July, 2019 ++ *Last Build*: 8th July, 2019 + *Version*: 2.9.21 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **211603** ++ *Line count*: **210080** + *Field count*: **1143** + *File count*: **1346** + *Folder count*: **209** diff --git a/admin/README.txt b/admin/README.txt index d62f0765e..b2a86bc53 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -146,11 +146,11 @@ TODO + *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*: 6th July, 2019 ++ *Last Build*: 8th July, 2019 + *Version*: 2.9.21 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **211603** ++ *Line count*: **210080** + *Field count*: **1143** + *File count*: **1346** + *Folder count*: **209** diff --git a/admin/assets/images/icons/servers.png b/admin/assets/images/icons/servers.png index db130da40d8acd9696cf3b0db77a2f7ee3562998..6baf509e0ed6df31d3ead9812d41ed6a7dd69452 100644 GIT binary patch literal 13981 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 literal 12108 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 0 && path.length > 0 && status.length > 0) { - var request = 'token='+token+'&path='+path+'&status='+status; + var request = token+'=1&path='+path+'&status='+status; } return jQuery.ajax({ type: 'POST', url: getUrl, - dataType: 'jsonp', + dataType: 'json', data: request, - jsonp: 'callback' + jsonp: false }); } @@ -423,16 +423,16 @@ function setSnippetGithub(key, status) { function setSnippetGithub_server(path, status) { // set the ajax scope ajaxcall = null; - var getUrl = "index.php?option=com_componentbuilder&task=ajax.setSnippetGithub&format=json"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.setSnippetGithub&format=json&raw=true"); if (token.length > 0 && path.length > 0 && status.length > 0) { - var request = 'token='+token+'&path='+path+'&status='+status; + var request = token+'=1&path='+path+'&status='+status; } return jQuery.ajax({ type: 'POST', url: getUrl, - dataType: 'jsonp', + dataType: 'json', data: request, - jsonp: 'callback' + jsonp: false }); } diff --git a/admin/compiler/joomla_3/JControllerLegacyAjax.php b/admin/compiler/joomla_3/JControllerLegacyAjax.php index d865c8162..ba88f128e 100644 --- a/admin/compiler/joomla_3/JControllerLegacyAjax.php +++ b/admin/compiler/joomla_3/JControllerLegacyAjax.php @@ -39,7 +39,7 @@ class ###Component###ControllerAjax extends JControllerLegacy // Check Token! $token = JSession::getFormToken(); $call_token = $jinput->get('token', 0, 'ALNUM'); - if($token == $call_token) + if($jinput->get($token, 0, 'ALNUM') || $token === $call_token) { $task = $this->getTask(); switch($task) diff --git a/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php b/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php index 0c483a598..fb10fd0fe 100644 --- a/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php +++ b/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php @@ -39,7 +39,7 @@ class ###Component###ControllerAjax extends JControllerLegacy // Check Token! $token = JSession::getFormToken(); $call_token = $jinput->get('token', 0, 'ALNUM'); - if($token == $call_token) + if($jinput->get($token, 0, 'ALNUM') || $token === $call_token) { $task = $this->getTask(); switch($task) diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 8bcc6b72d..53ff59742 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -67,7 +67,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy // Check Token! $token = JSession::getFormToken(); $call_token = $jinput->get('token', 0, 'ALNUM'); - if($token == $call_token) + if($jinput->get($token, 0, 'ALNUM') || $token === $call_token) { $task = $this->getTask(); switch($task) diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 67182ca26..d3dfb9d3e 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -124,6 +124,65 @@ abstract class ComponentbuilderHelper 'JPATH_THEMES' => JPATH_THEMES ); + /** + * get the method code + * + * @input int The method ID + * + * @returns string on success + **/ + public static function getMethodCode($id) + { + // Get a db connection. + $db = JFactory::getDbo(); + // Create a new query object. + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.comment','a.name','a.visibility','a.params','a.code'))); + $query->from($db->quoteName('#__componentbuilder_method','a')); + $query->where($db->quoteName('a.id') . ' = ' . (int) $id); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $columns = $db->getTableColumns('#__componentbuilder_method'); + if(isset($columns['access'])) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + } + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + // get the method + $method = $db->loadObject; + // combine method values + $combinded = array(); + // add comment if set + if (self::checkString($method->comment)) + { + $combinded[] = $method->comment; + } + // set the method sginature + $combinded[] = "\t" . $method->visibility . ' function ' . $method->name . '(' . $method->params . ')'; + // set the method code + $combinded[] = "\t" . "{"; + // add comment if set + if (self::checkString($method->code)) + { + $combinded[] = $method->code; + } + else + { + $combinded[] = "\t\t// add your code here"; + } + $combinded[] = "\t" . "}"; + // return the method + return implode(PHP_EOL, $combinded); + } + return false; + } + /** * Making class or function name safe * diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 87f383cbc..4968f6ab3 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -13,7 +13,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->warfields; +$items = $displayData->vxqfields; $user = JFactory::getUser(); $id = $displayData->item->id; // set the edit URL diff --git a/admin/layouts/server/linked_components_fullwidth.php b/admin/layouts/server/linked_components_fullwidth.php index 859a76e18..70894c881 100644 --- a/admin/layouts/server/linked_components_fullwidth.php +++ b/admin/layouts/server/linked_components_fullwidth.php @@ -13,7 +13,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->wbblinked_components; +$items = $displayData->vyalinked_components; $user = JFactory::getUser(); $id = $displayData->item->id; // set the edit URL diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index f7cbca17b..f73f7132c 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -604,42 +604,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin return $data; } - /** - * Method to validate the form data. - * - * @param JForm $form The form to validate against. - * @param array $data The data to validate. - * @param string $group The name of the field group to validate. - * - * @return mixed Array of filtered data if valid, false otherwise. - * - * @see JFormRule - * @see JFilterInput - * @since 12.2 - */ - public function validate($form, $data, $group = null) - { - // check if the not_required field is set - if (ComponentbuilderHelper::checkString($data['not_required'])) - { - $requiredFields = (array) explode(',',(string) $data['not_required']); - $requiredFields = array_unique($requiredFields); - // now change the required field attributes value - foreach ($requiredFields as $requiredField) - { - // make sure there is a string value - if (ComponentbuilderHelper::checkString($requiredField)) - { - // change to false - $form->setFieldAttribute($requiredField, 'required', 'false'); - // also clear the data set - $data[$requiredField] = ''; - } - } - } - return parent::validate($form, $data, $group); - } - /** * Method to get the unique fields of this table. * diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index 8e12d7c13..1c4f8c295 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -203,7 +203,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getWarfields() + public function getVxqfields() { // Get the user object. $user = JFactory::getUser(); @@ -285,13 +285,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationWarfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVxqfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationWarfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVxqfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationWarfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVxqfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationWarfields($item->store, 'store'); + $item->store = $this->selectionTranslationVxqfields($item->store, 'store'); } } @@ -305,7 +305,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationWarfields($value,$name) + public function selectionTranslationVxqfields($value,$name) { // Array of datatype language strings if ($name === 'datatype') diff --git a/admin/models/forms/admin_fields_conditions.js b/admin/models/forms/admin_fields_conditions.js index 4c71df68c..a14c15d39 100644 --- a/admin/models/forms/admin_fields_conditions.js +++ b/admin/models/forms/admin_fields_conditions.js @@ -12,9 +12,9 @@ function getFieldSelectOptions_server(fieldId){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldSelectOptions&format=json"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.fieldSelectOptions&format=json"); if(token.length > 0 && fieldId > 0){ - var request = 'token='+token+'&id='+fieldId; + var request = token+'=1&id='+fieldId; } return jQuery.ajax({ type: 'GET', @@ -24,7 +24,6 @@ function getFieldSelectOptions_server(fieldId){ jsonp: 'callback' }); } - function getFieldSelectOptions(fieldKey){ // first check if the field is set if(jQuery("#jform_addconditions__addconditions"+fieldKey+"__match_field").length) { diff --git a/admin/models/forms/admin_fields_relations.js b/admin/models/forms/admin_fields_relations.js index dd027678a..2876e864a 100644 --- a/admin/models/forms/admin_fields_relations.js +++ b/admin/models/forms/admin_fields_relations.js @@ -47,13 +47,13 @@ function getCodeGlueOptions(field) { } function getCodeGlueOptions_server(listfield, joinfields, type, area){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getCodeGlueOptions&format=json"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getCodeGlueOptions&format=json"); // make sure the joinfields are set if (!_isSet(joinfields)) { joinfields = 'none'; } if(token.length > 0 && listfield > 0 && type > 0 && area > 0) { - var request = 'token='+token+'&listfield='+listfield+'&type='+type+'&area='+area+'&joinfields='+joinfields; + var request = token+'=1&listfield='+listfield+'&type='+type+'&area='+area+'&joinfields='+joinfields; } return jQuery.ajax({ type: 'GET', @@ -74,9 +74,9 @@ function _isSet(val) } function getEditCustomCodeButtons_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id+'&return_here='+return_here; + var request = token+'=1&id='+id+'&return_here='+return_here; } return jQuery.ajax({ type: 'GET', diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index a6c59cb6e..d4c61abbc 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,45 +9,15 @@ */ // Some Global Values -jform_vvvvvxbvwr_required = false; -jform_vvvvvxcvws_required = false; -jform_vvvvvxdvwt_required = false; -jform_vvvvvxevwu_required = false; -jform_vvvvvxfvwv_required = false; -jform_vvvvvxgvww_required = false; -jform_vvvvvxhvwx_required = false; -jform_vvvvvxivwy_required = false; -jform_vvvvvxjvwz_required = false; -jform_vvvvvxkvxa_required = false; -jform_vvvvvxlvxb_required = false; -jform_vvvvvxmvxc_required = false; -jform_vvvvvxnvxd_required = false; -jform_vvvvvxovxe_required = false; -jform_vvvvvxpvxf_required = false; -jform_vvvvvxqvxg_required = false; -jform_vvvvvxrvxh_required = false; -jform_vvvvvxsvxi_required = false; -jform_vvvvvxtvxj_required = false; -jform_vvvvvxuvxk_required = false; -jform_vvvvvxvvxl_required = false; -jform_vvvvvxwvxm_required = false; -jform_vvvvvxxvxn_required = false; -jform_vvvvvxyvxo_required = false; -jform_vvvvvxzvxp_required = false; -jform_vvvvvyavxq_required = false; -jform_vvvvvybvxr_required = false; -jform_vvvvvycvxs_required = false; -jform_vvvvvygvxt_required = false; -jform_vvvvvygvxu_required = false; -jform_vvvvvygvxv_required = false; -jform_vvvvvygvxw_required = false; -jform_vvvvvygvxx_required = false; -jform_vvvvvygvxy_required = false; -jform_vvvvvygvxz_required = false; -jform_vvvvvyivya_required = false; -jform_vvvvvyivyb_required = false; -jform_vvvvvyivyc_required = false; -jform_vvvvvyivyd_required = false; +jform_vvvvvybvwd_required = false; +jform_vvvvvycvwe_required = false; +jform_vvvvvygvwf_required = false; +jform_vvvvvygvwg_required = false; +jform_vvvvvygvwh_required = false; +jform_vvvvvygvwi_required = false; +jform_vvvvvygvwj_required = false; +jform_vvvvvygvwk_required = false; +jform_vvvvvygvwl_required = false; // Initial Script jQuery(document).ready(function() @@ -158,28 +128,10 @@ function vvvvvxb(add_css_view_vvvvvxb) if (add_css_view_vvvvvxb == 1) { jQuery('#jform_css_view-lbl').closest('.control-group').show(); - // add required attribute to css_view field - if (jform_vvvvvxbvwr_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_vvvvvxbvwr_required = false; - } } else { jQuery('#jform_css_view-lbl').closest('.control-group').hide(); - // remove required attribute from css_view field - if (!jform_vvvvvxbvwr_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_vvvvvxbvwr_required = true; - } } } @@ -190,28 +142,10 @@ function vvvvvxc(add_css_views_vvvvvxc) if (add_css_views_vvvvvxc == 1) { jQuery('#jform_css_views-lbl').closest('.control-group').show(); - // add required attribute to css_views field - if (jform_vvvvvxcvws_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_vvvvvxcvws_required = false; - } } else { jQuery('#jform_css_views-lbl').closest('.control-group').hide(); - // remove required attribute from css_views field - if (!jform_vvvvvxcvws_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_vvvvvxcvws_required = true; - } } } @@ -222,28 +156,10 @@ function vvvvvxd(add_javascript_view_file_vvvvvxd) if (add_javascript_view_file_vvvvvxd == 1) { jQuery('#jform_javascript_view_file-lbl').closest('.control-group').show(); - // add required attribute to javascript_view_file field - if (jform_vvvvvxdvwt_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_vvvvvxdvwt_required = false; - } } else { jQuery('#jform_javascript_view_file-lbl').closest('.control-group').hide(); - // remove required attribute from javascript_view_file field - if (!jform_vvvvvxdvwt_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_vvvvvxdvwt_required = true; - } } } @@ -254,28 +170,10 @@ function vvvvvxe(add_javascript_views_file_vvvvvxe) if (add_javascript_views_file_vvvvvxe == 1) { jQuery('#jform_javascript_views_file-lbl').closest('.control-group').show(); - // add required attribute to javascript_views_file field - if (jform_vvvvvxevwu_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_vvvvvxevwu_required = false; - } } else { jQuery('#jform_javascript_views_file-lbl').closest('.control-group').hide(); - // remove required attribute from javascript_views_file field - if (!jform_vvvvvxevwu_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_vvvvvxevwu_required = true; - } } } @@ -286,28 +184,10 @@ function vvvvvxf(add_javascript_view_footer_vvvvvxf) if (add_javascript_view_footer_vvvvvxf == 1) { jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show(); - // add required attribute to javascript_view_footer field - if (jform_vvvvvxfvwv_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_vvvvvxfvwv_required = false; - } } else { jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').hide(); - // remove required attribute from javascript_view_footer field - if (!jform_vvvvvxfvwv_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_vvvvvxfvwv_required = true; - } } } @@ -318,28 +198,10 @@ function vvvvvxg(add_javascript_views_footer_vvvvvxg) if (add_javascript_views_footer_vvvvvxg == 1) { jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show(); - // add required attribute to javascript_views_footer field - if (jform_vvvvvxgvww_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_vvvvvxgvww_required = false; - } } else { jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').hide(); - // remove required attribute from javascript_views_footer field - if (!jform_vvvvvxgvww_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_vvvvvxgvww_required = true; - } } } @@ -351,29 +213,11 @@ function vvvvvxh(add_php_ajax_vvvvvxh) { jQuery('#jform_ajax_input-lbl').closest('.control-group').show(); jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show(); - // add required attribute to php_ajaxmethod field - if (jform_vvvvvxhvwx_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_vvvvvxhvwx_required = false; - } } else { jQuery('#jform_ajax_input-lbl').closest('.control-group').hide(); jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide(); - // remove required attribute from php_ajaxmethod field - if (!jform_vvvvvxhvwx_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_vvvvvxhvwx_required = true; - } } } @@ -384,28 +228,10 @@ function vvvvvxi(add_php_getitem_vvvvvxi) if (add_php_getitem_vvvvvxi == 1) { jQuery('#jform_php_getitem-lbl').closest('.control-group').show(); - // add required attribute to php_getitem field - if (jform_vvvvvxivwy_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_vvvvvxivwy_required = false; - } } else { jQuery('#jform_php_getitem-lbl').closest('.control-group').hide(); - // remove required attribute from php_getitem field - if (!jform_vvvvvxivwy_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_vvvvvxivwy_required = true; - } } } @@ -416,28 +242,10 @@ function vvvvvxj(add_php_getitems_vvvvvxj) if (add_php_getitems_vvvvvxj == 1) { jQuery('#jform_php_getitems-lbl').closest('.control-group').show(); - // add required attribute to php_getitems field - if (jform_vvvvvxjvwz_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_vvvvvxjvwz_required = false; - } } else { jQuery('#jform_php_getitems-lbl').closest('.control-group').hide(); - // remove required attribute from php_getitems field - if (!jform_vvvvvxjvwz_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_vvvvvxjvwz_required = true; - } } } @@ -448,28 +256,10 @@ function vvvvvxk(add_php_getitems_after_all_vvvvvxk) if (add_php_getitems_after_all_vvvvvxk == 1) { jQuery('#jform_php_getitems_after_all-lbl').closest('.control-group').show(); - // add required attribute to php_getitems_after_all field - if (jform_vvvvvxkvxa_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_vvvvvxkvxa_required = false; - } } else { jQuery('#jform_php_getitems_after_all-lbl').closest('.control-group').hide(); - // remove required attribute from php_getitems_after_all field - if (!jform_vvvvvxkvxa_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_vvvvvxkvxa_required = true; - } } } @@ -480,28 +270,10 @@ function vvvvvxl(add_php_getlistquery_vvvvvxl) if (add_php_getlistquery_vvvvvxl == 1) { jQuery('#jform_php_getlistquery-lbl').closest('.control-group').show(); - // add required attribute to php_getlistquery field - if (jform_vvvvvxlvxb_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_vvvvvxlvxb_required = false; - } } else { jQuery('#jform_php_getlistquery-lbl').closest('.control-group').hide(); - // remove required attribute from php_getlistquery field - if (!jform_vvvvvxlvxb_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_vvvvvxlvxb_required = true; - } } } @@ -512,28 +284,10 @@ function vvvvvxm(add_php_getform_vvvvvxm) if (add_php_getform_vvvvvxm == 1) { jQuery('#jform_php_getform-lbl').closest('.control-group').show(); - // add required attribute to php_getform field - if (jform_vvvvvxmvxc_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_vvvvvxmvxc_required = false; - } } else { jQuery('#jform_php_getform-lbl').closest('.control-group').hide(); - // remove required attribute from php_getform field - if (!jform_vvvvvxmvxc_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_vvvvvxmvxc_required = true; - } } } @@ -544,28 +298,10 @@ function vvvvvxn(add_php_before_save_vvvvvxn) if (add_php_before_save_vvvvvxn == 1) { jQuery('#jform_php_before_save-lbl').closest('.control-group').show(); - // add required attribute to php_before_save field - if (jform_vvvvvxnvxd_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_vvvvvxnvxd_required = false; - } } else { jQuery('#jform_php_before_save-lbl').closest('.control-group').hide(); - // remove required attribute from php_before_save field - if (!jform_vvvvvxnvxd_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_vvvvvxnvxd_required = true; - } } } @@ -576,28 +312,10 @@ function vvvvvxo(add_php_save_vvvvvxo) if (add_php_save_vvvvvxo == 1) { jQuery('#jform_php_save-lbl').closest('.control-group').show(); - // add required attribute to php_save field - if (jform_vvvvvxovxe_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_vvvvvxovxe_required = false; - } } else { jQuery('#jform_php_save-lbl').closest('.control-group').hide(); - // remove required attribute from php_save field - if (!jform_vvvvvxovxe_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_vvvvvxovxe_required = true; - } } } @@ -608,28 +326,10 @@ function vvvvvxp(add_php_postsavehook_vvvvvxp) if (add_php_postsavehook_vvvvvxp == 1) { jQuery('#jform_php_postsavehook-lbl').closest('.control-group').show(); - // add required attribute to php_postsavehook field - if (jform_vvvvvxpvxf_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_vvvvvxpvxf_required = false; - } } else { jQuery('#jform_php_postsavehook-lbl').closest('.control-group').hide(); - // remove required attribute from php_postsavehook field - if (!jform_vvvvvxpvxf_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_vvvvvxpvxf_required = true; - } } } @@ -640,28 +340,10 @@ function vvvvvxq(add_php_allowadd_vvvvvxq) if (add_php_allowadd_vvvvvxq == 1) { jQuery('#jform_php_allowadd-lbl').closest('.control-group').show(); - // add required attribute to php_allowadd field - if (jform_vvvvvxqvxg_required) - { - updateFieldRequired('php_allowadd',0); - jQuery('#jform_php_allowadd').prop('required','required'); - jQuery('#jform_php_allowadd').attr('aria-required',true); - jQuery('#jform_php_allowadd').addClass('required'); - jform_vvvvvxqvxg_required = false; - } } else { jQuery('#jform_php_allowadd-lbl').closest('.control-group').hide(); - // remove required attribute from php_allowadd field - if (!jform_vvvvvxqvxg_required) - { - updateFieldRequired('php_allowadd',1); - jQuery('#jform_php_allowadd').removeAttr('required'); - jQuery('#jform_php_allowadd').removeAttr('aria-required'); - jQuery('#jform_php_allowadd').removeClass('required'); - jform_vvvvvxqvxg_required = true; - } } } @@ -672,28 +354,10 @@ function vvvvvxr(add_php_allowedit_vvvvvxr) if (add_php_allowedit_vvvvvxr == 1) { jQuery('#jform_php_allowedit-lbl').closest('.control-group').show(); - // add required attribute to php_allowedit field - if (jform_vvvvvxrvxh_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_vvvvvxrvxh_required = false; - } } else { jQuery('#jform_php_allowedit-lbl').closest('.control-group').hide(); - // remove required attribute from php_allowedit field - if (!jform_vvvvvxrvxh_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_vvvvvxrvxh_required = true; - } } } @@ -704,28 +368,10 @@ function vvvvvxs(add_php_before_cancel_vvvvvxs) if (add_php_before_cancel_vvvvvxs == 1) { jQuery('#jform_php_before_cancel-lbl').closest('.control-group').show(); - // add required attribute to php_before_cancel field - if (jform_vvvvvxsvxi_required) - { - updateFieldRequired('php_before_cancel',0); - jQuery('#jform_php_before_cancel').prop('required','required'); - jQuery('#jform_php_before_cancel').attr('aria-required',true); - jQuery('#jform_php_before_cancel').addClass('required'); - jform_vvvvvxsvxi_required = false; - } } else { jQuery('#jform_php_before_cancel-lbl').closest('.control-group').hide(); - // remove required attribute from php_before_cancel field - if (!jform_vvvvvxsvxi_required) - { - updateFieldRequired('php_before_cancel',1); - jQuery('#jform_php_before_cancel').removeAttr('required'); - jQuery('#jform_php_before_cancel').removeAttr('aria-required'); - jQuery('#jform_php_before_cancel').removeClass('required'); - jform_vvvvvxsvxi_required = true; - } } } @@ -736,28 +382,10 @@ function vvvvvxt(add_php_after_cancel_vvvvvxt) if (add_php_after_cancel_vvvvvxt == 1) { jQuery('#jform_php_after_cancel-lbl').closest('.control-group').show(); - // add required attribute to php_after_cancel field - if (jform_vvvvvxtvxj_required) - { - updateFieldRequired('php_after_cancel',0); - jQuery('#jform_php_after_cancel').prop('required','required'); - jQuery('#jform_php_after_cancel').attr('aria-required',true); - jQuery('#jform_php_after_cancel').addClass('required'); - jform_vvvvvxtvxj_required = false; - } } else { jQuery('#jform_php_after_cancel-lbl').closest('.control-group').hide(); - // remove required attribute from php_after_cancel field - if (!jform_vvvvvxtvxj_required) - { - updateFieldRequired('php_after_cancel',1); - jQuery('#jform_php_after_cancel').removeAttr('required'); - jQuery('#jform_php_after_cancel').removeAttr('aria-required'); - jQuery('#jform_php_after_cancel').removeClass('required'); - jform_vvvvvxtvxj_required = true; - } } } @@ -768,28 +396,10 @@ function vvvvvxu(add_php_batchcopy_vvvvvxu) if (add_php_batchcopy_vvvvvxu == 1) { jQuery('#jform_php_batchcopy-lbl').closest('.control-group').show(); - // add required attribute to php_batchcopy field - if (jform_vvvvvxuvxk_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_vvvvvxuvxk_required = false; - } } else { jQuery('#jform_php_batchcopy-lbl').closest('.control-group').hide(); - // remove required attribute from php_batchcopy field - if (!jform_vvvvvxuvxk_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_vvvvvxuvxk_required = true; - } } } @@ -800,28 +410,10 @@ function vvvvvxv(add_php_batchmove_vvvvvxv) if (add_php_batchmove_vvvvvxv == 1) { jQuery('#jform_php_batchmove-lbl').closest('.control-group').show(); - // add required attribute to php_batchmove field - if (jform_vvvvvxvvxl_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_vvvvvxvvxl_required = false; - } } else { jQuery('#jform_php_batchmove-lbl').closest('.control-group').hide(); - // remove required attribute from php_batchmove field - if (!jform_vvvvvxvvxl_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_vvvvvxvvxl_required = true; - } } } @@ -832,28 +424,10 @@ function vvvvvxw(add_php_before_publish_vvvvvxw) if (add_php_before_publish_vvvvvxw == 1) { jQuery('#jform_php_before_publish-lbl').closest('.control-group').show(); - // add required attribute to php_before_publish field - if (jform_vvvvvxwvxm_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_vvvvvxwvxm_required = false; - } } else { jQuery('#jform_php_before_publish-lbl').closest('.control-group').hide(); - // remove required attribute from php_before_publish field - if (!jform_vvvvvxwvxm_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_vvvvvxwvxm_required = true; - } } } @@ -864,28 +438,10 @@ function vvvvvxx(add_php_after_publish_vvvvvxx) if (add_php_after_publish_vvvvvxx == 1) { jQuery('#jform_php_after_publish-lbl').closest('.control-group').show(); - // add required attribute to php_after_publish field - if (jform_vvvvvxxvxn_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_vvvvvxxvxn_required = false; - } } else { jQuery('#jform_php_after_publish-lbl').closest('.control-group').hide(); - // remove required attribute from php_after_publish field - if (!jform_vvvvvxxvxn_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_vvvvvxxvxn_required = true; - } } } @@ -896,28 +452,10 @@ function vvvvvxy(add_php_before_delete_vvvvvxy) if (add_php_before_delete_vvvvvxy == 1) { jQuery('#jform_php_before_delete-lbl').closest('.control-group').show(); - // add required attribute to php_before_delete field - if (jform_vvvvvxyvxo_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_vvvvvxyvxo_required = false; - } } else { jQuery('#jform_php_before_delete-lbl').closest('.control-group').hide(); - // remove required attribute from php_before_delete field - if (!jform_vvvvvxyvxo_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_vvvvvxyvxo_required = true; - } } } @@ -928,28 +466,10 @@ function vvvvvxz(add_php_after_delete_vvvvvxz) if (add_php_after_delete_vvvvvxz == 1) { jQuery('#jform_php_after_delete-lbl').closest('.control-group').show(); - // add required attribute to php_after_delete field - if (jform_vvvvvxzvxp_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_vvvvvxzvxp_required = false; - } } else { jQuery('#jform_php_after_delete-lbl').closest('.control-group').hide(); - // remove required attribute from php_after_delete field - if (!jform_vvvvvxzvxp_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_vvvvvxzvxp_required = true; - } } } @@ -960,28 +480,10 @@ function vvvvvya(add_php_document_vvvvvya) if (add_php_document_vvvvvya == 1) { jQuery('#jform_php_document-lbl').closest('.control-group').show(); - // add required attribute to php_document field - if (jform_vvvvvyavxq_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_vvvvvyavxq_required = false; - } } else { jQuery('#jform_php_document-lbl').closest('.control-group').hide(); - // remove required attribute from php_document field - if (!jform_vvvvvyavxq_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_vvvvvyavxq_required = true; - } } } @@ -993,26 +495,26 @@ function vvvvvyb(add_sql_vvvvvyb) { jQuery('#jform_source').closest('.control-group').show(); // add required attribute to source field - if (jform_vvvvvybvxr_required) + if (jform_vvvvvybvwd_required) { updateFieldRequired('source',0); jQuery('#jform_source').prop('required','required'); jQuery('#jform_source').attr('aria-required',true); jQuery('#jform_source').addClass('required'); - jform_vvvvvybvxr_required = false; + jform_vvvvvybvwd_required = false; } } else { jQuery('#jform_source').closest('.control-group').hide(); // remove required attribute from source field - if (!jform_vvvvvybvxr_required) + if (!jform_vvvvvybvwd_required) { updateFieldRequired('source',1); jQuery('#jform_source').removeAttr('required'); jQuery('#jform_source').removeAttr('aria-required'); jQuery('#jform_source').removeClass('required'); - jform_vvvvvybvxr_required = true; + jform_vvvvvybvwd_required = true; } } } @@ -1025,26 +527,26 @@ function vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc) { jQuery('#jform_sql').closest('.control-group').show(); // add required attribute to sql field - if (jform_vvvvvycvxs_required) + if (jform_vvvvvycvwe_required) { updateFieldRequired('sql',0); jQuery('#jform_sql').prop('required','required'); jQuery('#jform_sql').attr('aria-required',true); jQuery('#jform_sql').addClass('required'); - jform_vvvvvycvxs_required = false; + jform_vvvvvycvwe_required = false; } } else { jQuery('#jform_sql').closest('.control-group').hide(); // remove required attribute from sql field - if (!jform_vvvvvycvxs_required) + if (!jform_vvvvvycvwe_required) { updateFieldRequired('sql',1); jQuery('#jform_sql').removeAttr('required'); jQuery('#jform_sql').removeAttr('aria-required'); jQuery('#jform_sql').removeClass('required'); - jform_vvvvvycvxs_required = true; + jform_vvvvvycvwe_required = true; } } } @@ -1071,148 +573,148 @@ function vvvvvyg(add_custom_import_vvvvvyg) { jQuery('#jform_html_import_view').closest('.control-group').show(); // add required attribute to html_import_view field - if (jform_vvvvvygvxt_required) + if (jform_vvvvvygvwf_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_vvvvvygvxt_required = false; + jform_vvvvvygvwf_required = false; } jQuery('.note_advanced_import').closest('.control-group').show(); jQuery('#jform_php_import_display').closest('.control-group').show(); // add required attribute to php_import_display field - if (jform_vvvvvygvxu_required) + if (jform_vvvvvygvwg_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_vvvvvygvxu_required = false; + jform_vvvvvygvwg_required = false; } jQuery('#jform_php_import_ext').closest('.control-group').show(); // add required attribute to php_import_ext field - if (jform_vvvvvygvxv_required) + if (jform_vvvvvygvwh_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_vvvvvygvxv_required = false; + jform_vvvvvygvwh_required = false; } jQuery('#jform_php_import_headers').closest('.control-group').show(); // add required attribute to php_import_headers field - if (jform_vvvvvygvxw_required) + if (jform_vvvvvygvwi_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_vvvvvygvxw_required = false; + jform_vvvvvygvwi_required = false; } jQuery('#jform_php_import').closest('.control-group').show(); // add required attribute to php_import field - if (jform_vvvvvygvxx_required) + if (jform_vvvvvygvwj_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_vvvvvygvxx_required = false; + jform_vvvvvygvwj_required = false; } jQuery('#jform_php_import_save').closest('.control-group').show(); // add required attribute to php_import_save field - if (jform_vvvvvygvxy_required) + if (jform_vvvvvygvwk_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_vvvvvygvxy_required = false; + jform_vvvvvygvwk_required = false; } jQuery('#jform_php_import_setdata').closest('.control-group').show(); // add required attribute to php_import_setdata field - if (jform_vvvvvygvxz_required) + if (jform_vvvvvygvwl_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_vvvvvygvxz_required = false; + jform_vvvvvygvwl_required = false; } } else { jQuery('#jform_html_import_view').closest('.control-group').hide(); // remove required attribute from html_import_view field - if (!jform_vvvvvygvxt_required) + if (!jform_vvvvvygvwf_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_vvvvvygvxt_required = true; + jform_vvvvvygvwf_required = true; } jQuery('.note_advanced_import').closest('.control-group').hide(); jQuery('#jform_php_import_display').closest('.control-group').hide(); // remove required attribute from php_import_display field - if (!jform_vvvvvygvxu_required) + if (!jform_vvvvvygvwg_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_vvvvvygvxu_required = true; + jform_vvvvvygvwg_required = true; } jQuery('#jform_php_import_ext').closest('.control-group').hide(); // remove required attribute from php_import_ext field - if (!jform_vvvvvygvxv_required) + if (!jform_vvvvvygvwh_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_vvvvvygvxv_required = true; + jform_vvvvvygvwh_required = true; } jQuery('#jform_php_import_headers').closest('.control-group').hide(); // remove required attribute from php_import_headers field - if (!jform_vvvvvygvxw_required) + if (!jform_vvvvvygvwi_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_vvvvvygvxw_required = true; + jform_vvvvvygvwi_required = true; } jQuery('#jform_php_import').closest('.control-group').hide(); // remove required attribute from php_import field - if (!jform_vvvvvygvxx_required) + if (!jform_vvvvvygvwj_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_vvvvvygvxx_required = true; + jform_vvvvvygvwj_required = true; } jQuery('#jform_php_import_save').closest('.control-group').hide(); // remove required attribute from php_import_save field - if (!jform_vvvvvygvxy_required) + if (!jform_vvvvvygvwk_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_vvvvvygvxy_required = true; + jform_vvvvvygvwk_required = true; } jQuery('#jform_php_import_setdata').closest('.control-group').hide(); // remove required attribute from php_import_setdata field - if (!jform_vvvvvygvxz_required) + if (!jform_vvvvvygvwl_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_vvvvvygvxz_required = true; + jform_vvvvvygvwl_required = true; } } } @@ -1239,89 +741,17 @@ function vvvvvyi(add_custom_button_vvvvvyi) { jQuery('#jform_custom_button-lbl').closest('.control-group').show(); jQuery('#jform_php_controller-lbl').closest('.control-group').show(); - // add required attribute to php_controller field - if (jform_vvvvvyivya_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_vvvvvyivya_required = false; - } jQuery('#jform_php_controller_list-lbl').closest('.control-group').show(); - // add required attribute to php_controller_list field - if (jform_vvvvvyivyb_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_vvvvvyivyb_required = false; - } jQuery('#jform_php_model-lbl').closest('.control-group').show(); - // add required attribute to php_model field - if (jform_vvvvvyivyc_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_vvvvvyivyc_required = false; - } jQuery('#jform_php_model_list-lbl').closest('.control-group').show(); - // add required attribute to php_model_list field - if (jform_vvvvvyivyd_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_vvvvvyivyd_required = false; - } } else { jQuery('#jform_custom_button-lbl').closest('.control-group').hide(); jQuery('#jform_php_controller-lbl').closest('.control-group').hide(); - // remove required attribute from php_controller field - if (!jform_vvvvvyivya_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_vvvvvyivya_required = true; - } jQuery('#jform_php_controller_list-lbl').closest('.control-group').hide(); - // remove required attribute from php_controller_list field - if (!jform_vvvvvyivyb_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_vvvvvyivyb_required = true; - } jQuery('#jform_php_model-lbl').closest('.control-group').hide(); - // remove required attribute from php_model field - if (!jform_vvvvvyivyc_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_vvvvvyivyc_required = true; - } jQuery('#jform_php_model_list-lbl').closest('.control-group').hide(); - // remove required attribute from php_model_list field - if (!jform_vvvvvyivyd_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_vvvvvyivyd_required = true; - } } } @@ -1404,9 +834,9 @@ function checkAliasField() { } function checkAliasField_server(type){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.checkAliasField&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.checkAliasField&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type > 0){ - var request = 'token='+token+'&type=' + type; + var request = token+'=1&type=' + type; } return jQuery.ajax({ type: 'GET', @@ -1428,9 +858,9 @@ function getAjaxDisplay(type){ } function getAjaxDisplay_server(type){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type.length > 0){ - var request = 'token='+token+'&type=' + type; + var request = token+'=1&type=' + type; } return jQuery.ajax({ type: 'GET', @@ -1446,9 +876,9 @@ function addData(result,where){ } function getTableColumns_server(tableName){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.tableColumns&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.tableColumns&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && tableName.length > 0){ - var request = 'token='+token+'&table='+tableName; + var request = token+'=1&table='+tableName; } return jQuery.ajax({ type: 'GET', @@ -1477,9 +907,9 @@ function getTableColumns(fieldKey, table_, nr_){ } function getDynamicScripts_server(typpe){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicScripts&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getDynamicScripts&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && typpe.length > 0){ - var request = 'token='+token+'&type='+typpe; + var request = token+'=1&type='+typpe; } return jQuery.ajax({ type: 'GET', @@ -1560,9 +990,9 @@ function getDynamicScripts(id){ } function getEditCustomCodeButtons_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id+'&return_here='+return_here; + var request = token+'=1&id='+id+'&return_here='+return_here; } return jQuery.ajax({ type: 'GET', @@ -1601,7 +1031,7 @@ function isObject(obj) { function addButtonID_server(type, size){ var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButtonID&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type.length > 0 && size > 0){ - var request = 'token='+token+'&type='+type+'&size='+size; + var request = token+'=1&type='+type+'&size='+size; } return jQuery.ajax({ type: 'GET', @@ -1626,7 +1056,7 @@ function addButtonID(type, where, size){ function addButton_server(type, size){ var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type.length > 0){ - var request = 'token='+token+'&type='+type+'&size='+size; + var request = token+'=1&type='+type+'&size='+size; } return jQuery.ajax({ type: 'GET', @@ -1651,9 +1081,9 @@ function addButton(type, where, size){ } function getLinked_server(type){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type > 0){ - var request = 'token='+token+'&type='+type; + var request = token+'=1&type='+type; } return jQuery.ajax({ type: 'GET', diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index b2c2bdd88..4b9621508 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -1277,7 +1277,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1308,7 +1307,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1325,7 +1323,6 @@ syntax="css" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1342,7 +1339,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1373,7 +1369,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1390,7 +1385,6 @@ syntax="css" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1407,7 +1401,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1438,7 +1431,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1455,7 +1447,6 @@ syntax="javascript" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1472,7 +1463,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1503,7 +1493,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1520,7 +1509,6 @@ syntax="javascript" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1537,7 +1525,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1568,7 +1555,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1585,7 +1571,6 @@ syntax="javascript" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1602,7 +1587,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1633,7 +1617,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1650,7 +1633,6 @@ syntax="javascript" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1667,7 +1649,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1698,7 +1679,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -2223,7 +2203,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -2240,7 +2219,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="false" validate="code" /> @@ -2257,7 +2235,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -2274,7 +2251,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="false" validate="code" /> @@ -2291,7 +2267,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -2308,7 +2283,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="false" validate="code" /> @@ -2420,7 +2394,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="false" validate="code" /> @@ -2487,7 +2460,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -2686,7 +2658,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -2743,7 +2714,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> diff --git a/admin/models/forms/component_dashboard.js b/admin/models/forms/component_dashboard.js index 70dd5c103..e6c741404 100644 --- a/admin/models/forms/component_dashboard.js +++ b/admin/models/forms/component_dashboard.js @@ -18,9 +18,9 @@ jQuery(document).ready(function() }); function getEditCustomCodeButtons_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id+'&return_here='+return_here; + var request = token+'=1&id='+id+'&return_here='+return_here; } return jQuery.ajax({ type: 'GET', diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js index 892068a37..f14df1c29 100644 --- a/admin/models/forms/custom_admin_view.js +++ b/admin/models/forms/custom_admin_view.js @@ -8,19 +8,6 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -// Some Global Values -jform_vvvvvyjvye_required = false; -jform_vvvvvykvyf_required = false; -jform_vvvvvylvyg_required = false; -jform_vvvvvymvyh_required = false; -jform_vvvvvynvyi_required = false; -jform_vvvvvyovyj_required = false; -jform_vvvvvypvyk_required = false; -jform_vvvvvyqvyl_required = false; -jform_vvvvvyqvym_required = false; -jform_vvvvvyrvyn_required = false; -jform_vvvvvysvyo_required = false; - // Initial Script jQuery(document).ready(function() { @@ -62,28 +49,10 @@ function vvvvvyj(add_php_view_vvvvvyj) if (add_php_view_vvvvvyj == 1) { jQuery('#jform_php_view-lbl').closest('.control-group').show(); - // add required attribute to php_view field - if (jform_vvvvvyjvye_required) - { - updateFieldRequired('php_view',0); - jQuery('#jform_php_view').prop('required','required'); - jQuery('#jform_php_view').attr('aria-required',true); - jQuery('#jform_php_view').addClass('required'); - jform_vvvvvyjvye_required = false; - } } else { jQuery('#jform_php_view-lbl').closest('.control-group').hide(); - // remove required attribute from php_view field - if (!jform_vvvvvyjvye_required) - { - updateFieldRequired('php_view',1); - jQuery('#jform_php_view').removeAttr('required'); - jQuery('#jform_php_view').removeAttr('aria-required'); - jQuery('#jform_php_view').removeClass('required'); - jform_vvvvvyjvye_required = true; - } } } @@ -94,28 +63,10 @@ function vvvvvyk(add_php_jview_display_vvvvvyk) if (add_php_jview_display_vvvvvyk == 1) { jQuery('#jform_php_jview_display-lbl').closest('.control-group').show(); - // add required attribute to php_jview_display field - if (jform_vvvvvykvyf_required) - { - updateFieldRequired('php_jview_display',0); - jQuery('#jform_php_jview_display').prop('required','required'); - jQuery('#jform_php_jview_display').attr('aria-required',true); - jQuery('#jform_php_jview_display').addClass('required'); - jform_vvvvvykvyf_required = false; - } } else { jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide(); - // remove required attribute from php_jview_display field - if (!jform_vvvvvykvyf_required) - { - updateFieldRequired('php_jview_display',1); - jQuery('#jform_php_jview_display').removeAttr('required'); - jQuery('#jform_php_jview_display').removeAttr('aria-required'); - jQuery('#jform_php_jview_display').removeClass('required'); - jform_vvvvvykvyf_required = true; - } } } @@ -126,28 +77,10 @@ function vvvvvyl(add_php_jview_vvvvvyl) if (add_php_jview_vvvvvyl == 1) { jQuery('#jform_php_jview-lbl').closest('.control-group').show(); - // add required attribute to php_jview field - if (jform_vvvvvylvyg_required) - { - updateFieldRequired('php_jview',0); - jQuery('#jform_php_jview').prop('required','required'); - jQuery('#jform_php_jview').attr('aria-required',true); - jQuery('#jform_php_jview').addClass('required'); - jform_vvvvvylvyg_required = false; - } } else { jQuery('#jform_php_jview-lbl').closest('.control-group').hide(); - // remove required attribute from php_jview field - if (!jform_vvvvvylvyg_required) - { - updateFieldRequired('php_jview',1); - jQuery('#jform_php_jview').removeAttr('required'); - jQuery('#jform_php_jview').removeAttr('aria-required'); - jQuery('#jform_php_jview').removeClass('required'); - jform_vvvvvylvyg_required = true; - } } } @@ -158,28 +91,10 @@ function vvvvvym(add_php_document_vvvvvym) if (add_php_document_vvvvvym == 1) { jQuery('#jform_php_document-lbl').closest('.control-group').show(); - // add required attribute to php_document field - if (jform_vvvvvymvyh_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_vvvvvymvyh_required = false; - } } else { jQuery('#jform_php_document-lbl').closest('.control-group').hide(); - // remove required attribute from php_document field - if (!jform_vvvvvymvyh_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_vvvvvymvyh_required = true; - } } } @@ -190,28 +105,10 @@ function vvvvvyn(add_css_document_vvvvvyn) if (add_css_document_vvvvvyn == 1) { jQuery('#jform_css_document-lbl').closest('.control-group').show(); - // add required attribute to css_document field - if (jform_vvvvvynvyi_required) - { - updateFieldRequired('css_document',0); - jQuery('#jform_css_document').prop('required','required'); - jQuery('#jform_css_document').attr('aria-required',true); - jQuery('#jform_css_document').addClass('required'); - jform_vvvvvynvyi_required = false; - } } else { jQuery('#jform_css_document-lbl').closest('.control-group').hide(); - // remove required attribute from css_document field - if (!jform_vvvvvynvyi_required) - { - updateFieldRequired('css_document',1); - jQuery('#jform_css_document').removeAttr('required'); - jQuery('#jform_css_document').removeAttr('aria-required'); - jQuery('#jform_css_document').removeClass('required'); - jform_vvvvvynvyi_required = true; - } } } @@ -222,28 +119,10 @@ function vvvvvyo(add_javascript_file_vvvvvyo) if (add_javascript_file_vvvvvyo == 1) { jQuery('#jform_javascript_file-lbl').closest('.control-group').show(); - // add required attribute to javascript_file field - if (jform_vvvvvyovyj_required) - { - updateFieldRequired('javascript_file',0); - jQuery('#jform_javascript_file').prop('required','required'); - jQuery('#jform_javascript_file').attr('aria-required',true); - jQuery('#jform_javascript_file').addClass('required'); - jform_vvvvvyovyj_required = false; - } } else { jQuery('#jform_javascript_file-lbl').closest('.control-group').hide(); - // remove required attribute from javascript_file field - if (!jform_vvvvvyovyj_required) - { - updateFieldRequired('javascript_file',1); - jQuery('#jform_javascript_file').removeAttr('required'); - jQuery('#jform_javascript_file').removeAttr('aria-required'); - jQuery('#jform_javascript_file').removeClass('required'); - jform_vvvvvyovyj_required = true; - } } } @@ -254,28 +133,10 @@ function vvvvvyp(add_js_document_vvvvvyp) if (add_js_document_vvvvvyp == 1) { jQuery('#jform_js_document-lbl').closest('.control-group').show(); - // add required attribute to js_document field - if (jform_vvvvvypvyk_required) - { - updateFieldRequired('js_document',0); - jQuery('#jform_js_document').prop('required','required'); - jQuery('#jform_js_document').attr('aria-required',true); - jQuery('#jform_js_document').addClass('required'); - jform_vvvvvypvyk_required = false; - } } else { jQuery('#jform_js_document-lbl').closest('.control-group').hide(); - // remove required attribute from js_document field - if (!jform_vvvvvypvyk_required) - { - updateFieldRequired('js_document',1); - jQuery('#jform_js_document').removeAttr('required'); - jQuery('#jform_js_document').removeAttr('aria-required'); - jQuery('#jform_js_document').removeClass('required'); - jform_vvvvvypvyk_required = true; - } } } @@ -287,49 +148,13 @@ function vvvvvyq(add_custom_button_vvvvvyq) { jQuery('#jform_custom_button-lbl').closest('.control-group').show(); jQuery('#jform_php_controller-lbl').closest('.control-group').show(); - // add required attribute to php_controller field - if (jform_vvvvvyqvyl_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_vvvvvyqvyl_required = false; - } jQuery('#jform_php_model-lbl').closest('.control-group').show(); - // add required attribute to php_model field - if (jform_vvvvvyqvym_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_vvvvvyqvym_required = false; - } } else { jQuery('#jform_custom_button-lbl').closest('.control-group').hide(); jQuery('#jform_php_controller-lbl').closest('.control-group').hide(); - // remove required attribute from php_controller field - if (!jform_vvvvvyqvyl_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_vvvvvyqvyl_required = true; - } jQuery('#jform_php_model-lbl').closest('.control-group').hide(); - // remove required attribute from php_model field - if (!jform_vvvvvyqvym_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_vvvvvyqvym_required = true; - } } } @@ -340,28 +165,10 @@ function vvvvvyr(add_css_vvvvvyr) if (add_css_vvvvvyr == 1) { jQuery('#jform_css-lbl').closest('.control-group').show(); - // add required attribute to css field - if (jform_vvvvvyrvyn_required) - { - updateFieldRequired('css',0); - jQuery('#jform_css').prop('required','required'); - jQuery('#jform_css').attr('aria-required',true); - jQuery('#jform_css').addClass('required'); - jform_vvvvvyrvyn_required = false; - } } else { jQuery('#jform_css-lbl').closest('.control-group').hide(); - // remove required attribute from css field - if (!jform_vvvvvyrvyn_required) - { - updateFieldRequired('css',1); - jQuery('#jform_css').removeAttr('required'); - jQuery('#jform_css').removeAttr('aria-required'); - jQuery('#jform_css').removeClass('required'); - jform_vvvvvyrvyn_required = true; - } } } @@ -373,59 +180,14 @@ function vvvvvys(add_php_ajax_vvvvvys) { jQuery('#jform_ajax_input-lbl').closest('.control-group').show(); jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show(); - // add required attribute to php_ajaxmethod field - if (jform_vvvvvysvyo_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_vvvvvysvyo_required = false; - } } else { jQuery('#jform_ajax_input-lbl').closest('.control-group').hide(); jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide(); - // remove required attribute from php_ajaxmethod field - if (!jform_vvvvvysvyo_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_vvvvvysvyo_required = true; - } } } -// update required fields -function updateFieldRequired(name,status) -{ - var not_required = jQuery('#jform_not_required').val(); - - if(status == 1) - { - if (isSet(not_required) && not_required != 0) - { - not_required = not_required+','+name; - } - else - { - not_required = ','+name; - } - } - else - { - if (isSet(not_required) && not_required != 0) - { - not_required = not_required.replace(','+name,''); - } - } - - jQuery('#jform_not_required').val(not_required); -} - // the isSet function function isSet(val) { @@ -445,9 +207,9 @@ jQuery(document).ready(function() }); function getLinked_server(type){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type > 0){ - var request = 'token='+token+'&type='+type; + var request = token+'=1&type='+type; } return jQuery.ajax({ type: 'GET', @@ -467,9 +229,9 @@ function getLinked(){ } function getSnippetDetails_server(snippetId){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json"); if(token.length > 0 && snippetId > 0){ - var request = 'token='+token+'&id='+snippetId; + var request = token+'=1&id='+snippetId; } return jQuery.ajax({ type: 'GET', @@ -516,9 +278,9 @@ function getSnippetDetails(id){ } function getDynamicValues_server(dynamicId){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json"); if(token.length > 0 && dynamicId > 0){ - var request = 'token='+token+'&view=custom_admin_view&id='+dynamicId; + var request = token+'=1&view=custom_admin_view&id='+dynamicId; } return jQuery.ajax({ type: 'GET', @@ -543,9 +305,9 @@ function getDynamicValues(id){ } function getLayoutDetails_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id; + var request = token+'=1&id='+id; } return jQuery.ajax({ type: 'GET', @@ -569,9 +331,9 @@ function getLayoutDetails(id){ } function getTemplateDetails_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.templateDetails&format=json&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.templateDetails&format=json&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id; + var request = token+'=1&id='+id; } return jQuery.ajax({ type: 'GET', @@ -614,7 +376,7 @@ jQuery(document).ready(function($) function getSnippets_server(libraries){ var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&raw=true&format=json"; if(token.length > 0 && libraries.length > 0){ - var request = 'token='+token+'&libraries='+JSON.stringify(libraries); + var request = token+'=1&libraries='+JSON.stringify(libraries); } return jQuery.ajax({ type: 'GET', @@ -667,9 +429,9 @@ function setSnippets(array){ } function getEditCustomCodeButtons_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id+'&return_here='+return_here; + var request = token+'=1&id='+id+'&return_here='+return_here; } return jQuery.ajax({ type: 'GET', diff --git a/admin/models/forms/custom_admin_view.xml b/admin/models/forms/custom_admin_view.xml index a358eef46..8a7ab1274 100644 --- a/admin/models/forms/custom_admin_view.xml +++ b/admin/models/forms/custom_admin_view.xml @@ -156,7 +156,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -175,7 +174,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -266,7 +264,6 @@ syntax="html" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -304,7 +301,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -350,7 +346,6 @@ syntax="javascript" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -381,7 +376,6 @@ syntax="javascript" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -538,7 +532,6 @@ syntax="css" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -555,7 +548,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -572,7 +564,6 @@ syntax="css" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -601,7 +592,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1208,7 +1198,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="false" validate="code" /> @@ -1227,7 +1216,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="false" validate="code" /> diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js index cafa094a3..061338a81 100644 --- a/admin/models/forms/custom_code.js +++ b/admin/models/forms/custom_code.js @@ -9,10 +9,10 @@ */ // Some Global Values -jform_vvvvwahvzw_required = false; -jform_vvvvwaivzx_required = false; -jform_vvvvwaivzy_required = false; -jform_vvvvwaivzz_required = false; +jform_vvvvwahvwz_required = false; +jform_vvvvwaivxa_required = false; +jform_vvvvwaivxb_required = false; +jform_vvvvwaivxc_required = false; // Initial Script jQuery(document).ready(function() @@ -40,13 +40,13 @@ function vvvvwah(target_vvvvwah) { jQuery('#jform_function_name').closest('.control-group').show(); // add required attribute to function_name field - if (jform_vvvvwahvzw_required) + if (jform_vvvvwahvwz_required) { updateFieldRequired('function_name',0); jQuery('#jform_function_name').prop('required','required'); jQuery('#jform_function_name').attr('aria-required',true); jQuery('#jform_function_name').addClass('required'); - jform_vvvvwahvzw_required = false; + jform_vvvvwahvwz_required = false; } jQuery('.note_jcb_placeholder').closest('.control-group').show(); jQuery('#jform_system_name').closest('.control-group').show(); @@ -55,13 +55,13 @@ function vvvvwah(target_vvvvwah) { jQuery('#jform_function_name').closest('.control-group').hide(); // remove required attribute from function_name field - if (!jform_vvvvwahvzw_required) + if (!jform_vvvvwahvwz_required) { updateFieldRequired('function_name',1); jQuery('#jform_function_name').removeAttr('required'); jQuery('#jform_function_name').removeAttr('aria-required'); jQuery('#jform_function_name').removeClass('required'); - jform_vvvvwahvzw_required = true; + jform_vvvvwahvwz_required = true; } jQuery('.note_jcb_placeholder').closest('.control-group').hide(); jQuery('#jform_system_name').closest('.control-group').hide(); @@ -76,72 +76,72 @@ function vvvvwai(target_vvvvwai) { jQuery('#jform_component').closest('.control-group').show(); // add required attribute to component field - if (jform_vvvvwaivzx_required) + if (jform_vvvvwaivxa_required) { updateFieldRequired('component',0); jQuery('#jform_component').prop('required','required'); jQuery('#jform_component').attr('aria-required',true); jQuery('#jform_component').addClass('required'); - jform_vvvvwaivzx_required = false; + jform_vvvvwaivxa_required = false; } jQuery('#jform_path').closest('.control-group').show(); // add required attribute to path field - if (jform_vvvvwaivzy_required) + if (jform_vvvvwaivxb_required) { updateFieldRequired('path',0); jQuery('#jform_path').prop('required','required'); jQuery('#jform_path').attr('aria-required',true); jQuery('#jform_path').addClass('required'); - jform_vvvvwaivzy_required = false; + jform_vvvvwaivxb_required = false; } jQuery('#jform_from_line').closest('.control-group').show(); jQuery('#jform_hashtarget').closest('.control-group').show(); jQuery('#jform_to_line').closest('.control-group').show(); jQuery('#jform_type').closest('.control-group').show(); // add required attribute to type field - if (jform_vvvvwaivzz_required) + if (jform_vvvvwaivxc_required) { updateFieldRequired('type',0); jQuery('#jform_type').prop('required','required'); jQuery('#jform_type').attr('aria-required',true); jQuery('#jform_type').addClass('required'); - jform_vvvvwaivzz_required = false; + jform_vvvvwaivxc_required = false; } } else { jQuery('#jform_component').closest('.control-group').hide(); // remove required attribute from component field - if (!jform_vvvvwaivzx_required) + if (!jform_vvvvwaivxa_required) { updateFieldRequired('component',1); jQuery('#jform_component').removeAttr('required'); jQuery('#jform_component').removeAttr('aria-required'); jQuery('#jform_component').removeClass('required'); - jform_vvvvwaivzx_required = true; + jform_vvvvwaivxa_required = true; } jQuery('#jform_path').closest('.control-group').hide(); // remove required attribute from path field - if (!jform_vvvvwaivzy_required) + if (!jform_vvvvwaivxb_required) { updateFieldRequired('path',1); jQuery('#jform_path').removeAttr('required'); jQuery('#jform_path').removeAttr('aria-required'); jQuery('#jform_path').removeClass('required'); - jform_vvvvwaivzy_required = true; + jform_vvvvwaivxb_required = true; } jQuery('#jform_from_line').closest('.control-group').hide(); jQuery('#jform_hashtarget').closest('.control-group').hide(); jQuery('#jform_to_line').closest('.control-group').hide(); jQuery('#jform_type').closest('.control-group').hide(); // remove required attribute from type field - if (!jform_vvvvwaivzz_required) + if (!jform_vvvvwaivxc_required) { updateFieldRequired('type',1); jQuery('#jform_type').removeAttr('required'); jQuery('#jform_type').removeAttr('aria-required'); jQuery('#jform_type').removeClass('required'); - jform_vvvvwaivzz_required = true; + jform_vvvvwaivxc_required = true; } } } @@ -358,9 +358,9 @@ function usedin_server(functioName, ide, target){ function getEditCustomCodeButtons_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id+'&return_here='+return_here; + var request = token+'=1&id='+id+'&return_here='+return_here; } return jQuery.ajax({ type: 'GET', diff --git a/admin/models/forms/custom_code.xml b/admin/models/forms/custom_code.xml index a3b09b2da..9f5c1f643 100644 --- a/admin/models/forms/custom_code.xml +++ b/admin/models/forms/custom_code.xml @@ -200,7 +200,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js index a4e776f6d..b527188fa 100644 --- a/admin/models/forms/dynamic_get.js +++ b/admin/models/forms/dynamic_get.js @@ -9,26 +9,19 @@ */ // Some Global Values -jform_vvvvvzgvzc_required = false; -jform_vvvvvzivzd_required = false; -jform_vvvvvzjvze_required = false; -jform_vvvvvzkvzf_required = false; -jform_vvvvvzlvzg_required = false; -jform_vvvvvzmvzh_required = false; -jform_vvvvvzrvzi_required = false; -jform_vvvvvztvzj_required = false; -jform_vvvvvzuvzk_required = false; -jform_vvvvvzwvzl_required = false; -jform_vvvvvzwvzm_required = false; -jform_vvvvvzxvzn_required = false; -jform_vvvvvzyvzo_required = false; -jform_vvvvvzzvzp_required = false; -jform_vvvvwabvzq_required = false; -jform_vvvvwabvzr_required = false; -jform_vvvvwabvzs_required = false; -jform_vvvvwacvzt_required = false; -jform_vvvvwadvzu_required = false; -jform_vvvvwaevzv_required = false; +jform_vvvvvzgvwm_required = false; +jform_vvvvvzivwn_required = false; +jform_vvvvvzjvwo_required = false; +jform_vvvvvzkvwp_required = false; +jform_vvvvvzlvwq_required = false; +jform_vvvvvzwvwr_required = false; +jform_vvvvvzwvws_required = false; +jform_vvvvwabvwt_required = false; +jform_vvvvwabvwu_required = false; +jform_vvvvwabvwv_required = false; +jform_vvvvwacvww_required = false; +jform_vvvvwadvwx_required = false; +jform_vvvvwaevwy_required = false; // Initial Script jQuery(document).ready(function() @@ -129,26 +122,26 @@ function vvvvvzg(gettype_vvvvvzg) { jQuery('#jform_getcustom').closest('.control-group').show(); // add required attribute to getcustom field - if (jform_vvvvvzgvzc_required) + if (jform_vvvvvzgvwm_required) { updateFieldRequired('getcustom',0); jQuery('#jform_getcustom').prop('required','required'); jQuery('#jform_getcustom').attr('aria-required',true); jQuery('#jform_getcustom').addClass('required'); - jform_vvvvvzgvzc_required = false; + jform_vvvvvzgvwm_required = false; } } else { jQuery('#jform_getcustom').closest('.control-group').hide(); // remove required attribute from getcustom field - if (!jform_vvvvvzgvzc_required) + if (!jform_vvvvvzgvwm_required) { updateFieldRequired('getcustom',1); jQuery('#jform_getcustom').removeAttr('required'); jQuery('#jform_getcustom').removeAttr('aria-required'); jQuery('#jform_getcustom').removeClass('required'); - jform_vvvvvzgvzc_required = true; + jform_vvvvvzgvwm_required = true; } } } @@ -223,26 +216,26 @@ function vvvvvzi(main_source_vvvvvzi) { jQuery('#jform_view_table_main').closest('.control-group').show(); // add required attribute to view_table_main field - if (jform_vvvvvzivzd_required) + if (jform_vvvvvzivwn_required) { updateFieldRequired('view_table_main',0); jQuery('#jform_view_table_main').prop('required','required'); jQuery('#jform_view_table_main').attr('aria-required',true); jQuery('#jform_view_table_main').addClass('required'); - jform_vvvvvzivzd_required = false; + jform_vvvvvzivwn_required = false; } } else { jQuery('#jform_view_table_main').closest('.control-group').hide(); // remove required attribute from view_table_main field - if (!jform_vvvvvzivzd_required) + if (!jform_vvvvvzivwn_required) { updateFieldRequired('view_table_main',1); jQuery('#jform_view_table_main').removeAttr('required'); jQuery('#jform_view_table_main').removeAttr('aria-required'); jQuery('#jform_view_table_main').removeClass('required'); - jform_vvvvvzivzd_required = true; + jform_vvvvvzivwn_required = true; } } } @@ -279,26 +272,26 @@ function vvvvvzj(main_source_vvvvvzj) { jQuery('#jform_view_selection').closest('.control-group').show(); // add required attribute to view_selection field - if (jform_vvvvvzjvze_required) + if (jform_vvvvvzjvwo_required) { updateFieldRequired('view_selection',0); jQuery('#jform_view_selection').prop('required','required'); jQuery('#jform_view_selection').attr('aria-required',true); jQuery('#jform_view_selection').addClass('required'); - jform_vvvvvzjvze_required = false; + jform_vvvvvzjvwo_required = false; } } else { jQuery('#jform_view_selection').closest('.control-group').hide(); // remove required attribute from view_selection field - if (!jform_vvvvvzjvze_required) + if (!jform_vvvvvzjvwo_required) { updateFieldRequired('view_selection',1); jQuery('#jform_view_selection').removeAttr('required'); jQuery('#jform_view_selection').removeAttr('aria-required'); jQuery('#jform_view_selection').removeClass('required'); - jform_vvvvvzjvze_required = true; + jform_vvvvvzjvwo_required = true; } } } @@ -335,26 +328,26 @@ function vvvvvzk(main_source_vvvvvzk) { jQuery('#jform_db_table_main').closest('.control-group').show(); // add required attribute to db_table_main field - if (jform_vvvvvzkvzf_required) + if (jform_vvvvvzkvwp_required) { updateFieldRequired('db_table_main',0); jQuery('#jform_db_table_main').prop('required','required'); jQuery('#jform_db_table_main').attr('aria-required',true); jQuery('#jform_db_table_main').addClass('required'); - jform_vvvvvzkvzf_required = false; + jform_vvvvvzkvwp_required = false; } } else { jQuery('#jform_db_table_main').closest('.control-group').hide(); // remove required attribute from db_table_main field - if (!jform_vvvvvzkvzf_required) + if (!jform_vvvvvzkvwp_required) { updateFieldRequired('db_table_main',1); jQuery('#jform_db_table_main').removeAttr('required'); jQuery('#jform_db_table_main').removeAttr('aria-required'); jQuery('#jform_db_table_main').removeClass('required'); - jform_vvvvvzkvzf_required = true; + jform_vvvvvzkvwp_required = true; } } } @@ -391,26 +384,26 @@ function vvvvvzl(main_source_vvvvvzl) { jQuery('#jform_db_selection').closest('.control-group').show(); // add required attribute to db_selection field - if (jform_vvvvvzlvzg_required) + if (jform_vvvvvzlvwq_required) { updateFieldRequired('db_selection',0); jQuery('#jform_db_selection').prop('required','required'); jQuery('#jform_db_selection').attr('aria-required',true); jQuery('#jform_db_selection').addClass('required'); - jform_vvvvvzlvzg_required = false; + jform_vvvvvzlvwq_required = false; } } else { jQuery('#jform_db_selection').closest('.control-group').hide(); // remove required attribute from db_selection field - if (!jform_vvvvvzlvzg_required) + if (!jform_vvvvvzlvwq_required) { updateFieldRequired('db_selection',1); jQuery('#jform_db_selection').removeAttr('required'); jQuery('#jform_db_selection').removeAttr('aria-required'); jQuery('#jform_db_selection').removeClass('required'); - jform_vvvvvzlvzg_required = true; + jform_vvvvvzlvwq_required = true; } } } @@ -433,28 +426,10 @@ function vvvvvzm(addcalculation_vvvvvzm) if (addcalculation_vvvvvzm == 1) { jQuery('#jform_php_calculation-lbl').closest('.control-group').show(); - // add required attribute to php_calculation field - if (jform_vvvvvzmvzh_required) - { - updateFieldRequired('php_calculation',0); - jQuery('#jform_php_calculation').prop('required','required'); - jQuery('#jform_php_calculation').attr('aria-required',true); - jQuery('#jform_php_calculation').addClass('required'); - jform_vvvvvzmvzh_required = false; - } } else { jQuery('#jform_php_calculation-lbl').closest('.control-group').hide(); - // remove required attribute from php_calculation field - if (!jform_vvvvvzmvzh_required) - { - updateFieldRequired('php_calculation',1); - jQuery('#jform_php_calculation').removeAttr('required'); - jQuery('#jform_php_calculation').removeAttr('aria-required'); - jQuery('#jform_php_calculation').removeClass('required'); - jform_vvvvvzmvzh_required = true; - } } } @@ -600,28 +575,10 @@ function vvvvvzr(main_source_vvvvvzr) if (main_source) { jQuery('#jform_php_custom_get-lbl').closest('.control-group').show(); - // add required attribute to php_custom_get field - if (jform_vvvvvzrvzi_required) - { - updateFieldRequired('php_custom_get',0); - jQuery('#jform_php_custom_get').prop('required','required'); - jQuery('#jform_php_custom_get').attr('aria-required',true); - jQuery('#jform_php_custom_get').addClass('required'); - jform_vvvvvzrvzi_required = false; - } } else { jQuery('#jform_php_custom_get-lbl').closest('.control-group').hide(); - // remove required attribute from php_custom_get field - if (!jform_vvvvvzrvzi_required) - { - updateFieldRequired('php_custom_get',1); - jQuery('#jform_php_custom_get').removeAttr('required'); - jQuery('#jform_php_custom_get').removeAttr('aria-required'); - jQuery('#jform_php_custom_get').removeClass('required'); - jform_vvvvvzrvzi_required = true; - } } } @@ -718,28 +675,10 @@ function vvvvvzt(add_php_before_getitem_vvvvvzt,gettype_vvvvvzt) if (add_php_before_getitem && gettype) { jQuery('#jform_php_before_getitem-lbl').closest('.control-group').show(); - // add required attribute to php_before_getitem field - if (jform_vvvvvztvzj_required) - { - updateFieldRequired('php_before_getitem',0); - jQuery('#jform_php_before_getitem').prop('required','required'); - jQuery('#jform_php_before_getitem').attr('aria-required',true); - jQuery('#jform_php_before_getitem').addClass('required'); - jform_vvvvvztvzj_required = false; - } } else { jQuery('#jform_php_before_getitem-lbl').closest('.control-group').hide(); - // remove required attribute from php_before_getitem field - if (!jform_vvvvvztvzj_required) - { - updateFieldRequired('php_before_getitem',1); - jQuery('#jform_php_before_getitem').removeAttr('required'); - jQuery('#jform_php_before_getitem').removeAttr('aria-required'); - jQuery('#jform_php_before_getitem').removeClass('required'); - jform_vvvvvztvzj_required = true; - } } } @@ -797,28 +736,10 @@ function vvvvvzu(add_php_after_getitem_vvvvvzu,gettype_vvvvvzu) if (add_php_after_getitem && gettype) { jQuery('#jform_php_after_getitem-lbl').closest('.control-group').show(); - // add required attribute to php_after_getitem field - if (jform_vvvvvzuvzk_required) - { - updateFieldRequired('php_after_getitem',0); - jQuery('#jform_php_after_getitem').prop('required','required'); - jQuery('#jform_php_after_getitem').attr('aria-required',true); - jQuery('#jform_php_after_getitem').addClass('required'); - jform_vvvvvzuvzk_required = false; - } } else { jQuery('#jform_php_after_getitem-lbl').closest('.control-group').hide(); - // remove required attribute from php_after_getitem field - if (!jform_vvvvvzuvzk_required) - { - updateFieldRequired('php_after_getitem',1); - jQuery('#jform_php_after_getitem').removeAttr('required'); - jQuery('#jform_php_after_getitem').removeAttr('aria-required'); - jQuery('#jform_php_after_getitem').removeClass('required'); - jform_vvvvvzuvzk_required = true; - } } } @@ -865,46 +786,46 @@ function vvvvvzw(gettype_vvvvvzw) { jQuery('#jform_add_php_after_getitem').closest('.control-group').show(); // add required attribute to add_php_after_getitem field - if (jform_vvvvvzwvzl_required) + if (jform_vvvvvzwvwr_required) { updateFieldRequired('add_php_after_getitem',0); jQuery('#jform_add_php_after_getitem').prop('required','required'); jQuery('#jform_add_php_after_getitem').attr('aria-required',true); jQuery('#jform_add_php_after_getitem').addClass('required'); - jform_vvvvvzwvzl_required = false; + jform_vvvvvzwvwr_required = false; } jQuery('#jform_add_php_before_getitem').closest('.control-group').show(); // add required attribute to add_php_before_getitem field - if (jform_vvvvvzwvzm_required) + if (jform_vvvvvzwvws_required) { updateFieldRequired('add_php_before_getitem',0); jQuery('#jform_add_php_before_getitem').prop('required','required'); jQuery('#jform_add_php_before_getitem').attr('aria-required',true); jQuery('#jform_add_php_before_getitem').addClass('required'); - jform_vvvvvzwvzm_required = false; + jform_vvvvvzwvws_required = false; } } else { jQuery('#jform_add_php_after_getitem').closest('.control-group').hide(); // remove required attribute from add_php_after_getitem field - if (!jform_vvvvvzwvzl_required) + if (!jform_vvvvvzwvwr_required) { updateFieldRequired('add_php_after_getitem',1); jQuery('#jform_add_php_after_getitem').removeAttr('required'); jQuery('#jform_add_php_after_getitem').removeAttr('aria-required'); jQuery('#jform_add_php_after_getitem').removeClass('required'); - jform_vvvvvzwvzl_required = true; + jform_vvvvvzwvwr_required = true; } jQuery('#jform_add_php_before_getitem').closest('.control-group').hide(); // remove required attribute from add_php_before_getitem field - if (!jform_vvvvvzwvzm_required) + if (!jform_vvvvvzwvws_required) { updateFieldRequired('add_php_before_getitem',1); jQuery('#jform_add_php_before_getitem').removeAttr('required'); jQuery('#jform_add_php_before_getitem').removeAttr('aria-required'); jQuery('#jform_add_php_before_getitem').removeClass('required'); - jform_vvvvvzwvzm_required = true; + jform_vvvvvzwvws_required = true; } } } @@ -952,28 +873,10 @@ function vvvvvzx(add_php_getlistquery_vvvvvzx,gettype_vvvvvzx) if (add_php_getlistquery && gettype) { jQuery('#jform_php_getlistquery-lbl').closest('.control-group').show(); - // add required attribute to php_getlistquery field - if (jform_vvvvvzxvzn_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_vvvvvzxvzn_required = false; - } } else { jQuery('#jform_php_getlistquery-lbl').closest('.control-group').hide(); - // remove required attribute from php_getlistquery field - if (!jform_vvvvvzxvzn_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_vvvvvzxvzn_required = true; - } } } @@ -1031,28 +934,10 @@ function vvvvvzy(add_php_before_getitems_vvvvvzy,gettype_vvvvvzy) if (add_php_before_getitems && gettype) { jQuery('#jform_php_before_getitems-lbl').closest('.control-group').show(); - // add required attribute to php_before_getitems field - if (jform_vvvvvzyvzo_required) - { - updateFieldRequired('php_before_getitems',0); - jQuery('#jform_php_before_getitems').prop('required','required'); - jQuery('#jform_php_before_getitems').attr('aria-required',true); - jQuery('#jform_php_before_getitems').addClass('required'); - jform_vvvvvzyvzo_required = false; - } } else { jQuery('#jform_php_before_getitems-lbl').closest('.control-group').hide(); - // remove required attribute from php_before_getitems field - if (!jform_vvvvvzyvzo_required) - { - updateFieldRequired('php_before_getitems',1); - jQuery('#jform_php_before_getitems').removeAttr('required'); - jQuery('#jform_php_before_getitems').removeAttr('aria-required'); - jQuery('#jform_php_before_getitems').removeClass('required'); - jform_vvvvvzyvzo_required = true; - } } } @@ -1110,28 +995,10 @@ function vvvvvzz(add_php_after_getitems_vvvvvzz,gettype_vvvvvzz) if (add_php_after_getitems && gettype) { jQuery('#jform_php_after_getitems-lbl').closest('.control-group').show(); - // add required attribute to php_after_getitems field - if (jform_vvvvvzzvzp_required) - { - updateFieldRequired('php_after_getitems',0); - jQuery('#jform_php_after_getitems').prop('required','required'); - jQuery('#jform_php_after_getitems').attr('aria-required',true); - jQuery('#jform_php_after_getitems').addClass('required'); - jform_vvvvvzzvzp_required = false; - } } else { jQuery('#jform_php_after_getitems-lbl').closest('.control-group').hide(); - // remove required attribute from php_after_getitems field - if (!jform_vvvvvzzvzp_required) - { - updateFieldRequired('php_after_getitems',1); - jQuery('#jform_php_after_getitems').removeAttr('required'); - jQuery('#jform_php_after_getitems').removeAttr('aria-required'); - jQuery('#jform_php_after_getitems').removeClass('required'); - jform_vvvvvzzvzp_required = true; - } } } @@ -1178,66 +1045,66 @@ function vvvvwab(gettype_vvvvwab) { jQuery('#jform_add_php_after_getitems').closest('.control-group').show(); // add required attribute to add_php_after_getitems field - if (jform_vvvvwabvzq_required) + if (jform_vvvvwabvwt_required) { updateFieldRequired('add_php_after_getitems',0); jQuery('#jform_add_php_after_getitems').prop('required','required'); jQuery('#jform_add_php_after_getitems').attr('aria-required',true); jQuery('#jform_add_php_after_getitems').addClass('required'); - jform_vvvvwabvzq_required = false; + jform_vvvvwabvwt_required = false; } jQuery('#jform_add_php_before_getitems').closest('.control-group').show(); // add required attribute to add_php_before_getitems field - if (jform_vvvvwabvzr_required) + if (jform_vvvvwabvwu_required) { updateFieldRequired('add_php_before_getitems',0); jQuery('#jform_add_php_before_getitems').prop('required','required'); jQuery('#jform_add_php_before_getitems').attr('aria-required',true); jQuery('#jform_add_php_before_getitems').addClass('required'); - jform_vvvvwabvzr_required = false; + jform_vvvvwabvwu_required = false; } jQuery('#jform_add_php_getlistquery').closest('.control-group').show(); // add required attribute to add_php_getlistquery field - if (jform_vvvvwabvzs_required) + if (jform_vvvvwabvwv_required) { updateFieldRequired('add_php_getlistquery',0); jQuery('#jform_add_php_getlistquery').prop('required','required'); jQuery('#jform_add_php_getlistquery').attr('aria-required',true); jQuery('#jform_add_php_getlistquery').addClass('required'); - jform_vvvvwabvzs_required = false; + jform_vvvvwabvwv_required = false; } } else { jQuery('#jform_add_php_after_getitems').closest('.control-group').hide(); // remove required attribute from add_php_after_getitems field - if (!jform_vvvvwabvzq_required) + if (!jform_vvvvwabvwt_required) { updateFieldRequired('add_php_after_getitems',1); jQuery('#jform_add_php_after_getitems').removeAttr('required'); jQuery('#jform_add_php_after_getitems').removeAttr('aria-required'); jQuery('#jform_add_php_after_getitems').removeClass('required'); - jform_vvvvwabvzq_required = true; + jform_vvvvwabvwt_required = true; } jQuery('#jform_add_php_before_getitems').closest('.control-group').hide(); // remove required attribute from add_php_before_getitems field - if (!jform_vvvvwabvzr_required) + if (!jform_vvvvwabvwu_required) { updateFieldRequired('add_php_before_getitems',1); jQuery('#jform_add_php_before_getitems').removeAttr('required'); jQuery('#jform_add_php_before_getitems').removeAttr('aria-required'); jQuery('#jform_add_php_before_getitems').removeClass('required'); - jform_vvvvwabvzr_required = true; + jform_vvvvwabvwu_required = true; } jQuery('#jform_add_php_getlistquery').closest('.control-group').hide(); // remove required attribute from add_php_getlistquery field - if (!jform_vvvvwabvzs_required) + if (!jform_vvvvwabvwv_required) { updateFieldRequired('add_php_getlistquery',1); jQuery('#jform_add_php_getlistquery').removeAttr('required'); jQuery('#jform_add_php_getlistquery').removeAttr('aria-required'); jQuery('#jform_add_php_getlistquery').removeClass('required'); - jform_vvvvwabvzs_required = true; + jform_vvvvwabvwv_required = true; } } } @@ -1274,26 +1141,26 @@ function vvvvwac(gettype_vvvvwac) { jQuery('#jform_pagination').closest('.control-group').show(); // add required attribute to pagination field - if (jform_vvvvwacvzt_required) + if (jform_vvvvwacvww_required) { updateFieldRequired('pagination',0); jQuery('#jform_pagination').prop('required','required'); jQuery('#jform_pagination').attr('aria-required',true); jQuery('#jform_pagination').addClass('required'); - jform_vvvvwacvzt_required = false; + jform_vvvvwacvww_required = false; } } else { jQuery('#jform_pagination').closest('.control-group').hide(); // remove required attribute from pagination field - if (!jform_vvvvwacvzt_required) + if (!jform_vvvvwacvww_required) { updateFieldRequired('pagination',1); jQuery('#jform_pagination').removeAttr('required'); jQuery('#jform_pagination').removeAttr('aria-required'); jQuery('#jform_pagination').removeClass('required'); - jform_vvvvwacvzt_required = true; + jform_vvvvwacvww_required = true; } } } @@ -1330,26 +1197,26 @@ function vvvvwad(gettype_vvvvwad) { jQuery('#jform_add_php_router_parse').closest('.control-group').show(); // add required attribute to add_php_router_parse field - if (jform_vvvvwadvzu_required) + if (jform_vvvvwadvwx_required) { updateFieldRequired('add_php_router_parse',0); jQuery('#jform_add_php_router_parse').prop('required','required'); jQuery('#jform_add_php_router_parse').attr('aria-required',true); jQuery('#jform_add_php_router_parse').addClass('required'); - jform_vvvvwadvzu_required = false; + jform_vvvvwadvwx_required = false; } } else { jQuery('#jform_add_php_router_parse').closest('.control-group').hide(); // remove required attribute from add_php_router_parse field - if (!jform_vvvvwadvzu_required) + if (!jform_vvvvwadvwx_required) { updateFieldRequired('add_php_router_parse',1); jQuery('#jform_add_php_router_parse').removeAttr('required'); jQuery('#jform_add_php_router_parse').removeAttr('aria-required'); jQuery('#jform_add_php_router_parse').removeClass('required'); - jform_vvvvwadvzu_required = true; + jform_vvvvwadvwx_required = true; } } } @@ -1398,26 +1265,26 @@ function vvvvwae(gettype_vvvvwae,add_php_router_parse_vvvvwae) { jQuery('#jform_php_router_parse').closest('.control-group').show(); // add required attribute to php_router_parse field - if (jform_vvvvwaevzv_required) + if (jform_vvvvwaevwy_required) { updateFieldRequired('php_router_parse',0); jQuery('#jform_php_router_parse').prop('required','required'); jQuery('#jform_php_router_parse').attr('aria-required',true); jQuery('#jform_php_router_parse').addClass('required'); - jform_vvvvwaevzv_required = false; + jform_vvvvwaevwy_required = false; } } else { jQuery('#jform_php_router_parse').closest('.control-group').hide(); // remove required attribute from php_router_parse field - if (!jform_vvvvwaevzv_required) + if (!jform_vvvvwaevwy_required) { updateFieldRequired('php_router_parse',1); jQuery('#jform_php_router_parse').removeAttr('required'); jQuery('#jform_php_router_parse').removeAttr('aria-required'); jQuery('#jform_php_router_parse').removeClass('required'); - jform_vvvvwaevzv_required = true; + jform_vvvvwaevwy_required = true; } } } @@ -1560,10 +1427,10 @@ function setSelectAll(select_all){ } function getViewTableColumns_server(viewId,asKey,rowType){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.viewTableColumns&format=json&raw=true"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.viewTableColumns&format=json&raw=true"); if (token.length > 0 && viewId > 0 && asKey.length > 0) { - var request = 'token='+token+'&as='+asKey+'&type='+rowType+'&id='+viewId; + var request = token+'=1&as='+asKey+'&type='+rowType+'&id='+viewId; } return jQuery.ajax({ type: 'GET', @@ -1598,10 +1465,10 @@ function getViewTableColumns(id, asKey, key, rowType, main, table_, nr_){ function getDbTableColumns_server(name,asKey,rowType) { - var getUrl = "index.php?option=com_componentbuilder&task=ajax.dbTableColumns&format=json&raw=true"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.dbTableColumns&format=json&raw=true"); if (token.length > 0 && name.length > 0 && asKey.length > 0) { - var request = 'token='+token+'&as='+asKey+'&type='+rowType+'&name='+name; + var request = token+'=1&as='+asKey+'&type='+rowType+'&name='+name; } return jQuery.ajax({ type: 'GET', @@ -1696,9 +1563,9 @@ function updateSubItems(fieldName, fieldNr, table_, nr_) { } function getDynamicScripts_server(typpe){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicScripts&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getDynamicScripts&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && typpe.length > 0){ - var request = 'token='+token+'&type='+typpe; + var request = token+'=1&type='+typpe; } return jQuery.ajax({ type: 'GET', @@ -1725,9 +1592,9 @@ function getDynamicScripts(id){ } function getEditCustomCodeButtons_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id+'&return_here='+return_here; + var request = token+'=1&id='+id+'&return_here='+return_here; } return jQuery.ajax({ type: 'GET', @@ -1764,9 +1631,9 @@ function isObject(obj) { } function getLinked_server(type){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type > 0){ - var request = 'token='+token+'&type='+type; + var request = token+'=1&type='+type; } return jQuery.ajax({ type: 'GET', diff --git a/admin/models/forms/dynamic_get.xml b/admin/models/forms/dynamic_get.xml index 3edb290cd..bcaeadfd3 100644 --- a/admin/models/forms/dynamic_get.xml +++ b/admin/models/forms/dynamic_get.xml @@ -281,7 +281,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -867,7 +866,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -900,7 +898,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -932,7 +929,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -955,7 +951,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1086,7 +1081,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1271,7 +1265,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js index 8791d8d4f..9593549a9 100644 --- a/admin/models/forms/field.js +++ b/admin/models/forms/field.js @@ -9,14 +9,10 @@ */ // Some Global Values -jform_vvvvwatwac_required = false; -jform_vvvvwauwad_required = false; -jform_vvvvwavwae_required = false; -jform_vvvvwawwaf_required = false; -jform_vvvvwazwag_required = false; -jform_vvvvwbawah_required = false; -jform_vvvvwbbwai_required = false; -jform_vvvvwbcwaj_required = false; +jform_vvvvwatvxf_required = false; +jform_vvvvwauvxg_required = false; +jform_vvvvwavvxh_required = false; +jform_vvvvwawvxi_required = false; // Initial Script jQuery(document).ready(function() @@ -71,26 +67,26 @@ function vvvvwat(datalenght_vvvvwat) { jQuery('#jform_datalenght_other').closest('.control-group').show(); // add required attribute to datalenght_other field - if (jform_vvvvwatwac_required) + if (jform_vvvvwatvxf_required) { updateFieldRequired('datalenght_other',0); jQuery('#jform_datalenght_other').prop('required','required'); jQuery('#jform_datalenght_other').attr('aria-required',true); jQuery('#jform_datalenght_other').addClass('required'); - jform_vvvvwatwac_required = false; + jform_vvvvwatvxf_required = false; } } else { jQuery('#jform_datalenght_other').closest('.control-group').hide(); // remove required attribute from datalenght_other field - if (!jform_vvvvwatwac_required) + if (!jform_vvvvwatvxf_required) { updateFieldRequired('datalenght_other',1); jQuery('#jform_datalenght_other').removeAttr('required'); jQuery('#jform_datalenght_other').removeAttr('aria-required'); jQuery('#jform_datalenght_other').removeClass('required'); - jform_vvvvwatwac_required = true; + jform_vvvvwatvxf_required = true; } } } @@ -127,26 +123,26 @@ function vvvvwau(datadefault_vvvvwau) { jQuery('#jform_datadefault_other').closest('.control-group').show(); // add required attribute to datadefault_other field - if (jform_vvvvwauwad_required) + if (jform_vvvvwauvxg_required) { updateFieldRequired('datadefault_other',0); jQuery('#jform_datadefault_other').prop('required','required'); jQuery('#jform_datadefault_other').attr('aria-required',true); jQuery('#jform_datadefault_other').addClass('required'); - jform_vvvvwauwad_required = false; + jform_vvvvwauvxg_required = false; } } else { jQuery('#jform_datadefault_other').closest('.control-group').hide(); // remove required attribute from datadefault_other field - if (!jform_vvvvwauwad_required) + if (!jform_vvvvwauvxg_required) { updateFieldRequired('datadefault_other',1); jQuery('#jform_datadefault_other').removeAttr('required'); jQuery('#jform_datadefault_other').removeAttr('aria-required'); jQuery('#jform_datadefault_other').removeClass('required'); - jform_vvvvwauwad_required = true; + jform_vvvvwauvxg_required = true; } } } @@ -185,13 +181,13 @@ function vvvvwav(datatype_vvvvwav) jQuery('#jform_datalenght').closest('.control-group').show(); jQuery('#jform_indexes').closest('.control-group').show(); // add required attribute to indexes field - if (jform_vvvvwavwae_required) + if (jform_vvvvwavvxh_required) { updateFieldRequired('indexes',0); jQuery('#jform_indexes').prop('required','required'); jQuery('#jform_indexes').attr('aria-required',true); jQuery('#jform_indexes').addClass('required'); - jform_vvvvwavwae_required = false; + jform_vvvvwavvxh_required = false; } } else @@ -200,13 +196,13 @@ function vvvvwav(datatype_vvvvwav) jQuery('#jform_datalenght').closest('.control-group').hide(); jQuery('#jform_indexes').closest('.control-group').hide(); // remove required attribute from indexes field - if (!jform_vvvvwavwae_required) + if (!jform_vvvvwavvxh_required) { updateFieldRequired('indexes',1); jQuery('#jform_indexes').removeAttr('required'); jQuery('#jform_indexes').removeAttr('aria-required'); jQuery('#jform_indexes').removeClass('required'); - jform_vvvvwavwae_required = true; + jform_vvvvwavvxh_required = true; } } } @@ -243,26 +239,26 @@ function vvvvwaw(datatype_vvvvwaw) { jQuery('#jform_store').closest('.control-group').show(); // add required attribute to store field - if (jform_vvvvwawwaf_required) + if (jform_vvvvwawvxi_required) { updateFieldRequired('store',0); jQuery('#jform_store').prop('required','required'); jQuery('#jform_store').attr('aria-required',true); jQuery('#jform_store').addClass('required'); - jform_vvvvwawwaf_required = false; + jform_vvvvwawvxi_required = false; } } else { jQuery('#jform_store').closest('.control-group').hide(); // remove required attribute from store field - if (!jform_vvvvwawwaf_required) + if (!jform_vvvvwawvxi_required) { updateFieldRequired('store',1); jQuery('#jform_store').removeAttr('required'); jQuery('#jform_store').removeAttr('aria-required'); jQuery('#jform_store').removeClass('required'); - jform_vvvvwawwaf_required = true; + jform_vvvvwawvxi_required = true; } } } @@ -346,28 +342,10 @@ function vvvvwaz(add_css_view_vvvvwaz) if (add_css_view_vvvvwaz == 1) { jQuery('#jform_css_view-lbl').closest('.control-group').show(); - // add required attribute to css_view field - if (jform_vvvvwazwag_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_vvvvwazwag_required = false; - } } else { jQuery('#jform_css_view-lbl').closest('.control-group').hide(); - // remove required attribute from css_view field - if (!jform_vvvvwazwag_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_vvvvwazwag_required = true; - } } } @@ -378,28 +356,10 @@ function vvvvwba(add_css_views_vvvvwba) if (add_css_views_vvvvwba == 1) { jQuery('#jform_css_views-lbl').closest('.control-group').show(); - // add required attribute to css_views field - if (jform_vvvvwbawah_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_vvvvwbawah_required = false; - } } else { jQuery('#jform_css_views-lbl').closest('.control-group').hide(); - // remove required attribute from css_views field - if (!jform_vvvvwbawah_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_vvvvwbawah_required = true; - } } } @@ -410,28 +370,10 @@ function vvvvwbb(add_javascript_view_footer_vvvvwbb) if (add_javascript_view_footer_vvvvwbb == 1) { jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show(); - // add required attribute to javascript_view_footer field - if (jform_vvvvwbbwai_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_vvvvwbbwai_required = false; - } } else { jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').hide(); - // remove required attribute from javascript_view_footer field - if (!jform_vvvvwbbwai_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_vvvvwbbwai_required = true; - } } } @@ -442,28 +384,10 @@ function vvvvwbc(add_javascript_views_footer_vvvvwbc) if (add_javascript_views_footer_vvvvwbc == 1) { jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show(); - // add required attribute to javascript_views_footer field - if (jform_vvvvwbcwaj_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_vvvvwbcwaj_required = false; - } } else { jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').hide(); - // remove required attribute from javascript_views_footer field - if (!jform_vvvvwbcwaj_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_vvvvwbcwaj_required = true; - } } } @@ -527,9 +451,9 @@ jQuery(document).ready(function() var rowIdKey = 'properties'; function getFieldOptions_server(fieldtype){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldOptions&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.fieldOptions&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && fieldtype > 0){ - var request = 'token='+token+'&id='+fieldtype; + var request = token+'=1&id='+fieldtype; } return jQuery.ajax({ type: 'GET', @@ -721,9 +645,9 @@ function propertyIsSet(prop, id, targetForm) { } function getFieldPropertyDesc_server(fieldtype, property){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getFieldPropertyDesc&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getFieldPropertyDesc&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && (fieldtype > 0 || fieldtype.length > 0)&& property.length > 0){ - var request = 'token='+token+'&fieldtype='+fieldtype+'&property='+property; + var request = token+'=1&fieldtype='+fieldtype+'&property='+property; } return jQuery.ajax({ type: 'GET', @@ -736,9 +660,9 @@ function getFieldPropertyDesc_server(fieldtype, property){ function getValidationRulesTable_server(){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getValidationRulesTable&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getValidationRulesTable&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0){ - var request = 'token='+token+'&id=1'; + var request = token+'=1&id=1'; } return jQuery.ajax({ type: 'GET', @@ -805,9 +729,9 @@ function dbChecker(type){ } function getLinked_server(type){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type > 0){ - var request = 'token='+token+'&type='+type; + var request = token+'=1&type='+type; } return jQuery.ajax({ type: 'GET', @@ -829,7 +753,7 @@ function getLinked(){ function addButton_server(type, size){ var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type.length > 0){ - var request = 'token='+token+'&type='+type+'&size='+size; + var request = token+'=1&type='+type+'&size='+size; } return jQuery.ajax({ type: 'GET', @@ -854,9 +778,9 @@ function addButton(type, where, size){ } function getEditCustomCodeButtons_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id+'&return_here='+return_here; + var request = token+'=1&id='+id+'&return_here='+return_here; } return jQuery.ajax({ type: 'GET', diff --git a/admin/models/forms/field.xml b/admin/models/forms/field.xml index 24b41e53b..05f4c885c 100644 --- a/admin/models/forms/field.xml +++ b/admin/models/forms/field.xml @@ -244,7 +244,6 @@ syntax="css" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -275,7 +274,6 @@ syntax="css" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -432,7 +430,6 @@ syntax="javascript" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -451,7 +448,6 @@ syntax="javascript" editor="codemirror|none" filter="raw" - required="true" validate="code" /> diff --git a/admin/models/forms/fieldtype.js b/admin/models/forms/fieldtype.js index 1c20f92c3..6769d90f8 100644 --- a/admin/models/forms/fieldtype.js +++ b/admin/models/forms/fieldtype.js @@ -9,13 +9,13 @@ */ // Some Global Values -jform_vvvvwbdwak_required = false; -jform_vvvvwbfwal_required = false; -jform_vvvvwbhwam_required = false; -jform_vvvvwbiwan_required = false; -jform_vvvvwbjwao_required = false; -jform_vvvvwbowap_required = false; -jform_vvvvwbowaq_required = false; +jform_vvvvwbdvxj_required = false; +jform_vvvvwbfvxk_required = false; +jform_vvvvwbhvxl_required = false; +jform_vvvvwbivxm_required = false; +jform_vvvvwbjvxn_required = false; +jform_vvvvwbovxo_required = false; +jform_vvvvwbovxp_required = false; // Initial Script jQuery(document).ready(function() @@ -92,26 +92,26 @@ function vvvvwbd(datalenght_vvvvwbd,has_defaults_vvvvwbd) { jQuery('#jform_datalenght_other').closest('.control-group').show(); // add required attribute to datalenght_other field - if (jform_vvvvwbdwak_required) + if (jform_vvvvwbdvxj_required) { updateFieldRequired('datalenght_other',0); jQuery('#jform_datalenght_other').prop('required','required'); jQuery('#jform_datalenght_other').attr('aria-required',true); jQuery('#jform_datalenght_other').addClass('required'); - jform_vvvvwbdwak_required = false; + jform_vvvvwbdvxj_required = false; } } else { jQuery('#jform_datalenght_other').closest('.control-group').hide(); // remove required attribute from datalenght_other field - if (!jform_vvvvwbdwak_required) + if (!jform_vvvvwbdvxj_required) { updateFieldRequired('datalenght_other',1); jQuery('#jform_datalenght_other').removeAttr('required'); jQuery('#jform_datalenght_other').removeAttr('aria-required'); jQuery('#jform_datalenght_other').removeClass('required'); - jform_vvvvwbdwak_required = true; + jform_vvvvwbdvxj_required = true; } } } @@ -171,26 +171,26 @@ function vvvvwbf(datadefault_vvvvwbf,has_defaults_vvvvwbf) { jQuery('#jform_datadefault_other').closest('.control-group').show(); // add required attribute to datadefault_other field - if (jform_vvvvwbfwal_required) + if (jform_vvvvwbfvxk_required) { updateFieldRequired('datadefault_other',0); jQuery('#jform_datadefault_other').prop('required','required'); jQuery('#jform_datadefault_other').attr('aria-required',true); jQuery('#jform_datadefault_other').addClass('required'); - jform_vvvvwbfwal_required = false; + jform_vvvvwbfvxk_required = false; } } else { jQuery('#jform_datadefault_other').closest('.control-group').hide(); // remove required attribute from datadefault_other field - if (!jform_vvvvwbfwal_required) + if (!jform_vvvvwbfvxk_required) { updateFieldRequired('datadefault_other',1); jQuery('#jform_datadefault_other').removeAttr('required'); jQuery('#jform_datadefault_other').removeAttr('aria-required'); jQuery('#jform_datadefault_other').removeClass('required'); - jform_vvvvwbfwal_required = true; + jform_vvvvwbfvxk_required = true; } } } @@ -252,13 +252,13 @@ function vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh) jQuery('#jform_datalenght').closest('.control-group').show(); jQuery('#jform_indexes').closest('.control-group').show(); // add required attribute to indexes field - if (jform_vvvvwbhwam_required) + if (jform_vvvvwbhvxl_required) { updateFieldRequired('indexes',0); jQuery('#jform_indexes').prop('required','required'); jQuery('#jform_indexes').attr('aria-required',true); jQuery('#jform_indexes').addClass('required'); - jform_vvvvwbhwam_required = false; + jform_vvvvwbhvxl_required = false; } } else @@ -267,13 +267,13 @@ function vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh) jQuery('#jform_datalenght').closest('.control-group').hide(); jQuery('#jform_indexes').closest('.control-group').hide(); // remove required attribute from indexes field - if (!jform_vvvvwbhwam_required) + if (!jform_vvvvwbhvxl_required) { updateFieldRequired('indexes',1); jQuery('#jform_indexes').removeAttr('required'); jQuery('#jform_indexes').removeAttr('aria-required'); jQuery('#jform_indexes').removeClass('required'); - jform_vvvvwbhwam_required = true; + jform_vvvvwbhvxl_required = true; } } } @@ -335,13 +335,13 @@ function vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi) jQuery('#jform_datalenght').closest('.control-group').show(); jQuery('#jform_indexes').closest('.control-group').show(); // add required attribute to indexes field - if (jform_vvvvwbiwan_required) + if (jform_vvvvwbivxm_required) { updateFieldRequired('indexes',0); jQuery('#jform_indexes').prop('required','required'); jQuery('#jform_indexes').attr('aria-required',true); jQuery('#jform_indexes').addClass('required'); - jform_vvvvwbiwan_required = false; + jform_vvvvwbivxm_required = false; } } else @@ -350,13 +350,13 @@ function vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi) jQuery('#jform_datalenght').closest('.control-group').hide(); jQuery('#jform_indexes').closest('.control-group').hide(); // remove required attribute from indexes field - if (!jform_vvvvwbiwan_required) + if (!jform_vvvvwbivxm_required) { updateFieldRequired('indexes',1); jQuery('#jform_indexes').removeAttr('required'); jQuery('#jform_indexes').removeAttr('aria-required'); jQuery('#jform_indexes').removeClass('required'); - jform_vvvvwbiwan_required = true; + jform_vvvvwbivxm_required = true; } } } @@ -416,26 +416,26 @@ function vvvvwbj(datatype_vvvvwbj,has_defaults_vvvvwbj) { jQuery('#jform_store').closest('.control-group').show(); // add required attribute to store field - if (jform_vvvvwbjwao_required) + if (jform_vvvvwbjvxn_required) { updateFieldRequired('store',0); jQuery('#jform_store').prop('required','required'); jQuery('#jform_store').attr('aria-required',true); jQuery('#jform_store').addClass('required'); - jform_vvvvwbjwao_required = false; + jform_vvvvwbjvxn_required = false; } } else { jQuery('#jform_store').closest('.control-group').hide(); // remove required attribute from store field - if (!jform_vvvvwbjwao_required) + if (!jform_vvvvwbjvxn_required) { updateFieldRequired('store',1); jQuery('#jform_store').removeAttr('required'); jQuery('#jform_store').removeAttr('aria-required'); jQuery('#jform_store').removeClass('required'); - jform_vvvvwbjwao_required = true; + jform_vvvvwbjvxn_required = true; } } } @@ -722,46 +722,46 @@ function vvvvwbo(has_defaults_vvvvwbo) { jQuery('#jform_datatype').closest('.control-group').show(); // add required attribute to datatype field - if (jform_vvvvwbowap_required) + if (jform_vvvvwbovxo_required) { updateFieldRequired('datatype',0); jQuery('#jform_datatype').prop('required','required'); jQuery('#jform_datatype').attr('aria-required',true); jQuery('#jform_datatype').addClass('required'); - jform_vvvvwbowap_required = false; + jform_vvvvwbovxo_required = false; } jQuery('#jform_null_switch').closest('.control-group').show(); // add required attribute to null_switch field - if (jform_vvvvwbowaq_required) + if (jform_vvvvwbovxp_required) { updateFieldRequired('null_switch',0); jQuery('#jform_null_switch').prop('required','required'); jQuery('#jform_null_switch').attr('aria-required',true); jQuery('#jform_null_switch').addClass('required'); - jform_vvvvwbowaq_required = false; + jform_vvvvwbovxp_required = false; } } else { jQuery('#jform_datatype').closest('.control-group').hide(); // remove required attribute from datatype field - if (!jform_vvvvwbowap_required) + if (!jform_vvvvwbovxo_required) { updateFieldRequired('datatype',1); jQuery('#jform_datatype').removeAttr('required'); jQuery('#jform_datatype').removeAttr('aria-required'); jQuery('#jform_datatype').removeClass('required'); - jform_vvvvwbowap_required = true; + jform_vvvvwbovxo_required = true; } jQuery('#jform_null_switch').closest('.control-group').hide(); // remove required attribute from null_switch field - if (!jform_vvvvwbowaq_required) + if (!jform_vvvvwbovxp_required) { updateFieldRequired('null_switch',1); jQuery('#jform_null_switch').removeAttr('required'); jQuery('#jform_null_switch').removeAttr('aria-required'); jQuery('#jform_null_switch').removeClass('required'); - jform_vvvvwbowaq_required = true; + jform_vvvvwbovxp_required = true; } } } @@ -810,9 +810,9 @@ jQuery(document).ready(function($) }); function getEditCustomCodeButtons_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id+'&return_here='+return_here; + var request = token+'=1&id='+id+'&return_here='+return_here; } return jQuery.ajax({ type: 'GET', diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index 71a6b21b1..6937a7a24 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -9,12 +9,11 @@ */ // Some Global Values -jform_vvvvwbzwbc_required = false; -jform_vvvvwcawbd_required = false; -jform_vvvvwcbwbe_required = false; -jform_vvvvwccwbf_required = false; -jform_vvvvwcdwbg_required = false; -jform_vvvvwcewbh_required = false; +jform_vvvvwbzvyb_required = false; +jform_vvvvwcavyc_required = false; +jform_vvvvwcbvyd_required = false; +jform_vvvvwccvye_required = false; +jform_vvvvwcevyf_required = false; // Initial Script jQuery(document).ready(function() @@ -46,26 +45,26 @@ function vvvvwbz(location_vvvvwbz) { jQuery('#jform_admin_view').closest('.control-group').show(); // add required attribute to admin_view field - if (jform_vvvvwbzwbc_required) + if (jform_vvvvwbzvyb_required) { updateFieldRequired('admin_view',0); jQuery('#jform_admin_view').prop('required','required'); jQuery('#jform_admin_view').attr('aria-required',true); jQuery('#jform_admin_view').addClass('required'); - jform_vvvvwbzwbc_required = false; + jform_vvvvwbzvyb_required = false; } } else { jQuery('#jform_admin_view').closest('.control-group').hide(); // remove required attribute from admin_view field - if (!jform_vvvvwbzwbc_required) + if (!jform_vvvvwbzvyb_required) { updateFieldRequired('admin_view',1); jQuery('#jform_admin_view').removeAttr('required'); jQuery('#jform_admin_view').removeAttr('aria-required'); jQuery('#jform_admin_view').removeClass('required'); - jform_vvvvwbzwbc_required = true; + jform_vvvvwbzvyb_required = true; } } } @@ -78,26 +77,26 @@ function vvvvwca(location_vvvvwca) { jQuery('#jform_site_view').closest('.control-group').show(); // add required attribute to site_view field - if (jform_vvvvwcawbd_required) + if (jform_vvvvwcavyc_required) { updateFieldRequired('site_view',0); jQuery('#jform_site_view').prop('required','required'); jQuery('#jform_site_view').attr('aria-required',true); jQuery('#jform_site_view').addClass('required'); - jform_vvvvwcawbd_required = false; + jform_vvvvwcavyc_required = false; } } else { jQuery('#jform_site_view').closest('.control-group').hide(); // remove required attribute from site_view field - if (!jform_vvvvwcawbd_required) + if (!jform_vvvvwcavyc_required) { updateFieldRequired('site_view',1); jQuery('#jform_site_view').removeAttr('required'); jQuery('#jform_site_view').removeAttr('aria-required'); jQuery('#jform_site_view').removeClass('required'); - jform_vvvvwcawbd_required = true; + jform_vvvvwcavyc_required = true; } } } @@ -123,26 +122,26 @@ function vvvvwcb(type_vvvvwcb) { jQuery('#jform_url').closest('.control-group').show(); // add required attribute to url field - if (jform_vvvvwcbwbe_required) + if (jform_vvvvwcbvyd_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_vvvvwcbwbe_required = false; + jform_vvvvwcbvyd_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); // remove required attribute from url field - if (!jform_vvvvwcbwbe_required) + if (!jform_vvvvwcbvyd_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_vvvvwcbwbe_required = true; + jform_vvvvwcbvyd_required = true; } } } @@ -179,26 +178,26 @@ function vvvvwcc(type_vvvvwcc) { jQuery('#jform_article').closest('.control-group').show(); // add required attribute to article field - if (jform_vvvvwccwbf_required) + if (jform_vvvvwccvye_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_vvvvwccwbf_required = false; + jform_vvvvwccvye_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); // remove required attribute from article field - if (!jform_vvvvwccwbf_required) + if (!jform_vvvvwccvye_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_vvvvwccwbf_required = true; + jform_vvvvwccvye_required = true; } } } @@ -234,28 +233,10 @@ function vvvvwcd(type_vvvvwcd) if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - // add required attribute to content field - if (jform_vvvvwcdwbg_required) - { - updateFieldRequired('content',0); - jQuery('#jform_content').prop('required','required'); - jQuery('#jform_content').attr('aria-required',true); - jQuery('#jform_content').addClass('required'); - jform_vvvvwcdwbg_required = false; - } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - // remove required attribute from content field - if (!jform_vvvvwcdwbg_required) - { - updateFieldRequired('content',1); - jQuery('#jform_content').removeAttr('required'); - jQuery('#jform_content').removeAttr('aria-required'); - jQuery('#jform_content').removeClass('required'); - jform_vvvvwcdwbg_required = true; - } } } @@ -278,26 +259,26 @@ function vvvvwce(target_vvvvwce) { jQuery('#jform_groups').closest('.control-group').show(); // add required attribute to groups field - if (jform_vvvvwcewbh_required) + if (jform_vvvvwcevyf_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_vvvvwcewbh_required = false; + jform_vvvvwcevyf_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); // remove required attribute from groups field - if (!jform_vvvvwcewbh_required) + if (!jform_vvvvwcevyf_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_vvvvwcewbh_required = true; + jform_vvvvwcevyf_required = true; } } } diff --git a/admin/models/forms/help_document.xml b/admin/models/forms/help_document.xml index 1aafa6873..f6a9bf71e 100644 --- a/admin/models/forms/help_document.xml +++ b/admin/models/forms/help_document.xml @@ -176,7 +176,6 @@ height="300 px" buttons="false" filter="safehtml" - required="true" /> 0 && identifier.length > 0 && key.length > 0){ - var request = 'token='+token+'&identifier='+identifier+'&key='+key; + var request = token+'=1&identifier='+identifier+'&key='+key; } return jQuery.ajax({ type: 'GET', @@ -1132,9 +866,9 @@ function getAjaxDisplay(type){ } function getAjaxDisplay_server(type){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type.length > 0){ - var request = 'token='+token+'&type=' + type; + var request = token+'=1&type=' + type; } return jQuery.ajax({ type: 'GET', @@ -1165,9 +899,9 @@ function dasboardSwitch(value){ function getEditCustomCodeButtons_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id+'&return_here='+return_here; + var request = token+'=1&id='+id+'&return_here='+return_here; } return jQuery.ajax({ type: 'GET', @@ -1206,7 +940,7 @@ function isObject(obj) { function addButtonID_server(type, size){ var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButtonID&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type.length > 0 && size > 0){ - var request = 'token='+token+'&type='+type+'&size='+size; + var request = token+'=1&type='+type+'&size='+size; } return jQuery.ajax({ type: 'GET', @@ -1231,7 +965,7 @@ function addButtonID(type, where, size){ function addButton_server(type, size){ var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type.length > 0){ - var request = 'token='+token+'&type='+type+'&size='+size; + var request = token+'=1&type='+type+'&size='+size; } return jQuery.ajax({ type: 'GET', diff --git a/admin/models/forms/joomla_component.xml b/admin/models/forms/joomla_component.xml index 2eeedcb3a..8cabf38ab 100644 --- a/admin/models/forms/joomla_component.xml +++ b/admin/models/forms/joomla_component.xml @@ -176,7 +176,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -229,7 +228,6 @@ buttons="false" editor="none" filter="raw" - required="true" /> @@ -318,7 +315,6 @@ syntax="javascript" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -335,7 +331,6 @@ syntax="css" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -366,7 +361,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -461,7 +455,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -509,7 +502,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -541,7 +533,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -579,7 +570,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -598,7 +588,6 @@ syntax="css" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -645,7 +634,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -677,7 +665,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -708,7 +695,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> diff --git a/admin/models/forms/language_translation.js b/admin/models/forms/language_translation.js index 393b31333..26c4bcace 100644 --- a/admin/models/forms/language_translation.js +++ b/admin/models/forms/language_translation.js @@ -23,7 +23,7 @@ function addData(result,where){ function addButton_server(type, size){ var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type.length > 0){ - var request = 'token='+token+'&type='+type+'&size='+size; + var request = token+'=1&type='+type+'&size='+size; } return jQuery.ajax({ type: 'GET', diff --git a/admin/models/forms/layout.js b/admin/models/forms/layout.js index 182ca629e..1996b5f44 100644 --- a/admin/models/forms/layout.js +++ b/admin/models/forms/layout.js @@ -8,9 +8,6 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -// Some Global Values -jform_vvvvvzfvzb_required = false; - // Initial Script jQuery(document).ready(function() { @@ -25,58 +22,13 @@ function vvvvvzf(add_php_view_vvvvvzf) if (add_php_view_vvvvvzf == 1) { jQuery('#jform_php_view-lbl').closest('.control-group').show(); - // add required attribute to php_view field - if (jform_vvvvvzfvzb_required) - { - updateFieldRequired('php_view',0); - jQuery('#jform_php_view').prop('required','required'); - jQuery('#jform_php_view').attr('aria-required',true); - jQuery('#jform_php_view').addClass('required'); - jform_vvvvvzfvzb_required = false; - } } else { jQuery('#jform_php_view-lbl').closest('.control-group').hide(); - // remove required attribute from php_view field - if (!jform_vvvvvzfvzb_required) - { - updateFieldRequired('php_view',1); - jQuery('#jform_php_view').removeAttr('required'); - jQuery('#jform_php_view').removeAttr('aria-required'); - jQuery('#jform_php_view').removeClass('required'); - jform_vvvvvzfvzb_required = true; - } } } -// update required fields -function updateFieldRequired(name,status) -{ - var not_required = jQuery('#jform_not_required').val(); - - if(status == 1) - { - if (isSet(not_required) && not_required != 0) - { - not_required = not_required+','+name; - } - else - { - not_required = ','+name; - } - } - else - { - if (isSet(not_required) && not_required != 0) - { - not_required = not_required.replace(','+name,''); - } - } - - jQuery('#jform_not_required').val(not_required); -} - // the isSet function function isSet(val) { @@ -94,9 +46,9 @@ jQuery(document).ready(function($) }); function getEditCustomCodeButtons_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id+'&return_here='+return_here; + var request = token+'=1&id='+id+'&return_here='+return_here; } return jQuery.ajax({ type: 'GET', @@ -133,9 +85,9 @@ function isObject(obj) { } function getSnippetDetails_server(snippetId){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json"); if(token.length > 0 && snippetId > 0){ - var request = 'token='+token+'&id='+snippetId; + var request = token+'=1&id='+snippetId; } return jQuery.ajax({ type: 'GET', @@ -182,9 +134,9 @@ function getSnippetDetails(id){ } function getDynamicValues_server(dynamicId){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json"); if(token.length > 0 && dynamicId > 0){ - var request = 'token='+token+'&view=layout&id='+dynamicId; + var request = token+'=1&view=layout&id='+dynamicId; } return jQuery.ajax({ type: 'GET', @@ -209,9 +161,9 @@ function getDynamicValues(id){ } function getLayoutDetails_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id; + var request = token+'=1&id='+id; } return jQuery.ajax({ type: 'GET', @@ -254,7 +206,7 @@ jQuery(document).ready(function($) function getSnippets_server(libraries){ var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&raw=true&format=json"; if(token.length > 0 && libraries.length > 0){ - var request = 'token='+token+'&libraries='+JSON.stringify(libraries); + var request = token+'=1&libraries='+JSON.stringify(libraries); } return jQuery.ajax({ type: 'GET', diff --git a/admin/models/forms/layout.xml b/admin/models/forms/layout.xml index 501f0fa0e..fc260118f 100644 --- a/admin/models/forms/layout.xml +++ b/admin/models/forms/layout.xml @@ -153,7 +153,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -192,7 +191,6 @@ syntax="html" editor="codemirror|none" filter="raw" - required="true" validate="code" /> diff --git a/admin/models/forms/library.js b/admin/models/forms/library.js index 6c3d5b0da..7007280d1 100644 --- a/admin/models/forms/library.js +++ b/admin/models/forms/library.js @@ -9,8 +9,8 @@ */ // Some Global Values -jform_vvvvwamwaa_required = false; -jform_vvvvwaswab_required = false; +jform_vvvvwamvxd_required = false; +jform_vvvvwasvxe_required = false; // Initial Script jQuery(document).ready(function() @@ -99,26 +99,26 @@ function vvvvwam(how_vvvvwam) { jQuery('#jform_php_setdocument').closest('.control-group').show(); // add required attribute to php_setdocument field - if (jform_vvvvwamwaa_required) + if (jform_vvvvwamvxd_required) { updateFieldRequired('php_setdocument',0); jQuery('#jform_php_setdocument').prop('required','required'); jQuery('#jform_php_setdocument').attr('aria-required',true); jQuery('#jform_php_setdocument').addClass('required'); - jform_vvvvwamwaa_required = false; + jform_vvvvwamvxd_required = false; } } else { jQuery('#jform_php_setdocument').closest('.control-group').hide(); // remove required attribute from php_setdocument field - if (!jform_vvvvwamwaa_required) + if (!jform_vvvvwamvxd_required) { updateFieldRequired('php_setdocument',1); jQuery('#jform_php_setdocument').removeAttr('required'); jQuery('#jform_php_setdocument').removeAttr('aria-required'); jQuery('#jform_php_setdocument').removeClass('required'); - jform_vvvvwamwaa_required = true; + jform_vvvvwamvxd_required = true; } } } @@ -342,26 +342,26 @@ function vvvvwas(type_vvvvwas) { jQuery('#jform_libraries').closest('.control-group').show(); // add required attribute to libraries field - if (jform_vvvvwaswab_required) + if (jform_vvvvwasvxe_required) { updateFieldRequired('libraries',0); jQuery('#jform_libraries').prop('required','required'); jQuery('#jform_libraries').attr('aria-required',true); jQuery('#jform_libraries').addClass('required'); - jform_vvvvwaswab_required = false; + jform_vvvvwasvxe_required = false; } } else { jQuery('#jform_libraries').closest('.control-group').hide(); // remove required attribute from libraries field - if (!jform_vvvvwaswab_required) + if (!jform_vvvvwasvxe_required) { updateFieldRequired('libraries',1); jQuery('#jform_libraries').removeAttr('required'); jQuery('#jform_libraries').removeAttr('aria-required'); jQuery('#jform_libraries').removeClass('required'); - jform_vvvvwaswab_required = true; + jform_vvvvwasvxe_required = true; } } } @@ -430,9 +430,9 @@ function getAjaxDisplay(type){ } function getAjaxDisplay_server(type){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getAjaxDisplay&format=json&raw=true&vdm="+vastDevMod); if (token.length > 0 && type.length > 0) { - var request = 'token='+token+'&type=' + type; + var request = token+'=1&type=' + type; } return jQuery.ajax({ type: 'GET', @@ -444,9 +444,9 @@ function getAjaxDisplay_server(type){ } function getFieldSelectOptions_server(fieldId){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldSelectOptions&format=json&raw=true"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.fieldSelectOptions&format=json&raw=true"); if (token.length > 0 && fieldId > 0) { - var request = 'token='+token+'&id='+fieldId; + var request = token+'=1&id='+fieldId; } return jQuery.ajax({ type: 'GET', @@ -472,9 +472,9 @@ function getFieldSelectOptions(fieldKey){ } function getEditCustomCodeButtons_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id+'&return_here='+return_here; + var request = token+'=1&id='+id+'&return_here='+return_here; } return jQuery.ajax({ type: 'GET', @@ -513,7 +513,7 @@ function isObject(obj) { function addButtonID_server(type, size){ var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButtonID&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type.length > 0 && size > 0){ - var request = 'token='+token+'&type='+type+'&size='+size; + var request = token+'=1&type='+type+'&size='+size; } return jQuery.ajax({ type: 'GET', @@ -538,7 +538,7 @@ function addButtonID(type, where, size){ function addButton_server(type, size){ var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type.length > 0){ - var request = 'token='+token+'&type='+type+'&size='+size; + var request = token+'=1&type='+type+'&size='+size; } return jQuery.ajax({ type: 'GET', @@ -563,9 +563,9 @@ function addButton(type, where, size){ } function getLinked_server(type){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type > 0){ - var request = 'token='+token+'&type='+type; + var request = token+'=1&type='+type; } return jQuery.ajax({ type: 'GET', diff --git a/admin/models/forms/placeholder.js b/admin/models/forms/placeholder.js index 871f1b71d..0968bf924 100644 --- a/admin/models/forms/placeholder.js +++ b/admin/models/forms/placeholder.js @@ -18,7 +18,6 @@ jQuery(document).ready(function() // check if this function name is taken checkPlaceholderName(placeholderName); }); - function setPlaceholderName(){ // noting for now (we may add more functionality later) } diff --git a/admin/models/forms/server.js b/admin/models/forms/server.js index 0a0f955ac..6483e214f 100644 --- a/admin/models/forms/server.js +++ b/admin/models/forms/server.js @@ -9,15 +9,15 @@ */ // Some Global Values -jform_vvvvwbpwas_required = false; -jform_vvvvwbpwat_required = false; -jform_vvvvwbpwau_required = false; -jform_vvvvwbpwav_required = false; -jform_vvvvwbpwaw_required = false; -jform_vvvvwbqwax_required = false; -jform_vvvvwbrway_required = false; -jform_vvvvwbtwaz_required = false; -jform_vvvvwbvwba_required = false; +jform_vvvvwbpvxr_required = false; +jform_vvvvwbpvxs_required = false; +jform_vvvvwbpvxt_required = false; +jform_vvvvwbpvxu_required = false; +jform_vvvvwbpvxv_required = false; +jform_vvvvwbqvxw_required = false; +jform_vvvvwbrvxx_required = false; +jform_vvvvwbtvxy_required = false; +jform_vvvvwbvvxz_required = false; // Initial Script jQuery(document).ready(function() @@ -66,108 +66,108 @@ function vvvvwbp(protocol_vvvvwbp) { jQuery('#jform_authentication').closest('.control-group').show(); // add required attribute to authentication field - if (jform_vvvvwbpwas_required) + if (jform_vvvvwbpvxr_required) { updateFieldRequired('authentication',0); jQuery('#jform_authentication').prop('required','required'); jQuery('#jform_authentication').attr('aria-required',true); jQuery('#jform_authentication').addClass('required'); - jform_vvvvwbpwas_required = false; + jform_vvvvwbpvxr_required = false; } jQuery('#jform_host').closest('.control-group').show(); // add required attribute to host field - if (jform_vvvvwbpwat_required) + if (jform_vvvvwbpvxs_required) { updateFieldRequired('host',0); jQuery('#jform_host').prop('required','required'); jQuery('#jform_host').attr('aria-required',true); jQuery('#jform_host').addClass('required'); - jform_vvvvwbpwat_required = false; + jform_vvvvwbpvxs_required = false; } jQuery('#jform_port').closest('.control-group').show(); // add required attribute to port field - if (jform_vvvvwbpwau_required) + if (jform_vvvvwbpvxt_required) { updateFieldRequired('port',0); jQuery('#jform_port').prop('required','required'); jQuery('#jform_port').attr('aria-required',true); jQuery('#jform_port').addClass('required'); - jform_vvvvwbpwau_required = false; + jform_vvvvwbpvxt_required = false; } jQuery('#jform_path').closest('.control-group').show(); // add required attribute to path field - if (jform_vvvvwbpwav_required) + if (jform_vvvvwbpvxu_required) { updateFieldRequired('path',0); jQuery('#jform_path').prop('required','required'); jQuery('#jform_path').attr('aria-required',true); jQuery('#jform_path').addClass('required'); - jform_vvvvwbpwav_required = false; + jform_vvvvwbpvxu_required = false; } jQuery('.note_ssh_security').closest('.control-group').show(); jQuery('#jform_username').closest('.control-group').show(); // add required attribute to username field - if (jform_vvvvwbpwaw_required) + if (jform_vvvvwbpvxv_required) { updateFieldRequired('username',0); jQuery('#jform_username').prop('required','required'); jQuery('#jform_username').attr('aria-required',true); jQuery('#jform_username').addClass('required'); - jform_vvvvwbpwaw_required = false; + jform_vvvvwbpvxv_required = false; } } else { jQuery('#jform_authentication').closest('.control-group').hide(); // remove required attribute from authentication field - if (!jform_vvvvwbpwas_required) + if (!jform_vvvvwbpvxr_required) { updateFieldRequired('authentication',1); jQuery('#jform_authentication').removeAttr('required'); jQuery('#jform_authentication').removeAttr('aria-required'); jQuery('#jform_authentication').removeClass('required'); - jform_vvvvwbpwas_required = true; + jform_vvvvwbpvxr_required = true; } jQuery('#jform_host').closest('.control-group').hide(); // remove required attribute from host field - if (!jform_vvvvwbpwat_required) + if (!jform_vvvvwbpvxs_required) { updateFieldRequired('host',1); jQuery('#jform_host').removeAttr('required'); jQuery('#jform_host').removeAttr('aria-required'); jQuery('#jform_host').removeClass('required'); - jform_vvvvwbpwat_required = true; + jform_vvvvwbpvxs_required = true; } jQuery('#jform_port').closest('.control-group').hide(); // remove required attribute from port field - if (!jform_vvvvwbpwau_required) + if (!jform_vvvvwbpvxt_required) { updateFieldRequired('port',1); jQuery('#jform_port').removeAttr('required'); jQuery('#jform_port').removeAttr('aria-required'); jQuery('#jform_port').removeClass('required'); - jform_vvvvwbpwau_required = true; + jform_vvvvwbpvxt_required = true; } jQuery('#jform_path').closest('.control-group').hide(); // remove required attribute from path field - if (!jform_vvvvwbpwav_required) + if (!jform_vvvvwbpvxu_required) { updateFieldRequired('path',1); jQuery('#jform_path').removeAttr('required'); jQuery('#jform_path').removeAttr('aria-required'); jQuery('#jform_path').removeClass('required'); - jform_vvvvwbpwav_required = true; + jform_vvvvwbpvxu_required = true; } jQuery('.note_ssh_security').closest('.control-group').hide(); jQuery('#jform_username').closest('.control-group').hide(); // remove required attribute from username field - if (!jform_vvvvwbpwaw_required) + if (!jform_vvvvwbpvxv_required) { updateFieldRequired('username',1); jQuery('#jform_username').removeAttr('required'); jQuery('#jform_username').removeAttr('aria-required'); jQuery('#jform_username').removeClass('required'); - jform_vvvvwbpwaw_required = true; + jform_vvvvwbpvxv_required = true; } } } @@ -205,13 +205,13 @@ function vvvvwbq(protocol_vvvvwbq) jQuery('.note_ftp_signature').closest('.control-group').show(); jQuery('#jform_signature').closest('.control-group').show(); // add required attribute to signature field - if (jform_vvvvwbqwax_required) + if (jform_vvvvwbqvxw_required) { updateFieldRequired('signature',0); jQuery('#jform_signature').prop('required','required'); jQuery('#jform_signature').attr('aria-required',true); jQuery('#jform_signature').addClass('required'); - jform_vvvvwbqwax_required = false; + jform_vvvvwbqvxw_required = false; } } else @@ -219,13 +219,13 @@ function vvvvwbq(protocol_vvvvwbq) jQuery('.note_ftp_signature').closest('.control-group').hide(); jQuery('#jform_signature').closest('.control-group').hide(); // remove required attribute from signature field - if (!jform_vvvvwbqwax_required) + if (!jform_vvvvwbqvxw_required) { updateFieldRequired('signature',1); jQuery('#jform_signature').removeAttr('required'); jQuery('#jform_signature').removeAttr('aria-required'); jQuery('#jform_signature').removeClass('required'); - jform_vvvvwbqwax_required = true; + jform_vvvvwbqvxw_required = true; } } } @@ -274,26 +274,26 @@ function vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr) { jQuery('#jform_password').closest('.control-group').show(); // add required attribute to password field - if (jform_vvvvwbrway_required) + if (jform_vvvvwbrvxx_required) { updateFieldRequired('password',0); jQuery('#jform_password').prop('required','required'); jQuery('#jform_password').attr('aria-required',true); jQuery('#jform_password').addClass('required'); - jform_vvvvwbrway_required = false; + jform_vvvvwbrvxx_required = false; } } else { jQuery('#jform_password').closest('.control-group').hide(); // remove required attribute from password field - if (!jform_vvvvwbrway_required) + if (!jform_vvvvwbrvxx_required) { updateFieldRequired('password',1); jQuery('#jform_password').removeAttr('required'); jQuery('#jform_password').removeAttr('aria-required'); jQuery('#jform_password').removeClass('required'); - jform_vvvvwbrway_required = true; + jform_vvvvwbrvxx_required = true; } } } @@ -353,26 +353,26 @@ function vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt) { jQuery('#jform_private').closest('.control-group').show(); // add required attribute to private field - if (jform_vvvvwbtwaz_required) + if (jform_vvvvwbtvxy_required) { updateFieldRequired('private',0); jQuery('#jform_private').prop('required','required'); jQuery('#jform_private').attr('aria-required',true); jQuery('#jform_private').addClass('required'); - jform_vvvvwbtwaz_required = false; + jform_vvvvwbtvxy_required = false; } } else { jQuery('#jform_private').closest('.control-group').hide(); // remove required attribute from private field - if (!jform_vvvvwbtwaz_required) + if (!jform_vvvvwbtvxy_required) { updateFieldRequired('private',1); jQuery('#jform_private').removeAttr('required'); jQuery('#jform_private').removeAttr('aria-required'); jQuery('#jform_private').removeClass('required'); - jform_vvvvwbtwaz_required = true; + jform_vvvvwbtvxy_required = true; } } } @@ -432,26 +432,26 @@ function vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv) { jQuery('#jform_private_key').closest('.control-group').show(); // add required attribute to private_key field - if (jform_vvvvwbvwba_required) + if (jform_vvvvwbvvxz_required) { updateFieldRequired('private_key',0); jQuery('#jform_private_key').prop('required','required'); jQuery('#jform_private_key').attr('aria-required',true); jQuery('#jform_private_key').addClass('required'); - jform_vvvvwbvwba_required = false; + jform_vvvvwbvvxz_required = false; } } else { jQuery('#jform_private_key').closest('.control-group').hide(); // remove required attribute from private_key field - if (!jform_vvvvwbvwba_required) + if (!jform_vvvvwbvvxz_required) { updateFieldRequired('private_key',1); jQuery('#jform_private_key').removeAttr('required'); jQuery('#jform_private_key').removeAttr('aria-required'); jQuery('#jform_private_key').removeClass('required'); - jform_vvvvwbvwba_required = true; + jform_vvvvwbvvxz_required = true; } } } diff --git a/admin/models/forms/site_view.js b/admin/models/forms/site_view.js index 815d76d84..4cacc0c55 100644 --- a/admin/models/forms/site_view.js +++ b/admin/models/forms/site_view.js @@ -8,19 +8,6 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -// Some Global Values -jform_vvvvvytvyp_required = false; -jform_vvvvvyuvyq_required = false; -jform_vvvvvyvvyr_required = false; -jform_vvvvvywvys_required = false; -jform_vvvvvyxvyt_required = false; -jform_vvvvvyyvyu_required = false; -jform_vvvvvyzvyv_required = false; -jform_vvvvvzavyw_required = false; -jform_vvvvvzbvyx_required = false; -jform_vvvvvzcvyy_required = false; -jform_vvvvvzcvyz_required = false; - // Initial Script jQuery(document).ready(function() { @@ -65,28 +52,10 @@ function vvvvvyt(add_php_view_vvvvvyt) if (add_php_view_vvvvvyt == 1) { jQuery('#jform_php_view-lbl').closest('.control-group').show(); - // add required attribute to php_view field - if (jform_vvvvvytvyp_required) - { - updateFieldRequired('php_view',0); - jQuery('#jform_php_view').prop('required','required'); - jQuery('#jform_php_view').attr('aria-required',true); - jQuery('#jform_php_view').addClass('required'); - jform_vvvvvytvyp_required = false; - } } else { jQuery('#jform_php_view-lbl').closest('.control-group').hide(); - // remove required attribute from php_view field - if (!jform_vvvvvytvyp_required) - { - updateFieldRequired('php_view',1); - jQuery('#jform_php_view').removeAttr('required'); - jQuery('#jform_php_view').removeAttr('aria-required'); - jQuery('#jform_php_view').removeClass('required'); - jform_vvvvvytvyp_required = true; - } } } @@ -97,28 +66,10 @@ function vvvvvyu(add_php_jview_display_vvvvvyu) if (add_php_jview_display_vvvvvyu == 1) { jQuery('#jform_php_jview_display-lbl').closest('.control-group').show(); - // add required attribute to php_jview_display field - if (jform_vvvvvyuvyq_required) - { - updateFieldRequired('php_jview_display',0); - jQuery('#jform_php_jview_display').prop('required','required'); - jQuery('#jform_php_jview_display').attr('aria-required',true); - jQuery('#jform_php_jview_display').addClass('required'); - jform_vvvvvyuvyq_required = false; - } } else { jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide(); - // remove required attribute from php_jview_display field - if (!jform_vvvvvyuvyq_required) - { - updateFieldRequired('php_jview_display',1); - jQuery('#jform_php_jview_display').removeAttr('required'); - jQuery('#jform_php_jview_display').removeAttr('aria-required'); - jQuery('#jform_php_jview_display').removeClass('required'); - jform_vvvvvyuvyq_required = true; - } } } @@ -129,28 +80,10 @@ function vvvvvyv(add_php_jview_vvvvvyv) if (add_php_jview_vvvvvyv == 1) { jQuery('#jform_php_jview-lbl').closest('.control-group').show(); - // add required attribute to php_jview field - if (jform_vvvvvyvvyr_required) - { - updateFieldRequired('php_jview',0); - jQuery('#jform_php_jview').prop('required','required'); - jQuery('#jform_php_jview').attr('aria-required',true); - jQuery('#jform_php_jview').addClass('required'); - jform_vvvvvyvvyr_required = false; - } } else { jQuery('#jform_php_jview-lbl').closest('.control-group').hide(); - // remove required attribute from php_jview field - if (!jform_vvvvvyvvyr_required) - { - updateFieldRequired('php_jview',1); - jQuery('#jform_php_jview').removeAttr('required'); - jQuery('#jform_php_jview').removeAttr('aria-required'); - jQuery('#jform_php_jview').removeClass('required'); - jform_vvvvvyvvyr_required = true; - } } } @@ -161,28 +94,10 @@ function vvvvvyw(add_php_document_vvvvvyw) if (add_php_document_vvvvvyw == 1) { jQuery('#jform_php_document-lbl').closest('.control-group').show(); - // add required attribute to php_document field - if (jform_vvvvvywvys_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_vvvvvywvys_required = false; - } } else { jQuery('#jform_php_document-lbl').closest('.control-group').hide(); - // remove required attribute from php_document field - if (!jform_vvvvvywvys_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_vvvvvywvys_required = true; - } } } @@ -193,28 +108,10 @@ function vvvvvyx(add_css_document_vvvvvyx) if (add_css_document_vvvvvyx == 1) { jQuery('#jform_css_document-lbl').closest('.control-group').show(); - // add required attribute to css_document field - if (jform_vvvvvyxvyt_required) - { - updateFieldRequired('css_document',0); - jQuery('#jform_css_document').prop('required','required'); - jQuery('#jform_css_document').attr('aria-required',true); - jQuery('#jform_css_document').addClass('required'); - jform_vvvvvyxvyt_required = false; - } } else { jQuery('#jform_css_document-lbl').closest('.control-group').hide(); - // remove required attribute from css_document field - if (!jform_vvvvvyxvyt_required) - { - updateFieldRequired('css_document',1); - jQuery('#jform_css_document').removeAttr('required'); - jQuery('#jform_css_document').removeAttr('aria-required'); - jQuery('#jform_css_document').removeClass('required'); - jform_vvvvvyxvyt_required = true; - } } } @@ -225,28 +122,10 @@ function vvvvvyy(add_javascript_file_vvvvvyy) if (add_javascript_file_vvvvvyy == 1) { jQuery('#jform_javascript_file-lbl').closest('.control-group').show(); - // add required attribute to javascript_file field - if (jform_vvvvvyyvyu_required) - { - updateFieldRequired('javascript_file',0); - jQuery('#jform_javascript_file').prop('required','required'); - jQuery('#jform_javascript_file').attr('aria-required',true); - jQuery('#jform_javascript_file').addClass('required'); - jform_vvvvvyyvyu_required = false; - } } else { jQuery('#jform_javascript_file-lbl').closest('.control-group').hide(); - // remove required attribute from javascript_file field - if (!jform_vvvvvyyvyu_required) - { - updateFieldRequired('javascript_file',1); - jQuery('#jform_javascript_file').removeAttr('required'); - jQuery('#jform_javascript_file').removeAttr('aria-required'); - jQuery('#jform_javascript_file').removeClass('required'); - jform_vvvvvyyvyu_required = true; - } } } @@ -257,28 +136,10 @@ function vvvvvyz(add_js_document_vvvvvyz) if (add_js_document_vvvvvyz == 1) { jQuery('#jform_js_document-lbl').closest('.control-group').show(); - // add required attribute to js_document field - if (jform_vvvvvyzvyv_required) - { - updateFieldRequired('js_document',0); - jQuery('#jform_js_document').prop('required','required'); - jQuery('#jform_js_document').attr('aria-required',true); - jQuery('#jform_js_document').addClass('required'); - jform_vvvvvyzvyv_required = false; - } } else { jQuery('#jform_js_document-lbl').closest('.control-group').hide(); - // remove required attribute from js_document field - if (!jform_vvvvvyzvyv_required) - { - updateFieldRequired('js_document',1); - jQuery('#jform_js_document').removeAttr('required'); - jQuery('#jform_js_document').removeAttr('aria-required'); - jQuery('#jform_js_document').removeClass('required'); - jform_vvvvvyzvyv_required = true; - } } } @@ -289,28 +150,10 @@ function vvvvvza(add_css_vvvvvza) if (add_css_vvvvvza == 1) { jQuery('#jform_css-lbl').closest('.control-group').show(); - // add required attribute to css field - if (jform_vvvvvzavyw_required) - { - updateFieldRequired('css',0); - jQuery('#jform_css').prop('required','required'); - jQuery('#jform_css').attr('aria-required',true); - jQuery('#jform_css').addClass('required'); - jform_vvvvvzavyw_required = false; - } } else { jQuery('#jform_css-lbl').closest('.control-group').hide(); - // remove required attribute from css field - if (!jform_vvvvvzavyw_required) - { - updateFieldRequired('css',1); - jQuery('#jform_css').removeAttr('required'); - jQuery('#jform_css').removeAttr('aria-required'); - jQuery('#jform_css').removeClass('required'); - jform_vvvvvzavyw_required = true; - } } } @@ -322,29 +165,11 @@ function vvvvvzb(add_php_ajax_vvvvvzb) { jQuery('#jform_ajax_input-lbl').closest('.control-group').show(); jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show(); - // add required attribute to php_ajaxmethod field - if (jform_vvvvvzbvyx_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_vvvvvzbvyx_required = false; - } } else { jQuery('#jform_ajax_input-lbl').closest('.control-group').hide(); jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide(); - // remove required attribute from php_ajaxmethod field - if (!jform_vvvvvzbvyx_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_vvvvvzbvyx_required = true; - } } } @@ -356,49 +181,13 @@ function vvvvvzc(add_custom_button_vvvvvzc) { jQuery('#jform_custom_button-lbl').closest('.control-group').show(); jQuery('#jform_php_controller-lbl').closest('.control-group').show(); - // add required attribute to php_controller field - if (jform_vvvvvzcvyy_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_vvvvvzcvyy_required = false; - } jQuery('#jform_php_model-lbl').closest('.control-group').show(); - // add required attribute to php_model field - if (jform_vvvvvzcvyz_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_vvvvvzcvyz_required = false; - } } else { jQuery('#jform_custom_button-lbl').closest('.control-group').hide(); jQuery('#jform_php_controller-lbl').closest('.control-group').hide(); - // remove required attribute from php_controller field - if (!jform_vvvvvzcvyy_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_vvvvvzcvyy_required = true; - } jQuery('#jform_php_model-lbl').closest('.control-group').hide(); - // remove required attribute from php_model field - if (!jform_vvvvvzcvyz_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_vvvvvzcvyz_required = true; - } } } @@ -440,33 +229,6 @@ function button_position_vvvvvzd_SomeFunc(button_position_vvvvvzd) return false; } -// update required fields -function updateFieldRequired(name,status) -{ - var not_required = jQuery('#jform_not_required').val(); - - if(status == 1) - { - if (isSet(not_required) && not_required != 0) - { - not_required = not_required+','+name; - } - else - { - not_required = ','+name; - } - } - else - { - if (isSet(not_required) && not_required != 0) - { - not_required = not_required.replace(','+name,''); - } - } - - jQuery('#jform_not_required').val(not_required); -} - // the isSet function function isSet(val) { @@ -486,9 +248,9 @@ jQuery(document).ready(function() }); function getLinked_server(type){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && type > 0){ - var request = 'token='+token+'&type='+type; + var request = token+'=1&type='+type; } return jQuery.ajax({ type: 'GET', @@ -508,9 +270,9 @@ function getLinked(){ } function getSnippetDetails_server(snippetId){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json"); if(token.length > 0 && snippetId > 0){ - var request = 'token='+token+'&id='+snippetId; + var request = token+'=1&id='+snippetId; } return jQuery.ajax({ type: 'GET', @@ -557,9 +319,9 @@ function getSnippetDetails(id){ } function getDynamicValues_server(dynamicId){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json"); if(token.length > 0 && dynamicId > 0){ - var request = 'token='+token+'&view=site_view&id='+dynamicId; + var request = token+'=1&view=site_view&id='+dynamicId; } return jQuery.ajax({ type: 'GET', @@ -584,9 +346,9 @@ function getDynamicValues(id){ } function getLayoutDetails_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id; + var request = token+'=1&id='+id; } return jQuery.ajax({ type: 'GET', @@ -610,9 +372,9 @@ function getLayoutDetails(id){ } function getTemplateDetails_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.templateDetails&format=json&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.templateDetails&format=json&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id; + var request = token+'=1&id='+id; } return jQuery.ajax({ type: 'GET', @@ -655,7 +417,7 @@ jQuery(document).ready(function($) function getSnippets_server(libraries){ var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&raw=true&format=json"; if(token.length > 0 && libraries.length > 0){ - var request = 'token='+token+'&libraries='+JSON.stringify(libraries); + var request = token+'=1&libraries='+JSON.stringify(libraries); } return jQuery.ajax({ type: 'GET', @@ -708,9 +470,9 @@ function setSnippets(array){ } function getEditCustomCodeButtons_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id+'&return_here='+return_here; + var request = token+'=1&id='+id+'&return_here='+return_here; } return jQuery.ajax({ type: 'GET', diff --git a/admin/models/forms/site_view.xml b/admin/models/forms/site_view.xml index b9c3f5a57..eff581b52 100644 --- a/admin/models/forms/site_view.xml +++ b/admin/models/forms/site_view.xml @@ -156,7 +156,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -173,7 +172,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -262,7 +260,6 @@ syntax="html" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -296,7 +293,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -319,7 +315,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -345,7 +340,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="false" validate="code" /> @@ -376,7 +370,6 @@ syntax="javascript" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -407,7 +400,6 @@ syntax="javascript" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -564,7 +556,6 @@ syntax="css" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -593,7 +584,6 @@ syntax="css" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -620,7 +610,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -1246,7 +1235,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="false" validate="code" /> diff --git a/admin/models/forms/template.js b/admin/models/forms/template.js index efbc1d633..34290a7bb 100644 --- a/admin/models/forms/template.js +++ b/admin/models/forms/template.js @@ -8,9 +8,6 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -// Some Global Values -jform_vvvvvzevza_required = false; - // Initial Script jQuery(document).ready(function() { @@ -25,58 +22,13 @@ function vvvvvze(add_php_view_vvvvvze) if (add_php_view_vvvvvze == 1) { jQuery('#jform_php_view-lbl').closest('.control-group').show(); - // add required attribute to php_view field - if (jform_vvvvvzevza_required) - { - updateFieldRequired('php_view',0); - jQuery('#jform_php_view').prop('required','required'); - jQuery('#jform_php_view').attr('aria-required',true); - jQuery('#jform_php_view').addClass('required'); - jform_vvvvvzevza_required = false; - } } else { jQuery('#jform_php_view-lbl').closest('.control-group').hide(); - // remove required attribute from php_view field - if (!jform_vvvvvzevza_required) - { - updateFieldRequired('php_view',1); - jQuery('#jform_php_view').removeAttr('required'); - jQuery('#jform_php_view').removeAttr('aria-required'); - jQuery('#jform_php_view').removeClass('required'); - jform_vvvvvzevza_required = true; - } } } -// update required fields -function updateFieldRequired(name,status) -{ - var not_required = jQuery('#jform_not_required').val(); - - if(status == 1) - { - if (isSet(not_required) && not_required != 0) - { - not_required = not_required+','+name; - } - else - { - not_required = ','+name; - } - } - else - { - if (isSet(not_required) && not_required != 0) - { - not_required = not_required.replace(','+name,''); - } - } - - jQuery('#jform_not_required').val(not_required); -} - // the isSet function function isSet(val) { @@ -94,9 +46,9 @@ jQuery(document).ready(function($) }); function getEditCustomCodeButtons_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id+'&return_here='+return_here; + var request = token+'=1&id='+id+'&return_here='+return_here; } return jQuery.ajax({ type: 'GET', @@ -133,9 +85,9 @@ function isObject(obj) { } function getSnippetDetails_server(snippetId){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json"); if(token.length > 0 && snippetId > 0){ - var request = 'token='+token+'&id='+snippetId; + var request = token+'=1&id='+snippetId; } return jQuery.ajax({ type: 'GET', @@ -182,9 +134,9 @@ function getSnippetDetails(id){ } function getDynamicValues_server(dynamicId){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getDynamicValues&format=json"); if(token.length > 0 && dynamicId > 0){ - var request = 'token='+token+'&view=template&id='+dynamicId; + var request = token+'=1&view=template&id='+dynamicId; } return jQuery.ajax({ type: 'GET', @@ -209,9 +161,9 @@ function getDynamicValues(id){ } function getLayoutDetails_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getLayoutDetails&format=json&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id; + var request = token+'=1&id='+id; } return jQuery.ajax({ type: 'GET', @@ -235,9 +187,9 @@ function getLayoutDetails(id){ } function getTemplateDetails_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.templateDetails&format=json&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.templateDetails&format=json&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id; + var request = token+'=1&id='+id; } return jQuery.ajax({ type: 'GET', @@ -280,7 +232,7 @@ jQuery(document).ready(function($) function getSnippets_server(libraries){ var getUrl = "index.php?option=com_componentbuilder&task=ajax.getSnippets&raw=true&format=json"; if(token.length > 0 && libraries.length > 0){ - var request = 'token='+token+'&libraries='+JSON.stringify(libraries); + var request = token+'=1&libraries='+JSON.stringify(libraries); } return jQuery.ajax({ type: 'GET', diff --git a/admin/models/forms/template.xml b/admin/models/forms/template.xml index 81d006e0f..bd1133ec5 100644 --- a/admin/models/forms/template.xml +++ b/admin/models/forms/template.xml @@ -142,7 +142,6 @@ syntax="php" editor="codemirror|none" filter="raw" - required="true" validate="code" /> @@ -181,7 +180,6 @@ syntax="html" editor="codemirror|none" filter="raw" - required="true" validate="code" /> diff --git a/admin/models/forms/validation_rule.js b/admin/models/forms/validation_rule.js index 992c3fdc9..56bf6de28 100644 --- a/admin/models/forms/validation_rule.js +++ b/admin/models/forms/validation_rule.js @@ -32,9 +32,9 @@ jQuery(document).ready(function() }); function getExistingValidationRuleCode_server(rulefilename){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getExistingValidationRuleCode&format=json"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getExistingValidationRuleCode&format=json"); if(token.length > 0 && rulefilename.length > 0){ - var request = 'token='+token+'&name='+rulefilename; + var request = token+'=1&name='+rulefilename; } return jQuery.ajax({ type: 'GET', @@ -84,9 +84,9 @@ function checkRuleName(ruleName) { } // check Function Name function checkRuleName_server(ruleName, ide){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.checkRuleName&format=json"; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.checkRuleName&format=json"); if(token.length > 0){ - var request = 'token='+token+'&name='+ruleName+'&id='+ide; + var request = token+'=1&name='+ruleName+'&id='+ide; } return jQuery.ajax({ type: 'POST', @@ -98,9 +98,9 @@ function checkRuleName_server(ruleName, ide){ } function getEditCustomCodeButtons_server(id){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod; + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getEditCustomCodeButtons&format=json&raw=true&vdm="+vastDevMod); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id+'&return_here='+return_here; + var request = token+'=1&id='+id+'&return_here='+return_here; } return jQuery.ajax({ type: 'GET', diff --git a/admin/models/layout.php b/admin/models/layout.php index 76abad48b..135bc4d5a 100644 --- a/admin/models/layout.php +++ b/admin/models/layout.php @@ -456,42 +456,6 @@ class ComponentbuilderModelLayout extends JModelAdmin return $data; } - /** - * Method to validate the form data. - * - * @param JForm $form The form to validate against. - * @param array $data The data to validate. - * @param string $group The name of the field group to validate. - * - * @return mixed Array of filtered data if valid, false otherwise. - * - * @see JFormRule - * @see JFilterInput - * @since 12.2 - */ - public function validate($form, $data, $group = null) - { - // check if the not_required field is set - if (ComponentbuilderHelper::checkString($data['not_required'])) - { - $requiredFields = (array) explode(',',(string) $data['not_required']); - $requiredFields = array_unique($requiredFields); - // now change the required field attributes value - foreach ($requiredFields as $requiredField) - { - // make sure there is a string value - if (ComponentbuilderHelper::checkString($requiredField)) - { - // change to false - $form->setFieldAttribute($requiredField, 'required', 'false'); - // also clear the data set - $data[$requiredField] = ''; - } - } - } - return parent::validate($form, $data, $group); - } - /** * Method to get the unique fields of this table. * diff --git a/admin/models/server.php b/admin/models/server.php index ce83d23e8..c526099f1 100644 --- a/admin/models/server.php +++ b/admin/models/server.php @@ -179,7 +179,7 @@ class ComponentbuilderModelServer extends JModelAdmin $item->tags->getTagIds($item->id, 'com_componentbuilder.server'); } } - $this->sales_serverupdate_servervvvw = $item->id; + $this->sales_serverorupdate_servervvvw = $item->id; return $item; } @@ -189,7 +189,7 @@ class ComponentbuilderModelServer extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getWbblinked_components() + public function getVyalinked_components() { // Get the user object. $user = JFactory::getUser(); @@ -203,19 +203,19 @@ class ComponentbuilderModelServer extends JModelAdmin // From the componentbuilder_joomla_component table $query->from($db->quoteName('#__componentbuilder_joomla_component', 'a')); - // Filter by sales_serverupdate_servervvvw global. - $sales_serverupdate_servervvvw = $this->sales_serverupdate_servervvvw; - if (is_numeric($sales_serverupdate_servervvvw )) + // Filter by sales_serverorupdate_servervvvw global. + $sales_serverorupdate_servervvvw = $this->sales_serverorupdate_servervvvw; + if (is_numeric($sales_serverorupdate_servervvvw )) { - $query->where('a.sales_server = ' . (int) $sales_serverupdate_servervvvw . ' OR a.update_server = ' . (int) $sales_serverupdate_servervvvw, ' OR'); + $query->where('a.sales_serverORupdate_server = ' . (int) $sales_serverorupdate_servervvvw ); } - elseif (is_string($sales_serverupdate_servervvvw)) + elseif (is_string($sales_serverorupdate_servervvvw)) { - $query->where('a.sales_server = ' . $db->quote($sales_serverupdate_servervvvw) . ' OR a.update_server = ' . $db->quote($sales_serverupdate_servervvvw), ' OR'); + $query->where('a.sales_serverORupdate_server = ' . $db->quote($sales_serverorupdate_servervvvw)); } else { - $query->where('a.update_server = -5'); + $query->where('a.sales_serverORupdate_server = -5'); } // Join over the asset groups. diff --git a/admin/models/site_view.php b/admin/models/site_view.php index 8192eefa8..38cf0d417 100644 --- a/admin/models/site_view.php +++ b/admin/models/site_view.php @@ -625,42 +625,6 @@ class ComponentbuilderModelSite_view extends JModelAdmin return $data; } - /** - * Method to validate the form data. - * - * @param JForm $form The form to validate against. - * @param array $data The data to validate. - * @param string $group The name of the field group to validate. - * - * @return mixed Array of filtered data if valid, false otherwise. - * - * @see JFormRule - * @see JFilterInput - * @since 12.2 - */ - public function validate($form, $data, $group = null) - { - // check if the not_required field is set - if (ComponentbuilderHelper::checkString($data['not_required'])) - { - $requiredFields = (array) explode(',',(string) $data['not_required']); - $requiredFields = array_unique($requiredFields); - // now change the required field attributes value - foreach ($requiredFields as $requiredField) - { - // make sure there is a string value - if (ComponentbuilderHelper::checkString($requiredField)) - { - // change to false - $form->setFieldAttribute($requiredField, 'required', 'false'); - // also clear the data set - $data[$requiredField] = ''; - } - } - } - return parent::validate($form, $data, $group); - } - /** * Method to get the unique fields of this table. * diff --git a/admin/models/template.php b/admin/models/template.php index 91d6ceabb..82ab2241d 100644 --- a/admin/models/template.php +++ b/admin/models/template.php @@ -456,42 +456,6 @@ class ComponentbuilderModelTemplate extends JModelAdmin return $data; } - /** - * Method to validate the form data. - * - * @param JForm $form The form to validate against. - * @param array $data The data to validate. - * @param string $group The name of the field group to validate. - * - * @return mixed Array of filtered data if valid, false otherwise. - * - * @see JFormRule - * @see JFilterInput - * @since 12.2 - */ - public function validate($form, $data, $group = null) - { - // check if the not_required field is set - if (ComponentbuilderHelper::checkString($data['not_required'])) - { - $requiredFields = (array) explode(',',(string) $data['not_required']); - $requiredFields = array_unique($requiredFields); - // now change the required field attributes value - foreach ($requiredFields as $requiredField) - { - // make sure there is a string value - if (ComponentbuilderHelper::checkString($requiredField)) - { - // change to false - $form->setFieldAttribute($requiredField, 'required', 'false'); - // also clear the data set - $data[$requiredField] = ''; - } - } - } - return parent::validate($form, $data, $group); - } - /** * Method to get the unique fields of this table. * diff --git a/admin/views/admin_fields_conditions/tmpl/edit.php b/admin/views/admin_fields_conditions/tmpl/edit.php index 35293dbf6..4fa567151 100644 --- a/admin/views/admin_fields_conditions/tmpl/edit.php +++ b/admin/views/admin_fields_conditions/tmpl/edit.php @@ -130,5 +130,22 @@ jQuery(document).ready(function(){ }); } }); -}); +}); + + +function JRouter(link) { +isSite()) + { + echo 'var url = "'.JURI::root().'";'; + } + else + { + echo 'var url = "";'; + } +?> + return url+link; +} diff --git a/admin/views/admin_fields_relations/tmpl/edit.php b/admin/views/admin_fields_relations/tmpl/edit.php index 732d6d559..833e790e8 100644 --- a/admin/views/admin_fields_relations/tmpl/edit.php +++ b/admin/views/admin_fields_relations/tmpl/edit.php @@ -103,4 +103,27 @@ $componentParams = $this->params; // will be removed just use $this->params inst - + + + diff --git a/admin/views/compiler/tmpl/default.php b/admin/views/compiler/tmpl/default.php index 4d1a32449..2da0f0f65 100644 --- a/admin/views/compiler/tmpl/default.php +++ b/admin/views/compiler/tmpl/default.php @@ -67,20 +67,21 @@ Joomla.submitbutton = function(task) } // Add spindle-wheel for importations: jQuery(document).ready(function($) { - var outerDiv = $('body'); - - $('
') - .css("background", "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat") - .css("top", outerDiv.position().top - $(window).scrollTop()) - .css("left", outerDiv.position().left - $(window).scrollLeft()) - .css("width", outerDiv.width()) - .css("height", outerDiv.height()) - .css("position", "fixed") - .css("opacity", "0.80") - .css("-ms-filter", "progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)") - .css("filter", "alpha(opacity = 80)") - .css("display", "none") - .appendTo(outerDiv); + +// waiting spinner +var outerDiv = jQuery('body'); +jQuery('
') + .css("background", "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat") + .css("top", outerDiv.position().top - jQuery(window).scrollTop()) + .css("left", outerDiv.position().left - jQuery(window).scrollLeft()) + .css("width", outerDiv.width()) + .css("height", outerDiv.height()) + .css("position", "fixed") + .css("opacity", "0.80") + .css("-ms-filter", "progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)") + .css("filter", "alpha(opacity = 80)") + .css("display", "none") + .appendTo(outerDiv); }); sidebar)): ?> diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php index a814874f9..f18cfc7ee 100644 --- a/admin/views/compiler/view.html.php +++ b/admin/views/compiler/view.html.php @@ -233,7 +233,7 @@ class ComponentbuilderViewCompiler extends JViewLegacy function getComponentDetails_server(id){ var getUrl = JRouter(\"index.php?option=com_componentbuilder&task=ajax.getComponentDetails&format=json\"); if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id; + var request = token+'=1&id='+id; } return jQuery.ajax({ type: 'GET', @@ -278,7 +278,7 @@ class ComponentbuilderViewCompiler extends JViewLegacy var getUrl = JRouter(\"index.php?option=com_componentbuilder&task=ajax.isRead&format=json\"); } if(token.length > 0 && notice.length){ - var request = \"token=\"+token+\"¬ice=\"+notice; + var request = token+\"=1¬ice=\"+notice; } return jQuery.ajax({ type: \"POST\", diff --git a/admin/views/component_dashboard/tmpl/edit.php b/admin/views/component_dashboard/tmpl/edit.php index 6fbb3b9eb..be38a716d 100644 --- a/admin/views/component_dashboard/tmpl/edit.php +++ b/admin/views/component_dashboard/tmpl/edit.php @@ -103,4 +103,27 @@ $componentParams = $this->params; // will be removed just use $this->params inst - + + + diff --git a/admin/views/custom_admin_view/tmpl/edit.php b/admin/views/custom_admin_view/tmpl/edit.php index bfb648fda..7c857a543 100644 --- a/admin/views/custom_admin_view/tmpl/edit.php +++ b/admin/views/custom_admin_view/tmpl/edit.php @@ -396,7 +396,24 @@ jQuery(document).ready( function($) { } $(".loading-dots").text(dots); } , 500); -}); +}); + + +function JRouter(link) { +isSite()) + { + echo 'var url = "'.JURI::root().'";'; + } + else + { + echo 'var url = "";'; + } +?> + return url+link; +} jQuery(document).ready(function(){ jQuery(document).on('subform-row-add', function(event, row){ getIconImage(jQuery(row).find('.icomoon342')); diff --git a/admin/views/custom_code/tmpl/edit.php b/admin/views/custom_code/tmpl/edit.php index 1a9d78088..3dfe0c6c8 100644 --- a/admin/views/custom_code/tmpl/edit.php +++ b/admin/views/custom_code/tmpl/edit.php @@ -266,5 +266,22 @@ jQuery(document).ready( function($) { } $(".loading-dots").text(dots); } , 500); -}); +}); + + +function JRouter(link) { +isSite()) + { + echo 'var url = "'.JURI::root().'";'; + } + else + { + echo 'var url = "";'; + } +?> + return url+link; +} diff --git a/admin/views/dynamic_get/tmpl/edit.php b/admin/views/dynamic_get/tmpl/edit.php index 8a35153e3..a109f91a6 100644 --- a/admin/views/dynamic_get/tmpl/edit.php +++ b/admin/views/dynamic_get/tmpl/edit.php @@ -663,20 +663,17 @@ jQuery(document).ready(function(){ }); }); - $funcName): ?>jQuery('#adminForm').on('change', '#jform__table_main',function (e) { // get options var value_ = jQuery("#jform__table_main option:selected").val(); getTableColumns(value_, 'a', '', 3, true, '', ''); }); - // #jform_add_php_router_parse listeners jQuery('#jform_add_php_router_parse').on('change',function() { var valueSwitch = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val(); getDynamicScripts(valueSwitch); }); - jQuery('#adminForm').on('change', '#jform_select_all',function (e) { e.preventDefault(); @@ -685,7 +682,23 @@ jQuery('#adminForm').on('change', '#jform_select_all',function (e) setSelectAll(select_all); }); - + + +function JRouter(link) { +isSite()) + { + echo 'var url = "'.JURI::root().'";'; + } + else + { + echo 'var url = "";'; + } +?> + return url+link; +} // nice little dot trick :) jQuery(document).ready( function($) { diff --git a/admin/views/fieldtype/tmpl/edit.php b/admin/views/fieldtype/tmpl/edit.php index 7a6fa1bef..349d9d967 100644 --- a/admin/views/fieldtype/tmpl/edit.php +++ b/admin/views/fieldtype/tmpl/edit.php @@ -492,4 +492,23 @@ jQuery('#adminForm').on('change', '#jform_has_defaults',function (e) }); + + + + +function JRouter(link) { +isSite()) + { + echo 'var url = "'.JURI::root().'";'; + } + else + { + echo 'var url = "";'; + } +?> + return url+link; +} diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php index c5392c3f2..b06162dc0 100644 --- a/admin/views/fieldtype/view.html.php +++ b/admin/views/fieldtype/view.html.php @@ -57,7 +57,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy } // Get Linked view data - $this->warfields = $this->get('Warfields'); + $this->vxqfields = $this->get('Vxqfields'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/get_snippets/tmpl/default.php b/admin/views/get_snippets/tmpl/default.php index 9a032bcdf..7940efa28 100644 --- a/admin/views/get_snippets/tmpl/default.php +++ b/admin/views/get_snippets/tmpl/default.php @@ -226,7 +226,24 @@ jQuery(document).ready( function($) { } $(".loading-dots").text(dots); } , 500); -}); +}); + + +function JRouter(link) { +isSite()) + { + echo 'var url = "'.JURI::root().'";'; + } + else + { + echo 'var url = "";'; + } +?> + return url+link; +}

diff --git a/admin/views/languages/tmpl/default.php b/admin/views/languages/tmpl/default.php index 8dea911ad..8203eaf96 100644 --- a/admin/views/languages/tmpl/default.php +++ b/admin/views/languages/tmpl/default.php @@ -85,6 +85,7 @@ if ($this->saveOrder) diff --git a/admin/views/library/tmpl/edit.php b/admin/views/library/tmpl/edit.php index 65d34ea39..1f5bbd2ad 100644 --- a/admin/views/library/tmpl/edit.php +++ b/admin/views/library/tmpl/edit.php @@ -319,5 +319,5 @@ jQuery(document).ready( function($) { } $(".loading-dots").text(dots); } , 500); -}); +}); diff --git a/admin/views/placeholder/tmpl/edit.php b/admin/views/placeholder/tmpl/edit.php index 86a95b352..a4dfa13be 100644 --- a/admin/views/placeholder/tmpl/edit.php +++ b/admin/views/placeholder/tmpl/edit.php @@ -134,5 +134,22 @@ jQuery(document).ready( function($) { } $(".loading-dots").text(dots); } , 500); -}); +}); + + +function JRouter(link) { +isSite()) + { + echo 'var url = "'.JURI::root().'";'; + } + else + { + echo 'var url = "";'; + } +?> + return url+link; +} diff --git a/admin/views/server/view.html.php b/admin/views/server/view.html.php index 0f720c642..a6e4ef3a8 100644 --- a/admin/views/server/view.html.php +++ b/admin/views/server/view.html.php @@ -57,7 +57,7 @@ class ComponentbuilderViewServer extends JViewLegacy } // Get Linked view data - $this->wbblinked_components = $this->get('Wbblinked_components'); + $this->vyalinked_components = $this->get('Vyalinked_components'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/site_view/tmpl/edit.php b/admin/views/site_view/tmpl/edit.php index 87242ca70..df756a40c 100644 --- a/admin/views/site_view/tmpl/edit.php +++ b/admin/views/site_view/tmpl/edit.php @@ -414,7 +414,24 @@ jQuery(document).ready( function($) { } $(".loading-dots").text(dots); } , 500); -}); +}); + + +function JRouter(link) { +isSite()) + { + echo 'var url = "'.JURI::root().'";'; + } + else + { + echo 'var url = "";'; + } +?> + return url+link; +} jQuery(document).ready(function(){ jQuery(document).on('subform-row-add', function(event, row){ getIconImage(jQuery(row).find('.icomoon342')); diff --git a/admin/views/template/tmpl/edit.php b/admin/views/template/tmpl/edit.php index 84da6a428..5200a4574 100644 --- a/admin/views/template/tmpl/edit.php +++ b/admin/views/template/tmpl/edit.php @@ -213,5 +213,22 @@ jQuery(document).ready(function() { }); // some lang strings var select_a_snippet = ''; -var create_a_snippet = ''; +var create_a_snippet = ''; + + +function JRouter(link) { +isSite()) + { + echo 'var url = "'.JURI::root().'";'; + } + else + { + echo 'var url = "";'; + } +?> + return url+link; +} diff --git a/admin/views/validation_rule/tmpl/edit.php b/admin/views/validation_rule/tmpl/edit.php index d12d3b46a..a5bcd9d69 100644 --- a/admin/views/validation_rule/tmpl/edit.php +++ b/admin/views/validation_rule/tmpl/edit.php @@ -121,14 +121,12 @@ jQuery('#componentbuilder_loader').on('change', '#jform_inherit',function (e) { var rulefilename = jQuery("#jform_inherit option:selected").val(); getExistingValidationRuleCode(rulefilename); }); - jQuery('#componentbuilder_loader').on('change', '#jform_name',function (e) { var ruleName = jQuery('#jform_name').val(); // check if this rule name is taken checkRuleName(ruleName); }); - // nice little dot trick :) jQuery(document).ready( function($) { @@ -141,5 +139,22 @@ jQuery(document).ready( function($) { } $(".loading-dots").text(dots); } , 500); -}); +}); + + +function JRouter(link) { +isSite()) + { + echo 'var url = "'.JURI::root().'";'; + } + else + { + echo 'var url = "";'; + } +?> + return url+link; +} diff --git a/componentbuilder.xml b/componentbuilder.xml index 91d56596e..38c5fd33e 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 6th July, 2019 + 8th July, 2019 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://www.joomlacomponentbuilder.com diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index 2b4801c52..ee36b9328 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -124,6 +124,65 @@ abstract class ComponentbuilderHelper 'JPATH_THEMES' => JPATH_THEMES ); + /** + * get the method code + * + * @input int The method ID + * + * @returns string on success + **/ + public static function getMethodCode($id) + { + // Get a db connection. + $db = JFactory::getDbo(); + // Create a new query object. + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.comment','a.name','a.visibility','a.params','a.code'))); + $query->from($db->quoteName('#__componentbuilder_method','a')); + $query->where($db->quoteName('a.id') . ' = ' . (int) $id); + // Implement View Level Access + if (!$user->authorise('core.options', 'com_componentbuilder')) + { + $columns = $db->getTableColumns('#__componentbuilder_method'); + if(isset($columns['access'])) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + } + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + // get the method + $method = $db->loadObject; + // combine method values + $combinded = array(); + // add comment if set + if (self::checkString($method->comment)) + { + $combinded[] = $method->comment; + } + // set the method sginature + $combinded[] = "\t" . $method->visibility . ' function ' . $method->name . '(' . $method->params . ')'; + // set the method code + $combinded[] = "\t" . "{"; + // add comment if set + if (self::checkString($method->code)) + { + $combinded[] = $method->code; + } + else + { + $combinded[] = "\t\t// add your code here"; + } + $combinded[] = "\t" . "}"; + // return the method + return implode(PHP_EOL, $combinded); + } + return false; + } + /** * Making class or function name safe *