diff --git a/README.md b/README.md
index 1a987be40..11568a2b8 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.9) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.10) with **ALL** its features and **ALL** concepts totally open-source and free!
> Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
@@ -126,13 +126,13 @@ Component Builder is mapped as a component in itself on my local development env
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](http://joomlacomponentbuilder.com)
+ *First Build*: 30th April, 2015
-+ *Last Build*: 29th December, 2017
-+ *Version*: 2.6.9
++ *Last Build*: 15th January, 2018
++ *Version*: 2.6.10
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **178630**
-+ *Field count*: **1539**
-+ *File count*: **1147**
++ *Line count*: **179644**
++ *Field count*: **1571**
++ *File count*: **1151**
+ *Folder count*: **184**
> This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
diff --git a/admin/README.txt b/admin/README.txt
index 1a987be40..11568a2b8 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.9) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.10) with **ALL** its features and **ALL** concepts totally open-source and free!
> Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
@@ -126,13 +126,13 @@ Component Builder is mapped as a component in itself on my local development env
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](http://joomlacomponentbuilder.com)
+ *First Build*: 30th April, 2015
-+ *Last Build*: 29th December, 2017
-+ *Version*: 2.6.9
++ *Last Build*: 15th January, 2018
++ *Version*: 2.6.10
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **178630**
-+ *Field count*: **1539**
-+ *File count*: **1147**
++ *Line count*: **179644**
++ *Field count*: **1571**
++ *File count*: **1151**
+ *Folder count*: **184**
> This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
diff --git a/admin/compiler/joomla_3/Helper.php b/admin/compiler/joomla_3/Helper.php
index 7fdcd2b52..b7410f773 100644
--- a/admin/compiler/joomla_3/Helper.php
+++ b/admin/compiler/joomla_3/Helper.php
@@ -42,6 +42,24 @@ abstract class ###Component###Helper
$manifestUrl = JPATH_ADMINISTRATOR."/components/com_###component###/###component###.xml";
return simplexml_load_file($manifestUrl);
}
+
+ /**
+ * Joomla version object
+ **/
+ protected static $JVersion;
+
+ /**
+ * set/get Joomla version
+ **/
+ public static function jVersion()
+ {
+ // check if set
+ if (!self::checkObject(self::$JVersion))
+ {
+ self::$JVersion = new JVersion();
+ }
+ return self::$JVersion;
+ }
/**
* Load the Contributors details.
diff --git a/admin/compiler/joomla_3/Helper_site.php b/admin/compiler/joomla_3/Helper_site.php
index c84f8c55f..7be66c600 100644
--- a/admin/compiler/joomla_3/Helper_site.php
+++ b/admin/compiler/joomla_3/Helper_site.php
@@ -61,10 +61,10 @@ abstract class ###Component###Helper
}
return (string) implode($sperator,$result);
}
- return (string) json_decode($value);
- }
- return $value;
- }
+ return (string) json_decode($value);
+ }
+ return $value;
+ }
/**
* Load the Component xml manifest.
@@ -74,6 +74,24 @@ abstract class ###Component###Helper
$manifestUrl = JPATH_ADMINISTRATOR."/components/com_###component###/###component###.xml";
return simplexml_load_file($manifestUrl);
}
+
+ /**
+ * Joomla version object
+ **/
+ protected static $JVersion;
+
+ /**
+ * set/get Joomla version
+ **/
+ public static function jVersion()
+ {
+ // check if set
+ if (!self::checkObject(self::$JVersion))
+ {
+ self::$JVersion = new JVersion();
+ }
+ return self::$JVersion;
+ }
/**
* Load the Contributors details.
diff --git a/admin/compiler/joomla_3/JViewLegacy_custom_admin.php b/admin/compiler/joomla_3/JViewLegacy_custom_admin.php
index bfda48403..1c7591ab8 100644
--- a/admin/compiler/joomla_3/JViewLegacy_custom_admin.php
+++ b/admin/compiler/joomla_3/JViewLegacy_custom_admin.php
@@ -56,7 +56,7 @@ class ###Component###View###SView### extends JViewLegacy
protected function setDocument()
{###CUSTOM_ADMIN_LIBRARIES_LOADER### ###CUSTOM_ADMIN_DOCUMENT_METADATA### ###CUSTOM_ADMIN_UIKIT_LOADER### ###CUSTOM_ADMIN_GOOGLECHART_LOADER### ###CUSTOM_ADMIN_FOOTABLE_LOADER### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_PHP###
// add the document default css file
- $this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_###component###/assets/css/###sview###.css');###CUSTOM_ADMIN_DOCUMENT_CUSTOM_CSS### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_JS###
+ $this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_###component###/assets/css/###sview###.css', (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');###CUSTOM_ADMIN_DOCUMENT_CUSTOM_CSS### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_JS###
}
/**
diff --git a/admin/compiler/joomla_3/JViewLegacy_edit.php b/admin/compiler/joomla_3/JViewLegacy_edit.php
index 6ac457c7a..280c17f58 100644
--- a/admin/compiler/joomla_3/JViewLegacy_edit.php
+++ b/admin/compiler/joomla_3/JViewLegacy_edit.php
@@ -122,9 +122,9 @@ class ###Component###View###View### extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_###component###/assets/css/###view###.css", array('version' => 'auto'));###AJAXTOKE### ###LINKEDVIEWTABLESCRIPTS###
- $this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
- $this->document->addScript(JURI::root() . "administrator/components/com_###component###/views/###view###/submitbutton.js", array('version' => 'auto')); ###DOCUMENT_CUSTOM_PHP###
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_###component###/assets/css/###view###.css", (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');###AJAXTOKE### ###LINKEDVIEWTABLESCRIPTS###
+ $this->document->addScript(JURI::root() . $this->script, (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript(JURI::root() . "administrator/components/com_###component###/views/###view###/submitbutton.js", (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); ###DOCUMENT_CUSTOM_PHP###
JText::script('view not acceptable. Error');
}
}
diff --git a/admin/compiler/joomla_3/JViewLegacy_edit_site.php b/admin/compiler/joomla_3/JViewLegacy_edit_site.php
index 63d5d0e73..7d11ec1e8 100644
--- a/admin/compiler/joomla_3/JViewLegacy_edit_site.php
+++ b/admin/compiler/joomla_3/JViewLegacy_edit_site.php
@@ -127,13 +127,13 @@ class ###Component###View###View### extends JViewLegacy
}
$this->document->setTitle(JText::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT'));
// we need this to fix the form display
- $this->document->addStyleSheet(JURI::root()."administrator/templates/isis/css/template.css", array('version' => 'auto'));
- $this->document->addScript(JURI::root()."administrator/templates/isis/js/template.js", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root()."administrator/templates/isis/css/template.css", (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+ $this->document->addScript(JURI::root()."administrator/templates/isis/js/template.js", (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
// the default style of this view
- $this->document->addStyleSheet(JURI::root()."components/com_###component###/assets/css/###view###.css", array('version' => 'auto'));###AJAXTOKE### ###LINKEDVIEWTABLESCRIPTS###
+ $this->document->addStyleSheet(JURI::root()."components/com_###component###/assets/css/###view###.css", (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');###AJAXTOKE### ###LINKEDVIEWTABLESCRIPTS###
// default javascript of this view
- $this->document->addScript(JURI::root().$this->script, array('version' => 'auto'));
- $this->document->addScript(JURI::root(). "components/com_###component###/views/###view###/submitbutton.js", array('version' => 'auto')); ###DOCUMENT_CUSTOM_PHP###
+ $this->document->addScript(JURI::root().$this->script, (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript(JURI::root(). "components/com_###component###/views/###view###/submitbutton.js", (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); ###DOCUMENT_CUSTOM_PHP###
JText::script('view not acceptable. Error');
}
}
diff --git a/admin/compiler/joomla_3/JViewLegacy_list.php b/admin/compiler/joomla_3/JViewLegacy_list.php
index 1c114be8b..0bcff84ee 100644
--- a/admin/compiler/joomla_3/JViewLegacy_list.php
+++ b/admin/compiler/joomla_3/JViewLegacy_list.php
@@ -202,7 +202,7 @@ class ###Component###View###Views### extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_('COM_###COMPONENT###_###VIEWS###'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_###component###/assets/css/###views###.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_###component###/assets/css/###views###.css", (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
}
/**
diff --git a/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php b/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php
index 6242152ee..2fbfce638 100644
--- a/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php
+++ b/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php
@@ -56,7 +56,7 @@ class ###Component###View###SViews### extends JViewLegacy
protected function setDocument()
{###CUSTOM_ADMIN_LIBRARIES_LOADER### ###CUSTOM_ADMIN_UIKIT_LOADER### ###CUSTOM_ADMIN_GOOGLECHART_LOADER### ###CUSTOM_ADMIN_FOOTABLE_LOADER### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_PHP###
// add the document default css file
- $this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_###component###/assets/css/###sviews###.css', array('version' => 'auto'));###CUSTOM_ADMIN_DOCUMENT_CUSTOM_CSS### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_JS###
+ $this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_###component###/assets/css/###sviews###.css', (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');###CUSTOM_ADMIN_DOCUMENT_CUSTOM_CSS### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_JS###
}
/**
diff --git a/admin/compiler/joomla_3/JViewLegacy_list_site.php b/admin/compiler/joomla_3/JViewLegacy_list_site.php
index d3832c31c..ffb2113f0 100644
--- a/admin/compiler/joomla_3/JViewLegacy_list_site.php
+++ b/admin/compiler/joomla_3/JViewLegacy_list_site.php
@@ -54,7 +54,7 @@ class ###Component###View###SViews### extends JViewLegacy
protected function _prepareDocument()
{###SITE_LIBRARIES_LOADER### ###SITE_UIKIT_LOADER### ###SITE_GOOGLECHART_LOADER### ###SITE_FOOTABLE_LOADER### ###SITE_DOCUMENT_METADATA### ###SITE_DOCUMENT_CUSTOM_PHP###
// add the document default css file
- $this->document->addStyleSheet(JURI::root(true) .'/components/com_###component###/assets/css/###sview###.css', array('version' => 'auto'));###SITE_DOCUMENT_CUSTOM_CSS### ###SITE_DOCUMENT_CUSTOM_JS###
+ $this->document->addStyleSheet(JURI::root(true) .'/components/com_###component###/assets/css/###sview###.css', (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');###SITE_DOCUMENT_CUSTOM_CSS### ###SITE_DOCUMENT_CUSTOM_JS###
}
/**
diff --git a/admin/compiler/joomla_3/JViewLegacy_site.php b/admin/compiler/joomla_3/JViewLegacy_site.php
index aab75da62..ae2e5b1b6 100644
--- a/admin/compiler/joomla_3/JViewLegacy_site.php
+++ b/admin/compiler/joomla_3/JViewLegacy_site.php
@@ -54,7 +54,7 @@ class ###Component###View###SView### extends JViewLegacy
protected function _prepareDocument()
{###SITE_LIBRARIES_LOADER### ###SITE_UIKIT_LOADER### ###SITE_GOOGLECHART_LOADER### ###SITE_FOOTABLE_LOADER### ###SITE_DOCUMENT_METADATA### ###SITE_DOCUMENT_CUSTOM_PHP###
// add the document default css file
- $this->document->addStyleSheet(JURI::root(true) .'/components/com_###component###/assets/css/###sview###.css', array('version' => 'auto'));###SITE_DOCUMENT_CUSTOM_CSS### ###SITE_DOCUMENT_CUSTOM_JS###
+ $this->document->addStyleSheet(JURI::root(true) .'/components/com_###component###/assets/css/###sview###.css', (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');###SITE_DOCUMENT_CUSTOM_CSS### ###SITE_DOCUMENT_CUSTOM_JS###
}
/**
diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php
index 6fba22dda..c9f554f5d 100644
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@@ -52,7 +52,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
$this->registerTask('getButton', 'ajax');
$this->registerTask('getButtonID', 'ajax');
$this->registerTask('getAjaxDisplay', 'ajax');
- $this->registerTask('getSnippets', 'ajax');
+ $this->registerTask('getLinked', 'ajax');
$this->registerTask('templateDetails', 'ajax');
$this->registerTask('getLayoutDetails', 'ajax');
$this->registerTask('dbTableColumns', 'ajax');
@@ -60,9 +60,10 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
$this->registerTask('getDynamicValues', 'ajax');
$this->registerTask('checkFunctionName', 'ajax');
$this->registerTask('usedin', 'ajax');
+ $this->registerTask('fieldOptions', 'ajax');
$this->registerTask('snippetDetails', 'ajax');
$this->registerTask('setSnippetGithub', 'ajax');
- $this->registerTask('fieldOptions', 'ajax');
+ $this->registerTask('getSnippets', 'ajax');
}
public function ajax()
@@ -458,14 +459,14 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
}
}
break;
- case 'getSnippets':
+ case 'getLinked':
try
{
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
- $librariesValue = $jinput->get('libraries', NULL, 'STRING');
- if($librariesValue && $user->id != 0)
+ $typeValue = $jinput->get('type', NULL, 'INT');
+ if($typeValue && $user->id != 0)
{
- $result = $this->getModel('ajax')->getSnippets($librariesValue);
+ $result = $this->getModel('ajax')->getLinked($typeValue);
}
else
{
@@ -770,6 +771,44 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
}
}
break;
+ case 'fieldOptions':
+ try
+ {
+ $returnRaw = $jinput->get('raw', false, 'BOOLEAN');
+ $idValue = $jinput->get('id', NULL, 'INT');
+ if($idValue)
+ {
+ $result = $this->getModel('ajax')->getFieldOptions($idValue);
+ }
+ else
+ {
+ $result = false;
+ }
+ if($callback = $jinput->get('callback', null, 'CMD'))
+ {
+ echo $callback . "(".json_encode($result).");";
+ }
+ elseif($returnRaw)
+ {
+ echo json_encode($result);
+ }
+ else
+ {
+ echo "(".json_encode($result).");";
+ }
+ }
+ catch(Exception $e)
+ {
+ if($callback = $jinput->get('callback', null, 'CMD'))
+ {
+ echo $callback."(".json_encode($e).");";
+ }
+ else
+ {
+ echo "(".json_encode($e).");";
+ }
+ }
+ break;
case 'snippetDetails':
try
{
@@ -847,14 +886,14 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
}
}
break;
- case 'fieldOptions':
+ case 'getSnippets':
try
{
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
- $idValue = $jinput->get('id', NULL, 'INT');
- if($idValue)
+ $librariesValue = $jinput->get('libraries', NULL, 'STRING');
+ if($librariesValue && $user->id != 0)
{
- $result = $this->getModel('ajax')->getFieldOptions($idValue);
+ $result = $this->getModel('ajax')->getSnippets($librariesValue);
}
else
{
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 3c691a5aa..f29c49e7f 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -989,17 +989,21 @@ class Get
}
unset($component->javascript);
- // add_css
- if ($component->add_css == 1)
+ // add global CSS
+ $addGlobalCss = array('admin', 'site');
+ foreach ($addGlobalCss as $area)
{
- $this->customScriptBuilder['component_css'] = base64_decode($component->css);
+ // add_css if found
+ if (isset($component->{'add_css_'.$area}) && $component->{'add_css_'.$area} == 1 && isset($component->{'css_'.$area}) && ComponentbuilderHelper::checkString($component->{'css_'.$area}))
+ {
+ $this->customScriptBuilder['component_css_'.$area] = base64_decode($component->{'css_'.$area});
+ }
+ else
+ {
+ $this->customScriptBuilder['component_css_'.$area] = '';
+ }
+ unset($component->{'css_'.$area});
}
- else
- {
- $this->customScriptBuilder['component_css'] = '';
- }
- unset($component->css);
-
// set the lang target
$this->lang = 'admin';
// add PHP in ADMIN
@@ -1212,6 +1216,7 @@ class Get
// Load the results as a list of stdClass objects (see later for more options on retrieving data).
$view = $this->db->loadObject();
+
// setup view name to use in storing the data
$name_single = ComponentbuilderHelper::safeString($view->name_single);
$name_list = ComponentbuilderHelper::safeString($view->name_list);
@@ -1613,6 +1618,7 @@ class Get
unset($this->placeholders['[[[Views]]]']);
unset($this->placeholders['[[[VIEW]]]']);
unset($this->placeholders['[[[VIEWS]]]']);
+
// store this view to class object
$this->_adminViewData[$id] = $view;
}
@@ -1811,23 +1817,45 @@ class Get
// add_Ajax for this view
if (isset($view->add_php_ajax) && $view->add_php_ajax == 1)
{
+ // ajax target (since we only have two options really)
+ if ('site' === $this->target)
+ {
+ $target = 'site';
+ }
+ else
+ {
+ $target = 'admin';
+ }
+ $setAjax = false;
// check if controller input as been set
$view->ajax_input = (isset($view->ajax_input) && ComponentbuilderHelper::checkJson($view->ajax_input)) ? json_decode($view->ajax_input, true) : null;
if (ComponentbuilderHelper::checkArray($view->ajax_input))
{
- $this->customScriptBuilder[$this->target]['ajax_controller'][$view->code] = array_values($view->ajax_input);
- $this->addSiteAjax = true;
+ $this->customScriptBuilder[$target]['ajax_controller'][$view->code] = array_values($view->ajax_input);
+ $setAjax = true;
}
unset($view->ajax_input);
// load the ajax class mathods (if set)
if (ComponentbuilderHelper::checkString($view->php_ajaxmethod))
{
-
- $this->customScriptBuilder[$this->target]['ajax_model'][$view->code] = $this->setDynamicValues(base64_decode($view->php_ajaxmethod));
- $this->addSiteAjax = true;
+ $this->customScriptBuilder[$target]['ajax_model'][$view->code] = $this->setDynamicValues(base64_decode($view->php_ajaxmethod));
+ $setAjax = true;
}
// unset anyway
unset($view->php_ajaxmethod);
+ // should ajax be set
+ if ($setAjax)
+ {
+ // turn on ajax area
+ if ('site' === $this->target)
+ {
+ $this->addSiteAjax = true;
+ }
+ else
+ {
+ $this->addAjax = true;
+ }
+ }
}
// add the custom buttons
if (isset($view->add_custom_button) && $view->add_custom_button == 1)
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index b744798b7..087d229ec 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -3493,9 +3493,9 @@ class Interpretation extends Fields
$chart[] = PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " add the google chart builder class.";
$chart[] = "\t\trequire_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php';";
$chart[] = "\t\t//" . $this->setLine(__LINE__) . " load the google chart js.";
- $chart[] = "\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/js/google.jsapi.js', array('version' => 'auto'));";
- $chart[] = "\t\t\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', array('version' => 'auto'));";
- $chart[] = "\t\t\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', array('version' => 'auto'));";
+ $chart[] = "\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/js/google.jsapi.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+ $chart[] = "\t\t\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+ $chart[] = "\t\t\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
return implode(PHP_EOL, $chart);
}
return '';
@@ -3699,11 +3699,11 @@ class Interpretation extends Fields
switch ($pathInfo['extension'])
{
case 'js':
- return '$this->document->addScript(' . $JURI . '"' . $path . '", array("version" => "auto"));';
+ return '$this->document->addScript(' . $JURI . '"' . $path . '", (' . $this->fileContentStatic['###Component###'] . 'Helper::jVersion()->isCompatible("3.8.0")) ? array("version" => "auto") : "text/javascript");';
break;
case 'css':
case 'less':
- return '$this->document->addStyleSheet(' . $JURI . '"' . $path . '", array("version" => "auto"));';
+ return '$this->document->addStyleSheet(' . $JURI . '"' . $path . '", (' . $this->fileContentStatic['###Component###'] . 'Helper::jVersion()->isCompatible("3.8.0")) ? array("version" => "auto") : "text/css");';
break;
case 'php':
if (strpos($path, 'http') === false)
@@ -3765,12 +3765,12 @@ class Interpretation extends Fields
$setter .= PHP_EOL . PHP_EOL . $tabV . "\t\t//" . $this->setLine(__LINE__) . " The uikit css.";
$setter .= PHP_EOL . $tabV . "\t\tif ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
$setter .= PHP_EOL . $tabV . "\t\t{";
- $setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/uikit'.\$style.\$size.'.css', array('version' => 'auto'));";
+ $setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/uikit'.\$style.\$size.'.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$setter .= PHP_EOL . $tabV . "\t\t}";
$setter .= PHP_EOL . $tabV . "\t\t//" . $this->setLine(__LINE__) . " The uikit js.";
$setter .= PHP_EOL . $tabV . "\t\tif ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
$setter .= PHP_EOL . $tabV . "\t\t{";
- $setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/uikit'.\$size.'.js', array('version' => 'auto'));";
+ $setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/uikit'.\$size.'.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
$setter .= PHP_EOL . $tabV . "\t\t}";
}
// load the components need
@@ -3818,13 +3818,13 @@ class Interpretation extends Fields
$setter .= PHP_EOL . $tabV . "\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css'))";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\t{";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t//" . $this->setLine(__LINE__) . " load the css.";
- $setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', array('version' => 'auto'));";
+ $setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\t}";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\t//" . $this->setLine(__LINE__) . " check if the JavaScript file exists.";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/components/'.\$name.\$size.'.js'))";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\t{";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t//" . $this->setLine(__LINE__) . " load the js.";
- $setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/components/'.\$name.\$size.'.js', array('version' => 'auto'), array('type' => 'text/javascript', 'async' => 'async'));";
+ $setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/components/'.\$name.\$size.'.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\t}";
$setter .= PHP_EOL . $tabV . "\t\t\t\t}";
$setter .= PHP_EOL . $tabV . "\t\t\t}";
@@ -3847,13 +3847,13 @@ class Interpretation extends Fields
$setter .= PHP_EOL . $tabV . "\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css'))";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\t{";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t//" . $this->setLine(__LINE__) . " load the css.";
- $setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', array('version' => 'auto'));";
+ $setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\t}";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\t//" . $this->setLine(__LINE__) . " check if the JavaScript file exists.";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/components/'.\$name.\$size.'.js'))";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\t{";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t//" . $this->setLine(__LINE__) . " load the js.";
- $setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/components/'.\$name.\$size.'.js', array('version' => 'auto'), array('type' => 'text/javascript', 'async' => 'async'));";
+ $setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/components/'.\$name.\$size.'.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);";
$setter .= PHP_EOL . $tabV . "\t\t\t\t\t}";
$setter .= PHP_EOL . $tabV . "\t\t\t\t}";
$setter .= PHP_EOL . $tabV . "\t\t\t}";
@@ -3873,12 +3873,12 @@ class Interpretation extends Fields
$setter .= PHP_EOL . $tabV . "\t\t//" . $this->setLine(__LINE__) . " The uikit css.";
$setter .= PHP_EOL . $tabV . "\t\tif ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
$setter .= PHP_EOL . $tabV . "\t\t{";
- $setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v3/css/uikit'.\$size.'.css', array('version' => 'auto'));";
+ $setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v3/css/uikit'.\$size.'.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$setter .= PHP_EOL . $tabV . "\t\t}";
$setter .= PHP_EOL . $tabV . "\t\t//" . $this->setLine(__LINE__) . " The uikit js.";
$setter .= PHP_EOL . $tabV . "\t\tif ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
$setter .= PHP_EOL . $tabV . "\t\t{";
- $setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v3/js/uikit'.\$size.'.js', array('version' => 'auto'));";
+ $setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v3/js/uikit'.\$size.'.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
$setter .= PHP_EOL . $tabV . "\t\t}";
if (2 == $this->uikit)
{
@@ -5756,7 +5756,7 @@ class Interpretation extends Fields
$componentName = JFilterOutput::cleanText($this->componentData->name);
$this->langContent['adminsys'][$this->langPrefix] = $componentName;
$this->langContent['adminsys'][$this->langPrefix . '_CONFIGURATION'] = $componentName . ' Configuration';
- $this->langContent[$this->lang][$this->langPrefix] = $componentName;
+ $this->langContent['admin'][$this->langPrefix] = $componentName;
$this->langContent['admin'][$this->langPrefix . '_BACK'] = 'Back';
$this->langContent['admin'][$this->langPrefix . '_DASH'] = 'Dashboard';
$this->langContent['admin'][$this->langPrefix . '_VERSION'] = 'Version';
@@ -5781,6 +5781,8 @@ class Interpretation extends Fields
$this->langContent['admin'][$this->langPrefix . '_INACTIVE'] = 'Inactive';
$this->langContent['admin'][$this->langPrefix . '_ARCHIVED'] = 'Archived';
$this->langContent['admin'][$this->langPrefix . '_TRASHED'] = 'Trashed';
+ $this->langContent['admin'][$this->langPrefix . '_NO_ACCESS_GRANTED'] = "No Access Granted!";
+ $this->langContent['admin'][$this->langPrefix . '_NOT_FOUND_OR_ACCESS_DENIED'] = "Not found or access denied!";
if ($this->componentData->add_license && $this->componentData->license_type == 3)
{
$this->langContent['admin']['NIE_REG_NIE'] = "
License not set for " . $componentName . ". Notify your administrator! The license can be obtained from " . $this->componentData->companyname . ".
";
@@ -5822,7 +5824,6 @@ class Interpretation extends Fields
$this->langContent['admin'][$this->langPrefix . '_IMPORT_FILE_COLUMNS'] = "File Columns";
$this->langContent['admin'][$this->langPrefix . '_IMPORT_PLEASE_SELECT_COLUMN'] = "-- Please Select Column --";
$this->langContent['admin'][$this->langPrefix . '_IMPORT_IGNORE_COLUMN'] = "-- Ignore This Column --";
- $this->langContent['admin'][$this->langPrefix . '_NO_ACCESS_GRANTED'] = "No Access Granted!";
}
// check if the both array is set
if (isset($this->langContent['both']) && ComponentbuilderHelper::checkArray($this->langContent['both']))
@@ -5875,6 +5876,7 @@ class Interpretation extends Fields
$this->langContent['site'][$this->langPrefix . '_CREATE_NEW_S'] = "Create New %s";
$this->langContent['site'][$this->langPrefix . '_EDIT_S'] = "Edit %s";
$this->langContent['site'][$this->langPrefix . '_NO_ACCESS_GRANTED'] = "No Access Granted!";
+ $this->langContent['site'][$this->langPrefix . '_NOT_FOUND_OR_ACCESS_DENIED'] = "Not found or access denied!";
// check if the both array is set
if (isset($this->langContent['both']) && ComponentbuilderHelper::checkArray($this->langContent['both']))
@@ -5910,6 +5912,7 @@ class Interpretation extends Fields
// add final list of needed lang strings
$this->langContent['sitesys'][$this->langPrefix] = ComponentbuilderHelper::safeString($this->componentData->name, 'W');
$this->langContent['sitesys'][$this->langPrefix . '_NO_ACCESS_GRANTED'] = "No Access Granted!";
+ $this->langContent['sitesys'][$this->langPrefix . '_NOT_FOUND_OR_ACCESS_DENIED'] = "Not found or access denied!";
// check if the both site array is set
if (isset($this->langContent['bothsite']) && ComponentbuilderHelper::checkArray($this->langContent['bothsite']))
@@ -7176,22 +7179,22 @@ class Interpretation extends Fields
if (!isset($this->footableVersion) || 2 == $this->footableVersion) // loading version 2
{
$foo = PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Add the CSS for Footable.";
- $foo .= PHP_EOL . "\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/css/footable.core.min.css', array('version' => 'auto'));";
+ $foo .= PHP_EOL . "\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/css/footable.core.min.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$foo .= PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Use the Metro Style";
$foo .= PHP_EOL . "\t\tif (!isset(\$this->fooTableStyle) || 0 == \$this->fooTableStyle)";
$foo .= PHP_EOL . "\t\t{";
- $foo .= PHP_EOL . "\t\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/css/footable.metro.min.css', array('version' => 'auto'));";
+ $foo .= PHP_EOL . "\t\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/css/footable.metro.min.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$foo .= PHP_EOL . "\t\t}";
$foo .= PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Use the Legacy Style.";
$foo .= PHP_EOL . "\t\telseif (isset(\$this->fooTableStyle) && 1 == \$this->fooTableStyle)";
$foo .= PHP_EOL . "\t\t{";
- $foo .= PHP_EOL . "\t\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/css/footable.standalone.min.css', array('version' => 'auto'));";
+ $foo .= PHP_EOL . "\t\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/css/footable.standalone.min.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$foo .= PHP_EOL . "\t\t}";
$foo .= PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Add the JavaScript for Footable";
- $foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.js', array('version' => 'auto'));";
- $foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.sort.js', array('version' => 'auto'));";
- $foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.filter.js', array('version' => 'auto'));";
- $foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.paginate.js', array('version' => 'auto'));";
+ $foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+ $foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.sort.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+ $foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.filter.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+ $foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.paginate.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
if ($init)
{
$foo .= PHP_EOL . PHP_EOL . "\t\t" . '$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery(' . "'.footable'" . ').footable(); }); jQuery(' . "'.nav-tabs'" . ').on(' . "'click'" . ', ' . "'li'" . ', function() { setTimeout(tableFix, 10); }); }); function tableFix() { jQuery(' . "'.footable'" . ').trigger(' . "'footable_resize'" . '); }";';
@@ -7203,9 +7206,9 @@ class Interpretation extends Fields
$foo = PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Add the CSS for Footable";
$foo .= PHP_EOL . "\t\t\$this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');";
- $foo .= PHP_EOL . "\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v3/css/footable.standalone.min.css', array('version' => 'auto'));";
+ $foo .= PHP_EOL . "\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v3/css/footable.standalone.min.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$foo .= PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Add the JavaScript for Footable (adding all funtions)";
- $foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v3/js/footable.min.js', array('version' => 'auto'));";
+ $foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v3/js/footable.min.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
if ($init)
{
$foo .= PHP_EOL . PHP_EOL . "\t\t" . '$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery(' . "'.footable'" . ').footable();});});";';
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index 0e31f77aa..790495e89 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -173,9 +173,9 @@ class Infusion extends Interpretation
$this->fileContentStatic['###SITEJS###'] = $this->setPlaceholders($this->customScriptBuilder['component_js'], $this->placeholders);
// ###ADMINCSS###
- $this->fileContentStatic['###ADMINCSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css'], $this->placeholders);
+ $this->fileContentStatic['###ADMINCSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css_admin'], $this->placeholders);
// ###SITECSS###
- $this->fileContentStatic['###SITECSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css'], $this->placeholders);
+ $this->fileContentStatic['###SITECSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css_site'], $this->placeholders);
// ###CUSTOM_HELPER_SCRIPT###
$this->fileContentStatic['###CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_admin'], $this->placeholders);
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index cf8b28172..48f055ea3 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -1853,6 +1853,24 @@ abstract class ComponentbuilderHelper
$manifestUrl = JPATH_ADMINISTRATOR."/components/com_componentbuilder/componentbuilder.xml";
return simplexml_load_file($manifestUrl);
}
+
+ /**
+ * Joomla version object
+ **/
+ protected static $JVersion;
+
+ /**
+ * set/get Joomla version
+ **/
+ public static function jVersion()
+ {
+ // check if set
+ if (!self::checkObject(self::$JVersion))
+ {
+ self::$JVersion = new JVersion();
+ }
+ return self::$JVersion;
+ }
/**
* Load the Contributors details.
@@ -2018,6 +2036,11 @@ abstract class ComponentbuilderHelper
{
JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_SNIPPETS'), 'index.php?option=com_componentbuilder&view=snippets', $submenu === 'snippets');
}
+ // Access control (get_snippets.submenu).
+ if ($user->authorise('get_snippets.submenu', 'com_componentbuilder'))
+ {
+ JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_GET_SNIPPETS'), 'index.php?option=com_componentbuilder&view=get_snippets', $submenu === 'get_snippets');
+ }
if ($user->authorise('field.access', 'com_componentbuilder') && $user->authorise('field.submenu', 'com_componentbuilder'))
{
JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_FIELDS'), 'index.php?option=com_componentbuilder&view=fields', $submenu === 'fields');
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index 4dbfec224..ee87af24f 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -598,6 +598,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION="Some Short
COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION="Linked Fields Display of the fields will load here!
Field Conditions Display of the fields conditions will load here!
"
COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION="Welcome to the new improved fields and conditions layout. We had to remove the repeatable fields layouts since Joomla has depreciated it. With this new improved layout we trust your experience will be better then ever before.
You can still watch the tutorials , and though it was made during the time repeatable fields were still being used, the various concepts and layouts still look mostly the same.
"
COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL="Fields & Conditions"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION="Searching the database.
"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_LABEL="Linked To"
COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION="You can link other views that has relationship with this view. Please watch this tutorial for more info. "
COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_LABEL="Linked Views Options"
COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION="Only if you add permissions here will this view have permissions. Please watch this tutorial for more info."
@@ -2466,6 +2468,8 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION="Add Java
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_LABEL="Add JavaScript (file)"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT="Add Js Document"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL="Add JS (custom document script)"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_AJAX="Add Php Ajax"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_AJAX_LABEL="Add PHP (AJAX)"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_DOCUMENT="Add Php Document"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL="Add PHP (custom document script)"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW="Add Php Jview"
@@ -2474,7 +2478,11 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL="Add PHP (cus
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_LABEL="Add PHP (custom JViewLegacy methods)"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW="Add Php View"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW_LABEL="Add PHP (custom view script)"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_AJAX_INPUT="Ajax Input"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_AJAX_INPUT_LABEL="Ajax Input"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ALNUM="ALNUM"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ARCHIVE="Archive"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ARRAY="ARRAY"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ARROW_DOWN="Arrow Down"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ARROW_DOWN_FOUR="Arrow Down 4"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ARROW_DOWN_THREE="Arrow Down 3"
@@ -2497,10 +2505,12 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ATTACHMENT="Attachment"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BACKWARD_CIRCLE="Backward Circle"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BAN_CIRCLE="Ban Circle"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BARS="Bars"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BASESIXTY_FOUR="BASE64"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BASKET="Basket"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BOOK="Book"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BOOKMARK="Bookmark"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BOOKMARK_TWO="Bookmark 2"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BOOLEAN="BOOLEAN"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BOTH="Both"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BOX_ADD="Box Add"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BOX_REMOVE="Box Remove"
@@ -2522,6 +2532,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CHECKMARK_CIRCLE="Checkmark Circle"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CHECKMARK_TWO="Checkmark 2"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CIRCLE="Circle"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CLOCK="Clock"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CMD="CMD"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME="Codename"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_DESCRIPTION="Add Name in Code Here"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_HINT="codename"
@@ -2598,6 +2609,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FIRST="First"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FLAG="Flag"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FLAG_THREE="Flag 3"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FLASH="Flash"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FLOAT="FLOAT"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FOLDER_CLOSE="Folder Close"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FOLDER_MINUS="Folder Minus"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FOLDER_OPEN="Folder Open"
@@ -2617,6 +2629,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HEART="Heart"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HEART_TWO="Heart 2"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HOME="Home"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HOME_TWO="Home 2"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HTML="HTML"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICOMOON_DESCRIPTION="Joomla Standard Icomoon Fonts"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICOMOON_LABEL="Icon"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON="Icon"
@@ -2627,6 +2640,13 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_IMAGE="Image"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_IMAGES="Images"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INFO="Info"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INFO_CIRCLE="Info Circle"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_DEFAULT_DESCRIPTION="Enter default input value"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_DEFAULT_HINT="Default Value Here"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_DEFAULT_LABEL="Default"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_DEFAULT_MESSAGE="Error! Please add default input value here."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_FILTER_DESCRIPTION="Select the filter used to sanitized the input value."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_FILTER_LABEL="Select a Filter"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INT="INT"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_CSS="JavaScript & CSS"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE="Javascript File"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
@@ -2644,6 +2664,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES="Libraries"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_DESCRIPTION="Select the libraries you want to use here."
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_LABEL="Libraries"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LINK="Link"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LINKED_COMPONENTS="Linked - Components"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIST="List"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIST_TWO="List 2"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LOCATION="Location"
@@ -2659,6 +2680,10 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_DESCRIPTION="Add Controller Method
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_HINT="methodName"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_LABEL="Target Controller Method"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_MESSAGE="Error! Please add controller method name here."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_NAME_DESCRIPTION="Enter method name."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_NAME_HINT="Method Name Here"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_NAME_LABEL="Method Name"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_NAME_MESSAGE="Error! Please add method name here."
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MINUS="Minus"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MINUS_SIGN="Minus Sign"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MOBILE="Mobile"
@@ -2682,6 +2707,8 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION="Searching the database. "
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_LABEL="Linked To"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_SNIPPET_USAGE_LABEL="Snippet Usage"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_UIKIT_SNIPPET_LABEL="Snippet Details"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTIFICATION="Notification"
@@ -2694,6 +2721,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PARAGRAPH_CENTER="Paragraph Center"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PARAGRAPH_JUSTIFY="Paragraph Justify"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PARAGRAPH_LEFT="Paragraph Left"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PARAGRAPH_RIGHT="Paragraph Right"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PATH="PATH"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PAUSE="Pause"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PAUSE_CIRCLE="Pause Circle"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PENCIL="Pencil"
@@ -2702,6 +2730,10 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PERMISSION="Permissions"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHONE="Phone"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHONE_TWO="Phone 2"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP="PHP"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD="Php Ajaxmethod"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_HINT="// PHP Method that should run in the AJAX Model"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL="php Ajax Method"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER="Php Controller"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_HINT="// PHP methods for the controller that the button will target"
@@ -2744,6 +2776,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_QUESTION_TWO="Question 2"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_QUOTES_LEFT="Quotes Left"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_QUOTES_RIGHT="Quotes Right"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_RADIO_UNCHECKED="Radio Unchecked"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_RAW="RAW"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_REPLY="Reply"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SAVE_COPY="Save Copy"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SAVE_NEW="Save New"
@@ -2774,6 +2807,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_STAR_TWO="Star 2"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_STATUS="Status"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_STOP="Stop"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_STOP_CIRCLE="Stop Circle"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_STRING="STRING"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SUPPORT="Support"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SWITCH="Switch"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SYSTEM_NAME="System Name"
@@ -2788,22 +2822,35 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TAGS_TWO="Tags 2"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TAG_TWO="Tag 2"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TARGET_DESCRIPTION="Set the target view type"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TARGET_LABEL="Target"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TASK_NAME_DESCRIPTION="Enter Task Name Here"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TASK_NAME_HINT="Task Name Here"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TASK_NAME_LABEL="Task Name"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TASK_NAME_MESSAGE="Error! Please add task name here."
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_THUMBS_DOWN="Thumbs Down"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_THUMBS_UP="Thumbs Up"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TREE="Tree"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TREE_TWO="Tree 2"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TYPE_DESCRIPTION="for list target"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TYPE_LABEL="Type"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UINT="UINT"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNARCHIVE="Unarchive"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNBLOCK="Unblock"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNDO="Undo"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNDO_TWO="Undo 2"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNFEATURED="Unfeatured"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNKNOWN="unknown"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNLOCK="Unlock"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNPUBLISH="Unpublish"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UPLOAD="Upload"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_USER="User"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_USERNAME="USERNAME"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_USERS="Users"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_USER_CHECK_DESCRIPTION="Allow only users."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_USER_CHECK_LABEL="User Check"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_DESCRIPTION="Enter Value Name Here"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_HINT="Value Name Here"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_LABEL="Value Name"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_MESSAGE="Error! Please add value name here."
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VCARD="Vcard"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VERSION_DESC="A count of the number of times this Custom Admin View has been revised."
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VERSION_LABEL="Revision"
@@ -2811,6 +2858,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WAND="Wand"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WARNING="Warning"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WARNING_CIRCLE="Warning Circle"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WIFI="Wifi"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WORD="WORD"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WRENCH="Wrench"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES="Yes"
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YOUTUBE="Youtube"
@@ -3276,6 +3324,8 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_NN="nn"
COM_COMPONENTBUILDER_DYNAMIC_GET_NO="No"
COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_CALCULATION_ITEMS_DESCRIPTION="Fields are in the $item Object."
COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_CALCULATION_ITEM_DESCRIPTION="Fields are in the $data Object."
+COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_LINKED_TO_NOTICE_DESCRIPTION="Searching the database.
"
+COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_LINKED_TO_NOTICE_LABEL="Linked To"
COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_EQUAL="not equal"
COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_GREATER_THAN="not greater than"
COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_IN="NOT IN"
@@ -3359,7 +3409,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_TAGS="Tags"
COM_COMPONENTBUILDER_DYNAMIC_GET_THIS="This"
COM_COMPONENTBUILDER_DYNAMIC_GET_TT="tt"
COM_COMPONENTBUILDER_DYNAMIC_GET_TWEAK="Tweak"
-COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL="Type"
+COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL="Set Type"
COM_COMPONENTBUILDER_DYNAMIC_GET_U="u"
COM_COMPONENTBUILDER_DYNAMIC_GET_USER="User"
COM_COMPONENTBUILDER_DYNAMIC_GET_USER_GROUPS="User Groups"
@@ -3678,25 +3728,33 @@ COM_COMPONENTBUILDER_FIELD_NEW="A New Field"
COM_COMPONENTBUILDER_FIELD_NO="No"
COM_COMPONENTBUILDER_FIELD_NONE="None"
COM_COMPONENTBUILDER_FIELD_NONE_SET="None Set"
-COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION="The available values for the filter attribute are:
-
- INT
- An integer,
- UINT
- An unsigned integer,
- FLOAT
- A floating point number,
- BOOLEAN
- A boolean value,
- WORD
- A string containing A-Z or underscores only (not case sensitive),
- ALNUM
- A string containing A-Z or 0-9 only (not case sensitive),
- CMD
- A string containing A-Z, 0-9, underscores, periods or hyphens (not case sensitive),
- BASE64
- A string containing A-Z, 0-9, forward slashes, plus or equals (not case sensitive),
- STRING
- A fully decoded and sanitized string (default),
- HTML
- A sanitized string,
- ARRAY
- An array,
- PATH
- A sanitized file path,
- USERNAME
- Do not use (use an application specific filter),
- RAW
- The raw string is returned with no filtering,
- unknown
- An unknown filter will act like STRING. If the input is an array it will return an array of fully decoded and sanitized strings.
-
"
-COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_LABEL="Filter Information"
+COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION=""
COM_COMPONENTBUILDER_FIELD_NOTE_VDM_ENCRYPTION_DESCRIPTION="When using the VDM encryption you need to get a VDM public key from https://www.vdm.io/ "
COM_COMPONENTBUILDER_FIELD_NOTE_VDM_ENCRYPTION_LABEL="The VDM Encryption"
COM_COMPONENTBUILDER_FIELD_NOT_NULL="NOT NULL"
@@ -4093,8 +4151,10 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDUIKIT_LABEL="Add Uikit"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_ADMIN_EVENT="Add Admin Event"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_ADMIN_EVENT_LABEL="Add Global Admin Event"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_BOTH_VTWO_AMP_VTHREE="Add Both v2 & v3"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS="Add Css"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_LABEL="Add CSS"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_ADMIN="Add Css Admin"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_ADMIN_LABEL="Add CSS (admin)"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_SITE="Add Css Site"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_SITE_LABEL="Add CSS (site)"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER="Add Email Helper"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_DESCRIPTION="Adding the email helper class, that can be used to send emails."
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_LABEL="Add Email Helper"
@@ -4176,10 +4236,14 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CREATED_DATE_DESC="The date this Joomla Co
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CREATED_DATE_LABEL="Created Date"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CREATUSERHELPER="Creatuserhelper"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CREATUSERHELPER_LABEL="Add Create User Helper Method"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS="Css"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_HINT="// CSS for the entire back-end"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_LABEL="CSS"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN="Css Admin"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_HINT="// CSS for the entire back-end of your component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_LABEL="CSS (admin)"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE="Css Site"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_HINT="// CSS for the entire front-end of your component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_LABEL="CSS (site)"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_ADMIN_VIEWS="Custom Admin Views"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE="Custom (used in custom code)"
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR="Debug Linenr"
@@ -5019,6 +5083,7 @@ COM_COMPONENTBUILDER_LIBRARY_KEY_WORD_ANY_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD="Ke
COM_COMPONENTBUILDER_LIBRARY_LIBRARIES="Libraries"
COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_DESCRIPTION="Select the libraries you want to bundle here."
COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_LABEL="Libraries"
+COM_COMPONENTBUILDER_LIBRARY_LINKED="Linked"
COM_COMPONENTBUILDER_LIBRARY_MAIN="Main"
COM_COMPONENTBUILDER_LIBRARY_MAX_LENGTH_ONLY_FOUR_TEXT_FIELD="Max Length (only 4 text_field)"
COM_COMPONENTBUILDER_LIBRARY_MIN_LENGTH_ONLY_FOUR_TEXT_FIELD="Min Length (only 4 text_field)"
@@ -5042,6 +5107,8 @@ COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_CONFIG_DESCRIPTION="Linked
COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_FILES_FOLDERS_URLS_DESCRIPTION="Linked Files, Folders & URLs Display of the files, folders & urls will load here!
"
COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_DESCRIPTION="Watch a tutorial overview of the new library manager concept."
COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_LABEL="Quick overview"
+COM_COMPONENTBUILDER_LIBRARY_NOTE_LINKED_TO_NOTICE_DESCRIPTION="Searching the database.
"
+COM_COMPONENTBUILDER_LIBRARY_NOTE_LINKED_TO_NOTICE_LABEL="Linked To"
COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION="There is no behaviour set for this library. This means JCB will not add any files unless you custom code it in somewhere."
COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_LABEL="No Behaviour"
COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_DESCRIPTION="There is no behaviour set for this library. This means JCB will not add any files unless you custom code it in somewhere."
@@ -5102,13 +5169,14 @@ COM_COMPONENTBUILDER_NEW_MEANS_THAT_WE_COULD_NOT_FIND_A_LOCAL_SNIPPET_WITH_THE_S
COM_COMPONENTBUILDER_NEW_NOTICE="New Notice"
COM_COMPONENTBUILDER_NO="No"
COM_COMPONENTBUILDER_NOTRANSLATION="no-translation"
-COM_COMPONENTBUILDER_NOT_FOUND_OR_ACCESS_DENIED="Not found, or access denied."
+COM_COMPONENTBUILDER_NOT_FOUND_OR_ACCESS_DENIED="Not found or access denied!"
COM_COMPONENTBUILDER_NOT_SET="not set"
COM_COMPONENTBUILDER_NO_ACCESS_GRANTED="No Access Granted!"
COM_COMPONENTBUILDER_NO_COMPONENTS_WERE_SELECTED_PLEASE_MAKE_A_SELECTION_AND_TRY_AGAIN="No components were selected, please make a selection and try again!"
COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_FOR_S="No cronjob path found for (%s)"
COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_SINCE_INCORRECT_TYPE_REQUESTED="No cronjob path found since incorrect type requested."
COM_COMPONENTBUILDER_NO_FILES_LINKED="No Files Linked"
+COM_COMPONENTBUILDER_NO_FOUND="No Found"
COM_COMPONENTBUILDER_NO_ITEM_FOUND="No Item Found"
COM_COMPONENTBUILDER_NO_KEYS_WERE_FOUND_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_SETTINGS_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_EXPORT_KEY="No keys were found. To add an export key simply open the component, go to the tab called settings, bottom right there is a field called Export Key."
COM_COMPONENTBUILDER_NO_NEED_TO_GET_IT_SINCE_IT_IS_ALREADY_IN_SYNC_WITH_YOUR_LOCAL_VERSION="No need to get it since it is already in sync with your local version"
@@ -5425,6 +5493,7 @@ COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES="Libraries"
COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION="Select the libraries you want to use here."
COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL="Libraries"
COM_COMPONENTBUILDER_SITE_VIEW_LINK="Link"
+COM_COMPONENTBUILDER_SITE_VIEW_LINKED_COMPONENTS="Linked - Components"
COM_COMPONENTBUILDER_SITE_VIEW_LIST="List"
COM_COMPONENTBUILDER_SITE_VIEW_LIST_TWO="List 2"
COM_COMPONENTBUILDER_SITE_VIEW_LOCATION="Location"
@@ -5469,6 +5538,8 @@ COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL="Add Language Stri
COM_COMPONENTBUILDER_SITE_VIEW_NOTE_CUSTOM_TOOLBAR_PLACEHOLDER_DESCRIPTION="Use this placeholder in the body [[[SITE_TOOLBAR]]]
to add the custom position of the toolbar."
COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION="All libraries you select will dynamically be added to the header of the page according to the settings of the selected library. Each library will also get its respective buttons added to the component global options if it has any set. Please take a look at the libraries for more details."
COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_LABEL="Select libraries you would like to use in your code"
+COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION="Searching the database.
"
+COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LINKED_TO_NOTICE_LABEL="Linked To"
COM_COMPONENTBUILDER_SITE_VIEW_NOTE_SNIPPET_USAGE_LABEL="Snippet Usage"
COM_COMPONENTBUILDER_SITE_VIEW_NOTE_UIKIT_SNIPPET_LABEL="Snippet Details"
COM_COMPONENTBUILDER_SITE_VIEW_NOTIFICATION="Notification"
@@ -5832,6 +5903,7 @@ COM_COMPONENTBUILDER_SUBMENU_DYNAMIC_GETS="Dynamic Gets"
COM_COMPONENTBUILDER_SUBMENU_FIELDS="Fields"
COM_COMPONENTBUILDER_SUBMENU_FIELDTYPES="Fieldtypes"
COM_COMPONENTBUILDER_SUBMENU_FTPS="FTP's"
+COM_COMPONENTBUILDER_SUBMENU_GET_SNIPPETS="Get Snippets"
COM_COMPONENTBUILDER_SUBMENU_HELP_DOCUMENTS="Help Documents"
COM_COMPONENTBUILDER_SUBMENU_JOOMLA_COMPONENTS="Joomla Components"
COM_COMPONENTBUILDER_SUBMENU_LANGUAGES="Languages"
@@ -5985,6 +6057,8 @@ COM_COMPONENTBUILDER_THE_COMPONENT_MYSQL_TWEAKS="The component mysql tweaks"
COM_COMPONENTBUILDER_THE_COMPONENT_SITE_VIEWS="The component site views"
COM_COMPONENTBUILDER_THE_COMPONENT_UPDATES="The component updates"
COM_COMPONENTBUILDER_THE_KEY_OF_THIS_PACKAGE="The key of this package."
+COM_COMPONENTBUILDER_THE_LIBRARY_CONFIG_FIELDS="The library config fields"
+COM_COMPONENTBUILDER_THE_LIBRARY_FILES_FOLDERS_URLS="The library files, folders & URLs"
COM_COMPONENTBUILDER_THE_NAME_OF_THIS_LIBRARY_BSB_CAN_NOT_BE_CHANGED_TO_BSB_OR_THINGS_WILL_BREAK="The name of this library (%s ) can not be changed to %s or things will break."
COM_COMPONENTBUILDER_THE_NOTICE_BOARD_IS_LOADING="The notice board is loading"
COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_CODESCODE="The package key is: %s
"
@@ -5994,7 +6068,7 @@ COM_COMPONENTBUILDER_THE_SEARCH_FOR_THE_SNIPPETS_ARE_CASE_SENSITIVE_SO_IF_YOU_CH
COM_COMPONENTBUILDER_THE_SNIPPETS_WERE_SUCCESSFULLY_EXPORTED="The Snippets Were Successfully Exported!"
COM_COMPONENTBUILDER_THE_SNIPPET_WAS_SUCCESSFULLY_EXPORTED="The Snippet Was Successfully Exported!"
COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING="The wiki is loading"
-COM_COMPONENTBUILDER_THIS_BSB_IS_NOT_LINKED_TO_ANY_S="This %s is not linked to any (%s)!"
+COM_COMPONENTBUILDER_THIS_BSB_IS_NOT_LINKED_TO_ANY_OTHER_AREAS_OF_JCB_AT_THIS_TIME="This %s is not linked to any other areas of JCB at this time!"
COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY="This package has no key."
COM_COMPONENTBUILDER_TITLE="Title"
COM_COMPONENTBUILDER_TOTAL_DOWNLOADS="total downloads"
diff --git a/admin/layouts/admin_view/details_fullwidth.php b/admin/layouts/admin_view/details_fullwidth.php
new file mode 100644
index 000000000..e4ec249ee
--- /dev/null
+++ b/admin/layouts/admin_view/details_fullwidth.php
@@ -0,0 +1,48 @@
+
+ @github Joomla Component Builder
+ @copyright Copyright (C) 2015. All Rights Reserved
+ @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+
+ Builds Complex Joomla Components
+
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+ 'note_linked_to_notice'
+);
+
+?>
+
diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php
new file mode 100644
index 000000000..197d8f141
--- /dev/null
+++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php
@@ -0,0 +1,48 @@
+
+ @github Joomla Component Builder
+ @copyright Copyright (C) 2015. All Rights Reserved
+ @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+
+ Builds Complex Joomla Components
+
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+ 'note_linked_to_notice'
+);
+
+?>
+
diff --git a/admin/layouts/custom_admin_view/php_fullwidth.php b/admin/layouts/custom_admin_view/php_fullwidth.php
index d592322f2..641013366 100644
--- a/admin/layouts/custom_admin_view/php_fullwidth.php
+++ b/admin/layouts/custom_admin_view/php_fullwidth.php
@@ -30,6 +30,9 @@ defined('_JEXEC') or die('Restricted access');
$form = $displayData->getForm();
$fields = $displayData->get('fields') ?: array(
+ 'add_php_ajax',
+ 'php_ajaxmethod',
+ 'ajax_input',
'add_php_document',
'php_document',
'add_php_view',
diff --git a/admin/layouts/dynamic_get/main_fullwidth.php b/admin/layouts/dynamic_get/main_fullwidth.php
index daabf3a2d..c81885a0b 100644
--- a/admin/layouts/dynamic_get/main_fullwidth.php
+++ b/admin/layouts/dynamic_get/main_fullwidth.php
@@ -30,7 +30,8 @@ defined('_JEXEC') or die('Restricted access');
$form = $displayData->getForm();
$fields = $displayData->get('fields') ?: array(
- 'php_custom_get'
+ 'php_custom_get',
+ 'note_linked_to_notice'
);
?>
diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php
index 12b5d8ed1..c41c6cff0 100644
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@@ -28,7 +28,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
-$items = $displayData->vzyfields;
+$items = $displayData->waafields;
$user = JFactory::getUser();
$id = $displayData->item->id;
$edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php
index bae7c0792..785f8e156 100644
--- a/admin/layouts/ftp/linked_components_fullwidth.php
+++ b/admin/layouts/ftp/linked_components_fullwidth.php
@@ -28,7 +28,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
-$items = $displayData->vzzlinked_components;
+$items = $displayData->wablinked_components;
$user = JFactory::getUser();
$id = $displayData->item->id;
$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php
index 17490f21e..ae099f39a 100644
--- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php
+++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php
@@ -46,8 +46,10 @@ $fields = $displayData->get('fields') ?: array(
'php_site_event',
'add_javascript',
'javascript',
- 'add_css',
- 'css'
+ 'add_css_admin',
+ 'css_admin',
+ 'add_css_site',
+ 'css_site'
);
?>
diff --git a/admin/layouts/joomla_component/translation_fullwidth.php b/admin/layouts/joomla_component/translation_fullwidth.php
index 151081f8c..11a586ad2 100644
--- a/admin/layouts/joomla_component/translation_fullwidth.php
+++ b/admin/layouts/joomla_component/translation_fullwidth.php
@@ -28,7 +28,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
-$items = $displayData->vwmtranslation;
+$items = $displayData->vwntranslation;
$user = JFactory::getUser();
$id = $displayData->item->id;
$edit = "index.php?option=com_componentbuilder&view=language_translations&task=language_translation.edit";
diff --git a/admin/layouts/library/linked_fullwidth.php b/admin/layouts/library/linked_fullwidth.php
new file mode 100644
index 000000000..dea1c5fb2
--- /dev/null
+++ b/admin/layouts/library/linked_fullwidth.php
@@ -0,0 +1,48 @@
+
+ @github Joomla Component Builder
+ @copyright Copyright (C) 2015. All Rights Reserved
+ @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+
+ Builds Complex Joomla Components
+
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+ 'note_linked_to_notice'
+);
+
+?>
+
diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php
new file mode 100644
index 000000000..197d8f141
--- /dev/null
+++ b/admin/layouts/site_view/linked_components_fullwidth.php
@@ -0,0 +1,48 @@
+
+ @github Joomla Component Builder
+ @copyright Copyright (C) 2015. All Rights Reserved
+ @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+
+ Builds Complex Joomla Components
+
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+ 'note_linked_to_notice'
+);
+
+?>
+
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index f1b4790e1..9db4fd8ff 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -166,12 +166,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$item->php_batchmove = base64_decode($item->php_batchmove);
}
- if (!empty($item->php_getlistquery))
- {
- // base64 Decode php_getlistquery.
- $item->php_getlistquery = base64_decode($item->php_getlistquery);
- }
-
if (!empty($item->php_allowedit))
{
// base64 Decode php_allowedit.
@@ -196,6 +190,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$item->php_import = base64_decode($item->php_import);
}
+ if (!empty($item->php_getlistquery))
+ {
+ // base64 Decode php_getlistquery.
+ $item->php_getlistquery = base64_decode($item->php_getlistquery);
+ }
+
+ if (!empty($item->php_getitem))
+ {
+ // base64 Decode php_getitem.
+ $item->php_getitem = base64_decode($item->php_getitem);
+ }
+
if (!empty($item->php_getitems_after_all))
{
// base64 Decode php_getitems_after_all.
@@ -250,12 +256,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$item->php_import_display = base64_decode($item->php_import_display);
}
- if (!empty($item->php_getitem))
- {
- // base64 Decode php_getitem.
- $item->php_getitem = base64_decode($item->php_getitem);
- }
-
if (!empty($item->php_import_save))
{
// base64 Decode php_import_save.
@@ -1282,12 +1282,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$data['php_batchmove'] = base64_encode($data['php_batchmove']);
}
- // Set the php_getlistquery string to base64 string.
- if (isset($data['php_getlistquery']))
- {
- $data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
- }
-
// Set the php_allowedit string to base64 string.
if (isset($data['php_allowedit']))
{
@@ -1312,6 +1306,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$data['php_import'] = base64_encode($data['php_import']);
}
+ // Set the php_getlistquery string to base64 string.
+ if (isset($data['php_getlistquery']))
+ {
+ $data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
+ }
+
+ // Set the php_getitem string to base64 string.
+ if (isset($data['php_getitem']))
+ {
+ $data['php_getitem'] = base64_encode($data['php_getitem']);
+ }
+
// Set the php_getitems_after_all string to base64 string.
if (isset($data['php_getitems_after_all']))
{
@@ -1366,12 +1372,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$data['php_import_display'] = base64_encode($data['php_import_display']);
}
- // Set the php_getitem string to base64 string.
- if (isset($data['php_getitem']))
- {
- $data['php_getitem'] = base64_encode($data['php_getitem']);
- }
-
// Set the php_import_save string to base64 string.
if (isset($data['php_import_save']))
{
diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php
index 3fc3ba037..f419a6d8d 100644
--- a/admin/models/admin_views.php
+++ b/admin/models/admin_views.php
@@ -268,8 +268,6 @@ class ComponentbuilderModelAdmin_views extends JModelList
$item->php_save = base64_decode($item->php_save);
// decode php_batchmove
$item->php_batchmove = base64_decode($item->php_batchmove);
- // decode php_getlistquery
- $item->php_getlistquery = base64_decode($item->php_getlistquery);
// decode php_allowedit
$item->php_allowedit = base64_decode($item->php_allowedit);
// decode php_after_publish
@@ -278,6 +276,10 @@ class ComponentbuilderModelAdmin_views extends JModelList
$item->php_getitems = base64_decode($item->php_getitems);
// decode php_import
$item->php_import = base64_decode($item->php_import);
+ // decode php_getlistquery
+ $item->php_getlistquery = base64_decode($item->php_getlistquery);
+ // decode php_getitem
+ $item->php_getitem = base64_decode($item->php_getitem);
// decode php_getitems_after_all
$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
// decode php_before_save
@@ -296,8 +298,6 @@ class ComponentbuilderModelAdmin_views extends JModelList
$item->sql = base64_decode($item->sql);
// decode php_import_display
$item->php_import_display = base64_decode($item->php_import_display);
- // decode php_getitem
- $item->php_getitem = base64_decode($item->php_getitem);
// decode php_import_save
$item->php_import_save = base64_decode($item->php_import_save);
// decode css_view
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index 88c695e1d..8ad6a21a4 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -826,7 +826,7 @@ class ComponentbuilderModelAjax extends JModelList
protected function addEditLink($id, $view, $views)
{
// can edit
- if ($this->canEdit($id))
+ if ($this->canEdit($id, $view))
{
$edit = "index.php?option=com_componentbuilder&view=".$views."&task=".$view.".edit&id=".$id.$this->ref;
return ' ';
@@ -970,24 +970,21 @@ class ComponentbuilderModelAjax extends JModelList
}
public function getFieldSelectOptions($id)
- {
- // Get a db connection.
- $db = JFactory::getDbo();
-
+ {
// Create a new query object.
- $query = $db->getQuery(true);
- $query->select($db->quoteName(array('a.xml', 'b.name')));
- $query->from($db->quoteName('#__componentbuilder_field', 'a'));
- $query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'b') . ' ON (' . $db->quoteName('a.fieldtype') . ' = ' . $db->quoteName('b.id') . ')');
- $query->where($db->quoteName('a.published') . ' = 1');
- $query->where($db->quoteName('a.id') . ' = '. (int) $id);
+ $query = $this->_db->getQuery(true);
+ $query->select($this->_db->quoteName(array('a.xml', 'b.name')));
+ $query->from($this->_db->quoteName('#__componentbuilder_field', 'a'));
+ $query->join('LEFT', $this->_db->quoteName('#__componentbuilder_fieldtype', 'b') . ' ON (' . $this->_db->quoteName('a.fieldtype') . ' = ' . $this->_db->quoteName('b.id') . ')');
+ $query->where($this->_db->quoteName('a.published') . ' = 1');
+ $query->where($this->_db->quoteName('a.id') . ' = '. (int) $id);
// Reset the query using our newly populated query object.
- $db->setQuery($query);
- $db->execute();
- if ($db->getNumRows())
+ $this->_db->setQuery($query);
+ $this->_db->execute();
+ if ($this->_db->getNumRows())
{
- $result = $db->loadObject();
+ $result = $this->_db->loadObject();
$result->name = strtolower($result->name);
if (ComponentbuilderHelper::typeField($result->name,'list'))
{
@@ -1056,10 +1053,8 @@ class ComponentbuilderModelAjax extends JModelList
public function getTableColumns($tableName)
{
- // Get a db connection.
- $db = JFactory::getDbo();
// get the columns
- $columns = $db->getTableColumns("#__".$tableName);
+ $columns = $this->_db->getTableColumns("#__".$tableName);
if (ComponentbuilderHelper::checkArray($columns))
{
// build the return string
@@ -1073,189 +1068,184 @@ class ComponentbuilderModelAjax extends JModelList
return false;
}
+ protected $linkedKeys = array(
+ 'field' => array(
+ array('table' => 'component_config', 'tables' => 'components_config', 'fields' => array('addconfig' => 'field', 'joomla_component' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT', 'name' => 'system_name'),
+ array('table' => 'admin_fields', 'tables' => 'admins_fields', 'fields' => array('addfields' => 'field', 'admin_view' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_ADMIN_VIEW', 'name' => 'system_name')
+ ),
+ 'admin_view' => array(
+ array('table' => 'component_admin_views', 'tables' => 'components_admin_views', 'fields' => array('addadmin_views' => 'adminview', 'joomla_component' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT', 'name' => 'system_name')
+ ),
+ 'custom_admin_view' => array(
+ array('table' => 'component_custom_admin_views', 'tables' => 'components_custom_admin_views', 'fields' => array('addcustom_admin_views' => 'customadminview', 'joomla_component' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT', 'name' => 'system_name')
+ ),
+ 'site_view' => array(
+ array('table' => 'component_site_views', 'tables' => 'components_site_views', 'fields' => array('addsite_views' => 'siteview', 'joomla_component' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT', 'name' => 'system_name')
+ ),
+ 'library' => array(
+ array('table' => 'template', 'tables' => 'templates', 'fields' => array('libraries' => 'ARRAY', 'name' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_TEMPLATE'),
+ array('table' => 'layout', 'tables' => 'layouts', 'fields' => array('libraries' => 'ARRAY', 'name' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_LAYOUT'),
+ array('table' => 'site_view', 'tables' => 'site_views', 'fields' => array('libraries' => 'ARRAY', 'system_name' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_SITE_VIEW'),
+ array('table' => 'custom_admin_view', 'tables' => 'custom_admin_views', 'fields' => array('libraries' => 'ARRAY', 'system_name' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW')
+ ),
+ 'dynamic_get' => array(
+ array('table' => 'site_view', 'tables' => 'site_views', 'fields' => array('custom_get' => 'ARRAY', 'main_get' => 'INT', 'system_name' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_SITE_VIEW'),
+ array('table' => 'custom_admin_view', 'tables' => 'custom_admin_views', 'fields' => array('custom_get' => 'ARRAY', 'main_get' => 'INT', 'system_name' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW')
+ )
+ );
+
/**
- * Get Linked to
+ * Get Linked
*
- * @param string $type Item Name
- * @param int $id Item ID
+ * @param int $type The display return type
*
- * @return string The table of the linked to result
+ * @return string The display return type on success
*
*/
- protected function getLinked($to)
+ public function getLinked($type)
{
// get the view name & id
$values = $this->getViewID();
// check if item is set
if (!is_null($values['a_id']) && $values['a_id'] > 0 && strlen($values['a_view']))
{
- // get linked to
- $linkedToArray = (array) explode('__', $to);
- // check if item is linked to component
- if (in_array('component', $linkedToArray))
+ // check if we have any linked to config
+ if (isset($this->linkedKeys[$values['a_view']]))
{
- if (!$components = getComponentLinked($values['a_view'], $values['a_id']))
+ // make sure the ref is set
+ $this->ref = '&ref=' . $values['a_view'] . '&refid=' . $values['a_id'];
+ // get the linked to
+ if ($linked = $this->getLinkedTo($values['a_view'], $values['a_id']))
{
- $linkedToString = implode(', ', array_map( function($name) { return ComponentbuilderHelper::safeString($name, 'w'); }, $linkedToArray));
- return '' . JText::sprintf('COM_COMPONENTBUILDER_S_NOT_LINKED', ComponentbuilderHelper::safeString($values['a_view'], 'Ww')) . ' ' . JText::sprintf('COM_COMPONENTBUILDER_THIS_BSB_IS_NOT_LINKED_TO_ANY_S', $values['a_view'], $linkedToString) . '
';
+ // just return it for now as an unordered list
+ return '' .implode(' ', $linked) . ' ';
}
}
- // if fields and components found get admin views
-
+ }
+ // if not found but has session view name
+ if (strlen($values['a_view']))
+ {
+ return '' . JText::sprintf('COM_COMPONENTBUILDER_S_NOT_LINKED', ComponentbuilderHelper::safeString($values['a_view'], 'Ww')) . ' ' . JText::sprintf('COM_COMPONENTBUILDER_THIS_BSB_IS_NOT_LINKED_TO_ANY_OTHER_AREAS_OF_JCB_AT_THIS_TIME', $values['a_view']) . '
';
}
// no view or id found in session, or view not allowed to access area
return '' . JText::_('COM_COMPONENTBUILDER_ERROR') . ' ' . JText::_('COM_COMPONENTBUILDER_THERE_WAS_A_PROBLEM_BNO_VIEW_OR_ID_FOUND_IN_SESSION_OR_VIEW_NOT_ALLOWED_TO_ACCESS_AREAB_WE_COULD_NOT_LOAD_ANY_LINKED_TO_VALUES_PLEASE_INFORM_YOUR_SYSTEM_ADMINISTRATOR') . '
';
}
/**
- * Get Component Linked to Item
+ * Get Linked to Items
*
- * @param string $type Item Name
- * @param int $id Item ID
+ * @param string $view View that is being searched for
+ * @param int $id ID
*
- * @return array Components Id if found
+ * @return array Found items
*
*/
- protected function getComponentLinked($type, $id)
+ protected function getLinkedTo($view, $id)
{
// reset bucket
- $componentsLinked = array();
- // Create a new query object.
- $query = $this->db->getQuery(true);
- // get all history values
- $query->select('h.*');
- $query->from('#__ucm_history AS h');
- $query->where($this->db->quoteName('h.ucm_item_id') . ' = ' . (int) $id);
- // Join over the content type for the type id
- $query->join('LEFT', '#__content_types AS ct ON ct.type_id = h.ucm_type_id');
- $query->where('ct.type_alias = ' . $this->db->quote('com_componentbuilder.' . $type));
- $this->db->setQuery($query);
- $this->db->execute();
- if ($this->db->getNumRows())
+ $linked = array();
+ // start search
+ foreach ($this->linkedKeys[$view] as $search)
{
- // load all item history
- $items = $db->loadObjectList();
- // load the components ids
- foreach ($items as $item)
+ // Create a new query object.
+ $query = $this->_db->getQuery(true);
+ // get all history values
+ $selection = array_keys($search['fields']);
+ $selection[] = 'id';
+ $query->select($selection);
+ $query->from('#__componentbuilder_' . $search['table']);
+ $this->_db->setQuery($query);
+ $this->_db->execute();
+ if ($this->_db->getNumRows())
{
- // only work with those who have notes
- if (ComponentbuilderHelper::checkJson($item->version_note))
+ // load all items
+ $items = $this->_db->loadObjectList();
+ // search the items
+ foreach ($items as $item)
{
- $note = json_decode($item->version_note, true);
- if (ComponentbuilderHelper::checkArray($note))
+ $found = false;
+ foreach ($search['fields'] as $key => $target)
{
- foreach($note as $ids)
+ if ('NAME' === $target)
{
- if (ComponentbuilderHelper::checkArray($ids))
+ $name = $item->{$key};
+ $nameTable = $key;
+ continue;
+ }
+ elseif (!$found)
+ {
+ if ('INT' === $target)
{
- foreach ($ids as $_id)
+ // check if ID match
+ if ($item->{$key} == $id)
{
- $componentsLinked[(int) $_id] = array('component' => (int) $_id);
+ $found = true;
}
}
- elseif (is_numeric($ids))
+ else
{
- $componentsLinked[(int) $ids] = array('component' => (int) $ids);
+ // check if we have a json
+ if (ComponentbuilderHelper::checkJson($item->{$key}))
+ {
+ $item->{$key} = json_decode($item->{$key}, true);
+ }
+ // if array
+ if (ComponentbuilderHelper::checkArray($item->{$key}))
+ {
+ if ('ARRAY' === $target)
+ {
+ // check if ID match
+ foreach ($item->{$key} as $_id)
+ {
+ if ($_id == $id)
+ {
+ $found = true;
+ }
+ }
+ }
+ else
+ {
+ foreach ($item->{$key} as $row)
+ {
+ if (isset($row[$target]) && $row[$target] == $id)
+ {
+ $found = true;
+ }
+ }
+ }
+ }
}
}
}
+ // check if found
+ if ($found)
+ {
+ // build the name
+ $edit = true;
+ if (is_numeric($name) && isset($search['name']))
+ {
+ if (!$name = ComponentbuilderHelper::getVar($nameTable, (int) $name, 'id', $search['name']))
+ {
+ $name = JText::_('COM_COMPONENTBUILDER_NO_FOUND');
+ $edit = false;
+ }
+ }
+ // set edit link
+ $link = ($edit) ? $this->addEditLink($item->id, $search['table'], $search['tables']) : '';
+ // build the linked
+ $linked[] = JText::_($search['type']) . ' - ' . $name . ' ' . $link;
+ }
}
}
- // check if we found any
- if (ComponentbuilderHelper::checkArray($componentLinked))
- {
- return $componentLinked;
- }
+ }
+ // check if we found any
+ if (ComponentbuilderHelper::checkArray($linked))
+ {
+ return $linked;
}
return false;
}
- // Used in site_view
-
- public function getSnippets($libraries)
- {
- if (ComponentbuilderHelper::checkJson($libraries))
- {
- $libraries = json_decode($libraries, true);
- }
- // check if we have an array
- if (ComponentbuilderHelper::checkArray($libraries))
- {
- // insure we only have int values
- if ($libraries = $this->checkLibraries($libraries))
- {
- // Get a db connection.
- $db = JFactory::getDbo();
- // Create a new query object.
- $query = $db->getQuery(true);
- $query->select($db->quoteName( array('a.id') ));
- $query->from($db->quoteName('#__componentbuilder_snippet', 'a'));
- $query->where($db->quoteName('a.published') . ' = 1');
- // check for country and region
- $query->where($db->quoteName('a.library') . ' IN ('. implode(',',$libraries) .')');
- $db->setQuery($query);
- $db->execute();
- if ($db->getNumRows())
- {
- return $db->loadColumn();
- }
- }
- }
- return false;
- }
-
- protected function checkLibraries($libraries)
- {
- $bucket = array();
- $libraries = array_map( function($id) use (&$bucket) {
- // now get bundled libraries
- $type = ComponentbuilderHelper::getVar('library', (int) $id, 'id', 'type');
- if (2 == $type && $bundled = ComponentbuilderHelper::getVar('library', (int) $id, 'id', 'libraries'))
- {
- // make sure we have an array if it was json
- if (ComponentbuilderHelper::checkJson($bundled))
- {
- $bundled = json_decode($bundled, true);
- }
- // load in the values if we have an array
- if (ComponentbuilderHelper::checkArray($bundled))
- {
- foreach ($bundled as $lib)
- {
- $bucket[$lib] = $lib;
- }
- }
- elseif (is_numeric($bundled))
- {
- $bucket[(int) $bundled] = (int) $bundled;
- }
- }
- else
- {
- return (int) $id;
- }
- }, $libraries);
- // check if we have any bundled libraries
- if (ComponentbuilderHelper::checkArray($bucket))
- {
- foreach ($bucket as $lib)
- {
- $libraries[] = (int) $lib;
- }
- }
- // check that we have libraries
- if (ComponentbuilderHelper::checkArray($libraries))
- {
- $libraries = array_values(array_unique(array_filter($libraries, function($id){return is_int($id);})));
- // check if we have any libraries remaining
- if (ComponentbuilderHelper::checkArray($libraries))
- {
- return $libraries;
- }
- }
- return false;
- }
-
// Used in template
public function getTemplateDetails($id)
{
@@ -1964,7 +1954,102 @@ class ComponentbuilderModelAjax extends JModelList
return false;
}
- // Used in snippet
+ // Used in field
+ public function getFieldOptions($id)
+ {
+ if ($field = ComponentbuilderHelper::getFieldOptions($id, 'id'))
+ {
+ // return found field options
+ return $field;
+ }
+ return false;
+ }
+
+ // Used in get_snippets
+
+ public function getSnippets($libraries)
+ {
+ if (ComponentbuilderHelper::checkJson($libraries))
+ {
+ $libraries = json_decode($libraries, true);
+ }
+ // check if we have an array
+ if (ComponentbuilderHelper::checkArray($libraries))
+ {
+ // insure we only have int values
+ if ($libraries = $this->checkLibraries($libraries))
+ {
+ // Get a db connection.
+ $db = JFactory::getDbo();
+ // Create a new query object.
+ $query = $db->getQuery(true);
+ $query->select($db->quoteName( array('a.id') ));
+ $query->from($db->quoteName('#__componentbuilder_snippet', 'a'));
+ $query->where($db->quoteName('a.published') . ' = 1');
+ // check for country and region
+ $query->where($db->quoteName('a.library') . ' IN ('. implode(',',$libraries) .')');
+ $db->setQuery($query);
+ $db->execute();
+ if ($db->getNumRows())
+ {
+ return $db->loadColumn();
+ }
+ }
+ }
+ return false;
+ }
+
+ protected function checkLibraries($libraries)
+ {
+ $bucket = array();
+ $libraries = array_map( function($id) use (&$bucket) {
+ // now get bundled libraries
+ $type = ComponentbuilderHelper::getVar('library', (int) $id, 'id', 'type');
+ if (2 == $type && $bundled = ComponentbuilderHelper::getVar('library', (int) $id, 'id', 'libraries'))
+ {
+ // make sure we have an array if it was json
+ if (ComponentbuilderHelper::checkJson($bundled))
+ {
+ $bundled = json_decode($bundled, true);
+ }
+ // load in the values if we have an array
+ if (ComponentbuilderHelper::checkArray($bundled))
+ {
+ foreach ($bundled as $lib)
+ {
+ $bucket[$lib] = $lib;
+ }
+ }
+ elseif (is_numeric($bundled))
+ {
+ $bucket[(int) $bundled] = (int) $bundled;
+ }
+ }
+ else
+ {
+ return (int) $id;
+ }
+ }, $libraries);
+ // check if we have any bundled libraries
+ if (ComponentbuilderHelper::checkArray($bucket))
+ {
+ foreach ($bucket as $lib)
+ {
+ $libraries[] = (int) $lib;
+ }
+ }
+ // check that we have libraries
+ if (ComponentbuilderHelper::checkArray($libraries))
+ {
+ $libraries = array_values(array_unique(array_filter($libraries, function($id){return is_int($id);})));
+ // check if we have any libraries remaining
+ if (ComponentbuilderHelper::checkArray($libraries))
+ {
+ return $libraries;
+ }
+ }
+ return false;
+ }
public function getSnippetDetails($id)
{
// Get a db connection.
@@ -2126,16 +2211,5 @@ class ComponentbuilderModelAjax extends JModelList
return $item->get('id');
}
return 0;
- }
-
- // Used in field
- public function getFieldOptions($id)
- {
- if ($field = ComponentbuilderHelper::getFieldOptions($id, 'id'))
- {
- // return found field options
- return $field;
- }
- return false;
}
}
diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php
index 708dd0852..5ba658a25 100644
--- a/admin/models/componentbuilder.php
+++ b/admin/models/componentbuilder.php
@@ -384,10 +384,10 @@ class ComponentbuilderModelComponentbuilder extends JModelList
} else {
// split versions in to array
var activeVersionArray = activeVersion.split(".");
- var localVersionArray = manifest.version.split(".");
- if (localVersionArray[0] > activeVersionArray[0] ||
- (localVersionArray[0] == activeVersionArray[0] && localVersionArray[1] > activeVersionArray[1]) ||
- (localVersionArray[0] == activeVersionArray[0] && localVersionArray[1] == activeVersionArray[1] && localVersionArray[2] > activeVersionArray[2])) {
+ var localVersionArray = manifest.version.split(".");
+ if ((+localVersionArray[0] > +activeVersionArray[0]) ||
+ (+localVersionArray[0] == +activeVersionArray[0] && +localVersionArray[1] > +activeVersionArray[1]) ||
+ (+localVersionArray[0] == +activeVersionArray[0] && +localVersionArray[1] == +activeVersionArray[1] && +localVersionArray[2] > +activeVersionArray[2])) {
// local version head latest release
jQuery(".update-notice").html(" '.JText::_('COM_COMPONENTBUILDER_BETA_RELEASE').' ");
} else {
diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php
index b140494af..ee5abd489 100644
--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@@ -64,6 +64,11 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
public function getTable($type = 'custom_admin_view', $prefix = 'ComponentbuilderTable', $config = array())
{
return JTable::getInstance($type, $prefix, $config);
+ }
+
+ public function getVDM()
+ {
+ return $this->vastDevMod;
}
/**
@@ -103,6 +108,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->libraries = $libraries->toArray();
}
+ if (!empty($item->ajax_input))
+ {
+ // Convert the ajax_input field to an array.
+ $ajax_input = new Registry;
+ $ajax_input->loadString($item->ajax_input);
+ $item->ajax_input = $ajax_input->toArray();
+ }
+
if (!empty($item->custom_get))
{
// Convert the custom_get field to an array.
@@ -119,10 +132,28 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->custom_button = $custom_button->toArray();
}
- if (!empty($item->php_controller))
+ if (!empty($item->php_document))
{
- // base64 Decode php_controller.
- $item->php_controller = base64_decode($item->php_controller);
+ // base64 Decode php_document.
+ $item->php_document = base64_decode($item->php_document);
+ }
+
+ if (!empty($item->php_jview_display))
+ {
+ // base64 Decode php_jview_display.
+ $item->php_jview_display = base64_decode($item->php_jview_display);
+ }
+
+ if (!empty($item->php_view))
+ {
+ // base64 Decode php_view.
+ $item->php_view = base64_decode($item->php_view);
+ }
+
+ if (!empty($item->php_jview))
+ {
+ // base64 Decode php_jview.
+ $item->php_jview = base64_decode($item->php_jview);
}
if (!empty($item->default))
@@ -131,12 +162,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->default = base64_decode($item->default);
}
- if (!empty($item->php_model))
- {
- // base64 Decode php_model.
- $item->php_model = base64_decode($item->php_model);
- }
-
if (!empty($item->js_document))
{
// base64 Decode js_document.
@@ -161,30 +186,45 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->css = base64_decode($item->css);
}
- if (!empty($item->php_document))
+ if (!empty($item->php_ajaxmethod))
{
- // base64 Decode php_document.
- $item->php_document = base64_decode($item->php_document);
+ // base64 Decode php_ajaxmethod.
+ $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
}
- if (!empty($item->php_view))
+ if (!empty($item->php_controller))
{
- // base64 Decode php_view.
- $item->php_view = base64_decode($item->php_view);
+ // base64 Decode php_controller.
+ $item->php_controller = base64_decode($item->php_controller);
}
- if (!empty($item->php_jview_display))
+ if (!empty($item->php_model))
{
- // base64 Decode php_jview_display.
- $item->php_jview_display = base64_decode($item->php_jview_display);
- }
-
- if (!empty($item->php_jview))
- {
- // base64 Decode php_jview.
- $item->php_jview = base64_decode($item->php_jview);
+ // base64 Decode php_model.
+ $item->php_model = base64_decode($item->php_model);
}
+
+ if (empty($item->id))
+ {
+ $id = 0;
+ }
+ else
+ {
+ $id = $item->id;
+ }
+ // set the id and view name to session
+ if ($vdm = ComponentbuilderHelper::get('custom_admin_view__'.$id))
+ {
+ $this->vastDevMod = $vdm;
+ }
+ else
+ {
+ $this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+ ComponentbuilderHelper::set($this->vastDevMod, 'custom_admin_view__'.$id);
+ ComponentbuilderHelper::set('custom_admin_view__'.$id, $this->vastDevMod);
+ }
+
// check what type of custom_button array we have here (should be subform... but just incase)
// This could happen due to huge data sets
if (isset($item->custom_button) && isset($item->custom_button['name']))
@@ -945,6 +985,19 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['libraries'] = '';
}
+ // Set the ajax_input items to data.
+ if (isset($data['ajax_input']) && is_array($data['ajax_input']))
+ {
+ $ajax_input = new JRegistry;
+ $ajax_input->loadArray($data['ajax_input']);
+ $data['ajax_input'] = (string) $ajax_input;
+ }
+ elseif (!isset($data['ajax_input']))
+ {
+ // Set the empty ajax_input to data
+ $data['ajax_input'] = '';
+ }
+
// Set the custom_get items to data.
if (isset($data['custom_get']) && is_array($data['custom_get']))
{
@@ -971,10 +1024,28 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['custom_button'] = '';
}
- // Set the php_controller string to base64 string.
- if (isset($data['php_controller']))
+ // Set the php_document string to base64 string.
+ if (isset($data['php_document']))
{
- $data['php_controller'] = base64_encode($data['php_controller']);
+ $data['php_document'] = base64_encode($data['php_document']);
+ }
+
+ // Set the php_jview_display string to base64 string.
+ if (isset($data['php_jview_display']))
+ {
+ $data['php_jview_display'] = base64_encode($data['php_jview_display']);
+ }
+
+ // Set the php_view string to base64 string.
+ if (isset($data['php_view']))
+ {
+ $data['php_view'] = base64_encode($data['php_view']);
+ }
+
+ // Set the php_jview string to base64 string.
+ if (isset($data['php_jview']))
+ {
+ $data['php_jview'] = base64_encode($data['php_jview']);
}
// Set the default string to base64 string.
@@ -983,12 +1054,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['default'] = base64_encode($data['default']);
}
- // Set the php_model string to base64 string.
- if (isset($data['php_model']))
- {
- $data['php_model'] = base64_encode($data['php_model']);
- }
-
// Set the js_document string to base64 string.
if (isset($data['js_document']))
{
@@ -1013,28 +1078,22 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['css'] = base64_encode($data['css']);
}
- // Set the php_document string to base64 string.
- if (isset($data['php_document']))
+ // Set the php_ajaxmethod string to base64 string.
+ if (isset($data['php_ajaxmethod']))
{
- $data['php_document'] = base64_encode($data['php_document']);
+ $data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
}
- // Set the php_view string to base64 string.
- if (isset($data['php_view']))
+ // Set the php_controller string to base64 string.
+ if (isset($data['php_controller']))
{
- $data['php_view'] = base64_encode($data['php_view']);
+ $data['php_controller'] = base64_encode($data['php_controller']);
}
- // Set the php_jview_display string to base64 string.
- if (isset($data['php_jview_display']))
+ // Set the php_model string to base64 string.
+ if (isset($data['php_model']))
{
- $data['php_jview_display'] = base64_encode($data['php_jview_display']);
- }
-
- // Set the php_jview string to base64 string.
- if (isset($data['php_jview']))
- {
- $data['php_jview'] = base64_encode($data['php_jview']);
+ $data['php_model'] = base64_encode($data['php_model']);
}
// Set the Params Items to data
diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php
index 2b50c4801..b4b6f9f8b 100644
--- a/admin/models/custom_admin_views.php
+++ b/admin/models/custom_admin_views.php
@@ -266,12 +266,16 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
continue;
}
- // decode php_controller
- $item->php_controller = base64_decode($item->php_controller);
+ // decode php_document
+ $item->php_document = base64_decode($item->php_document);
+ // decode php_jview_display
+ $item->php_jview_display = base64_decode($item->php_jview_display);
+ // decode php_view
+ $item->php_view = base64_decode($item->php_view);
+ // decode php_jview
+ $item->php_jview = base64_decode($item->php_jview);
// decode default
$item->default = base64_decode($item->default);
- // decode php_model
- $item->php_model = base64_decode($item->php_model);
// decode js_document
$item->js_document = base64_decode($item->js_document);
// decode javascript_file
@@ -280,14 +284,12 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
$item->css_document = base64_decode($item->css_document);
// decode css
$item->css = base64_decode($item->css);
- // decode php_document
- $item->php_document = base64_decode($item->php_document);
- // decode php_view
- $item->php_view = base64_decode($item->php_view);
- // decode php_jview_display
- $item->php_jview_display = base64_decode($item->php_jview_display);
- // decode php_jview
- $item->php_jview = base64_decode($item->php_jview);
+ // decode php_ajaxmethod
+ $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
+ // decode php_controller
+ $item->php_controller = base64_decode($item->php_controller);
+ // decode php_model
+ $item->php_model = base64_decode($item->php_model);
// unset the values we don't want exported.
unset($item->asset_id);
unset($item->checked_out);
diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php
index f37f06333..f68403bc9 100644
--- a/admin/models/dynamic_get.php
+++ b/admin/models/dynamic_get.php
@@ -64,6 +64,11 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
public function getTable($type = 'dynamic_get', $prefix = 'ComponentbuilderTable', $config = array())
{
return JTable::getInstance($type, $prefix, $config);
+ }
+
+ public function getVDM()
+ {
+ return $this->vastDevMod;
}
/**
@@ -95,6 +100,22 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
$item->metadata = $registry->toArray();
}
+ if (!empty($item->join_view_table))
+ {
+ // Convert the join_view_table field to an array.
+ $join_view_table = new Registry;
+ $join_view_table->loadString($item->join_view_table);
+ $item->join_view_table = $join_view_table->toArray();
+ }
+
+ if (!empty($item->join_db_table))
+ {
+ // Convert the join_db_table field to an array.
+ $join_db_table = new Registry;
+ $join_db_table->loadString($item->join_db_table);
+ $item->join_db_table = $join_db_table->toArray();
+ }
+
if (!empty($item->filter))
{
// Convert the filter field to an array.
@@ -127,22 +148,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
$item->global = $global->toArray();
}
- if (!empty($item->join_db_table))
- {
- // Convert the join_db_table field to an array.
- $join_db_table = new Registry;
- $join_db_table->loadString($item->join_db_table);
- $item->join_db_table = $join_db_table->toArray();
- }
-
- if (!empty($item->join_view_table))
- {
- // Convert the join_view_table field to an array.
- $join_view_table = new Registry;
- $join_view_table->loadString($item->join_view_table);
- $item->join_view_table = $join_view_table->toArray();
- }
-
if (!empty($item->php_custom_get))
{
// base64 Decode php_custom_get.
@@ -185,6 +190,27 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
$item->php_calculation = base64_decode($item->php_calculation);
}
+
+ if (empty($item->id))
+ {
+ $id = 0;
+ }
+ else
+ {
+ $id = $item->id;
+ }
+ // set the id and view name to session
+ if ($vdm = ComponentbuilderHelper::get('dynamic_get__'.$id))
+ {
+ $this->vastDevMod = $vdm;
+ }
+ else
+ {
+ $this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+ ComponentbuilderHelper::set($this->vastDevMod, 'dynamic_get__'.$id);
+ ComponentbuilderHelper::set('dynamic_get__'.$id, $this->vastDevMod);
+ }
+
// update the fields
$objectUpdate = new stdClass();
$objectUpdate->id = (int) $item->id;
@@ -944,6 +970,32 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
$data['metadata'] = (string) $metadata;
}
+ // Set the join_view_table items to data.
+ if (isset($data['join_view_table']) && is_array($data['join_view_table']))
+ {
+ $join_view_table = new JRegistry;
+ $join_view_table->loadArray($data['join_view_table']);
+ $data['join_view_table'] = (string) $join_view_table;
+ }
+ elseif (!isset($data['join_view_table']))
+ {
+ // Set the empty join_view_table to data
+ $data['join_view_table'] = '';
+ }
+
+ // Set the join_db_table items to data.
+ if (isset($data['join_db_table']) && is_array($data['join_db_table']))
+ {
+ $join_db_table = new JRegistry;
+ $join_db_table->loadArray($data['join_db_table']);
+ $data['join_db_table'] = (string) $join_db_table;
+ }
+ elseif (!isset($data['join_db_table']))
+ {
+ // Set the empty join_db_table to data
+ $data['join_db_table'] = '';
+ }
+
// Set the filter items to data.
if (isset($data['filter']) && is_array($data['filter']))
{
@@ -996,32 +1048,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
$data['global'] = '';
}
- // Set the join_db_table items to data.
- if (isset($data['join_db_table']) && is_array($data['join_db_table']))
- {
- $join_db_table = new JRegistry;
- $join_db_table->loadArray($data['join_db_table']);
- $data['join_db_table'] = (string) $join_db_table;
- }
- elseif (!isset($data['join_db_table']))
- {
- // Set the empty join_db_table to data
- $data['join_db_table'] = '';
- }
-
- // Set the join_view_table items to data.
- if (isset($data['join_view_table']) && is_array($data['join_view_table']))
- {
- $join_view_table = new JRegistry;
- $join_view_table->loadArray($data['join_view_table']);
- $data['join_view_table'] = (string) $join_view_table;
- }
- elseif (!isset($data['join_view_table']))
- {
- // Set the empty join_view_table to data
- $data['join_view_table'] = '';
- }
-
// Set the php_custom_get string to base64 string.
if (isset($data['php_custom_get']))
{
diff --git a/admin/models/field.php b/admin/models/field.php
index dd36c9b55..ea38efb14 100644
--- a/admin/models/field.php
+++ b/admin/models/field.php
@@ -64,6 +64,11 @@ class ComponentbuilderModelField extends JModelAdmin
public function getTable($type = 'field', $prefix = 'ComponentbuilderTable', $config = array())
{
return JTable::getInstance($type, $prefix, $config);
+ }
+
+ public function getVDM()
+ {
+ return $this->vastDevMod;
}
/**
@@ -123,7 +128,28 @@ class ComponentbuilderModelField extends JModelAdmin
{
// base64 Decode javascript_views_footer.
$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+ }
+
+
+ if (empty($item->id))
+ {
+ $id = 0;
}
+ else
+ {
+ $id = $item->id;
+ }
+ // set the id and view name to session
+ if ($vdm = ComponentbuilderHelper::get('field__'.$id))
+ {
+ $this->vastDevMod = $vdm;
+ }
+ else
+ {
+ $this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+ ComponentbuilderHelper::set($this->vastDevMod, 'field__'.$id);
+ ComponentbuilderHelper::set('field__'.$id, $this->vastDevMod);
+ }
if (!empty($item->id))
{
diff --git a/admin/models/fields/ftps.php b/admin/models/fields/ftps.php
deleted file mode 100644
index 938f5562b..000000000
--- a/admin/models/fields/ftps.php
+++ /dev/null
@@ -1,171 +0,0 @@
-
- @github Joomla Component Builder
- @copyright Copyright (C) 2015. All Rights Reserved
- @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-
- Builds Complex Joomla Components
-
-/-----------------------------------------------------------------------------------------------------------------------------*/
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-// import the list field type
-jimport('joomla.form.helper');
-JFormHelper::loadFieldClass('list');
-
-/**
- * Ftps Form Field class for the Componentbuilder component
- */
-class JFormFieldFtps extends JFormFieldList
-{
- /**
- * The ftps field type.
- *
- * @var string
- */
- public $type = 'ftps';
- /**
- * Override to add new button
- *
- * @return string The field input markup.
- *
- * @since 3.2
- */
- protected function getInput()
- {
- // see if we should add buttons
- $setButton = $this->getAttribute('button');
- // get html
- $html = parent::getInput();
- // if true set button
- if ($setButton === 'true')
- {
- $button = array();
- $script = array();
- $buttonName = $this->getAttribute('name');
- // get the input from url
- $app = JFactory::getApplication();
- $jinput = $app->input;
- // get the view name & id
- $values = $jinput->getArray(array(
- 'id' => 'int',
- 'view' => 'word'
- ));
- // check if new item
- $ref = '';
- $refJ = '';
- if (!is_null($values['id']) && strlen($values['view']))
- {
- // only load referal if not new item.
- $ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
- $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
- }
- $user = JFactory::getUser();
- // only add if user allowed to create ftp
- if ($user->authorise('ftp.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
- {
- // build Create button
- $buttonNamee = trim($buttonName);
- $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
- $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
- $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
- $buttonNamee = ucfirst(strtolower($buttonNamee));
- $button[] = '
- ';
- }
- // only add if user allowed to edit ftp
- if (($buttonName === 'ftp' || $buttonName === 'ftps') && $user->authorise('ftp.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
- {
- // build edit button
- $buttonNamee = trim($buttonName);
- $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
- $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
- $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
- $buttonNamee = ucfirst(strtolower($buttonNamee));
- $button[] = '
- ';
- // build script
- $script[] = "
- jQuery(document).ready(function() {
- jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
- e.preventDefault();
- var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
- ".$buttonName."Button(".$buttonName."Value);
- });
- var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
- ".$buttonName."Button(".$buttonName."Value);
- });
- function ".$buttonName."Button(value) {
- if (value > 0) {
- // hide the create button
- jQuery('#".$buttonName."Create').hide();
- // show edit button
- jQuery('#".$buttonName."Edit').show();
- var url = 'index.php?option=com_componentbuilder&view=ftps&task=ftp.edit&id='+value+'".$refJ."';
- jQuery('#".$buttonName."Edit').attr('href', url);
- } else {
- // show the create button
- jQuery('#".$buttonName."Create').show();
- // hide edit button
- jQuery('#".$buttonName."Edit').hide();
- }
- }";
- }
- // check if button was created for ftp field.
- if (is_array($button) && count($button) > 0)
- {
- // Load the needed script.
- $document = JFactory::getDocument();
- $document->addScriptDeclaration(implode(' ',$script));
- // return the button attached to input field.
- return '' .$html . implode('',$button).'
';
- }
- }
- return $html;
- }
-
- /**
- * Method to get a list of options for a list input.
- *
- * @return array An array of JHtml options.
- */
- public function getOptions()
- {
- $db = JFactory::getDBO();
- $query = $db->getQuery(true);
- $query->select($db->quoteName(array('a.id','a.name'),array('id','sales_server_ftp_name')));
- $query->from($db->quoteName('#__componentbuilder_ftp', 'a'));
- $query->where($db->quoteName('a.published') . ' >= 1');
- $query->order('a.name ASC');
- $db->setQuery((string)$query);
- $items = $db->loadObjectList();
- $options = array();
- if ($items)
- {
- $options[] = JHtml::_('select.option', '', 'Select an option');
- foreach($items as $item)
- {
- $options[] = JHtml::_('select.option', $item->id, $item->sales_server_ftp_name);
- }
- }
- return $options;
- }
-}
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index 086b35548..54cb01dd7 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -139,7 +139,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
- public function getVzyfields()
+ public function getWaafields()
{
// Get the user object.
$user = JFactory::getUser();
@@ -223,13 +223,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
foreach ($items as $nr => &$item)
{
// convert datatype
- $item->datatype = $this->selectionTranslationVzyfields($item->datatype, 'datatype');
+ $item->datatype = $this->selectionTranslationWaafields($item->datatype, 'datatype');
// convert indexes
- $item->indexes = $this->selectionTranslationVzyfields($item->indexes, 'indexes');
+ $item->indexes = $this->selectionTranslationWaafields($item->indexes, 'indexes');
// convert null_switch
- $item->null_switch = $this->selectionTranslationVzyfields($item->null_switch, 'null_switch');
+ $item->null_switch = $this->selectionTranslationWaafields($item->null_switch, 'null_switch');
// convert store
- $item->store = $this->selectionTranslationVzyfields($item->store, 'store');
+ $item->store = $this->selectionTranslationWaafields($item->store, 'store');
}
}
@@ -243,7 +243,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
*
* @return translatable string
*/
- public function selectionTranslationVzyfields($value,$name)
+ public function selectionTranslationWaafields($value,$name)
{
// Array of datatype language strings
if ($name === 'datatype')
diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js
index 0be551203..c6228c10f 100644
--- a/admin/models/forms/admin_view.js
+++ b/admin/models/forms/admin_view.js
@@ -23,7 +23,6 @@
/-----------------------------------------------------------------------------------------------------------------------------*/
// Some Global Values
-jform_vvvvvwwvwn_required = false;
jform_vvvvvwxvwo_required = false;
jform_vvvvvwyvwp_required = false;
jform_vvvvvwzvwq_required = false;
@@ -47,308 +46,309 @@ jform_vvvvvxqvxh_required = false;
jform_vvvvvxrvxi_required = false;
jform_vvvvvxsvxj_required = false;
jform_vvvvvxtvxk_required = false;
-jform_vvvvvxxvxl_required = false;
-jform_vvvvvxxvxm_required = false;
-jform_vvvvvxxvxn_required = false;
-jform_vvvvvxxvxo_required = false;
-jform_vvvvvxxvxp_required = false;
-jform_vvvvvxxvxq_required = false;
-jform_vvvvvxzvxr_required = false;
-jform_vvvvvxzvxs_required = false;
-jform_vvvvvxzvxt_required = false;
-jform_vvvvvxzvxu_required = false;
+jform_vvvvvxuvxl_required = false;
+jform_vvvvvxyvxm_required = false;
+jform_vvvvvxyvxn_required = false;
+jform_vvvvvxyvxo_required = false;
+jform_vvvvvxyvxp_required = false;
+jform_vvvvvxyvxq_required = false;
+jform_vvvvvxyvxr_required = false;
+jform_vvvvvyavxs_required = false;
+jform_vvvvvyavxt_required = false;
+jform_vvvvvyavxu_required = false;
+jform_vvvvvyavxv_required = false;
// Initial Script
jQuery(document).ready(function()
{
- var add_css_view_vvvvvww = jQuery("#jform_add_css_view input[type='radio']:checked").val();
- vvvvvww(add_css_view_vvvvvww);
+ var add_css_view_vvvvvwx = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+ vvvvvwx(add_css_view_vvvvvwx);
- var add_css_views_vvvvvwx = jQuery("#jform_add_css_views input[type='radio']:checked").val();
- vvvvvwx(add_css_views_vvvvvwx);
+ var add_css_views_vvvvvwy = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+ vvvvvwy(add_css_views_vvvvvwy);
- var add_javascript_view_file_vvvvvwy = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
- vvvvvwy(add_javascript_view_file_vvvvvwy);
+ var add_javascript_view_file_vvvvvwz = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
+ vvvvvwz(add_javascript_view_file_vvvvvwz);
- var add_javascript_views_file_vvvvvwz = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
- vvvvvwz(add_javascript_views_file_vvvvvwz);
+ var add_javascript_views_file_vvvvvxa = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
+ vvvvvxa(add_javascript_views_file_vvvvvxa);
- var add_javascript_view_footer_vvvvvxa = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
- vvvvvxa(add_javascript_view_footer_vvvvvxa);
+ var add_javascript_view_footer_vvvvvxb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+ vvvvvxb(add_javascript_view_footer_vvvvvxb);
- var add_javascript_views_footer_vvvvvxb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
- vvvvvxb(add_javascript_views_footer_vvvvvxb);
+ var add_javascript_views_footer_vvvvvxc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+ vvvvvxc(add_javascript_views_footer_vvvvvxc);
- var add_php_ajax_vvvvvxc = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
- vvvvvxc(add_php_ajax_vvvvvxc);
+ var add_php_ajax_vvvvvxd = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+ vvvvvxd(add_php_ajax_vvvvvxd);
- var add_php_getitem_vvvvvxd = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
- vvvvvxd(add_php_getitem_vvvvvxd);
+ var add_php_getitem_vvvvvxe = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
+ vvvvvxe(add_php_getitem_vvvvvxe);
- var add_php_getitems_vvvvvxe = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
- vvvvvxe(add_php_getitems_vvvvvxe);
+ var add_php_getitems_vvvvvxf = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
+ vvvvvxf(add_php_getitems_vvvvvxf);
- var add_php_getitems_after_all_vvvvvxf = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
- vvvvvxf(add_php_getitems_after_all_vvvvvxf);
+ var add_php_getitems_after_all_vvvvvxg = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
+ vvvvvxg(add_php_getitems_after_all_vvvvvxg);
- var add_php_getlistquery_vvvvvxg = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
- vvvvvxg(add_php_getlistquery_vvvvvxg);
+ var add_php_getlistquery_vvvvvxh = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
+ vvvvvxh(add_php_getlistquery_vvvvvxh);
- var add_php_before_save_vvvvvxh = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
- vvvvvxh(add_php_before_save_vvvvvxh);
+ var add_php_before_save_vvvvvxi = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
+ vvvvvxi(add_php_before_save_vvvvvxi);
- var add_php_save_vvvvvxi = jQuery("#jform_add_php_save input[type='radio']:checked").val();
- vvvvvxi(add_php_save_vvvvvxi);
+ var add_php_save_vvvvvxj = jQuery("#jform_add_php_save input[type='radio']:checked").val();
+ vvvvvxj(add_php_save_vvvvvxj);
- var add_php_postsavehook_vvvvvxj = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
- vvvvvxj(add_php_postsavehook_vvvvvxj);
+ var add_php_postsavehook_vvvvvxk = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
+ vvvvvxk(add_php_postsavehook_vvvvvxk);
- var add_php_allowedit_vvvvvxk = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
- vvvvvxk(add_php_allowedit_vvvvvxk);
+ var add_php_allowedit_vvvvvxl = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
+ vvvvvxl(add_php_allowedit_vvvvvxl);
- var add_php_batchcopy_vvvvvxl = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
- vvvvvxl(add_php_batchcopy_vvvvvxl);
+ var add_php_batchcopy_vvvvvxm = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+ vvvvvxm(add_php_batchcopy_vvvvvxm);
- var add_php_batchmove_vvvvvxm = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
- vvvvvxm(add_php_batchmove_vvvvvxm);
+ var add_php_batchmove_vvvvvxn = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+ vvvvvxn(add_php_batchmove_vvvvvxn);
- var add_php_before_publish_vvvvvxn = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
- vvvvvxn(add_php_before_publish_vvvvvxn);
+ var add_php_before_publish_vvvvvxo = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+ vvvvvxo(add_php_before_publish_vvvvvxo);
- var add_php_after_publish_vvvvvxo = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
- vvvvvxo(add_php_after_publish_vvvvvxo);
+ var add_php_after_publish_vvvvvxp = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+ vvvvvxp(add_php_after_publish_vvvvvxp);
- var add_php_before_delete_vvvvvxp = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
- vvvvvxp(add_php_before_delete_vvvvvxp);
+ var add_php_before_delete_vvvvvxq = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+ vvvvvxq(add_php_before_delete_vvvvvxq);
- var add_php_after_delete_vvvvvxq = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
- vvvvvxq(add_php_after_delete_vvvvvxq);
+ var add_php_after_delete_vvvvvxr = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+ vvvvvxr(add_php_after_delete_vvvvvxr);
- var add_php_document_vvvvvxr = jQuery("#jform_add_php_document input[type='radio']:checked").val();
- vvvvvxr(add_php_document_vvvvvxr);
+ var add_php_document_vvvvvxs = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+ vvvvvxs(add_php_document_vvvvvxs);
- var add_sql_vvvvvxs = jQuery("#jform_add_sql input[type='radio']:checked").val();
- vvvvvxs(add_sql_vvvvvxs);
-
- var source_vvvvvxt = jQuery("#jform_source input[type='radio']:checked").val();
var add_sql_vvvvvxt = jQuery("#jform_add_sql input[type='radio']:checked").val();
- vvvvvxt(source_vvvvvxt,add_sql_vvvvvxt);
+ vvvvvxt(add_sql_vvvvvxt);
- var source_vvvvvxv = jQuery("#jform_source input[type='radio']:checked").val();
- var add_sql_vvvvvxv = jQuery("#jform_add_sql input[type='radio']:checked").val();
- vvvvvxv(source_vvvvvxv,add_sql_vvvvvxv);
+ var source_vvvvvxu = jQuery("#jform_source input[type='radio']:checked").val();
+ var add_sql_vvvvvxu = jQuery("#jform_add_sql input[type='radio']:checked").val();
+ vvvvvxu(source_vvvvvxu,add_sql_vvvvvxu);
- var add_custom_import_vvvvvxx = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
- vvvvvxx(add_custom_import_vvvvvxx);
+ var source_vvvvvxw = jQuery("#jform_source input[type='radio']:checked").val();
+ var add_sql_vvvvvxw = jQuery("#jform_add_sql input[type='radio']:checked").val();
+ vvvvvxw(source_vvvvvxw,add_sql_vvvvvxw);
var add_custom_import_vvvvvxy = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
vvvvvxy(add_custom_import_vvvvvxy);
- var add_custom_button_vvvvvxz = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
- vvvvvxz(add_custom_button_vvvvvxz);
+ var add_custom_import_vvvvvxz = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+ vvvvvxz(add_custom_import_vvvvvxz);
+
+ var add_custom_button_vvvvvya = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+ vvvvvya(add_custom_button_vvvvvya);
});
-// the vvvvvww function
-function vvvvvww(add_css_view_vvvvvww)
+// the vvvvvwx function
+function vvvvvwx(add_css_view_vvvvvwx)
{
// set the function logic
- if (add_css_view_vvvvvww == 1)
+ if (add_css_view_vvvvvwx == 1)
{
jQuery('#jform_css_view').closest('.control-group').show();
- if (jform_vvvvvwwvwn_required)
+ if (jform_vvvvvwxvwo_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_vvvvvwwvwn_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_css_view').closest('.control-group').hide();
- if (!jform_vvvvvwwvwn_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_vvvvvwwvwn_required = true;
- }
- }
-}
-
-// the vvvvvwx function
-function vvvvvwx(add_css_views_vvvvvwx)
-{
- // set the function logic
- if (add_css_views_vvvvvwx == 1)
- {
- jQuery('#jform_css_views').closest('.control-group').show();
- if (jform_vvvvvwxvwo_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_vvvvvwxvwo_required = false;
}
}
else
{
- jQuery('#jform_css_views').closest('.control-group').hide();
+ jQuery('#jform_css_view').closest('.control-group').hide();
if (!jform_vvvvvwxvwo_required)
{
- updateFieldRequired('css_views',1);
- jQuery('#jform_css_views').removeAttr('required');
- jQuery('#jform_css_views').removeAttr('aria-required');
- jQuery('#jform_css_views').removeClass('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_vvvvvwxvwo_required = true;
}
}
}
// the vvvvvwy function
-function vvvvvwy(add_javascript_view_file_vvvvvwy)
+function vvvvvwy(add_css_views_vvvvvwy)
{
// set the function logic
- if (add_javascript_view_file_vvvvvwy == 1)
+ if (add_css_views_vvvvvwy == 1)
{
- jQuery('#jform_javascript_view_file').closest('.control-group').show();
+ jQuery('#jform_css_views').closest('.control-group').show();
if (jform_vvvvvwyvwp_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');
+ 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_vvvvvwyvwp_required = false;
}
}
else
{
- jQuery('#jform_javascript_view_file').closest('.control-group').hide();
+ jQuery('#jform_css_views').closest('.control-group').hide();
if (!jform_vvvvvwyvwp_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');
+ updateFieldRequired('css_views',1);
+ jQuery('#jform_css_views').removeAttr('required');
+ jQuery('#jform_css_views').removeAttr('aria-required');
+ jQuery('#jform_css_views').removeClass('required');
jform_vvvvvwyvwp_required = true;
}
}
}
// the vvvvvwz function
-function vvvvvwz(add_javascript_views_file_vvvvvwz)
+function vvvvvwz(add_javascript_view_file_vvvvvwz)
{
// set the function logic
- if (add_javascript_views_file_vvvvvwz == 1)
+ if (add_javascript_view_file_vvvvvwz == 1)
{
- jQuery('#jform_javascript_views_file').closest('.control-group').show();
+ jQuery('#jform_javascript_view_file').closest('.control-group').show();
if (jform_vvvvvwzvwq_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');
+ 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_vvvvvwzvwq_required = false;
}
}
else
{
- jQuery('#jform_javascript_views_file').closest('.control-group').hide();
+ jQuery('#jform_javascript_view_file').closest('.control-group').hide();
if (!jform_vvvvvwzvwq_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');
+ 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_vvvvvwzvwq_required = true;
}
}
}
// the vvvvvxa function
-function vvvvvxa(add_javascript_view_footer_vvvvvxa)
+function vvvvvxa(add_javascript_views_file_vvvvvxa)
{
// set the function logic
- if (add_javascript_view_footer_vvvvvxa == 1)
+ if (add_javascript_views_file_vvvvvxa == 1)
{
- jQuery('#jform_javascript_view_footer').closest('.control-group').show();
+ jQuery('#jform_javascript_views_file').closest('.control-group').show();
if (jform_vvvvvxavwr_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');
+ 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_vvvvvxavwr_required = false;
}
}
else
{
- jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
+ jQuery('#jform_javascript_views_file').closest('.control-group').hide();
if (!jform_vvvvvxavwr_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');
+ 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_vvvvvxavwr_required = true;
}
}
}
// the vvvvvxb function
-function vvvvvxb(add_javascript_views_footer_vvvvvxb)
+function vvvvvxb(add_javascript_view_footer_vvvvvxb)
{
// set the function logic
- if (add_javascript_views_footer_vvvvvxb == 1)
+ if (add_javascript_view_footer_vvvvvxb == 1)
{
- jQuery('#jform_javascript_views_footer').closest('.control-group').show();
+ jQuery('#jform_javascript_view_footer').closest('.control-group').show();
if (jform_vvvvvxbvws_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');
+ 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_vvvvvxbvws_required = false;
}
}
else
{
- jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
+ jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
if (!jform_vvvvvxbvws_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');
+ 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_vvvvvxbvws_required = true;
}
}
}
// the vvvvvxc function
-function vvvvvxc(add_php_ajax_vvvvvxc)
+function vvvvvxc(add_javascript_views_footer_vvvvvxc)
{
// set the function logic
- if (add_php_ajax_vvvvvxc == 1)
+ if (add_javascript_views_footer_vvvvvxc == 1)
+ {
+ jQuery('#jform_javascript_views_footer').closest('.control-group').show();
+ if (jform_vvvvvxcvwt_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_vvvvvxcvwt_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
+ if (!jform_vvvvvxcvwt_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_vvvvvxcvwt_required = true;
+ }
+ }
+}
+
+// the vvvvvxd function
+function vvvvvxd(add_php_ajax_vvvvvxd)
+{
+ // set the function logic
+ if (add_php_ajax_vvvvvxd == 1)
{
jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
- if (jform_vvvvvxcvwt_required)
+ if (jform_vvvvvxdvwu_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_vvvvvxcvwt_required = false;
+ jform_vvvvvxdvwu_required = false;
}
}
@@ -356,549 +356,549 @@ function vvvvvxc(add_php_ajax_vvvvvxc)
{
jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
- if (!jform_vvvvvxcvwt_required)
+ if (!jform_vvvvvxdvwu_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_vvvvvxcvwt_required = true;
- }
- }
-}
-
-// the vvvvvxd function
-function vvvvvxd(add_php_getitem_vvvvvxd)
-{
- // set the function logic
- if (add_php_getitem_vvvvvxd == 1)
- {
- jQuery('#jform_php_getitem').closest('.control-group').show();
- if (jform_vvvvvxdvwu_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_vvvvvxdvwu_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_php_getitem').closest('.control-group').hide();
- if (!jform_vvvvvxdvwu_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_vvvvvxdvwu_required = true;
}
}
}
// the vvvvvxe function
-function vvvvvxe(add_php_getitems_vvvvvxe)
+function vvvvvxe(add_php_getitem_vvvvvxe)
{
// set the function logic
- if (add_php_getitems_vvvvvxe == 1)
+ if (add_php_getitem_vvvvvxe == 1)
{
- jQuery('#jform_php_getitems').closest('.control-group').show();
+ jQuery('#jform_php_getitem').closest('.control-group').show();
if (jform_vvvvvxevwv_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');
+ 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_vvvvvxevwv_required = false;
}
}
else
{
- jQuery('#jform_php_getitems').closest('.control-group').hide();
+ jQuery('#jform_php_getitem').closest('.control-group').hide();
if (!jform_vvvvvxevwv_required)
{
- updateFieldRequired('php_getitems',1);
- jQuery('#jform_php_getitems').removeAttr('required');
- jQuery('#jform_php_getitems').removeAttr('aria-required');
- jQuery('#jform_php_getitems').removeClass('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_vvvvvxevwv_required = true;
}
}
}
// the vvvvvxf function
-function vvvvvxf(add_php_getitems_after_all_vvvvvxf)
+function vvvvvxf(add_php_getitems_vvvvvxf)
{
// set the function logic
- if (add_php_getitems_after_all_vvvvvxf == 1)
+ if (add_php_getitems_vvvvvxf == 1)
{
- jQuery('#jform_php_getitems_after_all').closest('.control-group').show();
+ jQuery('#jform_php_getitems').closest('.control-group').show();
if (jform_vvvvvxfvww_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');
+ 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_vvvvvxfvww_required = false;
}
}
else
{
- jQuery('#jform_php_getitems_after_all').closest('.control-group').hide();
+ jQuery('#jform_php_getitems').closest('.control-group').hide();
if (!jform_vvvvvxfvww_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');
+ updateFieldRequired('php_getitems',1);
+ jQuery('#jform_php_getitems').removeAttr('required');
+ jQuery('#jform_php_getitems').removeAttr('aria-required');
+ jQuery('#jform_php_getitems').removeClass('required');
jform_vvvvvxfvww_required = true;
}
}
}
// the vvvvvxg function
-function vvvvvxg(add_php_getlistquery_vvvvvxg)
+function vvvvvxg(add_php_getitems_after_all_vvvvvxg)
{
// set the function logic
- if (add_php_getlistquery_vvvvvxg == 1)
+ if (add_php_getitems_after_all_vvvvvxg == 1)
{
- jQuery('#jform_php_getlistquery').closest('.control-group').show();
+ jQuery('#jform_php_getitems_after_all').closest('.control-group').show();
if (jform_vvvvvxgvwx_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');
+ 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_vvvvvxgvwx_required = false;
}
}
else
{
- jQuery('#jform_php_getlistquery').closest('.control-group').hide();
+ jQuery('#jform_php_getitems_after_all').closest('.control-group').hide();
if (!jform_vvvvvxgvwx_required)
{
- updateFieldRequired('php_getlistquery',1);
- jQuery('#jform_php_getlistquery').removeAttr('required');
- jQuery('#jform_php_getlistquery').removeAttr('aria-required');
- jQuery('#jform_php_getlistquery').removeClass('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_vvvvvxgvwx_required = true;
}
}
}
// the vvvvvxh function
-function vvvvvxh(add_php_before_save_vvvvvxh)
+function vvvvvxh(add_php_getlistquery_vvvvvxh)
{
// set the function logic
- if (add_php_before_save_vvvvvxh == 1)
+ if (add_php_getlistquery_vvvvvxh == 1)
{
- jQuery('#jform_php_before_save').closest('.control-group').show();
+ jQuery('#jform_php_getlistquery').closest('.control-group').show();
if (jform_vvvvvxhvwy_required)
{
- updateFieldRequired('php_before_save',0);
- jQuery('#jform_php_before_save').prop('required','required');
- jQuery('#jform_php_before_save').attr('aria-required',true);
- jQuery('#jform_php_before_save').addClass('required');
+ updateFieldRequired('php_getlistquery',0);
+ jQuery('#jform_php_getlistquery').prop('required','required');
+ jQuery('#jform_php_getlistquery').attr('aria-required',true);
+ jQuery('#jform_php_getlistquery').addClass('required');
jform_vvvvvxhvwy_required = false;
}
}
else
{
- jQuery('#jform_php_before_save').closest('.control-group').hide();
+ jQuery('#jform_php_getlistquery').closest('.control-group').hide();
if (!jform_vvvvvxhvwy_required)
{
- updateFieldRequired('php_before_save',1);
- jQuery('#jform_php_before_save').removeAttr('required');
- jQuery('#jform_php_before_save').removeAttr('aria-required');
- jQuery('#jform_php_before_save').removeClass('required');
+ updateFieldRequired('php_getlistquery',1);
+ jQuery('#jform_php_getlistquery').removeAttr('required');
+ jQuery('#jform_php_getlistquery').removeAttr('aria-required');
+ jQuery('#jform_php_getlistquery').removeClass('required');
jform_vvvvvxhvwy_required = true;
}
}
}
// the vvvvvxi function
-function vvvvvxi(add_php_save_vvvvvxi)
+function vvvvvxi(add_php_before_save_vvvvvxi)
{
// set the function logic
- if (add_php_save_vvvvvxi == 1)
+ if (add_php_before_save_vvvvvxi == 1)
{
- jQuery('#jform_php_save').closest('.control-group').show();
+ jQuery('#jform_php_before_save').closest('.control-group').show();
if (jform_vvvvvxivwz_required)
{
- updateFieldRequired('php_save',0);
- jQuery('#jform_php_save').prop('required','required');
- jQuery('#jform_php_save').attr('aria-required',true);
- jQuery('#jform_php_save').addClass('required');
+ updateFieldRequired('php_before_save',0);
+ jQuery('#jform_php_before_save').prop('required','required');
+ jQuery('#jform_php_before_save').attr('aria-required',true);
+ jQuery('#jform_php_before_save').addClass('required');
jform_vvvvvxivwz_required = false;
}
}
else
{
- jQuery('#jform_php_save').closest('.control-group').hide();
+ jQuery('#jform_php_before_save').closest('.control-group').hide();
if (!jform_vvvvvxivwz_required)
{
- updateFieldRequired('php_save',1);
- jQuery('#jform_php_save').removeAttr('required');
- jQuery('#jform_php_save').removeAttr('aria-required');
- jQuery('#jform_php_save').removeClass('required');
+ updateFieldRequired('php_before_save',1);
+ jQuery('#jform_php_before_save').removeAttr('required');
+ jQuery('#jform_php_before_save').removeAttr('aria-required');
+ jQuery('#jform_php_before_save').removeClass('required');
jform_vvvvvxivwz_required = true;
}
}
}
// the vvvvvxj function
-function vvvvvxj(add_php_postsavehook_vvvvvxj)
+function vvvvvxj(add_php_save_vvvvvxj)
{
// set the function logic
- if (add_php_postsavehook_vvvvvxj == 1)
+ if (add_php_save_vvvvvxj == 1)
{
- jQuery('#jform_php_postsavehook').closest('.control-group').show();
+ jQuery('#jform_php_save').closest('.control-group').show();
if (jform_vvvvvxjvxa_required)
{
- updateFieldRequired('php_postsavehook',0);
- jQuery('#jform_php_postsavehook').prop('required','required');
- jQuery('#jform_php_postsavehook').attr('aria-required',true);
- jQuery('#jform_php_postsavehook').addClass('required');
+ updateFieldRequired('php_save',0);
+ jQuery('#jform_php_save').prop('required','required');
+ jQuery('#jform_php_save').attr('aria-required',true);
+ jQuery('#jform_php_save').addClass('required');
jform_vvvvvxjvxa_required = false;
}
}
else
{
- jQuery('#jform_php_postsavehook').closest('.control-group').hide();
+ jQuery('#jform_php_save').closest('.control-group').hide();
if (!jform_vvvvvxjvxa_required)
{
- updateFieldRequired('php_postsavehook',1);
- jQuery('#jform_php_postsavehook').removeAttr('required');
- jQuery('#jform_php_postsavehook').removeAttr('aria-required');
- jQuery('#jform_php_postsavehook').removeClass('required');
+ updateFieldRequired('php_save',1);
+ jQuery('#jform_php_save').removeAttr('required');
+ jQuery('#jform_php_save').removeAttr('aria-required');
+ jQuery('#jform_php_save').removeClass('required');
jform_vvvvvxjvxa_required = true;
}
}
}
// the vvvvvxk function
-function vvvvvxk(add_php_allowedit_vvvvvxk)
+function vvvvvxk(add_php_postsavehook_vvvvvxk)
{
// set the function logic
- if (add_php_allowedit_vvvvvxk == 1)
+ if (add_php_postsavehook_vvvvvxk == 1)
{
- jQuery('#jform_php_allowedit').closest('.control-group').show();
+ jQuery('#jform_php_postsavehook').closest('.control-group').show();
if (jform_vvvvvxkvxb_required)
{
- updateFieldRequired('php_allowedit',0);
- jQuery('#jform_php_allowedit').prop('required','required');
- jQuery('#jform_php_allowedit').attr('aria-required',true);
- jQuery('#jform_php_allowedit').addClass('required');
+ updateFieldRequired('php_postsavehook',0);
+ jQuery('#jform_php_postsavehook').prop('required','required');
+ jQuery('#jform_php_postsavehook').attr('aria-required',true);
+ jQuery('#jform_php_postsavehook').addClass('required');
jform_vvvvvxkvxb_required = false;
}
}
else
{
- jQuery('#jform_php_allowedit').closest('.control-group').hide();
+ jQuery('#jform_php_postsavehook').closest('.control-group').hide();
if (!jform_vvvvvxkvxb_required)
{
- updateFieldRequired('php_allowedit',1);
- jQuery('#jform_php_allowedit').removeAttr('required');
- jQuery('#jform_php_allowedit').removeAttr('aria-required');
- jQuery('#jform_php_allowedit').removeClass('required');
+ updateFieldRequired('php_postsavehook',1);
+ jQuery('#jform_php_postsavehook').removeAttr('required');
+ jQuery('#jform_php_postsavehook').removeAttr('aria-required');
+ jQuery('#jform_php_postsavehook').removeClass('required');
jform_vvvvvxkvxb_required = true;
}
}
}
// the vvvvvxl function
-function vvvvvxl(add_php_batchcopy_vvvvvxl)
+function vvvvvxl(add_php_allowedit_vvvvvxl)
{
// set the function logic
- if (add_php_batchcopy_vvvvvxl == 1)
+ if (add_php_allowedit_vvvvvxl == 1)
{
- jQuery('#jform_php_batchcopy').closest('.control-group').show();
+ jQuery('#jform_php_allowedit').closest('.control-group').show();
if (jform_vvvvvxlvxc_required)
{
- updateFieldRequired('php_batchcopy',0);
- jQuery('#jform_php_batchcopy').prop('required','required');
- jQuery('#jform_php_batchcopy').attr('aria-required',true);
- jQuery('#jform_php_batchcopy').addClass('required');
+ updateFieldRequired('php_allowedit',0);
+ jQuery('#jform_php_allowedit').prop('required','required');
+ jQuery('#jform_php_allowedit').attr('aria-required',true);
+ jQuery('#jform_php_allowedit').addClass('required');
jform_vvvvvxlvxc_required = false;
}
}
else
{
- jQuery('#jform_php_batchcopy').closest('.control-group').hide();
+ jQuery('#jform_php_allowedit').closest('.control-group').hide();
if (!jform_vvvvvxlvxc_required)
{
- updateFieldRequired('php_batchcopy',1);
- jQuery('#jform_php_batchcopy').removeAttr('required');
- jQuery('#jform_php_batchcopy').removeAttr('aria-required');
- jQuery('#jform_php_batchcopy').removeClass('required');
+ updateFieldRequired('php_allowedit',1);
+ jQuery('#jform_php_allowedit').removeAttr('required');
+ jQuery('#jform_php_allowedit').removeAttr('aria-required');
+ jQuery('#jform_php_allowedit').removeClass('required');
jform_vvvvvxlvxc_required = true;
}
}
}
// the vvvvvxm function
-function vvvvvxm(add_php_batchmove_vvvvvxm)
+function vvvvvxm(add_php_batchcopy_vvvvvxm)
{
// set the function logic
- if (add_php_batchmove_vvvvvxm == 1)
+ if (add_php_batchcopy_vvvvvxm == 1)
{
- jQuery('#jform_php_batchmove').closest('.control-group').show();
+ jQuery('#jform_php_batchcopy').closest('.control-group').show();
if (jform_vvvvvxmvxd_required)
{
- updateFieldRequired('php_batchmove',0);
- jQuery('#jform_php_batchmove').prop('required','required');
- jQuery('#jform_php_batchmove').attr('aria-required',true);
- jQuery('#jform_php_batchmove').addClass('required');
+ updateFieldRequired('php_batchcopy',0);
+ jQuery('#jform_php_batchcopy').prop('required','required');
+ jQuery('#jform_php_batchcopy').attr('aria-required',true);
+ jQuery('#jform_php_batchcopy').addClass('required');
jform_vvvvvxmvxd_required = false;
}
}
else
{
- jQuery('#jform_php_batchmove').closest('.control-group').hide();
+ jQuery('#jform_php_batchcopy').closest('.control-group').hide();
if (!jform_vvvvvxmvxd_required)
{
- updateFieldRequired('php_batchmove',1);
- jQuery('#jform_php_batchmove').removeAttr('required');
- jQuery('#jform_php_batchmove').removeAttr('aria-required');
- jQuery('#jform_php_batchmove').removeClass('required');
+ updateFieldRequired('php_batchcopy',1);
+ jQuery('#jform_php_batchcopy').removeAttr('required');
+ jQuery('#jform_php_batchcopy').removeAttr('aria-required');
+ jQuery('#jform_php_batchcopy').removeClass('required');
jform_vvvvvxmvxd_required = true;
}
}
}
// the vvvvvxn function
-function vvvvvxn(add_php_before_publish_vvvvvxn)
+function vvvvvxn(add_php_batchmove_vvvvvxn)
{
// set the function logic
- if (add_php_before_publish_vvvvvxn == 1)
+ if (add_php_batchmove_vvvvvxn == 1)
{
- jQuery('#jform_php_before_publish').closest('.control-group').show();
+ jQuery('#jform_php_batchmove').closest('.control-group').show();
if (jform_vvvvvxnvxe_required)
{
- updateFieldRequired('php_before_publish',0);
- jQuery('#jform_php_before_publish').prop('required','required');
- jQuery('#jform_php_before_publish').attr('aria-required',true);
- jQuery('#jform_php_before_publish').addClass('required');
+ updateFieldRequired('php_batchmove',0);
+ jQuery('#jform_php_batchmove').prop('required','required');
+ jQuery('#jform_php_batchmove').attr('aria-required',true);
+ jQuery('#jform_php_batchmove').addClass('required');
jform_vvvvvxnvxe_required = false;
}
}
else
{
- jQuery('#jform_php_before_publish').closest('.control-group').hide();
+ jQuery('#jform_php_batchmove').closest('.control-group').hide();
if (!jform_vvvvvxnvxe_required)
{
- updateFieldRequired('php_before_publish',1);
- jQuery('#jform_php_before_publish').removeAttr('required');
- jQuery('#jform_php_before_publish').removeAttr('aria-required');
- jQuery('#jform_php_before_publish').removeClass('required');
+ updateFieldRequired('php_batchmove',1);
+ jQuery('#jform_php_batchmove').removeAttr('required');
+ jQuery('#jform_php_batchmove').removeAttr('aria-required');
+ jQuery('#jform_php_batchmove').removeClass('required');
jform_vvvvvxnvxe_required = true;
}
}
}
// the vvvvvxo function
-function vvvvvxo(add_php_after_publish_vvvvvxo)
+function vvvvvxo(add_php_before_publish_vvvvvxo)
{
// set the function logic
- if (add_php_after_publish_vvvvvxo == 1)
+ if (add_php_before_publish_vvvvvxo == 1)
{
- jQuery('#jform_php_after_publish').closest('.control-group').show();
+ jQuery('#jform_php_before_publish').closest('.control-group').show();
if (jform_vvvvvxovxf_required)
{
- updateFieldRequired('php_after_publish',0);
- jQuery('#jform_php_after_publish').prop('required','required');
- jQuery('#jform_php_after_publish').attr('aria-required',true);
- jQuery('#jform_php_after_publish').addClass('required');
+ updateFieldRequired('php_before_publish',0);
+ jQuery('#jform_php_before_publish').prop('required','required');
+ jQuery('#jform_php_before_publish').attr('aria-required',true);
+ jQuery('#jform_php_before_publish').addClass('required');
jform_vvvvvxovxf_required = false;
}
}
else
{
- jQuery('#jform_php_after_publish').closest('.control-group').hide();
+ jQuery('#jform_php_before_publish').closest('.control-group').hide();
if (!jform_vvvvvxovxf_required)
{
- updateFieldRequired('php_after_publish',1);
- jQuery('#jform_php_after_publish').removeAttr('required');
- jQuery('#jform_php_after_publish').removeAttr('aria-required');
- jQuery('#jform_php_after_publish').removeClass('required');
+ updateFieldRequired('php_before_publish',1);
+ jQuery('#jform_php_before_publish').removeAttr('required');
+ jQuery('#jform_php_before_publish').removeAttr('aria-required');
+ jQuery('#jform_php_before_publish').removeClass('required');
jform_vvvvvxovxf_required = true;
}
}
}
// the vvvvvxp function
-function vvvvvxp(add_php_before_delete_vvvvvxp)
+function vvvvvxp(add_php_after_publish_vvvvvxp)
{
// set the function logic
- if (add_php_before_delete_vvvvvxp == 1)
+ if (add_php_after_publish_vvvvvxp == 1)
{
- jQuery('#jform_php_before_delete').closest('.control-group').show();
+ jQuery('#jform_php_after_publish').closest('.control-group').show();
if (jform_vvvvvxpvxg_required)
{
- updateFieldRequired('php_before_delete',0);
- jQuery('#jform_php_before_delete').prop('required','required');
- jQuery('#jform_php_before_delete').attr('aria-required',true);
- jQuery('#jform_php_before_delete').addClass('required');
+ updateFieldRequired('php_after_publish',0);
+ jQuery('#jform_php_after_publish').prop('required','required');
+ jQuery('#jform_php_after_publish').attr('aria-required',true);
+ jQuery('#jform_php_after_publish').addClass('required');
jform_vvvvvxpvxg_required = false;
}
}
else
{
- jQuery('#jform_php_before_delete').closest('.control-group').hide();
+ jQuery('#jform_php_after_publish').closest('.control-group').hide();
if (!jform_vvvvvxpvxg_required)
{
- updateFieldRequired('php_before_delete',1);
- jQuery('#jform_php_before_delete').removeAttr('required');
- jQuery('#jform_php_before_delete').removeAttr('aria-required');
- jQuery('#jform_php_before_delete').removeClass('required');
+ updateFieldRequired('php_after_publish',1);
+ jQuery('#jform_php_after_publish').removeAttr('required');
+ jQuery('#jform_php_after_publish').removeAttr('aria-required');
+ jQuery('#jform_php_after_publish').removeClass('required');
jform_vvvvvxpvxg_required = true;
}
}
}
// the vvvvvxq function
-function vvvvvxq(add_php_after_delete_vvvvvxq)
+function vvvvvxq(add_php_before_delete_vvvvvxq)
{
// set the function logic
- if (add_php_after_delete_vvvvvxq == 1)
+ if (add_php_before_delete_vvvvvxq == 1)
{
- jQuery('#jform_php_after_delete').closest('.control-group').show();
+ jQuery('#jform_php_before_delete').closest('.control-group').show();
if (jform_vvvvvxqvxh_required)
{
- updateFieldRequired('php_after_delete',0);
- jQuery('#jform_php_after_delete').prop('required','required');
- jQuery('#jform_php_after_delete').attr('aria-required',true);
- jQuery('#jform_php_after_delete').addClass('required');
+ updateFieldRequired('php_before_delete',0);
+ jQuery('#jform_php_before_delete').prop('required','required');
+ jQuery('#jform_php_before_delete').attr('aria-required',true);
+ jQuery('#jform_php_before_delete').addClass('required');
jform_vvvvvxqvxh_required = false;
}
}
else
{
- jQuery('#jform_php_after_delete').closest('.control-group').hide();
+ jQuery('#jform_php_before_delete').closest('.control-group').hide();
if (!jform_vvvvvxqvxh_required)
{
- updateFieldRequired('php_after_delete',1);
- jQuery('#jform_php_after_delete').removeAttr('required');
- jQuery('#jform_php_after_delete').removeAttr('aria-required');
- jQuery('#jform_php_after_delete').removeClass('required');
+ updateFieldRequired('php_before_delete',1);
+ jQuery('#jform_php_before_delete').removeAttr('required');
+ jQuery('#jform_php_before_delete').removeAttr('aria-required');
+ jQuery('#jform_php_before_delete').removeClass('required');
jform_vvvvvxqvxh_required = true;
}
}
}
// the vvvvvxr function
-function vvvvvxr(add_php_document_vvvvvxr)
+function vvvvvxr(add_php_after_delete_vvvvvxr)
{
// set the function logic
- if (add_php_document_vvvvvxr == 1)
+ if (add_php_after_delete_vvvvvxr == 1)
{
- jQuery('#jform_php_document').closest('.control-group').show();
+ jQuery('#jform_php_after_delete').closest('.control-group').show();
if (jform_vvvvvxrvxi_required)
{
- updateFieldRequired('php_document',0);
- jQuery('#jform_php_document').prop('required','required');
- jQuery('#jform_php_document').attr('aria-required',true);
- jQuery('#jform_php_document').addClass('required');
+ updateFieldRequired('php_after_delete',0);
+ jQuery('#jform_php_after_delete').prop('required','required');
+ jQuery('#jform_php_after_delete').attr('aria-required',true);
+ jQuery('#jform_php_after_delete').addClass('required');
jform_vvvvvxrvxi_required = false;
}
}
else
{
- jQuery('#jform_php_document').closest('.control-group').hide();
+ jQuery('#jform_php_after_delete').closest('.control-group').hide();
if (!jform_vvvvvxrvxi_required)
{
- updateFieldRequired('php_document',1);
- jQuery('#jform_php_document').removeAttr('required');
- jQuery('#jform_php_document').removeAttr('aria-required');
- jQuery('#jform_php_document').removeClass('required');
+ updateFieldRequired('php_after_delete',1);
+ jQuery('#jform_php_after_delete').removeAttr('required');
+ jQuery('#jform_php_after_delete').removeAttr('aria-required');
+ jQuery('#jform_php_after_delete').removeClass('required');
jform_vvvvvxrvxi_required = true;
}
}
}
// the vvvvvxs function
-function vvvvvxs(add_sql_vvvvvxs)
+function vvvvvxs(add_php_document_vvvvvxs)
{
// set the function logic
- if (add_sql_vvvvvxs == 1)
+ if (add_php_document_vvvvvxs == 1)
{
- jQuery('#jform_source').closest('.control-group').show();
+ jQuery('#jform_php_document').closest('.control-group').show();
if (jform_vvvvvxsvxj_required)
{
- updateFieldRequired('source',0);
- jQuery('#jform_source').prop('required','required');
- jQuery('#jform_source').attr('aria-required',true);
- jQuery('#jform_source').addClass('required');
+ updateFieldRequired('php_document',0);
+ jQuery('#jform_php_document').prop('required','required');
+ jQuery('#jform_php_document').attr('aria-required',true);
+ jQuery('#jform_php_document').addClass('required');
jform_vvvvvxsvxj_required = false;
}
}
else
{
- jQuery('#jform_source').closest('.control-group').hide();
+ jQuery('#jform_php_document').closest('.control-group').hide();
if (!jform_vvvvvxsvxj_required)
{
- updateFieldRequired('source',1);
- jQuery('#jform_source').removeAttr('required');
- jQuery('#jform_source').removeAttr('aria-required');
- jQuery('#jform_source').removeClass('required');
+ updateFieldRequired('php_document',1);
+ jQuery('#jform_php_document').removeAttr('required');
+ jQuery('#jform_php_document').removeAttr('aria-required');
+ jQuery('#jform_php_document').removeClass('required');
jform_vvvvvxsvxj_required = true;
}
}
}
// the vvvvvxt function
-function vvvvvxt(source_vvvvvxt,add_sql_vvvvvxt)
+function vvvvvxt(add_sql_vvvvvxt)
{
// set the function logic
- if (source_vvvvvxt == 2 && add_sql_vvvvvxt == 1)
+ if (add_sql_vvvvvxt == 1)
{
- jQuery('#jform_sql').closest('.control-group').show();
+ jQuery('#jform_source').closest('.control-group').show();
if (jform_vvvvvxtvxk_required)
{
- updateFieldRequired('sql',0);
- jQuery('#jform_sql').prop('required','required');
- jQuery('#jform_sql').attr('aria-required',true);
- jQuery('#jform_sql').addClass('required');
+ updateFieldRequired('source',0);
+ jQuery('#jform_source').prop('required','required');
+ jQuery('#jform_source').attr('aria-required',true);
+ jQuery('#jform_source').addClass('required');
jform_vvvvvxtvxk_required = false;
}
}
else
{
- jQuery('#jform_sql').closest('.control-group').hide();
+ jQuery('#jform_source').closest('.control-group').hide();
if (!jform_vvvvvxtvxk_required)
{
- updateFieldRequired('sql',1);
- jQuery('#jform_sql').removeAttr('required');
- jQuery('#jform_sql').removeAttr('aria-required');
- jQuery('#jform_sql').removeClass('required');
+ updateFieldRequired('source',1);
+ jQuery('#jform_source').removeAttr('required');
+ jQuery('#jform_source').removeAttr('aria-required');
+ jQuery('#jform_source').removeClass('required');
jform_vvvvvxtvxk_required = true;
}
}
}
-// the vvvvvxv function
-function vvvvvxv(source_vvvvvxv,add_sql_vvvvvxv)
+// the vvvvvxu function
+function vvvvvxu(source_vvvvvxu,add_sql_vvvvvxu)
{
// set the function logic
- if (source_vvvvvxv == 1 && add_sql_vvvvvxv == 1)
+ if (source_vvvvvxu == 2 && add_sql_vvvvvxu == 1)
+ {
+ jQuery('#jform_sql').closest('.control-group').show();
+ if (jform_vvvvvxuvxl_required)
+ {
+ updateFieldRequired('sql',0);
+ jQuery('#jform_sql').prop('required','required');
+ jQuery('#jform_sql').attr('aria-required',true);
+ jQuery('#jform_sql').addClass('required');
+ jform_vvvvvxuvxl_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_sql').closest('.control-group').hide();
+ if (!jform_vvvvvxuvxl_required)
+ {
+ updateFieldRequired('sql',1);
+ jQuery('#jform_sql').removeAttr('required');
+ jQuery('#jform_sql').removeAttr('aria-required');
+ jQuery('#jform_sql').removeClass('required');
+ jform_vvvvvxuvxl_required = true;
+ }
+ }
+}
+
+// the vvvvvxw function
+function vvvvvxw(source_vvvvvxw,add_sql_vvvvvxw)
+{
+ // set the function logic
+ if (source_vvvvvxw == 1 && add_sql_vvvvvxw == 1)
{
jQuery('#jform_addtables-lbl').closest('.control-group').show();
}
@@ -908,139 +908,139 @@ function vvvvvxv(source_vvvvvxv,add_sql_vvvvvxv)
}
}
-// the vvvvvxx function
-function vvvvvxx(add_custom_import_vvvvvxx)
+// the vvvvvxy function
+function vvvvvxy(add_custom_import_vvvvvxy)
{
// set the function logic
- if (add_custom_import_vvvvvxx == 1)
+ if (add_custom_import_vvvvvxy == 1)
{
jQuery('#jform_html_import_view').closest('.control-group').show();
- if (jform_vvvvvxxvxl_required)
+ if (jform_vvvvvxyvxm_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_vvvvvxxvxl_required = false;
+ jform_vvvvvxyvxm_required = false;
}
jQuery('.note_advanced_import').closest('.control-group').show();
jQuery('#jform_php_import_display').closest('.control-group').show();
- if (jform_vvvvvxxvxm_required)
+ if (jform_vvvvvxyvxn_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_vvvvvxxvxm_required = false;
+ jform_vvvvvxyvxn_required = false;
}
jQuery('#jform_php_import_ext').closest('.control-group').show();
- if (jform_vvvvvxxvxn_required)
+ if (jform_vvvvvxyvxo_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_vvvvvxxvxn_required = false;
+ jform_vvvvvxyvxo_required = false;
}
jQuery('#jform_php_import').closest('.control-group').show();
- if (jform_vvvvvxxvxo_required)
+ if (jform_vvvvvxyvxp_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_vvvvvxxvxo_required = false;
+ jform_vvvvvxyvxp_required = false;
}
jQuery('#jform_php_import_save').closest('.control-group').show();
- if (jform_vvvvvxxvxp_required)
+ if (jform_vvvvvxyvxq_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_vvvvvxxvxp_required = false;
+ jform_vvvvvxyvxq_required = false;
}
jQuery('#jform_php_import_setdata').closest('.control-group').show();
- if (jform_vvvvvxxvxq_required)
+ if (jform_vvvvvxyvxr_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_vvvvvxxvxq_required = false;
+ jform_vvvvvxyvxr_required = false;
}
}
else
{
jQuery('#jform_html_import_view').closest('.control-group').hide();
- if (!jform_vvvvvxxvxl_required)
+ if (!jform_vvvvvxyvxm_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_vvvvvxxvxl_required = true;
+ jform_vvvvvxyvxm_required = true;
}
jQuery('.note_advanced_import').closest('.control-group').hide();
jQuery('#jform_php_import_display').closest('.control-group').hide();
- if (!jform_vvvvvxxvxm_required)
+ if (!jform_vvvvvxyvxn_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_vvvvvxxvxm_required = true;
+ jform_vvvvvxyvxn_required = true;
}
jQuery('#jform_php_import_ext').closest('.control-group').hide();
- if (!jform_vvvvvxxvxn_required)
+ if (!jform_vvvvvxyvxo_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_vvvvvxxvxn_required = true;
+ jform_vvvvvxyvxo_required = true;
}
jQuery('#jform_php_import').closest('.control-group').hide();
- if (!jform_vvvvvxxvxo_required)
+ if (!jform_vvvvvxyvxp_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_vvvvvxxvxo_required = true;
+ jform_vvvvvxyvxp_required = true;
}
jQuery('#jform_php_import_save').closest('.control-group').hide();
- if (!jform_vvvvvxxvxp_required)
+ if (!jform_vvvvvxyvxq_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_vvvvvxxvxp_required = true;
+ jform_vvvvvxyvxq_required = true;
}
jQuery('#jform_php_import_setdata').closest('.control-group').hide();
- if (!jform_vvvvvxxvxq_required)
+ if (!jform_vvvvvxyvxr_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_vvvvvxxvxq_required = true;
+ jform_vvvvvxyvxr_required = true;
}
}
}
-// the vvvvvxy function
-function vvvvvxy(add_custom_import_vvvvvxy)
+// the vvvvvxz function
+function vvvvvxz(add_custom_import_vvvvvxz)
{
// set the function logic
- if (add_custom_import_vvvvvxy == 0)
+ if (add_custom_import_vvvvvxz == 0)
{
jQuery('.note_beginner_import').closest('.control-group').show();
}
@@ -1050,51 +1050,51 @@ function vvvvvxy(add_custom_import_vvvvvxy)
}
}
-// the vvvvvxz function
-function vvvvvxz(add_custom_button_vvvvvxz)
+// the vvvvvya function
+function vvvvvya(add_custom_button_vvvvvya)
{
// set the function logic
- if (add_custom_button_vvvvvxz == 1)
+ if (add_custom_button_vvvvvya == 1)
{
jQuery('#jform_custom_button-lbl').closest('.control-group').show();
jQuery('#jform_php_controller').closest('.control-group').show();
- if (jform_vvvvvxzvxr_required)
+ if (jform_vvvvvyavxs_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_vvvvvxzvxr_required = false;
+ jform_vvvvvyavxs_required = false;
}
jQuery('#jform_php_controller_list').closest('.control-group').show();
- if (jform_vvvvvxzvxs_required)
+ if (jform_vvvvvyavxt_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_vvvvvxzvxs_required = false;
+ jform_vvvvvyavxt_required = false;
}
jQuery('#jform_php_model').closest('.control-group').show();
- if (jform_vvvvvxzvxt_required)
+ if (jform_vvvvvyavxu_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_vvvvvxzvxt_required = false;
+ jform_vvvvvyavxu_required = false;
}
jQuery('#jform_php_model_list').closest('.control-group').show();
- if (jform_vvvvvxzvxu_required)
+ if (jform_vvvvvyavxv_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_vvvvvxzvxu_required = false;
+ jform_vvvvvyavxv_required = false;
}
}
@@ -1102,40 +1102,40 @@ function vvvvvxz(add_custom_button_vvvvvxz)
{
jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
jQuery('#jform_php_controller').closest('.control-group').hide();
- if (!jform_vvvvvxzvxr_required)
+ if (!jform_vvvvvyavxs_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_vvvvvxzvxr_required = true;
+ jform_vvvvvyavxs_required = true;
}
jQuery('#jform_php_controller_list').closest('.control-group').hide();
- if (!jform_vvvvvxzvxs_required)
+ if (!jform_vvvvvyavxt_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_vvvvvxzvxs_required = true;
+ jform_vvvvvyavxt_required = true;
}
jQuery('#jform_php_model').closest('.control-group').hide();
- if (!jform_vvvvvxzvxt_required)
+ if (!jform_vvvvvyavxu_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_vvvvvxzvxt_required = true;
+ jform_vvvvvyavxu_required = true;
}
jQuery('#jform_php_model_list').closest('.control-group').hide();
- if (!jform_vvvvvxzvxu_required)
+ if (!jform_vvvvvyavxv_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_vvvvvxzvxu_required = true;
+ jform_vvvvvyavxv_required = true;
}
}
}
@@ -1178,6 +1178,8 @@ function isSet(val)
jQuery(document).ready(function()
{
+ // get the linked details
+ getLinked();
// set button
addButtonID('admin_fields','create_edit_buttons', 1); // <-- first
var valueSwitch = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
@@ -1264,6 +1266,28 @@ function addButton(type,where){
}
})
}
+
+function getLinked_server(type){
+ var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&vdm="+vastDevMod;
+ if(token.length > 0 && type > 0){
+ var request = 'token='+token+'&type='+type;
+ }
+ return jQuery.ajax({
+ type: 'GET',
+ url: getUrl,
+ dataType: 'jsonp',
+ data: request,
+ jsonp: 'callback'
+ });
+}
+
+function getLinked(){
+ getLinked_server(1).done(function(result) {
+ if(result){
+ jQuery('#display_linked_to').html(result);
+ }
+ });
+}
function getTableColumns_server(tableName){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.tableColumns&format=json";
diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml
index 14de9cdd7..73fe5b727 100644
--- a/admin/models/forms/admin_view.xml
+++ b/admin/models/forms/admin_view.xml
@@ -170,6 +170,24 @@
filter="raw"
hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_HINT"
required="true" />
+
+
+
+
COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE
COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY
-
-
-
-
-
+
+ class="note_linked_to_notice" />
+
+
+
+
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+ name="note_create_edit_notice"
+ label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL"
+ description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION"
+ heading="h4"
+ class="alert alert-info note_create_edit_notice" />
-
+
+ name="note_create_edit_buttons"
+ description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION"
+ class="note_create_edit_buttons" />
-
-
+
+
0 && type > 0){
+ var request = 'token='+token+'&type='+type;
+ }
+ return jQuery.ajax({
+ type: 'GET',
+ url: getUrl,
+ dataType: 'jsonp',
+ data: request,
+ jsonp: 'callback'
+ });
+}
+
+function getLinked(){
+ getLinked_server(1).done(function(result) {
+ if(result){
+ jQuery('#display_linked_to').html(result);
+ }
+ });
+}
function getSnippetDetails_server(snippetId){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json";
diff --git a/admin/models/forms/custom_admin_view.xml b/admin/models/forms/custom_admin_view.xml
index 952e2ac8b..3e4e32efe 100644
--- a/admin/models/forms/custom_admin_view.xml
+++ b/admin/models/forms/custom_admin_view.xml
@@ -155,21 +155,20 @@
label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_LABEL"
description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_DESCRIPTION"
directory="" />
-
-
+
-
- COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES
- COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO
-
-
+ required="false"
+ button="true" />
+
@@ -184,17 +183,17 @@
description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION"
heading="h4"
class="note_add_language_string" />
-
-
-
- COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES
- COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO
-
+
+
-
-
+
+
-
-
-
- COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES
- COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO
-
-
-
-
-
-
- COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES
- COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO
+
+
+
+
+
+
+
+
+ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES
+ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO
+
+
+
-
-
-
+
-
-
+
+
+
+ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES
+ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO
+
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES
COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO
-
-
+
+
+
+ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES
+ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO
+
-
+
+
+
+ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES
+ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO
+
+
+ hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_HINT"
+ required="false" />
+
+
+
+ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES
+ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO
+
+
+
+
+
diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js
index 316506824..40d2cfb20 100644
--- a/admin/models/forms/custom_code.js
+++ b/admin/models/forms/custom_code.js
@@ -23,43 +23,43 @@
/-----------------------------------------------------------------------------------------------------------------------------*/
// Some Global Values
-jform_vvvvvzsvzk_required = false;
-jform_vvvvvztvzl_required = false;
-jform_vvvvvztvzm_required = false;
-jform_vvvvvztvzn_required = false;
+jform_vvvvvzuvzm_required = false;
+jform_vvvvvzvvzn_required = false;
+jform_vvvvvzvvzo_required = false;
+jform_vvvvvzvvzp_required = false;
// Initial Script
jQuery(document).ready(function()
{
- var target_vvvvvzs = jQuery("#jform_target input[type='radio']:checked").val();
- vvvvvzs(target_vvvvvzs);
-
- var target_vvvvvzt = jQuery("#jform_target input[type='radio']:checked").val();
- vvvvvzt(target_vvvvvzt);
-
var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
- var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
- vvvvvzu(target_vvvvvzu,type_vvvvvzu);
+ vvvvvzu(target_vvvvvzu);
- var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
- vvvvvzv(type_vvvvvzv,target_vvvvvzv);
+ vvvvvzv(target_vvvvvzv);
+
+ var target_vvvvvzw = jQuery("#jform_target input[type='radio']:checked").val();
+ var type_vvvvvzw = jQuery("#jform_type input[type='radio']:checked").val();
+ vvvvvzw(target_vvvvvzw,type_vvvvvzw);
+
+ var type_vvvvvzx = jQuery("#jform_type input[type='radio']:checked").val();
+ var target_vvvvvzx = jQuery("#jform_target input[type='radio']:checked").val();
+ vvvvvzx(type_vvvvvzx,target_vvvvvzx);
});
-// the vvvvvzs function
-function vvvvvzs(target_vvvvvzs)
+// the vvvvvzu function
+function vvvvvzu(target_vvvvvzu)
{
// set the function logic
- if (target_vvvvvzs == 2)
+ if (target_vvvvvzu == 2)
{
jQuery('#jform_function_name').closest('.control-group').show();
- if (jform_vvvvvzsvzk_required)
+ if (jform_vvvvvzuvzm_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_vvvvvzsvzk_required = false;
+ jform_vvvvvzuvzm_required = false;
}
jQuery('.note_jcb_placeholder').closest('.control-group').show();
@@ -68,99 +68,99 @@ function vvvvvzs(target_vvvvvzs)
else
{
jQuery('#jform_function_name').closest('.control-group').hide();
- if (!jform_vvvvvzsvzk_required)
+ if (!jform_vvvvvzuvzm_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_vvvvvzsvzk_required = true;
+ jform_vvvvvzuvzm_required = true;
}
jQuery('.note_jcb_placeholder').closest('.control-group').hide();
jQuery('#jform_system_name').closest('.control-group').hide();
}
}
-// the vvvvvzt function
-function vvvvvzt(target_vvvvvzt)
+// the vvvvvzv function
+function vvvvvzv(target_vvvvvzv)
{
// set the function logic
- if (target_vvvvvzt == 1)
+ if (target_vvvvvzv == 1)
{
jQuery('#jform_component').closest('.control-group').show();
- if (jform_vvvvvztvzl_required)
+ if (jform_vvvvvzvvzn_required)
{
updateFieldRequired('component',0);
jQuery('#jform_component').prop('required','required');
jQuery('#jform_component').attr('aria-required',true);
jQuery('#jform_component').addClass('required');
- jform_vvvvvztvzl_required = false;
+ jform_vvvvvzvvzn_required = false;
}
jQuery('#jform_path').closest('.control-group').show();
- if (jform_vvvvvztvzm_required)
+ if (jform_vvvvvzvvzo_required)
{
updateFieldRequired('path',0);
jQuery('#jform_path').prop('required','required');
jQuery('#jform_path').attr('aria-required',true);
jQuery('#jform_path').addClass('required');
- jform_vvvvvztvzm_required = false;
+ jform_vvvvvzvvzo_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();
- if (jform_vvvvvztvzn_required)
+ if (jform_vvvvvzvvzp_required)
{
updateFieldRequired('type',0);
jQuery('#jform_type').prop('required','required');
jQuery('#jform_type').attr('aria-required',true);
jQuery('#jform_type').addClass('required');
- jform_vvvvvztvzn_required = false;
+ jform_vvvvvzvvzp_required = false;
}
}
else
{
jQuery('#jform_component').closest('.control-group').hide();
- if (!jform_vvvvvztvzl_required)
+ if (!jform_vvvvvzvvzn_required)
{
updateFieldRequired('component',1);
jQuery('#jform_component').removeAttr('required');
jQuery('#jform_component').removeAttr('aria-required');
jQuery('#jform_component').removeClass('required');
- jform_vvvvvztvzl_required = true;
+ jform_vvvvvzvvzn_required = true;
}
jQuery('#jform_path').closest('.control-group').hide();
- if (!jform_vvvvvztvzm_required)
+ if (!jform_vvvvvzvvzo_required)
{
updateFieldRequired('path',1);
jQuery('#jform_path').removeAttr('required');
jQuery('#jform_path').removeAttr('aria-required');
jQuery('#jform_path').removeClass('required');
- jform_vvvvvztvzm_required = true;
+ jform_vvvvvzvvzo_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();
- if (!jform_vvvvvztvzn_required)
+ if (!jform_vvvvvzvvzp_required)
{
updateFieldRequired('type',1);
jQuery('#jform_type').removeAttr('required');
jQuery('#jform_type').removeAttr('aria-required');
jQuery('#jform_type').removeClass('required');
- jform_vvvvvztvzn_required = true;
+ jform_vvvvvzvvzp_required = true;
}
}
}
-// the vvvvvzu function
-function vvvvvzu(target_vvvvvzu,type_vvvvvzu)
+// the vvvvvzw function
+function vvvvvzw(target_vvvvvzw,type_vvvvvzw)
{
// set the function logic
- if (target_vvvvvzu == 1 && type_vvvvvzu == 1)
+ if (target_vvvvvzw == 1 && type_vvvvvzw == 1)
{
jQuery('#jform_hashendtarget').closest('.control-group').show();
jQuery('#jform_to_line').closest('.control-group').show();
@@ -172,11 +172,11 @@ function vvvvvzu(target_vvvvvzu,type_vvvvvzu)
}
}
-// the vvvvvzv function
-function vvvvvzv(type_vvvvvzv,target_vvvvvzv)
+// the vvvvvzx function
+function vvvvvzx(type_vvvvvzx,target_vvvvvzx)
{
// set the function logic
- if (type_vvvvvzv == 1 && target_vvvvvzv == 1)
+ if (type_vvvvvzx == 1 && target_vvvvvzx == 1)
{
jQuery('#jform_hashendtarget').closest('.control-group').show();
jQuery('#jform_to_line').closest('.control-group').show();
diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js
index 29e9501fc..48081b96f 100644
--- a/admin/models/forms/dynamic_get.js
+++ b/admin/models/forms/dynamic_get.js
@@ -23,36 +23,30 @@
/-----------------------------------------------------------------------------------------------------------------------------*/
// Some Global Values
-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_vvvvvzgvyy_required = false;
-jform_vvvvvzivyz_required = false;
-jform_vvvvvzjvza_required = false;
-jform_vvvvvzlvzb_required = false;
+jform_vvvvvzcvyy_required = false;
+jform_vvvvvzdvyz_required = false;
+jform_vvvvvzivza_required = false;
+jform_vvvvvzkvzb_required = false;
jform_vvvvvzlvzc_required = false;
-jform_vvvvvzmvzd_required = false;
+jform_vvvvvznvzd_required = false;
jform_vvvvvznvze_required = false;
jform_vvvvvzovzf_required = false;
-jform_vvvvvzqvzg_required = false;
+jform_vvvvvzpvzg_required = false;
jform_vvvvvzqvzh_required = false;
-jform_vvvvvzqvzi_required = false;
-jform_vvvvvzrvzj_required = false;
+jform_vvvvvzsvzi_required = false;
+jform_vvvvvzsvzj_required = false;
+jform_vvvvvzsvzk_required = false;
+jform_vvvvvztvzl_required = false;
// Initial Script
jQuery(document).ready(function()
{
- var gettype_vvvvvyw = jQuery("#jform_gettype").val();
- vvvvvyw(gettype_vvvvvyw);
-
- var main_source_vvvvvyx = jQuery("#jform_main_source").val();
- vvvvvyx(main_source_vvvvvyx);
-
- var main_source_vvvvvyy = jQuery("#jform_main_source").val();
- vvvvvyy(main_source_vvvvvyy);
+ var gettype_vvvvvyy = jQuery("#jform_gettype").val();
+ vvvvvyy(gettype_vvvvvyy);
var main_source_vvvvvyz = jQuery("#jform_main_source").val();
vvvvvyz(main_source_vvvvvyz);
@@ -60,212 +54,108 @@ jQuery(document).ready(function()
var main_source_vvvvvza = jQuery("#jform_main_source").val();
vvvvvza(main_source_vvvvvza);
- var addcalculation_vvvvvzb = jQuery("#jform_addcalculation input[type='radio']:checked").val();
- vvvvvzb(addcalculation_vvvvvzb);
+ var main_source_vvvvvzb = jQuery("#jform_main_source").val();
+ vvvvvzb(main_source_vvvvvzb);
- var addcalculation_vvvvvzc = jQuery("#jform_addcalculation input[type='radio']:checked").val();
- var gettype_vvvvvzc = jQuery("#jform_gettype").val();
- vvvvvzc(addcalculation_vvvvvzc,gettype_vvvvvzc);
+ var main_source_vvvvvzc = jQuery("#jform_main_source").val();
+ vvvvvzc(main_source_vvvvvzc);
var addcalculation_vvvvvzd = jQuery("#jform_addcalculation input[type='radio']:checked").val();
- var gettype_vvvvvzd = jQuery("#jform_gettype").val();
- vvvvvzd(addcalculation_vvvvvzd,gettype_vvvvvzd);
+ vvvvvzd(addcalculation_vvvvvzd);
- var main_source_vvvvvzg = jQuery("#jform_main_source").val();
- vvvvvzg(main_source_vvvvvzg);
+ var addcalculation_vvvvvze = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+ var gettype_vvvvvze = jQuery("#jform_gettype").val();
+ vvvvvze(addcalculation_vvvvvze,gettype_vvvvvze);
- var main_source_vvvvvzh = jQuery("#jform_main_source").val();
- vvvvvzh(main_source_vvvvvzh);
+ var addcalculation_vvvvvzf = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+ var gettype_vvvvvzf = jQuery("#jform_gettype").val();
+ vvvvvzf(addcalculation_vvvvvzf,gettype_vvvvvzf);
- var add_php_before_getitem_vvvvvzi = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
- var gettype_vvvvvzi = jQuery("#jform_gettype").val();
- vvvvvzi(add_php_before_getitem_vvvvvzi,gettype_vvvvvzi);
+ var main_source_vvvvvzi = jQuery("#jform_main_source").val();
+ vvvvvzi(main_source_vvvvvzi);
- var add_php_after_getitem_vvvvvzj = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
- var gettype_vvvvvzj = jQuery("#jform_gettype").val();
- vvvvvzj(add_php_after_getitem_vvvvvzj,gettype_vvvvvzj);
+ var main_source_vvvvvzj = jQuery("#jform_main_source").val();
+ vvvvvzj(main_source_vvvvvzj);
+ var add_php_before_getitem_vvvvvzk = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+ var gettype_vvvvvzk = jQuery("#jform_gettype").val();
+ vvvvvzk(add_php_before_getitem_vvvvvzk,gettype_vvvvvzk);
+
+ var add_php_after_getitem_vvvvvzl = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
var gettype_vvvvvzl = jQuery("#jform_gettype").val();
- vvvvvzl(gettype_vvvvvzl);
+ vvvvvzl(add_php_after_getitem_vvvvvzl,gettype_vvvvvzl);
- var add_php_getlistquery_vvvvvzm = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
- var gettype_vvvvvzm = jQuery("#jform_gettype").val();
- vvvvvzm(add_php_getlistquery_vvvvvzm,gettype_vvvvvzm);
-
- var add_php_before_getitems_vvvvvzn = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
var gettype_vvvvvzn = jQuery("#jform_gettype").val();
- vvvvvzn(add_php_before_getitems_vvvvvzn,gettype_vvvvvzn);
+ vvvvvzn(gettype_vvvvvzn);
- var add_php_after_getitems_vvvvvzo = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+ var add_php_getlistquery_vvvvvzo = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
var gettype_vvvvvzo = jQuery("#jform_gettype").val();
- vvvvvzo(add_php_after_getitems_vvvvvzo,gettype_vvvvvzo);
+ vvvvvzo(add_php_getlistquery_vvvvvzo,gettype_vvvvvzo);
+ var add_php_before_getitems_vvvvvzp = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+ var gettype_vvvvvzp = jQuery("#jform_gettype").val();
+ vvvvvzp(add_php_before_getitems_vvvvvzp,gettype_vvvvvzp);
+
+ var add_php_after_getitems_vvvvvzq = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
var gettype_vvvvvzq = jQuery("#jform_gettype").val();
- vvvvvzq(gettype_vvvvvzq);
+ vvvvvzq(add_php_after_getitems_vvvvvzq,gettype_vvvvvzq);
- var gettype_vvvvvzr = jQuery("#jform_gettype").val();
- vvvvvzr(gettype_vvvvvzr);
+ var gettype_vvvvvzs = jQuery("#jform_gettype").val();
+ vvvvvzs(gettype_vvvvvzs);
+
+ var gettype_vvvvvzt = jQuery("#jform_gettype").val();
+ vvvvvzt(gettype_vvvvvzt);
});
-// the vvvvvyw function
-function vvvvvyw(gettype_vvvvvyw)
+// the vvvvvyy function
+function vvvvvyy(gettype_vvvvvyy)
{
- if (isSet(gettype_vvvvvyw) && gettype_vvvvvyw.constructor !== Array)
+ if (isSet(gettype_vvvvvyy) && gettype_vvvvvyy.constructor !== Array)
{
- var temp_vvvvvyw = gettype_vvvvvyw;
- var gettype_vvvvvyw = [];
- gettype_vvvvvyw.push(temp_vvvvvyw);
+ var temp_vvvvvyy = gettype_vvvvvyy;
+ var gettype_vvvvvyy = [];
+ gettype_vvvvvyy.push(temp_vvvvvyy);
}
- else if (!isSet(gettype_vvvvvyw))
+ else if (!isSet(gettype_vvvvvyy))
{
- var gettype_vvvvvyw = [];
+ var gettype_vvvvvyy = [];
}
- var gettype = gettype_vvvvvyw.some(gettype_vvvvvyw_SomeFunc);
+ var gettype = gettype_vvvvvyy.some(gettype_vvvvvyy_SomeFunc);
// set this function logic
if (gettype)
{
jQuery('#jform_getcustom').closest('.control-group').show();
- if (jform_vvvvvywvys_required)
+ if (jform_vvvvvyyvyu_required)
{
updateFieldRequired('getcustom',0);
jQuery('#jform_getcustom').prop('required','required');
jQuery('#jform_getcustom').attr('aria-required',true);
jQuery('#jform_getcustom').addClass('required');
- jform_vvvvvywvys_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_getcustom').closest('.control-group').hide();
- if (!jform_vvvvvywvys_required)
- {
- updateFieldRequired('getcustom',1);
- jQuery('#jform_getcustom').removeAttr('required');
- jQuery('#jform_getcustom').removeAttr('aria-required');
- jQuery('#jform_getcustom').removeClass('required');
- jform_vvvvvywvys_required = true;
- }
- }
-}
-
-// the vvvvvyw Some function
-function gettype_vvvvvyw_SomeFunc(gettype_vvvvvyw)
-{
- // set the function logic
- if (gettype_vvvvvyw == 3 || gettype_vvvvvyw == 4)
- {
- return true;
- }
- return false;
-}
-
-// the vvvvvyx function
-function vvvvvyx(main_source_vvvvvyx)
-{
- if (isSet(main_source_vvvvvyx) && main_source_vvvvvyx.constructor !== Array)
- {
- var temp_vvvvvyx = main_source_vvvvvyx;
- var main_source_vvvvvyx = [];
- main_source_vvvvvyx.push(temp_vvvvvyx);
- }
- else if (!isSet(main_source_vvvvvyx))
- {
- var main_source_vvvvvyx = [];
- }
- var main_source = main_source_vvvvvyx.some(main_source_vvvvvyx_SomeFunc);
-
-
- // set this function logic
- if (main_source)
- {
- jQuery('#jform_view_table_main').closest('.control-group').show();
- if (jform_vvvvvyxvyt_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_vvvvvyxvyt_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_view_table_main').closest('.control-group').hide();
- if (!jform_vvvvvyxvyt_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_vvvvvyxvyt_required = true;
- }
- }
-}
-
-// the vvvvvyx Some function
-function main_source_vvvvvyx_SomeFunc(main_source_vvvvvyx)
-{
- // set the function logic
- if (main_source_vvvvvyx == 1)
- {
- return true;
- }
- return false;
-}
-
-// the vvvvvyy function
-function vvvvvyy(main_source_vvvvvyy)
-{
- if (isSet(main_source_vvvvvyy) && main_source_vvvvvyy.constructor !== Array)
- {
- var temp_vvvvvyy = main_source_vvvvvyy;
- var main_source_vvvvvyy = [];
- main_source_vvvvvyy.push(temp_vvvvvyy);
- }
- else if (!isSet(main_source_vvvvvyy))
- {
- var main_source_vvvvvyy = [];
- }
- var main_source = main_source_vvvvvyy.some(main_source_vvvvvyy_SomeFunc);
-
-
- // set this function logic
- if (main_source)
- {
- jQuery('#jform_view_selection').closest('.control-group').show();
- if (jform_vvvvvyyvyu_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_vvvvvyyvyu_required = false;
}
}
else
{
- jQuery('#jform_view_selection').closest('.control-group').hide();
+ jQuery('#jform_getcustom').closest('.control-group').hide();
if (!jform_vvvvvyyvyu_required)
{
- updateFieldRequired('view_selection',1);
- jQuery('#jform_view_selection').removeAttr('required');
- jQuery('#jform_view_selection').removeAttr('aria-required');
- jQuery('#jform_view_selection').removeClass('required');
+ updateFieldRequired('getcustom',1);
+ jQuery('#jform_getcustom').removeAttr('required');
+ jQuery('#jform_getcustom').removeAttr('aria-required');
+ jQuery('#jform_getcustom').removeClass('required');
jform_vvvvvyyvyu_required = true;
}
}
}
// the vvvvvyy Some function
-function main_source_vvvvvyy_SomeFunc(main_source_vvvvvyy)
+function gettype_vvvvvyy_SomeFunc(gettype_vvvvvyy)
{
// set the function logic
- if (main_source_vvvvvyy == 1)
+ if (gettype_vvvvvyy == 3 || gettype_vvvvvyy == 4)
{
return true;
}
@@ -291,26 +181,26 @@ function vvvvvyz(main_source_vvvvvyz)
// set this function logic
if (main_source)
{
- jQuery('#jform_db_table_main').closest('.control-group').show();
+ jQuery('#jform_view_table_main').closest('.control-group').show();
if (jform_vvvvvyzvyv_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');
+ 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_vvvvvyzvyv_required = false;
}
}
else
{
- jQuery('#jform_db_table_main').closest('.control-group').hide();
+ jQuery('#jform_view_table_main').closest('.control-group').hide();
if (!jform_vvvvvyzvyv_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');
+ 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_vvvvvyzvyv_required = true;
}
}
@@ -320,7 +210,7 @@ function vvvvvyz(main_source_vvvvvyz)
function main_source_vvvvvyz_SomeFunc(main_source_vvvvvyz)
{
// set the function logic
- if (main_source_vvvvvyz == 2)
+ if (main_source_vvvvvyz == 1)
{
return true;
}
@@ -346,26 +236,26 @@ function vvvvvza(main_source_vvvvvza)
// set this function logic
if (main_source)
{
- jQuery('#jform_db_selection').closest('.control-group').show();
+ jQuery('#jform_view_selection').closest('.control-group').show();
if (jform_vvvvvzavyw_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');
+ 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_vvvvvzavyw_required = false;
}
}
else
{
- jQuery('#jform_db_selection').closest('.control-group').hide();
+ jQuery('#jform_view_selection').closest('.control-group').hide();
if (!jform_vvvvvzavyw_required)
{
- updateFieldRequired('db_selection',1);
- jQuery('#jform_db_selection').removeAttr('required');
- jQuery('#jform_db_selection').removeAttr('aria-required');
- jQuery('#jform_db_selection').removeClass('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_vvvvvzavyw_required = true;
}
}
@@ -375,7 +265,7 @@ function vvvvvza(main_source_vvvvvza)
function main_source_vvvvvza_SomeFunc(main_source_vvvvvza)
{
// set the function logic
- if (main_source_vvvvvza == 2)
+ if (main_source_vvvvvza == 1)
{
return true;
}
@@ -383,62 +273,172 @@ function main_source_vvvvvza_SomeFunc(main_source_vvvvvza)
}
// the vvvvvzb function
-function vvvvvzb(addcalculation_vvvvvzb)
+function vvvvvzb(main_source_vvvvvzb)
{
- // set the function logic
- if (addcalculation_vvvvvzb == 1)
+ if (isSet(main_source_vvvvvzb) && main_source_vvvvvzb.constructor !== Array)
{
- jQuery('#jform_php_calculation').closest('.control-group').show();
+ var temp_vvvvvzb = main_source_vvvvvzb;
+ var main_source_vvvvvzb = [];
+ main_source_vvvvvzb.push(temp_vvvvvzb);
+ }
+ else if (!isSet(main_source_vvvvvzb))
+ {
+ var main_source_vvvvvzb = [];
+ }
+ var main_source = main_source_vvvvvzb.some(main_source_vvvvvzb_SomeFunc);
+
+
+ // set this function logic
+ if (main_source)
+ {
+ jQuery('#jform_db_table_main').closest('.control-group').show();
if (jform_vvvvvzbvyx_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');
+ 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_vvvvvzbvyx_required = false;
}
}
else
{
- jQuery('#jform_php_calculation').closest('.control-group').hide();
+ jQuery('#jform_db_table_main').closest('.control-group').hide();
if (!jform_vvvvvzbvyx_required)
{
- updateFieldRequired('php_calculation',1);
- jQuery('#jform_php_calculation').removeAttr('required');
- jQuery('#jform_php_calculation').removeAttr('aria-required');
- jQuery('#jform_php_calculation').removeClass('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_vvvvvzbvyx_required = true;
}
}
}
-// the vvvvvzc function
-function vvvvvzc(addcalculation_vvvvvzc,gettype_vvvvvzc)
+// the vvvvvzb Some function
+function main_source_vvvvvzb_SomeFunc(main_source_vvvvvzb)
{
- if (isSet(addcalculation_vvvvvzc) && addcalculation_vvvvvzc.constructor !== Array)
+ // set the function logic
+ if (main_source_vvvvvzb == 2)
{
- var temp_vvvvvzc = addcalculation_vvvvvzc;
- var addcalculation_vvvvvzc = [];
- addcalculation_vvvvvzc.push(temp_vvvvvzc);
+ return true;
}
- else if (!isSet(addcalculation_vvvvvzc))
- {
- var addcalculation_vvvvvzc = [];
- }
- var addcalculation = addcalculation_vvvvvzc.some(addcalculation_vvvvvzc_SomeFunc);
+ return false;
+}
- if (isSet(gettype_vvvvvzc) && gettype_vvvvvzc.constructor !== Array)
+// the vvvvvzc function
+function vvvvvzc(main_source_vvvvvzc)
+{
+ if (isSet(main_source_vvvvvzc) && main_source_vvvvvzc.constructor !== Array)
{
- var temp_vvvvvzc = gettype_vvvvvzc;
- var gettype_vvvvvzc = [];
- gettype_vvvvvzc.push(temp_vvvvvzc);
+ var temp_vvvvvzc = main_source_vvvvvzc;
+ var main_source_vvvvvzc = [];
+ main_source_vvvvvzc.push(temp_vvvvvzc);
}
- else if (!isSet(gettype_vvvvvzc))
+ else if (!isSet(main_source_vvvvvzc))
{
- var gettype_vvvvvzc = [];
+ var main_source_vvvvvzc = [];
}
- var gettype = gettype_vvvvvzc.some(gettype_vvvvvzc_SomeFunc);
+ var main_source = main_source_vvvvvzc.some(main_source_vvvvvzc_SomeFunc);
+
+
+ // set this function logic
+ if (main_source)
+ {
+ jQuery('#jform_db_selection').closest('.control-group').show();
+ if (jform_vvvvvzcvyy_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_vvvvvzcvyy_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_db_selection').closest('.control-group').hide();
+ if (!jform_vvvvvzcvyy_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_vvvvvzcvyy_required = true;
+ }
+ }
+}
+
+// the vvvvvzc Some function
+function main_source_vvvvvzc_SomeFunc(main_source_vvvvvzc)
+{
+ // set the function logic
+ if (main_source_vvvvvzc == 2)
+ {
+ return true;
+ }
+ return false;
+}
+
+// the vvvvvzd function
+function vvvvvzd(addcalculation_vvvvvzd)
+{
+ // set the function logic
+ if (addcalculation_vvvvvzd == 1)
+ {
+ jQuery('#jform_php_calculation').closest('.control-group').show();
+ if (jform_vvvvvzdvyz_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_vvvvvzdvyz_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_php_calculation').closest('.control-group').hide();
+ if (!jform_vvvvvzdvyz_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_vvvvvzdvyz_required = true;
+ }
+ }
+}
+
+// the vvvvvze function
+function vvvvvze(addcalculation_vvvvvze,gettype_vvvvvze)
+{
+ if (isSet(addcalculation_vvvvvze) && addcalculation_vvvvvze.constructor !== Array)
+ {
+ var temp_vvvvvze = addcalculation_vvvvvze;
+ var addcalculation_vvvvvze = [];
+ addcalculation_vvvvvze.push(temp_vvvvvze);
+ }
+ else if (!isSet(addcalculation_vvvvvze))
+ {
+ var addcalculation_vvvvvze = [];
+ }
+ var addcalculation = addcalculation_vvvvvze.some(addcalculation_vvvvvze_SomeFunc);
+
+ if (isSet(gettype_vvvvvze) && gettype_vvvvvze.constructor !== Array)
+ {
+ var temp_vvvvvze = gettype_vvvvvze;
+ var gettype_vvvvvze = [];
+ gettype_vvvvvze.push(temp_vvvvvze);
+ }
+ else if (!isSet(gettype_vvvvvze))
+ {
+ var gettype_vvvvvze = [];
+ }
+ var gettype = gettype_vvvvvze.some(gettype_vvvvvze_SomeFunc);
// set this function logic
@@ -452,54 +452,54 @@ function vvvvvzc(addcalculation_vvvvvzc,gettype_vvvvvzc)
}
}
-// the vvvvvzc Some function
-function addcalculation_vvvvvzc_SomeFunc(addcalculation_vvvvvzc)
+// the vvvvvze Some function
+function addcalculation_vvvvvze_SomeFunc(addcalculation_vvvvvze)
{
// set the function logic
- if (addcalculation_vvvvvzc == 1)
+ if (addcalculation_vvvvvze == 1)
{
return true;
}
return false;
}
-// the vvvvvzc Some function
-function gettype_vvvvvzc_SomeFunc(gettype_vvvvvzc)
+// the vvvvvze Some function
+function gettype_vvvvvze_SomeFunc(gettype_vvvvvze)
{
// set the function logic
- if (gettype_vvvvvzc == 1 || gettype_vvvvvzc == 3)
+ if (gettype_vvvvvze == 1 || gettype_vvvvvze == 3)
{
return true;
}
return false;
}
-// the vvvvvzd function
-function vvvvvzd(addcalculation_vvvvvzd,gettype_vvvvvzd)
+// the vvvvvzf function
+function vvvvvzf(addcalculation_vvvvvzf,gettype_vvvvvzf)
{
- if (isSet(addcalculation_vvvvvzd) && addcalculation_vvvvvzd.constructor !== Array)
+ if (isSet(addcalculation_vvvvvzf) && addcalculation_vvvvvzf.constructor !== Array)
{
- var temp_vvvvvzd = addcalculation_vvvvvzd;
- var addcalculation_vvvvvzd = [];
- addcalculation_vvvvvzd.push(temp_vvvvvzd);
+ var temp_vvvvvzf = addcalculation_vvvvvzf;
+ var addcalculation_vvvvvzf = [];
+ addcalculation_vvvvvzf.push(temp_vvvvvzf);
}
- else if (!isSet(addcalculation_vvvvvzd))
+ else if (!isSet(addcalculation_vvvvvzf))
{
- var addcalculation_vvvvvzd = [];
+ var addcalculation_vvvvvzf = [];
}
- var addcalculation = addcalculation_vvvvvzd.some(addcalculation_vvvvvzd_SomeFunc);
+ var addcalculation = addcalculation_vvvvvzf.some(addcalculation_vvvvvzf_SomeFunc);
- if (isSet(gettype_vvvvvzd) && gettype_vvvvvzd.constructor !== Array)
+ if (isSet(gettype_vvvvvzf) && gettype_vvvvvzf.constructor !== Array)
{
- var temp_vvvvvzd = gettype_vvvvvzd;
- var gettype_vvvvvzd = [];
- gettype_vvvvvzd.push(temp_vvvvvzd);
+ var temp_vvvvvzf = gettype_vvvvvzf;
+ var gettype_vvvvvzf = [];
+ gettype_vvvvvzf.push(temp_vvvvvzf);
}
- else if (!isSet(gettype_vvvvvzd))
+ else if (!isSet(gettype_vvvvvzf))
{
- var gettype_vvvvvzd = [];
+ var gettype_vvvvvzf = [];
}
- var gettype = gettype_vvvvvzd.some(gettype_vvvvvzd_SomeFunc);
+ var gettype = gettype_vvvvvzf.some(gettype_vvvvvzf_SomeFunc);
// set this function logic
@@ -513,97 +513,97 @@ function vvvvvzd(addcalculation_vvvvvzd,gettype_vvvvvzd)
}
}
-// the vvvvvzd Some function
-function addcalculation_vvvvvzd_SomeFunc(addcalculation_vvvvvzd)
+// the vvvvvzf Some function
+function addcalculation_vvvvvzf_SomeFunc(addcalculation_vvvvvzf)
{
// set the function logic
- if (addcalculation_vvvvvzd == 1)
+ if (addcalculation_vvvvvzf == 1)
{
return true;
}
return false;
}
-// the vvvvvzd Some function
-function gettype_vvvvvzd_SomeFunc(gettype_vvvvvzd)
+// the vvvvvzf Some function
+function gettype_vvvvvzf_SomeFunc(gettype_vvvvvzf)
{
// set the function logic
- if (gettype_vvvvvzd == 2 || gettype_vvvvvzd == 4)
+ if (gettype_vvvvvzf == 2 || gettype_vvvvvzf == 4)
{
return true;
}
return false;
}
-// the vvvvvzg function
-function vvvvvzg(main_source_vvvvvzg)
+// the vvvvvzi function
+function vvvvvzi(main_source_vvvvvzi)
{
- if (isSet(main_source_vvvvvzg) && main_source_vvvvvzg.constructor !== Array)
+ if (isSet(main_source_vvvvvzi) && main_source_vvvvvzi.constructor !== Array)
{
- var temp_vvvvvzg = main_source_vvvvvzg;
- var main_source_vvvvvzg = [];
- main_source_vvvvvzg.push(temp_vvvvvzg);
+ var temp_vvvvvzi = main_source_vvvvvzi;
+ var main_source_vvvvvzi = [];
+ main_source_vvvvvzi.push(temp_vvvvvzi);
}
- else if (!isSet(main_source_vvvvvzg))
+ else if (!isSet(main_source_vvvvvzi))
{
- var main_source_vvvvvzg = [];
+ var main_source_vvvvvzi = [];
}
- var main_source = main_source_vvvvvzg.some(main_source_vvvvvzg_SomeFunc);
+ var main_source = main_source_vvvvvzi.some(main_source_vvvvvzi_SomeFunc);
// set this function logic
if (main_source)
{
jQuery('#jform_php_custom_get').closest('.control-group').show();
- if (jform_vvvvvzgvyy_required)
+ if (jform_vvvvvzivza_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_vvvvvzgvyy_required = false;
+ jform_vvvvvzivza_required = false;
}
}
else
{
jQuery('#jform_php_custom_get').closest('.control-group').hide();
- if (!jform_vvvvvzgvyy_required)
+ if (!jform_vvvvvzivza_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_vvvvvzgvyy_required = true;
+ jform_vvvvvzivza_required = true;
}
}
}
-// the vvvvvzg Some function
-function main_source_vvvvvzg_SomeFunc(main_source_vvvvvzg)
+// the vvvvvzi Some function
+function main_source_vvvvvzi_SomeFunc(main_source_vvvvvzi)
{
// set the function logic
- if (main_source_vvvvvzg == 3)
+ if (main_source_vvvvvzi == 3)
{
return true;
}
return false;
}
-// the vvvvvzh function
-function vvvvvzh(main_source_vvvvvzh)
+// the vvvvvzj function
+function vvvvvzj(main_source_vvvvvzj)
{
- if (isSet(main_source_vvvvvzh) && main_source_vvvvvzh.constructor !== Array)
+ if (isSet(main_source_vvvvvzj) && main_source_vvvvvzj.constructor !== Array)
{
- var temp_vvvvvzh = main_source_vvvvvzh;
- var main_source_vvvvvzh = [];
- main_source_vvvvvzh.push(temp_vvvvvzh);
+ var temp_vvvvvzj = main_source_vvvvvzj;
+ var main_source_vvvvvzj = [];
+ main_source_vvvvvzj.push(temp_vvvvvzj);
}
- else if (!isSet(main_source_vvvvvzh))
+ else if (!isSet(main_source_vvvvvzj))
{
- var main_source_vvvvvzh = [];
+ var main_source_vvvvvzj = [];
}
- var main_source = main_source_vvvvvzh.some(main_source_vvvvvzh_SomeFunc);
+ var main_source = main_source_vvvvvzj.some(main_source_vvvvvzj_SomeFunc);
// set this function logic
@@ -627,167 +627,89 @@ function vvvvvzh(main_source_vvvvvzh)
}
}
-// the vvvvvzh Some function
-function main_source_vvvvvzh_SomeFunc(main_source_vvvvvzh)
+// the vvvvvzj Some function
+function main_source_vvvvvzj_SomeFunc(main_source_vvvvvzj)
{
// set the function logic
- if (main_source_vvvvvzh == 1 || main_source_vvvvvzh == 2)
+ if (main_source_vvvvvzj == 1 || main_source_vvvvvzj == 2)
{
return true;
}
return false;
}
-// the vvvvvzi function
-function vvvvvzi(add_php_before_getitem_vvvvvzi,gettype_vvvvvzi)
+// the vvvvvzk function
+function vvvvvzk(add_php_before_getitem_vvvvvzk,gettype_vvvvvzk)
{
- if (isSet(add_php_before_getitem_vvvvvzi) && add_php_before_getitem_vvvvvzi.constructor !== Array)
+ if (isSet(add_php_before_getitem_vvvvvzk) && add_php_before_getitem_vvvvvzk.constructor !== Array)
{
- var temp_vvvvvzi = add_php_before_getitem_vvvvvzi;
- var add_php_before_getitem_vvvvvzi = [];
- add_php_before_getitem_vvvvvzi.push(temp_vvvvvzi);
+ var temp_vvvvvzk = add_php_before_getitem_vvvvvzk;
+ var add_php_before_getitem_vvvvvzk = [];
+ add_php_before_getitem_vvvvvzk.push(temp_vvvvvzk);
}
- else if (!isSet(add_php_before_getitem_vvvvvzi))
+ else if (!isSet(add_php_before_getitem_vvvvvzk))
{
- var add_php_before_getitem_vvvvvzi = [];
+ var add_php_before_getitem_vvvvvzk = [];
}
- var add_php_before_getitem = add_php_before_getitem_vvvvvzi.some(add_php_before_getitem_vvvvvzi_SomeFunc);
+ var add_php_before_getitem = add_php_before_getitem_vvvvvzk.some(add_php_before_getitem_vvvvvzk_SomeFunc);
- if (isSet(gettype_vvvvvzi) && gettype_vvvvvzi.constructor !== Array)
+ if (isSet(gettype_vvvvvzk) && gettype_vvvvvzk.constructor !== Array)
{
- var temp_vvvvvzi = gettype_vvvvvzi;
- var gettype_vvvvvzi = [];
- gettype_vvvvvzi.push(temp_vvvvvzi);
+ var temp_vvvvvzk = gettype_vvvvvzk;
+ var gettype_vvvvvzk = [];
+ gettype_vvvvvzk.push(temp_vvvvvzk);
}
- else if (!isSet(gettype_vvvvvzi))
+ else if (!isSet(gettype_vvvvvzk))
{
- var gettype_vvvvvzi = [];
+ var gettype_vvvvvzk = [];
}
- var gettype = gettype_vvvvvzi.some(gettype_vvvvvzi_SomeFunc);
+ var gettype = gettype_vvvvvzk.some(gettype_vvvvvzk_SomeFunc);
// set this function logic
if (add_php_before_getitem && gettype)
{
jQuery('#jform_php_before_getitem').closest('.control-group').show();
- if (jform_vvvvvzivyz_required)
+ if (jform_vvvvvzkvzb_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_vvvvvzivyz_required = false;
+ jform_vvvvvzkvzb_required = false;
}
}
else
{
jQuery('#jform_php_before_getitem').closest('.control-group').hide();
- if (!jform_vvvvvzivyz_required)
+ if (!jform_vvvvvzkvzb_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_vvvvvzivyz_required = true;
+ jform_vvvvvzkvzb_required = true;
}
}
}
-// the vvvvvzi Some function
-function add_php_before_getitem_vvvvvzi_SomeFunc(add_php_before_getitem_vvvvvzi)
+// the vvvvvzk Some function
+function add_php_before_getitem_vvvvvzk_SomeFunc(add_php_before_getitem_vvvvvzk)
{
// set the function logic
- if (add_php_before_getitem_vvvvvzi == 1)
+ if (add_php_before_getitem_vvvvvzk == 1)
{
return true;
}
return false;
}
-// the vvvvvzi Some function
-function gettype_vvvvvzi_SomeFunc(gettype_vvvvvzi)
+// the vvvvvzk Some function
+function gettype_vvvvvzk_SomeFunc(gettype_vvvvvzk)
{
// set the function logic
- if (gettype_vvvvvzi == 1 || gettype_vvvvvzi == 3)
- {
- return true;
- }
- return false;
-}
-
-// the vvvvvzj function
-function vvvvvzj(add_php_after_getitem_vvvvvzj,gettype_vvvvvzj)
-{
- if (isSet(add_php_after_getitem_vvvvvzj) && add_php_after_getitem_vvvvvzj.constructor !== Array)
- {
- var temp_vvvvvzj = add_php_after_getitem_vvvvvzj;
- var add_php_after_getitem_vvvvvzj = [];
- add_php_after_getitem_vvvvvzj.push(temp_vvvvvzj);
- }
- else if (!isSet(add_php_after_getitem_vvvvvzj))
- {
- var add_php_after_getitem_vvvvvzj = [];
- }
- var add_php_after_getitem = add_php_after_getitem_vvvvvzj.some(add_php_after_getitem_vvvvvzj_SomeFunc);
-
- if (isSet(gettype_vvvvvzj) && gettype_vvvvvzj.constructor !== Array)
- {
- var temp_vvvvvzj = gettype_vvvvvzj;
- var gettype_vvvvvzj = [];
- gettype_vvvvvzj.push(temp_vvvvvzj);
- }
- else if (!isSet(gettype_vvvvvzj))
- {
- var gettype_vvvvvzj = [];
- }
- var gettype = gettype_vvvvvzj.some(gettype_vvvvvzj_SomeFunc);
-
-
- // set this function logic
- if (add_php_after_getitem && gettype)
- {
- jQuery('#jform_php_after_getitem').closest('.control-group').show();
- if (jform_vvvvvzjvza_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_vvvvvzjvza_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_php_after_getitem').closest('.control-group').hide();
- if (!jform_vvvvvzjvza_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_vvvvvzjvza_required = true;
- }
- }
-}
-
-// the vvvvvzj Some function
-function add_php_after_getitem_vvvvvzj_SomeFunc(add_php_after_getitem_vvvvvzj)
-{
- // set the function logic
- if (add_php_after_getitem_vvvvvzj == 1)
- {
- return true;
- }
- return false;
-}
-
-// the vvvvvzj Some function
-function gettype_vvvvvzj_SomeFunc(gettype_vvvvvzj)
-{
- // set the function logic
- if (gettype_vvvvvzj == 1 || gettype_vvvvvzj == 3)
+ if (gettype_vvvvvzk == 1 || gettype_vvvvvzk == 3)
{
return true;
}
@@ -795,8 +717,20 @@ function gettype_vvvvvzj_SomeFunc(gettype_vvvvvzj)
}
// the vvvvvzl function
-function vvvvvzl(gettype_vvvvvzl)
+function vvvvvzl(add_php_after_getitem_vvvvvzl,gettype_vvvvvzl)
{
+ if (isSet(add_php_after_getitem_vvvvvzl) && add_php_after_getitem_vvvvvzl.constructor !== Array)
+ {
+ var temp_vvvvvzl = add_php_after_getitem_vvvvvzl;
+ var add_php_after_getitem_vvvvvzl = [];
+ add_php_after_getitem_vvvvvzl.push(temp_vvvvvzl);
+ }
+ else if (!isSet(add_php_after_getitem_vvvvvzl))
+ {
+ var add_php_after_getitem_vvvvvzl = [];
+ }
+ var add_php_after_getitem = add_php_after_getitem_vvvvvzl.some(add_php_after_getitem_vvvvvzl_SomeFunc);
+
if (isSet(gettype_vvvvvzl) && gettype_vvvvvzl.constructor !== Array)
{
var temp_vvvvvzl = gettype_vvvvvzl;
@@ -811,52 +745,44 @@ function vvvvvzl(gettype_vvvvvzl)
// set this function logic
- if (gettype)
+ if (add_php_after_getitem && gettype)
{
- jQuery('#jform_add_php_after_getitem').closest('.control-group').show();
- if (jform_vvvvvzlvzb_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_vvvvvzlvzb_required = false;
- }
-
- jQuery('#jform_add_php_before_getitem').closest('.control-group').show();
+ jQuery('#jform_php_after_getitem').closest('.control-group').show();
if (jform_vvvvvzlvzc_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');
+ 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_vvvvvzlvzc_required = false;
}
}
else
{
- jQuery('#jform_add_php_after_getitem').closest('.control-group').hide();
- if (!jform_vvvvvzlvzb_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_vvvvvzlvzb_required = true;
- }
- jQuery('#jform_add_php_before_getitem').closest('.control-group').hide();
+ jQuery('#jform_php_after_getitem').closest('.control-group').hide();
if (!jform_vvvvvzlvzc_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');
+ 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_vvvvvzlvzc_required = true;
}
}
}
+// the vvvvvzl Some function
+function add_php_after_getitem_vvvvvzl_SomeFunc(add_php_after_getitem_vvvvvzl)
+{
+ // set the function logic
+ if (add_php_after_getitem_vvvvvzl == 1)
+ {
+ return true;
+ }
+ return false;
+}
+
// the vvvvvzl Some function
function gettype_vvvvvzl_SomeFunc(gettype_vvvvvzl)
{
@@ -868,99 +794,9 @@ function gettype_vvvvvzl_SomeFunc(gettype_vvvvvzl)
return false;
}
-// the vvvvvzm function
-function vvvvvzm(add_php_getlistquery_vvvvvzm,gettype_vvvvvzm)
-{
- if (isSet(add_php_getlistquery_vvvvvzm) && add_php_getlistquery_vvvvvzm.constructor !== Array)
- {
- var temp_vvvvvzm = add_php_getlistquery_vvvvvzm;
- var add_php_getlistquery_vvvvvzm = [];
- add_php_getlistquery_vvvvvzm.push(temp_vvvvvzm);
- }
- else if (!isSet(add_php_getlistquery_vvvvvzm))
- {
- var add_php_getlistquery_vvvvvzm = [];
- }
- var add_php_getlistquery = add_php_getlistquery_vvvvvzm.some(add_php_getlistquery_vvvvvzm_SomeFunc);
-
- if (isSet(gettype_vvvvvzm) && gettype_vvvvvzm.constructor !== Array)
- {
- var temp_vvvvvzm = gettype_vvvvvzm;
- var gettype_vvvvvzm = [];
- gettype_vvvvvzm.push(temp_vvvvvzm);
- }
- else if (!isSet(gettype_vvvvvzm))
- {
- var gettype_vvvvvzm = [];
- }
- var gettype = gettype_vvvvvzm.some(gettype_vvvvvzm_SomeFunc);
-
-
- // set this function logic
- if (add_php_getlistquery && gettype)
- {
- jQuery('#jform_php_getlistquery').closest('.control-group').show();
- if (jform_vvvvvzmvzd_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_vvvvvzmvzd_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_php_getlistquery').closest('.control-group').hide();
- if (!jform_vvvvvzmvzd_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_vvvvvzmvzd_required = true;
- }
- }
-}
-
-// the vvvvvzm Some function
-function add_php_getlistquery_vvvvvzm_SomeFunc(add_php_getlistquery_vvvvvzm)
-{
- // set the function logic
- if (add_php_getlistquery_vvvvvzm == 1)
- {
- return true;
- }
- return false;
-}
-
-// the vvvvvzm Some function
-function gettype_vvvvvzm_SomeFunc(gettype_vvvvvzm)
-{
- // set the function logic
- if (gettype_vvvvvzm == 2 || gettype_vvvvvzm == 4)
- {
- return true;
- }
- return false;
-}
-
// the vvvvvzn function
-function vvvvvzn(add_php_before_getitems_vvvvvzn,gettype_vvvvvzn)
+function vvvvvzn(gettype_vvvvvzn)
{
- if (isSet(add_php_before_getitems_vvvvvzn) && add_php_before_getitems_vvvvvzn.constructor !== Array)
- {
- var temp_vvvvvzn = add_php_before_getitems_vvvvvzn;
- var add_php_before_getitems_vvvvvzn = [];
- add_php_before_getitems_vvvvvzn.push(temp_vvvvvzn);
- }
- else if (!isSet(add_php_before_getitems_vvvvvzn))
- {
- var add_php_before_getitems_vvvvvzn = [];
- }
- var add_php_before_getitems = add_php_before_getitems_vvvvvzn.some(add_php_before_getitems_vvvvvzn_SomeFunc);
-
if (isSet(gettype_vvvvvzn) && gettype_vvvvvzn.constructor !== Array)
{
var temp_vvvvvzn = gettype_vvvvvzn;
@@ -975,49 +811,57 @@ function vvvvvzn(add_php_before_getitems_vvvvvzn,gettype_vvvvvzn)
// set this function logic
- if (add_php_before_getitems && gettype)
+ if (gettype)
{
- jQuery('#jform_php_before_getitems').closest('.control-group').show();
+ jQuery('#jform_add_php_after_getitem').closest('.control-group').show();
+ if (jform_vvvvvznvzd_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_vvvvvznvzd_required = false;
+ }
+
+ jQuery('#jform_add_php_before_getitem').closest('.control-group').show();
if (jform_vvvvvznvze_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');
+ 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_vvvvvznvze_required = false;
}
}
else
{
- jQuery('#jform_php_before_getitems').closest('.control-group').hide();
+ jQuery('#jform_add_php_after_getitem').closest('.control-group').hide();
+ if (!jform_vvvvvznvzd_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_vvvvvznvzd_required = true;
+ }
+ jQuery('#jform_add_php_before_getitem').closest('.control-group').hide();
if (!jform_vvvvvznvze_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');
+ 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_vvvvvznvze_required = true;
}
}
}
-// the vvvvvzn Some function
-function add_php_before_getitems_vvvvvzn_SomeFunc(add_php_before_getitems_vvvvvzn)
-{
- // set the function logic
- if (add_php_before_getitems_vvvvvzn == 1)
- {
- return true;
- }
- return false;
-}
-
// the vvvvvzn Some function
function gettype_vvvvvzn_SomeFunc(gettype_vvvvvzn)
{
// set the function logic
- if (gettype_vvvvvzn == 2 || gettype_vvvvvzn == 4)
+ if (gettype_vvvvvzn == 1 || gettype_vvvvvzn == 3)
{
return true;
}
@@ -1025,19 +869,19 @@ function gettype_vvvvvzn_SomeFunc(gettype_vvvvvzn)
}
// the vvvvvzo function
-function vvvvvzo(add_php_after_getitems_vvvvvzo,gettype_vvvvvzo)
+function vvvvvzo(add_php_getlistquery_vvvvvzo,gettype_vvvvvzo)
{
- if (isSet(add_php_after_getitems_vvvvvzo) && add_php_after_getitems_vvvvvzo.constructor !== Array)
+ if (isSet(add_php_getlistquery_vvvvvzo) && add_php_getlistquery_vvvvvzo.constructor !== Array)
{
- var temp_vvvvvzo = add_php_after_getitems_vvvvvzo;
- var add_php_after_getitems_vvvvvzo = [];
- add_php_after_getitems_vvvvvzo.push(temp_vvvvvzo);
+ var temp_vvvvvzo = add_php_getlistquery_vvvvvzo;
+ var add_php_getlistquery_vvvvvzo = [];
+ add_php_getlistquery_vvvvvzo.push(temp_vvvvvzo);
}
- else if (!isSet(add_php_after_getitems_vvvvvzo))
+ else if (!isSet(add_php_getlistquery_vvvvvzo))
{
- var add_php_after_getitems_vvvvvzo = [];
+ var add_php_getlistquery_vvvvvzo = [];
}
- var add_php_after_getitems = add_php_after_getitems_vvvvvzo.some(add_php_after_getitems_vvvvvzo_SomeFunc);
+ var add_php_getlistquery = add_php_getlistquery_vvvvvzo.some(add_php_getlistquery_vvvvvzo_SomeFunc);
if (isSet(gettype_vvvvvzo) && gettype_vvvvvzo.constructor !== Array)
{
@@ -1053,38 +897,38 @@ function vvvvvzo(add_php_after_getitems_vvvvvzo,gettype_vvvvvzo)
// set this function logic
- if (add_php_after_getitems && gettype)
+ if (add_php_getlistquery && gettype)
{
- jQuery('#jform_php_after_getitems').closest('.control-group').show();
+ jQuery('#jform_php_getlistquery').closest('.control-group').show();
if (jform_vvvvvzovzf_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');
+ 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_vvvvvzovzf_required = false;
}
}
else
{
- jQuery('#jform_php_after_getitems').closest('.control-group').hide();
+ jQuery('#jform_php_getlistquery').closest('.control-group').hide();
if (!jform_vvvvvzovzf_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');
+ updateFieldRequired('php_getlistquery',1);
+ jQuery('#jform_php_getlistquery').removeAttr('required');
+ jQuery('#jform_php_getlistquery').removeAttr('aria-required');
+ jQuery('#jform_php_getlistquery').removeClass('required');
jform_vvvvvzovzf_required = true;
}
}
}
// the vvvvvzo Some function
-function add_php_after_getitems_vvvvvzo_SomeFunc(add_php_after_getitems_vvvvvzo)
+function add_php_getlistquery_vvvvvzo_SomeFunc(add_php_getlistquery_vvvvvzo)
{
// set the function logic
- if (add_php_after_getitems_vvvvvzo == 1)
+ if (add_php_getlistquery_vvvvvzo == 1)
{
return true;
}
@@ -1102,9 +946,99 @@ function gettype_vvvvvzo_SomeFunc(gettype_vvvvvzo)
return false;
}
-// the vvvvvzq function
-function vvvvvzq(gettype_vvvvvzq)
+// the vvvvvzp function
+function vvvvvzp(add_php_before_getitems_vvvvvzp,gettype_vvvvvzp)
{
+ if (isSet(add_php_before_getitems_vvvvvzp) && add_php_before_getitems_vvvvvzp.constructor !== Array)
+ {
+ var temp_vvvvvzp = add_php_before_getitems_vvvvvzp;
+ var add_php_before_getitems_vvvvvzp = [];
+ add_php_before_getitems_vvvvvzp.push(temp_vvvvvzp);
+ }
+ else if (!isSet(add_php_before_getitems_vvvvvzp))
+ {
+ var add_php_before_getitems_vvvvvzp = [];
+ }
+ var add_php_before_getitems = add_php_before_getitems_vvvvvzp.some(add_php_before_getitems_vvvvvzp_SomeFunc);
+
+ if (isSet(gettype_vvvvvzp) && gettype_vvvvvzp.constructor !== Array)
+ {
+ var temp_vvvvvzp = gettype_vvvvvzp;
+ var gettype_vvvvvzp = [];
+ gettype_vvvvvzp.push(temp_vvvvvzp);
+ }
+ else if (!isSet(gettype_vvvvvzp))
+ {
+ var gettype_vvvvvzp = [];
+ }
+ var gettype = gettype_vvvvvzp.some(gettype_vvvvvzp_SomeFunc);
+
+
+ // set this function logic
+ if (add_php_before_getitems && gettype)
+ {
+ jQuery('#jform_php_before_getitems').closest('.control-group').show();
+ if (jform_vvvvvzpvzg_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_vvvvvzpvzg_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_php_before_getitems').closest('.control-group').hide();
+ if (!jform_vvvvvzpvzg_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_vvvvvzpvzg_required = true;
+ }
+ }
+}
+
+// the vvvvvzp Some function
+function add_php_before_getitems_vvvvvzp_SomeFunc(add_php_before_getitems_vvvvvzp)
+{
+ // set the function logic
+ if (add_php_before_getitems_vvvvvzp == 1)
+ {
+ return true;
+ }
+ return false;
+}
+
+// the vvvvvzp Some function
+function gettype_vvvvvzp_SomeFunc(gettype_vvvvvzp)
+{
+ // set the function logic
+ if (gettype_vvvvvzp == 2 || gettype_vvvvvzp == 4)
+ {
+ return true;
+ }
+ return false;
+}
+
+// the vvvvvzq function
+function vvvvvzq(add_php_after_getitems_vvvvvzq,gettype_vvvvvzq)
+{
+ if (isSet(add_php_after_getitems_vvvvvzq) && add_php_after_getitems_vvvvvzq.constructor !== Array)
+ {
+ var temp_vvvvvzq = add_php_after_getitems_vvvvvzq;
+ var add_php_after_getitems_vvvvvzq = [];
+ add_php_after_getitems_vvvvvzq.push(temp_vvvvvzq);
+ }
+ else if (!isSet(add_php_after_getitems_vvvvvzq))
+ {
+ var add_php_after_getitems_vvvvvzq = [];
+ }
+ var add_php_after_getitems = add_php_after_getitems_vvvvvzq.some(add_php_after_getitems_vvvvvzq_SomeFunc);
+
if (isSet(gettype_vvvvvzq) && gettype_vvvvvzq.constructor !== Array)
{
var temp_vvvvvzq = gettype_vvvvvzq;
@@ -1119,71 +1053,44 @@ function vvvvvzq(gettype_vvvvvzq)
// set this function logic
- if (gettype)
+ if (add_php_after_getitems && gettype)
{
- jQuery('#jform_add_php_after_getitems').closest('.control-group').show();
- if (jform_vvvvvzqvzg_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_vvvvvzqvzg_required = false;
- }
-
- jQuery('#jform_add_php_before_getitems').closest('.control-group').show();
+ jQuery('#jform_php_after_getitems').closest('.control-group').show();
if (jform_vvvvvzqvzh_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');
+ 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_vvvvvzqvzh_required = false;
}
- jQuery('#jform_add_php_getlistquery').closest('.control-group').show();
- if (jform_vvvvvzqvzi_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_vvvvvzqvzi_required = false;
- }
-
}
else
{
- jQuery('#jform_add_php_after_getitems').closest('.control-group').hide();
- if (!jform_vvvvvzqvzg_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_vvvvvzqvzg_required = true;
- }
- jQuery('#jform_add_php_before_getitems').closest('.control-group').hide();
+ jQuery('#jform_php_after_getitems').closest('.control-group').hide();
if (!jform_vvvvvzqvzh_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');
+ 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_vvvvvzqvzh_required = true;
}
- jQuery('#jform_add_php_getlistquery').closest('.control-group').hide();
- if (!jform_vvvvvzqvzi_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_vvvvvzqvzi_required = true;
- }
}
}
+// the vvvvvzq Some function
+function add_php_after_getitems_vvvvvzq_SomeFunc(add_php_after_getitems_vvvvvzq)
+{
+ // set the function logic
+ if (add_php_after_getitems_vvvvvzq == 1)
+ {
+ return true;
+ }
+ return false;
+}
+
// the vvvvvzq Some function
function gettype_vvvvvzq_SomeFunc(gettype_vvvvvzq)
{
@@ -1195,55 +1102,148 @@ function gettype_vvvvvzq_SomeFunc(gettype_vvvvvzq)
return false;
}
-// the vvvvvzr function
-function vvvvvzr(gettype_vvvvvzr)
+// the vvvvvzs function
+function vvvvvzs(gettype_vvvvvzs)
{
- if (isSet(gettype_vvvvvzr) && gettype_vvvvvzr.constructor !== Array)
+ if (isSet(gettype_vvvvvzs) && gettype_vvvvvzs.constructor !== Array)
{
- var temp_vvvvvzr = gettype_vvvvvzr;
- var gettype_vvvvvzr = [];
- gettype_vvvvvzr.push(temp_vvvvvzr);
+ var temp_vvvvvzs = gettype_vvvvvzs;
+ var gettype_vvvvvzs = [];
+ gettype_vvvvvzs.push(temp_vvvvvzs);
}
- else if (!isSet(gettype_vvvvvzr))
+ else if (!isSet(gettype_vvvvvzs))
{
- var gettype_vvvvvzr = [];
+ var gettype_vvvvvzs = [];
}
- var gettype = gettype_vvvvvzr.some(gettype_vvvvvzr_SomeFunc);
+ var gettype = gettype_vvvvvzs.some(gettype_vvvvvzs_SomeFunc);
+
+
+ // set this function logic
+ if (gettype)
+ {
+ jQuery('#jform_add_php_after_getitems').closest('.control-group').show();
+ if (jform_vvvvvzsvzi_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_vvvvvzsvzi_required = false;
+ }
+
+ jQuery('#jform_add_php_before_getitems').closest('.control-group').show();
+ if (jform_vvvvvzsvzj_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_vvvvvzsvzj_required = false;
+ }
+
+ jQuery('#jform_add_php_getlistquery').closest('.control-group').show();
+ if (jform_vvvvvzsvzk_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_vvvvvzsvzk_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_add_php_after_getitems').closest('.control-group').hide();
+ if (!jform_vvvvvzsvzi_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_vvvvvzsvzi_required = true;
+ }
+ jQuery('#jform_add_php_before_getitems').closest('.control-group').hide();
+ if (!jform_vvvvvzsvzj_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_vvvvvzsvzj_required = true;
+ }
+ jQuery('#jform_add_php_getlistquery').closest('.control-group').hide();
+ if (!jform_vvvvvzsvzk_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_vvvvvzsvzk_required = true;
+ }
+ }
+}
+
+// the vvvvvzs Some function
+function gettype_vvvvvzs_SomeFunc(gettype_vvvvvzs)
+{
+ // set the function logic
+ if (gettype_vvvvvzs == 2 || gettype_vvvvvzs == 4)
+ {
+ return true;
+ }
+ return false;
+}
+
+// the vvvvvzt function
+function vvvvvzt(gettype_vvvvvzt)
+{
+ if (isSet(gettype_vvvvvzt) && gettype_vvvvvzt.constructor !== Array)
+ {
+ var temp_vvvvvzt = gettype_vvvvvzt;
+ var gettype_vvvvvzt = [];
+ gettype_vvvvvzt.push(temp_vvvvvzt);
+ }
+ else if (!isSet(gettype_vvvvvzt))
+ {
+ var gettype_vvvvvzt = [];
+ }
+ var gettype = gettype_vvvvvzt.some(gettype_vvvvvzt_SomeFunc);
// set this function logic
if (gettype)
{
jQuery('#jform_pagination').closest('.control-group').show();
- if (jform_vvvvvzrvzj_required)
+ if (jform_vvvvvztvzl_required)
{
updateFieldRequired('pagination',0);
jQuery('#jform_pagination').prop('required','required');
jQuery('#jform_pagination').attr('aria-required',true);
jQuery('#jform_pagination').addClass('required');
- jform_vvvvvzrvzj_required = false;
+ jform_vvvvvztvzl_required = false;
}
}
else
{
jQuery('#jform_pagination').closest('.control-group').hide();
- if (!jform_vvvvvzrvzj_required)
+ if (!jform_vvvvvztvzl_required)
{
updateFieldRequired('pagination',1);
jQuery('#jform_pagination').removeAttr('required');
jQuery('#jform_pagination').removeAttr('aria-required');
jQuery('#jform_pagination').removeClass('required');
- jform_vvvvvzrvzj_required = true;
+ jform_vvvvvztvzl_required = true;
}
}
}
-// the vvvvvzr Some function
-function gettype_vvvvvzr_SomeFunc(gettype_vvvvvzr)
+// the vvvvvzt Some function
+function gettype_vvvvvzt_SomeFunc(gettype_vvvvvzt)
{
// set the function logic
- if (gettype_vvvvvzr == 2)
+ if (gettype_vvvvvzt == 2)
{
return true;
}
@@ -1286,6 +1286,34 @@ function isSet(val)
return false;
}
+jQuery(document).ready(function()
+{
+ // get the linked details
+ getLinked();
+});
+
+function getLinked_server(type){
+ var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&vdm="+vastDevMod;
+ if(token.length > 0 && type > 0){
+ var request = 'token='+token+'&type='+type;
+ }
+ return jQuery.ajax({
+ type: 'GET',
+ url: getUrl,
+ dataType: 'jsonp',
+ data: request,
+ jsonp: 'callback'
+ });
+}
+
+function getLinked(){
+ getLinked_server(1).done(function(result) {
+ if(result){
+ jQuery('#display_linked_to').html(result);
+ }
+ });
+}
+
function getViewTableColumns_server(viewId,asKey,rowType)
{
var getUrl = "index.php?option=com_componentbuilder&task=ajax.viewTableColumns&format=json";
diff --git a/admin/models/forms/dynamic_get.xml b/admin/models/forms/dynamic_get.xml
index 8ccb137d3..eeafb8024 100644
--- a/admin/models/forms/dynamic_get.xml
+++ b/admin/models/forms/dynamic_get.xml
@@ -124,29 +124,14 @@
COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM
COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOMS
-
-
-
- COM_COMPONENTBUILDER_DYNAMIC_GET_YES
- COM_COMPONENTBUILDER_DYNAMIC_GET_NO
-
-
-
-
- COM_COMPONENTBUILDER_DYNAMIC_GET_YES
- COM_COMPONENTBUILDER_DYNAMIC_GET_NO
-
+
+
-
+
+
+
+
+
@@ -169,265 +170,47 @@
COM_COMPONENTBUILDER_DYNAMIC_GET_YES
COM_COMPONENTBUILDER_DYNAMIC_GET_NO
-
+
+
+
-
-
-
-
-
-
-
-
-
-
- COM_COMPONENTBUILDER_DYNAMIC_GET_YES
- COM_COMPONENTBUILDER_DYNAMIC_GET_NO
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ COM_COMPONENTBUILDER_DYNAMIC_GET_YES
+ COM_COMPONENTBUILDER_DYNAMIC_GET_NO
+
+
+
+
+ COM_COMPONENTBUILDER_DYNAMIC_GET_YES
+ COM_COMPONENTBUILDER_DYNAMIC_GET_NO
+
+
+
+
+ COM_COMPONENTBUILDER_DYNAMIC_GET_YES
+ COM_COMPONENTBUILDER_DYNAMIC_GET_NO
+
+
+
+
+ COM_COMPONENTBUILDER_DYNAMIC_GET_YES
+ COM_COMPONENTBUILDER_DYNAMIC_GET_NO
+
+
+
+
+
+
+ COM_COMPONENTBUILDER_DYNAMIC_GET_YES
+ COM_COMPONENTBUILDER_DYNAMIC_GET_NO
+
-
-
+
+
-
+
COM_COMPONENTBUILDER_DYNAMIC_GET_YES
@@ -740,17 +652,10 @@
filter="raw"
hint="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEM_HINT"
required="true" />
-
-
-
- COM_COMPONENTBUILDER_DYNAMIC_GET_YES
- COM_COMPONENTBUILDER_DYNAMIC_GET_NO
-
+
+
-
-
+
+
+
+
-
-
-
- COM_COMPONENTBUILDER_DYNAMIC_GET_YES
- COM_COMPONENTBUILDER_DYNAMIC_GET_NO
+
+
+
-
-
+
+
+
+
-
+
+ maximum="200">
diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js
index 969becb4c..c69f112f2 100644
--- a/admin/models/forms/field.js
+++ b/admin/models/forms/field.js
@@ -23,210 +23,96 @@
/-----------------------------------------------------------------------------------------------------------------------------*/
// Some Global Values
-jform_vvvvwaevzq_required = false;
-jform_vvvvwafvzr_required = false;
jform_vvvvwagvzs_required = false;
jform_vvvvwahvzt_required = false;
-jform_vvvvwakvzu_required = false;
-jform_vvvvwalvzv_required = false;
+jform_vvvvwaivzu_required = false;
+jform_vvvvwajvzv_required = false;
jform_vvvvwamvzw_required = false;
jform_vvvvwanvzx_required = false;
+jform_vvvvwaovzy_required = false;
+jform_vvvvwapvzz_required = false;
// Initial Script
jQuery(document).ready(function()
{
- var datalenght_vvvvwae = jQuery("#jform_datalenght").val();
- vvvvwae(datalenght_vvvvwae);
+ var datalenght_vvvvwag = jQuery("#jform_datalenght").val();
+ vvvvwag(datalenght_vvvvwag);
- var datadefault_vvvvwaf = jQuery("#jform_datadefault").val();
- vvvvwaf(datadefault_vvvvwaf);
+ var datadefault_vvvvwah = jQuery("#jform_datadefault").val();
+ vvvvwah(datadefault_vvvvwah);
- var datatype_vvvvwag = jQuery("#jform_datatype").val();
- vvvvwag(datatype_vvvvwag);
-
- var datatype_vvvvwah = jQuery("#jform_datatype").val();
- vvvvwah(datatype_vvvvwah);
-
- var store_vvvvwai = jQuery("#jform_store").val();
var datatype_vvvvwai = jQuery("#jform_datatype").val();
- vvvvwai(store_vvvvwai,datatype_vvvvwai);
+ vvvvwai(datatype_vvvvwai);
- var add_css_view_vvvvwak = jQuery("#jform_add_css_view input[type='radio']:checked").val();
- vvvvwak(add_css_view_vvvvwak);
+ var datatype_vvvvwaj = jQuery("#jform_datatype").val();
+ vvvvwaj(datatype_vvvvwaj);
- var add_css_views_vvvvwal = jQuery("#jform_add_css_views input[type='radio']:checked").val();
- vvvvwal(add_css_views_vvvvwal);
+ var store_vvvvwak = jQuery("#jform_store").val();
+ var datatype_vvvvwak = jQuery("#jform_datatype").val();
+ vvvvwak(store_vvvvwak,datatype_vvvvwak);
- var add_javascript_view_footer_vvvvwam = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
- vvvvwam(add_javascript_view_footer_vvvvwam);
+ var add_css_view_vvvvwam = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+ vvvvwam(add_css_view_vvvvwam);
- var add_javascript_views_footer_vvvvwan = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
- vvvvwan(add_javascript_views_footer_vvvvwan);
+ var add_css_views_vvvvwan = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+ vvvvwan(add_css_views_vvvvwan);
+
+ var add_javascript_view_footer_vvvvwao = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+ vvvvwao(add_javascript_view_footer_vvvvwao);
+
+ var add_javascript_views_footer_vvvvwap = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+ vvvvwap(add_javascript_views_footer_vvvvwap);
});
-// the vvvvwae function
-function vvvvwae(datalenght_vvvvwae)
+// the vvvvwag function
+function vvvvwag(datalenght_vvvvwag)
{
- if (isSet(datalenght_vvvvwae) && datalenght_vvvvwae.constructor !== Array)
+ if (isSet(datalenght_vvvvwag) && datalenght_vvvvwag.constructor !== Array)
{
- var temp_vvvvwae = datalenght_vvvvwae;
- var datalenght_vvvvwae = [];
- datalenght_vvvvwae.push(temp_vvvvwae);
+ var temp_vvvvwag = datalenght_vvvvwag;
+ var datalenght_vvvvwag = [];
+ datalenght_vvvvwag.push(temp_vvvvwag);
}
- else if (!isSet(datalenght_vvvvwae))
+ else if (!isSet(datalenght_vvvvwag))
{
- var datalenght_vvvvwae = [];
+ var datalenght_vvvvwag = [];
}
- var datalenght = datalenght_vvvvwae.some(datalenght_vvvvwae_SomeFunc);
+ var datalenght = datalenght_vvvvwag.some(datalenght_vvvvwag_SomeFunc);
// set this function logic
if (datalenght)
{
jQuery('#jform_datalenght_other').closest('.control-group').show();
- if (jform_vvvvwaevzq_required)
+ if (jform_vvvvwagvzs_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_vvvvwaevzq_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_datalenght_other').closest('.control-group').hide();
- if (!jform_vvvvwaevzq_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_vvvvwaevzq_required = true;
- }
- }
-}
-
-// the vvvvwae Some function
-function datalenght_vvvvwae_SomeFunc(datalenght_vvvvwae)
-{
- // set the function logic
- if (datalenght_vvvvwae == 'Other')
- {
- return true;
- }
- return false;
-}
-
-// the vvvvwaf function
-function vvvvwaf(datadefault_vvvvwaf)
-{
- if (isSet(datadefault_vvvvwaf) && datadefault_vvvvwaf.constructor !== Array)
- {
- var temp_vvvvwaf = datadefault_vvvvwaf;
- var datadefault_vvvvwaf = [];
- datadefault_vvvvwaf.push(temp_vvvvwaf);
- }
- else if (!isSet(datadefault_vvvvwaf))
- {
- var datadefault_vvvvwaf = [];
- }
- var datadefault = datadefault_vvvvwaf.some(datadefault_vvvvwaf_SomeFunc);
-
-
- // set this function logic
- if (datadefault)
- {
- jQuery('#jform_datadefault_other').closest('.control-group').show();
- if (jform_vvvvwafvzr_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_vvvvwafvzr_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_datadefault_other').closest('.control-group').hide();
- if (!jform_vvvvwafvzr_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_vvvvwafvzr_required = true;
- }
- }
-}
-
-// the vvvvwaf Some function
-function datadefault_vvvvwaf_SomeFunc(datadefault_vvvvwaf)
-{
- // set the function logic
- if (datadefault_vvvvwaf == 'Other')
- {
- return true;
- }
- return false;
-}
-
-// the vvvvwag function
-function vvvvwag(datatype_vvvvwag)
-{
- if (isSet(datatype_vvvvwag) && datatype_vvvvwag.constructor !== Array)
- {
- var temp_vvvvwag = datatype_vvvvwag;
- var datatype_vvvvwag = [];
- datatype_vvvvwag.push(temp_vvvvwag);
- }
- else if (!isSet(datatype_vvvvwag))
- {
- var datatype_vvvvwag = [];
- }
- var datatype = datatype_vvvvwag.some(datatype_vvvvwag_SomeFunc);
-
-
- // set this function logic
- if (datatype)
- {
- jQuery('#jform_datadefault').closest('.control-group').show();
- jQuery('#jform_datalenght').closest('.control-group').show();
- jQuery('#jform_indexes').closest('.control-group').show();
- if (jform_vvvvwagvzs_required)
- {
- updateFieldRequired('indexes',0);
- jQuery('#jform_indexes').prop('required','required');
- jQuery('#jform_indexes').attr('aria-required',true);
- jQuery('#jform_indexes').addClass('required');
jform_vvvvwagvzs_required = false;
}
}
else
{
- jQuery('#jform_datadefault').closest('.control-group').hide();
- jQuery('#jform_datalenght').closest('.control-group').hide();
- jQuery('#jform_indexes').closest('.control-group').hide();
+ jQuery('#jform_datalenght_other').closest('.control-group').hide();
if (!jform_vvvvwagvzs_required)
{
- updateFieldRequired('indexes',1);
- jQuery('#jform_indexes').removeAttr('required');
- jQuery('#jform_indexes').removeAttr('aria-required');
- jQuery('#jform_indexes').removeClass('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_vvvvwagvzs_required = true;
}
}
}
// the vvvvwag Some function
-function datatype_vvvvwag_SomeFunc(datatype_vvvvwag)
+function datalenght_vvvvwag_SomeFunc(datalenght_vvvvwag)
{
// set the function logic
- if (datatype_vvvvwag == 'CHAR' || datatype_vvvvwag == 'VARCHAR' || datatype_vvvvwag == 'DATETIME' || datatype_vvvvwag == 'DATE' || datatype_vvvvwag == 'TIME' || datatype_vvvvwag == 'INT' || datatype_vvvvwag == 'TINYINT' || datatype_vvvvwag == 'BIGINT' || datatype_vvvvwag == 'FLOAT' || datatype_vvvvwag == 'DECIMAL' || datatype_vvvvwag == 'DOUBLE')
+ if (datalenght_vvvvwag == 'Other')
{
return true;
}
@@ -234,54 +120,54 @@ function datatype_vvvvwag_SomeFunc(datatype_vvvvwag)
}
// the vvvvwah function
-function vvvvwah(datatype_vvvvwah)
+function vvvvwah(datadefault_vvvvwah)
{
- if (isSet(datatype_vvvvwah) && datatype_vvvvwah.constructor !== Array)
+ if (isSet(datadefault_vvvvwah) && datadefault_vvvvwah.constructor !== Array)
{
- var temp_vvvvwah = datatype_vvvvwah;
- var datatype_vvvvwah = [];
- datatype_vvvvwah.push(temp_vvvvwah);
+ var temp_vvvvwah = datadefault_vvvvwah;
+ var datadefault_vvvvwah = [];
+ datadefault_vvvvwah.push(temp_vvvvwah);
}
- else if (!isSet(datatype_vvvvwah))
+ else if (!isSet(datadefault_vvvvwah))
{
- var datatype_vvvvwah = [];
+ var datadefault_vvvvwah = [];
}
- var datatype = datatype_vvvvwah.some(datatype_vvvvwah_SomeFunc);
+ var datadefault = datadefault_vvvvwah.some(datadefault_vvvvwah_SomeFunc);
// set this function logic
- if (datatype)
+ if (datadefault)
{
- jQuery('#jform_store').closest('.control-group').show();
+ jQuery('#jform_datadefault_other').closest('.control-group').show();
if (jform_vvvvwahvzt_required)
{
- updateFieldRequired('store',0);
- jQuery('#jform_store').prop('required','required');
- jQuery('#jform_store').attr('aria-required',true);
- jQuery('#jform_store').addClass('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_vvvvwahvzt_required = false;
}
}
else
{
- jQuery('#jform_store').closest('.control-group').hide();
+ jQuery('#jform_datadefault_other').closest('.control-group').hide();
if (!jform_vvvvwahvzt_required)
{
- updateFieldRequired('store',1);
- jQuery('#jform_store').removeAttr('required');
- jQuery('#jform_store').removeAttr('aria-required');
- jQuery('#jform_store').removeClass('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_vvvvwahvzt_required = true;
}
}
}
// the vvvvwah Some function
-function datatype_vvvvwah_SomeFunc(datatype_vvvvwah)
+function datadefault_vvvvwah_SomeFunc(datadefault_vvvvwah)
{
// set the function logic
- if (datatype_vvvvwah == 'CHAR' || datatype_vvvvwah == 'VARCHAR' || datatype_vvvvwah == 'TEXT' || datatype_vvvvwah == 'MEDIUMTEXT' || datatype_vvvvwah == 'LONGTEXT')
+ if (datadefault_vvvvwah == 'Other')
{
return true;
}
@@ -289,20 +175,8 @@ function datatype_vvvvwah_SomeFunc(datatype_vvvvwah)
}
// the vvvvwai function
-function vvvvwai(store_vvvvwai,datatype_vvvvwai)
+function vvvvwai(datatype_vvvvwai)
{
- if (isSet(store_vvvvwai) && store_vvvvwai.constructor !== Array)
- {
- var temp_vvvvwai = store_vvvvwai;
- var store_vvvvwai = [];
- store_vvvvwai.push(temp_vvvvwai);
- }
- else if (!isSet(store_vvvvwai))
- {
- var store_vvvvwai = [];
- }
- var store = store_vvvvwai.some(store_vvvvwai_SomeFunc);
-
if (isSet(datatype_vvvvwai) && datatype_vvvvwai.constructor !== Array)
{
var temp_vvvvwai = datatype_vvvvwai;
@@ -316,6 +190,132 @@ function vvvvwai(store_vvvvwai,datatype_vvvvwai)
var datatype = datatype_vvvvwai.some(datatype_vvvvwai_SomeFunc);
+ // set this function logic
+ if (datatype)
+ {
+ jQuery('#jform_datadefault').closest('.control-group').show();
+ jQuery('#jform_datalenght').closest('.control-group').show();
+ jQuery('#jform_indexes').closest('.control-group').show();
+ if (jform_vvvvwaivzu_required)
+ {
+ updateFieldRequired('indexes',0);
+ jQuery('#jform_indexes').prop('required','required');
+ jQuery('#jform_indexes').attr('aria-required',true);
+ jQuery('#jform_indexes').addClass('required');
+ jform_vvvvwaivzu_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_datadefault').closest('.control-group').hide();
+ jQuery('#jform_datalenght').closest('.control-group').hide();
+ jQuery('#jform_indexes').closest('.control-group').hide();
+ if (!jform_vvvvwaivzu_required)
+ {
+ updateFieldRequired('indexes',1);
+ jQuery('#jform_indexes').removeAttr('required');
+ jQuery('#jform_indexes').removeAttr('aria-required');
+ jQuery('#jform_indexes').removeClass('required');
+ jform_vvvvwaivzu_required = true;
+ }
+ }
+}
+
+// the vvvvwai Some function
+function datatype_vvvvwai_SomeFunc(datatype_vvvvwai)
+{
+ // set the function logic
+ if (datatype_vvvvwai == 'CHAR' || datatype_vvvvwai == 'VARCHAR' || datatype_vvvvwai == 'DATETIME' || datatype_vvvvwai == 'DATE' || datatype_vvvvwai == 'TIME' || datatype_vvvvwai == 'INT' || datatype_vvvvwai == 'TINYINT' || datatype_vvvvwai == 'BIGINT' || datatype_vvvvwai == 'FLOAT' || datatype_vvvvwai == 'DECIMAL' || datatype_vvvvwai == 'DOUBLE')
+ {
+ return true;
+ }
+ return false;
+}
+
+// the vvvvwaj function
+function vvvvwaj(datatype_vvvvwaj)
+{
+ if (isSet(datatype_vvvvwaj) && datatype_vvvvwaj.constructor !== Array)
+ {
+ var temp_vvvvwaj = datatype_vvvvwaj;
+ var datatype_vvvvwaj = [];
+ datatype_vvvvwaj.push(temp_vvvvwaj);
+ }
+ else if (!isSet(datatype_vvvvwaj))
+ {
+ var datatype_vvvvwaj = [];
+ }
+ var datatype = datatype_vvvvwaj.some(datatype_vvvvwaj_SomeFunc);
+
+
+ // set this function logic
+ if (datatype)
+ {
+ jQuery('#jform_store').closest('.control-group').show();
+ if (jform_vvvvwajvzv_required)
+ {
+ updateFieldRequired('store',0);
+ jQuery('#jform_store').prop('required','required');
+ jQuery('#jform_store').attr('aria-required',true);
+ jQuery('#jform_store').addClass('required');
+ jform_vvvvwajvzv_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_store').closest('.control-group').hide();
+ if (!jform_vvvvwajvzv_required)
+ {
+ updateFieldRequired('store',1);
+ jQuery('#jform_store').removeAttr('required');
+ jQuery('#jform_store').removeAttr('aria-required');
+ jQuery('#jform_store').removeClass('required');
+ jform_vvvvwajvzv_required = true;
+ }
+ }
+}
+
+// the vvvvwaj Some function
+function datatype_vvvvwaj_SomeFunc(datatype_vvvvwaj)
+{
+ // set the function logic
+ if (datatype_vvvvwaj == 'CHAR' || datatype_vvvvwaj == 'VARCHAR' || datatype_vvvvwaj == 'TEXT' || datatype_vvvvwaj == 'MEDIUMTEXT' || datatype_vvvvwaj == 'LONGTEXT')
+ {
+ return true;
+ }
+ return false;
+}
+
+// the vvvvwak function
+function vvvvwak(store_vvvvwak,datatype_vvvvwak)
+{
+ if (isSet(store_vvvvwak) && store_vvvvwak.constructor !== Array)
+ {
+ var temp_vvvvwak = store_vvvvwak;
+ var store_vvvvwak = [];
+ store_vvvvwak.push(temp_vvvvwak);
+ }
+ else if (!isSet(store_vvvvwak))
+ {
+ var store_vvvvwak = [];
+ }
+ var store = store_vvvvwak.some(store_vvvvwak_SomeFunc);
+
+ if (isSet(datatype_vvvvwak) && datatype_vvvvwak.constructor !== Array)
+ {
+ var temp_vvvvwak = datatype_vvvvwak;
+ var datatype_vvvvwak = [];
+ datatype_vvvvwak.push(temp_vvvvwak);
+ }
+ else if (!isSet(datatype_vvvvwak))
+ {
+ var datatype_vvvvwak = [];
+ }
+ var datatype = datatype_vvvvwak.some(datatype_vvvvwak_SomeFunc);
+
+
// set this function logic
if (store && datatype)
{
@@ -327,148 +327,148 @@ function vvvvwai(store_vvvvwai,datatype_vvvvwai)
}
}
-// the vvvvwai Some function
-function store_vvvvwai_SomeFunc(store_vvvvwai)
+// the vvvvwak Some function
+function store_vvvvwak_SomeFunc(store_vvvvwak)
{
// set the function logic
- if (store_vvvvwai == 4)
+ if (store_vvvvwak == 4)
{
return true;
}
return false;
}
-// the vvvvwai Some function
-function datatype_vvvvwai_SomeFunc(datatype_vvvvwai)
+// the vvvvwak Some function
+function datatype_vvvvwak_SomeFunc(datatype_vvvvwak)
{
// set the function logic
- if (datatype_vvvvwai == 'CHAR' || datatype_vvvvwai == 'VARCHAR' || datatype_vvvvwai == 'TEXT' || datatype_vvvvwai == 'MEDIUMTEXT' || datatype_vvvvwai == 'LONGTEXT')
+ if (datatype_vvvvwak == 'CHAR' || datatype_vvvvwak == 'VARCHAR' || datatype_vvvvwak == 'TEXT' || datatype_vvvvwak == 'MEDIUMTEXT' || datatype_vvvvwak == 'LONGTEXT')
{
return true;
}
return false;
}
-// the vvvvwak function
-function vvvvwak(add_css_view_vvvvwak)
+// the vvvvwam function
+function vvvvwam(add_css_view_vvvvwam)
{
// set the function logic
- if (add_css_view_vvvvwak == 1)
+ if (add_css_view_vvvvwam == 1)
{
jQuery('#jform_css_view').closest('.control-group').show();
- if (jform_vvvvwakvzu_required)
+ if (jform_vvvvwamvzw_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_vvvvwakvzu_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_css_view').closest('.control-group').hide();
- if (!jform_vvvvwakvzu_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_vvvvwakvzu_required = true;
- }
- }
-}
-
-// the vvvvwal function
-function vvvvwal(add_css_views_vvvvwal)
-{
- // set the function logic
- if (add_css_views_vvvvwal == 1)
- {
- jQuery('#jform_css_views').closest('.control-group').show();
- if (jform_vvvvwalvzv_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_vvvvwalvzv_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_css_views').closest('.control-group').hide();
- if (!jform_vvvvwalvzv_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_vvvvwalvzv_required = true;
- }
- }
-}
-
-// the vvvvwam function
-function vvvvwam(add_javascript_view_footer_vvvvwam)
-{
- // set the function logic
- if (add_javascript_view_footer_vvvvwam == 1)
- {
- jQuery('#jform_javascript_view_footer').closest('.control-group').show();
- if (jform_vvvvwamvzw_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_vvvvwamvzw_required = false;
}
}
else
{
- jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
+ jQuery('#jform_css_view').closest('.control-group').hide();
if (!jform_vvvvwamvzw_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');
+ updateFieldRequired('css_view',1);
+ jQuery('#jform_css_view').removeAttr('required');
+ jQuery('#jform_css_view').removeAttr('aria-required');
+ jQuery('#jform_css_view').removeClass('required');
jform_vvvvwamvzw_required = true;
}
}
}
// the vvvvwan function
-function vvvvwan(add_javascript_views_footer_vvvvwan)
+function vvvvwan(add_css_views_vvvvwan)
{
// set the function logic
- if (add_javascript_views_footer_vvvvwan == 1)
+ if (add_css_views_vvvvwan == 1)
{
- jQuery('#jform_javascript_views_footer').closest('.control-group').show();
+ jQuery('#jform_css_views').closest('.control-group').show();
if (jform_vvvvwanvzx_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');
+ 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_vvvvwanvzx_required = false;
}
}
else
{
- jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
+ jQuery('#jform_css_views').closest('.control-group').hide();
if (!jform_vvvvwanvzx_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_vvvvwanvzx_required = true;
+ }
+ }
+}
+
+// the vvvvwao function
+function vvvvwao(add_javascript_view_footer_vvvvwao)
+{
+ // set the function logic
+ if (add_javascript_view_footer_vvvvwao == 1)
+ {
+ jQuery('#jform_javascript_view_footer').closest('.control-group').show();
+ if (jform_vvvvwaovzy_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_vvvvwaovzy_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
+ if (!jform_vvvvwaovzy_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_vvvvwaovzy_required = true;
+ }
+ }
+}
+
+// the vvvvwap function
+function vvvvwap(add_javascript_views_footer_vvvvwap)
+{
+ // set the function logic
+ if (add_javascript_views_footer_vvvvwap == 1)
+ {
+ jQuery('#jform_javascript_views_footer').closest('.control-group').show();
+ if (jform_vvvvwapvzz_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_vvvvwapvzz_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
+ if (!jform_vvvvwapvzz_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_vvvvwanvzx_required = true;
+ jform_vvvvwapvzz_required = true;
}
}
}
@@ -509,6 +509,34 @@ function isSet(val)
return false;
}
+jQuery(document).ready(function()
+{
+ // get the linked details
+ getLinked();
+});
+
+function getLinked_server(type){
+ var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&vdm="+vastDevMod;
+ if(token.length > 0 && type > 0){
+ var request = 'token='+token+'&type='+type;
+ }
+ return jQuery.ajax({
+ type: 'GET',
+ url: getUrl,
+ dataType: 'jsonp',
+ data: request,
+ jsonp: 'callback'
+ });
+}
+
+function getLinked(){
+ getLinked_server(1).done(function(result) {
+ if(result){
+ jQuery('#display_linked_to').html(result);
+ }
+ });
+}
+
function getFieldOptions_server(fieldId){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldOptions&format=json";
if(token.length > 0 && fieldId > 0){
diff --git a/admin/models/forms/field.xml b/admin/models/forms/field.xml
index 25cf5c3f1..0011745e7 100644
--- a/admin/models/forms/field.xml
+++ b/admin/models/forms/field.xml
@@ -208,7 +208,6 @@
diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js
index 489a8f3ab..f436f73b8 100644
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@@ -23,207 +23,97 @@
/-----------------------------------------------------------------------------------------------------------------------------*/
// Some Global Values
-jform_vvvvwaowaa_required = false;
-jform_vvvvwapwab_required = false;
jform_vvvvwaqwac_required = false;
jform_vvvvwarwad_required = false;
jform_vvvvwaswae_required = false;
jform_vvvvwatwaf_required = false;
+jform_vvvvwauwag_required = false;
+jform_vvvvwavwah_required = false;
// Initial Script
jQuery(document).ready(function()
{
- var location_vvvvwao = jQuery("#jform_location input[type='radio']:checked").val();
- vvvvwao(location_vvvvwao);
+ var location_vvvvwaq = jQuery("#jform_location input[type='radio']:checked").val();
+ vvvvwaq(location_vvvvwaq);
- var location_vvvvwap = jQuery("#jform_location input[type='radio']:checked").val();
- vvvvwap(location_vvvvwap);
-
- var type_vvvvwaq = jQuery("#jform_type").val();
- vvvvwaq(type_vvvvwaq);
-
- var type_vvvvwar = jQuery("#jform_type").val();
- vvvvwar(type_vvvvwar);
+ var location_vvvvwar = jQuery("#jform_location input[type='radio']:checked").val();
+ vvvvwar(location_vvvvwar);
var type_vvvvwas = jQuery("#jform_type").val();
vvvvwas(type_vvvvwas);
- var target_vvvvwat = jQuery("#jform_target input[type='radio']:checked").val();
- vvvvwat(target_vvvvwat);
+ var type_vvvvwat = jQuery("#jform_type").val();
+ vvvvwat(type_vvvvwat);
+
+ var type_vvvvwau = jQuery("#jform_type").val();
+ vvvvwau(type_vvvvwau);
+
+ var target_vvvvwav = jQuery("#jform_target input[type='radio']:checked").val();
+ vvvvwav(target_vvvvwav);
});
-// the vvvvwao function
-function vvvvwao(location_vvvvwao)
+// the vvvvwaq function
+function vvvvwaq(location_vvvvwaq)
{
// set the function logic
- if (location_vvvvwao == 1)
+ if (location_vvvvwaq == 1)
{
jQuery('#jform_admin_view').closest('.control-group').show();
- if (jform_vvvvwaowaa_required)
+ if (jform_vvvvwaqwac_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_vvvvwaowaa_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_admin_view').closest('.control-group').hide();
- if (!jform_vvvvwaowaa_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_vvvvwaowaa_required = true;
- }
- }
-}
-
-// the vvvvwap function
-function vvvvwap(location_vvvvwap)
-{
- // set the function logic
- if (location_vvvvwap == 2)
- {
- jQuery('#jform_site_view').closest('.control-group').show();
- if (jform_vvvvwapwab_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_vvvvwapwab_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_site_view').closest('.control-group').hide();
- if (!jform_vvvvwapwab_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_vvvvwapwab_required = true;
- }
- }
-}
-
-// the vvvvwaq function
-function vvvvwaq(type_vvvvwaq)
-{
- if (isSet(type_vvvvwaq) && type_vvvvwaq.constructor !== Array)
- {
- var temp_vvvvwaq = type_vvvvwaq;
- var type_vvvvwaq = [];
- type_vvvvwaq.push(temp_vvvvwaq);
- }
- else if (!isSet(type_vvvvwaq))
- {
- var type_vvvvwaq = [];
- }
- var type = type_vvvvwaq.some(type_vvvvwaq_SomeFunc);
-
-
- // set this function logic
- if (type)
- {
- jQuery('#jform_url').closest('.control-group').show();
- if (jform_vvvvwaqwac_required)
- {
- updateFieldRequired('url',0);
- jQuery('#jform_url').prop('required','required');
- jQuery('#jform_url').attr('aria-required',true);
- jQuery('#jform_url').addClass('required');
jform_vvvvwaqwac_required = false;
}
}
else
{
- jQuery('#jform_url').closest('.control-group').hide();
+ jQuery('#jform_admin_view').closest('.control-group').hide();
if (!jform_vvvvwaqwac_required)
{
- updateFieldRequired('url',1);
- jQuery('#jform_url').removeAttr('required');
- jQuery('#jform_url').removeAttr('aria-required');
- jQuery('#jform_url').removeClass('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_vvvvwaqwac_required = true;
}
}
}
-// the vvvvwaq Some function
-function type_vvvvwaq_SomeFunc(type_vvvvwaq)
+// the vvvvwar function
+function vvvvwar(location_vvvvwar)
{
// set the function logic
- if (type_vvvvwaq == 3)
+ if (location_vvvvwar == 2)
{
- return true;
- }
- return false;
-}
-
-// the vvvvwar function
-function vvvvwar(type_vvvvwar)
-{
- if (isSet(type_vvvvwar) && type_vvvvwar.constructor !== Array)
- {
- var temp_vvvvwar = type_vvvvwar;
- var type_vvvvwar = [];
- type_vvvvwar.push(temp_vvvvwar);
- }
- else if (!isSet(type_vvvvwar))
- {
- var type_vvvvwar = [];
- }
- var type = type_vvvvwar.some(type_vvvvwar_SomeFunc);
-
-
- // set this function logic
- if (type)
- {
- jQuery('#jform_article').closest('.control-group').show();
+ jQuery('#jform_site_view').closest('.control-group').show();
if (jform_vvvvwarwad_required)
{
- updateFieldRequired('article',0);
- jQuery('#jform_article').prop('required','required');
- jQuery('#jform_article').attr('aria-required',true);
- jQuery('#jform_article').addClass('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_vvvvwarwad_required = false;
}
}
else
{
- jQuery('#jform_article').closest('.control-group').hide();
+ jQuery('#jform_site_view').closest('.control-group').hide();
if (!jform_vvvvwarwad_required)
{
- updateFieldRequired('article',1);
- jQuery('#jform_article').removeAttr('required');
- jQuery('#jform_article').removeAttr('aria-required');
- jQuery('#jform_article').removeClass('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_vvvvwarwad_required = true;
}
}
}
-// the vvvvwar Some function
-function type_vvvvwar_SomeFunc(type_vvvvwar)
-{
- // set the function logic
- if (type_vvvvwar == 1)
- {
- return true;
- }
- return false;
-}
-
// the vvvvwas function
function vvvvwas(type_vvvvwas)
{
@@ -243,26 +133,26 @@ function vvvvwas(type_vvvvwas)
// set this function logic
if (type)
{
- jQuery('#jform_content-lbl').closest('.control-group').show();
+ jQuery('#jform_url').closest('.control-group').show();
if (jform_vvvvwaswae_required)
{
- updateFieldRequired('content',0);
- jQuery('#jform_content').prop('required','required');
- jQuery('#jform_content').attr('aria-required',true);
- jQuery('#jform_content').addClass('required');
+ updateFieldRequired('url',0);
+ jQuery('#jform_url').prop('required','required');
+ jQuery('#jform_url').attr('aria-required',true);
+ jQuery('#jform_url').addClass('required');
jform_vvvvwaswae_required = false;
}
}
else
{
- jQuery('#jform_content-lbl').closest('.control-group').hide();
+ jQuery('#jform_url').closest('.control-group').hide();
if (!jform_vvvvwaswae_required)
{
- updateFieldRequired('content',1);
- jQuery('#jform_content').removeAttr('required');
- jQuery('#jform_content').removeAttr('aria-required');
- jQuery('#jform_content').removeClass('required');
+ updateFieldRequired('url',1);
+ jQuery('#jform_url').removeAttr('required');
+ jQuery('#jform_url').removeAttr('aria-required');
+ jQuery('#jform_url').removeClass('required');
jform_vvvvwaswae_required = true;
}
}
@@ -272,7 +162,7 @@ function vvvvwas(type_vvvvwas)
function type_vvvvwas_SomeFunc(type_vvvvwas)
{
// set the function logic
- if (type_vvvvwas == 2)
+ if (type_vvvvwas == 3)
{
return true;
}
@@ -280,32 +170,142 @@ function type_vvvvwas_SomeFunc(type_vvvvwas)
}
// the vvvvwat function
-function vvvvwat(target_vvvvwat)
+function vvvvwat(type_vvvvwat)
{
- // set the function logic
- if (target_vvvvwat == 1)
+ if (isSet(type_vvvvwat) && type_vvvvwat.constructor !== Array)
{
- jQuery('#jform_groups').closest('.control-group').show();
+ var temp_vvvvwat = type_vvvvwat;
+ var type_vvvvwat = [];
+ type_vvvvwat.push(temp_vvvvwat);
+ }
+ else if (!isSet(type_vvvvwat))
+ {
+ var type_vvvvwat = [];
+ }
+ var type = type_vvvvwat.some(type_vvvvwat_SomeFunc);
+
+
+ // set this function logic
+ if (type)
+ {
+ jQuery('#jform_article').closest('.control-group').show();
if (jform_vvvvwatwaf_required)
{
- updateFieldRequired('groups',0);
- jQuery('#jform_groups').prop('required','required');
- jQuery('#jform_groups').attr('aria-required',true);
- jQuery('#jform_groups').addClass('required');
+ updateFieldRequired('article',0);
+ jQuery('#jform_article').prop('required','required');
+ jQuery('#jform_article').attr('aria-required',true);
+ jQuery('#jform_article').addClass('required');
jform_vvvvwatwaf_required = false;
}
}
else
{
- jQuery('#jform_groups').closest('.control-group').hide();
+ jQuery('#jform_article').closest('.control-group').hide();
if (!jform_vvvvwatwaf_required)
+ {
+ updateFieldRequired('article',1);
+ jQuery('#jform_article').removeAttr('required');
+ jQuery('#jform_article').removeAttr('aria-required');
+ jQuery('#jform_article').removeClass('required');
+ jform_vvvvwatwaf_required = true;
+ }
+ }
+}
+
+// the vvvvwat Some function
+function type_vvvvwat_SomeFunc(type_vvvvwat)
+{
+ // set the function logic
+ if (type_vvvvwat == 1)
+ {
+ return true;
+ }
+ return false;
+}
+
+// the vvvvwau function
+function vvvvwau(type_vvvvwau)
+{
+ if (isSet(type_vvvvwau) && type_vvvvwau.constructor !== Array)
+ {
+ var temp_vvvvwau = type_vvvvwau;
+ var type_vvvvwau = [];
+ type_vvvvwau.push(temp_vvvvwau);
+ }
+ else if (!isSet(type_vvvvwau))
+ {
+ var type_vvvvwau = [];
+ }
+ var type = type_vvvvwau.some(type_vvvvwau_SomeFunc);
+
+
+ // set this function logic
+ if (type)
+ {
+ jQuery('#jform_content-lbl').closest('.control-group').show();
+ if (jform_vvvvwauwag_required)
+ {
+ updateFieldRequired('content',0);
+ jQuery('#jform_content').prop('required','required');
+ jQuery('#jform_content').attr('aria-required',true);
+ jQuery('#jform_content').addClass('required');
+ jform_vvvvwauwag_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_content-lbl').closest('.control-group').hide();
+ if (!jform_vvvvwauwag_required)
+ {
+ updateFieldRequired('content',1);
+ jQuery('#jform_content').removeAttr('required');
+ jQuery('#jform_content').removeAttr('aria-required');
+ jQuery('#jform_content').removeClass('required');
+ jform_vvvvwauwag_required = true;
+ }
+ }
+}
+
+// the vvvvwau Some function
+function type_vvvvwau_SomeFunc(type_vvvvwau)
+{
+ // set the function logic
+ if (type_vvvvwau == 2)
+ {
+ return true;
+ }
+ return false;
+}
+
+// the vvvvwav function
+function vvvvwav(target_vvvvwav)
+{
+ // set the function logic
+ if (target_vvvvwav == 1)
+ {
+ jQuery('#jform_groups').closest('.control-group').show();
+ if (jform_vvvvwavwah_required)
+ {
+ updateFieldRequired('groups',0);
+ jQuery('#jform_groups').prop('required','required');
+ jQuery('#jform_groups').attr('aria-required',true);
+ jQuery('#jform_groups').addClass('required');
+ jform_vvvvwavwah_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_groups').closest('.control-group').hide();
+ if (!jform_vvvvwavwah_required)
{
updateFieldRequired('groups',1);
jQuery('#jform_groups').removeAttr('required');
jQuery('#jform_groups').removeAttr('aria-required');
jQuery('#jform_groups').removeClass('required');
- jform_vvvvwatwaf_required = true;
+ jform_vvvvwavwah_required = true;
}
}
}
diff --git a/admin/models/forms/joomla_component.js b/admin/models/forms/joomla_component.js
index 85bd607ea..efa0011d5 100644
--- a/admin/models/forms/joomla_component.js
+++ b/admin/models/forms/joomla_component.js
@@ -29,17 +29,18 @@ jform_vvvvvvxvvx_required = false;
jform_vvvvvvyvvy_required = false;
jform_vvvvvvzvvz_required = false;
jform_vvvvvwavwa_required = false;
-jform_vvvvvwcvwb_required = false;
+jform_vvvvvwbvwb_required = false;
jform_vvvvvwdvwc_required = false;
jform_vvvvvwevwd_required = false;
jform_vvvvvwfvwe_required = false;
-jform_vvvvvwjvwf_required = false;
+jform_vvvvvwgvwf_required = false;
jform_vvvvvwkvwg_required = false;
jform_vvvvvwlvwh_required = false;
jform_vvvvvwmvwi_required = false;
jform_vvvvvwnvwj_required = false;
-jform_vvvvvwuvwk_required = false;
+jform_vvvvvwovwk_required = false;
jform_vvvvvwvvwl_required = false;
+jform_vvvvvwwvwm_required = false;
// Initial Script
jQuery(document).ready(function()
@@ -53,75 +54,78 @@ jQuery(document).ready(function()
var add_php_helper_both_vvvvvvx = jQuery("#jform_add_php_helper_both input[type='radio']:checked").val();
vvvvvvx(add_php_helper_both_vvvvvvx);
- var add_css_vvvvvvy = jQuery("#jform_add_css input[type='radio']:checked").val();
- vvvvvvy(add_css_vvvvvvy);
+ var add_css_admin_vvvvvvy = jQuery("#jform_add_css_admin input[type='radio']:checked").val();
+ vvvvvvy(add_css_admin_vvvvvvy);
- var add_javascript_vvvvvvz = jQuery("#jform_add_javascript input[type='radio']:checked").val();
- vvvvvvz(add_javascript_vvvvvvz);
+ var add_css_site_vvvvvvz = jQuery("#jform_add_css_site input[type='radio']:checked").val();
+ vvvvvvz(add_css_site_vvvvvvz);
- var add_sql_vvvvvwa = jQuery("#jform_add_sql input[type='radio']:checked").val();
- vvvvvwa(add_sql_vvvvvwa);
+ var add_javascript_vvvvvwa = jQuery("#jform_add_javascript input[type='radio']:checked").val();
+ vvvvvwa(add_javascript_vvvvvwa);
- var emptycontributors_vvvvvwb = jQuery("#jform_emptycontributors input[type='radio']:checked").val();
- vvvvvwb(emptycontributors_vvvvvwb);
+ var add_sql_vvvvvwb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+ vvvvvwb(add_sql_vvvvvwb);
- var add_license_vvvvvwc = jQuery("#jform_add_license input[type='radio']:checked").val();
- vvvvvwc(add_license_vvvvvwc);
+ var emptycontributors_vvvvvwc = jQuery("#jform_emptycontributors input[type='radio']:checked").val();
+ vvvvvwc(emptycontributors_vvvvvwc);
- var add_admin_event_vvvvvwd = jQuery("#jform_add_admin_event input[type='radio']:checked").val();
- vvvvvwd(add_admin_event_vvvvvwd);
+ var add_license_vvvvvwd = jQuery("#jform_add_license input[type='radio']:checked").val();
+ vvvvvwd(add_license_vvvvvwd);
- var add_site_event_vvvvvwe = jQuery("#jform_add_site_event input[type='radio']:checked").val();
- vvvvvwe(add_site_event_vvvvvwe);
+ var add_admin_event_vvvvvwe = jQuery("#jform_add_admin_event input[type='radio']:checked").val();
+ vvvvvwe(add_admin_event_vvvvvwe);
- var addreadme_vvvvvwf = jQuery("#jform_addreadme input[type='radio']:checked").val();
- vvvvvwf(addreadme_vvvvvwf);
+ var add_site_event_vvvvvwf = jQuery("#jform_add_site_event input[type='radio']:checked").val();
+ vvvvvwf(add_site_event_vvvvvwf);
- var add_update_server_vvvvvwg = jQuery("#jform_add_update_server input[type='radio']:checked").val();
- vvvvvwg(add_update_server_vvvvvwg);
+ var addreadme_vvvvvwg = jQuery("#jform_addreadme input[type='radio']:checked").val();
+ vvvvvwg(addreadme_vvvvvwg);
- var add_sales_server_vvvvvwh = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
- vvvvvwh(add_sales_server_vvvvvwh);
+ var add_update_server_vvvvvwh = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+ vvvvvwh(add_update_server_vvvvvwh);
- var add_license_vvvvvwi = jQuery("#jform_add_license input[type='radio']:checked").val();
- vvvvvwi(add_license_vvvvvwi);
+ var add_sales_server_vvvvvwi = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
+ vvvvvwi(add_sales_server_vvvvvwi);
- var add_php_postflight_install_vvvvvwj = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
- vvvvvwj(add_php_postflight_install_vvvvvwj);
+ var add_license_vvvvvwj = jQuery("#jform_add_license input[type='radio']:checked").val();
+ vvvvvwj(add_license_vvvvvwj);
- var add_php_postflight_update_vvvvvwk = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
- vvvvvwk(add_php_postflight_update_vvvvvwk);
+ var add_php_postflight_install_vvvvvwk = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
+ vvvvvwk(add_php_postflight_install_vvvvvwk);
- var add_php_method_uninstall_vvvvvwl = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
- vvvvvwl(add_php_method_uninstall_vvvvvwl);
+ var add_php_postflight_update_vvvvvwl = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
+ vvvvvwl(add_php_postflight_update_vvvvvwl);
- var add_php_preflight_install_vvvvvwm = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
- vvvvvwm(add_php_preflight_install_vvvvvwm);
+ var add_php_method_uninstall_vvvvvwm = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
+ vvvvvwm(add_php_method_uninstall_vvvvvwm);
- var add_php_preflight_update_vvvvvwn = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
- vvvvvwn(add_php_preflight_update_vvvvvwn);
+ var add_php_preflight_install_vvvvvwn = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
+ vvvvvwn(add_php_preflight_install_vvvvvwn);
- var update_server_target_vvvvvwo = jQuery("#jform_update_server_target input[type='radio']:checked").val();
- var add_update_server_vvvvvwo = jQuery("#jform_add_update_server input[type='radio']:checked").val();
- vvvvvwo(update_server_target_vvvvvwo,add_update_server_vvvvvwo);
+ var add_php_preflight_update_vvvvvwo = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
+ vvvvvwo(add_php_preflight_update_vvvvvwo);
- var add_update_server_vvvvvwp = jQuery("#jform_add_update_server input[type='radio']:checked").val();
var update_server_target_vvvvvwp = jQuery("#jform_update_server_target input[type='radio']:checked").val();
- vvvvvwp(add_update_server_vvvvvwp,update_server_target_vvvvvwp);
+ var add_update_server_vvvvvwp = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+ vvvvvwp(update_server_target_vvvvvwp,add_update_server_vvvvvwp);
- var update_server_target_vvvvvwq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
var add_update_server_vvvvvwq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
- vvvvvwq(update_server_target_vvvvvwq,add_update_server_vvvvvwq);
+ var update_server_target_vvvvvwq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+ vvvvvwq(add_update_server_vvvvvwq,update_server_target_vvvvvwq);
- var update_server_target_vvvvvws = jQuery("#jform_update_server_target input[type='radio']:checked").val();
- var add_update_server_vvvvvws = jQuery("#jform_add_update_server input[type='radio']:checked").val();
- vvvvvws(update_server_target_vvvvvws,add_update_server_vvvvvws);
+ var update_server_target_vvvvvwr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+ var add_update_server_vvvvvwr = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+ vvvvvwr(update_server_target_vvvvvwr,add_update_server_vvvvvwr);
- var add_update_server_vvvvvwu = jQuery("#jform_add_update_server input[type='radio']:checked").val();
- vvvvvwu(add_update_server_vvvvvwu);
+ var update_server_target_vvvvvwt = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+ var add_update_server_vvvvvwt = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+ vvvvvwt(update_server_target_vvvvvwt,add_update_server_vvvvvwt);
- var buildcomp_vvvvvwv = jQuery("#jform_buildcomp input[type='radio']:checked").val();
- vvvvvwv(buildcomp_vvvvvwv);
+ var add_update_server_vvvvvwv = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+ vvvvvwv(add_update_server_vvvvvwv);
+
+ var buildcomp_vvvvvww = jQuery("#jform_buildcomp input[type='radio']:checked").val();
+ vvvvvww(buildcomp_vvvvvww);
});
// the vvvvvvv function
@@ -218,103 +222,134 @@ function vvvvvvx(add_php_helper_both_vvvvvvx)
}
// the vvvvvvy function
-function vvvvvvy(add_css_vvvvvvy)
+function vvvvvvy(add_css_admin_vvvvvvy)
{
// set the function logic
- if (add_css_vvvvvvy == 1)
+ if (add_css_admin_vvvvvvy == 1)
{
- jQuery('#jform_css').closest('.control-group').show();
+ jQuery('#jform_css_admin').closest('.control-group').show();
if (jform_vvvvvvyvvy_required)
{
- updateFieldRequired('css',0);
- jQuery('#jform_css').prop('required','required');
- jQuery('#jform_css').attr('aria-required',true);
- jQuery('#jform_css').addClass('required');
+ updateFieldRequired('css_admin',0);
+ jQuery('#jform_css_admin').prop('required','required');
+ jQuery('#jform_css_admin').attr('aria-required',true);
+ jQuery('#jform_css_admin').addClass('required');
jform_vvvvvvyvvy_required = false;
}
}
else
{
- jQuery('#jform_css').closest('.control-group').hide();
+ jQuery('#jform_css_admin').closest('.control-group').hide();
if (!jform_vvvvvvyvvy_required)
{
- updateFieldRequired('css',1);
- jQuery('#jform_css').removeAttr('required');
- jQuery('#jform_css').removeAttr('aria-required');
- jQuery('#jform_css').removeClass('required');
+ updateFieldRequired('css_admin',1);
+ jQuery('#jform_css_admin').removeAttr('required');
+ jQuery('#jform_css_admin').removeAttr('aria-required');
+ jQuery('#jform_css_admin').removeClass('required');
jform_vvvvvvyvvy_required = true;
}
}
}
// the vvvvvvz function
-function vvvvvvz(add_javascript_vvvvvvz)
+function vvvvvvz(add_css_site_vvvvvvz)
{
// set the function logic
- if (add_javascript_vvvvvvz == 1)
+ if (add_css_site_vvvvvvz == 1)
{
- jQuery('#jform_javascript').closest('.control-group').show();
+ jQuery('#jform_css_site').closest('.control-group').show();
if (jform_vvvvvvzvvz_required)
{
- updateFieldRequired('javascript',0);
- jQuery('#jform_javascript').prop('required','required');
- jQuery('#jform_javascript').attr('aria-required',true);
- jQuery('#jform_javascript').addClass('required');
+ updateFieldRequired('css_site',0);
+ jQuery('#jform_css_site').prop('required','required');
+ jQuery('#jform_css_site').attr('aria-required',true);
+ jQuery('#jform_css_site').addClass('required');
jform_vvvvvvzvvz_required = false;
}
}
else
{
- jQuery('#jform_javascript').closest('.control-group').hide();
+ jQuery('#jform_css_site').closest('.control-group').hide();
if (!jform_vvvvvvzvvz_required)
{
- updateFieldRequired('javascript',1);
- jQuery('#jform_javascript').removeAttr('required');
- jQuery('#jform_javascript').removeAttr('aria-required');
- jQuery('#jform_javascript').removeClass('required');
+ updateFieldRequired('css_site',1);
+ jQuery('#jform_css_site').removeAttr('required');
+ jQuery('#jform_css_site').removeAttr('aria-required');
+ jQuery('#jform_css_site').removeClass('required');
jform_vvvvvvzvvz_required = true;
}
}
}
// the vvvvvwa function
-function vvvvvwa(add_sql_vvvvvwa)
+function vvvvvwa(add_javascript_vvvvvwa)
{
// set the function logic
- if (add_sql_vvvvvwa == 1)
+ if (add_javascript_vvvvvwa == 1)
{
- jQuery('#jform_sql').closest('.control-group').show();
+ jQuery('#jform_javascript').closest('.control-group').show();
if (jform_vvvvvwavwa_required)
{
- updateFieldRequired('sql',0);
- jQuery('#jform_sql').prop('required','required');
- jQuery('#jform_sql').attr('aria-required',true);
- jQuery('#jform_sql').addClass('required');
+ updateFieldRequired('javascript',0);
+ jQuery('#jform_javascript').prop('required','required');
+ jQuery('#jform_javascript').attr('aria-required',true);
+ jQuery('#jform_javascript').addClass('required');
jform_vvvvvwavwa_required = false;
}
}
else
{
- jQuery('#jform_sql').closest('.control-group').hide();
+ jQuery('#jform_javascript').closest('.control-group').hide();
if (!jform_vvvvvwavwa_required)
{
- updateFieldRequired('sql',1);
- jQuery('#jform_sql').removeAttr('required');
- jQuery('#jform_sql').removeAttr('aria-required');
- jQuery('#jform_sql').removeClass('required');
+ updateFieldRequired('javascript',1);
+ jQuery('#jform_javascript').removeAttr('required');
+ jQuery('#jform_javascript').removeAttr('aria-required');
+ jQuery('#jform_javascript').removeClass('required');
jform_vvvvvwavwa_required = true;
}
}
}
// the vvvvvwb function
-function vvvvvwb(emptycontributors_vvvvvwb)
+function vvvvvwb(add_sql_vvvvvwb)
{
// set the function logic
- if (emptycontributors_vvvvvwb == 1)
+ if (add_sql_vvvvvwb == 1)
+ {
+ jQuery('#jform_sql').closest('.control-group').show();
+ if (jform_vvvvvwbvwb_required)
+ {
+ updateFieldRequired('sql',0);
+ jQuery('#jform_sql').prop('required','required');
+ jQuery('#jform_sql').attr('aria-required',true);
+ jQuery('#jform_sql').addClass('required');
+ jform_vvvvvwbvwb_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_sql').closest('.control-group').hide();
+ if (!jform_vvvvvwbvwb_required)
+ {
+ updateFieldRequired('sql',1);
+ jQuery('#jform_sql').removeAttr('required');
+ jQuery('#jform_sql').removeAttr('aria-required');
+ jQuery('#jform_sql').removeClass('required');
+ jform_vvvvvwbvwb_required = true;
+ }
+ }
+}
+
+// the vvvvvwc function
+function vvvvvwc(emptycontributors_vvvvvwc)
+{
+ // set the function logic
+ if (emptycontributors_vvvvvwc == 1)
{
jQuery('#jform_number').closest('.control-group').show();
}
@@ -324,114 +359,114 @@ function vvvvvwb(emptycontributors_vvvvvwb)
}
}
-// the vvvvvwc function
-function vvvvvwc(add_license_vvvvvwc)
+// the vvvvvwd function
+function vvvvvwd(add_license_vvvvvwd)
{
// set the function logic
- if (add_license_vvvvvwc == 1)
+ if (add_license_vvvvvwd == 1)
{
jQuery('#jform_license_type').closest('.control-group').show();
- if (jform_vvvvvwcvwb_required)
+ if (jform_vvvvvwdvwc_required)
{
updateFieldRequired('license_type',0);
jQuery('#jform_license_type').prop('required','required');
jQuery('#jform_license_type').attr('aria-required',true);
jQuery('#jform_license_type').addClass('required');
- jform_vvvvvwcvwb_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_license_type').closest('.control-group').hide();
- if (!jform_vvvvvwcvwb_required)
- {
- updateFieldRequired('license_type',1);
- jQuery('#jform_license_type').removeAttr('required');
- jQuery('#jform_license_type').removeAttr('aria-required');
- jQuery('#jform_license_type').removeClass('required');
- jform_vvvvvwcvwb_required = true;
- }
- }
-}
-
-// the vvvvvwd function
-function vvvvvwd(add_admin_event_vvvvvwd)
-{
- // set the function logic
- if (add_admin_event_vvvvvwd == 1)
- {
- jQuery('#jform_php_admin_event').closest('.control-group').show();
- if (jform_vvvvvwdvwc_required)
- {
- updateFieldRequired('php_admin_event',0);
- jQuery('#jform_php_admin_event').prop('required','required');
- jQuery('#jform_php_admin_event').attr('aria-required',true);
- jQuery('#jform_php_admin_event').addClass('required');
jform_vvvvvwdvwc_required = false;
}
}
else
{
- jQuery('#jform_php_admin_event').closest('.control-group').hide();
+ jQuery('#jform_license_type').closest('.control-group').hide();
if (!jform_vvvvvwdvwc_required)
{
- updateFieldRequired('php_admin_event',1);
- jQuery('#jform_php_admin_event').removeAttr('required');
- jQuery('#jform_php_admin_event').removeAttr('aria-required');
- jQuery('#jform_php_admin_event').removeClass('required');
+ updateFieldRequired('license_type',1);
+ jQuery('#jform_license_type').removeAttr('required');
+ jQuery('#jform_license_type').removeAttr('aria-required');
+ jQuery('#jform_license_type').removeClass('required');
jform_vvvvvwdvwc_required = true;
}
}
}
// the vvvvvwe function
-function vvvvvwe(add_site_event_vvvvvwe)
+function vvvvvwe(add_admin_event_vvvvvwe)
{
// set the function logic
- if (add_site_event_vvvvvwe == 1)
+ if (add_admin_event_vvvvvwe == 1)
{
- jQuery('#jform_php_site_event').closest('.control-group').show();
+ jQuery('#jform_php_admin_event').closest('.control-group').show();
if (jform_vvvvvwevwd_required)
{
- updateFieldRequired('php_site_event',0);
- jQuery('#jform_php_site_event').prop('required','required');
- jQuery('#jform_php_site_event').attr('aria-required',true);
- jQuery('#jform_php_site_event').addClass('required');
+ updateFieldRequired('php_admin_event',0);
+ jQuery('#jform_php_admin_event').prop('required','required');
+ jQuery('#jform_php_admin_event').attr('aria-required',true);
+ jQuery('#jform_php_admin_event').addClass('required');
jform_vvvvvwevwd_required = false;
}
}
else
{
- jQuery('#jform_php_site_event').closest('.control-group').hide();
+ jQuery('#jform_php_admin_event').closest('.control-group').hide();
if (!jform_vvvvvwevwd_required)
{
- updateFieldRequired('php_site_event',1);
- jQuery('#jform_php_site_event').removeAttr('required');
- jQuery('#jform_php_site_event').removeAttr('aria-required');
- jQuery('#jform_php_site_event').removeClass('required');
+ updateFieldRequired('php_admin_event',1);
+ jQuery('#jform_php_admin_event').removeAttr('required');
+ jQuery('#jform_php_admin_event').removeAttr('aria-required');
+ jQuery('#jform_php_admin_event').removeClass('required');
jform_vvvvvwevwd_required = true;
}
}
}
// the vvvvvwf function
-function vvvvvwf(addreadme_vvvvvwf)
+function vvvvvwf(add_site_event_vvvvvwf)
{
// set the function logic
- if (addreadme_vvvvvwf == 1)
+ if (add_site_event_vvvvvwf == 1)
+ {
+ jQuery('#jform_php_site_event').closest('.control-group').show();
+ if (jform_vvvvvwfvwe_required)
+ {
+ updateFieldRequired('php_site_event',0);
+ jQuery('#jform_php_site_event').prop('required','required');
+ jQuery('#jform_php_site_event').attr('aria-required',true);
+ jQuery('#jform_php_site_event').addClass('required');
+ jform_vvvvvwfvwe_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_php_site_event').closest('.control-group').hide();
+ if (!jform_vvvvvwfvwe_required)
+ {
+ updateFieldRequired('php_site_event',1);
+ jQuery('#jform_php_site_event').removeAttr('required');
+ jQuery('#jform_php_site_event').removeAttr('aria-required');
+ jQuery('#jform_php_site_event').removeClass('required');
+ jform_vvvvvwfvwe_required = true;
+ }
+ }
+}
+
+// the vvvvvwg function
+function vvvvvwg(addreadme_vvvvvwg)
+{
+ // set the function logic
+ if (addreadme_vvvvvwg == 1)
{
jQuery('.note_readme').closest('.control-group').show();
jQuery('#jform_readme-lbl').closest('.control-group').show();
- if (jform_vvvvvwfvwe_required)
+ if (jform_vvvvvwgvwf_required)
{
updateFieldRequired('readme',0);
jQuery('#jform_readme').prop('required','required');
jQuery('#jform_readme').attr('aria-required',true);
jQuery('#jform_readme').addClass('required');
- jform_vvvvvwfvwe_required = false;
+ jform_vvvvvwgvwf_required = false;
}
}
@@ -439,22 +474,22 @@ function vvvvvwf(addreadme_vvvvvwf)
{
jQuery('.note_readme').closest('.control-group').hide();
jQuery('#jform_readme-lbl').closest('.control-group').hide();
- if (!jform_vvvvvwfvwe_required)
+ if (!jform_vvvvvwgvwf_required)
{
updateFieldRequired('readme',1);
jQuery('#jform_readme').removeAttr('required');
jQuery('#jform_readme').removeAttr('aria-required');
jQuery('#jform_readme').removeClass('required');
- jform_vvvvvwfvwe_required = true;
+ jform_vvvvvwgvwf_required = true;
}
}
}
-// the vvvvvwg function
-function vvvvvwg(add_update_server_vvvvvwg)
+// the vvvvvwh function
+function vvvvvwh(add_update_server_vvvvvwh)
{
// set the function logic
- if (add_update_server_vvvvvwg == 1)
+ if (add_update_server_vvvvvwh == 1)
{
jQuery('#jform_update_server').closest('.control-group').show();
}
@@ -464,11 +499,11 @@ function vvvvvwg(add_update_server_vvvvvwg)
}
}
-// the vvvvvwh function
-function vvvvvwh(add_sales_server_vvvvvwh)
+// the vvvvvwi function
+function vvvvvwi(add_sales_server_vvvvvwi)
{
// set the function logic
- if (add_sales_server_vvvvvwh == 1)
+ if (add_sales_server_vvvvvwi == 1)
{
jQuery('#jform_sales_server_ftp').closest('.control-group').show();
}
@@ -478,11 +513,11 @@ function vvvvvwh(add_sales_server_vvvvvwh)
}
}
-// the vvvvvwi function
-function vvvvvwi(add_license_vvvvvwi)
+// the vvvvvwj function
+function vvvvvwj(add_license_vvvvvwj)
{
// set the function logic
- if (add_license_vvvvvwi == 1)
+ if (add_license_vvvvvwj == 1)
{
jQuery('.note_whmcs_lisencing_note').closest('.control-group').show();
jQuery('#jform_whmcs_key').closest('.control-group').show();
@@ -496,182 +531,166 @@ function vvvvvwi(add_license_vvvvvwi)
}
}
-// the vvvvvwj function
-function vvvvvwj(add_php_postflight_install_vvvvvwj)
+// the vvvvvwk function
+function vvvvvwk(add_php_postflight_install_vvvvvwk)
{
// set the function logic
- if (add_php_postflight_install_vvvvvwj == 1)
+ if (add_php_postflight_install_vvvvvwk == 1)
{
jQuery('#jform_php_postflight_install').closest('.control-group').show();
- if (jform_vvvvvwjvwf_required)
+ if (jform_vvvvvwkvwg_required)
{
updateFieldRequired('php_postflight_install',0);
jQuery('#jform_php_postflight_install').prop('required','required');
jQuery('#jform_php_postflight_install').attr('aria-required',true);
jQuery('#jform_php_postflight_install').addClass('required');
- jform_vvvvvwjvwf_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_php_postflight_install').closest('.control-group').hide();
- if (!jform_vvvvvwjvwf_required)
- {
- updateFieldRequired('php_postflight_install',1);
- jQuery('#jform_php_postflight_install').removeAttr('required');
- jQuery('#jform_php_postflight_install').removeAttr('aria-required');
- jQuery('#jform_php_postflight_install').removeClass('required');
- jform_vvvvvwjvwf_required = true;
- }
- }
-}
-
-// the vvvvvwk function
-function vvvvvwk(add_php_postflight_update_vvvvvwk)
-{
- // set the function logic
- if (add_php_postflight_update_vvvvvwk == 1)
- {
- jQuery('#jform_php_postflight_update').closest('.control-group').show();
- if (jform_vvvvvwkvwg_required)
- {
- updateFieldRequired('php_postflight_update',0);
- jQuery('#jform_php_postflight_update').prop('required','required');
- jQuery('#jform_php_postflight_update').attr('aria-required',true);
- jQuery('#jform_php_postflight_update').addClass('required');
jform_vvvvvwkvwg_required = false;
}
}
else
{
- jQuery('#jform_php_postflight_update').closest('.control-group').hide();
+ jQuery('#jform_php_postflight_install').closest('.control-group').hide();
if (!jform_vvvvvwkvwg_required)
{
- updateFieldRequired('php_postflight_update',1);
- jQuery('#jform_php_postflight_update').removeAttr('required');
- jQuery('#jform_php_postflight_update').removeAttr('aria-required');
- jQuery('#jform_php_postflight_update').removeClass('required');
+ updateFieldRequired('php_postflight_install',1);
+ jQuery('#jform_php_postflight_install').removeAttr('required');
+ jQuery('#jform_php_postflight_install').removeAttr('aria-required');
+ jQuery('#jform_php_postflight_install').removeClass('required');
jform_vvvvvwkvwg_required = true;
}
}
}
// the vvvvvwl function
-function vvvvvwl(add_php_method_uninstall_vvvvvwl)
+function vvvvvwl(add_php_postflight_update_vvvvvwl)
{
// set the function logic
- if (add_php_method_uninstall_vvvvvwl == 1)
+ if (add_php_postflight_update_vvvvvwl == 1)
{
- jQuery('#jform_php_method_uninstall').closest('.control-group').show();
+ jQuery('#jform_php_postflight_update').closest('.control-group').show();
if (jform_vvvvvwlvwh_required)
{
- updateFieldRequired('php_method_uninstall',0);
- jQuery('#jform_php_method_uninstall').prop('required','required');
- jQuery('#jform_php_method_uninstall').attr('aria-required',true);
- jQuery('#jform_php_method_uninstall').addClass('required');
+ updateFieldRequired('php_postflight_update',0);
+ jQuery('#jform_php_postflight_update').prop('required','required');
+ jQuery('#jform_php_postflight_update').attr('aria-required',true);
+ jQuery('#jform_php_postflight_update').addClass('required');
jform_vvvvvwlvwh_required = false;
}
}
else
{
- jQuery('#jform_php_method_uninstall').closest('.control-group').hide();
+ jQuery('#jform_php_postflight_update').closest('.control-group').hide();
if (!jform_vvvvvwlvwh_required)
{
- updateFieldRequired('php_method_uninstall',1);
- jQuery('#jform_php_method_uninstall').removeAttr('required');
- jQuery('#jform_php_method_uninstall').removeAttr('aria-required');
- jQuery('#jform_php_method_uninstall').removeClass('required');
+ updateFieldRequired('php_postflight_update',1);
+ jQuery('#jform_php_postflight_update').removeAttr('required');
+ jQuery('#jform_php_postflight_update').removeAttr('aria-required');
+ jQuery('#jform_php_postflight_update').removeClass('required');
jform_vvvvvwlvwh_required = true;
}
}
}
// the vvvvvwm function
-function vvvvvwm(add_php_preflight_install_vvvvvwm)
+function vvvvvwm(add_php_method_uninstall_vvvvvwm)
{
// set the function logic
- if (add_php_preflight_install_vvvvvwm == 1)
+ if (add_php_method_uninstall_vvvvvwm == 1)
{
- jQuery('#jform_php_preflight_install').closest('.control-group').show();
+ jQuery('#jform_php_method_uninstall').closest('.control-group').show();
if (jform_vvvvvwmvwi_required)
{
- updateFieldRequired('php_preflight_install',0);
- jQuery('#jform_php_preflight_install').prop('required','required');
- jQuery('#jform_php_preflight_install').attr('aria-required',true);
- jQuery('#jform_php_preflight_install').addClass('required');
+ updateFieldRequired('php_method_uninstall',0);
+ jQuery('#jform_php_method_uninstall').prop('required','required');
+ jQuery('#jform_php_method_uninstall').attr('aria-required',true);
+ jQuery('#jform_php_method_uninstall').addClass('required');
jform_vvvvvwmvwi_required = false;
}
}
else
{
- jQuery('#jform_php_preflight_install').closest('.control-group').hide();
+ jQuery('#jform_php_method_uninstall').closest('.control-group').hide();
if (!jform_vvvvvwmvwi_required)
{
- updateFieldRequired('php_preflight_install',1);
- jQuery('#jform_php_preflight_install').removeAttr('required');
- jQuery('#jform_php_preflight_install').removeAttr('aria-required');
- jQuery('#jform_php_preflight_install').removeClass('required');
+ updateFieldRequired('php_method_uninstall',1);
+ jQuery('#jform_php_method_uninstall').removeAttr('required');
+ jQuery('#jform_php_method_uninstall').removeAttr('aria-required');
+ jQuery('#jform_php_method_uninstall').removeClass('required');
jform_vvvvvwmvwi_required = true;
}
}
}
// the vvvvvwn function
-function vvvvvwn(add_php_preflight_update_vvvvvwn)
+function vvvvvwn(add_php_preflight_install_vvvvvwn)
{
// set the function logic
- if (add_php_preflight_update_vvvvvwn == 1)
+ if (add_php_preflight_install_vvvvvwn == 1)
{
- jQuery('#jform_php_preflight_update').closest('.control-group').show();
+ jQuery('#jform_php_preflight_install').closest('.control-group').show();
if (jform_vvvvvwnvwj_required)
{
- updateFieldRequired('php_preflight_update',0);
- jQuery('#jform_php_preflight_update').prop('required','required');
- jQuery('#jform_php_preflight_update').attr('aria-required',true);
- jQuery('#jform_php_preflight_update').addClass('required');
+ updateFieldRequired('php_preflight_install',0);
+ jQuery('#jform_php_preflight_install').prop('required','required');
+ jQuery('#jform_php_preflight_install').attr('aria-required',true);
+ jQuery('#jform_php_preflight_install').addClass('required');
jform_vvvvvwnvwj_required = false;
}
}
else
{
- jQuery('#jform_php_preflight_update').closest('.control-group').hide();
+ jQuery('#jform_php_preflight_install').closest('.control-group').hide();
if (!jform_vvvvvwnvwj_required)
{
- updateFieldRequired('php_preflight_update',1);
- jQuery('#jform_php_preflight_update').removeAttr('required');
- jQuery('#jform_php_preflight_update').removeAttr('aria-required');
- jQuery('#jform_php_preflight_update').removeClass('required');
+ updateFieldRequired('php_preflight_install',1);
+ jQuery('#jform_php_preflight_install').removeAttr('required');
+ jQuery('#jform_php_preflight_install').removeAttr('aria-required');
+ jQuery('#jform_php_preflight_install').removeClass('required');
jform_vvvvvwnvwj_required = true;
}
}
}
// the vvvvvwo function
-function vvvvvwo(update_server_target_vvvvvwo,add_update_server_vvvvvwo)
+function vvvvvwo(add_php_preflight_update_vvvvvwo)
{
// set the function logic
- if (update_server_target_vvvvvwo == 1 && add_update_server_vvvvvwo == 1)
+ if (add_php_preflight_update_vvvvvwo == 1)
{
- jQuery('#jform_update_server_ftp').closest('.control-group').show();
- jQuery('.note_update_server_note_ftp').closest('.control-group').show();
+ jQuery('#jform_php_preflight_update').closest('.control-group').show();
+ if (jform_vvvvvwovwk_required)
+ {
+ updateFieldRequired('php_preflight_update',0);
+ jQuery('#jform_php_preflight_update').prop('required','required');
+ jQuery('#jform_php_preflight_update').attr('aria-required',true);
+ jQuery('#jform_php_preflight_update').addClass('required');
+ jform_vvvvvwovwk_required = false;
+ }
+
}
else
{
- jQuery('#jform_update_server_ftp').closest('.control-group').hide();
- jQuery('.note_update_server_note_ftp').closest('.control-group').hide();
+ jQuery('#jform_php_preflight_update').closest('.control-group').hide();
+ if (!jform_vvvvvwovwk_required)
+ {
+ updateFieldRequired('php_preflight_update',1);
+ jQuery('#jform_php_preflight_update').removeAttr('required');
+ jQuery('#jform_php_preflight_update').removeAttr('aria-required');
+ jQuery('#jform_php_preflight_update').removeClass('required');
+ jform_vvvvvwovwk_required = true;
+ }
}
}
// the vvvvvwp function
-function vvvvvwp(add_update_server_vvvvvwp,update_server_target_vvvvvwp)
+function vvvvvwp(update_server_target_vvvvvwp,add_update_server_vvvvvwp)
{
// set the function logic
- if (add_update_server_vvvvvwp == 1 && update_server_target_vvvvvwp == 1)
+ if (update_server_target_vvvvvwp == 1 && add_update_server_vvvvvwp == 1)
{
jQuery('#jform_update_server_ftp').closest('.control-group').show();
jQuery('.note_update_server_note_ftp').closest('.control-group').show();
@@ -684,10 +703,26 @@ function vvvvvwp(add_update_server_vvvvvwp,update_server_target_vvvvvwp)
}
// the vvvvvwq function
-function vvvvvwq(update_server_target_vvvvvwq,add_update_server_vvvvvwq)
+function vvvvvwq(add_update_server_vvvvvwq,update_server_target_vvvvvwq)
{
// set the function logic
- if (update_server_target_vvvvvwq == 2 && add_update_server_vvvvvwq == 1)
+ if (add_update_server_vvvvvwq == 1 && update_server_target_vvvvvwq == 1)
+ {
+ jQuery('#jform_update_server_ftp').closest('.control-group').show();
+ jQuery('.note_update_server_note_ftp').closest('.control-group').show();
+ }
+ else
+ {
+ jQuery('#jform_update_server_ftp').closest('.control-group').hide();
+ jQuery('.note_update_server_note_ftp').closest('.control-group').hide();
+ }
+}
+
+// the vvvvvwr function
+function vvvvvwr(update_server_target_vvvvvwr,add_update_server_vvvvvwr)
+{
+ // set the function logic
+ if (update_server_target_vvvvvwr == 2 && add_update_server_vvvvvwr == 1)
{
jQuery('.note_update_server_note_zip').closest('.control-group').show();
}
@@ -697,11 +732,11 @@ function vvvvvwq(update_server_target_vvvvvwq,add_update_server_vvvvvwq)
}
}
-// the vvvvvws function
-function vvvvvws(update_server_target_vvvvvws,add_update_server_vvvvvws)
+// the vvvvvwt function
+function vvvvvwt(update_server_target_vvvvvwt,add_update_server_vvvvvwt)
{
// set the function logic
- if (update_server_target_vvvvvws == 3 && add_update_server_vvvvvws == 1)
+ if (update_server_target_vvvvvwt == 3 && add_update_server_vvvvvwt == 1)
{
jQuery('.note_update_server_note_other').closest('.control-group').show();
}
@@ -711,64 +746,64 @@ function vvvvvws(update_server_target_vvvvvws,add_update_server_vvvvvws)
}
}
-// the vvvvvwu function
-function vvvvvwu(add_update_server_vvvvvwu)
+// the vvvvvwv function
+function vvvvvwv(add_update_server_vvvvvwv)
{
// set the function logic
- if (add_update_server_vvvvvwu == 1)
+ if (add_update_server_vvvvvwv == 1)
{
jQuery('#jform_update_server_target').closest('.control-group').show();
- if (jform_vvvvvwuvwk_required)
+ if (jform_vvvvvwvvwl_required)
{
updateFieldRequired('update_server_target',0);
jQuery('#jform_update_server_target').prop('required','required');
jQuery('#jform_update_server_target').attr('aria-required',true);
jQuery('#jform_update_server_target').addClass('required');
- jform_vvvvvwuvwk_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_update_server_target').closest('.control-group').hide();
- if (!jform_vvvvvwuvwk_required)
- {
- updateFieldRequired('update_server_target',1);
- jQuery('#jform_update_server_target').removeAttr('required');
- jQuery('#jform_update_server_target').removeAttr('aria-required');
- jQuery('#jform_update_server_target').removeClass('required');
- jform_vvvvvwuvwk_required = true;
- }
- }
-}
-
-// the vvvvvwv function
-function vvvvvwv(buildcomp_vvvvvwv)
-{
- // set the function logic
- if (buildcomp_vvvvvwv == 1)
- {
- jQuery('#jform_buildcompsql').closest('.control-group').show();
- if (jform_vvvvvwvvwl_required)
- {
- updateFieldRequired('buildcompsql',0);
- jQuery('#jform_buildcompsql').prop('required','required');
- jQuery('#jform_buildcompsql').attr('aria-required',true);
- jQuery('#jform_buildcompsql').addClass('required');
jform_vvvvvwvvwl_required = false;
}
}
else
{
- jQuery('#jform_buildcompsql').closest('.control-group').hide();
+ jQuery('#jform_update_server_target').closest('.control-group').hide();
if (!jform_vvvvvwvvwl_required)
+ {
+ updateFieldRequired('update_server_target',1);
+ jQuery('#jform_update_server_target').removeAttr('required');
+ jQuery('#jform_update_server_target').removeAttr('aria-required');
+ jQuery('#jform_update_server_target').removeClass('required');
+ jform_vvvvvwvvwl_required = true;
+ }
+ }
+}
+
+// the vvvvvww function
+function vvvvvww(buildcomp_vvvvvww)
+{
+ // set the function logic
+ if (buildcomp_vvvvvww == 1)
+ {
+ jQuery('#jform_buildcompsql').closest('.control-group').show();
+ if (jform_vvvvvwwvwm_required)
+ {
+ updateFieldRequired('buildcompsql',0);
+ jQuery('#jform_buildcompsql').prop('required','required');
+ jQuery('#jform_buildcompsql').attr('aria-required',true);
+ jQuery('#jform_buildcompsql').addClass('required');
+ jform_vvvvvwwvwm_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_buildcompsql').closest('.control-group').hide();
+ if (!jform_vvvvvwwvwm_required)
{
updateFieldRequired('buildcompsql',1);
jQuery('#jform_buildcompsql').removeAttr('required');
jQuery('#jform_buildcompsql').removeAttr('aria-required');
jQuery('#jform_buildcompsql').removeClass('required');
- jform_vvvvvwvvwl_required = true;
+ jform_vvvvvwwvwm_required = true;
}
}
}
diff --git a/admin/models/forms/joomla_component.xml b/admin/models/forms/joomla_component.xml
index 029b737f3..ff5c295e3 100644
--- a/admin/models/forms/joomla_component.xml
+++ b/admin/models/forms/joomla_component.xml
@@ -169,10 +169,27 @@
filter="HTML"
message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_MESSAGE"
hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_HINT" />
-
+
+
+
+
+
@@ -180,19 +197,6 @@
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
-
-
-
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_ONLY_FIRST_TWO_NUMBER_OF_GLOBAL_VERSION_ONEZEROX
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_ONLY_FIRST_NUMBER_OF_GLOBAL_VERSION_ONEXX
-
+
-
+
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
+
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_FOOTABLE_VTHREE
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_FOOTABLE_VTWO
-
+
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
-
+
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_FTP
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ZIP
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OTHER
+
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LOCK_DOWN_USE_USED_TO_VERIFY_OWNERSHIP
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE
-
+
@@ -486,17 +496,13 @@
description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_DESCRIPTION"
heading="h4"
class="alert alert-success note_whmcs_lisencing_note" />
-
-
+
+
-
+
-
+
-
-
+
-
+
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_FTP
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ZIP
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OTHER
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
+
+
+
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
+
+
+
+
-
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
-
-
-
-
-
+
-
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
+
+
-
+
@@ -851,10 +857,10 @@
description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JCB_EXPORT_PACKAGE_NOTE_DESCRIPTION"
heading="h4"
class="alert alert-info jcb_export_package_note" />
-
+
@@ -874,10 +880,10 @@
filter="STRING"
message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_MESSAGE"
hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_HINT" />
-
+
@@ -898,10 +904,10 @@
validated="url"
message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_PACKAGE_LINK_MESSAGE"
hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_PACKAGE_LINK_HINT" />
-
+
@@ -922,10 +928,10 @@
validated="url"
message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_MESSAGE"
hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_HINT" />
-
+
@@ -938,12 +944,13 @@
name="spacer_hr_f"
hr="true"
class="spacer_hr_f" />
-
+
+ default="0"
+ required="true">
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
@@ -955,13 +962,16 @@
description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CONTRIBUTORS_DESCRIPTION"
heading="h4"
class="alert alert-info note_on_contributors" />
-
-
+
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
+
+
+
+
+
+
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
+ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
+
-
-
-
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
- COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
-
-
-
+
+ class="alert alert-success note_update_server_note_ftp" />
+
+
+
+
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES
COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO
-
-
-
-
+
+
+
+
0 && type > 0){
+ var request = 'token='+token+'&type='+type;
+ }
+ return jQuery.ajax({
+ type: 'GET',
+ url: getUrl,
+ dataType: 'jsonp',
+ data: request,
+ jsonp: 'callback'
+ });
+}
+
+function getLinked(){
+ getLinked_server(1).done(function(result) {
+ if(result){
+ jQuery('#display_linked_to').html(result);
+ }
+ });
+}
function getAjaxDisplay(type){
getAjaxDisplay_server(type).done(function(result) {
diff --git a/admin/models/forms/library.xml b/admin/models/forms/library.xml
index 413a67a95..480607398 100644
--- a/admin/models/forms/library.xml
+++ b/admin/models/forms/library.xml
@@ -136,6 +136,11 @@
description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_DESCRIPTION"
heading="h4"
class="alert alert-success note_yes_behaviour_one" />
+
+
-
+
+ class="alert alert-error note_no_behaviour_three" />
-
+
+ class="alert alert-success note_yes_behaviour_two" />
-
+
+ class="alert alert-error note_no_behaviour_one" />
-
+
+ class="alert alert-success note_build_in_behaviour_three" />
-
+
-
-
-
-
-
-
+ class="alert alert-error note_no_behaviour_two" />
+
+
+
+
+
+
diff --git a/admin/models/forms/site_view.js b/admin/models/forms/site_view.js
index 44de5ecdf..1d7efc88f 100644
--- a/admin/models/forms/site_view.js
+++ b/admin/models/forms/site_view.js
@@ -23,8 +23,6 @@
/-----------------------------------------------------------------------------------------------------------------------------*/
// Some Global Values
-jform_vvvvvyjvyf_required = false;
-jform_vvvvvykvyg_required = false;
jform_vvvvvylvyh_required = false;
jform_vvvvvymvyi_required = false;
jform_vvvvvynvyj_required = false;
@@ -33,308 +31,310 @@ jform_vvvvvypvyl_required = false;
jform_vvvvvyqvym_required = false;
jform_vvvvvyrvyn_required = false;
jform_vvvvvysvyo_required = false;
-jform_vvvvvysvyp_required = false;
+jform_vvvvvytvyp_required = false;
+jform_vvvvvyuvyq_required = false;
+jform_vvvvvyuvyr_required = false;
// Initial Script
jQuery(document).ready(function()
{
- var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
- vvvvvyj(add_php_view_vvvvvyj);
+ var add_php_view_vvvvvyl = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+ vvvvvyl(add_php_view_vvvvvyl);
- var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
- vvvvvyk(add_php_jview_display_vvvvvyk);
+ var add_php_jview_display_vvvvvym = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+ vvvvvym(add_php_jview_display_vvvvvym);
- var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
- vvvvvyl(add_php_jview_vvvvvyl);
+ var add_php_jview_vvvvvyn = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+ vvvvvyn(add_php_jview_vvvvvyn);
- var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
- vvvvvym(add_php_document_vvvvvym);
+ var add_php_document_vvvvvyo = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+ vvvvvyo(add_php_document_vvvvvyo);
- var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
- vvvvvyn(add_css_document_vvvvvyn);
+ var add_css_document_vvvvvyp = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+ vvvvvyp(add_css_document_vvvvvyp);
- var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
- vvvvvyo(add_javascript_file_vvvvvyo);
+ var add_javascript_file_vvvvvyq = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+ vvvvvyq(add_javascript_file_vvvvvyq);
- var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
- vvvvvyp(add_js_document_vvvvvyp);
+ var add_js_document_vvvvvyr = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+ vvvvvyr(add_js_document_vvvvvyr);
- var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
- vvvvvyq(add_css_vvvvvyq);
+ var add_css_vvvvvys = jQuery("#jform_add_css input[type='radio']:checked").val();
+ vvvvvys(add_css_vvvvvys);
- var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
- vvvvvyr(add_php_ajax_vvvvvyr);
+ var add_php_ajax_vvvvvyt = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+ vvvvvyt(add_php_ajax_vvvvvyt);
- var add_custom_button_vvvvvys = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
- vvvvvys(add_custom_button_vvvvvys);
+ var add_custom_button_vvvvvyu = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+ vvvvvyu(add_custom_button_vvvvvyu);
- var button_position_vvvvvyt = jQuery("#jform_button_position").val();
- vvvvvyt(button_position_vvvvvyt);
+ var button_position_vvvvvyv = jQuery("#jform_button_position").val();
+ vvvvvyv(button_position_vvvvvyv);
});
-// the vvvvvyj function
-function vvvvvyj(add_php_view_vvvvvyj)
+// the vvvvvyl function
+function vvvvvyl(add_php_view_vvvvvyl)
{
// set the function logic
- if (add_php_view_vvvvvyj == 1)
+ if (add_php_view_vvvvvyl == 1)
{
jQuery('#jform_php_view').closest('.control-group').show();
- if (jform_vvvvvyjvyf_required)
+ if (jform_vvvvvylvyh_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_vvvvvyjvyf_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_php_view').closest('.control-group').hide();
- if (!jform_vvvvvyjvyf_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_vvvvvyjvyf_required = true;
- }
- }
-}
-
-// the vvvvvyk function
-function vvvvvyk(add_php_jview_display_vvvvvyk)
-{
- // set the function logic
- if (add_php_jview_display_vvvvvyk == 1)
- {
- jQuery('#jform_php_jview_display').closest('.control-group').show();
- if (jform_vvvvvykvyg_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_vvvvvykvyg_required = false;
- }
-
- }
- else
- {
- jQuery('#jform_php_jview_display').closest('.control-group').hide();
- if (!jform_vvvvvykvyg_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_vvvvvykvyg_required = true;
- }
- }
-}
-
-// the vvvvvyl function
-function vvvvvyl(add_php_jview_vvvvvyl)
-{
- // set the function logic
- if (add_php_jview_vvvvvyl == 1)
- {
- jQuery('#jform_php_jview').closest('.control-group').show();
- if (jform_vvvvvylvyh_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_vvvvvylvyh_required = false;
}
}
else
{
- jQuery('#jform_php_jview').closest('.control-group').hide();
+ jQuery('#jform_php_view').closest('.control-group').hide();
if (!jform_vvvvvylvyh_required)
{
- updateFieldRequired('php_jview',1);
- jQuery('#jform_php_jview').removeAttr('required');
- jQuery('#jform_php_jview').removeAttr('aria-required');
- jQuery('#jform_php_jview').removeClass('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_vvvvvylvyh_required = true;
}
}
}
// the vvvvvym function
-function vvvvvym(add_php_document_vvvvvym)
+function vvvvvym(add_php_jview_display_vvvvvym)
{
// set the function logic
- if (add_php_document_vvvvvym == 1)
+ if (add_php_jview_display_vvvvvym == 1)
{
- jQuery('#jform_php_document').closest('.control-group').show();
+ jQuery('#jform_php_jview_display').closest('.control-group').show();
if (jform_vvvvvymvyi_required)
{
- updateFieldRequired('php_document',0);
- jQuery('#jform_php_document').prop('required','required');
- jQuery('#jform_php_document').attr('aria-required',true);
- jQuery('#jform_php_document').addClass('required');
+ updateFieldRequired('php_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_vvvvvymvyi_required = false;
}
}
else
{
- jQuery('#jform_php_document').closest('.control-group').hide();
+ jQuery('#jform_php_jview_display').closest('.control-group').hide();
if (!jform_vvvvvymvyi_required)
{
- updateFieldRequired('php_document',1);
- jQuery('#jform_php_document').removeAttr('required');
- jQuery('#jform_php_document').removeAttr('aria-required');
- jQuery('#jform_php_document').removeClass('required');
+ updateFieldRequired('php_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_vvvvvymvyi_required = true;
}
}
}
// the vvvvvyn function
-function vvvvvyn(add_css_document_vvvvvyn)
+function vvvvvyn(add_php_jview_vvvvvyn)
{
// set the function logic
- if (add_css_document_vvvvvyn == 1)
+ if (add_php_jview_vvvvvyn == 1)
{
- jQuery('#jform_css_document').closest('.control-group').show();
+ jQuery('#jform_php_jview').closest('.control-group').show();
if (jform_vvvvvynvyj_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');
+ 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_vvvvvynvyj_required = false;
}
}
else
{
- jQuery('#jform_css_document').closest('.control-group').hide();
+ jQuery('#jform_php_jview').closest('.control-group').hide();
if (!jform_vvvvvynvyj_required)
{
- updateFieldRequired('css_document',1);
- jQuery('#jform_css_document').removeAttr('required');
- jQuery('#jform_css_document').removeAttr('aria-required');
- jQuery('#jform_css_document').removeClass('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_vvvvvynvyj_required = true;
}
}
}
// the vvvvvyo function
-function vvvvvyo(add_javascript_file_vvvvvyo)
+function vvvvvyo(add_php_document_vvvvvyo)
{
// set the function logic
- if (add_javascript_file_vvvvvyo == 1)
+ if (add_php_document_vvvvvyo == 1)
{
- jQuery('#jform_javascript_file').closest('.control-group').show();
+ jQuery('#jform_php_document').closest('.control-group').show();
if (jform_vvvvvyovyk_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');
+ 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_vvvvvyovyk_required = false;
}
}
else
{
- jQuery('#jform_javascript_file').closest('.control-group').hide();
+ jQuery('#jform_php_document').closest('.control-group').hide();
if (!jform_vvvvvyovyk_required)
{
- updateFieldRequired('javascript_file',1);
- jQuery('#jform_javascript_file').removeAttr('required');
- jQuery('#jform_javascript_file').removeAttr('aria-required');
- jQuery('#jform_javascript_file').removeClass('required');
+ updateFieldRequired('php_document',1);
+ jQuery('#jform_php_document').removeAttr('required');
+ jQuery('#jform_php_document').removeAttr('aria-required');
+ jQuery('#jform_php_document').removeClass('required');
jform_vvvvvyovyk_required = true;
}
}
}
// the vvvvvyp function
-function vvvvvyp(add_js_document_vvvvvyp)
+function vvvvvyp(add_css_document_vvvvvyp)
{
// set the function logic
- if (add_js_document_vvvvvyp == 1)
+ if (add_css_document_vvvvvyp == 1)
{
- jQuery('#jform_js_document').closest('.control-group').show();
+ jQuery('#jform_css_document').closest('.control-group').show();
if (jform_vvvvvypvyl_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');
+ 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_vvvvvypvyl_required = false;
}
}
else
{
- jQuery('#jform_js_document').closest('.control-group').hide();
+ jQuery('#jform_css_document').closest('.control-group').hide();
if (!jform_vvvvvypvyl_required)
{
- updateFieldRequired('js_document',1);
- jQuery('#jform_js_document').removeAttr('required');
- jQuery('#jform_js_document').removeAttr('aria-required');
- jQuery('#jform_js_document').removeClass('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_vvvvvypvyl_required = true;
}
}
}
// the vvvvvyq function
-function vvvvvyq(add_css_vvvvvyq)
+function vvvvvyq(add_javascript_file_vvvvvyq)
{
// set the function logic
- if (add_css_vvvvvyq == 1)
+ if (add_javascript_file_vvvvvyq == 1)
{
- jQuery('#jform_css').closest('.control-group').show();
+ jQuery('#jform_javascript_file').closest('.control-group').show();
if (jform_vvvvvyqvym_required)
{
- updateFieldRequired('css',0);
- jQuery('#jform_css').prop('required','required');
- jQuery('#jform_css').attr('aria-required',true);
- jQuery('#jform_css').addClass('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_vvvvvyqvym_required = false;
}
}
else
{
- jQuery('#jform_css').closest('.control-group').hide();
+ jQuery('#jform_javascript_file').closest('.control-group').hide();
if (!jform_vvvvvyqvym_required)
{
- updateFieldRequired('css',1);
- jQuery('#jform_css').removeAttr('required');
- jQuery('#jform_css').removeAttr('aria-required');
- jQuery('#jform_css').removeClass('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_vvvvvyqvym_required = true;
}
}
}
// the vvvvvyr function
-function vvvvvyr(add_php_ajax_vvvvvyr)
+function vvvvvyr(add_js_document_vvvvvyr)
{
// set the function logic
- if (add_php_ajax_vvvvvyr == 1)
+ if (add_js_document_vvvvvyr == 1)
+ {
+ jQuery('#jform_js_document').closest('.control-group').show();
+ if (jform_vvvvvyrvyn_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_vvvvvyrvyn_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_js_document').closest('.control-group').hide();
+ if (!jform_vvvvvyrvyn_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_vvvvvyrvyn_required = true;
+ }
+ }
+}
+
+// the vvvvvys function
+function vvvvvys(add_css_vvvvvys)
+{
+ // set the function logic
+ if (add_css_vvvvvys == 1)
+ {
+ jQuery('#jform_css').closest('.control-group').show();
+ if (jform_vvvvvysvyo_required)
+ {
+ updateFieldRequired('css',0);
+ jQuery('#jform_css').prop('required','required');
+ jQuery('#jform_css').attr('aria-required',true);
+ jQuery('#jform_css').addClass('required');
+ jform_vvvvvysvyo_required = false;
+ }
+
+ }
+ else
+ {
+ jQuery('#jform_css').closest('.control-group').hide();
+ if (!jform_vvvvvysvyo_required)
+ {
+ updateFieldRequired('css',1);
+ jQuery('#jform_css').removeAttr('required');
+ jQuery('#jform_css').removeAttr('aria-required');
+ jQuery('#jform_css').removeClass('required');
+ jform_vvvvvysvyo_required = true;
+ }
+ }
+}
+
+// the vvvvvyt function
+function vvvvvyt(add_php_ajax_vvvvvyt)
+{
+ // set the function logic
+ if (add_php_ajax_vvvvvyt == 1)
{
jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
- if (jform_vvvvvyrvyn_required)
+ if (jform_vvvvvytvyp_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_vvvvvyrvyn_required = false;
+ jform_vvvvvytvyp_required = false;
}
}
@@ -342,42 +342,42 @@ function vvvvvyr(add_php_ajax_vvvvvyr)
{
jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
- if (!jform_vvvvvyrvyn_required)
+ if (!jform_vvvvvytvyp_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_vvvvvyrvyn_required = true;
+ jform_vvvvvytvyp_required = true;
}
}
}
-// the vvvvvys function
-function vvvvvys(add_custom_button_vvvvvys)
+// the vvvvvyu function
+function vvvvvyu(add_custom_button_vvvvvyu)
{
// set the function logic
- if (add_custom_button_vvvvvys == 1)
+ if (add_custom_button_vvvvvyu == 1)
{
jQuery('#jform_custom_button-lbl').closest('.control-group').show();
jQuery('#jform_php_controller').closest('.control-group').show();
- if (jform_vvvvvysvyo_required)
+ if (jform_vvvvvyuvyq_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_vvvvvysvyo_required = false;
+ jform_vvvvvyuvyq_required = false;
}
jQuery('#jform_php_model').closest('.control-group').show();
- if (jform_vvvvvysvyp_required)
+ if (jform_vvvvvyuvyr_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_vvvvvysvyp_required = false;
+ jform_vvvvvyuvyr_required = false;
}
}
@@ -385,40 +385,40 @@ function vvvvvys(add_custom_button_vvvvvys)
{
jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
jQuery('#jform_php_controller').closest('.control-group').hide();
- if (!jform_vvvvvysvyo_required)
+ if (!jform_vvvvvyuvyq_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_vvvvvysvyo_required = true;
+ jform_vvvvvyuvyq_required = true;
}
jQuery('#jform_php_model').closest('.control-group').hide();
- if (!jform_vvvvvysvyp_required)
+ if (!jform_vvvvvyuvyr_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_vvvvvysvyp_required = true;
+ jform_vvvvvyuvyr_required = true;
}
}
}
-// the vvvvvyt function
-function vvvvvyt(button_position_vvvvvyt)
+// the vvvvvyv function
+function vvvvvyv(button_position_vvvvvyv)
{
- if (isSet(button_position_vvvvvyt) && button_position_vvvvvyt.constructor !== Array)
+ if (isSet(button_position_vvvvvyv) && button_position_vvvvvyv.constructor !== Array)
{
- var temp_vvvvvyt = button_position_vvvvvyt;
- var button_position_vvvvvyt = [];
- button_position_vvvvvyt.push(temp_vvvvvyt);
+ var temp_vvvvvyv = button_position_vvvvvyv;
+ var button_position_vvvvvyv = [];
+ button_position_vvvvvyv.push(temp_vvvvvyv);
}
- else if (!isSet(button_position_vvvvvyt))
+ else if (!isSet(button_position_vvvvvyv))
{
- var button_position_vvvvvyt = [];
+ var button_position_vvvvvyv = [];
}
- var button_position = button_position_vvvvvyt.some(button_position_vvvvvyt_SomeFunc);
+ var button_position = button_position_vvvvvyv.some(button_position_vvvvvyv_SomeFunc);
// set this function logic
@@ -432,11 +432,11 @@ function vvvvvyt(button_position_vvvvvyt)
}
}
-// the vvvvvyt Some function
-function button_position_vvvvvyt_SomeFunc(button_position_vvvvvyt)
+// the vvvvvyv Some function
+function button_position_vvvvvyv_SomeFunc(button_position_vvvvvyv)
{
// set the function logic
- if (button_position_vvvvvyt == 5)
+ if (button_position_vvvvvyv == 5)
{
return true;
}
@@ -479,6 +479,33 @@ function isSet(val)
return false;
}
+jQuery(document).ready(function()
+{
+ // get the linked details
+ getLinked();
+});
+
+function getLinked_server(type){
+ var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&vdm="+vastDevMod;
+ if(token.length > 0 && type > 0){
+ var request = 'token='+token+'&type='+type;
+ }
+ return jQuery.ajax({
+ type: 'GET',
+ url: getUrl,
+ dataType: 'jsonp',
+ data: request,
+ jsonp: 'callback'
+ });
+}
+
+function getLinked(){
+ getLinked_server(1).done(function(result) {
+ if(result){
+ jQuery('#display_linked_to').html(result);
+ }
+ });
+}
function getSnippetDetails_server(snippetId){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json";
diff --git a/admin/models/forms/site_view.xml b/admin/models/forms/site_view.xml
index 7d3c93fef..88a513fa5 100644
--- a/admin/models/forms/site_view.xml
+++ b/admin/models/forms/site_view.xml
@@ -138,27 +138,6 @@
multiple="false"
required="false"
button="true" />
-
-
-
-
-
-
-
-
-
- COM_COMPONENTBUILDER_SITE_VIEW_YES
- COM_COMPONENTBUILDER_SITE_VIEW_NO
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- COM_COMPONENTBUILDER_SITE_VIEW_YES
- COM_COMPONENTBUILDER_SITE_VIEW_NO
-
-
-
-
- COM_COMPONENTBUILDER_SITE_VIEW_YES
- COM_COMPONENTBUILDER_SITE_VIEW_NO
-
-
-
-
-
-
- COM_COMPONENTBUILDER_SITE_VIEW_YES
- COM_COMPONENTBUILDER_SITE_VIEW_NO
-
-
-
-
-
-
-
-
- COM_COMPONENTBUILDER_SITE_VIEW_YES
- COM_COMPONENTBUILDER_SITE_VIEW_NO
-
-
-
-
-
-
- COM_COMPONENTBUILDER_SITE_VIEW_YES
- COM_COMPONENTBUILDER_SITE_VIEW_NO
-
-
-
COM_COMPONENTBUILDER_SITE_VIEW_YES
COM_COMPONENTBUILDER_SITE_VIEW_NO
-
-
-
-
+
-
- COM_COMPONENTBUILDER_SITE_VIEW_YES
- COM_COMPONENTBUILDER_SITE_VIEW_NO
-
-
-
+ required="false"
+ button="true" />
COM_COMPONENTBUILDER_SITE_VIEW_YES
COM_COMPONENTBUILDER_SITE_VIEW_NO
-
+
+
+
+
+
+
+
+
+
@@ -393,6 +223,12 @@
COM_COMPONENTBUILDER_SITE_VIEW_YES
COM_COMPONENTBUILDER_SITE_VIEW_NO
+
+
+
+
+
+
+
+
+
+ COM_COMPONENTBUILDER_SITE_VIEW_YES
+ COM_COMPONENTBUILDER_SITE_VIEW_NO
+
+
+
+
+
+
+ COM_COMPONENTBUILDER_SITE_VIEW_YES
+ COM_COMPONENTBUILDER_SITE_VIEW_NO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ COM_COMPONENTBUILDER_SITE_VIEW_YES
+ COM_COMPONENTBUILDER_SITE_VIEW_NO
+
+
+
+
+ COM_COMPONENTBUILDER_SITE_VIEW_YES
+ COM_COMPONENTBUILDER_SITE_VIEW_NO
+
COM_COMPONENTBUILDER_SITE_VIEW_BOTTOM_LEFT
COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM
-
-
+
+
+
+ COM_COMPONENTBUILDER_SITE_VIEW_YES
+ COM_COMPONENTBUILDER_SITE_VIEW_NO
+
-
-
+
+
+
+ COM_COMPONENTBUILDER_SITE_VIEW_YES
+ COM_COMPONENTBUILDER_SITE_VIEW_NO
+
-
-
+
+
+
+ COM_COMPONENTBUILDER_SITE_VIEW_YES
+ COM_COMPONENTBUILDER_SITE_VIEW_NO
+
-
-
+
+
diff --git a/admin/models/forms/template.js b/admin/models/forms/template.js
index 9fd7a678b..32b717671 100644
--- a/admin/models/forms/template.js
+++ b/admin/models/forms/template.js
@@ -23,42 +23,42 @@
/-----------------------------------------------------------------------------------------------------------------------------*/
// Some Global Values
-jform_vvvvvyuvyq_required = false;
+jform_vvvvvywvys_required = false;
// Initial Script
jQuery(document).ready(function()
{
- var add_php_view_vvvvvyu = jQuery("#jform_add_php_view input[type='radio']:checked").val();
- vvvvvyu(add_php_view_vvvvvyu);
+ var add_php_view_vvvvvyw = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+ vvvvvyw(add_php_view_vvvvvyw);
});
-// the vvvvvyu function
-function vvvvvyu(add_php_view_vvvvvyu)
+// the vvvvvyw function
+function vvvvvyw(add_php_view_vvvvvyw)
{
// set the function logic
- if (add_php_view_vvvvvyu == 1)
+ if (add_php_view_vvvvvyw == 1)
{
jQuery('#jform_php_view').closest('.control-group').show();
- if (jform_vvvvvyuvyq_required)
+ if (jform_vvvvvywvys_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_vvvvvyuvyq_required = false;
+ jform_vvvvvywvys_required = false;
}
}
else
{
jQuery('#jform_php_view').closest('.control-group').hide();
- if (!jform_vvvvvyuvyq_required)
+ if (!jform_vvvvvywvys_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_vvvvvyuvyq_required = true;
+ jform_vvvvvywvys_required = true;
}
}
}
diff --git a/admin/models/ftp.php b/admin/models/ftp.php
index 23a6bb80a..37b6abde2 100644
--- a/admin/models/ftp.php
+++ b/admin/models/ftp.php
@@ -122,7 +122,7 @@ class ComponentbuilderModelFtp extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
- public function getVzzlinked_components()
+ public function getWablinked_components()
{
// Get the user object.
$user = JFactory::getUser();
diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php
index 49d809881..ed0794c86 100644
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@@ -108,28 +108,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
$item->addcontributors = $addcontributors->toArray();
}
- if (!empty($item->php_postflight_update))
+ if (!empty($item->readme))
{
- // base64 Decode php_postflight_update.
- $item->php_postflight_update = base64_decode($item->php_postflight_update);
- }
-
- if (!empty($item->php_preflight_update))
- {
- // base64 Decode php_preflight_update.
- $item->php_preflight_update = base64_decode($item->php_preflight_update);
- }
-
- if (!empty($item->sql))
- {
- // base64 Decode sql.
- $item->sql = base64_decode($item->sql);
- }
-
- if (!empty($item->php_preflight_install))
- {
- // base64 Decode php_preflight_install.
- $item->php_preflight_install = base64_decode($item->php_preflight_install);
+ // base64 Decode readme.
+ $item->readme = base64_decode($item->readme);
}
if (!empty($item->php_postflight_install))
@@ -138,16 +120,34 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
$item->php_postflight_install = base64_decode($item->php_postflight_install);
}
+ if (!empty($item->php_preflight_install))
+ {
+ // base64 Decode php_preflight_install.
+ $item->php_preflight_install = base64_decode($item->php_preflight_install);
+ }
+
if (!empty($item->php_method_uninstall))
{
// base64 Decode php_method_uninstall.
$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
}
- if (!empty($item->readme))
+ if (!empty($item->php_preflight_update))
{
- // base64 Decode readme.
- $item->readme = base64_decode($item->readme);
+ // base64 Decode php_preflight_update.
+ $item->php_preflight_update = base64_decode($item->php_preflight_update);
+ }
+
+ if (!empty($item->php_postflight_update))
+ {
+ // base64 Decode php_postflight_update.
+ $item->php_postflight_update = base64_decode($item->php_postflight_update);
+ }
+
+ if (!empty($item->sql))
+ {
+ // base64 Decode sql.
+ $item->sql = base64_decode($item->sql);
}
if (!empty($item->php_helper_both))
@@ -186,10 +186,16 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
$item->javascript = base64_decode($item->javascript);
}
- if (!empty($item->css))
+ if (!empty($item->css_admin))
{
- // base64 Decode css.
- $item->css = base64_decode($item->css);
+ // base64 Decode css_admin.
+ $item->css_admin = base64_decode($item->css_admin);
+ }
+
+ if (!empty($item->css_site))
+ {
+ // base64 Decode css_site.
+ $item->css_site = base64_decode($item->css_site);
}
if (!empty($item->buildcompsql))
@@ -283,7 +289,7 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
- public function getVwmtranslation()
+ public function getVwntranslation()
{
// Get the user object.
$user = JFactory::getUser();
@@ -1196,28 +1202,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
$data['addcontributors'] = '';
}
- // Set the php_postflight_update string to base64 string.
- if (isset($data['php_postflight_update']))
+ // Set the readme string to base64 string.
+ if (isset($data['readme']))
{
- $data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
- }
-
- // Set the php_preflight_update string to base64 string.
- if (isset($data['php_preflight_update']))
- {
- $data['php_preflight_update'] = base64_encode($data['php_preflight_update']);
- }
-
- // Set the sql string to base64 string.
- if (isset($data['sql']))
- {
- $data['sql'] = base64_encode($data['sql']);
- }
-
- // Set the php_preflight_install string to base64 string.
- if (isset($data['php_preflight_install']))
- {
- $data['php_preflight_install'] = base64_encode($data['php_preflight_install']);
+ $data['readme'] = base64_encode($data['readme']);
}
// Set the php_postflight_install string to base64 string.
@@ -1226,16 +1214,34 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
}
+ // Set the php_preflight_install string to base64 string.
+ if (isset($data['php_preflight_install']))
+ {
+ $data['php_preflight_install'] = base64_encode($data['php_preflight_install']);
+ }
+
// Set the php_method_uninstall string to base64 string.
if (isset($data['php_method_uninstall']))
{
$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
}
- // Set the readme string to base64 string.
- if (isset($data['readme']))
+ // Set the php_preflight_update string to base64 string.
+ if (isset($data['php_preflight_update']))
{
- $data['readme'] = base64_encode($data['readme']);
+ $data['php_preflight_update'] = base64_encode($data['php_preflight_update']);
+ }
+
+ // Set the php_postflight_update string to base64 string.
+ if (isset($data['php_postflight_update']))
+ {
+ $data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
+ }
+
+ // Set the sql string to base64 string.
+ if (isset($data['sql']))
+ {
+ $data['sql'] = base64_encode($data['sql']);
}
// Set the php_helper_both string to base64 string.
@@ -1274,10 +1280,16 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
$data['javascript'] = base64_encode($data['javascript']);
}
- // Set the css string to base64 string.
- if (isset($data['css']))
+ // Set the css_admin string to base64 string.
+ if (isset($data['css_admin']))
{
- $data['css'] = base64_encode($data['css']);
+ $data['css_admin'] = base64_encode($data['css_admin']);
+ }
+
+ // Set the css_site string to base64 string.
+ if (isset($data['css_site']))
+ {
+ $data['css_site'] = base64_encode($data['css_site']);
}
// Set the buildcompsql string to base64 string.
diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php
index 1902fa8ca..4500df277 100644
--- a/admin/models/joomla_components.php
+++ b/admin/models/joomla_components.php
@@ -1526,25 +1526,25 @@ class ComponentbuilderModelJoomla_components extends JModelList
continue;
}
- // decode php_postflight_update
- $item->php_postflight_update = base64_decode($item->php_postflight_update);
- // decode php_preflight_update
- $item->php_preflight_update = base64_decode($item->php_preflight_update);
- // decode sql
- $item->sql = base64_decode($item->sql);
+ // decode readme
+ $item->readme = base64_decode($item->readme);
+ // decode php_postflight_install
+ $item->php_postflight_install = base64_decode($item->php_postflight_install);
// decode php_preflight_install
$item->php_preflight_install = base64_decode($item->php_preflight_install);
+ // decode php_method_uninstall
+ $item->php_method_uninstall = base64_decode($item->php_method_uninstall);
if ($basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true)))
{
// decrypt whmcs_key
$item->whmcs_key = $basic->decryptString($item->whmcs_key);
}
- // decode php_postflight_install
- $item->php_postflight_install = base64_decode($item->php_postflight_install);
- // decode php_method_uninstall
- $item->php_method_uninstall = base64_decode($item->php_method_uninstall);
- // decode readme
- $item->readme = base64_decode($item->readme);
+ // decode php_preflight_update
+ $item->php_preflight_update = base64_decode($item->php_preflight_update);
+ // decode php_postflight_update
+ $item->php_postflight_update = base64_decode($item->php_postflight_update);
+ // decode sql
+ $item->sql = base64_decode($item->sql);
// decode php_helper_both
$item->php_helper_both = base64_decode($item->php_helper_both);
// decode php_helper_admin
@@ -1557,8 +1557,10 @@ class ComponentbuilderModelJoomla_components extends JModelList
$item->php_site_event = base64_decode($item->php_site_event);
// decode javascript
$item->javascript = base64_decode($item->javascript);
- // decode css
- $item->css = base64_decode($item->css);
+ // decode css_admin
+ $item->css_admin = base64_decode($item->css_admin);
+ // decode css_site
+ $item->css_site = base64_decode($item->css_site);
if ($basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true)))
{
// decrypt export_key
diff --git a/admin/models/site_view.php b/admin/models/site_view.php
index 45ae32d37..286e13a9f 100644
--- a/admin/models/site_view.php
+++ b/admin/models/site_view.php
@@ -64,6 +64,11 @@ class ComponentbuilderModelSite_view extends JModelAdmin
public function getTable($type = 'site_view', $prefix = 'ComponentbuilderTable', $config = array())
{
return JTable::getInstance($type, $prefix, $config);
+ }
+
+ public function getVDM()
+ {
+ return $this->vastDevMod;
}
/**
@@ -103,14 +108,6 @@ class ComponentbuilderModelSite_view extends JModelAdmin
$item->libraries = $libraries->toArray();
}
- if (!empty($item->custom_get))
- {
- // Convert the custom_get field to an array.
- $custom_get = new Registry;
- $custom_get->loadString($item->custom_get);
- $item->custom_get = $custom_get->toArray();
- }
-
if (!empty($item->ajax_input))
{
// Convert the ajax_input field to an array.
@@ -119,6 +116,14 @@ class ComponentbuilderModelSite_view extends JModelAdmin
$item->ajax_input = $ajax_input->toArray();
}
+ if (!empty($item->custom_get))
+ {
+ // Convert the custom_get field to an array.
+ $custom_get = new Registry;
+ $custom_get->loadString($item->custom_get);
+ $item->custom_get = $custom_get->toArray();
+ }
+
if (!empty($item->custom_button))
{
// Convert the custom_button field to an array.
@@ -127,10 +132,46 @@ class ComponentbuilderModelSite_view extends JModelAdmin
$item->custom_button = $custom_button->toArray();
}
- if (!empty($item->css))
+ if (!empty($item->php_jview_display))
{
- // base64 Decode css.
- $item->css = base64_decode($item->css);
+ // base64 Decode php_jview_display.
+ $item->php_jview_display = base64_decode($item->php_jview_display);
+ }
+
+ if (!empty($item->php_document))
+ {
+ // base64 Decode php_document.
+ $item->php_document = base64_decode($item->php_document);
+ }
+
+ if (!empty($item->default))
+ {
+ // base64 Decode default.
+ $item->default = base64_decode($item->default);
+ }
+
+ if (!empty($item->php_view))
+ {
+ // base64 Decode php_view.
+ $item->php_view = base64_decode($item->php_view);
+ }
+
+ if (!empty($item->php_jview))
+ {
+ // base64 Decode php_jview.
+ $item->php_jview = base64_decode($item->php_jview);
+ }
+
+ if (!empty($item->php_model))
+ {
+ // base64 Decode php_model.
+ $item->php_model = base64_decode($item->php_model);
+ }
+
+ if (!empty($item->javascript_file))
+ {
+ // base64 Decode javascript_file.
+ $item->javascript_file = base64_decode($item->javascript_file);
}
if (!empty($item->js_document))
@@ -145,10 +186,10 @@ class ComponentbuilderModelSite_view extends JModelAdmin
$item->css_document = base64_decode($item->css_document);
}
- if (!empty($item->default))
+ if (!empty($item->css))
{
- // base64 Decode default.
- $item->default = base64_decode($item->default);
+ // base64 Decode css.
+ $item->css = base64_decode($item->css);
}
if (!empty($item->php_ajaxmethod))
@@ -157,48 +198,33 @@ class ComponentbuilderModelSite_view extends JModelAdmin
$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
}
- if (!empty($item->javascript_file))
- {
- // base64 Decode javascript_file.
- $item->javascript_file = base64_decode($item->javascript_file);
- }
-
- if (!empty($item->php_model))
- {
- // base64 Decode php_model.
- $item->php_model = base64_decode($item->php_model);
- }
-
- if (!empty($item->php_document))
- {
- // base64 Decode php_document.
- $item->php_document = base64_decode($item->php_document);
- }
-
- if (!empty($item->php_view))
- {
- // base64 Decode php_view.
- $item->php_view = base64_decode($item->php_view);
- }
-
- if (!empty($item->php_jview_display))
- {
- // base64 Decode php_jview_display.
- $item->php_jview_display = base64_decode($item->php_jview_display);
- }
-
if (!empty($item->php_controller))
{
// base64 Decode php_controller.
$item->php_controller = base64_decode($item->php_controller);
}
- if (!empty($item->php_jview))
- {
- // base64 Decode php_jview.
- $item->php_jview = base64_decode($item->php_jview);
- }
-
+
+ if (empty($item->id))
+ {
+ $id = 0;
+ }
+ else
+ {
+ $id = $item->id;
+ }
+ // set the id and view name to session
+ if ($vdm = ComponentbuilderHelper::get('site_view__'.$id))
+ {
+ $this->vastDevMod = $vdm;
+ }
+ else
+ {
+ $this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+ ComponentbuilderHelper::set($this->vastDevMod, 'site_view__'.$id);
+ ComponentbuilderHelper::set('site_view__'.$id, $this->vastDevMod);
+ }
+
// update the fields
$objectUpdate = new stdClass();
$objectUpdate->id = (int) $item->id;
@@ -977,19 +1003,6 @@ class ComponentbuilderModelSite_view extends JModelAdmin
$data['libraries'] = '';
}
- // Set the custom_get items to data.
- if (isset($data['custom_get']) && is_array($data['custom_get']))
- {
- $custom_get = new JRegistry;
- $custom_get->loadArray($data['custom_get']);
- $data['custom_get'] = (string) $custom_get;
- }
- elseif (!isset($data['custom_get']))
- {
- // Set the empty custom_get to data
- $data['custom_get'] = '';
- }
-
// Set the ajax_input items to data.
if (isset($data['ajax_input']) && is_array($data['ajax_input']))
{
@@ -1003,6 +1016,19 @@ class ComponentbuilderModelSite_view extends JModelAdmin
$data['ajax_input'] = '';
}
+ // Set the custom_get items to data.
+ if (isset($data['custom_get']) && is_array($data['custom_get']))
+ {
+ $custom_get = new JRegistry;
+ $custom_get->loadArray($data['custom_get']);
+ $data['custom_get'] = (string) $custom_get;
+ }
+ elseif (!isset($data['custom_get']))
+ {
+ // Set the empty custom_get to data
+ $data['custom_get'] = '';
+ }
+
// Set the custom_button items to data.
if (isset($data['custom_button']) && is_array($data['custom_button']))
{
@@ -1016,10 +1042,46 @@ class ComponentbuilderModelSite_view extends JModelAdmin
$data['custom_button'] = '';
}
- // Set the css string to base64 string.
- if (isset($data['css']))
+ // Set the php_jview_display string to base64 string.
+ if (isset($data['php_jview_display']))
{
- $data['css'] = base64_encode($data['css']);
+ $data['php_jview_display'] = base64_encode($data['php_jview_display']);
+ }
+
+ // Set the php_document string to base64 string.
+ if (isset($data['php_document']))
+ {
+ $data['php_document'] = base64_encode($data['php_document']);
+ }
+
+ // Set the default string to base64 string.
+ if (isset($data['default']))
+ {
+ $data['default'] = base64_encode($data['default']);
+ }
+
+ // Set the php_view string to base64 string.
+ if (isset($data['php_view']))
+ {
+ $data['php_view'] = base64_encode($data['php_view']);
+ }
+
+ // Set the php_jview string to base64 string.
+ if (isset($data['php_jview']))
+ {
+ $data['php_jview'] = base64_encode($data['php_jview']);
+ }
+
+ // Set the php_model string to base64 string.
+ if (isset($data['php_model']))
+ {
+ $data['php_model'] = base64_encode($data['php_model']);
+ }
+
+ // Set the javascript_file string to base64 string.
+ if (isset($data['javascript_file']))
+ {
+ $data['javascript_file'] = base64_encode($data['javascript_file']);
}
// Set the js_document string to base64 string.
@@ -1034,10 +1096,10 @@ class ComponentbuilderModelSite_view extends JModelAdmin
$data['css_document'] = base64_encode($data['css_document']);
}
- // Set the default string to base64 string.
- if (isset($data['default']))
+ // Set the css string to base64 string.
+ if (isset($data['css']))
{
- $data['default'] = base64_encode($data['default']);
+ $data['css'] = base64_encode($data['css']);
}
// Set the php_ajaxmethod string to base64 string.
@@ -1046,46 +1108,10 @@ class ComponentbuilderModelSite_view extends JModelAdmin
$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
}
- // Set the javascript_file string to base64 string.
- if (isset($data['javascript_file']))
- {
- $data['javascript_file'] = base64_encode($data['javascript_file']);
- }
-
- // Set the php_model string to base64 string.
- if (isset($data['php_model']))
- {
- $data['php_model'] = base64_encode($data['php_model']);
- }
-
- // Set the php_document string to base64 string.
- if (isset($data['php_document']))
- {
- $data['php_document'] = base64_encode($data['php_document']);
- }
-
- // Set the php_view string to base64 string.
- if (isset($data['php_view']))
- {
- $data['php_view'] = base64_encode($data['php_view']);
- }
-
- // Set the php_jview_display string to base64 string.
- if (isset($data['php_jview_display']))
- {
- $data['php_jview_display'] = base64_encode($data['php_jview_display']);
- }
-
// Set the php_controller string to base64 string.
if (isset($data['php_controller']))
{
$data['php_controller'] = base64_encode($data['php_controller']);
- }
-
- // Set the php_jview string to base64 string.
- if (isset($data['php_jview']))
- {
- $data['php_jview'] = base64_encode($data['php_jview']);
}
// Set the Params Items to data
diff --git a/admin/models/site_views.php b/admin/models/site_views.php
index 2edfd51d4..74c5ed598 100644
--- a/admin/models/site_views.php
+++ b/admin/models/site_views.php
@@ -266,30 +266,30 @@ class ComponentbuilderModelSite_views extends JModelList
continue;
}
- // decode css
- $item->css = base64_decode($item->css);
+ // decode php_jview_display
+ $item->php_jview_display = base64_decode($item->php_jview_display);
+ // decode php_document
+ $item->php_document = base64_decode($item->php_document);
+ // decode default
+ $item->default = base64_decode($item->default);
+ // decode php_view
+ $item->php_view = base64_decode($item->php_view);
+ // decode php_jview
+ $item->php_jview = base64_decode($item->php_jview);
+ // decode php_model
+ $item->php_model = base64_decode($item->php_model);
+ // decode javascript_file
+ $item->javascript_file = base64_decode($item->javascript_file);
// decode js_document
$item->js_document = base64_decode($item->js_document);
// decode css_document
$item->css_document = base64_decode($item->css_document);
- // decode default
- $item->default = base64_decode($item->default);
+ // decode css
+ $item->css = base64_decode($item->css);
// decode php_ajaxmethod
$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
- // decode javascript_file
- $item->javascript_file = base64_decode($item->javascript_file);
- // decode php_model
- $item->php_model = base64_decode($item->php_model);
- // decode php_document
- $item->php_document = base64_decode($item->php_document);
- // decode php_view
- $item->php_view = base64_decode($item->php_view);
- // decode php_jview_display
- $item->php_jview_display = base64_decode($item->php_jview_display);
// decode php_controller
$item->php_controller = base64_decode($item->php_controller);
- // decode php_jview
- $item->php_jview = base64_decode($item->php_jview);
// unset the values we don't want exported.
unset($item->asset_id);
unset($item->checked_out);
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index 0b7b39088..1e6795f92 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -2,7 +2,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
`id` INT(11) NOT NULL AUTO_INCREMENT,
`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
`add_admin_event` TINYINT(1) NOT NULL DEFAULT 0,
- `add_css` TINYINT(1) NOT NULL DEFAULT 0,
+ `add_css_admin` TINYINT(1) NOT NULL DEFAULT 0,
+ `add_css_site` TINYINT(1) NOT NULL DEFAULT 0,
`add_email_helper` TINYINT(1) NOT NULL DEFAULT 0,
`add_javascript` TINYINT(1) NOT NULL DEFAULT 0,
`add_license` TINYINT(1) NOT NULL DEFAULT 0,
@@ -31,7 +32,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
`component_version` CHAR(64) NOT NULL DEFAULT '',
`copyright` VARCHAR(255) NOT NULL DEFAULT '',
`creatuserhelper` TINYINT(1) NOT NULL DEFAULT 0,
- `css` TEXT NOT NULL,
+ `css_admin` TEXT NOT NULL,
+ `css_site` TEXT NOT NULL,
`debug_linenr` TINYINT(1) NOT NULL DEFAULT 0,
`description` TEXT NOT NULL,
`email` VARCHAR(255) NOT NULL DEFAULT '',
@@ -93,11 +95,12 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
KEY `idx_state` (`published`),
KEY `idx_system_name` (`system_name`),
KEY `idx_name_code` (`name_code`),
- KEY `idx_add_update_server` (`add_update_server`),
+ KEY `idx_add_css_site` (`add_css_site`),
KEY `idx_mvc_versiondate` (`mvc_versiondate`),
KEY `idx_add_placeholders` (`add_placeholders`),
KEY `idx_addfootable` (`addfootable`),
KEY `idx_add_php_helper_admin` (`add_php_helper_admin`),
+ KEY `idx_update_server_target` (`update_server_target`),
KEY `idx_add_php_helper_site` (`add_php_helper_site`),
KEY `idx_debug_linenr` (`debug_linenr`),
KEY `idx_add_javascript` (`add_javascript`),
@@ -107,8 +110,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
KEY `idx_add_license` (`add_license`),
KEY `idx_add_site_event` (`add_site_event`),
KEY `idx_license_type` (`license_type`),
- KEY `idx_add_css` (`add_css`),
- KEY `idx_update_server_target` (`update_server_target`),
+ KEY `idx_add_css_admin` (`add_css_admin`),
+ KEY `idx_add_update_server` (`add_update_server`),
KEY `idx_adduikit` (`adduikit`),
KEY `idx_add_email_helper` (`add_email_helper`),
KEY `idx_add_php_preflight_install` (`add_php_preflight_install`),
@@ -259,10 +262,12 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
`add_custom_button` INT(1) NOT NULL DEFAULT 0,
`add_javascript_file` TINYINT(1) NOT NULL DEFAULT 0,
`add_js_document` TINYINT(1) NOT NULL DEFAULT 0,
+ `add_php_ajax` TINYINT(1) NOT NULL DEFAULT 0,
`add_php_document` TINYINT(1) NOT NULL DEFAULT 0,
`add_php_jview` TINYINT(1) NOT NULL DEFAULT 0,
`add_php_jview_display` TINYINT(1) NOT NULL DEFAULT 0,
`add_php_view` TINYINT(1) NOT NULL DEFAULT 0,
+ `ajax_input` TEXT NOT NULL,
`codename` VARCHAR(255) NOT NULL DEFAULT '',
`css` TEXT NOT NULL,
`css_document` TEXT NOT NULL,
@@ -278,6 +283,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
`main_get` INT(11) NOT NULL DEFAULT 0,
`name` VARCHAR(255) NOT NULL DEFAULT '',
`not_required` INT(1) NOT NULL DEFAULT 0,
+ `php_ajaxmethod` MEDIUMTEXT NOT NULL,
`php_controller` MEDIUMTEXT NOT NULL,
`php_document` MEDIUMTEXT NOT NULL,
`php_jview` MEDIUMTEXT NOT NULL,
@@ -307,16 +313,17 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
KEY `idx_name` (`name`),
KEY `idx_codename` (`codename`),
KEY `idx_add_css_document` (`add_css_document`),
- KEY `idx_add_js_document` (`add_js_document`),
- KEY `idx_add_php_document` (`add_php_document`),
- KEY `idx_add_php_jview_display` (`add_php_jview_display`),
+ KEY `idx_add_php_ajax` (`add_php_ajax`),
KEY `idx_add_css` (`add_css`),
- KEY `idx_add_php_view` (`add_php_view`),
- KEY `idx_add_php_jview` (`add_php_jview`),
+ KEY `idx_add_js_document` (`add_js_document`),
KEY `idx_add_javascript_file` (`add_javascript_file`),
KEY `idx_main_get` (`main_get`),
KEY `idx_dynamic_get` (`dynamic_get`),
- KEY `idx_add_custom_button` (`add_custom_button`)
+ KEY `idx_add_php_document` (`add_php_document`),
+ KEY `idx_add_custom_button` (`add_custom_button`),
+ KEY `idx_add_php_view` (`add_php_view`),
+ KEY `idx_add_php_jview_display` (`add_php_jview_display`),
+ KEY `idx_add_php_jview` (`add_php_jview`)
) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
@@ -377,19 +384,19 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
KEY `idx_state` (`published`),
KEY `idx_name` (`name`),
KEY `idx_codename` (`codename`),
- KEY `idx_add_php_document` (`add_php_document`),
- KEY `idx_add_php_jview_display` (`add_php_jview_display`),
- KEY `idx_add_php_view` (`add_php_view`),
- KEY `idx_add_php_jview` (`add_php_jview`),
+ KEY `idx_add_css_document` (`add_css_document`),
+ KEY `idx_add_php_ajax` (`add_php_ajax`),
+ KEY `idx_add_css` (`add_css`),
KEY `idx_add_javascript_file` (`add_javascript_file`),
KEY `idx_add_js_document` (`add_js_document`),
KEY `idx_main_get` (`main_get`),
- KEY `idx_add_css_document` (`add_css_document`),
KEY `idx_dynamic_get` (`dynamic_get`),
- KEY `idx_add_css` (`add_css`),
- KEY `idx_add_php_ajax` (`add_php_ajax`),
KEY `idx_add_custom_button` (`add_custom_button`),
- KEY `idx_button_position` (`button_position`)
+ KEY `idx_add_php_document` (`add_php_document`),
+ KEY `idx_button_position` (`button_position`),
+ KEY `idx_add_php_view` (`add_php_view`),
+ KEY `idx_add_php_jview_display` (`add_php_jview_display`),
+ KEY `idx_add_php_jview` (`add_php_jview`)
) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `#__componentbuilder_template` (
@@ -519,11 +526,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` (
KEY `idx_name` (`name`),
KEY `idx_main_source` (`main_source`),
KEY `idx_gettype` (`gettype`),
- KEY `idx_add_php_before_getitem` (`add_php_before_getitem`),
- KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
- KEY `idx_add_php_after_getitem` (`add_php_after_getitem`),
- KEY `idx_add_php_before_getitems` (`add_php_before_getitems`),
KEY `idx_add_php_after_getitems` (`add_php_after_getitems`),
+ KEY `idx_add_php_before_getitems` (`add_php_before_getitems`),
+ KEY `idx_add_php_before_getitem` (`add_php_before_getitem`),
+ KEY `idx_add_php_after_getitem` (`add_php_after_getitem`),
+ KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
KEY `idx_getcustom` (`getcustom`),
KEY `idx_pagination` (`pagination`)
) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
@@ -1220,8 +1227,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library_files_folders_urls` (
-- Dumping data for table `#__componentbuilder_joomla_component`
--
-INSERT INTO `#__componentbuilder_joomla_component` (`id`, `add_license`, `license_type`, `mvc_versiondate`, `add_css`, `add_email_helper`, `add_php_helper_admin`, `add_php_helper_both`, `add_php_helper_site`, `add_php_postflight_install`, `add_php_method_uninstall`, `add_php_postflight_update`, `add_php_preflight_install`, `add_php_preflight_update`, `add_placeholders`, `add_sql`, `addfootable`, `adduikit`, `add_admin_event`, `add_site_event`, `add_update_server`, `add_sales_server`, `sales_server_ftp`, `update_server_ftp`, `update_server_target`, `php_admin_event`, `php_site_event`, `addreadme`, `readme`, `author`, `bom`, `buildcomp`, `buildcompsql`, `companyname`, `component_version`, `update_server`, `copyright`, `creatuserhelper`, `css`, `debug_linenr`, `description`, `email`, `emptycontributors`, `image`, `license`, `name`, `system_name`, `name_code`, `not_required`, `number`, `php_helper_admin`, `php_helper_both`, `php_helper_site`, `php_postflight_install`, `php_method_uninstall`, `php_postflight_update`, `php_preflight_install`, `php_preflight_update`, `short_description`, `sql`, `website`, `published`, `created`, `modified`, `version`, `hits`, `ordering`, `whmcs_key`, `whmcs_url`) VALUES
-(25, '', 1, '', '', '', '', '', 1, 1, '', '', '', '', '', '', '', 1, '', '', 1, '', '', '', 2, '', '', 1, 'IyAjIyNDb21wb25lbnRfbmFtZSMjIyAoIyMjVkVSU0lPTiMjIykNCg0KIVsjIyNDb21wb25lbnRfbmFtZSMjIyBpbWFnZV0oaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL25hbWliaWEvZGVtby1qb29tbGEtMy1jb21wb25lbnQvbWFzdGVyL2FkbWluL2Fzc2V0cy9pbWFnZXMvdmRtLWNvbXBvbmVudC5qcGcgIlRoZSAjIyNDb21wb25lbnRfbmFtZSMjIyIpDQoNCiMjI0RFU0NSSVBUSU9OIyMjDQoNCiMgQnVpbGQgRGV0YWlscw0KDQorICpDb21wYW55KjogWyMjI0NPTVBBTllOQU1FIyMjXSgjIyNBVVRIT1JXRUJTSVRFIyMjKQ0KKyAqQXV0aG9yKjogWyMjI0FVVEhPUiMjI10obWFpbHRvOiMjI0FVVEhPUkVNQUlMIyMjKQ0KKyAqTmFtZSo6IFsjIyNDb21wb25lbnRfbmFtZSMjI10oIyMjQVVUSE9SV0VCU0lURSMjIykNCisgKkZpcnN0IEJ1aWxkKjogIyMjQ1JFQVRJT05EQVRFIyMjDQorICpMYXN0IEJ1aWxkKjogIyMjQlVJTEREQVRFIyMjDQorICpWZXJzaW9uKjogIyMjVkVSU0lPTiMjIw0KKyAqQ29weXJpZ2h0KjogIyMjQ09QWVJJR0hUIyMjDQorICpMaWNlbnNlKjogIyMjTElDRU5TRSMjIw0KDQojIyBCdWlsZCBUaW1lDQoNCioqIyMjdG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjdG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqIChhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNhdmVkIC0NCmR1ZSB0byBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwczovL3d3dy52ZG0uaW8vam9vbWxhLWNvbXBvbmVudC1idWlsZGVyKSkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gbmV2ZXIgbWFraW5nIG9uZSBtaXN0YWtlIG9yIHRha2luZyBhbnkgY29mZmVlIGJyZWFrLikNCg0KKyAqTGluZSBjb3VudCo6ICoqIyMjTElORV9DT1VOVCMjIyoqDQorICpGaWxlIGNvdW50KjogKiojIyNGSUxFX0NPVU5UIyMjKioNCisgKkZvbGRlciBjb3VudCo6ICoqIyMjRk9MREVSX0NPVU5UIyMjKioNCg0KKiojIyNhY3R1YWxIb3Vyc1NwZW50IyMjIEhvdXJzKiogb3IgKiojIyNhY3R1YWxEYXlzU3BlbnQjIyMgRWlnaHQgSG91ciBEYXlzKiogKHRoZSBhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNwZW50KQ0KDQo+ICh3aXRoIHRoZSBmb2xsb3dpbmcgYnJlYWsgZG93bjoNCj4gKipkZWJ1Z2dpbmcgQCMjI2RlYnVnZ2luZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA0Ow0KPiAqKnBsYW5uaW5nIEAjIyNwbGFubmluZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA3Ow0KPiAqKm1hcHBpbmcgQCMjI21hcHBpbmdIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gMTA7DQo+ICoqb2ZmaWNlIEAjIyNvZmZpY2VIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gNjspDQoNCioqIyMjYWN0dWFsVG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjYWN0dWFsVG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqDQooYSB0b3RhbCBvZiB0aGUgcmVhbGlzdGljIHRpbWUgZnJhbWUgZm9yIHRoaXMgcHJvamVjdCkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gd2l0aCB0aGUgbm9ybWFsIGV2ZXJ5ZGF5IHJlYWxpdGllcyBhdCB0aGUgb2ZmaWNlLCB0aGF0IGluY2x1ZGVzIHRoZSBjb21wb25lbnQgcGxhbm5pbmcsIG1hcHBpbmcgJiBkZWJ1Z2dpbmcuKQ0KDQpQcm9qZWN0IGR1cmF0aW9uOiAqKiMjI3Byb2plY3RXZWVrVGltZSMjIyB3ZWVrcyoqIG9yICoqIyMjcHJvamVjdE1vbnRoVGltZSMjIyBtb250aHMqKg0KDQo+IFRoaXMgKipjb21wb25lbnQqKiB3YXMgYnVpbGQgd2l0aCBhIEpvb21sYSBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwczovL3d3dy52ZG0uaW8vam9vbWxhLWNvbXBvbmVudC1idWlsZGVyKS4NCj4gRGV2ZWxvcGVkIGJ5IFtMbGV3ZWxseW4gdmFuIGRlciBNZXJ3ZV0obWFpbHRvOmpvb21sYUB2ZG0uaW8pDQoNCiMjIERvbmF0aW9ucw0KDQpJZiB5b3Ugd2FudCB0byBzdXBwb3J0IHRoaXMgcHJvamVjdCwgcGxlYXNlIGNvbnNpZGVyIGRvbmF0aW5nOg0KKiBQYXlQYWw6IFtwYXlwYWwubWUvcGF5dmRtXShodHRwczovL3d3dy5wYXlwYWwubWUvcGF5dmRtKQ0KKiBCaXRjb2luOiAxRkx4aVQ2d3l4Z1ozYm9ldmlMa1lKMURScHA0MXV6cHhhDQoqIEV0aGVyZXVtOiAweDI0MzM5MmRhYTNjOWM4YmM4NDFmY2FjZjdjN2Y3MjU0MWNiMTY4MjMg', 'Llewellyn van der Merwe', 'default.txt', '', '', 'Vast Development Method', '2.0.0', 'https://www.vdm.io/updates/demo_update_server.xml', 'Copyright (C) 2015. All Rights Reserved', '', '', '', 'Just a basic demo of the most basic implementations of the [Joomla](http://www.joomla.org) Component Builder\'s ability.', 'info@vdm.io', '', 'images/vdm/demo500.jpg', 'GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html', 'Demo', 'Demo', 'demo', '', 4, '', '', 'CS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGZhbmN5IGRhdGUNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5RGF0ZSgkZGF0ZSkNCgl7DQoJCWlmICghc2VsZjo6aXNWYWxpZFRpbWVTdGFtcCgkZGF0ZSkpDQoJCXsNCgkJCSRkYXRlID0gc3RydG90aW1lKCRkYXRlKTsNCgkJfQ0KCQlyZXR1cm4gZGF0ZSgnalMgXG9cZiBGIFknLCRkYXRlKTsNCgl9DQoNCgkvKioNCgkgKglDaGFuZ2UgdG8gbmljZSBmYW5jeSB0aW1lIGFuZCBkYXRlDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeURhdGVUaW1lKCR0aW1lKQ0KCXsNCgkJaWYgKCFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCR0aW1lKSkNCgkJew0KCQkJJHRpbWUgPSBzdHJ0b3RpbWUoJHRpbWUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCcoRzppKSBqUyBcb1xmIEYgWScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGhvdXI6bWludXRlcyB0aW1lDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeVRpbWUoJHRpbWUpDQoJew0KCQlpZiAoIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJHRpbWUpKQ0KCQl7DQoJCQkkdGltZSA9IHN0cnRvdGltZSgkdGltZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ0c6aScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoZWNrIGlmIHN0cmluZyBpcyBhIHZhbGlkIHRpbWUgc3RhbXANCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGlzVmFsaWRUaW1lU3RhbXAoJHRpbWVzdGFtcCkNCgl7DQoJCXJldHVybiAoKGludCkgJHRpbWVzdGFtcCA9PT0gJHRpbWVzdGFtcCkNCgkJJiYgKCR0aW1lc3RhbXAgPD0gUEhQX0lOVF9NQVgpDQoJCSYmICgkdGltZXN0YW1wID49IH5QSFBfSU5UX01BWCk7DQoJfQ0K', 'CQkvLyBHZXQgQXBwbGljYXRpb24gb2JqZWN0DQoJCSRhcHAgPSBKRmFjdG9yeTo6Z2V0QXBwbGljYXRpb24oKTsNCgkJJGFwcC0+ZW5xdWV1ZU1lc3NhZ2UoJ1RoaXMgaXMgYSBkZW1vIGNvbXBvbmVudCBkZXZlbG9wZWQgaW4gPGEgaHJlZj0iaHR0cDovL3ZkbS5iei9jb21wb25lbnQtYnVpbGRlciIgdGFnZXQ9Il9iYWxuayIgdGl0bGU9Ikpvb21sYSBDb21wb25lbnQgQnVpbGRlciI+SkNCPC9hPiEgWW91IGNhbiBidWlsZCBtb3JlIGNvbXBvbmVudHMgbGlrZSB0aGlzIHdpdGggSkNCLCBjaGVja291dCBvdXIgcGFnZSBvbiA8YSBocmVmPSJodHRwczovL2dpdGh1Yi5jb20vdmRtLWlvL0pvb21sYS1Db21wb25lbnQtQnVpbGRlciIgdGFnZXQ9Il9iYWxuayIgdGl0bGU9Ikpvb21sYSBDb21wb25lbnQgQnVpbGRlciI+Z2l0aHViPC9hPiBmb3IgbW9yZSBpbmZvLiBUaGUgZnV0dXJlIG9mIDxhIGhyZWY9Imh0dHA6Ly92ZG0uYnovY29tcG9uZW50LWJ1aWxkZXIiIHRhZ2V0PSJfYmFsbmsiIHRpdGxlPSJKb29tbGEgQ29tcG9uZW50IEJ1aWxkZXIiPkpvb21sYSBDb21wb25lbnQgRGV2ZWxvcG1lbnQ8L2E+IGlzIEhlcmUhJywgJ0luZm8nKTs=', '', '', '', '', 'Demo Component', '', 'https://www.vdm.io/', 1, '2016-10-18 11:44:09', '2017-08-25 00:36:01', 30, '', 3, 'V6inNhoApqD2JvhSrOd+R/OzoW8mTod30wXoypEZacY=', '');
+INSERT INTO `#__componentbuilder_joomla_component` (`id`, `add_license`, `license_type`, `mvc_versiondate`, `add_css_admin`, `add_css_site`, `add_email_helper`, `add_javascript`, `add_php_helper_admin`, `add_php_helper_both`, `add_php_helper_site`, `add_php_postflight_install`, `add_php_method_uninstall`, `add_php_postflight_update`, `add_php_preflight_install`, `add_php_preflight_update`, `add_placeholders`, `add_sql`, `addadmin_views`, `addconfig`, `addcontributors`, `addcustom_admin_views`, `addcustommenus`, `addfiles`, `addfolders`, `addfootable`, `adduikit`, `addsite_views`, `add_admin_event`, `add_site_event`, `add_update_server`, `add_sales_server`, `add_php_dashboard_methods`, `php_dashboard_methods`, `dashboard_tab`, `sales_server_ftp`, `update_server_ftp`, `update_server_target`, `php_admin_event`, `php_site_event`, `addreadme`, `readme`, `author`, `bom`, `buildcomp`, `buildcompsql`, `companyname`, `component_version`, `update_server`, `copyright`, `creatuserhelper`, `css_admin`, `css_site`, `debug_linenr`, `description`, `email`, `emptycontributors`, `export_buy_link`, `export_package_link`, `export_key`, `image`, `javascript`, `license`, `name`, `system_name`, `toignore`, `name_code`, `number`, `php_helper_admin`, `php_helper_both`, `php_helper_site`, `php_postflight_install`, `php_method_uninstall`, `php_postflight_update`, `php_preflight_install`, `php_preflight_update`, `short_description`, `sql`, `sql_tweak`, `website`, `version_update`, `published`, `created`, `modified`, `hits`, `ordering`, `whmcs_key`, `whmcs_url`) VALUES
+(25, '', 1, '', '', '', '', '', '', '', 1, 1, '', '', '', '', '', '', '{\"addadmin_views0\":{\"adminview\":\"109\",\"icomoon\":\"eye-open\",\"mainmenu\":\"1\",\"dashboard_add\":\"1\",\"dashboard_list\":\"1\",\"submenu\":\"1\",\"checkin\":\"1\",\"history\":\"1\",\"metadata\":\"1\",\"access\":\"1\",\"port\":\"1\",\"edit_create_site_view\":\"1\",\"order\":\"1\"}}', '', '', '', '', '', '', '', 1, '{\"addsite_views0\":{\"siteview\":\"23\",\"menu\":\"1\",\"metadata\":\"1\",\"default_view\":\"1\",\"access\":\"1\",\"public\":\"1\"},\"addsite_views1\":{\"siteview\":\"25\",\"menu\":\"0\",\"metadata\":\"1\",\"default_view\":\"0\",\"access\":\"1\",\"public\":\"1\"}}', '', '', 1, '', '', '', '', '', '', 2, '', '', 1, 'IyAjIyNDb21wb25lbnRfbmFtZSMjIyAoIyMjVkVSU0lPTiMjIykNCg0KIVsjIyNDb21wb25lbnRfbmFtZSMjIyBpbWFnZV0oaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL25hbWliaWEvZGVtby1qb29tbGEtMy1jb21wb25lbnQvbWFzdGVyL2FkbWluL2Fzc2V0cy9pbWFnZXMvdmRtLWNvbXBvbmVudC5qcGcgIlRoZSAjIyNDb21wb25lbnRfbmFtZSMjIyIpDQoNCiMjI0RFU0NSSVBUSU9OIyMjDQoNCiMgQnVpbGQgRGV0YWlscw0KDQorICpDb21wYW55KjogWyMjI0NPTVBBTllOQU1FIyMjXSgjIyNBVVRIT1JXRUJTSVRFIyMjKQ0KKyAqQXV0aG9yKjogWyMjI0FVVEhPUiMjI10obWFpbHRvOiMjI0FVVEhPUkVNQUlMIyMjKQ0KKyAqTmFtZSo6IFsjIyNDb21wb25lbnRfbmFtZSMjI10oIyMjQVVUSE9SV0VCU0lURSMjIykNCisgKkZpcnN0IEJ1aWxkKjogIyMjQ1JFQVRJT05EQVRFIyMjDQorICpMYXN0IEJ1aWxkKjogIyMjQlVJTEREQVRFIyMjDQorICpWZXJzaW9uKjogIyMjVkVSU0lPTiMjIw0KKyAqQ29weXJpZ2h0KjogIyMjQ09QWVJJR0hUIyMjDQorICpMaWNlbnNlKjogIyMjTElDRU5TRSMjIw0KDQojIyBCdWlsZCBUaW1lDQoNCioqIyMjdG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjdG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqIChhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNhdmVkIC0NCmR1ZSB0byBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwczovL3d3dy52ZG0uaW8vam9vbWxhLWNvbXBvbmVudC1idWlsZGVyKSkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gbmV2ZXIgbWFraW5nIG9uZSBtaXN0YWtlIG9yIHRha2luZyBhbnkgY29mZmVlIGJyZWFrLikNCg0KKyAqTGluZSBjb3VudCo6ICoqIyMjTElORV9DT1VOVCMjIyoqDQorICpGaWxlIGNvdW50KjogKiojIyNGSUxFX0NPVU5UIyMjKioNCisgKkZvbGRlciBjb3VudCo6ICoqIyMjRk9MREVSX0NPVU5UIyMjKioNCg0KKiojIyNhY3R1YWxIb3Vyc1NwZW50IyMjIEhvdXJzKiogb3IgKiojIyNhY3R1YWxEYXlzU3BlbnQjIyMgRWlnaHQgSG91ciBEYXlzKiogKHRoZSBhY3R1YWwgdGltZSB0aGUgYXV0aG9yIHNwZW50KQ0KDQo+ICh3aXRoIHRoZSBmb2xsb3dpbmcgYnJlYWsgZG93bjoNCj4gKipkZWJ1Z2dpbmcgQCMjI2RlYnVnZ2luZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA0Ow0KPiAqKnBsYW5uaW5nIEAjIyNwbGFubmluZ0hvdXJzIyMjaG91cnMqKiA9IGNvZGluZ3RpbWUgLyA3Ow0KPiAqKm1hcHBpbmcgQCMjI21hcHBpbmdIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gMTA7DQo+ICoqb2ZmaWNlIEAjIyNvZmZpY2VIb3VycyMjI2hvdXJzKiogPSBjb2Rpbmd0aW1lIC8gNjspDQoNCioqIyMjYWN0dWFsVG90YWxIb3VycyMjIyBIb3VycyoqIG9yICoqIyMjYWN0dWFsVG90YWxEYXlzIyMjIEVpZ2h0IEhvdXIgRGF5cyoqDQooYSB0b3RhbCBvZiB0aGUgcmVhbGlzdGljIHRpbWUgZnJhbWUgZm9yIHRoaXMgcHJvamVjdCkNCg0KPiAoaWYgY3JlYXRpbmcgYSBmb2xkZXIgYW5kIGZpbGUgdG9vayAqKjUgc2Vjb25kcyoqIGFuZCB3cml0aW5nIG9uZSBsaW5lIG9mIGNvZGUgdG9vayAqKjEwIHNlY29uZHMqKiwNCj4gd2l0aCB0aGUgbm9ybWFsIGV2ZXJ5ZGF5IHJlYWxpdGllcyBhdCB0aGUgb2ZmaWNlLCB0aGF0IGluY2x1ZGVzIHRoZSBjb21wb25lbnQgcGxhbm5pbmcsIG1hcHBpbmcgJiBkZWJ1Z2dpbmcuKQ0KDQpQcm9qZWN0IGR1cmF0aW9uOiAqKiMjI3Byb2plY3RXZWVrVGltZSMjIyB3ZWVrcyoqIG9yICoqIyMjcHJvamVjdE1vbnRoVGltZSMjIyBtb250aHMqKg0KDQo+IFRoaXMgKipjb21wb25lbnQqKiB3YXMgYnVpbGQgd2l0aCBhIEpvb21sYSBbQXV0b21hdGVkIENvbXBvbmVudCBCdWlsZGVyXShodHRwczovL3d3dy52ZG0uaW8vam9vbWxhLWNvbXBvbmVudC1idWlsZGVyKS4NCj4gRGV2ZWxvcGVkIGJ5IFtMbGV3ZWxseW4gdmFuIGRlciBNZXJ3ZV0obWFpbHRvOmpvb21sYUB2ZG0uaW8pDQoNCiMjIERvbmF0aW9ucw0KDQpJZiB5b3Ugd2FudCB0byBzdXBwb3J0IHRoaXMgcHJvamVjdCwgcGxlYXNlIGNvbnNpZGVyIGRvbmF0aW5nOg0KKiBQYXlQYWw6IFtwYXlwYWwubWUvcGF5dmRtXShodHRwczovL3d3dy5wYXlwYWwubWUvcGF5dmRtKQ0KKiBCaXRjb2luOiAxRkx4aVQ2d3l4Z1ozYm9ldmlMa1lKMURScHA0MXV6cHhhDQoqIEV0aGVyZXVtOiAweDI0MzM5MmRhYTNjOWM4YmM4NDFmY2FjZjdjN2Y3MjU0MWNiMTY4MjMg', 'Llewellyn van der Merwe', 'default.txt', '', '', 'Vast Development Method', '2.0.0', 'https://www.vdm.io/updates/demo_update_server.xml', 'Copyright (C) 2015. All Rights Reserved', '', '', '', '', 'Just a basic demo of the most basic implementations of the [Joomla](http://www.joomla.org) Component Builder\'s ability.', 'info@vdm.io', '', '', '', 'q59UiiKBVT2mWzkz3EPBrdIANxfa0dSmp+5sEgzgC+s=', 'images/vdm/demo500.jpg', '', 'GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html', 'Demo', 'Demo', '', 'demo', 4, '', '', 'CS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGZhbmN5IGRhdGUNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5RGF0ZSgkZGF0ZSkNCgl7DQoJCWlmICghc2VsZjo6aXNWYWxpZFRpbWVTdGFtcCgkZGF0ZSkpDQoJCXsNCgkJCSRkYXRlID0gc3RydG90aW1lKCRkYXRlKTsNCgkJfQ0KCQlyZXR1cm4gZGF0ZSgnalMgXG9cZiBGIFknLCRkYXRlKTsNCgl9DQoNCgkvKioNCgkgKglDaGFuZ2UgdG8gbmljZSBmYW5jeSB0aW1lIGFuZCBkYXRlDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeURhdGVUaW1lKCR0aW1lKQ0KCXsNCgkJaWYgKCFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCR0aW1lKSkNCgkJew0KCQkJJHRpbWUgPSBzdHJ0b3RpbWUoJHRpbWUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCcoRzppKSBqUyBcb1xmIEYgWScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoYW5nZSB0byBuaWNlIGhvdXI6bWludXRlcyB0aW1lDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBmYW5jeVRpbWUoJHRpbWUpDQoJew0KCQlpZiAoIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJHRpbWUpKQ0KCQl7DQoJCQkkdGltZSA9IHN0cnRvdGltZSgkdGltZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ0c6aScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqCUNoZWNrIGlmIHN0cmluZyBpcyBhIHZhbGlkIHRpbWUgc3RhbXANCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGlzVmFsaWRUaW1lU3RhbXAoJHRpbWVzdGFtcCkNCgl7DQoJCXJldHVybiAoKGludCkgJHRpbWVzdGFtcCA9PT0gJHRpbWVzdGFtcCkNCgkJJiYgKCR0aW1lc3RhbXAgPD0gUEhQX0lOVF9NQVgpDQoJCSYmICgkdGltZXN0YW1wID49IH5QSFBfSU5UX01BWCk7DQoJfQ0K', 'CQkvLyBHZXQgQXBwbGljYXRpb24gb2JqZWN0DQoJCSRhcHAgPSBKRmFjdG9yeTo6Z2V0QXBwbGljYXRpb24oKTsNCgkJJGFwcC0+ZW5xdWV1ZU1lc3NhZ2UoJ1RoaXMgaXMgYSBkZW1vIGNvbXBvbmVudCBkZXZlbG9wZWQgaW4gPGEgaHJlZj0iaHR0cDovL3ZkbS5iei9jb21wb25lbnQtYnVpbGRlciIgdGFnZXQ9Il9iYWxuayIgdGl0bGU9Ikpvb21sYSBDb21wb25lbnQgQnVpbGRlciI+SkNCPC9hPiEgWW91IGNhbiBidWlsZCBtb3JlIGNvbXBvbmVudHMgbGlrZSB0aGlzIHdpdGggSkNCLCBjaGVja291dCBvdXIgcGFnZSBvbiA8YSBocmVmPSJodHRwczovL2dpdGh1Yi5jb20vdmRtLWlvL0pvb21sYS1Db21wb25lbnQtQnVpbGRlciIgdGFnZXQ9Il9iYWxuayIgdGl0bGU9Ikpvb21sYSBDb21wb25lbnQgQnVpbGRlciI+Z2l0aHViPC9hPiBmb3IgbW9yZSBpbmZvLiBUaGUgZnV0dXJlIG9mIDxhIGhyZWY9Imh0dHA6Ly92ZG0uYnovY29tcG9uZW50LWJ1aWxkZXIiIHRhZ2V0PSJfYmFsbmsiIHRpdGxlPSJKb29tbGEgQ29tcG9uZW50IEJ1aWxkZXIiPkpvb21sYSBDb21wb25lbnQgRGV2ZWxvcG1lbnQ8L2E+IGlzIEhlcmUhJywgJ0luZm8nKTs=', '', '', '', '', 'Demo Component', '', '', 'https://www.vdm.io/', '{\"version_update0\":{\"version\":\"1.0.5\",\"mysql\":\"\",\"url\":\"https:\\/\\/github.com\\/namibia\\/demo-joomla-3-component\\/archive\\/v1.0.5.zip\"},\"version_update1\":{\"version\":\"2.0.0\",\"mysql\":\"\",\"url\":\"https:\\/\\/github.com\\/namibia\\/demo-joomla-3-component\\/archive\\/v2.0.0.zip\"}}', 1, '2016-10-18 11:44:09', '2017-08-25 00:36:01', '', 3, 'V6inNhoApqD2JvhSrOd+R/OzoW8mTod30wXoypEZacY=', '');
--
-- Dumping data for table `#__componentbuilder_admin_view`
@@ -1272,7 +1279,7 @@ INSERT INTO `#__componentbuilder_library` (`id`, `addconditions`, `description`,
INSERT INTO `#__componentbuilder_snippet` (`id`, `contributor_company`, `contributor_email`, `contributor_name`, `contributor_website`, `description`, `heading`, `library`, `name`, `snippet`, `type`, `url`, `usage`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES
(1, 'Vast Development Method', 'Joomla@vdm.io', 'Llewellyn van der Merwe', 'https://www.vdm.io/', 'The grid system of UIkit follows the mobile-first approach and accomodates up to 10 grid columns. It uses units with predefined classes inside each grid, which define the column width. It is also possible to combine the grid with classes from the Flex component, although it works only in modern browsers.', 'Create a fully responsive, fluid and nestable grid layout.', 4, 'Grid', 'PGRpdiBkYXRhLXVrLWdyaWQtbWFyZ2luPSIiIGNsYXNzPSJ0bS1ncmlkLXRydW5jYXRlIHVrLWdyaWQgdWstZ3JpZC1kaXZpZGVyIHVrLXRleHQtY2VudGVyIj4NCiAgICA8ZGl2IGNsYXNzPSJ1ay13aWR0aC1tZWRpdW0tMS0zIj4NCiAgICAJPGRpdiBjbGFzcz0idWstcGFuZWwgdWstcGFuZWwtYm94Ij4NCiAgICAgICAgCXtjb250ZW50fQ0KICAgICAgICA8L2Rpdj4NCiAgICA8L2Rpdj4NCiAgICA8ZGl2IGNsYXNzPSJ1ay13aWR0aC1tZWRpdW0tMS0zIj4NCiAgICAJPGRpdiBjbGFzcz0idWstcGFuZWwgdWstcGFuZWwtYm94Ij4NCiAgICAgICAgCXtjb250ZW50fQ0KICAgICAgICA8L2Rpdj4NCiAgICA8L2Rpdj4NCiAgICA8ZGl2IGNsYXNzPSJ1ay13aWR0aC1tZWRpdW0tMS0zIj4NCiAgICAJPGRpdiBjbGFzcz0idWstcGFuZWwgdWstcGFuZWwtYm94Ij4NCiAgICAgICAgCXtjb250ZW50fQ0KICAgICAgICA8L2Rpdj4NCiAgICA8L2Rpdj4NCjwvZGl2Pg==', 1, 'http://getuikit.com/docs/grid.html', 'To create the grid container, add the .uk-grid class to a parent element. Add one of the .uk-width-* classes to child elements to determine, how the units shall be sized. The grid supports 1, 2, 3, 4, 5, 6 and 10 unit divisions. This table gives you an overview of the uk-width-* classes that can be applied to units.', '', 1, '2015-05-19 17:18:32', '2017-11-11 22:09:27', 77, '', 1),
-(2, 'Vast Development Method', 'Joomla@vdm.io', 'Llewellyn van der Merwe', 'https://www.vdm.io/', 'UIkit uses panels to outline certain sections of your content, which can be styled differently. Typically, panels are arranged in grid columns from the Grid component.', 'Create layout boxes with different styles.', 4, 'Panel', 'PGRpdiBkYXRhLXVrLWdyaWQtbWFyZ2luPSIiIGNsYXNzPSJ1ay1ncmlkIj4NCiAgICA8ZGl2IGNsYXNzPSJ1ay13aWR0aC1tZWRpdW0tMS0yIj4NCiAgICAgICAgPGRpdiBjbGFzcz0idWstcGFuZWwgdWstcGFuZWwtYm94Ij4NCiAgICAgICAgICAgIDxoMyBjbGFzcz0idWstcGFuZWwtdGl0bGUiPnt0aXRsZX08L2gzPg0KICAgICAgICAgICAge2NvbnRlbnR9DQogICAgICAgIDwvZGl2Pg0KICAgIDwvZGl2Pg0KICAgIDxkaXYgY2xhc3M9InVrLXdpZHRoLW1lZGl1bS0xLTIiPg0KICAgICAgICA8ZGl2IGNsYXNzPSJ1ay1wYW5lbCB1ay1wYW5lbC1ib3giPg0KICAgICAgICAgICAgPGgzIGNsYXNzPSJ1ay1wYW5lbC10aXRsZSI+e3RpdGxlfTwvaDM+DQogICAgICAgICAgICB7Y29udGVudH0NCiAgICAgICAgPC9kaXY+DQogICAgPC9kaXY+DQo8L2Rpdj4=', 1, 'http://getuikit.com/docs/panel.html', 'The Panel component consists of the panel itself, the panel title and a panel badge. To prevent redundant white space, top and bottom margins are removed from the panel\'s content.', '', 1, '2015-05-19 20:04:54', '2017-11-11 22:09:27', 67, '', 1),
+(2, 'Vast Development Method', 'Joomla@vdm.io', 'Llewellyn van der Merwe', 'https://www.vdm.io/', 'UIkit uses panels to outline certain sections of your content, which can be styled differently. Typically, panels are arranged in grid columns from the Grid component.', 'Create layout boxes with different styles.', 4, 'Panel', 'PGRpdiBkYXRhLXVrLWdyaWQtbWFyZ2luPSIiIGNsYXNzPSJ1ay1ncmlkIj4NCiAgICA8ZGl2IGNsYXNzPSJ1ay13aWR0aC1tZWRpdW0tMS0yIj4NCiAgICAgICAgPGRpdiBjbGFzcz0idWstcGFuZWwgdWstcGFuZWwtYm94Ij4NCiAgICAgICAgICAgIDxoMyBjbGFzcz0idWstcGFuZWwtdGl0bGUiPnt0aXRsZX08L2gzPg0KICAgICAgICAgICAge2NvbnRlbnR9DQogICAgICAgIDwvZGl2Pg0KICAgIDwvZGl2Pg0KICAgIDxkaXYgY2xhc3M9InVrLXdpZHRoLW1lZGl1bS0xLTIiPg0KICAgICAgICA8ZGl2IGNsYXNzPSJ1ay1wYW5lbCB1ay1wYW5lbC1ib3giPg0KICAgICAgICAgICAgPGgzIGNsYXNzPSJ1ay1wYW5lbC10aXRsZSI+e3RpdGxlfTwvaDM+DQogICAgICAgICAgICB7Y29udGVudH0NCiAgICAgICAgPC9kaXY+DQogICAgPC9kaXY+DQo8L2Rpdj4=', 1, 'http://getuikit.com/docs/panel.html', 'The Panel component consists of the panel itself, the panel title and a panel badge. To prevent redundant white space, top and bottom margins are removed from the panel\'s content.', '', 1, '2015-05-19 20:04:54', '2017-11-11 22:09:27', 70, '', 1),
(3, 'Vast Development Method', 'Joomla@vdm.io', 'Llewellyn van der Merwe', 'https://www.vdm.io/', '', 'Separate content sections by bundling them in blocks with different styles.', 4, 'Block', 'PGRpdiBjbGFzcz0idWstYmxvY2sgdWstYmxvY2stcHJpbWFyeSI+e2NvbnRlbnR9PC9kaXY+', 1, 'http://getuikit.com/docs/block.html', 'To apply this component, just add the .uk-block class to a container element.', '', 1, '2015-05-19 20:09:41', '2017-11-11 22:09:27', 56, '', 2),
(4, 'Vast Development Method', 'Joomla@vdm.io', 'Llewellyn van der Merwe', 'https://www.vdm.io/', '', 'Create articles within your page.', 4, 'Article', 'PGFydGljbGUgY2xhc3M9InVrLWFydGljbGUiPg0KICAgIDxoMSBjbGFzcz0idWstYXJ0aWNsZS10aXRsZSI+e3RpdGxlfTwvaDE+DQogICAgPHAgY2xhc3M9InVrLWFydGljbGUtbWV0YSI+e21ldGF9PC9wPg0KICAgIDxwIGNsYXNzPSJ1ay1hcnRpY2xlLWxlYWQiPntjb250ZW50fTwvcD4NCiAgICB7Y29udGVudH0NCiAgICA8aHIgY2xhc3M9InVrLWFydGljbGUtZGl2aWRlciI+DQogICAge2NvbnRlbnR9DQo8L2FydGljbGU+', 1, 'http://getuikit.com/docs/article.html', 'The article component consists of the article itself, a title, meta data, an opening paragraph and dividers.', '', 1, '2015-05-19 20:12:06', '2017-11-11 22:09:27', 53, '', 3),
(5, 'Vast Development Method', 'Joomla@vdm.io', 'Llewellyn van der Merwe', 'https://www.vdm.io/', '', 'Create comments, for example about articles.', 4, 'Comment', 'PGFydGljbGUgY2xhc3M9InVrLWNvbW1lbnQiPg0KICAgIDxoZWFkZXIgY2xhc3M9InVrLWNvbW1lbnQtaGVhZGVyIj4NCiAgICAgICAgPGltZyBjbGFzcz0idWstY29tbWVudC1hdmF0YXIiIHNyYz0ie2ltYWdldXJsfSIgYWx0PSIiPg0KICAgICAgICA8aDQgY2xhc3M9InVrLWNvbW1lbnQtdGl0bGUiPnt0aXRsZX08L2g0Pg0KICAgICAgICA8ZGl2IGNsYXNzPSJ1ay1jb21tZW50LW1ldGEiPnttZXRhfTwvZGl2Pg0KICAgIDwvaGVhZGVyPg0KICAgIDxkaXYgY2xhc3M9InVrLWNvbW1lbnQtYm9keSI+e3RpdGxlfTwvZGl2Pg0KPC9hcnRpY2xlPg==', 1, 'http://getuikit.com/docs/comment.html', 'The Comment component consists of a comment header, including an avatar, a title and meta data, and a comment body.', '', 1, '2015-05-19 20:13:53', '2017-11-11 22:09:27', 54, '', 4),
@@ -1613,24 +1620,15 @@ INSERT INTO `#__componentbuilder_snippet_type` (`id`, `name`, `description`, `pa
(42, 'Utility: Spacing', '', '', 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, '', 42),
(43, 'Utility: Text', '', '', 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, '', 43);
---
--- Dumping data for table `#__componentbuilder_library_config`
---
-INSERT INTO `#__componentbuilder_library_config` (`id`, `addconfig`, `library`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES
-(1, '', 2, '', 1, '2017-11-25 02:59:38', '2017-12-17 09:04:04', 12, '', 1),
-(2, '', 3, '', 1, '2017-11-25 21:51:25', '2017-12-10 15:08:32', 6, '', 2);
--
-- Dumping data for table `#__componentbuilder_library_files_folders_urls`
--
INSERT INTO `#__componentbuilder_library_files_folders_urls` (`id`, `addfiles`, `addfolders`, `addurls`, `library`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES
-(1, '', '', '', 4, '', 1, '2017-11-25 00:09:15', '2017-12-25 12:38:11', 9, '', 1),
(2, '', '', '{\"addurls0\":{\"url\":\"https:\\/\\/maxcdn.bootstrapcdn.com\\/bootstrap\\/4.0.0-alpha.6\\/js\\/bootstrap.min.js\",\"type\":\"2\"},\"addurls1\":{\"url\":\"https:\\/\\/maxcdn.bootstrapcdn.com\\/bootstrap\\/4.0.0-alpha.6\\/css\\/bootstrap.min.css\",\"type\":\"2\"}}', 2, '', 1, '2017-11-25 16:17:36', '2017-12-25 12:40:16', 10, '', 2),
-(3, '', '', '{\"addurls0\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/js\\/uikit.min.js\",\"type\":\"2\"},\"addurls1\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/js\\/uikit-icons.min.js\",\"type\":\"2\"},\"addurls2\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/css\\/uikit.min.css\",\"type\":\"2\"}}', 3, '', 1, '2017-11-25 21:47:40', '2017-12-25 12:38:24', 8, '', 3),
-(4, '', '', '', 5, '', 1, '2017-11-25 22:00:43', '2017-12-25 12:38:29', 4, '', 4),
-(5, '', '', '', 6, '', 1, '2017-11-25 22:12:42', '2017-12-25 12:38:34', 5, '', 5);
+(3, '', '', '{\"addurls0\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/js\\/uikit.min.js\",\"type\":\"2\"},\"addurls1\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/js\\/uikit-icons.min.js\",\"type\":\"2\"},\"addurls2\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/css\\/uikit.min.css\",\"type\":\"2\"}}', 3, '', 1, '2017-11-25 21:47:40', '2017-12-25 12:38:24', 8, '', 3);
diff --git a/admin/sql/updates/mysql/2.6.9.sql b/admin/sql/updates/mysql/2.6.9.sql
new file mode 100644
index 000000000..fd9eda1d4
--- /dev/null
+++ b/admin/sql/updates/mysql/2.6.9.sql
@@ -0,0 +1,13 @@
+ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `add_php_ajax` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_js_document`;
+
+ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `ajax_input` TEXT NOT NULL AFTER `add_php_view`;
+
+ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `php_ajaxmethod` MEDIUMTEXT NOT NULL AFTER `not_required`;
+
+ALTER TABLE `#__componentbuilder_joomla_component` CHANGE `css` `css_admin` TEXT NOT NULL;
+
+ALTER TABLE `#__componentbuilder_joomla_component` CHANGE `add_css` `add_css_admin` TINYINT(1) NOT NULL DEFAULT 0 ;
+
+ALTER TABLE `#__componentbuilder_joomla_component` ADD `add_css_site` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_css_admin`;
+
+ALTER TABLE `#__componentbuilder_joomla_component` ADD `css_site` TEXT NOT NULL AFTER `css_admin`;
diff --git a/admin/views/admin_fields/view.html.php b/admin/views/admin_fields/view.html.php
index 69365a042..f6bc1e033 100644
--- a/admin/views/admin_fields/view.html.php
+++ b/admin/views/admin_fields/view.html.php
@@ -194,9 +194,9 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_EDIT'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_fields.css", array('version' => 'auto'));
- $this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
- $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_fields/submitbutton.js", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_fields.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+ $this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_fields/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
JText::script('view not acceptable. Error');
}
}
diff --git a/admin/views/admin_fields_conditions/view.html.php b/admin/views/admin_fields_conditions/view.html.php
index c587979cd..880f4e984 100644
--- a/admin/views/admin_fields_conditions/view.html.php
+++ b/admin/views/admin_fields_conditions/view.html.php
@@ -194,11 +194,11 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_EDIT'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_fields_conditions.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_fields_conditions.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
// Add Ajax Token
$this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';");
- $this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
- $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_fields_conditions/submitbutton.js", array('version' => 'auto'));
+ $this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_fields_conditions/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
JText::script('view not acceptable. Error');
}
}
diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php
index bb27f1db2..5b6245966 100644
--- a/admin/views/admin_view/tmpl/edit.php
+++ b/admin/views/admin_view/tmpl/edit.php
@@ -72,6 +72,11 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
+
@@ -214,431 +219,416 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php
index 6ebb9dbdf..7b1c165fa 100644
--- a/admin/views/custom_admin_view/view.html.php
+++ b/admin/views/custom_admin_view/view.html.php
@@ -194,11 +194,22 @@ class ComponentbuilderViewCustom_admin_view extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NEW' : 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_EDIT'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_admin_view.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_admin_view.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
// Add Ajax Token
$this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';");
- $this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
- $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/custom_admin_view/submitbutton.js", array('version' => 'auto'));
+ $this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/custom_admin_view/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+
+ // add the Uikit v2 style sheets
+ $this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+ $this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+
+ // add Uikit v2 JavaScripts
+ $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit.min.js' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
+ $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/notify.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
+ // add var key
+ $this->document->addScriptDeclaration("var vastDevMod = '".$this->get('VDM')."';");
JText::script('view not acceptable. Error');
}
}
diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php
index 94a03c76d..0f41675e8 100644
--- a/admin/views/custom_admin_views/view.html.php
+++ b/admin/views/custom_admin_views/view.html.php
@@ -219,7 +219,7 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_admin_views.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_admin_views.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
}
/**
diff --git a/admin/views/custom_code/tmpl/edit.php b/admin/views/custom_code/tmpl/edit.php
index 55d2bfa07..d20f073f4 100644
--- a/admin/views/custom_code/tmpl/edit.php
+++ b/admin/views/custom_code/tmpl/edit.php
@@ -127,101 +127,101 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
diff --git a/admin/views/dynamic_get/view.html.php b/admin/views/dynamic_get/view.html.php
index 1e3d48619..9fbccd7e0 100644
--- a/admin/views/dynamic_get/view.html.php
+++ b/admin/views/dynamic_get/view.html.php
@@ -194,11 +194,22 @@ class ComponentbuilderViewDynamic_get extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_DYNAMIC_GET_NEW' : 'COM_COMPONENTBUILDER_DYNAMIC_GET_EDIT'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/dynamic_get.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/dynamic_get.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
// Add Ajax Token
$this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';");
- $this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
- $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/dynamic_get/submitbutton.js", array('version' => 'auto'));
+ $this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/dynamic_get/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+
+ // add the Uikit v2 style sheets
+ $this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+ $this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+
+ // add Uikit v2 JavaScripts
+ $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit.min.js' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
+ $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/notify.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
+ // add var key
+ $this->document->addScriptDeclaration("var vastDevMod = '".$this->get('VDM')."';");
JText::script('view not acceptable. Error');
}
}
diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php
index 180efa6b0..ad758cec7 100644
--- a/admin/views/dynamic_gets/view.html.php
+++ b/admin/views/dynamic_gets/view.html.php
@@ -258,7 +258,7 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_DYNAMIC_GETS'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/dynamic_gets.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/dynamic_gets.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
}
/**
diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php
index 07fd26a91..48ae5e62b 100644
--- a/admin/views/field/tmpl/edit.php
+++ b/admin/views/field/tmpl/edit.php
@@ -137,157 +137,157 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
diff --git a/admin/views/field/view.html.php b/admin/views/field/view.html.php
index 3da4a67ec..e0fd7dc16 100644
--- a/admin/views/field/view.html.php
+++ b/admin/views/field/view.html.php
@@ -194,11 +194,22 @@ class ComponentbuilderViewField extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_FIELD_NEW' : 'COM_COMPONENTBUILDER_FIELD_EDIT'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/field.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/field.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
// Add Ajax Token
$this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';");
- $this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
- $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/field/submitbutton.js", array('version' => 'auto'));
+ $this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/field/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+
+ // add the Uikit v2 style sheets
+ $this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+ $this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+
+ // add Uikit v2 JavaScripts
+ $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit.min.js' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
+ $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/notify.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
+ // add var key
+ $this->document->addScriptDeclaration("var vastDevMod = '".$this->get('VDM')."';");
JText::script('view not acceptable. Error');
}
}
diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php
index fa32c3900..22d8d639f 100644
--- a/admin/views/fields/view.html.php
+++ b/admin/views/fields/view.html.php
@@ -341,7 +341,7 @@ class ComponentbuilderViewFields extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_FIELDS'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/fields.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/fields.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
}
/**
diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php
index d5b0a3933..ce7c041e2 100644
--- a/admin/views/fieldtype/view.html.php
+++ b/admin/views/fieldtype/view.html.php
@@ -64,7 +64,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
}
// Get Linked view data
- $this->vzyfields = $this->get('Vzyfields');
+ $this->waafields = $this->get('Waafields');
// Set the toolbar
$this->addToolBar();
@@ -197,19 +197,19 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_FIELDTYPE_NEW' : 'COM_COMPONENTBUILDER_FIELDTYPE_EDIT'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/fieldtype.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/fieldtype.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
// Add the CSS for Footable
$this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');
- $this->document->addStyleSheet(JURI::root() .'media/com_componentbuilder/footable-v3/css/footable.standalone.min.css', array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() .'media/com_componentbuilder/footable-v3/css/footable.standalone.min.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
// Add the JavaScript for Footable (adding all funtions)
- $this->document->addScript(JURI::root() .'media/com_componentbuilder/footable-v3/js/footable.min.js', array('version' => 'auto'));
+ $this->document->addScript(JURI::root() .'media/com_componentbuilder/footable-v3/js/footable.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable();});});";
$this->document->addScriptDeclaration($footable);
- $this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
- $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/fieldtype/submitbutton.js", array('version' => 'auto'));
+ $this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/fieldtype/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
JText::script('view not acceptable. Error');
}
}
diff --git a/admin/views/fieldtypes/view.html.php b/admin/views/fieldtypes/view.html.php
index af330aa25..1590b8cfc 100644
--- a/admin/views/fieldtypes/view.html.php
+++ b/admin/views/fieldtypes/view.html.php
@@ -231,7 +231,7 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_FIELDTYPES'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/fieldtypes.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/fieldtypes.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
}
/**
diff --git a/admin/views/ftp/view.html.php b/admin/views/ftp/view.html.php
index 0a0726a60..d845fa61e 100644
--- a/admin/views/ftp/view.html.php
+++ b/admin/views/ftp/view.html.php
@@ -64,7 +64,7 @@ class ComponentbuilderViewFtp extends JViewLegacy
}
// Get Linked view data
- $this->vzzlinked_components = $this->get('Vzzlinked_components');
+ $this->wablinked_components = $this->get('Wablinked_components');
// Set the toolbar
$this->addToolBar();
@@ -197,19 +197,19 @@ class ComponentbuilderViewFtp extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_FTP_NEW' : 'COM_COMPONENTBUILDER_FTP_EDIT'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/ftp.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/ftp.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
// Add the CSS for Footable
$this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');
- $this->document->addStyleSheet(JURI::root() .'media/com_componentbuilder/footable-v3/css/footable.standalone.min.css', array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() .'media/com_componentbuilder/footable-v3/css/footable.standalone.min.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
// Add the JavaScript for Footable (adding all funtions)
- $this->document->addScript(JURI::root() .'media/com_componentbuilder/footable-v3/js/footable.min.js', array('version' => 'auto'));
+ $this->document->addScript(JURI::root() .'media/com_componentbuilder/footable-v3/js/footable.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable();});});";
$this->document->addScriptDeclaration($footable);
- $this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
- $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/ftp/submitbutton.js", array('version' => 'auto'));
+ $this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/ftp/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
JText::script('view not acceptable. Error');
}
}
diff --git a/admin/views/ftps/view.html.php b/admin/views/ftps/view.html.php
index 8d81537a1..dd5bd6ed4 100644
--- a/admin/views/ftps/view.html.php
+++ b/admin/views/ftps/view.html.php
@@ -236,7 +236,7 @@ class ComponentbuilderViewFtps extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_FTPS'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/ftps.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/ftps.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
}
/**
diff --git a/admin/views/get_snippets/view.html.php b/admin/views/get_snippets/view.html.php
index a203cc5ca..7a79f223f 100644
--- a/admin/views/get_snippets/view.html.php
+++ b/admin/views/get_snippets/view.html.php
@@ -81,7 +81,7 @@ class ComponentbuilderViewGet_snippets extends JViewLegacy
$HeaderCheck = new componentbuilderHeaderCheck;
// Add View JavaScript File
- $this->document->addScript(JURI::root(true) . "/administrator/components/com_componentbuilder/assets/js/get_snippets.js", array("version" => "auto"));
+ $this->document->addScript(JURI::root(true) . "/administrator/components/com_componentbuilder/assets/js/get_snippets.js", (ComponentbuilderHelper::jVersion()->isCompatible("3.8.0")) ? array("version" => "auto") : "text/javascript");
// Load uikit options.
$uikit = $this->params->get('uikit_load');
@@ -93,12 +93,12 @@ class ComponentbuilderViewGet_snippets extends JViewLegacy
// The uikit css.
if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
{
- $this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
}
// The uikit js.
if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
{
- $this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', array('version' => 'auto'));
+ $this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
}
// Load the script to find all uikit components needed.
@@ -124,13 +124,13 @@ class ComponentbuilderViewGet_snippets extends JViewLegacy
if (JFile::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css'))
{
// load the css.
- $this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css', array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
}
// check if the JavaScript file exists.
if (JFile::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js'))
{
// load the js.
- $this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', array('version' => 'auto'), array('type' => 'text/javascript', 'async' => 'async'));
+ $this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
}
}
}
@@ -256,7 +256,7 @@ class ComponentbuilderViewGet_snippets extends JViewLegacy
$this->document->addScriptDeclaration("var local_snippets = ". json_encode($local_snippets).";");
}
// add the document default css file
- $this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_componentbuilder/assets/css/get_snippets.css', array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_componentbuilder/assets/css/get_snippets.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
}
/**
diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php
index 974d4d228..00e1c6aed 100644
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@@ -127,63 +127,33 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
diff --git a/admin/views/site_view/view.html.php b/admin/views/site_view/view.html.php
index f0dbb2c99..c37a58b80 100644
--- a/admin/views/site_view/view.html.php
+++ b/admin/views/site_view/view.html.php
@@ -194,11 +194,22 @@ class ComponentbuilderViewSite_view extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_SITE_VIEW_NEW' : 'COM_COMPONENTBUILDER_SITE_VIEW_EDIT'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/site_view.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/site_view.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
// Add Ajax Token
$this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';");
- $this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
- $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/site_view/submitbutton.js", array('version' => 'auto'));
+ $this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/site_view/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+
+ // add the Uikit v2 style sheets
+ $this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+ $this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+
+ // add Uikit v2 JavaScripts
+ $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit.min.js' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
+ $this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/notify.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
+ // add var key
+ $this->document->addScriptDeclaration("var vastDevMod = '".$this->get('VDM')."';");
JText::script('view not acceptable. Error');
}
}
diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php
index dfb14992f..78df12fab 100644
--- a/admin/views/site_views/view.html.php
+++ b/admin/views/site_views/view.html.php
@@ -219,7 +219,7 @@ class ComponentbuilderViewSite_views extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_SITE_VIEWS'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/site_views.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/site_views.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
}
/**
diff --git a/admin/views/snippet/view.html.php b/admin/views/snippet/view.html.php
index 209bc2500..39e1b5b3d 100644
--- a/admin/views/snippet/view.html.php
+++ b/admin/views/snippet/view.html.php
@@ -194,11 +194,9 @@ class ComponentbuilderViewSnippet extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_SNIPPET_NEW' : 'COM_COMPONENTBUILDER_SNIPPET_EDIT'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/snippet.css", array('version' => 'auto'));
- // Add Ajax Token
- $this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';");
- $this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
- $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/snippet/submitbutton.js", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/snippet.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+ $this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/snippet/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
JText::script('view not acceptable. Error');
}
}
diff --git a/admin/views/snippet_type/view.html.php b/admin/views/snippet_type/view.html.php
index 6bdebf3dd..f74f0bae1 100644
--- a/admin/views/snippet_type/view.html.php
+++ b/admin/views/snippet_type/view.html.php
@@ -194,9 +194,9 @@ class ComponentbuilderViewSnippet_type extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_SNIPPET_TYPE_NEW' : 'COM_COMPONENTBUILDER_SNIPPET_TYPE_EDIT'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/snippet_type.css", array('version' => 'auto'));
- $this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
- $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/snippet_type/submitbutton.js", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/snippet_type.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+ $this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+ $this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/snippet_type/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
JText::script('view not acceptable. Error');
}
}
diff --git a/admin/views/snippet_types/view.html.php b/admin/views/snippet_types/view.html.php
index c4658f4f1..4508d205f 100644
--- a/admin/views/snippet_types/view.html.php
+++ b/admin/views/snippet_types/view.html.php
@@ -204,7 +204,7 @@ class ComponentbuilderViewSnippet_types extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_SNIPPET_TYPES'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/snippet_types.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/snippet_types.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
}
/**
diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php
index 8d457a9b7..a9514d761 100644
--- a/admin/views/snippets/view.html.php
+++ b/admin/views/snippets/view.html.php
@@ -268,7 +268,7 @@ class ComponentbuilderViewSnippets extends JViewLegacy
$this->document = JFactory::getDocument();
}
$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_SNIPPETS'));
- $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/snippets.css", array('version' => 'auto'));
+ $this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/snippets.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
}
/**
diff --git a/admin/views/template/tmpl/edit.php b/admin/views/template/tmpl/edit.php
index e3d6ffbc6..694ef30cd 100644
--- a/admin/views/template/tmpl/edit.php
+++ b/admin/views/template/tmpl/edit.php
@@ -139,18 +139,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');