diff --git a/README.md b/README.md index 73a9d4d1b..8c48412c4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Component Builder (2.1.6) +# Component Builder (2.1.7) This is a [Joomla 3.x] (http://www.joomla.org/) component. @@ -33,31 +33,31 @@ Would you require more help VDM.io has a number of support plans available [visi + *Name*: [Component Builder] (https://www.vdm.io/joomla-component-builder) + *First Build*: 30th April, 2015 + *Last Build*: 4th May, 2016 -+ *Version*: 2.1.6 ++ *Version*: 2.1.7 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html ## Build Time -**227 Hours** or **28 Eight Hour Days** (actual time the author saved - +**228 Hours** or **29 Eight Hour Days** (actual time the author saved - due to [Automated Component Builder] (https://www.vdm.io/joomla-component-builder)) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **81589** -+ *File count*: **499** ++ *Line count*: **81816** ++ *File count*: **500** + *Folder count*: **98** -**150 Hours** or **19 Eight Hour Days** (the actual time the author spent) +**151 Hours** or **18 Eight Hour Days** (the actual time the author spent) > (with the following break down: > **debugging @57hours** = codingtime / 4; -> **planning @32hours** = codingtime / 7; +> **planning @33hours** = codingtime / 7; > **mapping @23hours** = codingtime / 10; > **office @38hours** = codingtime / 6;) -**377 Hours** or **47 Eight Hour Days** +**379 Hours** or **47 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 6e051985a..64161b970 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index f81c7ff7b..6cb0ca841 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index 036bd2965..c46b02541 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/component.css b/admin/assets/css/component.css index 1d5bb4b2a..7184b1aa9 100644 --- a/admin/assets/css/component.css +++ b/admin/assets/css/component.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/components.css b/admin/assets/css/components.css index 6aad79b95..25a44c1a2 100644 --- a/admin/assets/css/components.css +++ b/admin/assets/css/components.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/custom_admin_view.css b/admin/assets/css/custom_admin_view.css index 7965f4964..9d5a4cd34 100644 --- a/admin/assets/css/custom_admin_view.css +++ b/admin/assets/css/custom_admin_view.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/custom_admin_views.css b/admin/assets/css/custom_admin_views.css index de4e3cbe4..20ade4bac 100644 --- a/admin/assets/css/custom_admin_views.css +++ b/admin/assets/css/custom_admin_views.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index a871257ad..8b374a859 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/dynamic_get.css b/admin/assets/css/dynamic_get.css index d5bdd074e..5b48a68df 100644 --- a/admin/assets/css/dynamic_get.css +++ b/admin/assets/css/dynamic_get.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/dynamic_gets.css b/admin/assets/css/dynamic_gets.css index 5601eca4d..4f2ade3a8 100644 --- a/admin/assets/css/dynamic_gets.css +++ b/admin/assets/css/dynamic_gets.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/field.css b/admin/assets/css/field.css index 8ac0d0040..7252b50f9 100644 --- a/admin/assets/css/field.css +++ b/admin/assets/css/field.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/fields.css b/admin/assets/css/fields.css index 290b80c8e..40f1b92b3 100644 --- a/admin/assets/css/fields.css +++ b/admin/assets/css/fields.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/fieldtype.css b/admin/assets/css/fieldtype.css index 0130d4775..2cd79781d 100644 --- a/admin/assets/css/fieldtype.css +++ b/admin/assets/css/fieldtype.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/fieldtypes.css b/admin/assets/css/fieldtypes.css index 24169c602..b4ac8d054 100644 --- a/admin/assets/css/fieldtypes.css +++ b/admin/assets/css/fieldtypes.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index 6c00c78b2..f16cced67 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 2835b6804..6b3ae4d3c 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/layout.css b/admin/assets/css/layout.css index 43c00b232..95186a070 100644 --- a/admin/assets/css/layout.css +++ b/admin/assets/css/layout.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/layouts.css b/admin/assets/css/layouts.css index 81ff0c7ab..f5975729f 100644 --- a/admin/assets/css/layouts.css +++ b/admin/assets/css/layouts.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/site_view.css b/admin/assets/css/site_view.css index 1f5554057..e6d581be4 100644 --- a/admin/assets/css/site_view.css +++ b/admin/assets/css/site_view.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/site_views.css b/admin/assets/css/site_views.css index e6b99efd7..d31d9eb2a 100644 --- a/admin/assets/css/site_views.css +++ b/admin/assets/css/site_views.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/snippet.css b/admin/assets/css/snippet.css index 5a4e163e3..dcc367fe8 100644 --- a/admin/assets/css/snippet.css +++ b/admin/assets/css/snippet.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/snippets.css b/admin/assets/css/snippets.css index cbb048748..b0e343e02 100644 --- a/admin/assets/css/snippets.css +++ b/admin/assets/css/snippets.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/template.css b/admin/assets/css/template.css index eea80a644..12b9c2326 100644 --- a/admin/assets/css/template.css +++ b/admin/assets/css/template.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/assets/css/templates.css b/admin/assets/css/templates.css index 4a54fe1c8..756dc1a08 100644 --- a/admin/assets/css/templates.css +++ b/admin/assets/css/templates.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/compiler/joomla_3/JModelLegacy_import.php b/admin/compiler/joomla_3/JModelLegacy_import.php index 11f0b4883..2422a1840 100644 --- a/admin/compiler/joomla_3/JModelLegacy_import.php +++ b/admin/compiler/joomla_3/JModelLegacy_import.php @@ -55,7 +55,7 @@ class ###Component###ModelImport extends JModelLegacy * Import Settings */ protected $getType = NULL; - protected $dataType = NULL; + protected $dataType = NULL; /** * Method to auto-populate the model state. diff --git a/admin/compiler/joomla_3/JModelLegacy_import_custom.php b/admin/compiler/joomla_3/JModelLegacy_import_custom.php index 93504ff17..5825f9083 100644 --- a/admin/compiler/joomla_3/JModelLegacy_import_custom.php +++ b/admin/compiler/joomla_3/JModelLegacy_import_custom.php @@ -55,7 +55,7 @@ class ###Component###Model###View### extends JModelLegacy * Import Settings */ protected $getType = NULL; - protected $dataType = NULL; + protected $dataType = NULL; /** * Method to auto-populate the model state. @@ -81,117 +81,7 @@ class ###Component###Model###View### extends JModelLegacy $this->safeFileOptions = array(); parent::populateState(); } - - /** - * Import an spreadsheet from either folder, url or upload. - * - * @return boolean result of import - * - */ - public function import() - { - $this->setState('action', 'import'); - $app = JFactory::getApplication(); - $session = JFactory::getSession(); - $package = null; - $continue = false; - // get import type - $this->getType = $app->input->getString('gettype', NULL); - // get import type - $this->dataType = $session->get('dataType_VDM_IMPORTINTO', NULL); - - if ($package === null) - { - switch ($this->getType) - { - case 'folder': - // Remember the 'Import from Directory' path. - $app->getUserStateFromRequest($this->_context . '.import_directory', 'import_directory'); - $package = $this->_getPackageFromFolder(); - break; - - case 'upload': - $package = $this->_getPackageFromUpload(); - break; - - case 'url': - $package = $this->_getPackageFromUrl(); - break; - - case 'continue': - $continue = true; - $package = $session->get('package', null); - $package = json_decode($package, true); - // clear session - $session->clear('package'); - $session->clear('dataType'); - $session->clear('hasPackage'); - break; - - default: - $app->setUserState('com_###component###.message', JText::_('COM_###COMPONENT###_IMPORT_NO_IMPORT_TYPE_FOUND')); - - return false; - break; - } - } - // Was the package valid? - if (!$package || !$package['type']) - { - if (in_array($this->getType, array('upload', 'url'))) - { - $this->remove($package['packagename']); - } - - $app->setUserState('com_###component###.message', JText::_('COM_###COMPONENT###_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE')); - return false; - } - - // first link data to table headers - if(!$continue){ - $package = json_encode($package); - $session->set('package', $package); - $session->set('dataType', $this->dataType); - $session->set('hasPackage', true); - return true; - } - - // set the data - $headerList = json_decode($session->get($this->dataType.'_VDM_IMPORTHEADERS', false), true); - if (!$this->setData($package,$this->dataType,$headerList)) - { - // There was an error importing the package - $msg = JText::_('COM_###COMPONENT###_IMPORT_ERROR'); - $back = $session->get('backto_VDM_IMPORT', NULL); - if ($back) - { - $app->setUserState('com_###component###.redirect_url', 'index.php?option=com_###component###&view='.$back); - $session->clear('backto_VDM_IMPORT'); - } - $result = false; - } - else - { - // Package imported sucessfully - $msg = JText::sprintf('COM_###COMPONENT###_IMPORT_SUCCESS', $package['packagename']); - $back = $session->get('backto_VDM_IMPORT', NULL); - if ($back) - { - $app->setUserState('com_###component###.redirect_url', 'index.php?option=com_###component###&view='.$back); - $session->clear('backto_VDM_IMPORT'); - } - $result = true; - } - - // Set some model state values - $app->enqueueMessage($msg); - - // remove file after import - $this->remove($package['packagename']); - $session->clear($this->getType.'_VDM_IMPORTHEADERS'); - - return $result; - } + ###IMPORT_METHOD_CUSTOM### /** * Works out an importation spreadsheet from a HTTP upload @@ -406,30 +296,8 @@ class ###Component###Model###View### extends JModelLegacy JFile::delete(JPath::clean($package)); } } - - /** - * Set the data from the spreadsheet to the database - * - * @param string $package Paths to the uploaded package file - * - * @return boolean false on failure - * - **/ - protected function setData($package,$table,$target_headers) - {###IMPORT_SETDATE_METOD_CUSTOM### - } - - /** - * Save the data from the file to the database - * - * @param string $package Paths to the uploaded package file - * - * @return boolean false on failure - * - **/ - protected function save($data,$table) - {###IMPORT_SAVE_METOD_CUSTOM### - } + ###IMPORT_SETDATE_METHOD_CUSTOM### + ###IMPORT_SAVE_METHOD_CUSTOM### protected function getAlias($name,$type = false) { diff --git a/admin/compiler/joomla_3/default_import.php b/admin/compiler/joomla_3/default_import.php index 84830af73..e888680ae 100644 --- a/admin/compiler/joomla_3/default_import.php +++ b/admin/compiler/joomla_3/default_import.php @@ -34,8 +34,7 @@ JHtml::_('bootstrap.tooltip'); JHtml::_('script', 'system/core.js', false, true); ?> @@ -148,89 +147,87 @@ JHtml::_('script', 'system/core.js', false, true);
- - hasPackage && ###Component###Helper::checkArray($this->headerList) && ###Component###Helper::checkArray($this->headers)) : ?> -
- -
- -
- -
-
- headerList as $name => $title): ?> -
- -
- -
-
- -
- -
-
- - + + hasPackage && ###Component###Helper::checkArray($this->headerList) && ###Component###Helper::checkArray($this->headers)) : ?> +
+ +
+ +
+ +
+
+ headerList as $name => $title): ?> +
+ +
+ +
+
+ +
+ +
+
+ + 'upload')); ?> - - -
- -
- -
- -
-
-
-     (.csv .xls .ods) -
-
- - - -
- -
- -
- -
-
-
-     (.csv .xls .ods) -
-
- - - -
- -
- -
- -
-
-
-     (.csv .xls .ods) -
-
- - - - + + +
+ +
+ +
+ +
+
+
+     (.csv .xls .ods) +
+
+ + + +
+ +
+ +
+ +
+
+
+     (.csv .xls .ods) +
+
+ + + +
+ +
+ +
+ +
+
+
+     (.csv .xls .ods) +
+
+ + - - - + + + -
+ \ No newline at end of file diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index 7b727d1ff..43a7e1362 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controller.php b/admin/controller.php index 36102432e..59b29c6a1 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 4397c1c07..6cb3cc9d1 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index 3d04f7c43..231133d5a 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 3c8154bd5..92119684f 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php index 524f1feca..645d4ea5f 100644 --- a/admin/controllers/compiler.php +++ b/admin/controllers/compiler.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/component.php b/admin/controllers/component.php index e4d4bf721..1f30625cb 100644 --- a/admin/controllers/component.php +++ b/admin/controllers/component.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 3d826b5bd..48c5896ae 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/components.php b/admin/controllers/components.php index d0d936180..37f77b8f9 100644 --- a/admin/controllers/components.php +++ b/admin/controllers/components.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php index e791cfd07..af94439a6 100644 --- a/admin/controllers/custom_admin_view.php +++ b/admin/controllers/custom_admin_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/custom_admin_views.php b/admin/controllers/custom_admin_views.php index 170d69b57..04a6a56ec 100644 --- a/admin/controllers/custom_admin_views.php +++ b/admin/controllers/custom_admin_views.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/dynamic_get.php b/admin/controllers/dynamic_get.php index 8f064a710..75fa44503 100644 --- a/admin/controllers/dynamic_get.php +++ b/admin/controllers/dynamic_get.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php index 04fca5cfb..24abfca39 100644 --- a/admin/controllers/dynamic_gets.php +++ b/admin/controllers/dynamic_gets.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/field.php b/admin/controllers/field.php index e6d38cc70..7fc5ebb2e 100644 --- a/admin/controllers/field.php +++ b/admin/controllers/field.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/fields.php b/admin/controllers/fields.php index 352ad95bb..01c7e2676 100644 --- a/admin/controllers/fields.php +++ b/admin/controllers/fields.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/fieldtype.php b/admin/controllers/fieldtype.php index 46f7f38f2..4298f171e 100644 --- a/admin/controllers/fieldtype.php +++ b/admin/controllers/fieldtype.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/fieldtypes.php b/admin/controllers/fieldtypes.php index 6243d2576..8f6fd4c9a 100644 --- a/admin/controllers/fieldtypes.php +++ b/admin/controllers/fieldtypes.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 9cef3566b..5e72b00b7 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index 655ce1b88..3b34ba0f4 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index 7e9bb7fd4..af5fa4922 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 7c95f0745..78e2b4458 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/layout.php b/admin/controllers/layout.php index 0ca2ede9b..a741f5b6a 100644 --- a/admin/controllers/layout.php +++ b/admin/controllers/layout.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/layouts.php b/admin/controllers/layouts.php index 6caf9d933..a1109540b 100644 --- a/admin/controllers/layouts.php +++ b/admin/controllers/layouts.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php index ef244b4dd..06f3ec140 100644 --- a/admin/controllers/site_view.php +++ b/admin/controllers/site_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/site_views.php b/admin/controllers/site_views.php index eb2237772..0eac7c823 100644 --- a/admin/controllers/site_views.php +++ b/admin/controllers/site_views.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/snippet.php b/admin/controllers/snippet.php index 7cc723afb..e9ae59f96 100644 --- a/admin/controllers/snippet.php +++ b/admin/controllers/snippet.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/snippets.php b/admin/controllers/snippets.php index d41638fed..71227848f 100644 --- a/admin/controllers/snippets.php +++ b/admin/controllers/snippets.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/template.php b/admin/controllers/template.php index 713cff724..3250ebbd7 100644 --- a/admin/controllers/template.php +++ b/admin/controllers/template.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/controllers/templates.php b/admin/controllers/templates.php index 28c2cd9a5..babb7e1a8 100644 --- a/admin/controllers/templates.php +++ b/admin/controllers/templates.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index d7a46f2d9..544e8c408 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -1089,7 +1089,7 @@ class Get // set custom import scripts if (isset($view->add_custom_import) && $view->add_custom_import == 1) { - $addImportArray = array('php_import_setdata','php_import_save','html_import_view'); + $addImportArray = array('php_import','php_import_setdata','php_import_save','html_import_view'); foreach ($addImportArray as $importScripter) { if (isset($view->$importScripter) && strlen($view->$importScripter) > 0) diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 6ce693bb9..7db3c1b79 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -6904,14 +6904,20 @@ class Interpretation extends Fields // load the custom script to the files if (isset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list])) { - // ###IMPORT_SETDATE_METOD_CUSTOM### <<>> - $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SETDATE_METOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]); + // ###IMPORT_SETDATE_METHOD_CUSTOM### <<>> + $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SETDATE_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]); unset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]); } + if (isset($this->customScriptBuilder['php_import']['import_'.$viewName_list])) + { + // ###IMPORT_METHOD_CUSTOM### <<>> + $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import']['import_'.$viewName_list]); + unset($this->customScriptBuilder['php_import']['import_'.$viewName_list]); + } if (isset($this->customScriptBuilder['php_import_save']['import_'.$viewName_list])) { - // ###IMPORT_SAVE_METOD_CUSTOM### <<>> - $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SAVE_METOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_save']['import_'.$viewName_list]); + // ###IMPORT_SAVE_METHOD_CUSTOM### <<>> + $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SAVE_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_save']['import_'.$viewName_list]); unset($this->customScriptBuilder['php_import_save']['import_'.$viewName_list]); } if (isset($this->customScriptBuilder['html_import_view']['import_'.$viewName_list])) diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 56561b80c..2f8655944 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 2983bc083..d1b3e8371 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 9764e2fce..d4b78ecc9 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/helpers/js.php b/admin/helpers/js.php index c0c4e3a9f..a34169416 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index e7b761d4e..3dd4de3bf 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 05205ab90..0a77c0ae2 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -314,6 +314,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY="Php Getlistquery" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_DESCRIPTION="Add your PHP here! [Do not add the php tags]" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_HINT="// PHP Here that should run in the getlistquery Method (to add custom filtering)" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_LABEL="PHP" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT="Php Import" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION="Add your PHP here! [Do not add the php tags]" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT="// PHP Here that should run in the import Method." +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL="Import Method PHP" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE="Php Import Save" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION="Add your PHP here! [Do not add the php tags]" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT="// PHP Here that should run in the save Method, $data, $table" diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 13e725805..1abe2500b 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index 2e3123bed..1bf4fdb0b 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @@ -36,7 +36,8 @@ $fields = $displayData->get('fields') ?: array( 'add_custom_import', 'html_import_view', 'php_import_setdata', - 'php_import_save' + 'php_import_save', + 'php_import' ); ?> diff --git a/admin/layouts/admin_view/fields_fullwidth.php b/admin/layouts/admin_view/fields_fullwidth.php index aa4bfec4e..067aa1008 100644 --- a/admin/layouts/admin_view/fields_fullwidth.php +++ b/admin/layouts/admin_view/fields_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @@ -29,7 +29,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vxdfields; +$items = $displayData->vxefields; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index 57d1f66b6..9f136bae8 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index 63c66b0cd..858ff6309 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index 488554eed..f722dc9d3 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index a139d64d8..7984954d1 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index c741e0680..73ad5578d 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php index b2c46664a..2f2f4e7e1 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/admin_view/settings_above.php b/admin/layouts/admin_view/settings_above.php index 0cf984ddf..60c26d3dc 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/settings_above.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/admin_view/settings_left.php b/admin/layouts/admin_view/settings_left.php index 31ec967bf..1352fd30b 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/settings_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/admin_view/settings_right.php b/admin/layouts/admin_view/settings_right.php index 40e581aed..f83e2b769 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/settings_right.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/settings_under.php index c57810921..60f541e32 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/settings_under.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 30faee2bc..adfef67ba 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/component/admin_views_fullwidth.php b/admin/layouts/component/admin_views_fullwidth.php index 65fa8c2ef..6b28d8968 100644 --- a/admin/layouts/component/admin_views_fullwidth.php +++ b/admin/layouts/component/admin_views_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/component/details_above.php b/admin/layouts/component/details_above.php index df4477c77..7bc696487 100644 --- a/admin/layouts/component/details_above.php +++ b/admin/layouts/component/details_above.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/component/details_left.php b/admin/layouts/component/details_left.php index ab5ed3dd0..ae960a74d 100644 --- a/admin/layouts/component/details_left.php +++ b/admin/layouts/component/details_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/component/details_right.php b/admin/layouts/component/details_right.php index 36d8907e6..9ef0853ba 100644 --- a/admin/layouts/component/details_right.php +++ b/admin/layouts/component/details_right.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/component/details_under.php b/admin/layouts/component/details_under.php index eefe37d18..5efd990f5 100644 --- a/admin/layouts/component/details_under.php +++ b/admin/layouts/component/details_under.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/component/ftp_servers_fullwidth.php b/admin/layouts/component/ftp_servers_fullwidth.php index 7a1fea511..a2fbae040 100644 --- a/admin/layouts/component/ftp_servers_fullwidth.php +++ b/admin/layouts/component/ftp_servers_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/component/publishing.php b/admin/layouts/component/publishing.php index c741e0680..73ad5578d 100644 --- a/admin/layouts/component/publishing.php +++ b/admin/layouts/component/publishing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/component/publlshing.php b/admin/layouts/component/publlshing.php index b2c46664a..2f2f4e7e1 100644 --- a/admin/layouts/component/publlshing.php +++ b/admin/layouts/component/publlshing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/component/readme_left.php b/admin/layouts/component/readme_left.php index f650e5678..4e75a084a 100644 --- a/admin/layouts/component/readme_left.php +++ b/admin/layouts/component/readme_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/component/readme_right.php b/admin/layouts/component/readme_right.php index 50b7963d6..7724da8db 100644 --- a/admin/layouts/component/readme_right.php +++ b/admin/layouts/component/readme_right.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/component/scripts_fullwidth.php b/admin/layouts/component/scripts_fullwidth.php index 4d0df678f..fd0201a17 100644 --- a/admin/layouts/component/scripts_fullwidth.php +++ b/admin/layouts/component/scripts_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/component/settings_left.php b/admin/layouts/component/settings_left.php index 4a44adf52..2525618b8 100644 --- a/admin/layouts/component/settings_left.php +++ b/admin/layouts/component/settings_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/component/settings_right.php b/admin/layouts/component/settings_right.php index 075ab5ea4..9909121e1 100644 --- a/admin/layouts/component/settings_right.php +++ b/admin/layouts/component/settings_right.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/component/site_views_fullwidth.php b/admin/layouts/component/site_views_fullwidth.php index da5892b61..795d7e931 100644 --- a/admin/layouts/component/site_views_fullwidth.php +++ b/admin/layouts/component/site_views_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index e421bfd70..28828b419 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php index ac613ff2d..32c560d70 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php index a250840c5..c23cd7d22 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php index df4477c77..7bc696487 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php index 898f0d326..7c226801c 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php index 0d649af21..9ac821ff4 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php index 9adc0b43e..f4e6c9be4 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php index 886e16c0d..7f25b1687 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php index eefe37d18..5efd990f5 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index c741e0680..73ad5578d 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php index b2c46664a..2f2f4e7e1 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php index 546398f09..f79baccc0 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php index 95690a4b6..ae8ae53e7 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php index 41e49e001..00540b1d6 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/dynamic_get/gettable_above.php b/admin/layouts/dynamic_get/gettable_above.php index cb4b449d4..77062c75a 100644 --- a/admin/layouts/dynamic_get/gettable_above.php +++ b/admin/layouts/dynamic_get/gettable_above.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/dynamic_get/gettable_fullwidth.php b/admin/layouts/dynamic_get/gettable_fullwidth.php index a3433dcf6..aec4d8616 100644 --- a/admin/layouts/dynamic_get/gettable_fullwidth.php +++ b/admin/layouts/dynamic_get/gettable_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/dynamic_get/gettable_left.php b/admin/layouts/dynamic_get/gettable_left.php index 20beec182..17ede6e9a 100644 --- a/admin/layouts/dynamic_get/gettable_left.php +++ b/admin/layouts/dynamic_get/gettable_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/dynamic_get/gettable_right.php b/admin/layouts/dynamic_get/gettable_right.php index 99b9ec8d8..e0fc3c0ea 100644 --- a/admin/layouts/dynamic_get/gettable_right.php +++ b/admin/layouts/dynamic_get/gettable_right.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/dynamic_get/gettable_under.php b/admin/layouts/dynamic_get/gettable_under.php index 7a82b2d28..7d01b217d 100644 --- a/admin/layouts/dynamic_get/gettable_under.php +++ b/admin/layouts/dynamic_get/gettable_under.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index c741e0680..73ad5578d 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php index b2c46664a..2f2f4e7e1 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php index c06d62003..a4a697e3a 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php index 64ed33af5..eec376cdb 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php index 074c8cc1b..3dfd401d4 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php index eefe37d18..5efd990f5 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index c741e0680..73ad5578d 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php index b2c46664a..2f2f4e7e1 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php index 3b5bcb8ce..bb82b26a2 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php index 6fc57af9a..137c0be70 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 279df6d61..83cc3e7dd 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php index cec6f222f..2845f35de 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 3381a4944..bbf72c115 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @@ -29,7 +29,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vyyfields; +$items = $displayData->vyzfields; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php index c741e0680..73ad5578d 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php index b2c46664a..2f2f4e7e1 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index c6ed84a94..4175e0407 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 21279e5d5..72fc36907 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index fc8438826..8a9a8f9ca 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index cc87d71bd..d495b1a3c 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index eefe37d18..5efd990f5 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index c741e0680..73ad5578d 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 8084b77fa..839c2b7a9 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index 09d3aa84b..3d9e27b2e 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php index f51c0b5f0..df1ffd5e6 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php index 0d649af21..9ac821ff4 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php index 9adc0b43e..f4e6c9be4 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php index 85ebb8b6e..c63d82015 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php index eefe37d18..5efd990f5 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php index c741e0680..73ad5578d 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php index b2c46664a..2f2f4e7e1 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php index ad78c75ff..c37562842 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index df4477c77..7bc696487 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php index 898f0d326..7c226801c 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php index 0d649af21..9ac821ff4 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php index 9adc0b43e..f4e6c9be4 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php index 886e16c0d..7f25b1687 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php index eefe37d18..5efd990f5 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php index a91610b0f..8dbcf51cb 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index 21b8d410b..c55b70a12 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php index c741e0680..73ad5578d 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php index b2c46664a..2f2f4e7e1 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php index a0ece3f97..3f013367d 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php index 77cf7d7fd..cbbba122e 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php index 78898c313..8ccf02215 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php index c741e0680..73ad5578d 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php index b2c46664a..2f2f4e7e1 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php index 09d3aa84b..3d9e27b2e 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php index db3e684c8..5e2b9a8fd 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php index 0d649af21..9ac821ff4 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index 9adc0b43e..f4e6c9be4 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php index 85ebb8b6e..c63d82015 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php index eefe37d18..5efd990f5 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php index c741e0680..73ad5578d 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php index b2c46664a..2f2f4e7e1 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index b640201e1..a161d3835 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @@ -96,40 +96,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->metadata = $registry->toArray(); } - if (!empty($item->php_before_delete)) + if (!empty($item->php_import_setdata)) { - // base64 Decode php_before_delete. - $item->php_before_delete = base64_decode($item->php_before_delete); + // base64 Decode php_import_setdata. + $item->php_import_setdata = base64_decode($item->php_import_setdata); } - if (!empty($item->php_postsavehook)) + if (!empty($item->php_import)) { - // base64 Decode php_postsavehook. - $item->php_postsavehook = base64_decode($item->php_postsavehook); - } - - if (!empty($item->sql)) - { - // base64 Decode sql. - $item->sql = base64_decode($item->sql); - } - - if (!empty($item->php_getlistquery)) - { - // base64 Decode php_getlistquery. - $item->php_getlistquery = base64_decode($item->php_getlistquery); - } - - if (!empty($item->php_batchcopy)) - { - // base64 Decode php_batchcopy. - $item->php_batchcopy = base64_decode($item->php_batchcopy); - } - - if (!empty($item->php_document)) - { - // base64 Decode php_document. - $item->php_document = base64_decode($item->php_document); + // base64 Decode php_import. + $item->php_import = base64_decode($item->php_import); } if (!empty($item->php_getitem)) @@ -138,94 +114,124 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_getitem = base64_decode($item->php_getitem); } - if (!empty($item->html_import_view)) - { - // base64 Decode html_import_view. - $item->html_import_view = base64_decode($item->html_import_view); - } - if (!empty($item->php_getitems)) { // base64 Decode php_getitems. $item->php_getitems = base64_decode($item->php_getitems); } - if (!empty($item->php_save)) - { - // base64 Decode php_save. - $item->php_save = base64_decode($item->php_save); - } - - if (!empty($item->php_allowedit)) - { - // base64 Decode php_allowedit. - $item->php_allowedit = base64_decode($item->php_allowedit); - } - - if (!empty($item->php_batchmove)) - { - // base64 Decode php_batchmove. - $item->php_batchmove = base64_decode($item->php_batchmove); - } - - if (!empty($item->php_after_delete)) - { - // base64 Decode php_after_delete. - $item->php_after_delete = base64_decode($item->php_after_delete); - } - - if (!empty($item->php_import_save)) - { - // base64 Decode php_import_save. - $item->php_import_save = base64_decode($item->php_import_save); - } - if (!empty($item->css_view)) { // base64 Decode css_view. $item->css_view = base64_decode($item->css_view); } + if (!empty($item->php_getlistquery)) + { + // base64 Decode php_getlistquery. + $item->php_getlistquery = base64_decode($item->php_getlistquery); + } + + if (!empty($item->php_save)) + { + // base64 Decode php_save. + $item->php_save = base64_decode($item->php_save); + } + if (!empty($item->css_views)) { // base64 Decode css_views. $item->css_views = base64_decode($item->css_views); } + if (!empty($item->php_postsavehook)) + { + // base64 Decode php_postsavehook. + $item->php_postsavehook = base64_decode($item->php_postsavehook); + } + + if (!empty($item->php_allowedit)) + { + // base64 Decode php_allowedit. + $item->php_allowedit = base64_decode($item->php_allowedit); + } + if (!empty($item->javascript_view_file)) { // base64 Decode javascript_view_file. $item->javascript_view_file = base64_decode($item->javascript_view_file); } + if (!empty($item->php_batchcopy)) + { + // base64 Decode php_batchcopy. + $item->php_batchcopy = base64_decode($item->php_batchcopy); + } + + if (!empty($item->php_batchmove)) + { + // base64 Decode php_batchmove. + $item->php_batchmove = base64_decode($item->php_batchmove); + } + if (!empty($item->javascript_view_footer)) { // base64 Decode javascript_view_footer. $item->javascript_view_footer = base64_decode($item->javascript_view_footer); } + if (!empty($item->php_before_delete)) + { + // base64 Decode php_before_delete. + $item->php_before_delete = base64_decode($item->php_before_delete); + } + + if (!empty($item->php_after_delete)) + { + // base64 Decode php_after_delete. + $item->php_after_delete = base64_decode($item->php_after_delete); + } + if (!empty($item->javascript_views_file)) { // base64 Decode javascript_views_file. $item->javascript_views_file = base64_decode($item->javascript_views_file); } + if (!empty($item->php_document)) + { + // base64 Decode php_document. + $item->php_document = base64_decode($item->php_document); + } + if (!empty($item->javascript_views_footer)) { // base64 Decode javascript_views_footer. $item->javascript_views_footer = base64_decode($item->javascript_views_footer); } + if (!empty($item->sql)) + { + // base64 Decode sql. + $item->sql = base64_decode($item->sql); + } + if (!empty($item->php_ajaxmethod)) { // base64 Decode php_ajaxmethod. $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); } - if (!empty($item->php_import_setdata)) + if (!empty($item->html_import_view)) { - // base64 Decode php_import_setdata. - $item->php_import_setdata = base64_decode($item->php_import_setdata); + // base64 Decode html_import_view. + $item->html_import_view = base64_decode($item->html_import_view); + } + + if (!empty($item->php_import_save)) + { + // base64 Decode php_import_save. + $item->php_import_save = base64_decode($item->php_import_save); } if (!empty($item->id)) @@ -244,7 +250,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxdfields() + public function getVxefields() { // Get the user object. $user = JFactory::getUser(); @@ -313,13 +319,13 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVxdfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVxefields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVxdfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVxefields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVxdfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVxefields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVxdfields($item->store, 'store'); + $item->store = $this->selectionTranslationVxefields($item->store, 'store'); } } @@ -354,7 +360,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVxdfields($value,$name) + public function selectionTranslationVxefields($value,$name) { // Array of datatype language strings if ($name == 'datatype') @@ -1117,40 +1123,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['metadata'] = (string) $metadata; } - // Set the php_before_delete string to base64 string. - if (isset($data['php_before_delete'])) + // Set the php_import_setdata string to base64 string. + if (isset($data['php_import_setdata'])) { - $data['php_before_delete'] = base64_encode($data['php_before_delete']); + $data['php_import_setdata'] = base64_encode($data['php_import_setdata']); } - // Set the php_postsavehook string to base64 string. - if (isset($data['php_postsavehook'])) + // Set the php_import string to base64 string. + if (isset($data['php_import'])) { - $data['php_postsavehook'] = base64_encode($data['php_postsavehook']); - } - - // Set the sql string to base64 string. - if (isset($data['sql'])) - { - $data['sql'] = base64_encode($data['sql']); - } - - // Set the php_getlistquery string to base64 string. - if (isset($data['php_getlistquery'])) - { - $data['php_getlistquery'] = base64_encode($data['php_getlistquery']); - } - - // Set the php_batchcopy string to base64 string. - if (isset($data['php_batchcopy'])) - { - $data['php_batchcopy'] = base64_encode($data['php_batchcopy']); - } - - // Set the php_document string to base64 string. - if (isset($data['php_document'])) - { - $data['php_document'] = base64_encode($data['php_document']); + $data['php_import'] = base64_encode($data['php_import']); } // Set the php_getitem string to base64 string. @@ -1159,94 +1141,124 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_getitem'] = base64_encode($data['php_getitem']); } - // Set the html_import_view string to base64 string. - if (isset($data['html_import_view'])) - { - $data['html_import_view'] = base64_encode($data['html_import_view']); - } - // Set the php_getitems string to base64 string. if (isset($data['php_getitems'])) { $data['php_getitems'] = base64_encode($data['php_getitems']); } - // Set the php_save string to base64 string. - if (isset($data['php_save'])) - { - $data['php_save'] = base64_encode($data['php_save']); - } - - // Set the php_allowedit string to base64 string. - if (isset($data['php_allowedit'])) - { - $data['php_allowedit'] = base64_encode($data['php_allowedit']); - } - - // Set the php_batchmove string to base64 string. - if (isset($data['php_batchmove'])) - { - $data['php_batchmove'] = base64_encode($data['php_batchmove']); - } - - // Set the php_after_delete string to base64 string. - if (isset($data['php_after_delete'])) - { - $data['php_after_delete'] = base64_encode($data['php_after_delete']); - } - - // Set the php_import_save string to base64 string. - if (isset($data['php_import_save'])) - { - $data['php_import_save'] = base64_encode($data['php_import_save']); - } - // Set the css_view string to base64 string. if (isset($data['css_view'])) { $data['css_view'] = base64_encode($data['css_view']); } + // Set the php_getlistquery string to base64 string. + if (isset($data['php_getlistquery'])) + { + $data['php_getlistquery'] = base64_encode($data['php_getlistquery']); + } + + // Set the php_save string to base64 string. + if (isset($data['php_save'])) + { + $data['php_save'] = base64_encode($data['php_save']); + } + // Set the css_views string to base64 string. if (isset($data['css_views'])) { $data['css_views'] = base64_encode($data['css_views']); } + // Set the php_postsavehook string to base64 string. + if (isset($data['php_postsavehook'])) + { + $data['php_postsavehook'] = base64_encode($data['php_postsavehook']); + } + + // Set the php_allowedit string to base64 string. + if (isset($data['php_allowedit'])) + { + $data['php_allowedit'] = base64_encode($data['php_allowedit']); + } + // Set the javascript_view_file string to base64 string. if (isset($data['javascript_view_file'])) { $data['javascript_view_file'] = base64_encode($data['javascript_view_file']); } + // Set the php_batchcopy string to base64 string. + if (isset($data['php_batchcopy'])) + { + $data['php_batchcopy'] = base64_encode($data['php_batchcopy']); + } + + // Set the php_batchmove string to base64 string. + if (isset($data['php_batchmove'])) + { + $data['php_batchmove'] = base64_encode($data['php_batchmove']); + } + // Set the javascript_view_footer string to base64 string. if (isset($data['javascript_view_footer'])) { $data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']); } + // Set the php_before_delete string to base64 string. + if (isset($data['php_before_delete'])) + { + $data['php_before_delete'] = base64_encode($data['php_before_delete']); + } + + // Set the php_after_delete string to base64 string. + if (isset($data['php_after_delete'])) + { + $data['php_after_delete'] = base64_encode($data['php_after_delete']); + } + // Set the javascript_views_file string to base64 string. if (isset($data['javascript_views_file'])) { $data['javascript_views_file'] = base64_encode($data['javascript_views_file']); } + // Set the php_document string to base64 string. + if (isset($data['php_document'])) + { + $data['php_document'] = base64_encode($data['php_document']); + } + // Set the javascript_views_footer string to base64 string. if (isset($data['javascript_views_footer'])) { $data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']); } + // Set the sql string to base64 string. + if (isset($data['sql'])) + { + $data['sql'] = base64_encode($data['sql']); + } + // Set the php_ajaxmethod string to base64 string. if (isset($data['php_ajaxmethod'])) { $data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']); } - // Set the php_import_setdata string to base64 string. - if (isset($data['php_import_setdata'])) + // Set the html_import_view string to base64 string. + if (isset($data['html_import_view'])) { - $data['php_import_setdata'] = base64_encode($data['php_import_setdata']); + $data['html_import_view'] = base64_encode($data['html_import_view']); + } + + // Set the php_import_save string to base64 string. + if (isset($data['php_import_save'])) + { + $data['php_import_save'] = base64_encode($data['php_import_save']); } // Set the Params Items to data diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index 676b0ad96..6e80e63df 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @@ -261,50 +261,52 @@ class ComponentbuilderModelAdmin_views extends JModelList continue; } - // decode php_before_delete - $item->php_before_delete = base64_decode($item->php_before_delete); - // decode php_postsavehook - $item->php_postsavehook = base64_decode($item->php_postsavehook); - // decode sql - $item->sql = base64_decode($item->sql); - // decode php_getlistquery - $item->php_getlistquery = base64_decode($item->php_getlistquery); - // decode php_batchcopy - $item->php_batchcopy = base64_decode($item->php_batchcopy); - // decode php_document - $item->php_document = base64_decode($item->php_document); - // decode php_getitem - $item->php_getitem = base64_decode($item->php_getitem); - // decode html_import_view - $item->html_import_view = base64_decode($item->html_import_view); - // decode php_getitems - $item->php_getitems = base64_decode($item->php_getitems); - // decode php_save - $item->php_save = base64_decode($item->php_save); - // decode php_allowedit - $item->php_allowedit = base64_decode($item->php_allowedit); - // decode php_batchmove - $item->php_batchmove = base64_decode($item->php_batchmove); - // decode php_after_delete - $item->php_after_delete = base64_decode($item->php_after_delete); - // decode php_import_save - $item->php_import_save = base64_decode($item->php_import_save); - // decode css_view - $item->css_view = base64_decode($item->css_view); - // decode css_views - $item->css_views = base64_decode($item->css_views); - // decode javascript_view_file - $item->javascript_view_file = base64_decode($item->javascript_view_file); - // decode javascript_view_footer - $item->javascript_view_footer = base64_decode($item->javascript_view_footer); - // decode javascript_views_file - $item->javascript_views_file = base64_decode($item->javascript_views_file); - // decode javascript_views_footer - $item->javascript_views_footer = base64_decode($item->javascript_views_footer); - // decode php_ajaxmethod - $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); // decode php_import_setdata $item->php_import_setdata = base64_decode($item->php_import_setdata); + // decode php_import + $item->php_import = base64_decode($item->php_import); + // decode php_getitem + $item->php_getitem = base64_decode($item->php_getitem); + // decode php_getitems + $item->php_getitems = base64_decode($item->php_getitems); + // decode css_view + $item->css_view = base64_decode($item->css_view); + // decode php_getlistquery + $item->php_getlistquery = base64_decode($item->php_getlistquery); + // decode php_save + $item->php_save = base64_decode($item->php_save); + // decode css_views + $item->css_views = base64_decode($item->css_views); + // decode php_postsavehook + $item->php_postsavehook = base64_decode($item->php_postsavehook); + // decode php_allowedit + $item->php_allowedit = base64_decode($item->php_allowedit); + // decode javascript_view_file + $item->javascript_view_file = base64_decode($item->javascript_view_file); + // decode php_batchcopy + $item->php_batchcopy = base64_decode($item->php_batchcopy); + // decode php_batchmove + $item->php_batchmove = base64_decode($item->php_batchmove); + // decode javascript_view_footer + $item->javascript_view_footer = base64_decode($item->javascript_view_footer); + // decode php_before_delete + $item->php_before_delete = base64_decode($item->php_before_delete); + // decode php_after_delete + $item->php_after_delete = base64_decode($item->php_after_delete); + // decode javascript_views_file + $item->javascript_views_file = base64_decode($item->javascript_views_file); + // decode php_document + $item->php_document = base64_decode($item->php_document); + // decode javascript_views_footer + $item->javascript_views_footer = base64_decode($item->javascript_views_footer); + // decode sql + $item->sql = base64_decode($item->sql); + // decode php_ajaxmethod + $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); + // decode html_import_view + $item->html_import_view = base64_decode($item->html_import_view); + // decode php_import_save + $item->php_import_save = base64_decode($item->php_import_save); // unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 5c0df6c23..5be1684a6 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @@ -52,6 +52,16 @@ class ComponentbuilderModelAjax extends JModelList { // set the setdata script $script['setdata'] = array(); + $script['setdata'][] = "\t/**"; + $script['setdata'][] = "\t* Set the data from the spreadsheet to the database"; + $script['setdata'][] = "\t*"; + $script['setdata'][] = "\t* @param string \$package Paths to the uploaded package file"; + $script['setdata'][] = "\t*"; + $script['setdata'][] = "\t* @return boolean false on failure"; + $script['setdata'][] = "\t*"; + $script['setdata'][] = "\t**/"; + $script['setdata'][] = "\tprotected function setData(\$package,\$table,\$target_headers)"; + $script['setdata'][] = "\t{"; $script['setdata'][] = "\t\tif (###-#-#-Component###Helper::checkArray(\$target_headers))"; $script['setdata'][] = "\t\t{"; $script['setdata'][] = "\t\t\t// make sure the file is loaded\t\t"; @@ -75,9 +85,21 @@ class ComponentbuilderModelAjax extends JModelList $script['setdata'][] = "\t\t\t}"; $script['setdata'][] = "\t\t}"; $script['setdata'][] = "\t\treturn false;"; + $script['setdata'][] = "\t}"; } elseif ('save' == $type) { + $script['save'] = array(); + $script['save'][] = "\t/**"; + $script['save'][] = "\t* Save the data from the file to the database"; + $script['save'][] = "\t*"; + $script['save'][] = "\t* @param string \$package Paths to the uploaded package file"; + $script['save'][] = "\t*"; + $script['save'][] = "\t* @return boolean false on failure"; + $script['save'][] = "\t*"; + $script['save'][] = "\t**/"; + $script['save'][] = "\tprotected function save(\$data,\$table)"; + $script['save'][] = "\t{"; $script['save'][] = "\t\t// import the data if there is any"; $script['save'][] = "\t\tif(###-#-#-Component###Helper::checkArray(\$data['array']))"; $script['save'][] = "\t\t{"; @@ -286,11 +308,13 @@ class ComponentbuilderModelAjax extends JModelList $script['save'][] = "\t\t\t}"; $script['save'][] = "\t\t}"; $script['save'][] = "\t\treturn false;"; + $script['save'][] = "\t}"; } elseif ('view' == $type) { + $script['view'] = array(); $script['view'][] = ""; + $script['view'][] = ""; $script['view'][] = "\n
"; - $script['view'][] = "
\" method=\"post\" name=\"adminForm\" id=\"adminForm\" class=\"form-horizontal form-validate\">"; + $script['view'][] = "\" method=\"post\" name=\"adminForm\" id=\"adminForm\" class=\"form-horizontal form-validate\">"; + $script['view'][] = ""; $script['view'][] = "\n\tsidebar)) : ?>"; $script['view'][] = "\t\t
"; $script['view'][] = "\t\t\tsidebar; ?>"; @@ -389,87 +427,194 @@ class ComponentbuilderModelAjax extends JModelList $script['view'][] = "\t"; $script['view'][] = "\t\t
"; $script['view'][] = "\t"; - $script['view'][] = "\nhasPackage && ###-#-#-Component###Helper::checkArray(\$this->headerList) && ###-#-#-Component###Helper::checkArray(\$this->headers)) : ?>"; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "
"; - $script['view'][] = "
"; - $script['view'][] = "headerList as \$name => \$title): ?>"; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "
"; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "
"; - $script['view'][] = "\" onclick=\"Joomla.continueImport()\" />"; - $script['view'][] = "
"; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = ""; + $script['view'][] = ""; + $script['view'][] = "\n\thasPackage && ###-#-#-Component###Helper::checkArray(\$this->headerList) && ###-#-#-Component###Helper::checkArray(\$this->headers)) : ?>"; + $script['view'][] = "\t\t
"; + $script['view'][] = "\t\t\t"; + $script['view'][] = "\t\t\t
"; + $script['view'][] = "\t\t\t\t"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t\t\t"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t
"; + $script['view'][] = "\t\t\theaderList as \$name => \$title): ?>"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t\t\t"; + $script['view'][] = "\t\t\t\t\t
"; + $script['view'][] = "\t\t\t\t\t\t"; + $script['view'][] = "\t\t\t\t\t
"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t"; + $script['view'][] = "\t\t\t
"; + $script['view'][] = "\t\t\t\t\" onclick=\"Joomla.continueImport()\" />"; + $script['view'][] = "\t\t\t
"; + $script['view'][] = "\t\t
"; + $script['view'][] = "\t\t"; + $script['view'][] = "\t"; $script['view'][] = "\t\t 'upload')); ?>"; - $script['view'][] = "\n"; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "
"; - $script['view'][] = "
"; - $script['view'][] = "
"; - $script['view'][] = "\" onclick=\"Joomla.submitbutton()\" />    (.csv .xls .ods)"; - $script['view'][] = "
"; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "\n"; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "
"; - $script['view'][] = "state->get('import.directory'); ?>\" />"; - $script['view'][] = "
"; - $script['view'][] = "
"; - $script['view'][] = "
"; - $script['view'][] = "\" onclick=\"Joomla.submitbutton3()\" />    (.csv .xls .ods)"; - $script['view'][] = "
"; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "\n"; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "
"; - $script['view'][] = ""; - $script['view'][] = "
"; - $script['view'][] = "
"; - $script['view'][] = "
"; - $script['view'][] = "\" onclick=\"Joomla.submitbutton4()\" />    (.csv .xls .ods)"; - $script['view'][] = "
"; - $script['view'][] = "
"; - $script['view'][] = "\n"; - $script['view'][] = "\n"; + $script['view'][] = "\t\t"; + $script['view'][] = "\t\t"; + $script['view'][] = "\t\t\t
"; + $script['view'][] = "\t\t\t\t"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t\t\t"; + $script['view'][] = "\t\t\t\t\t
"; + $script['view'][] = "\t\t\t\t\t\t"; + $script['view'][] = "\t\t\t\t\t
"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t\t\t\" onclick=\"Joomla.submitbutton()\" />    (.csv .xls .ods)"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t
"; + $script['view'][] = "\t\t"; + $script['view'][] = "\t\t"; + $script['view'][] = "\t\t"; + $script['view'][] = "\t\t\t
"; + $script['view'][] = "\t\t\t\t"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t\t\t"; + $script['view'][] = "\t\t\t\t\t
"; + $script['view'][] = "\t\t\t\t\t\tstate->get('import.directory'); ?>\" />"; + $script['view'][] = "\t\t\t\t\t
"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t\t\t\" onclick=\"Joomla.submitbutton3()\" />    (.csv .xls .ods)"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t"; + $script['view'][] = ""; + $script['view'][] = "\n\t\t"; + $script['view'][] = "\t\t\t
"; + $script['view'][] = "\t\t\t\t"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t\t\t"; + $script['view'][] = "\t\t\t\t\t
"; + $script['view'][] = "\t\t\t\t\t\t"; + $script['view'][] = "\t\t\t\t\t
"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t\t\t\" onclick=\"Joomla.submitbutton4()\" />    (.csv .xls .ods)"; + $script['view'][] = "\t\t\t\t
"; + $script['view'][] = "\t\t\t
"; + $script['view'][] = "\t\t"; + $script['view'][] = "\t\t"; $script['view'][] = "\t\t"; - $script['view'][] = ""; - $script['view'][] = ""; - $script['view'][] = ""; + $script['view'][] = "\t"; + $script['view'][] = "\t"; + $script['view'][] = "\t"; $script['view'][] = ""; $script['view'][] = "
"; } + elseif ('import' == $type) + { + $script['import'] = array(); + $script['import'][] = "\t/**"; + $script['import'][] = "\t * Import an spreadsheet from either folder, url or upload."; + $script['import'][] = "\t *"; + $script['import'][] = "\t * @return boolean result of import"; + $script['import'][] = "\t *"; + $script['import'][] = "\t */"; + $script['import'][] = "\tpublic function import()"; + $script['import'][] = "\t{"; + $script['import'][] = "\t\t\$this->setState('action', 'import');"; + $script['import'][] = "\t\t\$app \t\t= JFactory::getApplication();"; + $script['import'][] = "\t\t\$session \t= JFactory::getSession();"; + $script['import'][] = "\t\t\$package \t= null;"; + $script['import'][] = "\t\t\$continue\t= false;"; + $script['import'][] = "\t\t// get import type"; + $script['import'][] = "\t\t\$this->getType = \$app->input->getString('gettype', NULL);"; + $script['import'][] = "\t\t// get import type"; + $script['import'][] = "\t\t\$this->dataType\t= \$session->get('dataType_VDM_IMPORTINTO', NULL);"; + $script['import'][] = "\n\t\tif (\$package === null)"; + $script['import'][] = "\t\t{"; + $script['import'][] = "\t\t\tswitch (\$this->getType)"; + $script['import'][] = "\t\t\t{"; + $script['import'][] = "\t\t\t\tcase 'folder':"; + $script['import'][] = "\t\t\t\t\t// Remember the 'Import from Directory' path."; + $script['import'][] = "\t\t\t\t\t\$app->getUserStateFromRequest(\$this->_context . '.import_directory', 'import_directory');"; + $script['import'][] = "\t\t\t\t\t\$package = \$this->_getPackageFromFolder();"; + $script['import'][] = "\t\t\t\t\tbreak;"; + $script['import'][] = "\n\t\t\t\tcase 'upload':"; + $script['import'][] = "\t\t\t\t\t\$package = \$this->_getPackageFromUpload();"; + $script['import'][] = "\t\t\t\t\tbreak;"; + $script['import'][] = "\n\t\t\t\tcase 'url':"; + $script['import'][] = "\t\t\t\t\t\$package = \$this->_getPackageFromUrl();"; + $script['import'][] = "\t\t\t\t\tbreak;"; + $script['import'][] = "\n\t\t\t\tcase 'continue':"; + $script['import'][] = "\t\t\t\t\t\$continue \t= true;"; + $script['import'][] = "\t\t\t\t\t\$package\t= \$session->get('package', null);"; + $script['import'][] = "\t\t\t\t\t\$package\t= json_decode(\$package, true);"; + $script['import'][] = "\t\t\t\t\t// clear session"; + $script['import'][] = "\t\t\t\t\t\$session->clear('package');"; + $script['import'][] = "\t\t\t\t\t\$session->clear('dataType');"; + $script['import'][] = "\t\t\t\t\t\$session->clear('hasPackage');"; + $script['import'][] = "\t\t\t\t\tbreak;"; + $script['import'][] = "\n\t\t\t\tdefault:"; + $script['import'][] = "\t\t\t\t\t\$app->setUserState('com_###-#-#-component###.message', JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_NO_IMPORT_TYPE_FOUND'));"; + $script['import'][] = "\n\t\t\t\t\treturn false;"; + $script['import'][] = "\t\t\t\t\tbreak;"; + $script['import'][] = "\t\t\t}"; + $script['import'][] = "\t\t}"; + $script['import'][] = "\t\t// Was the package valid?"; + $script['import'][] = "\t\tif (!\$package || !\$package['type'])"; + $script['import'][] = "\t\t{"; + $script['import'][] = "\t\t\tif (in_array(\$this->getType, array('upload', 'url')))"; + $script['import'][] = "\t\t\t{"; + $script['import'][] = "\t\t\t\t\$this->remove(\$package['packagename']);"; + $script['import'][] = "\t\t\t}"; + $script['import'][] = "\n\t\t\t\$app->setUserState('com_###-#-#-component###.message', JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE'));"; + $script['import'][] = "\t\t\treturn false;"; + $script['import'][] = "\t\t}"; + $script['import'][] = "\t\t"; + $script['import'][] = "\t\t// first link data to table headers"; + $script['import'][] = "\t\tif(!\$continue){"; + $script['import'][] = "\t\t\t\$package\t= json_encode(\$package);"; + $script['import'][] = "\t\t\t\$session->set('package', \$package);"; + $script['import'][] = "\t\t\t\$session->set('dataType', \$this->dataType);"; + $script['import'][] = "\t\t\t\$session->set('hasPackage', true);"; + $script['import'][] = "\t\t\treturn true;"; + $script['import'][] = "\t\t}"; + $script['import'][] = "\t\t// set the data"; + $script['import'][] = "\t\t\$headerList = json_decode(\$session->get(\$this->dataType.'_VDM_IMPORTHEADERS', false), true);"; + $script['import'][] = "\t\tif (!\$this->setData(\$package,\$this->dataType,\$headerList))"; + $script['import'][] = "\t\t{"; + $script['import'][] = "\t\t\t// There was an error importing the package"; + $script['import'][] = "\t\t\t\$msg = JTe-#-#-xt::_('COM_###-#-#-COMPONENT###_IMPORT_ERROR');"; + $script['import'][] = "\t\t\t\$back = \$session->get('backto_VDM_IMPORT', NULL);"; + $script['import'][] = "\t\t\tif (\$back)"; + $script['import'][] = "\t\t\t{"; + $script['import'][] = "\t\t\t\t\$app->setUserState('com_###-#-#-component###.redirect_url', 'index.php?option=com_###-#-#-component###&view='.\$back);"; + $script['import'][] = "\t\t\t\t\$session->clear('backto_VDM_IMPORT');"; + $script['import'][] = "\t\t\t}"; + $script['import'][] = "\t\t\t\$result = false;"; + $script['import'][] = "\t\t}"; + $script['import'][] = "\t\telse"; + $script['import'][] = "\t\t{"; + $script['import'][] = "\t\t\t// Package imported sucessfully"; + $script['import'][] = "\t\t\t\$msg = JTe-#-#-xt::sprintf('COM_###-#-#-COMPONENT###_IMPORT_SUCCESS', \$package['packagename']);"; + $script['import'][] = "\t\t\t\$back = \$session->get('backto_VDM_IMPORT', NULL);"; + $script['import'][] = "\t\t\tif (\$back)"; + $script['import'][] = "\t\t\t{"; + $script['import'][] = "\t\t\t \$app->setUserState('com_###-#-#-component###.redirect_url', 'index.php?option=com_###-#-#-component###&view='.\$back);"; + $script['import'][] = "\t\t\t \$session->clear('backto_VDM_IMPORT');"; + $script['import'][] = "\t\t\t}"; + $script['import'][] = "\t\t\t\$result = true;"; + $script['import'][] = "\t\t}"; + $script['import'][] = "\n\t\t// Set some model state values"; + $script['import'][] = "\t\t\$app->enqueueMessage(\$msg);"; + $script['import'][] = "\n\t\t// remove file after import"; + $script['import'][] = "\t\t\$this->remove(\$package['packagename']);"; + $script['import'][] = "\t\t\$session->clear(\$this->getType.'_VDM_IMPORTHEADERS');"; + $script['import'][] = "\t\treturn \$result;"; + $script['import'][] = "\t}"; + } // return the needed script if (isset($script[$type])) { diff --git a/admin/models/compiler.php b/admin/models/compiler.php index f54842e33..c1a07bcd9 100644 --- a/admin/models/compiler.php +++ b/admin/models/compiler.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/component.php b/admin/models/component.php index 950341af5..962159345 100644 --- a/admin/models/component.php +++ b/admin/models/component.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index 4480ed124..435e34591 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/components.php b/admin/models/components.php index 4f21ec9d8..d89a4357d 100644 --- a/admin/models/components.php +++ b/admin/models/components.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index 4df24ccde..03bf6e1ed 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php index 36dda7bea..a423ee706 100644 --- a/admin/models/custom_admin_views.php +++ b/admin/models/custom_admin_views.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php index 03e13c6e6..4f244e464 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/dynamic_gets.php b/admin/models/dynamic_gets.php index 6a8b1d905..3ad0e9d22 100644 --- a/admin/models/dynamic_gets.php +++ b/admin/models/dynamic_gets.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/field.php b/admin/models/field.php index 7fdb53e06..99484ae80 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fields.php b/admin/models/fields.php index 2a8e8fbb7..665fc401a 100644 --- a/admin/models/fields.php +++ b/admin/models/fields.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index 03a3051ed..a1eb67a56 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 0cef8490e..2fd314369 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index 01a5c2044..ba3a3f05b 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index a041a84cf..2ca19792d 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index 0fe84fdd5..a68c39e5e 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index 405b57c49..1df910c1e 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index f7898a3f3..0f398b346 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index 8b19e46cb..ed819d299 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index 3330c7ffe..266343e92 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php index 2013625cc..4a5eed54e 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index 248dda149..7c264543b 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index 1f57a7abe..eebba25da 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index 21c423c80..daeffb111 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index 313c92046..7c10129f3 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index fc0b29baa..a85f52902 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @@ -112,7 +112,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVyyfields() + public function getVyzfields() { // Get the user object. $user = JFactory::getUser(); @@ -196,13 +196,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVyyfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVyzfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVyyfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVyzfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVyyfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVyzfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVyyfields($item->store, 'store'); + $item->store = $this->selectionTranslationVyzfields($item->store, 'store'); } } @@ -216,7 +216,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVyyfields($value,$name) + public function selectionTranslationVyzfields($value,$name) { // Array of datatype language strings if ($name == 'datatype') diff --git a/admin/models/fieldtypes.php b/admin/models/fieldtypes.php index c1e022303..4574e74a5 100644 --- a/admin/models/fieldtypes.php +++ b/admin/models/fieldtypes.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index fd85ad321..c928138d1 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @@ -47,6 +47,7 @@ jform_vvvvvxbvwz_required = false; jform_vvvvvxfvxa_required = false; jform_vvvvvxfvxb_required = false; jform_vvvvvxfvxc_required = false; +jform_vvvvvxfvxd_required = false; // Initial Script jQuery(document).ready(function() @@ -776,24 +777,34 @@ function vvvvvxf(add_custom_import_vvvvvxf) } jQuery('.note_advanced_import').closest('.control-group').show(); - jQuery('#jform_php_import_save').closest('.control-group').show(); + jQuery('#jform_php_import').closest('.control-group').show(); if (jform_vvvvvxfvxb_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_vvvvvxfvxb_required = false; + } + + jQuery('#jform_php_import_save').closest('.control-group').show(); + if (jform_vvvvvxfvxc_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_vvvvvxfvxb_required = false; + jform_vvvvvxfvxc_required = false; } jQuery('#jform_php_import_setdata').closest('.control-group').show(); - if (jform_vvvvvxfvxc_required) + if (jform_vvvvvxfvxd_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_vvvvvxfvxc_required = false; + jform_vvvvvxfvxd_required = false; } } @@ -809,23 +820,32 @@ function vvvvvxf(add_custom_import_vvvvvxf) jform_vvvvvxfvxa_required = true; } jQuery('.note_advanced_import').closest('.control-group').hide(); - jQuery('#jform_php_import_save').closest('.control-group').hide(); + jQuery('#jform_php_import').closest('.control-group').hide(); if (!jform_vvvvvxfvxb_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_vvvvvxfvxb_required = true; + } + jQuery('#jform_php_import_save').closest('.control-group').hide(); + if (!jform_vvvvvxfvxc_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_vvvvvxfvxb_required = true; + jform_vvvvvxfvxc_required = true; } jQuery('#jform_php_import_setdata').closest('.control-group').hide(); - if (!jform_vvvvvxfvxc_required) + if (!jform_vvvvvxfvxd_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_vvvvvxfvxc_required = true; + jform_vvvvvxfvxd_required = true; } } } @@ -880,6 +900,12 @@ function isSet(val) return false; } +jQuery(document).ready(function() +{ + var valueSwitch = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); + getImportScripts(valueSwitch); +}); + function getFieldSelectOptions_server(fieldId){ var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldSelectOptions&format=json"; if(token.length > 0 && fieldId > 0){ @@ -949,10 +975,19 @@ function getImportScripts_server(typpe){ function getImportScripts(id){ if (1 == id) { // get the current values + var current_import = jQuery('textarea#jform_php_import').val(); var current_setdata = jQuery('textarea#jform_php_import_setdata').val(); var current_save = jQuery('textarea#jform_php_import_save').val(); var current_view = jQuery('textarea#jform_html_import_view').val(); // set the setData method script + if(current_import.length == 0){ + getImportScripts_server('import').done(function(result) { + if(result){ + jQuery('textarea#jform_php_import').val(result); + } + }); + } + // set the setData method script if(current_setdata.length == 0){ getImportScripts_server('setdata').done(function(result) { if(result){ diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index 23036a197..988ab59f6 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -143,6 +143,48 @@ message="Error! Please add some short description here." hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT" /> + + + + + + + + + + + + + + + + + + COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY - + + + - - - - - - + type="radio" + name="add_php_save" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - + + type="radio" + name="add_php_batchmove" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - + - - - - + type="radio" + name="add_sql" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + + + - - - + + type="radio" + name="add_php_getlistquery" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - + + type="radio" + name="add_php_postsavehook" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_POSTSAVEHOOK_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - + + type="radio" + name="add_php_batchcopy" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHCOPY_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - - - - - + - + COM_COMPONENTBUILDER_ADMIN_VIEW_YES + + + + + + + + + - - + + + + + + - + + type="radio" + name="add_custom_import" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_DESCRIPTION" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - + - - - - + type="textarea" + name="php_import" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT" + required="true" + /> - + - - - - + type="textarea" + name="php_getitem" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_HINT" + required="true" + /> COM_COMPONENTBUILDER_ADMIN_VIEW_NO - + - - - - + type="textarea" + name="php_getitems" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_HINT" + required="true" + /> - + - - - - + type="textarea" + name="php_getlistquery" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_HINT" + required="true" + /> COM_COMPONENTBUILDER_ADMIN_VIEW_NO - + - - - - + type="textarea" + name="php_save" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_HINT" + required="true" + /> - + - - - - + type="textarea" + name="php_postsavehook" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_HINT" + required="true" + /> COM_COMPONENTBUILDER_ADMIN_VIEW_NO - + - - - - + type="textarea" + name="php_allowedit" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_HINT" + required="true" + /> - + - - - - + type="textarea" + name="php_batchcopy" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_HINT" + required="true" + /> COM_COMPONENTBUILDER_ADMIN_VIEW_NO - + - - - - + type="textarea" + name="php_batchmove" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_HINT" + required="true" + /> - + - - - - + type="textarea" + name="php_before_delete" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_HINT" + required="true" + /> COM_COMPONENTBUILDER_ADMIN_VIEW_NO - + - - - - + type="textarea" + name="php_after_delete" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_HINT" + required="true" + /> - + - - - - + type="textarea" + name="php_document" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_LABEL" + rows="17" + cols="5" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_HINT" + required="true" + /> COM_COMPONENTBUILDER_ADMIN_VIEW_NO - + - - - + type="radio" + name="source" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCE_LABEL" + class="btn-group btn-group-yesno" + required="true"> + + + - - + + COM_COMPONENTBUILDER_ADMIN_VIEW_NO - - - - - - + + - + @@ -1474,6 +1460,33 @@ + + + + + + + + vxdfields = $this->get('Vxdfields'); + $this->vxefields = $this->get('Vxefields'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index 3c80aeba3..c220a50c5 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_batch_body.php b/admin/views/admin_views/tmpl/default_batch_body.php index b721bb8e0..0bb44077e 100644 --- a/admin/views/admin_views/tmpl/default_batch_body.php +++ b/admin/views/admin_views/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_batch_footer.php b/admin/views/admin_views/tmpl/default_batch_footer.php index 1414005bd..1cd914557 100644 --- a/admin/views/admin_views/tmpl/default_batch_footer.php +++ b/admin/views/admin_views/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_body.php b/admin/views/admin_views/tmpl/default_body.php index 6174be222..eb3009529 100644 --- a/admin/views/admin_views/tmpl/default_body.php +++ b/admin/views/admin_views/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index a205c0cf3..a1d716133 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php index 76fd67491..6078d649c 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/tmpl/default_toolbar.php b/admin/views/admin_views/tmpl/default_toolbar.php index f8efcef3f..434e7d28d 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index f33910b17..5e14a5b2a 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/compiler/tmpl/default.php b/admin/views/compiler/tmpl/default.php index fd86a63f3..0acde9fc8 100644 --- a/admin/views/compiler/tmpl/default.php +++ b/admin/views/compiler/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php index ab03749eb..5d86e1ec2 100644 --- a/admin/views/compiler/view.html.php +++ b/admin/views/compiler/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/component/submitbutton.js b/admin/views/component/submitbutton.js index b1606df21..c4d49bf8e 100644 --- a/admin/views/component/submitbutton.js +++ b/admin/views/component/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/component/tmpl/edit.php b/admin/views/component/tmpl/edit.php index 60a50d2c3..41249c4a8 100644 --- a/admin/views/component/tmpl/edit.php +++ b/admin/views/component/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/component/view.html.php b/admin/views/component/view.html.php index 48d141117..1e4d2a75a 100644 --- a/admin/views/component/view.html.php +++ b/admin/views/component/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index 25aac54f1..0c1073f70 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index d262443c6..f065e2c7d 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php index 7dd016f92..9e0f06b37 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index ac369f512..47ef0cf9a 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/components/tmpl/default.php b/admin/views/components/tmpl/default.php index 5d40a1e20..5ff603001 100644 --- a/admin/views/components/tmpl/default.php +++ b/admin/views/components/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/components/tmpl/default_batch_body.php b/admin/views/components/tmpl/default_batch_body.php index 13ea86799..b3723acbb 100644 --- a/admin/views/components/tmpl/default_batch_body.php +++ b/admin/views/components/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/components/tmpl/default_batch_footer.php b/admin/views/components/tmpl/default_batch_footer.php index bf3466ede..dcd8f16ce 100644 --- a/admin/views/components/tmpl/default_batch_footer.php +++ b/admin/views/components/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/components/tmpl/default_body.php b/admin/views/components/tmpl/default_body.php index 7f8319ad8..287b03255 100644 --- a/admin/views/components/tmpl/default_body.php +++ b/admin/views/components/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/components/tmpl/default_foot.php b/admin/views/components/tmpl/default_foot.php index e20c0ef9b..8b9796913 100644 --- a/admin/views/components/tmpl/default_foot.php +++ b/admin/views/components/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/components/tmpl/default_head.php b/admin/views/components/tmpl/default_head.php index cc52ac528..fb8e2da53 100644 --- a/admin/views/components/tmpl/default_head.php +++ b/admin/views/components/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/components/tmpl/default_toolbar.php b/admin/views/components/tmpl/default_toolbar.php index d23f66b3c..d99d34634 100644 --- a/admin/views/components/tmpl/default_toolbar.php +++ b/admin/views/components/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/components/view.html.php b/admin/views/components/view.html.php index 07677d074..d4e06ef84 100644 --- a/admin/views/components/view.html.php +++ b/admin/views/components/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/custom_admin_view/submitbutton.js b/admin/views/custom_admin_view/submitbutton.js index dd12ffb43..bb2195ca6 100644 --- a/admin/views/custom_admin_view/submitbutton.js +++ b/admin/views/custom_admin_view/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/custom_admin_view/tmpl/edit.php b/admin/views/custom_admin_view/tmpl/edit.php index a706c4b8f..e163aa199 100644 --- a/admin/views/custom_admin_view/tmpl/edit.php +++ b/admin/views/custom_admin_view/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php index 1bc02ccd6..193d8f8eb 100644 --- a/admin/views/custom_admin_view/view.html.php +++ b/admin/views/custom_admin_view/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/custom_admin_views/tmpl/default.php b/admin/views/custom_admin_views/tmpl/default.php index a30839456..ef362ae34 100644 --- a/admin/views/custom_admin_views/tmpl/default.php +++ b/admin/views/custom_admin_views/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/custom_admin_views/tmpl/default_batch_body.php b/admin/views/custom_admin_views/tmpl/default_batch_body.php index add3052d1..a552133b8 100644 --- a/admin/views/custom_admin_views/tmpl/default_batch_body.php +++ b/admin/views/custom_admin_views/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/custom_admin_views/tmpl/default_batch_footer.php b/admin/views/custom_admin_views/tmpl/default_batch_footer.php index ed04e3b01..d4eecfcc0 100644 --- a/admin/views/custom_admin_views/tmpl/default_batch_footer.php +++ b/admin/views/custom_admin_views/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/custom_admin_views/tmpl/default_body.php b/admin/views/custom_admin_views/tmpl/default_body.php index fe6384034..28600e28f 100644 --- a/admin/views/custom_admin_views/tmpl/default_body.php +++ b/admin/views/custom_admin_views/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/custom_admin_views/tmpl/default_foot.php b/admin/views/custom_admin_views/tmpl/default_foot.php index 6999d561a..a9f2e4596 100644 --- a/admin/views/custom_admin_views/tmpl/default_foot.php +++ b/admin/views/custom_admin_views/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/custom_admin_views/tmpl/default_head.php b/admin/views/custom_admin_views/tmpl/default_head.php index b4ade2e82..004be8fd8 100644 --- a/admin/views/custom_admin_views/tmpl/default_head.php +++ b/admin/views/custom_admin_views/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/custom_admin_views/tmpl/default_toolbar.php b/admin/views/custom_admin_views/tmpl/default_toolbar.php index 2f50549e8..c2238af55 100644 --- a/admin/views/custom_admin_views/tmpl/default_toolbar.php +++ b/admin/views/custom_admin_views/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php index a1a1c271e..66e6cef1c 100644 --- a/admin/views/custom_admin_views/view.html.php +++ b/admin/views/custom_admin_views/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/dynamic_get/submitbutton.js b/admin/views/dynamic_get/submitbutton.js index 0a0940640..2f8b73598 100644 --- a/admin/views/dynamic_get/submitbutton.js +++ b/admin/views/dynamic_get/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/dynamic_get/tmpl/edit.php b/admin/views/dynamic_get/tmpl/edit.php index ac33f1bd9..283e0d818 100644 --- a/admin/views/dynamic_get/tmpl/edit.php +++ b/admin/views/dynamic_get/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/dynamic_get/view.html.php b/admin/views/dynamic_get/view.html.php index 0456880cc..4527100c3 100644 --- a/admin/views/dynamic_get/view.html.php +++ b/admin/views/dynamic_get/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/dynamic_gets/tmpl/default.php b/admin/views/dynamic_gets/tmpl/default.php index f36d8e70e..5abaa04d0 100644 --- a/admin/views/dynamic_gets/tmpl/default.php +++ b/admin/views/dynamic_gets/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/dynamic_gets/tmpl/default_batch_body.php b/admin/views/dynamic_gets/tmpl/default_batch_body.php index 2a42bfc7b..2dce86a26 100644 --- a/admin/views/dynamic_gets/tmpl/default_batch_body.php +++ b/admin/views/dynamic_gets/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/dynamic_gets/tmpl/default_batch_footer.php b/admin/views/dynamic_gets/tmpl/default_batch_footer.php index 2c6db3bf4..925a145df 100644 --- a/admin/views/dynamic_gets/tmpl/default_batch_footer.php +++ b/admin/views/dynamic_gets/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/dynamic_gets/tmpl/default_body.php b/admin/views/dynamic_gets/tmpl/default_body.php index e6b583c46..8b5686efd 100644 --- a/admin/views/dynamic_gets/tmpl/default_body.php +++ b/admin/views/dynamic_gets/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/dynamic_gets/tmpl/default_foot.php b/admin/views/dynamic_gets/tmpl/default_foot.php index bc533fb46..d8a25d1f5 100644 --- a/admin/views/dynamic_gets/tmpl/default_foot.php +++ b/admin/views/dynamic_gets/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/dynamic_gets/tmpl/default_head.php b/admin/views/dynamic_gets/tmpl/default_head.php index 7a0cf678d..3e6ba5ea1 100644 --- a/admin/views/dynamic_gets/tmpl/default_head.php +++ b/admin/views/dynamic_gets/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/dynamic_gets/tmpl/default_toolbar.php b/admin/views/dynamic_gets/tmpl/default_toolbar.php index 5838f5419..3c16b44d7 100644 --- a/admin/views/dynamic_gets/tmpl/default_toolbar.php +++ b/admin/views/dynamic_gets/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php index 837690214..50ca4b849 100644 --- a/admin/views/dynamic_gets/view.html.php +++ b/admin/views/dynamic_gets/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/field/submitbutton.js b/admin/views/field/submitbutton.js index d390841b1..0c4504310 100644 --- a/admin/views/field/submitbutton.js +++ b/admin/views/field/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php index 765652830..439b751f9 100644 --- a/admin/views/field/tmpl/edit.php +++ b/admin/views/field/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/field/view.html.php b/admin/views/field/view.html.php index 998c7de45..30fcc8e4b 100644 --- a/admin/views/field/view.html.php +++ b/admin/views/field/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fields/tmpl/default.php b/admin/views/fields/tmpl/default.php index 20334386f..bdc8a5091 100644 --- a/admin/views/fields/tmpl/default.php +++ b/admin/views/fields/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fields/tmpl/default_batch_body.php b/admin/views/fields/tmpl/default_batch_body.php index 3e355e201..a32725a7c 100644 --- a/admin/views/fields/tmpl/default_batch_body.php +++ b/admin/views/fields/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fields/tmpl/default_batch_footer.php b/admin/views/fields/tmpl/default_batch_footer.php index a2df496b2..62c3b9d36 100644 --- a/admin/views/fields/tmpl/default_batch_footer.php +++ b/admin/views/fields/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fields/tmpl/default_body.php b/admin/views/fields/tmpl/default_body.php index c19e949e1..a8c76662a 100644 --- a/admin/views/fields/tmpl/default_body.php +++ b/admin/views/fields/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fields/tmpl/default_foot.php b/admin/views/fields/tmpl/default_foot.php index 4c659e6da..3f340f6df 100644 --- a/admin/views/fields/tmpl/default_foot.php +++ b/admin/views/fields/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fields/tmpl/default_head.php b/admin/views/fields/tmpl/default_head.php index 5626137b6..48e280320 100644 --- a/admin/views/fields/tmpl/default_head.php +++ b/admin/views/fields/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fields/tmpl/default_toolbar.php b/admin/views/fields/tmpl/default_toolbar.php index f35604081..34b6e63ed 100644 --- a/admin/views/fields/tmpl/default_toolbar.php +++ b/admin/views/fields/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php index 20caa7480..2d5c28c98 100644 --- a/admin/views/fields/view.html.php +++ b/admin/views/fields/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fieldtype/submitbutton.js b/admin/views/fieldtype/submitbutton.js index 707765655..e828903c5 100644 --- a/admin/views/fieldtype/submitbutton.js +++ b/admin/views/fieldtype/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fieldtype/tmpl/edit.php b/admin/views/fieldtype/tmpl/edit.php index f64737377..1e4b385ad 100644 --- a/admin/views/fieldtype/tmpl/edit.php +++ b/admin/views/fieldtype/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php index 13eb905a3..d718c5d3c 100644 --- a/admin/views/fieldtype/view.html.php +++ b/admin/views/fieldtype/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @@ -72,7 +72,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy } // Get Linked view data - $this->vyyfields = $this->get('Vyyfields'); + $this->vyzfields = $this->get('Vyzfields'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/fieldtypes/tmpl/default.php b/admin/views/fieldtypes/tmpl/default.php index f12ee1bb1..30d003a90 100644 --- a/admin/views/fieldtypes/tmpl/default.php +++ b/admin/views/fieldtypes/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fieldtypes/tmpl/default_batch_body.php b/admin/views/fieldtypes/tmpl/default_batch_body.php index 3385e827f..2c945bd61 100644 --- a/admin/views/fieldtypes/tmpl/default_batch_body.php +++ b/admin/views/fieldtypes/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fieldtypes/tmpl/default_batch_footer.php b/admin/views/fieldtypes/tmpl/default_batch_footer.php index 2ab5b9275..c6989ed94 100644 --- a/admin/views/fieldtypes/tmpl/default_batch_footer.php +++ b/admin/views/fieldtypes/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fieldtypes/tmpl/default_body.php b/admin/views/fieldtypes/tmpl/default_body.php index e3e83b64d..b8147cfb7 100644 --- a/admin/views/fieldtypes/tmpl/default_body.php +++ b/admin/views/fieldtypes/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fieldtypes/tmpl/default_foot.php b/admin/views/fieldtypes/tmpl/default_foot.php index bc533fb46..d8a25d1f5 100644 --- a/admin/views/fieldtypes/tmpl/default_foot.php +++ b/admin/views/fieldtypes/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fieldtypes/tmpl/default_head.php b/admin/views/fieldtypes/tmpl/default_head.php index 47f4ad8e2..2641727ca 100644 --- a/admin/views/fieldtypes/tmpl/default_head.php +++ b/admin/views/fieldtypes/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fieldtypes/tmpl/default_toolbar.php b/admin/views/fieldtypes/tmpl/default_toolbar.php index 24595136a..623207774 100644 --- a/admin/views/fieldtypes/tmpl/default_toolbar.php +++ b/admin/views/fieldtypes/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/fieldtypes/view.html.php b/admin/views/fieldtypes/view.html.php index 32ae46b36..28c84749d 100644 --- a/admin/views/fieldtypes/view.html.php +++ b/admin/views/fieldtypes/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index 4c8f38b0c..fca3247d7 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index 1280812dd..efeea5cd0 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index ad1490b98..788f33ce2 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php index d6541520f..ba353c122 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php index 07f3ea232..7cca5dd97 100644 --- a/admin/views/help_documents/tmpl/default_batch_body.php +++ b/admin/views/help_documents/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php index af0da64a8..1da70a33c 100644 --- a/admin/views/help_documents/tmpl/default_batch_footer.php +++ b/admin/views/help_documents/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php index 52e0781ba..776c59e51 100644 --- a/admin/views/help_documents/tmpl/default_body.php +++ b/admin/views/help_documents/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php index e20c0ef9b..8b9796913 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php index fa6ed331b..27f49d3da 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php index f20761ceb..81895e200 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index 2ec5717ad..d262029d6 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index f0de3c8db..fb3f390a4 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @@ -32,8 +32,7 @@ JHtml::_('bootstrap.tooltip'); JHtml::_('script', 'system/core.js', false, true); ?> @@ -146,89 +145,87 @@ JHtml::_('script', 'system/core.js', false, true);
- - hasPackage && ComponentbuilderHelper::checkArray($this->headerList) && ComponentbuilderHelper::checkArray($this->headers)) : ?> -
- -
- -
- -
-
- headerList as $name => $title): ?> -
- -
- -
-
- -
- -
-
- - + + hasPackage && ComponentbuilderHelper::checkArray($this->headerList) && ComponentbuilderHelper::checkArray($this->headers)) : ?> +
+ +
+ +
+ +
+
+ headerList as $name => $title): ?> +
+ +
+ +
+
+ +
+ +
+
+ + 'upload')); ?> - - -
- -
- -
- -
-
-
-     (.csv .xls .ods) -
-
- - - -
- -
- -
- -
-
-
-     (.csv .xls .ods) -
-
- - - -
- -
- -
- -
-
-
-     (.csv .xls .ods) -
-
- - - - + + +
+ +
+ +
+ +
+
+
+     (.csv .xls .ods) +
+
+ + + +
+ +
+ +
+ +
+
+
+     (.csv .xls .ods) +
+
+ + + +
+ +
+ +
+ +
+
+
+     (.csv .xls .ods) +
+
+ + - - - + + + -
+
\ No newline at end of file diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index a49d73f87..cbe58fd11 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/layout/submitbutton.js b/admin/views/layout/submitbutton.js index 9a17dde05..4f388d499 100644 --- a/admin/views/layout/submitbutton.js +++ b/admin/views/layout/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/layout/tmpl/edit.php b/admin/views/layout/tmpl/edit.php index 06e7cbf03..aed21828b 100644 --- a/admin/views/layout/tmpl/edit.php +++ b/admin/views/layout/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/layout/view.html.php b/admin/views/layout/view.html.php index 36004620b..f53067c9a 100644 --- a/admin/views/layout/view.html.php +++ b/admin/views/layout/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/layouts/tmpl/default.php b/admin/views/layouts/tmpl/default.php index 8be40a9ad..99694b6fa 100644 --- a/admin/views/layouts/tmpl/default.php +++ b/admin/views/layouts/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/layouts/tmpl/default_batch_body.php b/admin/views/layouts/tmpl/default_batch_body.php index a47564378..86dc89178 100644 --- a/admin/views/layouts/tmpl/default_batch_body.php +++ b/admin/views/layouts/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/layouts/tmpl/default_batch_footer.php b/admin/views/layouts/tmpl/default_batch_footer.php index eab32f1d6..b8588a136 100644 --- a/admin/views/layouts/tmpl/default_batch_footer.php +++ b/admin/views/layouts/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/layouts/tmpl/default_body.php b/admin/views/layouts/tmpl/default_body.php index 81c5e9014..b9905a3df 100644 --- a/admin/views/layouts/tmpl/default_body.php +++ b/admin/views/layouts/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/layouts/tmpl/default_foot.php b/admin/views/layouts/tmpl/default_foot.php index a205c0cf3..a1d716133 100644 --- a/admin/views/layouts/tmpl/default_foot.php +++ b/admin/views/layouts/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/layouts/tmpl/default_head.php b/admin/views/layouts/tmpl/default_head.php index 36304e902..0eeccbb43 100644 --- a/admin/views/layouts/tmpl/default_head.php +++ b/admin/views/layouts/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/layouts/tmpl/default_toolbar.php b/admin/views/layouts/tmpl/default_toolbar.php index 4b058cbaf..6fa278809 100644 --- a/admin/views/layouts/tmpl/default_toolbar.php +++ b/admin/views/layouts/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php index aaf2d88fb..dbcfe0f0d 100644 --- a/admin/views/layouts/view.html.php +++ b/admin/views/layouts/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/site_view/submitbutton.js b/admin/views/site_view/submitbutton.js index 994cf457a..482bf031b 100644 --- a/admin/views/site_view/submitbutton.js +++ b/admin/views/site_view/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/site_view/tmpl/edit.php b/admin/views/site_view/tmpl/edit.php index 6121f48ac..46fb14eb6 100644 --- a/admin/views/site_view/tmpl/edit.php +++ b/admin/views/site_view/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/site_view/view.html.php b/admin/views/site_view/view.html.php index 6f874dd5e..083334e43 100644 --- a/admin/views/site_view/view.html.php +++ b/admin/views/site_view/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/site_views/tmpl/default.php b/admin/views/site_views/tmpl/default.php index e29704316..95d1d76e3 100644 --- a/admin/views/site_views/tmpl/default.php +++ b/admin/views/site_views/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/site_views/tmpl/default_batch_body.php b/admin/views/site_views/tmpl/default_batch_body.php index 4f80d562f..dc5a5b390 100644 --- a/admin/views/site_views/tmpl/default_batch_body.php +++ b/admin/views/site_views/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/site_views/tmpl/default_batch_footer.php b/admin/views/site_views/tmpl/default_batch_footer.php index 99e87b569..05f232f23 100644 --- a/admin/views/site_views/tmpl/default_batch_footer.php +++ b/admin/views/site_views/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/site_views/tmpl/default_body.php b/admin/views/site_views/tmpl/default_body.php index a0d6d1cf2..1146aae8f 100644 --- a/admin/views/site_views/tmpl/default_body.php +++ b/admin/views/site_views/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/site_views/tmpl/default_foot.php b/admin/views/site_views/tmpl/default_foot.php index 6999d561a..a9f2e4596 100644 --- a/admin/views/site_views/tmpl/default_foot.php +++ b/admin/views/site_views/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/site_views/tmpl/default_head.php b/admin/views/site_views/tmpl/default_head.php index 30541fa03..f33935abe 100644 --- a/admin/views/site_views/tmpl/default_head.php +++ b/admin/views/site_views/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/site_views/tmpl/default_toolbar.php b/admin/views/site_views/tmpl/default_toolbar.php index 9f5bc0b90..cda28c245 100644 --- a/admin/views/site_views/tmpl/default_toolbar.php +++ b/admin/views/site_views/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php index 13376ccc3..5cc06ea25 100644 --- a/admin/views/site_views/view.html.php +++ b/admin/views/site_views/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/snippet/submitbutton.js b/admin/views/snippet/submitbutton.js index 3b97acf99..3c2388ee0 100644 --- a/admin/views/snippet/submitbutton.js +++ b/admin/views/snippet/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/snippet/tmpl/edit.php b/admin/views/snippet/tmpl/edit.php index d190e2147..740f5e2f8 100644 --- a/admin/views/snippet/tmpl/edit.php +++ b/admin/views/snippet/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/snippet/view.html.php b/admin/views/snippet/view.html.php index adb784760..5c987e646 100644 --- a/admin/views/snippet/view.html.php +++ b/admin/views/snippet/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/snippets/tmpl/default.php b/admin/views/snippets/tmpl/default.php index 937789836..a51395b36 100644 --- a/admin/views/snippets/tmpl/default.php +++ b/admin/views/snippets/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/snippets/tmpl/default_batch_body.php b/admin/views/snippets/tmpl/default_batch_body.php index a5aa6a2b2..1a5168ab1 100644 --- a/admin/views/snippets/tmpl/default_batch_body.php +++ b/admin/views/snippets/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/snippets/tmpl/default_batch_footer.php b/admin/views/snippets/tmpl/default_batch_footer.php index 98a3c554e..53135d129 100644 --- a/admin/views/snippets/tmpl/default_batch_footer.php +++ b/admin/views/snippets/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/snippets/tmpl/default_body.php b/admin/views/snippets/tmpl/default_body.php index 10ca3103e..9a37ed418 100644 --- a/admin/views/snippets/tmpl/default_body.php +++ b/admin/views/snippets/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/snippets/tmpl/default_foot.php b/admin/views/snippets/tmpl/default_foot.php index a205c0cf3..a1d716133 100644 --- a/admin/views/snippets/tmpl/default_foot.php +++ b/admin/views/snippets/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/snippets/tmpl/default_head.php b/admin/views/snippets/tmpl/default_head.php index b9fd4d8d3..84d353d8e 100644 --- a/admin/views/snippets/tmpl/default_head.php +++ b/admin/views/snippets/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/snippets/tmpl/default_toolbar.php b/admin/views/snippets/tmpl/default_toolbar.php index 45a8f8158..02dcf5e87 100644 --- a/admin/views/snippets/tmpl/default_toolbar.php +++ b/admin/views/snippets/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php index 72ef76369..f757688c2 100644 --- a/admin/views/snippets/view.html.php +++ b/admin/views/snippets/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/template/submitbutton.js b/admin/views/template/submitbutton.js index 1116b99f5..7085c71ed 100644 --- a/admin/views/template/submitbutton.js +++ b/admin/views/template/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/template/tmpl/edit.php b/admin/views/template/tmpl/edit.php index 22da7ff36..042d174e8 100644 --- a/admin/views/template/tmpl/edit.php +++ b/admin/views/template/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/template/view.html.php b/admin/views/template/view.html.php index 1b454843a..fd3274870 100644 --- a/admin/views/template/view.html.php +++ b/admin/views/template/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/templates/tmpl/default.php b/admin/views/templates/tmpl/default.php index e6d0a4fed..6b15453e1 100644 --- a/admin/views/templates/tmpl/default.php +++ b/admin/views/templates/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/templates/tmpl/default_batch_body.php b/admin/views/templates/tmpl/default_batch_body.php index 74d596518..b1c66dc59 100644 --- a/admin/views/templates/tmpl/default_batch_body.php +++ b/admin/views/templates/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/templates/tmpl/default_batch_footer.php b/admin/views/templates/tmpl/default_batch_footer.php index dd1da0cf3..f939b066a 100644 --- a/admin/views/templates/tmpl/default_batch_footer.php +++ b/admin/views/templates/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/templates/tmpl/default_body.php b/admin/views/templates/tmpl/default_body.php index b67d49a64..30884f763 100644 --- a/admin/views/templates/tmpl/default_body.php +++ b/admin/views/templates/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/templates/tmpl/default_foot.php b/admin/views/templates/tmpl/default_foot.php index a205c0cf3..a1d716133 100644 --- a/admin/views/templates/tmpl/default_foot.php +++ b/admin/views/templates/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/templates/tmpl/default_head.php b/admin/views/templates/tmpl/default_head.php index eccf90c2c..5523d6ee8 100644 --- a/admin/views/templates/tmpl/default_head.php +++ b/admin/views/templates/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/templates/tmpl/default_toolbar.php b/admin/views/templates/tmpl/default_toolbar.php index 08ac9b83b..67991a007 100644 --- a/admin/views/templates/tmpl/default_toolbar.php +++ b/admin/views/templates/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php index 222440205..883c62472 100644 --- a/admin/views/templates/view.html.php +++ b/admin/views/templates/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/componentbuilder.xml b/componentbuilder.xml index 1ad1c2b07..b9ced92d7 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -7,9 +7,9 @@ https://www.vdm.io/joomla-component-builder Copyright (C) 2015. All Rights Reserved GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - 2.1.6 + 2.1.7 Component Builder (v.2.1.6) +

