diff --git a/README.md b/README.md index 1b754c338..64ba688c0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Component Builder (2.1.4) +# Component Builder (2.1.5) This is a [Joomla 3.x] (http://www.joomla.org/) component. @@ -32,32 +32,32 @@ Would you require more help VDM.io has a number of support plans available [visi + *Author*: [Llewellyn van der Merwe] (mailto:info@vdm.io) + *Name*: [Component Builder] (https://www.vdm.io/joomla-component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 2nd May, 2016 -+ *Version*: 2.1.4 ++ *Last Build*: 4th May, 2016 ++ *Version*: 2.1.5 + *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 -**225 Hours** or **28 Eight Hour Days** (actual time the author saved - +**227 Hours** or **28 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*: **80712** -+ *File count*: **496** ++ *Line count*: **81571** ++ *File count*: **498** + *Folder count*: **98** -**148 Hours** or **19 Eight Hour Days** (the actual time the author spent) +**150 Hours** or **19 Eight Hour Days** (the actual time the author spent) > (with the following break down: -> **debugging @56hours** = codingtime / 4; +> **debugging @57hours** = codingtime / 4; > **planning @32hours** = codingtime / 7; > **mapping @23hours** = codingtime / 10; > **office @38hours** = codingtime / 6;) -**373 Hours** or **47 Eight Hour Days** +**377 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 9608a1623..f6bcd802c 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index a723a6fda..1de82678f 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.css diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index f88ff7363..54d9ba160 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views.css diff --git a/admin/assets/css/component.css b/admin/assets/css/component.css index e7f6964f7..3b797cafd 100644 --- a/admin/assets/css/component.css +++ b/admin/assets/css/component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.css diff --git a/admin/assets/css/components.css b/admin/assets/css/components.css index 8056f530f..59385b72b 100644 --- a/admin/assets/css/components.css +++ b/admin/assets/css/components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage components.css diff --git a/admin/assets/css/custom_admin_view.css b/admin/assets/css/custom_admin_view.css index 8724b6443..ee6499303 100644 --- a/admin/assets/css/custom_admin_view.css +++ b/admin/assets/css/custom_admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.css diff --git a/admin/assets/css/custom_admin_views.css b/admin/assets/css/custom_admin_views.css index 81c1d42b7..b3d7b85da 100644 --- a/admin/assets/css/custom_admin_views.css +++ b/admin/assets/css/custom_admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 53afc18ea..6733c48b8 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/css/dynamic_get.css b/admin/assets/css/dynamic_get.css index 631592068..32e116cfd 100644 --- a/admin/assets/css/dynamic_get.css +++ b/admin/assets/css/dynamic_get.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.css diff --git a/admin/assets/css/dynamic_gets.css b/admin/assets/css/dynamic_gets.css index d65ae8ad2..52c6e49fb 100644 --- a/admin/assets/css/dynamic_gets.css +++ b/admin/assets/css/dynamic_gets.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.css diff --git a/admin/assets/css/field.css b/admin/assets/css/field.css index 9936066fe..663f21bca 100644 --- a/admin/assets/css/field.css +++ b/admin/assets/css/field.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.css diff --git a/admin/assets/css/fields.css b/admin/assets/css/fields.css index 1ddff0ccd..b15c3e0ed 100644 --- a/admin/assets/css/fields.css +++ b/admin/assets/css/fields.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.css diff --git a/admin/assets/css/fieldtype.css b/admin/assets/css/fieldtype.css index 6c3407985..3ef864425 100644 --- a/admin/assets/css/fieldtype.css +++ b/admin/assets/css/fieldtype.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.css diff --git a/admin/assets/css/fieldtypes.css b/admin/assets/css/fieldtypes.css index 51c686a9a..5d315b28a 100644 --- a/admin/assets/css/fieldtypes.css +++ b/admin/assets/css/fieldtypes.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index dfcdc46cc..bbaaca2f5 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 88ce18524..83be643f7 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_documents.css diff --git a/admin/assets/css/layout.css b/admin/assets/css/layout.css index ed94bb024..2c6eb124b 100644 --- a/admin/assets/css/layout.css +++ b/admin/assets/css/layout.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.css diff --git a/admin/assets/css/layouts.css b/admin/assets/css/layouts.css index 1f153499f..1b098b800 100644 --- a/admin/assets/css/layouts.css +++ b/admin/assets/css/layouts.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage layouts.css diff --git a/admin/assets/css/site_view.css b/admin/assets/css/site_view.css index 924dbec04..e19e95a7a 100644 --- a/admin/assets/css/site_view.css +++ b/admin/assets/css/site_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.css diff --git a/admin/assets/css/site_views.css b/admin/assets/css/site_views.css index cdbfb6cd4..fec16c465 100644 --- a/admin/assets/css/site_views.css +++ b/admin/assets/css/site_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views.css diff --git a/admin/assets/css/snippet.css b/admin/assets/css/snippet.css index ea3bd2b66..714462a58 100644 --- a/admin/assets/css/snippet.css +++ b/admin/assets/css/snippet.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.css diff --git a/admin/assets/css/snippets.css b/admin/assets/css/snippets.css index bc804c3e8..5e8ce8480 100644 --- a/admin/assets/css/snippets.css +++ b/admin/assets/css/snippets.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.css diff --git a/admin/assets/css/template.css b/admin/assets/css/template.css index 4ad2d5f3a..281a82a29 100644 --- a/admin/assets/css/template.css +++ b/admin/assets/css/template.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.css diff --git a/admin/assets/css/templates.css b/admin/assets/css/templates.css index 8cf3733e8..34342dde0 100644 --- a/admin/assets/css/templates.css +++ b/admin/assets/css/templates.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage templates.css diff --git a/admin/compiler/joomla_3/JControllerLegacy_import_custom.php b/admin/compiler/joomla_3/JControllerLegacy_import_custom.php new file mode 100644 index 000000000..ee70998cd --- /dev/null +++ b/admin/compiler/joomla_3/JControllerLegacy_import_custom.php @@ -0,0 +1,70 @@ + + @my wife Roline van der Merwe + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); +?> +###BOM### + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +/** + * ###Component### ###View### Controller + */ +class ###Component###Controller###View### extends JControllerLegacy +{ + /** + * Import an spreadsheet. + * + * @return void + */ + public function import() + { + // Check for request forgeries + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + + $model = $this->getModel('import'); + if ($model->import()) + { + $cache = JFactory::getCache('mod_menu'); + $cache->clean(); + // TODO: Reset the users acl here as well to kill off any missing bits + } + + $app = JFactory::getApplication(); + $redirect_url = $app->getUserState('com_###component###.redirect_url'); + if (empty($redirect_url)) + { + $redirect_url = JRoute::_('index.php?option=com_###component###&view=###view###', false); + } + else + { + // wipe out the user state when we're going to redirect + $app->setUserState('com_###component###.redirect_url', ''); + $app->setUserState('com_###component###.message', ''); + $app->setUserState('com_###component###.extension_message', ''); + } + $this->setRedirect($redirect_url); + } +} diff --git a/admin/compiler/joomla_3/JModelLegacy_import_custom.php b/admin/compiler/joomla_3/JModelLegacy_import_custom.php new file mode 100644 index 000000000..3373ed786 --- /dev/null +++ b/admin/compiler/joomla_3/JModelLegacy_import_custom.php @@ -0,0 +1,498 @@ + + @my wife Roline van der Merwe + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); +?> +###BOM### + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +/** + * ###Component### ###View### Model + */ +class ###Component###Model###View### extends JModelLegacy +{ + /** + * @var object JTable object + */ + protected $_table = null; + + /** + * @var object JTable object + */ + protected $_url = null; + + /** + * Model context string. + * + * @var string + */ + protected $_context = 'com_###component###.import'; + + /** + * Import Settings + */ + protected $getType = NULL; + protected $dataType = NULL; + + /** + * Method to auto-populate the model state. + * + * Note. Calling getState in this method will result in recursion. + * + * @return void + * + */ + protected function populateState() + { + $app = JFactory::getApplication('administrator'); + + $this->setState('message', $app->getUserState('com_###component###.message')); + $app->setUserState('com_###component###.message', ''); + + // Recall the 'Import from Directory' path. + $path = $app->getUserStateFromRequest($this->_context . '.import_directory', 'import_directory', $app->get('tmp_path')); + $this->setState('import.directory', $path); + // set uploading values + $this->use_streams = false; + $this->allow_unsafe = false; + $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; + } + + /** + * Works out an importation spreadsheet from a HTTP upload + * + * @return spreadsheet definition or false on failure + */ + protected function _getPackageFromUpload() + { + // Get the uploaded file information + $input = JFactory::getApplication()->input; + + // Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get. + $userfile = $input->files->get('import_package', null, 'raw'); + + // Make sure that file uploads are enabled in php + if (!(bool) ini_get('file_uploads')) + { + JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTFILE')); + return false; + } + + // If there is no uploaded file, we have a problem... + if (!is_array($userfile)) + { + JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_NO_FILE_SELECTED')); + return false; + } + + // Check if there was a problem uploading the file. + if ($userfile['error'] || $userfile['size'] < 1) + { + JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTUPLOADERROR')); + return false; + } + + // Build the appropriate paths + $config = JFactory::getConfig(); + $tmp_dest = $config->get('tmp_path') . '/' . $userfile['name']; + $tmp_src = $userfile['tmp_name']; + + // Move uploaded file + jimport('joomla.filesystem.file'); + $p_file = JFile::upload($tmp_src, $tmp_dest, $this->use_streams, $this->allow_unsafe, $this->safeFileOptions); + + // Was the package downloaded? + if (!$p_file) + { + $session = JFactory::getSession(); + $session->clear('package'); + $session->clear('dataType'); + $session->clear('hasPackage'); + // was not uploaded + return false; + } + + // check that this is a valid spreadsheet + $package = $this->check($userfile['name']); + + return $package; + } + + /** + * Import an spreadsheet from a directory + * + * @return array Spreadsheet details or false on failure + * + */ + protected function _getPackageFromFolder() + { + $input = JFactory::getApplication()->input; + + // Get the path to the package to import + $p_dir = $input->getString('import_directory'); + $p_dir = JPath::clean($p_dir); + // Did you give us a valid path? + if (!file_exists($p_dir)) + { + JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY')); + return false; + } + + // Detect the package type + $type = $this->getType; + + // Did you give us a valid package? + if (!$type) + { + JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE')); + } + + // check the extention + switch(strtolower(pathinfo($p_dir, PATHINFO_EXTENSION))){ + case 'xls': + case 'ods': + case 'csv': + break; + + default: + JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE')); + return false; + break; + } + + $package['packagename'] = null; + $package['dir'] = $p_dir; + $package['type'] = $type; + + return $package; + } + + /** + * Import an spreadsheet from a URL + * + * @return Package details or false on failure + * + */ + protected function _getPackageFromUrl() + { + $input = JFactory::getApplication()->input; + + // Get the URL of the package to import + $url = $input->getString('import_url'); + + // Did you give us a URL? + if (!$url) + { + JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL')); + return false; + } + + // Download the package at the URL given + $p_file = JInstallerHelper::downloadPackage($url); + + // Was the package downloaded? + if (!$p_file) + { + JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_INVALID_URL')); + return false; + } + + // check that this is a valid spreadsheet + $package = $this->check($p_file); + + return $package; + } + + /** + * Check a file and verifies it as a spreadsheet file + * Supports .csv .xlsx .xls and .ods + * + * @param string $p_filename The uploaded package filename or import directory + * + * @return array of elements + * + */ + protected function check($archivename) + { + // Clean the name + $archivename = JPath::clean($archivename); + + // check the extention + switch(strtolower(pathinfo($archivename, PATHINFO_EXTENSION))){ + case 'xls': + case 'ods': + case 'csv': + break; + + default: + // Cleanup the import files + $this->remove($archivename); + JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE')); + return false; + break; + } + + $config = JFactory::getConfig(); + // set Package Name + $check['packagename'] = $archivename; + + // set directory + $check['dir'] = $config->get('tmp_path'). '/' .$archivename; + + // set type + $check['type'] = $this->getType; + + return $check; + } + + /** + * Clean up temporary uploaded spreadsheet + * + * @param string $package Name of the uploaded spreadsheet file + * + * @return boolean True on success + * + */ + protected function remove($package) + { + jimport('joomla.filesystem.file'); + + $config = JFactory::getConfig(); + $package = $config->get('tmp_path'). '/' .$package; + + // Is the package file a valid file? + if (is_file($package)) + { + JFile::delete($package); + } + elseif (is_file(JPath::clean($package))) + { + // It might also be just a base filename + 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### + } + + protected function getAlias($name,$type = false) + { + // sanitize the name to an alias + if (JFactory::getConfig()->get('unicodeslugs') == 1) + { + $alias = JFilterOutput::stringURLUnicodeSlug($name); + } + else + { + $alias = JFilterOutput::stringURLSafe($name); + } + // must be a uniqe alias + if ($type) + { + return $this->getUniqe($alias,'alias',$type); + } + return $alias; + } + + /** + * Method to generate a uniqe value. + * + * @param string $field name. + * @param string $value data. + * @param string $type table. + * + * @return string New value. + */ + protected function getUniqe($value,$field,$type) + { + // insure the filed is always uniqe + while (isset($this->uniqeValueArray[$type][$field][$value])) + { + $value = JString::increment($value, 'dash'); + } + $this->uniqeValueArray[$type][$field][$value] = $value; + return $value; + } + + protected function getAliasesUsed($table) + { + // Get a db connection. + $db = JFactory::getDbo(); + // first we check if there is a alias column + $columns = $db->getTableColumns('#__###component###_'.$table); + if(isset($columns['alias'])){ + // Create a new query object. + $query = $db->getQuery(true); + $query->select($db->quoteName(array('alias'))); + $query->from($db->quoteName('#__###component###_'.$table)); + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + $aliases = $db->loadColumn(); + foreach($aliases as $alias) + { + $this->uniqeValueArray[$table]['alias'][$alias] = $alias; + } + } + return true; + } + return false; + } +} diff --git a/admin/compiler/joomla_3/JViewLegacy_import_custom.php b/admin/compiler/joomla_3/JViewLegacy_import_custom.php new file mode 100644 index 000000000..e0a33618f --- /dev/null +++ b/admin/compiler/joomla_3/JViewLegacy_import_custom.php @@ -0,0 +1,113 @@ + + @my wife Roline van der Merwe + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); +?> +###BOM### + +// No direct access to this file +defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED### + +// import Joomla view library +jimport('joomla.application.component.view'); + +/** + * ###Component### ###View### View + */ +class ###Component###View###View### extends JViewLegacy +{ + protected $headerList; + protected $hasPackage = false; + protected $headers; + protected $hasHeader = 0; + protected $dataType; + + public function display($tpl = null) + { + if ($this->getLayout() !== 'modal') + { + // Include helper submenu + ###Component###Helper::addSubmenu('import'); + } + + // Check for errors. + if (count($errors = $this->get('Errors'))){ + JError::raiseError(500, implode('
', $errors)); + return false; + } + + $paths = new stdClass; + $paths->first = ''; + $state = $this->get('state'); + + $this->paths = &$paths; + $this->state = &$state; + // get global action permissions + $this->canDo = ###Component###Helper::getActions('import'); + + // We don't need toolbar in the modal window. + if ($this->getLayout() !== 'modal') + { + $this->addToolbar(); + $this->sidebar = JHtmlSidebar::render(); + } + + // get the session object + $session = JFactory::getSession(); + // check if it has package + $this->hasPackage = $session->get('hasPackage', false); + $this->dataType = $session->get('dataType', false); + if($this->hasPackage && $this->dataType) + { + $this->headerList = json_decode($session->get($this->dataType.'_VDM_IMPORTHEADERS', false),true); + $this->headers = ###Component###Helper::getFileHeaders($this->dataType); + // clear the data type + $session->clear('dataType'); + } + + // Display the template + parent::display($tpl); + } + + /** + * Setting the toolbar + */ + protected function addToolBar() + { + JToolBarHelper::title(JText::_('COM_###COMPONENT###_IMPORT_TITLE'), 'upload'); + JHtmlSidebar::setAction('index.php?option=com_###component###&view=###view###'); + + if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) + { + JToolBarHelper::preferences('com_###component###'); + } + + // set help url for this view if found + $help_url = ###Component###Helper::getHelpUrl('###view###'); + if (###Component###Helper::checkString($help_url)) + { + JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url); + } + } +} diff --git a/admin/compiler/joomla_3/default_import_custom.php b/admin/compiler/joomla_3/default_import_custom.php new file mode 100644 index 000000000..d2346d8be --- /dev/null +++ b/admin/compiler/joomla_3/default_import_custom.php @@ -0,0 +1,35 @@ + + @my wife Roline van der Merwe + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); +?> +###BOM### + +// No direct access to this file +defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED### + +JHtml::_('jquery.framework'); +JHtml::_('bootstrap.tooltip'); +JHtml::_('script', 'system/core.js', false, true); +?>###IMPORT_DEFAULT_VIEW_CUSTOM### diff --git a/admin/compiler/joomla_3/settings.json b/admin/compiler/joomla_3/settings.json index d089186f2..8d30d6f35 100644 --- a/admin/compiler/joomla_3/settings.json +++ b/admin/compiler/joomla_3/settings.json @@ -465,6 +465,28 @@ "rename": false, "type": "import" }, + "JControllerLegacy_import_custom.php": { + "path": "c0mp0n3nt/admin/controllers", + "rename": "JControllerLegacy_import_custom", + "type": "customimport" + }, + "JModelLegacy_import_custom.php": { + "path": "c0mp0n3nt/admin/models", + "rename": "JModelLegacy_import_custom", + "type": "customimport" + }, + "JViewLegacy_import_custom.php": { + "path": "c0mp0n3nt/admin/views/VIEW", + "rename": "new", + "newName": "view.html.php", + "type": "customimport" + }, + "default_import_custom.php": { + "path": "c0mp0n3nt/admin/views/VIEW/tmpl", + "rename": "new", + "newName": "default.php", + "type": "customimport" + }, "JControllerLegacyHelp.php": { "path": "c0mp0n3nt/admin/controllers", "rename": "new", diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index 1bcaee099..b4847c77c 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index b4c5d3d3d..a82ae1416 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 198d1498e..1e56f9693 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index e236adcc3..439e37ec1 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 1405ec209..944a1d81d 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php @@ -45,6 +45,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy // load the tasks $this->registerTask('tableColumns', 'ajax'); $this->registerTask('fieldSelectOptions', 'ajax'); + $this->registerTask('getImportScripts', 'ajax'); $this->registerTask('layoutDetails', 'ajax'); $this->registerTask('templateDetails', 'ajax'); $this->registerTask('snippetDetails', 'ajax'); @@ -143,6 +144,44 @@ class ComponentbuilderControllerAjax extends JControllerLegacy } } break; + case 'getImportScripts': + try + { + $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); + $typeValue = $jinput->get('type', NULL, 'WORD'); + if($typeValue && $user->id != 0) + { + $result = $this->getModel('ajax')->getImportScripts($typeValue); + } + else + { + $result = false; + } + if(array_key_exists('callback',$_GET)) + { + echo $_GET['callback'] . "(".json_encode($result).");"; + } + elseif($returnRaw) + { + echo json_encode($result); + } + else + { + echo "(".json_encode($result).");"; + } + } + catch(Exception $e) + { + if(array_key_exists('callback',$_GET)) + { + echo $_GET['callback']."(".json_encode($e).");"; + } + else + { + echo "(".json_encode($e).");"; + } + } + break; case 'layoutDetails': try { diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php index 223493566..593e368dc 100644 --- a/admin/controllers/compiler.php +++ b/admin/controllers/compiler.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage compiler.php diff --git a/admin/controllers/component.php b/admin/controllers/component.php index a3eefd245..1187ae6a3 100644 --- a/admin/controllers/component.php +++ b/admin/controllers/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 2a4146916..d37d62f6c 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/components.php b/admin/controllers/components.php index 0d1edec99..431c79bda 100644 --- a/admin/controllers/components.php +++ b/admin/controllers/components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php index 181ad596f..4392b454a 100644 --- a/admin/controllers/custom_admin_view.php +++ b/admin/controllers/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/controllers/custom_admin_views.php b/admin/controllers/custom_admin_views.php index 51e64e60d..3a37de3c5 100644 --- a/admin/controllers/custom_admin_views.php +++ b/admin/controllers/custom_admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/controllers/dynamic_get.php b/admin/controllers/dynamic_get.php index 9ed4be9ce..f6e689da9 100644 --- a/admin/controllers/dynamic_get.php +++ b/admin/controllers/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php index 2a2b7cc9c..f1726ffc9 100644 --- a/admin/controllers/dynamic_gets.php +++ b/admin/controllers/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/controllers/field.php b/admin/controllers/field.php index e4a901a98..b790b198d 100644 --- a/admin/controllers/field.php +++ b/admin/controllers/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/controllers/fields.php b/admin/controllers/fields.php index 07a906001..f4cf7a8ef 100644 --- a/admin/controllers/fields.php +++ b/admin/controllers/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/controllers/fieldtype.php b/admin/controllers/fieldtype.php index 24f862958..9640dc644 100644 --- a/admin/controllers/fieldtype.php +++ b/admin/controllers/fieldtype.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php diff --git a/admin/controllers/fieldtypes.php b/admin/controllers/fieldtypes.php index d60eb193f..bfb1d501a 100644 --- a/admin/controllers/fieldtypes.php +++ b/admin/controllers/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index a73678b6a..72eacccee 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index 8adf0a8ad..4fa001afd 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.php diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index dbf26e46f..d7c0e3366 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index d68f6576c..397e15947 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/layout.php b/admin/controllers/layout.php index 983297a41..3330f183f 100644 --- a/admin/controllers/layout.php +++ b/admin/controllers/layout.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.php diff --git a/admin/controllers/layouts.php b/admin/controllers/layouts.php index 27dad2e36..d9e216a08 100644 --- a/admin/controllers/layouts.php +++ b/admin/controllers/layouts.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage layouts.php diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php index f1b4c4bba..2a657c045 100644 --- a/admin/controllers/site_view.php +++ b/admin/controllers/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/controllers/site_views.php b/admin/controllers/site_views.php index d6869f565..11f037422 100644 --- a/admin/controllers/site_views.php +++ b/admin/controllers/site_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views.php diff --git a/admin/controllers/snippet.php b/admin/controllers/snippet.php index a6e7ec12d..8c0057f0a 100644 --- a/admin/controllers/snippet.php +++ b/admin/controllers/snippet.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.php diff --git a/admin/controllers/snippets.php b/admin/controllers/snippets.php index 9da79c356..958495c36 100644 --- a/admin/controllers/snippets.php +++ b/admin/controllers/snippets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/controllers/template.php b/admin/controllers/template.php index a409d2f00..8bd3675cc 100644 --- a/admin/controllers/template.php +++ b/admin/controllers/template.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.php diff --git a/admin/controllers/templates.php b/admin/controllers/templates.php index 5518b214f..d7a6be23f 100644 --- a/admin/controllers/templates.php +++ b/admin/controllers/templates.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage templates.php diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index 94d99afec..d7a46f2d9 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -1086,6 +1086,20 @@ 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'); + foreach ($addImportArray as $importScripter) + { + if (isset($view->$importScripter) && strlen($view->$importScripter) > 0) + { + $this->customScriptBuilder[$importScripter]['import_'.$name_list] = $this->setCustomContentLang(base64_decode($view->$importScripter)); + unset($view->$importScripter); + } + } + } + // add_Ajax for this view if ($view->add_php_ajax == 1) { @@ -1985,9 +1999,11 @@ class Get */ public function setCustomContentLang($content) { + // insure string is not broken + $content = str_replace('COM_###COMPONENT###',$this->langPrefix,$content); // set language data - $langCheck[] = ComponentbuilderHelper::getAllBetween($content, "JText::_('","')"); - $langCheck[] = ComponentbuilderHelper::getAllBetween($content, 'JText::_("','")'); + $langCheck[] = ComponentbuilderHelper::getAllBetween($content, "JText::_('","'"); + $langCheck[] = ComponentbuilderHelper::getAllBetween($content, 'JText::_("','"'); $langCheck[] = ComponentbuilderHelper::getAllBetween($content, "JText::sprintf('","'"); $langCheck[] = ComponentbuilderHelper::getAllBetween($content, 'JText::sprintf("','"'); $langHolders = array(); @@ -2003,6 +2019,7 @@ class Get { foreach ($lang as $string) { + // this is there to insure we dont break already added Language strings if (ComponentbuilderHelper::safeString($string,'U') == $string) { continue; diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index a9cf68e1c..6ce693bb9 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -4736,7 +4736,7 @@ class Interpretation extends Fields { // add final list of needed lang strings $componentName = JFilterOutput::cleanText($this->componentData->name); - $this->langContent['adminsys'][$this->langPrefix] = + $this->langContent['adminsys'][$this->langPrefix] = $componentName; $this->langContent['adminsys'][$this->langPrefix.'_CONFIGURATION'] = $componentName.' Configuration'; $this->langContent[$this->lang][$this->langPrefix] = $componentName; $this->langContent['admin'][$this->langPrefix.'_BACK'] = 'Back'; @@ -6830,7 +6830,15 @@ class Interpretation extends Fields $this->langContent[$this->lang][$selectImportFileNote] = 'Select the file to import data to '.$viewName_list.'.'; } $method[] = "\t\t\t\t\$message = JText::_('".$selectImportFileNote."');"; - $method[] = "\t\t\t\t\$this->setRedirect(JRoute::_('index.php?option=com_".$this->fileContentStatic['###component###']."&view=import', false), \$message);"; + // if this view has custom script it must have as custom import (model, veiw, controller) + if (isset($this->importCustomScripts[$viewName_list]) && $this->importCustomScripts[$viewName_list]) + { + $method[] = "\t\t\t\t\$this->setRedirect(JRoute::_('index.php?option=com_".$this->fileContentStatic['###component###']."&view=import_".$viewName_list."', false), \$message);"; + } + else + { + $method[] = "\t\t\t\t\$this->setRedirect(JRoute::_('index.php?option=com_".$this->fileContentStatic['###component###']."&view=import', false), \$message);"; + } $method[] = "\t\t\t\treturn;"; $method[] = "\t\t\t}"; $method[] = "\t\t}"; @@ -6888,6 +6896,39 @@ class Interpretation extends Fields return $button; } + public function setImportCustomScripts($viewName_list) + { + // setup Ajax files + $target = array('admin' => 'import_'.$viewName_list); + $this->buildDynamique($target,'customimport'); + // 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]); + unset($this->customScriptBuilder['php_import_setdata']['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]); + unset($this->customScriptBuilder['php_import_save']['import_'.$viewName_list]); + } + if (isset($this->customScriptBuilder['html_import_view']['import_'.$viewName_list])) + { + // ###IMPORT_DEFAULT_VIEW_CUSTOM### <<>> + $this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DEFAULT_VIEW_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['html_import_view']['import_'.$viewName_list]); + unset($this->customScriptBuilder['html_import_view']['import_'.$viewName_list]); + } + // insure we have the view placeholders setup + $this->fileContentDynamic['import_'.$viewName_list]['###VIEW###'] = 'IMPORT_'.$this->placeholders['###VIEWS###']; + $this->fileContentDynamic['import_'.$viewName_list]['###View###'] = 'Import_'.$this->placeholders['###views###']; + $this->fileContentDynamic['import_'.$viewName_list]['###view###'] = 'import_'.$this->placeholders['###views###']; + $this->fileContentDynamic['import_'.$viewName_list]['###VIEWS###'] = 'IMPORT_'.$this->placeholders['###VIEWS###']; + $this->fileContentDynamic['import_'.$viewName_list]['###Views###'] = 'Import_'.$this->placeholders['###views###']; + $this->fileContentDynamic['import_'.$viewName_list]['###views###'] = 'import_'.$this->placeholders['###views###']; + } + public function setListQuery($viewName_single, $viewName_list) { // check if this view has category added @@ -12363,7 +12404,7 @@ for developing fast and powerful web interfaces. For more info visit permissions) || (isset($view['port']) && $view['port']) || (isset($view['history']) && $view['history'])) + if (isset($view['settings']->permissions) && ComponentbuilderHelper::checkArray($view['settings']->permissions) || (isset($view['port']) && $view['port']) || (isset($view['history']) && $view['history'])) { // add export/import permissions to each view that has export/import options if (isset($view['port']) && $view['port']) diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php index 4ccb25cfc..355358633 100644 --- a/admin/helpers/compiler/f_Infusion.php +++ b/admin/helpers/compiler/f_Infusion.php @@ -32,7 +32,10 @@ defined('_JEXEC') or die('Restricted access'); */ class Infusion extends Interpretation { - + + public $eximportView = array(); + public $importCustomScripts = array(); + /** * Constructor */ @@ -192,15 +195,6 @@ class Infusion extends Interpretation $site_edit_view_array[] = "\t\t\t\t'".$viewName_single."'"; $this->lang = 'both'; } - // set the export/import option - if ($view['port']) - { - $this->eximportView[$viewName_list] = true; - } - else - { - $this->eximportView[$viewName_list] = false; - } // check if help is being loaded $this->checkHelp($viewName_single); // set custom admin view list links @@ -227,6 +221,8 @@ class Infusion extends Interpretation // set some place holder for the views $this->placeholders['###view###'] = $viewName_single; + $this->placeholders['###VIEW###'] = $viewName_u; + $this->placeholders['###View###'] = $viewName_f; // set license per view if needed $this->setLockLicensePer($viewName_single); @@ -349,6 +345,24 @@ class Infusion extends Interpretation // set some place holder for the views $this->placeholders['###views###'] = $viewName_list; + $this->placeholders['###VIEWS###'] = $viewsName_u; + $this->placeholders['###Views###'] = $viewsName_f; + + // set the export/import option + if ($view['port']) + { + $this->eximportView[$viewName_list] = true; + if (1 == $view['settings']->add_custom_import) + { + // this view has custom import scripting + $this->importCustomScripts[$viewName_list] = true; + $this->setImportCustomScripts($viewName_list); + } + } + else + { + $this->eximportView[$viewName_list] = false; + } // set Autocheckin function if ($view['checkin'] == 1) diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 0b1ddbeab..64d954bdc 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 90e778a0f..f16dcc336 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 278679c16..0e1c18ff1 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index 5e947af36..4f834205d 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 625dd6002..f39fdbf8d 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage minify.php diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index deb5d9b37..05205ab90 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -72,6 +72,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEW="Add Css View" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEWS="Add Css Views" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEWS_LABEL="Add CSS (views)" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEW_LABEL="Add CSS (view)" +COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT="Add Custom Import" +COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_DESCRIPTION="Override the default import methods." +COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL="Add Custom Import" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_JAVASCRIPT_VIEWS_FILE="Add Javascript Views File" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_JAVASCRIPT_VIEWS_FILE_LABEL="Add JavaScript (views-file)" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_JAVASCRIPT_VIEWS_FOOTER="Add Javascript Views Footer" @@ -143,6 +146,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS_LABEL="CSS" COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_DESCRIPTION="Add your CSS here! [Do not add the style tags]" COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_HINT="// CSS for the edit view" COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_LABEL="CSS" +COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_IMPORT="Custom Import" COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION="Description" COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_DESCRIPTION="Add Description Here" COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_HINT="Add Description Here" @@ -161,6 +165,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_FLOAT="FLOAT" COM_COMPONENTBUILDER_ADMIN_VIEW_FULL_WIDTH_IN_TAB="Full Width in Tab" COM_COMPONENTBUILDER_ADMIN_VIEW_HIDE="Hide" COM_COMPONENTBUILDER_ADMIN_VIEW_HTML="HTML" +COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW="Html Import View" +COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION="Add your HTML & PHP here! [Use for PHP]" +COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT="// The HTML for the view of your custom import method." +COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL="HTML & PHP (view)" COM_COMPONENTBUILDER_ADMIN_VIEW_ICON="Icon" COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD="Icon Add" COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_DESCRIPTION="Must be 128px x 128px and a png format.." @@ -240,6 +248,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_HINT="Single Record Name Here" COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_LABEL="Name (single record)" COM_COMPONENTBUILDER_ADMIN_VIEW_NEW="A New Admin View" COM_COMPONENTBUILDER_ADMIN_VIEW_NO="No" +COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION="