Component Builder (v.2.1.7)

The Component Builder for Joomla that is highly advanced, truly able to build extremely complex components in a fraction of the time.

Created by Llewellyn van der Merwe
Development started 30th April, 2015

diff --git a/script.php b/script.php index b33e13c82..e74d038c4 100644 --- a/script.php +++ b/script.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @@ -1267,9 +1267,9 @@ class com_componentbuilderInstallerScript $admin_view->type_title = 'Componentbuilder Admin_view'; $admin_view->type_alias = 'com_componentbuilder.admin_view'; $admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","type":"type","php_before_delete":"php_before_delete","php_postsavehook":"php_postsavehook","sql":"sql","php_getlistquery":"php_getlistquery","description":"description","php_batchcopy":"php_batchcopy","icon":"icon","php_document":"php_document","php_getitem":"php_getitem","html_import_view":"html_import_view","icon_add":"icon_add","icon_category":"icon_category","php_getitems":"php_getitems","php_save":"php_save","php_allowedit":"php_allowedit","php_batchmove":"php_batchmove","php_after_delete":"php_after_delete","source":"source","php_import_save":"php_import_save","add_php_getitem":"add_php_getitem","add_php_getitems":"add_php_getitems","add_css_view":"add_css_view","add_php_getlistquery":"add_php_getlistquery","css_view":"css_view","add_php_save":"add_php_save","add_css_views":"add_css_views","add_php_postsavehook":"add_php_postsavehook","css_views":"css_views","add_php_allowedit":"add_php_allowedit","add_javascript_view_file":"add_javascript_view_file","add_php_batchcopy":"add_php_batchcopy","javascript_view_file":"javascript_view_file","add_php_batchmove":"add_php_batchmove","add_javascript_view_footer":"add_javascript_view_footer","add_php_before_delete":"add_php_before_delete","javascript_view_footer":"javascript_view_footer","add_php_after_delete":"add_php_after_delete","add_javascript_views_file":"add_javascript_views_file","add_php_document":"add_php_document","javascript_views_file":"javascript_views_file","add_sql":"add_sql","add_javascript_views_footer":"add_javascript_views_footer","javascript_views_footer":"javascript_views_footer","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","php_import_setdata":"php_import_setdata","not_required":"not_required"}}'; + $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","add_php_allowedit":"add_php_allowedit","add_php_getitems":"add_php_getitems","add_php_after_delete":"add_php_after_delete","type":"type","add_php_save":"add_php_save","description":"description","add_php_batchmove":"add_php_batchmove","icon":"icon","add_sql":"add_sql","icon_add":"icon_add","php_import_setdata":"php_import_setdata","icon_category":"icon_category","add_php_getlistquery":"add_php_getlistquery","add_php_postsavehook":"add_php_postsavehook","add_php_batchcopy":"add_php_batchcopy","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","add_custom_import":"add_custom_import","php_import":"php_import","php_getitem":"php_getitem","add_css_view":"add_css_view","php_getitems":"php_getitems","css_view":"css_view","php_getlistquery":"php_getlistquery","add_css_views":"add_css_views","php_save":"php_save","css_views":"css_views","php_postsavehook":"php_postsavehook","add_javascript_view_file":"add_javascript_view_file","php_allowedit":"php_allowedit","javascript_view_file":"javascript_view_file","php_batchcopy":"php_batchcopy","add_javascript_view_footer":"add_javascript_view_footer","php_batchmove":"php_batchmove","javascript_view_footer":"javascript_view_footer","php_before_delete":"php_before_delete","add_javascript_views_file":"add_javascript_views_file","php_after_delete":"php_after_delete","javascript_views_file":"javascript_views_file","php_document":"php_document","add_javascript_views_footer":"add_javascript_views_footer","source":"source","javascript_views_footer":"javascript_views_footer","sql":"sql","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_save":"php_import_save","add_php_getitem":"add_php_getitem","not_required":"not_required"}}'; $admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute'; - $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_php_getitem","add_php_getitems","add_css_view","add_php_getlistquery","add_php_save","add_css_views","add_php_postsavehook","add_php_allowedit","add_javascript_view_file","add_php_batchcopy","add_php_batchmove","add_javascript_view_footer","add_php_before_delete","add_php_after_delete","add_javascript_views_file","add_php_document","add_sql","add_javascript_views_footer","add_php_ajax","add_custom_import","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_allowedit","add_php_getitems","add_php_after_delete","type","add_php_save","add_php_batchmove","add_sql","add_php_getlistquery","add_php_postsavehook","add_php_batchcopy","add_php_before_delete","add_php_document","add_custom_import","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","source","add_php_ajax","add_php_getitem","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $admin_view_Inserted = $db->insertObject('#__content_types', $admin_view); @@ -1468,9 +1468,9 @@ class com_componentbuilderInstallerScript $admin_view->type_title = 'Componentbuilder Admin_view'; $admin_view->type_alias = 'com_componentbuilder.admin_view'; $admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","type":"type","php_before_delete":"php_before_delete","php_postsavehook":"php_postsavehook","sql":"sql","php_getlistquery":"php_getlistquery","description":"description","php_batchcopy":"php_batchcopy","icon":"icon","php_document":"php_document","php_getitem":"php_getitem","html_import_view":"html_import_view","icon_add":"icon_add","icon_category":"icon_category","php_getitems":"php_getitems","php_save":"php_save","php_allowedit":"php_allowedit","php_batchmove":"php_batchmove","php_after_delete":"php_after_delete","source":"source","php_import_save":"php_import_save","add_php_getitem":"add_php_getitem","add_php_getitems":"add_php_getitems","add_css_view":"add_css_view","add_php_getlistquery":"add_php_getlistquery","css_view":"css_view","add_php_save":"add_php_save","add_css_views":"add_css_views","add_php_postsavehook":"add_php_postsavehook","css_views":"css_views","add_php_allowedit":"add_php_allowedit","add_javascript_view_file":"add_javascript_view_file","add_php_batchcopy":"add_php_batchcopy","javascript_view_file":"javascript_view_file","add_php_batchmove":"add_php_batchmove","add_javascript_view_footer":"add_javascript_view_footer","add_php_before_delete":"add_php_before_delete","javascript_view_footer":"javascript_view_footer","add_php_after_delete":"add_php_after_delete","add_javascript_views_file":"add_javascript_views_file","add_php_document":"add_php_document","javascript_views_file":"javascript_views_file","add_sql":"add_sql","add_javascript_views_footer":"add_javascript_views_footer","javascript_views_footer":"javascript_views_footer","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","php_import_setdata":"php_import_setdata","not_required":"not_required"}}'; + $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","add_php_allowedit":"add_php_allowedit","add_php_getitems":"add_php_getitems","add_php_after_delete":"add_php_after_delete","type":"type","add_php_save":"add_php_save","description":"description","add_php_batchmove":"add_php_batchmove","icon":"icon","add_sql":"add_sql","icon_add":"icon_add","php_import_setdata":"php_import_setdata","icon_category":"icon_category","add_php_getlistquery":"add_php_getlistquery","add_php_postsavehook":"add_php_postsavehook","add_php_batchcopy":"add_php_batchcopy","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","add_custom_import":"add_custom_import","php_import":"php_import","php_getitem":"php_getitem","add_css_view":"add_css_view","php_getitems":"php_getitems","css_view":"css_view","php_getlistquery":"php_getlistquery","add_css_views":"add_css_views","php_save":"php_save","css_views":"css_views","php_postsavehook":"php_postsavehook","add_javascript_view_file":"add_javascript_view_file","php_allowedit":"php_allowedit","javascript_view_file":"javascript_view_file","php_batchcopy":"php_batchcopy","add_javascript_view_footer":"add_javascript_view_footer","php_batchmove":"php_batchmove","javascript_view_footer":"javascript_view_footer","php_before_delete":"php_before_delete","add_javascript_views_file":"add_javascript_views_file","php_after_delete":"php_after_delete","javascript_views_file":"javascript_views_file","php_document":"php_document","add_javascript_views_footer":"add_javascript_views_footer","source":"source","javascript_views_footer":"javascript_views_footer","sql":"sql","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_save":"php_import_save","add_php_getitem":"add_php_getitem","not_required":"not_required"}}'; $admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute'; - $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_php_getitem","add_php_getitems","add_css_view","add_php_getlistquery","add_php_save","add_css_views","add_php_postsavehook","add_php_allowedit","add_javascript_view_file","add_php_batchcopy","add_php_batchmove","add_javascript_view_footer","add_php_before_delete","add_php_after_delete","add_javascript_views_file","add_php_document","add_sql","add_javascript_views_footer","add_php_ajax","add_custom_import","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_allowedit","add_php_getitems","add_php_after_delete","type","add_php_save","add_php_batchmove","add_sql","add_php_getlistquery","add_php_postsavehook","add_php_batchcopy","add_php_before_delete","add_php_document","add_custom_import","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","source","add_php_ajax","add_php_getitem","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Check if admin_view type is already in content_type DB. $admin_view_id = null; @@ -1815,7 +1815,7 @@ class com_componentbuilderInstallerScript echo ' -

Upgrade to Version 2.1.6 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 2.1.7 Was Successful! Let us know if anything is not working as expected.

'; } } } diff --git a/site/assets/css/site.css b/site/assets/css/site.css index bf98ca9eb..9dd156d06 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/site/componentbuilder.php b/site/componentbuilder.php index a4eff3541..e805e2e9f 100644 --- a/site/componentbuilder.php +++ b/site/componentbuilder.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/site/controller.php b/site/controller.php index 6f4bc4291..0ca1e6cbb 100644 --- a/site/controller.php +++ b/site/controller.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/site/controllers/help.php b/site/controllers/help.php index dc8241b6e..fa0d790ce 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index ae4dfbe41..3764d1343 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index 2f1cb0329..8bf0ea1b6 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/site/helpers/route.php b/site/helpers/route.php index 9194d433c..8a25da26c 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder diff --git a/site/router.php b/site/router.php index 6a2d92bf6..395b4f2c5 100644 --- a/site/router.php +++ b/site/router.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.6 + @version 2.1.7 @build 4th May, 2016 @created 30th April, 2015 @package Component Builder