The scripts that are automatic added to the input fields below is identical to the default import scripts used. Adapt them to your own custom needs.

" +COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL="Advanced notice." +COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION="

Please do not change this area unless you would like to add special import to this view that goes beyond the default import concept that Component Builder already does automatic if this view is set to have import & export in the component area where this view is linked to the component.

" +COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL="Beginners notice." COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_CONDITIONS_DESCRIPTION="Here you can add conditional field settings" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_CONDITIONS_LABEL="Condition Implementation" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION="Only if you add permissions here will this view have permissions." @@ -302,6 +314,14 @@ 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_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" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_LABEL="Save Method PHP" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA="Php Import Setdata" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_DESCRIPTION="Add your PHP here! [Do not add the php tags]" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT="// PHP Here that should run in the setData Method, $package,$table,$target_headers" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_LABEL="setData Method PHP" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK="Php Postsavehook" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_DESCRIPTION="Add your PHP here! [Do not add the php tags]" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_HINT="// PHP Here that should run in the postSaveHook Method (object) $model is the data model object and (array) $validData is the validated data." diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini index 537f1d516..fdeb4f482 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini @@ -1,4 +1,4 @@ -COM_COMPONENTBUILDER="Component Builder Configuration" +COM_COMPONENTBUILDER="Component Builder" COM_COMPONENTBUILDER_CONFIGURATION="Component Builder Configuration" COM_COMPONENTBUILDER_MENU="» Component Builder" COM_COMPONENTBUILDER_MENU_ADMIN_VIEWS="Admin Views" diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 67ddd273e..5d6a69715 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage css_fullwidth.php diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php new file mode 100644 index 000000000..f025f4847 --- /dev/null +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -0,0 +1,54 @@ + + @my wife Roline van der Merwe + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file + +defined('_JEXEC') or die('Restricted access'); + +$form = $displayData->getForm(); + +$fields = $displayData->get('fields') ?: array( + 'note_beginner_import', + 'note_advanced_import', + 'add_custom_import', + 'html_import_view', + 'php_import_setdata', + 'php_import_save' +); + +?> +
+ +
+
+ getLabel($field); ?> +
+
+ getInput($field); ?> +
+
+ +
diff --git a/admin/layouts/admin_view/fields_fullwidth.php b/admin/layouts/admin_view/fields_fullwidth.php index dc10604be..b7592c934 100644 --- a/admin/layouts/admin_view/fields_fullwidth.php +++ b/admin/layouts/admin_view/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php @@ -29,7 +29,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vxafields; +$items = $displayData->vxdfields; $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 821775715..9a0697929 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index 4821565c1..111de7d58 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index 9365bfbb0..7b2c63333 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage mysql_left.php diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index 0c73dd16d..24932ea2b 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index 77ee19b50..36b4d2753 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php index 1678b1e36..468f4d9e9 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_above.php b/admin/layouts/admin_view/settings_above.php index ee328abfd..5725ed360 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/settings_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_above.php diff --git a/admin/layouts/admin_view/settings_left.php b/admin/layouts/admin_view/settings_left.php index cdd0c322a..6b6d9b443 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/admin_view/settings_right.php b/admin/layouts/admin_view/settings_right.php index 781c7c554..b5eeb8361 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/settings_under.php index 88d3880d5..caf37dc22 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/settings_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_under.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index c6f64e332..7b198d528 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/component/admin_views_fullwidth.php b/admin/layouts/component/admin_views_fullwidth.php index 3f059401f..85779554a 100644 --- a/admin/layouts/component/admin_views_fullwidth.php +++ b/admin/layouts/component/admin_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/component/details_above.php b/admin/layouts/component/details_above.php index 64d7c80cf..deb8216c4 100644 --- a/admin/layouts/component/details_above.php +++ b/admin/layouts/component/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/component/details_left.php b/admin/layouts/component/details_left.php index e567735f2..5a5ada524 100644 --- a/admin/layouts/component/details_left.php +++ b/admin/layouts/component/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/component/details_right.php b/admin/layouts/component/details_right.php index 0746a4b42..1761f9a6f 100644 --- a/admin/layouts/component/details_right.php +++ b/admin/layouts/component/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/component/details_under.php b/admin/layouts/component/details_under.php index 65d69f280..230bb7201 100644 --- a/admin/layouts/component/details_under.php +++ b/admin/layouts/component/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/component/ftp_servers_fullwidth.php b/admin/layouts/component/ftp_servers_fullwidth.php index 95406e23d..e9d6d2aac 100644 --- a/admin/layouts/component/ftp_servers_fullwidth.php +++ b/admin/layouts/component/ftp_servers_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage ftp_servers_fullwidth.php diff --git a/admin/layouts/component/publishing.php b/admin/layouts/component/publishing.php index 77ee19b50..36b4d2753 100644 --- a/admin/layouts/component/publishing.php +++ b/admin/layouts/component/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/component/publlshing.php b/admin/layouts/component/publlshing.php index 1678b1e36..468f4d9e9 100644 --- a/admin/layouts/component/publlshing.php +++ b/admin/layouts/component/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/component/readme_left.php b/admin/layouts/component/readme_left.php index 684854069..b9dbbca4f 100644 --- a/admin/layouts/component/readme_left.php +++ b/admin/layouts/component/readme_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/component/readme_right.php b/admin/layouts/component/readme_right.php index 764060b94..0c7b2d08a 100644 --- a/admin/layouts/component/readme_right.php +++ b/admin/layouts/component/readme_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/component/scripts_fullwidth.php b/admin/layouts/component/scripts_fullwidth.php index 864c08c70..67d717d99 100644 --- a/admin/layouts/component/scripts_fullwidth.php +++ b/admin/layouts/component/scripts_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage scripts_fullwidth.php diff --git a/admin/layouts/component/settings_left.php b/admin/layouts/component/settings_left.php index be88421b7..8508b5b24 100644 --- a/admin/layouts/component/settings_left.php +++ b/admin/layouts/component/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/component/settings_right.php b/admin/layouts/component/settings_right.php index 590d16311..49eea1c62 100644 --- a/admin/layouts/component/settings_right.php +++ b/admin/layouts/component/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/component/site_views_fullwidth.php b/admin/layouts/component/site_views_fullwidth.php index eb848e252..6edbd7179 100644 --- a/admin/layouts/component/site_views_fullwidth.php +++ b/admin/layouts/component/site_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index 00847b125..3a2e57d30 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php index f394b01a5..018c82f83 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php index a816eb98e..0bb831182 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php index 64d7c80cf..deb8216c4 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php index 9c9857c22..46ce8feed 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php index 2ef1cdcd4..b938068da 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php index a3ea0edb2..c76d05ace 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php index ee06c812c..0b0b9a118 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php index 65d69f280..230bb7201 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index 77ee19b50..36b4d2753 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php index 1678b1e36..468f4d9e9 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php index 55c7bdbb7..abeec6b8b 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage abacus_fullwidth.php diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php index cb70042db..fbcb18136 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage abacus_left.php diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php index df5c1a30f..c5a74cde8 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_above.php b/admin/layouts/dynamic_get/gettable_above.php index ce9b2a432..21fd62556 100644 --- a/admin/layouts/dynamic_get/gettable_above.php +++ b/admin/layouts/dynamic_get/gettable_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage gettable_above.php diff --git a/admin/layouts/dynamic_get/gettable_fullwidth.php b/admin/layouts/dynamic_get/gettable_fullwidth.php index d17de67b1..f0bb31935 100644 --- a/admin/layouts/dynamic_get/gettable_fullwidth.php +++ b/admin/layouts/dynamic_get/gettable_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage gettable_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_left.php b/admin/layouts/dynamic_get/gettable_left.php index 1b45470ca..8343f3753 100644 --- a/admin/layouts/dynamic_get/gettable_left.php +++ b/admin/layouts/dynamic_get/gettable_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage gettable_left.php diff --git a/admin/layouts/dynamic_get/gettable_right.php b/admin/layouts/dynamic_get/gettable_right.php index 542b6fd52..4288294e6 100644 --- a/admin/layouts/dynamic_get/gettable_right.php +++ b/admin/layouts/dynamic_get/gettable_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage gettable_right.php diff --git a/admin/layouts/dynamic_get/gettable_under.php b/admin/layouts/dynamic_get/gettable_under.php index d5486d507..2025274d3 100644 --- a/admin/layouts/dynamic_get/gettable_under.php +++ b/admin/layouts/dynamic_get/gettable_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage gettable_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index 77ee19b50..36b4d2753 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php index 1678b1e36..468f4d9e9 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php index f1cadbe41..8de813e86 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php index c68fdd776..7f36ecf76 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php index c80aa64e7..6ec6385d9 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php index 65d69f280..230bb7201 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index 77ee19b50..36b4d2753 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php index 1678b1e36..468f4d9e9 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php index c710a73e4..a88910c13 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage scripts_left.php diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php index 122a0c6d8..acd1a5023 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index b86c78a2a..7820532c2 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php index 507b5d8c0..e441ec80a 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 4d938217b..35253c9dd 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php @@ -29,7 +29,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vyvfields; +$items = $displayData->vyyfields; $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 77ee19b50..36b4d2753 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php index 1678b1e36..468f4d9e9 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index a650705e5..d7cd4ead9 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 0e01de8c5..fd833542e 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index fc705f9f8..96dafebb9 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index bd45a9dce..d88a37494 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index 65d69f280..230bb7201 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 77ee19b50..36b4d2753 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 4393305c5..6a07addce 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index 7198e7bff..4034d84bf 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php index 54129f54a..fd7d7050b 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php index 2ef1cdcd4..b938068da 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php index a3ea0edb2..c76d05ace 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php index 153728d9d..4c4912166 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php index 65d69f280..230bb7201 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php index 77ee19b50..36b4d2753 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php index 1678b1e36..468f4d9e9 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php index 3a5d4c045..d7ab842a7 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index 64d7c80cf..deb8216c4 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php index 9c9857c22..46ce8feed 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php index 2ef1cdcd4..b938068da 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php index a3ea0edb2..c76d05ace 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php index ee06c812c..0b0b9a118 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php index 65d69f280..230bb7201 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php index f8f90ba27..6b241e9ac 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index 074658be2..9d897572d 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php index 77ee19b50..36b4d2753 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php index 1678b1e36..468f4d9e9 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php index 7848c7aeb..eabc51822 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php index 4af3cda23..d5de52995 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php index cca9dff1b..a3e26c5cc 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php index 77ee19b50..36b4d2753 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php index 1678b1e36..468f4d9e9 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php index 7198e7bff..4034d84bf 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php index 19415ec85..419ee3c38 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php index 2ef1cdcd4..b938068da 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index a3ea0edb2..c76d05ace 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php index 153728d9d..4c4912166 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php index 65d69f280..230bb7201 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php index 77ee19b50..36b4d2753 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php index 1678b1e36..468f4d9e9 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 2eb30bf9e..94494bc39 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -96,46 +96,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->metadata = $registry->toArray(); } - if (!empty($item->php_allowedit)) + if (!empty($item->php_before_delete)) { - // base64 Decode php_allowedit. - $item->php_allowedit = base64_decode($item->php_allowedit); - } - - if (!empty($item->php_getitems)) - { - // base64 Decode php_getitems. - $item->php_getitems = base64_decode($item->php_getitems); - } - - 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_save)) - { - // base64 Decode php_save. - $item->php_save = base64_decode($item->php_save); - } - - if (!empty($item->php_batchmove)) - { - // base64 Decode php_batchmove. - $item->php_batchmove = base64_decode($item->php_batchmove); - } - - if (!empty($item->php_getitem)) - { - // base64 Decode php_getitem. - $item->php_getitem = base64_decode($item->php_getitem); - } - - if (!empty($item->php_getlistquery)) - { - // base64 Decode php_getlistquery. - $item->php_getlistquery = base64_decode($item->php_getlistquery); + // base64 Decode php_before_delete. + $item->php_before_delete = base64_decode($item->php_before_delete); } if (!empty($item->php_postsavehook)) @@ -144,34 +108,76 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $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_before_delete)) - { - // base64 Decode php_before_delete. - $item->php_before_delete = base64_decode($item->php_before_delete); - } - if (!empty($item->php_document)) { // base64 Decode php_document. $item->php_document = base64_decode($item->php_document); } - if (!empty($item->sql)) + if (!empty($item->php_getitem)) { - // base64 Decode sql. - $item->sql = base64_decode($item->sql); + // base64 Decode php_getitem. + $item->php_getitem = base64_decode($item->php_getitem); } - if (!empty($item->php_ajaxmethod)) + if (!empty($item->html_import_view)) { - // base64 Decode php_ajaxmethod. - $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); + // 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)) @@ -208,6 +214,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin { // base64 Decode javascript_views_footer. $item->javascript_views_footer = base64_decode($item->javascript_views_footer); + } + + if (!empty($item->php_ajaxmethod)) + { + // base64 Decode php_ajaxmethod. + $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); + } + + if (!empty($item->php_import_setdata)) + { + // base64 Decode php_import_setdata. + $item->php_import_setdata = base64_decode($item->php_import_setdata); } if (!empty($item->id)) @@ -226,7 +244,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxafields() + public function getVxdfields() { // Get the user object. $user = JFactory::getUser(); @@ -295,13 +313,13 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVxafields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVxdfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVxafields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVxdfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVxafields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVxdfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVxafields($item->store, 'store'); + $item->store = $this->selectionTranslationVxdfields($item->store, 'store'); } } @@ -336,7 +354,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVxafields($value,$name) + public function selectionTranslationVxdfields($value,$name) { // Array of datatype language strings if ($name == 'datatype') @@ -1099,46 +1117,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['metadata'] = (string) $metadata; } - // Set the php_allowedit string to base64 string. - if (isset($data['php_allowedit'])) + // Set the php_before_delete string to base64 string. + if (isset($data['php_before_delete'])) { - $data['php_allowedit'] = base64_encode($data['php_allowedit']); - } - - // Set the php_getitems string to base64 string. - if (isset($data['php_getitems'])) - { - $data['php_getitems'] = base64_encode($data['php_getitems']); - } - - // 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_save string to base64 string. - if (isset($data['php_save'])) - { - $data['php_save'] = base64_encode($data['php_save']); - } - - // Set the php_batchmove string to base64 string. - if (isset($data['php_batchmove'])) - { - $data['php_batchmove'] = base64_encode($data['php_batchmove']); - } - - // Set the php_getitem string to base64 string. - if (isset($data['php_getitem'])) - { - $data['php_getitem'] = base64_encode($data['php_getitem']); - } - - // Set the php_getlistquery string to base64 string. - if (isset($data['php_getlistquery'])) - { - $data['php_getlistquery'] = base64_encode($data['php_getlistquery']); + $data['php_before_delete'] = base64_encode($data['php_before_delete']); } // Set the php_postsavehook string to base64 string. @@ -1147,34 +1129,76 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $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_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_document string to base64 string. if (isset($data['php_document'])) { $data['php_document'] = base64_encode($data['php_document']); } - // Set the sql string to base64 string. - if (isset($data['sql'])) + // Set the php_getitem string to base64 string. + if (isset($data['php_getitem'])) { - $data['sql'] = base64_encode($data['sql']); + $data['php_getitem'] = base64_encode($data['php_getitem']); } - // Set the php_ajaxmethod string to base64 string. - if (isset($data['php_ajaxmethod'])) + // Set the html_import_view string to base64 string. + if (isset($data['html_import_view'])) { - $data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']); + $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. @@ -1211,6 +1235,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin if (isset($data['javascript_views_footer'])) { $data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']); + } + + // Set the php_ajaxmethod string to base64 string. + if (isset($data['php_ajaxmethod'])) + { + $data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']); + } + + // Set the php_import_setdata string to base64 string. + if (isset($data['php_import_setdata'])) + { + $data['php_import_setdata'] = base64_encode($data['php_import_setdata']); } // Set the Params Items to data diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index 9bfd3c2ea..24ed1893f 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php @@ -261,32 +261,34 @@ class ComponentbuilderModelAdmin_views extends JModelList continue; } - // decode php_allowedit - $item->php_allowedit = base64_decode($item->php_allowedit); - // decode php_getitems - $item->php_getitems = base64_decode($item->php_getitems); - // decode php_after_delete - $item->php_after_delete = base64_decode($item->php_after_delete); - // decode php_save - $item->php_save = base64_decode($item->php_save); - // decode php_batchmove - $item->php_batchmove = base64_decode($item->php_batchmove); - // decode php_getitem - $item->php_getitem = base64_decode($item->php_getitem); - // decode php_getlistquery - $item->php_getlistquery = base64_decode($item->php_getlistquery); - // decode php_postsavehook - $item->php_postsavehook = base64_decode($item->php_postsavehook); - // decode php_batchcopy - $item->php_batchcopy = base64_decode($item->php_batchcopy); // decode php_before_delete $item->php_before_delete = base64_decode($item->php_before_delete); - // decode php_document - $item->php_document = base64_decode($item->php_document); + // decode php_postsavehook + $item->php_postsavehook = base64_decode($item->php_postsavehook); // decode sql $item->sql = base64_decode($item->sql); - // decode php_ajaxmethod - $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); + // 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 @@ -299,6 +301,10 @@ class ComponentbuilderModelAdmin_views extends JModelList $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); // 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 88bdffd1a..0f77b2d8c 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage ajax.php @@ -45,6 +45,439 @@ class ComponentbuilderModelAjax extends JModelList } // Used in admin_view + public function getImportScripts($type) + { + $script = array(); + if ('setdata' == $type) + { + // set the setdata script + $script['setdata'] = array(); + $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"; + $script['setdata'][] = "\t\t\tJLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers');"; + $script['setdata'][] = "\t\t\t\$jinput = JFactory::getApplication()->input;"; + $script['setdata'][] = "\t\t\tforeach(\$target_headers as \$header)"; + $script['setdata'][] = "\t\t\t{"; + $script['setdata'][] = "\t\t\t\t\$data['target_headers'][\$header] = \$jinput->getString(\$header, null);"; + $script['setdata'][] = "\t\t\t}"; + $script['setdata'][] = "\t\t\t// set the data"; + $script['setdata'][] = "\t\t\tif(isset(\$package['dir']))"; + $script['setdata'][] = "\t\t\t{"; + $script['setdata'][] = "\t\t\t\t\$inputFileType = PHPExcel_IOFactory::identify(\$package['dir']);"; + $script['setdata'][] = "\t\t\t\t\$excelReader = PHPExcel_IOFactory::createReader(\$inputFileType);"; + $script['setdata'][] = "\t\t\t\t\$excelReader->setReadDataOnly(true);"; + $script['setdata'][] = "\t\t\t\t\$excelObj = \$excelReader->load(\$package['dir']);"; + $script['setdata'][] = "\t\t\t\t\$data['array'] = \$excelObj->getActiveSheet()->toArray(null, true,true,true);"; + $script['setdata'][] = "\t\t\t\t\$excelObj->disconnectWorksheets();"; + $script['setdata'][] = "\t\t\t\tunset(\$excelObj);"; + $script['setdata'][] = "\t\t\t\treturn \$this->save(\$data,\$table);"; + $script['setdata'][] = "\t\t\t}"; + $script['setdata'][] = "\t\t}"; + $script['setdata'][] = "\t\treturn false;"; + } + elseif ('save' == $type) + { + $script['save'][] = "\t\t// import the data if there is any"; + $script['save'][] = "\t\tif(###-#-#-Component###Helper::checkArray(\$data['array']))"; + $script['save'][] = "\t\t{"; + $script['save'][] = "\t\t\t// get user object"; + $script['save'][] = "\t\t\t\$user \t\t= JFactory::getUser();"; + $script['save'][] = "\t\t\t// remove header if it has headers"; + $script['save'][] = "\t\t\t\$id_key \t= \$data['target_headers']['id'];"; + $script['save'][] = "\t\t\t\$published_key \t= \$data['target_headers']['published'];"; + $script['save'][] = "\t\t\t\$ordering_key \t= \$data['target_headers']['ordering'];"; + $script['save'][] = "\t\t\t// get the first array set"; + $script['save'][] = "\t\t\t\$firstSet = reset(\$data['array']);"; + $script['save'][] = ""; + $script['save'][] = "\t\t\t// check if first array is a header array and remove if true"; + $script['save'][] = "\t\t\tif(\$firstSet[\$id_key] == 'id' || \$firstSet[\$published_key] == 'published' || \$firstSet[\$ordering_key] == 'ordering')"; + $script['save'][] = "\t\t\t{"; + $script['save'][] = "\t\t\t\tarray_shift(\$data['array']);"; + $script['save'][] = "\t\t\t}"; + $script['save'][] = "\t\t\t"; + $script['save'][] = "\t\t\t// make sure there is still values in array and that it was not only headers"; + $script['save'][] = "\t\t\tif(###-#-#-Component###Helper::checkArray(\$data['array']) && \$user->authorise(\$table.'.import', 'com_###-#-#-component###') && \$user->authorise('core.import', 'com_###-#-#-component###'))"; + $script['save'][] = "\t\t\t{"; + $script['save'][] = "\t\t\t\t// set target."; + $script['save'][] = "\t\t\t\t\$target\t= array_flip(\$data['target_headers']);"; + $script['save'][] = "\t\t\t\t// Get a db connection."; + $script['save'][] = "\t\t\t\t\$db = JFactory::getDbo();"; + $script['save'][] = "\t\t\t\t// set some defaults"; + $script['save'][] = "\t\t\t\t\$todayDate\t\t= JFactory::getDate()->toSql();"; + $script['save'][] = "\t\t\t\t// get global action permissions"; + $script['save'][] = "\t\t\t\t\$canDo\t\t\t= ###-#-#-Component###Helper::getActions(\$table);"; + $script['save'][] = "\t\t\t\t\$canEdit\t\t= \$canDo->get('core.edit');"; + $script['save'][] = "\t\t\t\t\$canState\t\t= \$canDo->get('core.edit.state');"; + $script['save'][] = "\t\t\t\t\$canCreate\t\t= \$canDo->get('core.create');"; + $script['save'][] = "\t\t\t\t\$hasAlias\t\t= \$this->getAliasesUsed(\$table);"; + $script['save'][] = "\t\t\t\t// prosses the data"; + $script['save'][] = "\t\t\t\tforeach(\$data['array'] as \$row)"; + $script['save'][] = "\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\$found = false;"; + $script['save'][] = "\t\t\t\t\tif (isset(\$row[\$id_key]) && is_numeric(\$row[\$id_key]) && \$row[\$id_key] > 0)"; + $script['save'][] = "\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t// raw items import & update!"; + $script['save'][] = "\t\t\t\t\t\t\$query = \$db->getQuery(true);"; + $script['save'][] = "\t\t\t\t\t\t\$query"; + $script['save'][] = "\t\t\t\t\t\t\t->select('version')"; + $script['save'][] = "\t\t\t\t\t\t\t->from(\$db->quoteName('#__###-#-#-component###_'.\$table))"; + $script['save'][] = "\t\t\t\t\t\t\t->where(\$db->quoteName('id') . ' = '. \$db->quote(\$row[\$id_key]));"; + $script['save'][] = "\t\t\t\t\t\t// Reset the query using our newly populated query object."; + $script['save'][] = "\t\t\t\t\t\t\$db->setQuery(\$query);"; + $script['save'][] = "\t\t\t\t\t\t\$db->execute();"; + $script['save'][] = "\t\t\t\t\t\t\$found = \$db->getNumRows();"; + $script['save'][] = "\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t"; + $script['save'][] = "\t\t\t\t\tif(\$found && \$canEdit)"; + $script['save'][] = "\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t// update item"; + $script['save'][] = "\t\t\t\t\t\t\$id \t\t= \$row[\$id_key];"; + $script['save'][] = "\t\t\t\t\t\t\$version\t= \$db->loadResult();"; + $script['save'][] = "\t\t\t\t\t\t// reset all buckets"; + $script['save'][] = "\t\t\t\t\t\t\$query \t\t= \$db->getQuery(true);"; + $script['save'][] = "\t\t\t\t\t\t\$fields \t= array();"; + $script['save'][] = "\t\t\t\t\t\t// Fields to update."; + $script['save'][] = "\t\t\t\t\t\tforeach(\$row as \$key => \$cell)"; + $script['save'][] = "\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t// ignore column"; + $script['save'][] = "\t\t\t\t\t\t\tif ('IGNORE' == \$target[\$key])"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\tcontinue;"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t\t// update modified"; + $script['save'][] = "\t\t\t\t\t\t\tif ('modified_by' == \$target[\$key])"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\tcontinue;"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t\t// update modified"; + $script['save'][] = "\t\t\t\t\t\t\tif ('modified' == \$target[\$key])"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\tcontinue;"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t\t// update version"; + $script['save'][] = "\t\t\t\t\t\t\tif ('version' == \$target[\$key])"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\t\$cell = (int) \$version + 1;"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t\t// verify publish authority"; + $script['save'][] = "\t\t\t\t\t\t\tif ('published' == \$target[\$key] && !\$canState)"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\tcontinue;"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t\t// set to update array"; + $script['save'][] = "\t\t\t\t\t\t\tif(in_array(\$key, \$data['target_headers']) && is_numeric(\$cell))"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\t\$fields[] = \$db->quoteName(\$target[\$key]) . ' = ' . \$cell;"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t\telseif(in_array(\$key, \$data['target_headers']) && is_string(\$cell))"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\t\$fields[] = \$db->quoteName(\$target[\$key]) . ' = ' . \$db->quote(\$cell);"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t\telseif(in_array(\$key, \$data['target_headers']) && is_null(\$cell))"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\t// if import data is null then set empty"; + $script['save'][] = "\t\t\t\t\t\t\t\t\$fields[] = \$db->quoteName(\$target[\$key]) . \" = ''\";"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t// load the defaults"; + $script['save'][] = "\t\t\t\t\t\t\$fields[]\t= \$db->quoteName('modified_by') . ' = ' . \$db->quote(\$user->id);"; + $script['save'][] = "\t\t\t\t\t\t\$fields[]\t= \$db->quoteName('modified') . ' = ' . \$db->quote(\$todayDate);"; + $script['save'][] = "\t\t\t\t\t\t// Conditions for which records should be updated."; + $script['save'][] = "\t\t\t\t\t\t\$conditions = array("; + $script['save'][] = "\t\t\t\t\t\t\t\$db->quoteName('id') . ' = ' . \$id"; + $script['save'][] = "\t\t\t\t\t\t);"; + $script['save'][] = "\t\t\t\t\t\t"; + $script['save'][] = "\t\t\t\t\t\t\$query->update(\$db->quoteName('#__###-#-#-component###_'.\$table))->set(\$fields)->where(\$conditions);"; + $script['save'][] = "\t\t\t\t\t\t\$db->setQuery(\$query);"; + $script['save'][] = "\t\t\t\t\t\t\$db->execute();"; + $script['save'][] = "\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\telseif (\$canCreate)"; + $script['save'][] = "\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t// insert item"; + $script['save'][] = "\t\t\t\t\t\t\$query = \$db->getQuery(true);"; + $script['save'][] = "\t\t\t\t\t\t// reset all buckets"; + $script['save'][] = "\t\t\t\t\t\t\$columns \t= array();"; + $script['save'][] = "\t\t\t\t\t\t\$values \t= array();"; + $script['save'][] = "\t\t\t\t\t\t\$version\t= false;"; + $script['save'][] = "\t\t\t\t\t\t// Insert columns. Insert values."; + $script['save'][] = "\t\t\t\t\t\tforeach(\$row as \$key => \$cell)"; + $script['save'][] = "\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t// ignore column"; + $script['save'][] = "\t\t\t\t\t\t\tif ('IGNORE' == \$target[\$key])"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\tcontinue;"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t\t// remove id"; + $script['save'][] = "\t\t\t\t\t\t\tif ('id' == \$target[\$key])"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\tcontinue;"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t\t// update created"; + $script['save'][] = "\t\t\t\t\t\t\tif ('created_by' == \$target[\$key])"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\tcontinue;"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t\t// update created"; + $script['save'][] = "\t\t\t\t\t\t\tif ('created' == \$target[\$key])"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\tcontinue;"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t\t// Make sure the alias is incremented"; + $script['save'][] = "\t\t\t\t\t\t\tif ('alias' == \$target[\$key])"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\t\$cell = \$this->getAlias(\$cell,\$table);"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t\t// update version"; + $script['save'][] = "\t\t\t\t\t\t\tif ('version' == \$target[\$key])"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\t\$cell = 1;"; + $script['save'][] = "\t\t\t\t\t\t\t\t\$version = true;"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t\t// set to insert array"; + $script['save'][] = "\t\t\t\t\t\t\tif(in_array(\$key, \$data['target_headers']) && is_numeric(\$cell))"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\t\$columns[] \t= \$target[\$key];"; + $script['save'][] = "\t\t\t\t\t\t\t\t\$values[] \t= \$cell;"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t\telseif(in_array(\$key, \$data['target_headers']) && is_string(\$cell))"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\t\$columns[] \t= \$target[\$key];"; + $script['save'][] = "\t\t\t\t\t\t\t\t\$values[] \t= \$db->quote(\$cell);"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t\telseif(in_array(\$key, \$data['target_headers']) && is_null(\$cell))"; + $script['save'][] = "\t\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\t// if import data is null then set empty"; + $script['save'][] = "\t\t\t\t\t\t\t\t\$columns[] \t= \$target[\$key];"; + $script['save'][] = "\t\t\t\t\t\t\t\t\$values[] \t= \"''\";"; + $script['save'][] = "\t\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t// load the defaults"; + $script['save'][] = "\t\t\t\t\t\t\$columns[] \t= 'created_by';"; + $script['save'][] = "\t\t\t\t\t\t\$values[] \t= \$db->quote(\$user->id);"; + $script['save'][] = "\t\t\t\t\t\t\$columns[] \t= 'created';"; + $script['save'][] = "\t\t\t\t\t\t\$values[] \t= \$db->quote(\$todayDate);"; + $script['save'][] = "\t\t\t\t\t\tif (!\$version)"; + $script['save'][] = "\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\$columns[] \t= 'version';"; + $script['save'][] = "\t\t\t\t\t\t\t\$values[] \t= 1;"; + $script['save'][] = "\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t\t// Prepare the insert query."; + $script['save'][] = "\t\t\t\t\t\t\$query"; + $script['save'][] = "\t\t\t\t\t\t\t->insert(\$db->quoteName('#__###-#-#-component###_'.\$table))"; + $script['save'][] = "\t\t\t\t\t\t\t->columns(\$db->quoteName(\$columns))"; + $script['save'][] = "\t\t\t\t\t\t\t->values(implode(',', \$values));"; + $script['save'][] = "\t\t\t\t\t\t// Set the query using our newly populated query object and execute it."; + $script['save'][] = "\t\t\t\t\t\t\$db->setQuery(\$query);"; + $script['save'][] = "\t\t\t\t\t\t\$done = \$db->execute();"; + $script['save'][] = "\t\t\t\t\t\tif (\$done)"; + $script['save'][] = "\t\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\t\t\$aId = \$db->insertid();"; + $script['save'][] = "\t\t\t\t\t\t\t// make sure the access of asset is set"; + $script['save'][] = "\t\t\t\t\t\t\t###-#-#-Component###Helper::setAsset(\$aId,\$table);"; + $script['save'][] = "\t\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t\telse"; + $script['save'][] = "\t\t\t\t\t{"; + $script['save'][] = "\t\t\t\t\t\treturn false;"; + $script['save'][] = "\t\t\t\t\t}"; + $script['save'][] = "\t\t\t\t}"; + $script['save'][] = "\t\t\t\treturn true;"; + $script['save'][] = "\t\t\t}"; + $script['save'][] = "\t\t}"; + $script['save'][] = "\t\treturn false;"; + } + elseif ('view' == $type) + { + $script['view'][] = ""; + $script['view'][] = "\n
"; + $script['view'][] = "
\" method=\"post\" name=\"adminForm\" id=\"adminForm\" class=\"form-horizontal form-validate\">"; + $script['view'][] = "\n\tsidebar)) : ?>"; + $script['view'][] = "\t\t
"; + $script['view'][] = "\t\t\tsidebar; ?>"; + $script['view'][] = "\t\t
"; + $script['view'][] = "\t\t
"; + $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'][] = "\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'][] = ""; + $script['view'][] = ""; + $script['view'][] = ""; + $script['view'][] = ""; + $script['view'][] = "
"; + } + // return the needed script + if (isset($script[$type])) + { + return str_replace('-#-#-', '', implode("\n",$script[$type])); + } + return false; + } + public function getFieldSelectOptions($id) { // Get a db connection. diff --git a/admin/models/compiler.php b/admin/models/compiler.php index b3189202f..ef1333fdc 100644 --- a/admin/models/compiler.php +++ b/admin/models/compiler.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage compiler.php diff --git a/admin/models/component.php b/admin/models/component.php index d05c18297..699619fae 100644 --- a/admin/models/component.php +++ b/admin/models/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index 2ea947c74..88e6aa075 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/models/components.php b/admin/models/components.php index 13709406f..83daba705 100644 --- a/admin/models/components.php +++ b/admin/models/components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index d3ed0d57e..e27513ff1 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php index 344008866..238d6b4a5 100644 --- a/admin/models/custom_admin_views.php +++ b/admin/models/custom_admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php index 0d12646d8..1f8f65fac 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/models/dynamic_gets.php b/admin/models/dynamic_gets.php index f1969fe31..528c61cba 100644 --- a/admin/models/dynamic_gets.php +++ b/admin/models/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/models/field.php b/admin/models/field.php index 91fc5ad3c..513b48a3f 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/models/fields.php b/admin/models/fields.php index eeabe4629..305944996 100644 --- a/admin/models/fields.php +++ b/admin/models/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index f77cd9efa..57389bf5d 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 48ca0f431..210cc57b0 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index a5ef8f121..d184a4652 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage customadminviews.php diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index 993796bf2..49834ff75 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage customfilelist.php diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index 1d07f1983..1ab63ff09 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage customfolderlist.php diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index cb857b4ca..d585f5cd8 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage customgets.php diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index 28a017450..77395c514 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index 2f0d41e93..34673fd71 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamicgets.php diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index 863de7416..47d3ded3b 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php index c23a8fe19..a63d904fd 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldsmulti.php diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index 4d0366dee..ddbe90778 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index f23c1c4fe..a1d35d26b 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index 21c10a506..ba76f6e50 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage siteviews.php diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index f2ea59a2e..eb24fd7c2 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index 39fde081e..c01f327aa 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php @@ -112,7 +112,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVyvfields() + public function getVyyfields() { // 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->selectionTranslationVyvfields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVyyfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVyvfields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVyyfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVyvfields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVyyfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVyvfields($item->store, 'store'); + $item->store = $this->selectionTranslationVyyfields($item->store, 'store'); } } @@ -216,7 +216,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVyvfields($value,$name) + public function selectionTranslationVyyfields($value,$name) { // Array of datatype language strings if ($name == 'datatype') diff --git a/admin/models/fieldtypes.php b/admin/models/fieldtypes.php index d5511e184..97180aac1 100644 --- a/admin/models/fieldtypes.php +++ b/admin/models/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index f51af34db..343cb9e95 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.js @@ -44,6 +44,9 @@ jform_vvvvvwyvww_required = false; jform_vvvvvwzvwx_required = false; jform_vvvvvxavwy_required = false; jform_vvvvvxbvwz_required = false; +jform_vvvvvxfvxa_required = false; +jform_vvvvvxfvxb_required = false; +jform_vvvvvxfvxc_required = false; // Initial Script jQuery(document).ready(function() @@ -112,6 +115,12 @@ jQuery(document).ready(function() var source_vvvvvxd = jQuery("#jform_source input[type='radio']:checked").val(); var add_sql_vvvvvxd = jQuery("#jform_add_sql input[type='radio']:checked").val(); vvvvvxd(source_vvvvvxd,add_sql_vvvvvxd); + + var add_custom_import_vvvvvxf = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); + vvvvvxf(add_custom_import_vvvvvxf); + + var add_custom_import_vvvvvxg = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); + vvvvvxg(add_custom_import_vvvvvxg); }); // the vvvvvwi function @@ -750,6 +759,91 @@ function vvvvvxd(source_vvvvvxd,add_sql_vvvvvxd) } } +// the vvvvvxf function +function vvvvvxf(add_custom_import_vvvvvxf) +{ + // set the function logic + if (add_custom_import_vvvvvxf == 1) + { + jQuery('#jform_html_import_view').closest('.control-group').show(); + if (jform_vvvvvxfvxa_required) + { + updateFieldRequired('html_import_view',0); + jQuery('#jform_html_import_view').prop('required','required'); + jQuery('#jform_html_import_view').attr('aria-required',true); + jQuery('#jform_html_import_view').addClass('required'); + jform_vvvvvxfvxa_required = false; + } + + jQuery('.note_advanced_import').closest('.control-group').show(); + jQuery('#jform_php_import_save').closest('.control-group').show(); + if (jform_vvvvvxfvxb_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; + } + + jQuery('#jform_php_import_setdata').closest('.control-group').show(); + if (jform_vvvvvxfvxc_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; + } + + } + else + { + jQuery('#jform_html_import_view').closest('.control-group').hide(); + if (!jform_vvvvvxfvxa_required) + { + updateFieldRequired('html_import_view',1); + jQuery('#jform_html_import_view').removeAttr('required'); + jQuery('#jform_html_import_view').removeAttr('aria-required'); + jQuery('#jform_html_import_view').removeClass('required'); + jform_vvvvvxfvxa_required = true; + } + jQuery('.note_advanced_import').closest('.control-group').hide(); + jQuery('#jform_php_import_save').closest('.control-group').hide(); + if (!jform_vvvvvxfvxb_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; + } + jQuery('#jform_php_import_setdata').closest('.control-group').hide(); + if (!jform_vvvvvxfvxc_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; + } + } +} + +// the vvvvvxg function +function vvvvvxg(add_custom_import_vvvvvxg) +{ + // set the function logic + if (add_custom_import_vvvvvxg == 0) + { + jQuery('.note_beginner_import').closest('.control-group').show(); + } + else + { + jQuery('.note_beginner_import').closest('.control-group').hide(); + } +} + // update required fields function updateFieldRequired(name,status) { @@ -836,4 +930,51 @@ function getTableColumns(tableName,fieldKey){ jQuery('textarea#jform_addtables_fields_sourcemap-'+fieldKey).val(''); } }) +} + +function getImportScripts_server(typpe){ + var getUrl = "index.php?option=com_componentbuilder&task=ajax.getImportScripts&format=json"; + if(token.length > 0 && typpe.length > 0){ + var request = 'token='+token+'&type='+typpe; + } + return jQuery.ajax({ + type: 'GET', + url: getUrl, + dataType: 'jsonp', + data: request, + jsonp: 'callback' + }); +} + +function getImportScripts(id){ + if (1 == id) { + // get the current values + 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_setdata.length == 0){ + getImportScripts_server('setdata').done(function(result) { + if(result){ + jQuery('textarea#jform_php_import_setdata').val(result); + } + }); + } + // set the save method script + if(current_save.length == 0){ + getImportScripts_server('save').done(function(result) { + if(result){ + jQuery('textarea#jform_php_import_save').val(result); + } + }); + } + // set the view script + if(current_view.length == 0){ + getImportScripts_server('view').done(function(result) { + if(result){ + jQuery('textarea#jform_html_import_view').val(result); + } + }); + } + } } diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index d533ef9bb..23036a197 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -143,177 +143,6 @@ message="Error! Please add some short description here." hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT" /> - - - - - - - - - - - - COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY - + + + + + + + @@ -354,17 +222,17 @@ filter="HTML" hint="COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_HINT" /> - + @@ -375,19 +243,45 @@ description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_DESCRIPTION" directory="" /> - + - - - - + 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" + /> + + + + - + - + @@ -504,32 +398,32 @@ - + - + @@ -563,61 +457,34 @@ - + - - - + - + COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE + - - + + - + @@ -1416,6 +1285,195 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FOOTER_HINT" required="true" /> + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ +
+
+ + canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?>
@@ -506,6 +516,36 @@ jQuery('#adminForm').on('change', '#jform_add_sql',function (e) }); +// #jform_add_custom_import listeners for add_custom_import_vvvvvxf function +jQuery('#jform_add_custom_import').on('keyup',function() +{ + var add_custom_import_vvvvvxf = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); + vvvvvxf(add_custom_import_vvvvvxf); + +}); +jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e) +{ + e.preventDefault(); + var add_custom_import_vvvvvxf = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); + vvvvvxf(add_custom_import_vvvvvxf); + +}); + +// #jform_add_custom_import listeners for add_custom_import_vvvvvxg function +jQuery('#jform_add_custom_import').on('keyup',function() +{ + var add_custom_import_vvvvvxg = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); + vvvvvxg(add_custom_import_vvvvvxg); + +}); +jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e) +{ + e.preventDefault(); + var add_custom_import_vvvvvxg = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); + vvvvvxg(add_custom_import_vvvvvxg); + +}); + jQuery('#jform_addconditions_modal').on('show.bs.modal', function (e) { @@ -526,5 +566,11 @@ jQuery('#jform_addtables_modal').on('show.bs.modal', function (e) { }); }); - +// #jform_add_custom_import listeners +jQuery('#jform_add_custom_import').on('change',function() +{ + var valueSwitch = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); + getImportScripts(valueSwitch); + +}); diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index 56115ec36..adfb1a243 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -72,7 +72,7 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy } // Get Linked view data - $this->vxafields = $this->get('Vxafields'); + $this->vxdfields = $this->get('Vxdfields'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index 04abccd29..9343443a1 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/admin_views/tmpl/default_batch_body.php b/admin/views/admin_views/tmpl/default_batch_body.php index b36df9bf8..96e865482 100644 --- a/admin/views/admin_views/tmpl/default_batch_body.php +++ b/admin/views/admin_views/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/admin_views/tmpl/default_batch_footer.php b/admin/views/admin_views/tmpl/default_batch_footer.php index ba205b94e..d66c27939 100644 --- a/admin/views/admin_views/tmpl/default_batch_footer.php +++ b/admin/views/admin_views/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/admin_views/tmpl/default_body.php b/admin/views/admin_views/tmpl/default_body.php index 65f769f90..fe675a98a 100644 --- a/admin/views/admin_views/tmpl/default_body.php +++ b/admin/views/admin_views/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index 4fa1d4efa..dd9240c25 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php index 0385aa16c..2a4840e90 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/admin_views/tmpl/default_toolbar.php b/admin/views/admin_views/tmpl/default_toolbar.php index afe590751..6822eea2e 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index c24149839..95fa387ce 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/compiler/tmpl/default.php b/admin/views/compiler/tmpl/default.php index bd683e2ce..e6309af51 100644 --- a/admin/views/compiler/tmpl/default.php +++ b/admin/views/compiler/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php index 772198ce1..5b9578c01 100644 --- a/admin/views/compiler/view.html.php +++ b/admin/views/compiler/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/component/submitbutton.js b/admin/views/component/submitbutton.js index 9d5f28df3..382e8ba19 100644 --- a/admin/views/component/submitbutton.js +++ b/admin/views/component/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/component/tmpl/edit.php b/admin/views/component/tmpl/edit.php index 21e7835c3..b17559cf2 100644 --- a/admin/views/component/tmpl/edit.php +++ b/admin/views/component/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/component/view.html.php b/admin/views/component/view.html.php index deb78ba42..5248e2027 100644 --- a/admin/views/component/view.html.php +++ b/admin/views/component/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index 2fabfd489..d357c9878 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index 8468345bf..95f7c3284 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_main.php diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php index 191b71548..a709612e6 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index 27c27258f..99674172c 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/components/tmpl/default.php b/admin/views/components/tmpl/default.php index 44db16970..f86f73962 100644 --- a/admin/views/components/tmpl/default.php +++ b/admin/views/components/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/components/tmpl/default_batch_body.php b/admin/views/components/tmpl/default_batch_body.php index 0a85918b4..26be1c9bb 100644 --- a/admin/views/components/tmpl/default_batch_body.php +++ b/admin/views/components/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/components/tmpl/default_batch_footer.php b/admin/views/components/tmpl/default_batch_footer.php index 5b98557f2..42c56d386 100644 --- a/admin/views/components/tmpl/default_batch_footer.php +++ b/admin/views/components/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/components/tmpl/default_body.php b/admin/views/components/tmpl/default_body.php index 5f9b45ede..94c72f6ec 100644 --- a/admin/views/components/tmpl/default_body.php +++ b/admin/views/components/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/components/tmpl/default_foot.php b/admin/views/components/tmpl/default_foot.php index 1bf507b80..f9d7fefe3 100644 --- a/admin/views/components/tmpl/default_foot.php +++ b/admin/views/components/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/components/tmpl/default_head.php b/admin/views/components/tmpl/default_head.php index 17cd3896b..8f69a5b07 100644 --- a/admin/views/components/tmpl/default_head.php +++ b/admin/views/components/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/components/tmpl/default_toolbar.php b/admin/views/components/tmpl/default_toolbar.php index 997d21fcb..f03fecb04 100644 --- a/admin/views/components/tmpl/default_toolbar.php +++ b/admin/views/components/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/components/view.html.php b/admin/views/components/view.html.php index cc12a514b..842beec84 100644 --- a/admin/views/components/view.html.php +++ b/admin/views/components/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/custom_admin_view/submitbutton.js b/admin/views/custom_admin_view/submitbutton.js index 232ac1594..30697a1a8 100644 --- a/admin/views/custom_admin_view/submitbutton.js +++ b/admin/views/custom_admin_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/custom_admin_view/tmpl/edit.php b/admin/views/custom_admin_view/tmpl/edit.php index b98603fc2..d1684cc27 100644 --- a/admin/views/custom_admin_view/tmpl/edit.php +++ b/admin/views/custom_admin_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.4 - @build 2nd May, 2016 + @version 2.1.5 + @build 4th May, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php @@ -128,123 +128,123 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');