Added easy translation export and import feature, to allow translation to be done via an exel spreadsheet

README.md

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.11) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.12) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -126,14 +126,14 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 16th January, 2018
++ *Last Build*: 17th January, 2018
-+ *Version*: 2.6.11
++ *Version*: 2.6.12
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **179847**
++ *Line count*: **180823**
-+ *Field count*: **1571**
++ *Field count*: **1573**
-+ *File count*: **1153**
++ *File count*: **1160**
-+ *Folder count*: **184**
++ *Folder count*: **186**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

admin/README.txt

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.11) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.12) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -126,14 +126,14 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 16th January, 2018
++ *Last Build*: 17th January, 2018
-+ *Version*: 2.6.11
++ *Version*: 2.6.12
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **179847**
++ *Line count*: **180823**
-+ *Field count*: **1571**
++ *Field count*: **1573**
-+ *File count*: **1153**
++ *File count*: **1160**
-+ *Folder count*: **184**
++ *Folder count*: **186**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

admin/controllers/import_language_translations.php

@@ -0,0 +1,67 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		import_language_translations.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * Componentbuilder Import_language_translations Controller
+ */
+class ComponentbuilderControllerImport_language_translations 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_language_translations');
+		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_componentbuilder.redirect_url');
+		if (empty($redirect_url))
+		{
+			$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=import_language_translations', false);
+		}
+		else
+		{
+			// wipe out the user state when we're going to redirect
+			$app->setUserState('com_componentbuilder.redirect_url', '');
+			$app->setUserState('com_componentbuilder.message', '');
+			$app->setUserState('com_componentbuilder.extension_message', '');
+		}
+		$this->setRedirect($redirect_url);
+	}
+}

admin/controllers/language_translations.php

@@ -99,7 +99,7 @@ class ComponentbuilderControllerLanguage_translations extends JControllerAdmin
 				$session->set('dataType_VDM_IMPORTINTO', 'language_translation');
 				// Redirect to import view.
 				$message = JText::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGE_TRANSLATIONS');
-				$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=import', false), $message);
+				$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=import_language_translations', false), $message);
 				return;
 			}
 		}

admin/helpers/compiler/a_Get.php

@@ -1534,7 +1534,7 @@ class Get
 			// set custom import scripts
 			if (isset($view->add_custom_import) && $view->add_custom_import == 1)
 			{
-				$addImportArray = array('php_import_ext', 'php_import_display', 'php_import', 'php_import_setdata', 'php_import_save', 'html_import_view');
+				$addImportArray = array('php_import_ext', 'php_import_display', 'php_import', 'php_import_setdata', 'php_import_save', 'php_import_headers', 'html_import_view');
 				foreach ($addImportArray as $importScripter)
 				{
 					if (isset($view->$importScripter) && strlen($view->$importScripter) > 0)

admin/helpers/compiler/e_Interpretation.php

@@ -8104,32 +8104,34 @@ class Interpretation extends Fields
 			$query .= PHP_EOL . "\t\treturn false;";
 			$query .= PHP_EOL . "\t}";
 
-			$query .= PHP_EOL . PHP_EOL . "\t/**";
+			// set some placeholders just incase
-			$query .= PHP_EOL . "\t* Method to get header.";
+			if (!isset($this->placeholders['###view###']) && !isset($this->placeholders['[[[view]]]']))
-			$query .= PHP_EOL . "\t*";
+			{
-			$query .= PHP_EOL . "\t* @return mixed  An array of data items on success, false on failure.";
+				$this->placeholders['###view###'] = $viewName_single;
-			$query .= PHP_EOL . "\t*/";
+				$this->placeholders['[[[view]]]'] = $viewName_single;
-			$query .= PHP_EOL . "\tpublic function getExImPortHeaders()";
+				$_viewSet = true;
-			$query .= PHP_EOL . "\t{";
+			}
-			$query .= PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Get a db connection.";
+			if (!isset($this->placeholders['###views###']) && !isset($this->placeholders['[[[views]]]']))
-			$query .= PHP_EOL . "\t\t\$db = JFactory::getDbo();";
+			{
-			$query .= PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " get the columns";
+				$this->placeholders['###views###'] = $viewName_list;
-			$query .= PHP_EOL . "\t\t\$columns = \$db->getTableColumns(" . '"#__' . $this->fileContentStatic['###component###'] . '_' . $viewName_single . '");';
+				$this->placeholders['[[[views]]]'] = $viewName_list;
-			$query .= PHP_EOL . "\t\tif (" . $this->fileContentStatic['###Component###'] . "Helper::checkArray(\$columns))";
+				$_viewsSet = true;
-			$query .= PHP_EOL . "\t\t{";
+			}
-			$query .= PHP_EOL . "\t\t\t//" . $this->setLine(__LINE__) . " remove the headers you don't import/export.";
+
-			$query .= PHP_EOL . "\t\t\tunset(\$columns['asset_id']);";
+			// add getExImPortHeaders
-			$query .= PHP_EOL . "\t\t\tunset(\$columns['checked_out']);";
+			$query .= $this->getCustomScriptBuilder('php_import_headers', 'import_' . $viewName_list, PHP_EOL . PHP_EOL, null, true);
-			$query .= PHP_EOL . "\t\t\tunset(\$columns['checked_out_time']);";
+
-			$query .= PHP_EOL . "\t\t\t\$headers = new stdClass();";
+			// remove place holders if not needed (to not be suprized)
-			$query .= PHP_EOL . "\t\t\tforeach (\$columns as \$column => \$type)";
+			if (isset($_viewSet))
-			$query .= PHP_EOL . "\t\t\t{";
+			{
-			$query .= PHP_EOL . "\t\t\t\t\$headers->{\$column} = \$column;";
+				unset($this->placeholders['###view###']);
-			$query .= PHP_EOL . "\t\t\t}";
+				unset($this->placeholders['[[[view]]]']);
-			$query .= PHP_EOL . "\t\t\treturn \$headers;";
+			}
-			$query .= PHP_EOL . "\t\t}";
+			if (isset($_viewsSet))
-			$query .= PHP_EOL . "\t\treturn false;";
+			{
-			$query .= PHP_EOL . "\t}";
+				unset($this->placeholders['###views###']);
+				unset($this->placeholders['[[[views]]]']);
+			}
 		}
 		return $query;
 	}

admin/helpers/componentbuilder.php

@@ -938,7 +938,7 @@ abstract class ComponentbuilderHelper
 			
 	public static function getImportScripts($type, $fieldName = false)
 	{
-		// if field name is pased the convert to type
+		// if field name is passed the convert to type
 		if ($fieldName)
 		{
 			$fieldNames = array(
@@ -947,7 +947,8 @@ abstract class ComponentbuilderHelper
 				'php_import_save' => 'save',
 				'html_import_view' => 'view',
 				'php_import' => 'import',
-				'php_import_ext' => 'ext'
+				'php_import_ext' => 'ext',
+				'php_import_headers' => 'headers'
 			);
 			// first check if the field name is found
 			if (isset($fieldNames[$type]))
@@ -1047,6 +1048,36 @@ abstract class ComponentbuilderHelper
 			$script['setdata'][] = "\t\treturn false;";
 			$script['setdata'][] = "\t}";
 		}
+		elseif ('headers' === $type)
+		{
+			$script['headers'] = array();
+			$script['headers'][] = "\t/**";
+			$script['headers'][] = "\t* Method to get header.";
+			$script['headers'][] = "\t*";
+			$script['headers'][] = "\t* @return mixed  An array of data items on success, false on failure.";
+			$script['headers'][] = "\t*/";
+			$script['headers'][] = "\tpublic function getExImPortHeaders()";
+			$script['headers'][] = "\t{";
+			$script['headers'][] = "\t\t// Get a db connection.";
+			$script['headers'][] = "\t\t\$db = JFactory::getDbo();";
+			$script['headers'][] = "\t\t// get the columns";
+			$script['headers'][] = "\t\t\$columns = \$db->getTableColumns(\"#__###-#-#-component###_###-#-#-view###\");";
+			$script['headers'][] = "\t\tif (###-#-#-Component###Helper::checkArray(\$columns))";
+			$script['headers'][] = "\t\t{";
+			$script['headers'][] = "\t\t\t// remove the headers you don't import/export.";
+			$script['headers'][] = "\t\t\tunset(\$columns['asset_id']);";
+			$script['headers'][] = "\t\t\tunset(\$columns['checked_out']);";
+			$script['headers'][] = "\t\t\tunset(\$columns['checked_out_time']);";
+			$script['headers'][] = "\t\t\t\$headers = new stdClass();";
+			$script['headers'][] = "\t\t\tforeach (\$columns as \$column => \$type)";
+			$script['headers'][] = "\t\t\t{";
+			$script['headers'][] = "\t\t\t\t\$headers->{\$column} = \$column;";
+			$script['headers'][] = "\t\t\t}";
+			$script['headers'][] = "\t\t\treturn \$headers;";
+			$script['headers'][] = "\t\t}";
+			$script['headers'][] = "\t\treturn false;";
+			$script['headers'][] = "\t}";
+		}
 		elseif ('save' === $type)
 		{
 			$script['save'] = array();

admin/language/en-GB/en-GB.com_componentbuilder.ini

@@ -703,6 +703,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT="Php Import Ext"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_HINT="// PHP here for the checkExtension Method"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_LABEL="Check Extension Method PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS="Php Import Headers"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_HINT="// PHP here for the getExImPortHeaders Method"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_LABEL="get Export Import Headers PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT="// PHP Here that should run in the import Method."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL="Import Method PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE="Php Import Save"

admin/layouts/admin_view/custom_import_fullwidth.php

@@ -36,6 +36,7 @@ $fields = $displayData->get('fields') ?: array(
 	'php_import_display',
 	'html_import_view',
 	'php_import',
+	'php_import_headers',
 	'php_import_setdata',
 	'php_import_save',
 	'php_import_ext'

admin/layouts/fieldtype/fields_fullwidth.php

@@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->waafields;
+$items	= $displayData->wabfields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";

admin/layouts/ftp/linked_components_fullwidth.php

@@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->wablinked_components;
+$items	= $displayData->waclinked_components;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";

admin/models/admin_view.php

@@ -100,6 +100,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
+			if (!empty($item->addtables))
+			{
+				// Convert the addtables field to an array.
+				$addtables = new Registry;
+				$addtables->loadString($item->addtables);
+				$item->addtables = $addtables->toArray();
+			}
+
 			if (!empty($item->addpermissions))
 			{
 				// Convert the addpermissions field to an array.
@@ -132,14 +140,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->custom_button = $custom_button->toArray();
 			}
 
-			if (!empty($item->addtables))
-			{
-				// Convert the addtables field to an array.
-				$addtables = new Registry;
-				$addtables->loadString($item->addtables);
-				$item->addtables = $addtables->toArray();
-			}
-
 			if (!empty($item->ajax_input))
 			{
 				// Convert the ajax_input field to an array.
@@ -148,112 +148,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->ajax_input = $ajax_input->toArray();
 			}
 
-			if (!empty($item->php_after_delete))
+			if (!empty($item->php_import_headers))
 			{
-				// base64 Decode php_after_delete.
+				// base64 Decode php_import_headers.
-				$item->php_after_delete = base64_decode($item->php_after_delete);
+				$item->php_import_headers = base64_decode($item->php_import_headers);
 			}
 
-			if (!empty($item->php_save))
+			if (!empty($item->html_import_view))
 			{
-				// base64 Decode php_save.
+				// base64 Decode html_import_view.
-				$item->php_save = base64_decode($item->php_save);
+				$item->html_import_view = base64_decode($item->html_import_view);
-			}
-
-			if (!empty($item->php_batchmove))
-			{
-				// base64 Decode php_batchmove.
-				$item->php_batchmove = base64_decode($item->php_batchmove);
-			}
-
-			if (!empty($item->php_allowedit))
-			{
-				// base64 Decode php_allowedit.
-				$item->php_allowedit = base64_decode($item->php_allowedit);
-			}
-
-			if (!empty($item->php_after_publish))
-			{
-				// base64 Decode php_after_publish.
-				$item->php_after_publish = base64_decode($item->php_after_publish);
-			}
-
-			if (!empty($item->php_getitems))
-			{
-				// base64 Decode php_getitems.
-				$item->php_getitems = base64_decode($item->php_getitems);
-			}
-
-			if (!empty($item->php_import))
-			{
-				// base64 Decode php_import.
-				$item->php_import = base64_decode($item->php_import);
-			}
-
-			if (!empty($item->php_getlistquery))
-			{
-				// base64 Decode php_getlistquery.
-				$item->php_getlistquery = base64_decode($item->php_getlistquery);
-			}
-
-			if (!empty($item->php_getitem))
-			{
-				// base64 Decode php_getitem.
-				$item->php_getitem = base64_decode($item->php_getitem);
-			}
-
-			if (!empty($item->php_getitems_after_all))
-			{
-				// base64 Decode php_getitems_after_all.
-				$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
-			}
-
-			if (!empty($item->php_before_save))
-			{
-				// base64 Decode php_before_save.
-				$item->php_before_save = base64_decode($item->php_before_save);
-			}
-
-			if (!empty($item->php_postsavehook))
-			{
-				// base64 Decode php_postsavehook.
-				$item->php_postsavehook = base64_decode($item->php_postsavehook);
-			}
-
-			if (!empty($item->php_batchcopy))
-			{
-				// base64 Decode php_batchcopy.
-				$item->php_batchcopy = base64_decode($item->php_batchcopy);
-			}
-
-			if (!empty($item->php_before_publish))
-			{
-				// base64 Decode php_before_publish.
-				$item->php_before_publish = base64_decode($item->php_before_publish);
-			}
-
-			if (!empty($item->php_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))
-			{
-				// base64 Decode sql.
-				$item->sql = base64_decode($item->sql);
-			}
-
-			if (!empty($item->php_import_display))
-			{
-				// base64 Decode php_import_display.
-				$item->php_import_display = base64_decode($item->php_import_display);
 			}
 
 			if (!empty($item->php_import_save))
@@ -262,48 +166,138 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import_save = base64_decode($item->php_import_save);
 			}
 
+			if (!empty($item->php_getitem))
+			{
+				// base64 Decode php_getitem.
+				$item->php_getitem = base64_decode($item->php_getitem);
+			}
+
 			if (!empty($item->css_view))
 			{
 				// base64 Decode css_view.
 				$item->css_view = base64_decode($item->css_view);
 			}
 
+			if (!empty($item->php_getitems))
+			{
+				// base64 Decode php_getitems.
+				$item->php_getitems = base64_decode($item->php_getitems);
+			}
+
+			if (!empty($item->php_getitems_after_all))
+			{
+				// base64 Decode php_getitems_after_all.
+				$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
+			}
+
 			if (!empty($item->css_views))
 			{
 				// base64 Decode css_views.
 				$item->css_views = base64_decode($item->css_views);
 			}
 
+			if (!empty($item->php_getlistquery))
+			{
+				// base64 Decode php_getlistquery.
+				$item->php_getlistquery = base64_decode($item->php_getlistquery);
+			}
+
+			if (!empty($item->php_before_save))
+			{
+				// base64 Decode php_before_save.
+				$item->php_before_save = base64_decode($item->php_before_save);
+			}
+
 			if (!empty($item->javascript_view_file))
 			{
 				// base64 Decode javascript_view_file.
 				$item->javascript_view_file = base64_decode($item->javascript_view_file);
 			}
 
+			if (!empty($item->php_save))
+			{
+				// base64 Decode php_save.
+				$item->php_save = base64_decode($item->php_save);
+			}
+
+			if (!empty($item->php_postsavehook))
+			{
+				// base64 Decode php_postsavehook.
+				$item->php_postsavehook = base64_decode($item->php_postsavehook);
+			}
+
 			if (!empty($item->javascript_view_footer))
 			{
 				// base64 Decode javascript_view_footer.
 				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 			}
 
+			if (!empty($item->php_allowedit))
+			{
+				// base64 Decode php_allowedit.
+				$item->php_allowedit = base64_decode($item->php_allowedit);
+			}
+
+			if (!empty($item->php_batchcopy))
+			{
+				// base64 Decode php_batchcopy.
+				$item->php_batchcopy = base64_decode($item->php_batchcopy);
+			}
+
 			if (!empty($item->javascript_views_file))
 			{
 				// base64 Decode javascript_views_file.
 				$item->javascript_views_file = base64_decode($item->javascript_views_file);
 			}
 
+			if (!empty($item->php_batchmove))
+			{
+				// base64 Decode php_batchmove.
+				$item->php_batchmove = base64_decode($item->php_batchmove);
+			}
+
+			if (!empty($item->php_before_publish))
+			{
+				// base64 Decode php_before_publish.
+				$item->php_before_publish = base64_decode($item->php_before_publish);
+			}
+
 			if (!empty($item->javascript_views_footer))
 			{
 				// base64 Decode javascript_views_footer.
 				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 			}
 
+			if (!empty($item->php_after_publish))
+			{
+				// base64 Decode php_after_publish.
+				$item->php_after_publish = base64_decode($item->php_after_publish);
+			}
+
+			if (!empty($item->php_before_delete))
+			{
+				// base64 Decode php_before_delete.
+				$item->php_before_delete = base64_decode($item->php_before_delete);
+			}
+
+			if (!empty($item->php_after_delete))
+			{
+				// base64 Decode php_after_delete.
+				$item->php_after_delete = base64_decode($item->php_after_delete);
+			}
+
 			if (!empty($item->php_controller))
 			{
 				// base64 Decode php_controller.
 				$item->php_controller = base64_decode($item->php_controller);
 			}
 
+			if (!empty($item->php_document))
+			{
+				// base64 Decode php_document.
+				$item->php_document = base64_decode($item->php_document);
+			}
+
 			if (!empty($item->php_model))
 			{
 				// base64 Decode php_model.
@@ -316,22 +310,34 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_controller_list = base64_decode($item->php_controller_list);
 			}
 
+			if (!empty($item->sql))
+			{
+				// base64 Decode sql.
+				$item->sql = base64_decode($item->sql);
+			}
+
 			if (!empty($item->php_model_list))
 			{
 				// base64 Decode php_model_list.
 				$item->php_model_list = base64_decode($item->php_model_list);
 			}
 
+			if (!empty($item->php_import_display))
+			{
+				// base64 Decode php_import_display.
+				$item->php_import_display = base64_decode($item->php_import_display);
+			}
+
 			if (!empty($item->php_ajaxmethod))
 			{
 				// base64 Decode php_ajaxmethod.
 				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 			}
 
-			if (!empty($item->html_import_view))
+			if (!empty($item->php_import))
 			{
-				// base64 Decode html_import_view.
+				// base64 Decode php_import.
-				$item->html_import_view = base64_decode($item->html_import_view);
+				$item->php_import = base64_decode($item->php_import);
 			}
 
 			if (!empty($item->php_import_setdata))
@@ -1186,6 +1192,19 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
+		// Set the addtables items to data.
+		if (isset($data['addtables']) && is_array($data['addtables']))
+		{
+			$addtables = new JRegistry;
+			$addtables->loadArray($data['addtables']);
+			$data['addtables'] = (string) $addtables;
+		}
+		elseif (!isset($data['addtables']))
+		{
+			// Set the empty addtables to data
+			$data['addtables'] = '';
+		}
+
 		// Set the addpermissions items to data.
 		if (isset($data['addpermissions']) && is_array($data['addpermissions']))
 		{
@@ -1238,19 +1257,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['custom_button'] = '';
 		}
 
-		// Set the addtables items to data.
-		if (isset($data['addtables']) && is_array($data['addtables']))
-		{
-			$addtables = new JRegistry;
-			$addtables->loadArray($data['addtables']);
-			$data['addtables'] = (string) $addtables;
-		}
-		elseif (!isset($data['addtables']))
-		{
-			// Set the empty addtables to data
-			$data['addtables'] = '';
-		}
-
 		// Set the ajax_input items to data.
 		if (isset($data['ajax_input']) && is_array($data['ajax_input']))
 		{
@@ -1264,112 +1270,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['ajax_input'] = '';
 		}
 
-		// Set the php_after_delete string to base64 string.
+		// Set the php_import_headers string to base64 string.
-		if (isset($data['php_after_delete']))
+		if (isset($data['php_import_headers']))
 		{
-			$data['php_after_delete'] = base64_encode($data['php_after_delete']);
+			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
 		}
 
-		// Set the php_save string to base64 string.
+		// Set the html_import_view string to base64 string.
-		if (isset($data['php_save']))
+		if (isset($data['html_import_view']))
 		{
-			$data['php_save'] = base64_encode($data['php_save']);
+			$data['html_import_view'] = base64_encode($data['html_import_view']);
-		}
-
-		// Set the php_batchmove string to base64 string.
-		if (isset($data['php_batchmove']))
-		{
-			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
-		}
-
-		// Set the php_allowedit string to base64 string.
-		if (isset($data['php_allowedit']))
-		{
-			$data['php_allowedit'] = base64_encode($data['php_allowedit']);
-		}
-
-		// Set the php_after_publish string to base64 string.
-		if (isset($data['php_after_publish']))
-		{
-			$data['php_after_publish'] = base64_encode($data['php_after_publish']);
-		}
-
-		// Set the php_getitems string to base64 string.
-		if (isset($data['php_getitems']))
-		{
-			$data['php_getitems'] = base64_encode($data['php_getitems']);
-		}
-
-		// Set the php_import string to base64 string.
-		if (isset($data['php_import']))
-		{
-			$data['php_import'] = base64_encode($data['php_import']);
-		}
-
-		// Set the php_getlistquery string to base64 string.
-		if (isset($data['php_getlistquery']))
-		{
-			$data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
-		}
-
-		// Set the php_getitem string to base64 string.
-		if (isset($data['php_getitem']))
-		{
-			$data['php_getitem'] = base64_encode($data['php_getitem']);
-		}
-
-		// Set the php_getitems_after_all string to base64 string.
-		if (isset($data['php_getitems_after_all']))
-		{
-			$data['php_getitems_after_all'] = base64_encode($data['php_getitems_after_all']);
-		}
-
-		// Set the php_before_save string to base64 string.
-		if (isset($data['php_before_save']))
-		{
-			$data['php_before_save'] = base64_encode($data['php_before_save']);
-		}
-
-		// Set the php_postsavehook string to base64 string.
-		if (isset($data['php_postsavehook']))
-		{
-			$data['php_postsavehook'] = base64_encode($data['php_postsavehook']);
-		}
-
-		// 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_publish string to base64 string.
-		if (isset($data['php_before_publish']))
-		{
-			$data['php_before_publish'] = base64_encode($data['php_before_publish']);
-		}
-
-		// Set the php_before_delete string to base64 string.
-		if (isset($data['php_before_delete']))
-		{
-			$data['php_before_delete'] = base64_encode($data['php_before_delete']);
-		}
-
-		// Set the 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']))
-		{
-			$data['sql'] = base64_encode($data['sql']);
-		}
-
-		// Set the php_import_display string to base64 string.
-		if (isset($data['php_import_display']))
-		{
-			$data['php_import_display'] = base64_encode($data['php_import_display']);
 		}
 
 		// Set the php_import_save string to base64 string.
@@ -1378,48 +1288,138 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_import_save'] = base64_encode($data['php_import_save']);
 		}
 
+		// Set the php_getitem string to base64 string.
+		if (isset($data['php_getitem']))
+		{
+			$data['php_getitem'] = base64_encode($data['php_getitem']);
+		}
+
 		// Set the css_view string to base64 string.
 		if (isset($data['css_view']))
 		{
 			$data['css_view'] = base64_encode($data['css_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_getitems_after_all string to base64 string.
+		if (isset($data['php_getitems_after_all']))
+		{
+			$data['php_getitems_after_all'] = base64_encode($data['php_getitems_after_all']);
+		}
+
 		// Set the css_views string to base64 string.
 		if (isset($data['css_views']))
 		{
 			$data['css_views'] = base64_encode($data['css_views']);
 		}
 
+		// Set the php_getlistquery string to base64 string.
+		if (isset($data['php_getlistquery']))
+		{
+			$data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
+		}
+
+		// Set the php_before_save string to base64 string.
+		if (isset($data['php_before_save']))
+		{
+			$data['php_before_save'] = base64_encode($data['php_before_save']);
+		}
+
 		// Set the javascript_view_file string to base64 string.
 		if (isset($data['javascript_view_file']))
 		{
 			$data['javascript_view_file'] = base64_encode($data['javascript_view_file']);
 		}
 
+		// Set the php_save string to base64 string.
+		if (isset($data['php_save']))
+		{
+			$data['php_save'] = base64_encode($data['php_save']);
+		}
+
+		// Set the php_postsavehook string to base64 string.
+		if (isset($data['php_postsavehook']))
+		{
+			$data['php_postsavehook'] = base64_encode($data['php_postsavehook']);
+		}
+
 		// Set the javascript_view_footer string to base64 string.
 		if (isset($data['javascript_view_footer']))
 		{
 			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
 		}
 
+		// Set the php_allowedit string to base64 string.
+		if (isset($data['php_allowedit']))
+		{
+			$data['php_allowedit'] = base64_encode($data['php_allowedit']);
+		}
+
+		// Set the php_batchcopy string to base64 string.
+		if (isset($data['php_batchcopy']))
+		{
+			$data['php_batchcopy'] = base64_encode($data['php_batchcopy']);
+		}
+
 		// Set the javascript_views_file string to base64 string.
 		if (isset($data['javascript_views_file']))
 		{
 			$data['javascript_views_file'] = base64_encode($data['javascript_views_file']);
 		}
 
+		// Set the php_batchmove string to base64 string.
+		if (isset($data['php_batchmove']))
+		{
+			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
+		}
+
+		// Set the php_before_publish string to base64 string.
+		if (isset($data['php_before_publish']))
+		{
+			$data['php_before_publish'] = base64_encode($data['php_before_publish']);
+		}
+
 		// Set the javascript_views_footer string to base64 string.
 		if (isset($data['javascript_views_footer']))
 		{
 			$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
 		}
 
+		// Set the php_after_publish string to base64 string.
+		if (isset($data['php_after_publish']))
+		{
+			$data['php_after_publish'] = base64_encode($data['php_after_publish']);
+		}
+
+		// Set the php_before_delete string to base64 string.
+		if (isset($data['php_before_delete']))
+		{
+			$data['php_before_delete'] = base64_encode($data['php_before_delete']);
+		}
+
+		// Set the 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_controller string to base64 string.
 		if (isset($data['php_controller']))
 		{
 			$data['php_controller'] = base64_encode($data['php_controller']);
 		}
 
+		// Set the php_document string to base64 string.
+		if (isset($data['php_document']))
+		{
+			$data['php_document'] = base64_encode($data['php_document']);
+		}
+
 		// Set the php_model string to base64 string.
 		if (isset($data['php_model']))
 		{
@@ -1432,22 +1432,34 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_controller_list'] = base64_encode($data['php_controller_list']);
 		}
 
+		// Set the sql string to base64 string.
+		if (isset($data['sql']))
+		{
+			$data['sql'] = base64_encode($data['sql']);
+		}
+
 		// Set the php_model_list string to base64 string.
 		if (isset($data['php_model_list']))
 		{
 			$data['php_model_list'] = base64_encode($data['php_model_list']);
 		}
 
+		// Set the php_import_display string to base64 string.
+		if (isset($data['php_import_display']))
+		{
+			$data['php_import_display'] = base64_encode($data['php_import_display']);
+		}
+
 		// Set the php_ajaxmethod string to base64 string.
 		if (isset($data['php_ajaxmethod']))
 		{
 			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
 		}
 
-		// Set the html_import_view string to base64 string.
+		// Set the php_import string to base64 string.
-		if (isset($data['html_import_view']))
+		if (isset($data['php_import']))
 		{
-			$data['html_import_view'] = base64_encode($data['html_import_view']);
+			$data['php_import'] = base64_encode($data['php_import']);
 		}
 
 		// Set the php_import_setdata string to base64 string.

admin/models/admin_views.php

@@ -262,68 +262,70 @@ class ComponentbuilderModelAdmin_views extends JModelList
 							continue;
 						}
 
-						// decode php_after_delete
+						// decode php_import_headers
-						$item->php_after_delete = base64_decode($item->php_after_delete);
+						$item->php_import_headers = base64_decode($item->php_import_headers);
-						// decode php_save
+						// decode html_import_view
-						$item->php_save = base64_decode($item->php_save);
+						$item->html_import_view = base64_decode($item->html_import_view);
-						// decode php_batchmove
-						$item->php_batchmove = base64_decode($item->php_batchmove);
-						// decode php_allowedit
-						$item->php_allowedit = base64_decode($item->php_allowedit);
-						// decode php_after_publish
-						$item->php_after_publish = base64_decode($item->php_after_publish);
-						// decode php_getitems
-						$item->php_getitems = base64_decode($item->php_getitems);
-						// decode php_import
-						$item->php_import = base64_decode($item->php_import);
-						// decode php_getlistquery
-						$item->php_getlistquery = base64_decode($item->php_getlistquery);
-						// decode php_getitem
-						$item->php_getitem = base64_decode($item->php_getitem);
-						// decode php_getitems_after_all
-						$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
-						// decode php_before_save
-						$item->php_before_save = base64_decode($item->php_before_save);
-						// 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_publish
-						$item->php_before_publish = base64_decode($item->php_before_publish);
-						// 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 sql
-						$item->sql = base64_decode($item->sql);
-						// decode php_import_display
-						$item->php_import_display = base64_decode($item->php_import_display);
 						// decode php_import_save
 						$item->php_import_save = base64_decode($item->php_import_save);
+						// decode php_getitem
+						$item->php_getitem = base64_decode($item->php_getitem);
 						// decode css_view
 						$item->css_view = base64_decode($item->css_view);
+						// decode php_getitems
+						$item->php_getitems = base64_decode($item->php_getitems);
+						// decode php_getitems_after_all
+						$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
 						// decode css_views
 						$item->css_views = base64_decode($item->css_views);
+						// decode php_getlistquery
+						$item->php_getlistquery = base64_decode($item->php_getlistquery);
+						// decode php_before_save
+						$item->php_before_save = base64_decode($item->php_before_save);
 						// decode javascript_view_file
 						$item->javascript_view_file = base64_decode($item->javascript_view_file);
+						// decode php_save
+						$item->php_save = base64_decode($item->php_save);
+						// decode php_postsavehook
+						$item->php_postsavehook = base64_decode($item->php_postsavehook);
 						// decode javascript_view_footer
 						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+						// decode php_allowedit
+						$item->php_allowedit = base64_decode($item->php_allowedit);
+						// decode php_batchcopy
+						$item->php_batchcopy = base64_decode($item->php_batchcopy);
 						// decode javascript_views_file
 						$item->javascript_views_file = base64_decode($item->javascript_views_file);
+						// decode php_batchmove
+						$item->php_batchmove = base64_decode($item->php_batchmove);
+						// decode php_before_publish
+						$item->php_before_publish = base64_decode($item->php_before_publish);
 						// decode javascript_views_footer
 						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+						// decode php_after_publish
+						$item->php_after_publish = base64_decode($item->php_after_publish);
+						// decode php_before_delete
+						$item->php_before_delete = base64_decode($item->php_before_delete);
+						// decode php_after_delete
+						$item->php_after_delete = base64_decode($item->php_after_delete);
 						// decode php_controller
 						$item->php_controller = base64_decode($item->php_controller);
+						// decode php_document
+						$item->php_document = base64_decode($item->php_document);
 						// decode php_model
 						$item->php_model = base64_decode($item->php_model);
 						// decode php_controller_list
 						$item->php_controller_list = base64_decode($item->php_controller_list);
+						// decode sql
+						$item->sql = base64_decode($item->sql);
 						// decode php_model_list
 						$item->php_model_list = base64_decode($item->php_model_list);
+						// decode php_import_display
+						$item->php_import_display = base64_decode($item->php_import_display);
 						// decode php_ajaxmethod
 						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
-						// decode html_import_view
+						// decode php_import
-						$item->html_import_view = base64_decode($item->html_import_view);
+						$item->php_import = base64_decode($item->php_import);
 						// decode php_import_setdata
 						$item->php_import_setdata = base64_decode($item->php_import_setdata);
 						// decode php_import_ext
@@ -346,33 +348,6 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		return false;
 	} 
 	
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_admin_view");
-		if (ComponentbuilderHelper::checkArray($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	} 
-	
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/models/custom_admin_views.php

@@ -308,33 +308,6 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 		return false;
 	} 
 	
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_custom_admin_view");
-		if (ComponentbuilderHelper::checkArray($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	} 
-	
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/models/custom_codes.php

@@ -408,33 +408,6 @@ class ComponentbuilderModelCustom_codes extends JModelList
 		return false;
 	} 
 	
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_custom_code");
-		if (ComponentbuilderHelper::checkArray($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	} 
-	
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/models/dynamic_gets.php

@@ -353,33 +353,6 @@ class ComponentbuilderModelDynamic_gets extends JModelList
 		return false;
 	} 
 	
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_dynamic_get");
-		if (ComponentbuilderHelper::checkArray($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	} 
-	
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/models/fields.php

@@ -456,33 +456,6 @@ class ComponentbuilderModelFields extends JModelList
 		return false;
 	} 
 	
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_field");
-		if (ComponentbuilderHelper::checkArray($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	} 
-	
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/models/fieldtype.php

@@ -139,7 +139,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getWaafields()
+	public function getWabfields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -223,13 +223,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationWaafields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationWabfields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationWaafields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationWabfields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationWaafields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationWabfields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationWaafields($item->store, 'store');
+					$item->store = $this->selectionTranslationWabfields($item->store, 'store');
 				}
 			}
 
@@ -243,7 +243,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationWaafields($value,$name)
+	public function selectionTranslationWabfields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')

admin/models/fieldtypes.php

@@ -308,33 +308,6 @@ class ComponentbuilderModelFieldtypes extends JModelList
 		return false;
 	} 
 	
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_fieldtype");
-		if (ComponentbuilderHelper::checkArray($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	} 
-	
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/models/forms/admin_view.js

@@ -53,10 +53,11 @@ jform_vvvvvxyvxo_required = false;
 jform_vvvvvxyvxp_required = false;
 jform_vvvvvxyvxq_required = false;
 jform_vvvvvxyvxr_required = false;
-jform_vvvvvyavxs_required = false;
+jform_vvvvvxyvxs_required = false;
 jform_vvvvvyavxt_required = false;
 jform_vvvvvyavxu_required = false;
 jform_vvvvvyavxv_required = false;
+jform_vvvvvyavxw_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -945,34 +946,44 @@ function vvvvvxy(add_custom_import_vvvvvxy)
 			jform_vvvvvxyvxo_required = false;
 		}
 
-		jQuery('#jform_php_import').closest('.control-group').show();
+		jQuery('#jform_php_import_headers').closest('.control-group').show();
 		if (jform_vvvvvxyvxp_required)
+		{
+			updateFieldRequired('php_import_headers',0);
+			jQuery('#jform_php_import_headers').prop('required','required');
+			jQuery('#jform_php_import_headers').attr('aria-required',true);
+			jQuery('#jform_php_import_headers').addClass('required');
+			jform_vvvvvxyvxp_required = false;
+		}
+
+		jQuery('#jform_php_import').closest('.control-group').show();
+		if (jform_vvvvvxyvxq_required)
 		{
 			updateFieldRequired('php_import',0);
 			jQuery('#jform_php_import').prop('required','required');
 			jQuery('#jform_php_import').attr('aria-required',true);
 			jQuery('#jform_php_import').addClass('required');
-			jform_vvvvvxyvxp_required = false;
+			jform_vvvvvxyvxq_required = false;
 		}
 
 		jQuery('#jform_php_import_save').closest('.control-group').show();
-		if (jform_vvvvvxyvxq_required)
+		if (jform_vvvvvxyvxr_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_vvvvvxyvxq_required = false;
+			jform_vvvvvxyvxr_required = false;
 		}
 
 		jQuery('#jform_php_import_setdata').closest('.control-group').show();
-		if (jform_vvvvvxyvxr_required)
+		if (jform_vvvvvxyvxs_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_vvvvvxyvxr_required = false;
+			jform_vvvvvxyvxs_required = false;
 		}
 
 	}
@@ -1006,32 +1017,41 @@ function vvvvvxy(add_custom_import_vvvvvxy)
 			jQuery('#jform_php_import_ext').removeClass('required');
 			jform_vvvvvxyvxo_required = true;
 		}
-		jQuery('#jform_php_import').closest('.control-group').hide();
+		jQuery('#jform_php_import_headers').closest('.control-group').hide();
 		if (!jform_vvvvvxyvxp_required)
+		{
+			updateFieldRequired('php_import_headers',1);
+			jQuery('#jform_php_import_headers').removeAttr('required');
+			jQuery('#jform_php_import_headers').removeAttr('aria-required');
+			jQuery('#jform_php_import_headers').removeClass('required');
+			jform_vvvvvxyvxp_required = true;
+		}
+		jQuery('#jform_php_import').closest('.control-group').hide();
+		if (!jform_vvvvvxyvxq_required)
 		{
 			updateFieldRequired('php_import',1);
 			jQuery('#jform_php_import').removeAttr('required');
 			jQuery('#jform_php_import').removeAttr('aria-required');
 			jQuery('#jform_php_import').removeClass('required');
-			jform_vvvvvxyvxp_required = true;
+			jform_vvvvvxyvxq_required = true;
 		}
 		jQuery('#jform_php_import_save').closest('.control-group').hide();
-		if (!jform_vvvvvxyvxq_required)
+		if (!jform_vvvvvxyvxr_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_vvvvvxyvxq_required = true;
+			jform_vvvvvxyvxr_required = true;
 		}
 		jQuery('#jform_php_import_setdata').closest('.control-group').hide();
-		if (!jform_vvvvvxyvxr_required)
+		if (!jform_vvvvvxyvxs_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_vvvvvxyvxr_required = true;
+			jform_vvvvvxyvxs_required = true;
 		}
 	}
 }
@@ -1058,43 +1078,43 @@ function vvvvvya(add_custom_button_vvvvvya)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvyavxs_required)
+		if (jform_vvvvvyavxt_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvyavxs_required = false;
+			jform_vvvvvyavxt_required = false;
 		}
 
 		jQuery('#jform_php_controller_list').closest('.control-group').show();
-		if (jform_vvvvvyavxt_required)
+		if (jform_vvvvvyavxu_required)
 		{
 			updateFieldRequired('php_controller_list',0);
 			jQuery('#jform_php_controller_list').prop('required','required');
 			jQuery('#jform_php_controller_list').attr('aria-required',true);
 			jQuery('#jform_php_controller_list').addClass('required');
-			jform_vvvvvyavxt_required = false;
+			jform_vvvvvyavxu_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvyavxu_required)
+		if (jform_vvvvvyavxv_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvyavxu_required = false;
+			jform_vvvvvyavxv_required = false;
 		}
 
 		jQuery('#jform_php_model_list').closest('.control-group').show();
-		if (jform_vvvvvyavxv_required)
+		if (jform_vvvvvyavxw_required)
 		{
 			updateFieldRequired('php_model_list',0);
 			jQuery('#jform_php_model_list').prop('required','required');
 			jQuery('#jform_php_model_list').attr('aria-required',true);
 			jQuery('#jform_php_model_list').addClass('required');
-			jform_vvvvvyavxv_required = false;
+			jform_vvvvvyavxw_required = false;
 		}
 
 	}
@@ -1102,40 +1122,40 @@ function vvvvvya(add_custom_button_vvvvvya)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvyavxs_required)
+		if (!jform_vvvvvyavxt_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvyavxs_required = true;
+			jform_vvvvvyavxt_required = true;
 		}
 		jQuery('#jform_php_controller_list').closest('.control-group').hide();
-		if (!jform_vvvvvyavxt_required)
+		if (!jform_vvvvvyavxu_required)
 		{
 			updateFieldRequired('php_controller_list',1);
 			jQuery('#jform_php_controller_list').removeAttr('required');
 			jQuery('#jform_php_controller_list').removeAttr('aria-required');
 			jQuery('#jform_php_controller_list').removeClass('required');
-			jform_vvvvvyavxt_required = true;
+			jform_vvvvvyavxu_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvyavxu_required)
+		if (!jform_vvvvvyavxv_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvyavxu_required = true;
+			jform_vvvvvyavxv_required = true;
 		}
 		jQuery('#jform_php_model_list').closest('.control-group').hide();
-		if (!jform_vvvvvyavxv_required)
+		if (!jform_vvvvvyavxw_required)
 		{
 			updateFieldRequired('php_model_list',1);
 			jQuery('#jform_php_model_list').removeAttr('required');
 			jQuery('#jform_php_model_list').removeAttr('aria-required');
 			jQuery('#jform_php_model_list').removeClass('required');
-			jform_vvvvvyavxv_required = true;
+			jform_vvvvvyavxw_required = true;
 		}
 	}
 }
@@ -1290,7 +1310,7 @@ function getLinked(){
 }			
 
 function getTableColumns_server(tableName){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.tableColumns&format=json";
+	var getUrl = "index.php?option=com_componentbuilder&task=ajax.tableColumns&format=json&vdm="+vastDevMod;
 	if(token.length > 0 && tableName.length > 0){
 		var request = 'token='+token+'&table='+tableName;
 	}
@@ -1321,7 +1341,7 @@ function getTableColumns(fieldKey, table_, nr_){
 }
 
 function getImportScripts_server(typpe){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getImportScripts&format=json";
+	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getImportScripts&format=json&vdm="+vastDevMod;
 	if(token.length > 0 && typpe.length > 0){
 		var request = 'token='+token+'&type='+typpe;
 	}
@@ -1339,6 +1359,7 @@ function getImportScripts(id){
 		// get the current values
 		var current_import_display = jQuery('textarea#jform_php_import_display').val();
 		var current_import = jQuery('textarea#jform_php_import').val();
+		var current_headers = jQuery('textarea#jform_php_import_headers').val();
 		var current_setdata = jQuery('textarea#jform_php_import_setdata').val();
 		var current_save = jQuery('textarea#jform_php_import_save').val();
 		var current_view = jQuery('textarea#jform_html_import_view').val();
@@ -1359,6 +1380,14 @@ function getImportScripts(id){
 				}
 			});
 		}
+		// set the headers method script
+		if(current_headers.length == 0){
+			getImportScripts_server('headers').done(function(result) {
+				if(result){
+					jQuery('textarea#jform_php_import_headers').val(result);
+				}
+			});
+		}
 		// set the setData method script
 		if(current_setdata.length == 0){
 			getImportScripts_server('setdata').done(function(result) {

admin/models/forms/custom_admin_view.js

@@ -23,17 +23,17 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvybvxw_required = false;
+jform_vvvvvybvxx_required = false;
-jform_vvvvvycvxx_required = false;
+jform_vvvvvycvxy_required = false;
-jform_vvvvvydvxy_required = false;
+jform_vvvvvydvxz_required = false;
-jform_vvvvvyevxz_required = false;
+jform_vvvvvyevya_required = false;
-jform_vvvvvyfvya_required = false;
+jform_vvvvvyfvyb_required = false;
-jform_vvvvvygvyb_required = false;
+jform_vvvvvygvyc_required = false;
-jform_vvvvvyhvyc_required = false;
+jform_vvvvvyhvyd_required = false;
-jform_vvvvvyivyd_required = false;
 jform_vvvvvyivye_required = false;
-jform_vvvvvyjvyf_required = false;
+jform_vvvvvyivyf_required = false;
-jform_vvvvvykvyg_required = false;
+jform_vvvvvyjvyg_required = false;
+jform_vvvvvykvyh_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -76,26 +76,26 @@ function vvvvvyb(add_php_view_vvvvvyb)
 	if (add_php_view_vvvvvyb == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvybvxw_required)
+		if (jform_vvvvvybvxx_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvybvxw_required = false;
+			jform_vvvvvybvxx_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvybvxw_required)
+		if (!jform_vvvvvybvxx_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvybvxw_required = true;
+			jform_vvvvvybvxx_required = true;
 		}
 	}
 }
@@ -107,26 +107,26 @@ function vvvvvyc(add_php_jview_display_vvvvvyc)
 	if (add_php_jview_display_vvvvvyc == 1)
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvycvxx_required)
+		if (jform_vvvvvycvxy_required)
 		{
 			updateFieldRequired('php_jview_display',0);
 			jQuery('#jform_php_jview_display').prop('required','required');
 			jQuery('#jform_php_jview_display').attr('aria-required',true);
 			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvycvxx_required = false;
+			jform_vvvvvycvxy_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').hide();
-		if (!jform_vvvvvycvxx_required)
+		if (!jform_vvvvvycvxy_required)
 		{
 			updateFieldRequired('php_jview_display',1);
 			jQuery('#jform_php_jview_display').removeAttr('required');
 			jQuery('#jform_php_jview_display').removeAttr('aria-required');
 			jQuery('#jform_php_jview_display').removeClass('required');
-			jform_vvvvvycvxx_required = true;
+			jform_vvvvvycvxy_required = true;
 		}
 	}
 }
@@ -138,26 +138,26 @@ function vvvvvyd(add_php_jview_vvvvvyd)
 	if (add_php_jview_vvvvvyd == 1)
 	{
 		jQuery('#jform_php_jview').closest('.control-group').show();
-		if (jform_vvvvvydvxy_required)
+		if (jform_vvvvvydvxz_required)
 		{
 			updateFieldRequired('php_jview',0);
 			jQuery('#jform_php_jview').prop('required','required');
 			jQuery('#jform_php_jview').attr('aria-required',true);
 			jQuery('#jform_php_jview').addClass('required');
-			jform_vvvvvydvxy_required = false;
+			jform_vvvvvydvxz_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview').closest('.control-group').hide();
-		if (!jform_vvvvvydvxy_required)
+		if (!jform_vvvvvydvxz_required)
 		{
 			updateFieldRequired('php_jview',1);
 			jQuery('#jform_php_jview').removeAttr('required');
 			jQuery('#jform_php_jview').removeAttr('aria-required');
 			jQuery('#jform_php_jview').removeClass('required');
-			jform_vvvvvydvxy_required = true;
+			jform_vvvvvydvxz_required = true;
 		}
 	}
 }
@@ -169,26 +169,26 @@ function vvvvvye(add_php_document_vvvvvye)
 	if (add_php_document_vvvvvye == 1)
 	{
 		jQuery('#jform_php_document').closest('.control-group').show();
-		if (jform_vvvvvyevxz_required)
+		if (jform_vvvvvyevya_required)
 		{
 			updateFieldRequired('php_document',0);
 			jQuery('#jform_php_document').prop('required','required');
 			jQuery('#jform_php_document').attr('aria-required',true);
 			jQuery('#jform_php_document').addClass('required');
-			jform_vvvvvyevxz_required = false;
+			jform_vvvvvyevya_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_document').closest('.control-group').hide();
-		if (!jform_vvvvvyevxz_required)
+		if (!jform_vvvvvyevya_required)
 		{
 			updateFieldRequired('php_document',1);
 			jQuery('#jform_php_document').removeAttr('required');
 			jQuery('#jform_php_document').removeAttr('aria-required');
 			jQuery('#jform_php_document').removeClass('required');
-			jform_vvvvvyevxz_required = true;
+			jform_vvvvvyevya_required = true;
 		}
 	}
 }
@@ -200,26 +200,26 @@ function vvvvvyf(add_css_document_vvvvvyf)
 	if (add_css_document_vvvvvyf == 1)
 	{
 		jQuery('#jform_css_document').closest('.control-group').show();
-		if (jform_vvvvvyfvya_required)
+		if (jform_vvvvvyfvyb_required)
 		{
 			updateFieldRequired('css_document',0);
 			jQuery('#jform_css_document').prop('required','required');
 			jQuery('#jform_css_document').attr('aria-required',true);
 			jQuery('#jform_css_document').addClass('required');
-			jform_vvvvvyfvya_required = false;
+			jform_vvvvvyfvyb_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_document').closest('.control-group').hide();
-		if (!jform_vvvvvyfvya_required)
+		if (!jform_vvvvvyfvyb_required)
 		{
 			updateFieldRequired('css_document',1);
 			jQuery('#jform_css_document').removeAttr('required');
 			jQuery('#jform_css_document').removeAttr('aria-required');
 			jQuery('#jform_css_document').removeClass('required');
-			jform_vvvvvyfvya_required = true;
+			jform_vvvvvyfvyb_required = true;
 		}
 	}
 }
@@ -231,26 +231,26 @@ function vvvvvyg(add_javascript_file_vvvvvyg)
 	if (add_javascript_file_vvvvvyg == 1)
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').show();
-		if (jform_vvvvvygvyb_required)
+		if (jform_vvvvvygvyc_required)
 		{
 			updateFieldRequired('javascript_file',0);
 			jQuery('#jform_javascript_file').prop('required','required');
 			jQuery('#jform_javascript_file').attr('aria-required',true);
 			jQuery('#jform_javascript_file').addClass('required');
-			jform_vvvvvygvyb_required = false;
+			jform_vvvvvygvyc_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').hide();
-		if (!jform_vvvvvygvyb_required)
+		if (!jform_vvvvvygvyc_required)
 		{
 			updateFieldRequired('javascript_file',1);
 			jQuery('#jform_javascript_file').removeAttr('required');
 			jQuery('#jform_javascript_file').removeAttr('aria-required');
 			jQuery('#jform_javascript_file').removeClass('required');
-			jform_vvvvvygvyb_required = true;
+			jform_vvvvvygvyc_required = true;
 		}
 	}
 }
@@ -262,26 +262,26 @@ function vvvvvyh(add_js_document_vvvvvyh)
 	if (add_js_document_vvvvvyh == 1)
 	{
 		jQuery('#jform_js_document').closest('.control-group').show();
-		if (jform_vvvvvyhvyc_required)
+		if (jform_vvvvvyhvyd_required)
 		{
 			updateFieldRequired('js_document',0);
 			jQuery('#jform_js_document').prop('required','required');
 			jQuery('#jform_js_document').attr('aria-required',true);
 			jQuery('#jform_js_document').addClass('required');
-			jform_vvvvvyhvyc_required = false;
+			jform_vvvvvyhvyd_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_js_document').closest('.control-group').hide();
-		if (!jform_vvvvvyhvyc_required)
+		if (!jform_vvvvvyhvyd_required)
 		{
 			updateFieldRequired('js_document',1);
 			jQuery('#jform_js_document').removeAttr('required');
 			jQuery('#jform_js_document').removeAttr('aria-required');
 			jQuery('#jform_js_document').removeClass('required');
-			jform_vvvvvyhvyc_required = true;
+			jform_vvvvvyhvyd_required = true;
 		}
 	}
 }
@@ -294,23 +294,23 @@ function vvvvvyi(add_custom_button_vvvvvyi)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvyivyd_required)
+		if (jform_vvvvvyivye_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvyivyd_required = false;
+			jform_vvvvvyivye_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvyivye_required)
+		if (jform_vvvvvyivyf_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvyivye_required = false;
+			jform_vvvvvyivyf_required = false;
 		}
 
 	}
@@ -318,22 +318,22 @@ function vvvvvyi(add_custom_button_vvvvvyi)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvyivyd_required)
+		if (!jform_vvvvvyivye_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvyivyd_required = true;
+			jform_vvvvvyivye_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvyivye_required)
+		if (!jform_vvvvvyivyf_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvyivye_required = true;
+			jform_vvvvvyivyf_required = true;
 		}
 	}
 }
@@ -345,26 +345,26 @@ function vvvvvyj(add_css_vvvvvyj)
 	if (add_css_vvvvvyj == 1)
 	{
 		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvyjvyf_required)
+		if (jform_vvvvvyjvyg_required)
 		{
 			updateFieldRequired('css',0);
 			jQuery('#jform_css').prop('required','required');
 			jQuery('#jform_css').attr('aria-required',true);
 			jQuery('#jform_css').addClass('required');
-			jform_vvvvvyjvyf_required = false;
+			jform_vvvvvyjvyg_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvyjvyf_required)
+		if (!jform_vvvvvyjvyg_required)
 		{
 			updateFieldRequired('css',1);
 			jQuery('#jform_css').removeAttr('required');
 			jQuery('#jform_css').removeAttr('aria-required');
 			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvyjvyf_required = true;
+			jform_vvvvvyjvyg_required = true;
 		}
 	}
 }
@@ -377,13 +377,13 @@ function vvvvvyk(add_php_ajax_vvvvvyk)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvykvyg_required)
+		if (jform_vvvvvykvyh_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvykvyg_required = false;
+			jform_vvvvvykvyh_required = false;
 		}
 
 	}
@@ -391,13 +391,13 @@ function vvvvvyk(add_php_ajax_vvvvvyk)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvykvyg_required)
+		if (!jform_vvvvvykvyh_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvykvyg_required = true;
+			jform_vvvvvykvyh_required = true;
 		}
 	}
 }

admin/models/forms/custom_code.js

@@ -23,10 +23,10 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvzuvzm_required = false;
+jform_vvvvvzuvzn_required = false;
-jform_vvvvvzvvzn_required = false;
 jform_vvvvvzvvzo_required = false;
 jform_vvvvvzvvzp_required = false;
+jform_vvvvvzvvzq_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -53,13 +53,13 @@ function vvvvvzu(target_vvvvvzu)
 	if (target_vvvvvzu == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
-		if (jform_vvvvvzuvzm_required)
+		if (jform_vvvvvzuvzn_required)
 		{
 			updateFieldRequired('function_name',0);
 			jQuery('#jform_function_name').prop('required','required');
 			jQuery('#jform_function_name').attr('aria-required',true);
 			jQuery('#jform_function_name').addClass('required');
-			jform_vvvvvzuvzm_required = false;
+			jform_vvvvvzuvzn_required = false;
 		}
 
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
@@ -68,13 +68,13 @@ function vvvvvzu(target_vvvvvzu)
 	else
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
-		if (!jform_vvvvvzuvzm_required)
+		if (!jform_vvvvvzuvzn_required)
 		{
 			updateFieldRequired('function_name',1);
 			jQuery('#jform_function_name').removeAttr('required');
 			jQuery('#jform_function_name').removeAttr('aria-required');
 			jQuery('#jform_function_name').removeClass('required');
-			jform_vvvvvzuvzm_required = true;
+			jform_vvvvvzuvzn_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
@@ -88,70 +88,70 @@ function vvvvvzv(target_vvvvvzv)
 	if (target_vvvvvzv == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
-		if (jform_vvvvvzvvzn_required)
+		if (jform_vvvvvzvvzo_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvvzvvzn_required = false;
+			jform_vvvvvzvvzo_required = false;
 		}
 
 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvvzvvzo_required)
+		if (jform_vvvvvzvvzp_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvvzvvzo_required = false;
+			jform_vvvvvzvvzp_required = false;
 		}
 
 		jQuery('#jform_from_line').closest('.control-group').show();
 		jQuery('#jform_hashtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
 		jQuery('#jform_type').closest('.control-group').show();
-		if (jform_vvvvvzvvzp_required)
+		if (jform_vvvvvzvvzq_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvvzvvzp_required = false;
+			jform_vvvvvzvvzq_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
-		if (!jform_vvvvvzvvzn_required)
+		if (!jform_vvvvvzvvzo_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvvzvvzn_required = true;
+			jform_vvvvvzvvzo_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvvzvvzo_required)
+		if (!jform_vvvvvzvvzp_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvvzvvzo_required = true;
+			jform_vvvvvzvvzp_required = true;
 		}
 		jQuery('#jform_from_line').closest('.control-group').hide();
 		jQuery('#jform_hashtarget').closest('.control-group').hide();
 		jQuery('#jform_to_line').closest('.control-group').hide();
 		jQuery('#jform_type').closest('.control-group').hide();
-		if (!jform_vvvvvzvvzp_required)
+		if (!jform_vvvvvzvvzq_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvvzvvzp_required = true;
+			jform_vvvvvzvvzq_required = true;
 		}
 	}
 }

admin/models/forms/dynamic_get.js

@@ -23,24 +23,24 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvyyvyu_required = false;
+jform_vvvvvyyvyv_required = false;
-jform_vvvvvyzvyv_required = false;
+jform_vvvvvyzvyw_required = false;
-jform_vvvvvzavyw_required = false;
+jform_vvvvvzavyx_required = false;
-jform_vvvvvzbvyx_required = false;
+jform_vvvvvzbvyy_required = false;
-jform_vvvvvzcvyy_required = false;
+jform_vvvvvzcvyz_required = false;
-jform_vvvvvzdvyz_required = false;
+jform_vvvvvzdvza_required = false;
-jform_vvvvvzivza_required = false;
+jform_vvvvvzivzb_required = false;
-jform_vvvvvzkvzb_required = false;
+jform_vvvvvzkvzc_required = false;
-jform_vvvvvzlvzc_required = false;
+jform_vvvvvzlvzd_required = false;
-jform_vvvvvznvzd_required = false;
 jform_vvvvvznvze_required = false;
-jform_vvvvvzovzf_required = false;
+jform_vvvvvznvzf_required = false;
-jform_vvvvvzpvzg_required = false;
+jform_vvvvvzovzg_required = false;
-jform_vvvvvzqvzh_required = false;
+jform_vvvvvzpvzh_required = false;
-jform_vvvvvzsvzi_required = false;
+jform_vvvvvzqvzi_required = false;
 jform_vvvvvzsvzj_required = false;
 jform_vvvvvzsvzk_required = false;
-jform_vvvvvztvzl_required = false;
+jform_vvvvvzsvzl_required = false;
+jform_vvvvvztvzm_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -127,26 +127,26 @@ function vvvvvyy(gettype_vvvvvyy)
 	if (gettype)
 	{
 		jQuery('#jform_getcustom').closest('.control-group').show();
-		if (jform_vvvvvyyvyu_required)
+		if (jform_vvvvvyyvyv_required)
 		{
 			updateFieldRequired('getcustom',0);
 			jQuery('#jform_getcustom').prop('required','required');
 			jQuery('#jform_getcustom').attr('aria-required',true);
 			jQuery('#jform_getcustom').addClass('required');
-			jform_vvvvvyyvyu_required = false;
+			jform_vvvvvyyvyv_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_getcustom').closest('.control-group').hide();
-		if (!jform_vvvvvyyvyu_required)
+		if (!jform_vvvvvyyvyv_required)
 		{
 			updateFieldRequired('getcustom',1);
 			jQuery('#jform_getcustom').removeAttr('required');
 			jQuery('#jform_getcustom').removeAttr('aria-required');
 			jQuery('#jform_getcustom').removeClass('required');
-			jform_vvvvvyyvyu_required = true;
+			jform_vvvvvyyvyv_required = true;
 		}
 	}
 }
@@ -182,26 +182,26 @@ function vvvvvyz(main_source_vvvvvyz)
 	if (main_source)
 	{
 		jQuery('#jform_view_table_main').closest('.control-group').show();
-		if (jform_vvvvvyzvyv_required)
+		if (jform_vvvvvyzvyw_required)
 		{
 			updateFieldRequired('view_table_main',0);
 			jQuery('#jform_view_table_main').prop('required','required');
 			jQuery('#jform_view_table_main').attr('aria-required',true);
 			jQuery('#jform_view_table_main').addClass('required');
-			jform_vvvvvyzvyv_required = false;
+			jform_vvvvvyzvyw_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_view_table_main').closest('.control-group').hide();
-		if (!jform_vvvvvyzvyv_required)
+		if (!jform_vvvvvyzvyw_required)
 		{
 			updateFieldRequired('view_table_main',1);
 			jQuery('#jform_view_table_main').removeAttr('required');
 			jQuery('#jform_view_table_main').removeAttr('aria-required');
 			jQuery('#jform_view_table_main').removeClass('required');
-			jform_vvvvvyzvyv_required = true;
+			jform_vvvvvyzvyw_required = true;
 		}
 	}
 }
@@ -237,26 +237,26 @@ function vvvvvza(main_source_vvvvvza)
 	if (main_source)
 	{
 		jQuery('#jform_view_selection').closest('.control-group').show();
-		if (jform_vvvvvzavyw_required)
+		if (jform_vvvvvzavyx_required)
 		{
 			updateFieldRequired('view_selection',0);
 			jQuery('#jform_view_selection').prop('required','required');
 			jQuery('#jform_view_selection').attr('aria-required',true);
 			jQuery('#jform_view_selection').addClass('required');
-			jform_vvvvvzavyw_required = false;
+			jform_vvvvvzavyx_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_view_selection').closest('.control-group').hide();
-		if (!jform_vvvvvzavyw_required)
+		if (!jform_vvvvvzavyx_required)
 		{
 			updateFieldRequired('view_selection',1);
 			jQuery('#jform_view_selection').removeAttr('required');
 			jQuery('#jform_view_selection').removeAttr('aria-required');
 			jQuery('#jform_view_selection').removeClass('required');
-			jform_vvvvvzavyw_required = true;
+			jform_vvvvvzavyx_required = true;
 		}
 	}
 }
@@ -292,26 +292,26 @@ function vvvvvzb(main_source_vvvvvzb)
 	if (main_source)
 	{
 		jQuery('#jform_db_table_main').closest('.control-group').show();
-		if (jform_vvvvvzbvyx_required)
+		if (jform_vvvvvzbvyy_required)
 		{
 			updateFieldRequired('db_table_main',0);
 			jQuery('#jform_db_table_main').prop('required','required');
 			jQuery('#jform_db_table_main').attr('aria-required',true);
 			jQuery('#jform_db_table_main').addClass('required');
-			jform_vvvvvzbvyx_required = false;
+			jform_vvvvvzbvyy_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_db_table_main').closest('.control-group').hide();
-		if (!jform_vvvvvzbvyx_required)
+		if (!jform_vvvvvzbvyy_required)
 		{
 			updateFieldRequired('db_table_main',1);
 			jQuery('#jform_db_table_main').removeAttr('required');
 			jQuery('#jform_db_table_main').removeAttr('aria-required');
 			jQuery('#jform_db_table_main').removeClass('required');
-			jform_vvvvvzbvyx_required = true;
+			jform_vvvvvzbvyy_required = true;
 		}
 	}
 }
@@ -347,26 +347,26 @@ function vvvvvzc(main_source_vvvvvzc)
 	if (main_source)
 	{
 		jQuery('#jform_db_selection').closest('.control-group').show();
-		if (jform_vvvvvzcvyy_required)
+		if (jform_vvvvvzcvyz_required)
 		{
 			updateFieldRequired('db_selection',0);
 			jQuery('#jform_db_selection').prop('required','required');
 			jQuery('#jform_db_selection').attr('aria-required',true);
 			jQuery('#jform_db_selection').addClass('required');
-			jform_vvvvvzcvyy_required = false;
+			jform_vvvvvzcvyz_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_db_selection').closest('.control-group').hide();
-		if (!jform_vvvvvzcvyy_required)
+		if (!jform_vvvvvzcvyz_required)
 		{
 			updateFieldRequired('db_selection',1);
 			jQuery('#jform_db_selection').removeAttr('required');
 			jQuery('#jform_db_selection').removeAttr('aria-required');
 			jQuery('#jform_db_selection').removeClass('required');
-			jform_vvvvvzcvyy_required = true;
+			jform_vvvvvzcvyz_required = true;
 		}
 	}
 }
@@ -389,26 +389,26 @@ function vvvvvzd(addcalculation_vvvvvzd)
 	if (addcalculation_vvvvvzd == 1)
 	{
 		jQuery('#jform_php_calculation').closest('.control-group').show();
-		if (jform_vvvvvzdvyz_required)
+		if (jform_vvvvvzdvza_required)
 		{
 			updateFieldRequired('php_calculation',0);
 			jQuery('#jform_php_calculation').prop('required','required');
 			jQuery('#jform_php_calculation').attr('aria-required',true);
 			jQuery('#jform_php_calculation').addClass('required');
-			jform_vvvvvzdvyz_required = false;
+			jform_vvvvvzdvza_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_calculation').closest('.control-group').hide();
-		if (!jform_vvvvvzdvyz_required)
+		if (!jform_vvvvvzdvza_required)
 		{
 			updateFieldRequired('php_calculation',1);
 			jQuery('#jform_php_calculation').removeAttr('required');
 			jQuery('#jform_php_calculation').removeAttr('aria-required');
 			jQuery('#jform_php_calculation').removeClass('required');
-			jform_vvvvvzdvyz_required = true;
+			jform_vvvvvzdvza_required = true;
 		}
 	}
 }
@@ -555,26 +555,26 @@ function vvvvvzi(main_source_vvvvvzi)
 	if (main_source)
 	{
 		jQuery('#jform_php_custom_get').closest('.control-group').show();
-		if (jform_vvvvvzivza_required)
+		if (jform_vvvvvzivzb_required)
 		{
 			updateFieldRequired('php_custom_get',0);
 			jQuery('#jform_php_custom_get').prop('required','required');
 			jQuery('#jform_php_custom_get').attr('aria-required',true);
 			jQuery('#jform_php_custom_get').addClass('required');
-			jform_vvvvvzivza_required = false;
+			jform_vvvvvzivzb_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_custom_get').closest('.control-group').hide();
-		if (!jform_vvvvvzivza_required)
+		if (!jform_vvvvvzivzb_required)
 		{
 			updateFieldRequired('php_custom_get',1);
 			jQuery('#jform_php_custom_get').removeAttr('required');
 			jQuery('#jform_php_custom_get').removeAttr('aria-required');
 			jQuery('#jform_php_custom_get').removeClass('required');
-			jform_vvvvvzivza_required = true;
+			jform_vvvvvzivzb_required = true;
 		}
 	}
 }
@@ -670,26 +670,26 @@ function vvvvvzk(add_php_before_getitem_vvvvvzk,gettype_vvvvvzk)
 	if (add_php_before_getitem && gettype)
 	{
 		jQuery('#jform_php_before_getitem').closest('.control-group').show();
-		if (jform_vvvvvzkvzb_required)
+		if (jform_vvvvvzkvzc_required)
 		{
 			updateFieldRequired('php_before_getitem',0);
 			jQuery('#jform_php_before_getitem').prop('required','required');
 			jQuery('#jform_php_before_getitem').attr('aria-required',true);
 			jQuery('#jform_php_before_getitem').addClass('required');
-			jform_vvvvvzkvzb_required = false;
+			jform_vvvvvzkvzc_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_before_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvzkvzb_required)
+		if (!jform_vvvvvzkvzc_required)
 		{
 			updateFieldRequired('php_before_getitem',1);
 			jQuery('#jform_php_before_getitem').removeAttr('required');
 			jQuery('#jform_php_before_getitem').removeAttr('aria-required');
 			jQuery('#jform_php_before_getitem').removeClass('required');
-			jform_vvvvvzkvzb_required = true;
+			jform_vvvvvzkvzc_required = true;
 		}
 	}
 }
@@ -748,26 +748,26 @@ function vvvvvzl(add_php_after_getitem_vvvvvzl,gettype_vvvvvzl)
 	if (add_php_after_getitem && gettype)
 	{
 		jQuery('#jform_php_after_getitem').closest('.control-group').show();
-		if (jform_vvvvvzlvzc_required)
+		if (jform_vvvvvzlvzd_required)
 		{
 			updateFieldRequired('php_after_getitem',0);
 			jQuery('#jform_php_after_getitem').prop('required','required');
 			jQuery('#jform_php_after_getitem').attr('aria-required',true);
 			jQuery('#jform_php_after_getitem').addClass('required');
-			jform_vvvvvzlvzc_required = false;
+			jform_vvvvvzlvzd_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_after_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvzlvzc_required)
+		if (!jform_vvvvvzlvzd_required)
 		{
 			updateFieldRequired('php_after_getitem',1);
 			jQuery('#jform_php_after_getitem').removeAttr('required');
 			jQuery('#jform_php_after_getitem').removeAttr('aria-required');
 			jQuery('#jform_php_after_getitem').removeClass('required');
-			jform_vvvvvzlvzc_required = true;
+			jform_vvvvvzlvzd_required = true;
 		}
 	}
 }
@@ -814,45 +814,45 @@ function vvvvvzn(gettype_vvvvvzn)
 	if (gettype)
 	{
 		jQuery('#jform_add_php_after_getitem').closest('.control-group').show();
-		if (jform_vvvvvznvzd_required)
+		if (jform_vvvvvznvze_required)
 		{
 			updateFieldRequired('add_php_after_getitem',0);
 			jQuery('#jform_add_php_after_getitem').prop('required','required');
 			jQuery('#jform_add_php_after_getitem').attr('aria-required',true);
 			jQuery('#jform_add_php_after_getitem').addClass('required');
-			jform_vvvvvznvzd_required = false;
+			jform_vvvvvznvze_required = false;
 		}
 
 		jQuery('#jform_add_php_before_getitem').closest('.control-group').show();
-		if (jform_vvvvvznvze_required)
+		if (jform_vvvvvznvzf_required)
 		{
 			updateFieldRequired('add_php_before_getitem',0);
 			jQuery('#jform_add_php_before_getitem').prop('required','required');
 			jQuery('#jform_add_php_before_getitem').attr('aria-required',true);
 			jQuery('#jform_add_php_before_getitem').addClass('required');
-			jform_vvvvvznvze_required = false;
+			jform_vvvvvznvzf_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_add_php_after_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvznvzd_required)
+		if (!jform_vvvvvznvze_required)
 		{
 			updateFieldRequired('add_php_after_getitem',1);
 			jQuery('#jform_add_php_after_getitem').removeAttr('required');
 			jQuery('#jform_add_php_after_getitem').removeAttr('aria-required');
 			jQuery('#jform_add_php_after_getitem').removeClass('required');
-			jform_vvvvvznvzd_required = true;
+			jform_vvvvvznvze_required = true;
 		}
 		jQuery('#jform_add_php_before_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvznvze_required)
+		if (!jform_vvvvvznvzf_required)
 		{
 			updateFieldRequired('add_php_before_getitem',1);
 			jQuery('#jform_add_php_before_getitem').removeAttr('required');
 			jQuery('#jform_add_php_before_getitem').removeAttr('aria-required');
 			jQuery('#jform_add_php_before_getitem').removeClass('required');
-			jform_vvvvvznvze_required = true;
+			jform_vvvvvznvzf_required = true;
 		}
 	}
 }
@@ -900,26 +900,26 @@ function vvvvvzo(add_php_getlistquery_vvvvvzo,gettype_vvvvvzo)
 	if (add_php_getlistquery && gettype)
 	{
 		jQuery('#jform_php_getlistquery').closest('.control-group').show();
-		if (jform_vvvvvzovzf_required)
+		if (jform_vvvvvzovzg_required)
 		{
 			updateFieldRequired('php_getlistquery',0);
 			jQuery('#jform_php_getlistquery').prop('required','required');
 			jQuery('#jform_php_getlistquery').attr('aria-required',true);
 			jQuery('#jform_php_getlistquery').addClass('required');
-			jform_vvvvvzovzf_required = false;
+			jform_vvvvvzovzg_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_getlistquery').closest('.control-group').hide();
-		if (!jform_vvvvvzovzf_required)
+		if (!jform_vvvvvzovzg_required)
 		{
 			updateFieldRequired('php_getlistquery',1);
 			jQuery('#jform_php_getlistquery').removeAttr('required');
 			jQuery('#jform_php_getlistquery').removeAttr('aria-required');
 			jQuery('#jform_php_getlistquery').removeClass('required');
-			jform_vvvvvzovzf_required = true;
+			jform_vvvvvzovzg_required = true;
 		}
 	}
 }
@@ -978,26 +978,26 @@ function vvvvvzp(add_php_before_getitems_vvvvvzp,gettype_vvvvvzp)
 	if (add_php_before_getitems && gettype)
 	{
 		jQuery('#jform_php_before_getitems').closest('.control-group').show();
-		if (jform_vvvvvzpvzg_required)
+		if (jform_vvvvvzpvzh_required)
 		{
 			updateFieldRequired('php_before_getitems',0);
 			jQuery('#jform_php_before_getitems').prop('required','required');
 			jQuery('#jform_php_before_getitems').attr('aria-required',true);
 			jQuery('#jform_php_before_getitems').addClass('required');
-			jform_vvvvvzpvzg_required = false;
+			jform_vvvvvzpvzh_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_before_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzpvzg_required)
+		if (!jform_vvvvvzpvzh_required)
 		{
 			updateFieldRequired('php_before_getitems',1);
 			jQuery('#jform_php_before_getitems').removeAttr('required');
 			jQuery('#jform_php_before_getitems').removeAttr('aria-required');
 			jQuery('#jform_php_before_getitems').removeClass('required');
-			jform_vvvvvzpvzg_required = true;
+			jform_vvvvvzpvzh_required = true;
 		}
 	}
 }
@@ -1056,26 +1056,26 @@ function vvvvvzq(add_php_after_getitems_vvvvvzq,gettype_vvvvvzq)
 	if (add_php_after_getitems && gettype)
 	{
 		jQuery('#jform_php_after_getitems').closest('.control-group').show();
-		if (jform_vvvvvzqvzh_required)
+		if (jform_vvvvvzqvzi_required)
 		{
 			updateFieldRequired('php_after_getitems',0);
 			jQuery('#jform_php_after_getitems').prop('required','required');
 			jQuery('#jform_php_after_getitems').attr('aria-required',true);
 			jQuery('#jform_php_after_getitems').addClass('required');
-			jform_vvvvvzqvzh_required = false;
+			jform_vvvvvzqvzi_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_after_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzqvzh_required)
+		if (!jform_vvvvvzqvzi_required)
 		{
 			updateFieldRequired('php_after_getitems',1);
 			jQuery('#jform_php_after_getitems').removeAttr('required');
 			jQuery('#jform_php_after_getitems').removeAttr('aria-required');
 			jQuery('#jform_php_after_getitems').removeClass('required');
-			jform_vvvvvzqvzh_required = true;
+			jform_vvvvvzqvzi_required = true;
 		}
 	}
 }
@@ -1122,64 +1122,64 @@ function vvvvvzs(gettype_vvvvvzs)
 	if (gettype)
 	{
 		jQuery('#jform_add_php_after_getitems').closest('.control-group').show();
-		if (jform_vvvvvzsvzi_required)
+		if (jform_vvvvvzsvzj_required)
 		{
 			updateFieldRequired('add_php_after_getitems',0);
 			jQuery('#jform_add_php_after_getitems').prop('required','required');
 			jQuery('#jform_add_php_after_getitems').attr('aria-required',true);
 			jQuery('#jform_add_php_after_getitems').addClass('required');
-			jform_vvvvvzsvzi_required = false;
+			jform_vvvvvzsvzj_required = false;
 		}
 
 		jQuery('#jform_add_php_before_getitems').closest('.control-group').show();
-		if (jform_vvvvvzsvzj_required)
+		if (jform_vvvvvzsvzk_required)
 		{
 			updateFieldRequired('add_php_before_getitems',0);
 			jQuery('#jform_add_php_before_getitems').prop('required','required');
 			jQuery('#jform_add_php_before_getitems').attr('aria-required',true);
 			jQuery('#jform_add_php_before_getitems').addClass('required');
-			jform_vvvvvzsvzj_required = false;
+			jform_vvvvvzsvzk_required = false;
 		}
 
 		jQuery('#jform_add_php_getlistquery').closest('.control-group').show();
-		if (jform_vvvvvzsvzk_required)
+		if (jform_vvvvvzsvzl_required)
 		{
 			updateFieldRequired('add_php_getlistquery',0);
 			jQuery('#jform_add_php_getlistquery').prop('required','required');
 			jQuery('#jform_add_php_getlistquery').attr('aria-required',true);
 			jQuery('#jform_add_php_getlistquery').addClass('required');
-			jform_vvvvvzsvzk_required = false;
+			jform_vvvvvzsvzl_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_add_php_after_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzsvzi_required)
+		if (!jform_vvvvvzsvzj_required)
 		{
 			updateFieldRequired('add_php_after_getitems',1);
 			jQuery('#jform_add_php_after_getitems').removeAttr('required');
 			jQuery('#jform_add_php_after_getitems').removeAttr('aria-required');
 			jQuery('#jform_add_php_after_getitems').removeClass('required');
-			jform_vvvvvzsvzi_required = true;
+			jform_vvvvvzsvzj_required = true;
 		}
 		jQuery('#jform_add_php_before_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzsvzj_required)
+		if (!jform_vvvvvzsvzk_required)
 		{
 			updateFieldRequired('add_php_before_getitems',1);
 			jQuery('#jform_add_php_before_getitems').removeAttr('required');
 			jQuery('#jform_add_php_before_getitems').removeAttr('aria-required');
 			jQuery('#jform_add_php_before_getitems').removeClass('required');
-			jform_vvvvvzsvzj_required = true;
+			jform_vvvvvzsvzk_required = true;
 		}
 		jQuery('#jform_add_php_getlistquery').closest('.control-group').hide();
-		if (!jform_vvvvvzsvzk_required)
+		if (!jform_vvvvvzsvzl_required)
 		{
 			updateFieldRequired('add_php_getlistquery',1);
 			jQuery('#jform_add_php_getlistquery').removeAttr('required');
 			jQuery('#jform_add_php_getlistquery').removeAttr('aria-required');
 			jQuery('#jform_add_php_getlistquery').removeClass('required');
-			jform_vvvvvzsvzk_required = true;
+			jform_vvvvvzsvzl_required = true;
 		}
 	}
 }
@@ -1215,26 +1215,26 @@ function vvvvvzt(gettype_vvvvvzt)
 	if (gettype)
 	{
 		jQuery('#jform_pagination').closest('.control-group').show();
-		if (jform_vvvvvztvzl_required)
+		if (jform_vvvvvztvzm_required)
 		{
 			updateFieldRequired('pagination',0);
 			jQuery('#jform_pagination').prop('required','required');
 			jQuery('#jform_pagination').attr('aria-required',true);
 			jQuery('#jform_pagination').addClass('required');
-			jform_vvvvvztvzl_required = false;
+			jform_vvvvvztvzm_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_pagination').closest('.control-group').hide();
-		if (!jform_vvvvvztvzl_required)
+		if (!jform_vvvvvztvzm_required)
 		{
 			updateFieldRequired('pagination',1);
 			jQuery('#jform_pagination').removeAttr('required');
 			jQuery('#jform_pagination').removeAttr('aria-required');
 			jQuery('#jform_pagination').removeClass('required');
-			jform_vvvvvztvzl_required = true;
+			jform_vvvvvztvzm_required = true;
 		}
 	}
 }

admin/models/forms/field.js

@@ -23,14 +23,14 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwagvzs_required = false;
+jform_vvvvwagvzt_required = false;
-jform_vvvvwahvzt_required = false;
+jform_vvvvwahvzu_required = false;
-jform_vvvvwaivzu_required = false;
+jform_vvvvwaivzv_required = false;
-jform_vvvvwajvzv_required = false;
+jform_vvvvwajvzw_required = false;
-jform_vvvvwamvzw_required = false;
+jform_vvvvwamvzx_required = false;
-jform_vvvvwanvzx_required = false;
+jform_vvvvwanvzy_required = false;
-jform_vvvvwaovzy_required = false;
+jform_vvvvwaovzz_required = false;
-jform_vvvvwapvzz_required = false;
+jform_vvvvwapwaa_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -84,26 +84,26 @@ function vvvvwag(datalenght_vvvvwag)
 	if (datalenght)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
-		if (jform_vvvvwagvzs_required)
+		if (jform_vvvvwagvzt_required)
 		{
 			updateFieldRequired('datalenght_other',0);
 			jQuery('#jform_datalenght_other').prop('required','required');
 			jQuery('#jform_datalenght_other').attr('aria-required',true);
 			jQuery('#jform_datalenght_other').addClass('required');
-			jform_vvvvwagvzs_required = false;
+			jform_vvvvwagvzt_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		if (!jform_vvvvwagvzs_required)
+		if (!jform_vvvvwagvzt_required)
 		{
 			updateFieldRequired('datalenght_other',1);
 			jQuery('#jform_datalenght_other').removeAttr('required');
 			jQuery('#jform_datalenght_other').removeAttr('aria-required');
 			jQuery('#jform_datalenght_other').removeClass('required');
-			jform_vvvvwagvzs_required = true;
+			jform_vvvvwagvzt_required = true;
 		}
 	}
 }
@@ -139,26 +139,26 @@ function vvvvwah(datadefault_vvvvwah)
 	if (datadefault)
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvwahvzt_required)
+		if (jform_vvvvwahvzu_required)
 		{
 			updateFieldRequired('datadefault_other',0);
 			jQuery('#jform_datadefault_other').prop('required','required');
 			jQuery('#jform_datadefault_other').attr('aria-required',true);
 			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwahvzt_required = false;
+			jform_vvvvwahvzu_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		if (!jform_vvvvwahvzt_required)
+		if (!jform_vvvvwahvzu_required)
 		{
 			updateFieldRequired('datadefault_other',1);
 			jQuery('#jform_datadefault_other').removeAttr('required');
 			jQuery('#jform_datadefault_other').removeAttr('aria-required');
 			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvwahvzt_required = true;
+			jform_vvvvwahvzu_required = true;
 		}
 	}
 }
@@ -196,13 +196,13 @@ function vvvvwai(datatype_vvvvwai)
 		jQuery('#jform_datadefault').closest('.control-group').show();
 		jQuery('#jform_datalenght').closest('.control-group').show();
 		jQuery('#jform_indexes').closest('.control-group').show();
-		if (jform_vvvvwaivzu_required)
+		if (jform_vvvvwaivzv_required)
 		{
 			updateFieldRequired('indexes',0);
 			jQuery('#jform_indexes').prop('required','required');
 			jQuery('#jform_indexes').attr('aria-required',true);
 			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwaivzu_required = false;
+			jform_vvvvwaivzv_required = false;
 		}
 
 	}
@@ -211,13 +211,13 @@ function vvvvwai(datatype_vvvvwai)
 		jQuery('#jform_datadefault').closest('.control-group').hide();
 		jQuery('#jform_datalenght').closest('.control-group').hide();
 		jQuery('#jform_indexes').closest('.control-group').hide();
-		if (!jform_vvvvwaivzu_required)
+		if (!jform_vvvvwaivzv_required)
 		{
 			updateFieldRequired('indexes',1);
 			jQuery('#jform_indexes').removeAttr('required');
 			jQuery('#jform_indexes').removeAttr('aria-required');
 			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwaivzu_required = true;
+			jform_vvvvwaivzv_required = true;
 		}
 	}
 }
@@ -253,26 +253,26 @@ function vvvvwaj(datatype_vvvvwaj)
 	if (datatype)
 	{
 		jQuery('#jform_store').closest('.control-group').show();
-		if (jform_vvvvwajvzv_required)
+		if (jform_vvvvwajvzw_required)
 		{
 			updateFieldRequired('store',0);
 			jQuery('#jform_store').prop('required','required');
 			jQuery('#jform_store').attr('aria-required',true);
 			jQuery('#jform_store').addClass('required');
-			jform_vvvvwajvzv_required = false;
+			jform_vvvvwajvzw_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_store').closest('.control-group').hide();
-		if (!jform_vvvvwajvzv_required)
+		if (!jform_vvvvwajvzw_required)
 		{
 			updateFieldRequired('store',1);
 			jQuery('#jform_store').removeAttr('required');
 			jQuery('#jform_store').removeAttr('aria-required');
 			jQuery('#jform_store').removeClass('required');
-			jform_vvvvwajvzv_required = true;
+			jform_vvvvwajvzw_required = true;
 		}
 	}
 }
@@ -356,26 +356,26 @@ function vvvvwam(add_css_view_vvvvwam)
 	if (add_css_view_vvvvwam == 1)
 	{
 		jQuery('#jform_css_view').closest('.control-group').show();
-		if (jform_vvvvwamvzw_required)
+		if (jform_vvvvwamvzx_required)
 		{
 			updateFieldRequired('css_view',0);
 			jQuery('#jform_css_view').prop('required','required');
 			jQuery('#jform_css_view').attr('aria-required',true);
 			jQuery('#jform_css_view').addClass('required');
-			jform_vvvvwamvzw_required = false;
+			jform_vvvvwamvzx_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_view').closest('.control-group').hide();
-		if (!jform_vvvvwamvzw_required)
+		if (!jform_vvvvwamvzx_required)
 		{
 			updateFieldRequired('css_view',1);
 			jQuery('#jform_css_view').removeAttr('required');
 			jQuery('#jform_css_view').removeAttr('aria-required');
 			jQuery('#jform_css_view').removeClass('required');
-			jform_vvvvwamvzw_required = true;
+			jform_vvvvwamvzx_required = true;
 		}
 	}
 }
@@ -387,26 +387,26 @@ function vvvvwan(add_css_views_vvvvwan)
 	if (add_css_views_vvvvwan == 1)
 	{
 		jQuery('#jform_css_views').closest('.control-group').show();
-		if (jform_vvvvwanvzx_required)
+		if (jform_vvvvwanvzy_required)
 		{
 			updateFieldRequired('css_views',0);
 			jQuery('#jform_css_views').prop('required','required');
 			jQuery('#jform_css_views').attr('aria-required',true);
 			jQuery('#jform_css_views').addClass('required');
-			jform_vvvvwanvzx_required = false;
+			jform_vvvvwanvzy_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_views').closest('.control-group').hide();
-		if (!jform_vvvvwanvzx_required)
+		if (!jform_vvvvwanvzy_required)
 		{
 			updateFieldRequired('css_views',1);
 			jQuery('#jform_css_views').removeAttr('required');
 			jQuery('#jform_css_views').removeAttr('aria-required');
 			jQuery('#jform_css_views').removeClass('required');
-			jform_vvvvwanvzx_required = true;
+			jform_vvvvwanvzy_required = true;
 		}
 	}
 }
@@ -418,26 +418,26 @@ function vvvvwao(add_javascript_view_footer_vvvvwao)
 	if (add_javascript_view_footer_vvvvwao == 1)
 	{
 		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
-		if (jform_vvvvwaovzy_required)
+		if (jform_vvvvwaovzz_required)
 		{
 			updateFieldRequired('javascript_view_footer',0);
 			jQuery('#jform_javascript_view_footer').prop('required','required');
 			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
 			jQuery('#jform_javascript_view_footer').addClass('required');
-			jform_vvvvwaovzy_required = false;
+			jform_vvvvwaovzz_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
-		if (!jform_vvvvwaovzy_required)
+		if (!jform_vvvvwaovzz_required)
 		{
 			updateFieldRequired('javascript_view_footer',1);
 			jQuery('#jform_javascript_view_footer').removeAttr('required');
 			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
 			jQuery('#jform_javascript_view_footer').removeClass('required');
-			jform_vvvvwaovzy_required = true;
+			jform_vvvvwaovzz_required = true;
 		}
 	}
 }
@@ -449,26 +449,26 @@ function vvvvwap(add_javascript_views_footer_vvvvwap)
 	if (add_javascript_views_footer_vvvvwap == 1)
 	{
 		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
-		if (jform_vvvvwapvzz_required)
+		if (jform_vvvvwapwaa_required)
 		{
 			updateFieldRequired('javascript_views_footer',0);
 			jQuery('#jform_javascript_views_footer').prop('required','required');
 			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
 			jQuery('#jform_javascript_views_footer').addClass('required');
-			jform_vvvvwapvzz_required = false;
+			jform_vvvvwapwaa_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
-		if (!jform_vvvvwapvzz_required)
+		if (!jform_vvvvwapwaa_required)
 		{
 			updateFieldRequired('javascript_views_footer',1);
 			jQuery('#jform_javascript_views_footer').removeAttr('required');
 			jQuery('#jform_javascript_views_footer').removeAttr('aria-required');
 			jQuery('#jform_javascript_views_footer').removeClass('required');
-			jform_vvvvwapvzz_required = true;
+			jform_vvvvwapwaa_required = true;
 		}
 	}
 }

admin/models/forms/help_document.js

@@ -23,12 +23,12 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwaqwac_required = false;
+jform_vvvvwaqwad_required = false;
-jform_vvvvwarwad_required = false;
+jform_vvvvwarwae_required = false;
-jform_vvvvwaswae_required = false;
+jform_vvvvwaswaf_required = false;
-jform_vvvvwatwaf_required = false;
+jform_vvvvwatwag_required = false;
-jform_vvvvwauwag_required = false;
+jform_vvvvwauwah_required = false;
-jform_vvvvwavwah_required = false;
+jform_vvvvwavwai_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -59,26 +59,26 @@ function vvvvwaq(location_vvvvwaq)
 	if (location_vvvvwaq == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
-		if (jform_vvvvwaqwac_required)
+		if (jform_vvvvwaqwad_required)
 		{
 			updateFieldRequired('admin_view',0);
 			jQuery('#jform_admin_view').prop('required','required');
 			jQuery('#jform_admin_view').attr('aria-required',true);
 			jQuery('#jform_admin_view').addClass('required');
-			jform_vvvvwaqwac_required = false;
+			jform_vvvvwaqwad_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
-		if (!jform_vvvvwaqwac_required)
+		if (!jform_vvvvwaqwad_required)
 		{
 			updateFieldRequired('admin_view',1);
 			jQuery('#jform_admin_view').removeAttr('required');
 			jQuery('#jform_admin_view').removeAttr('aria-required');
 			jQuery('#jform_admin_view').removeClass('required');
-			jform_vvvvwaqwac_required = true;
+			jform_vvvvwaqwad_required = true;
 		}
 	}
 }
@@ -90,26 +90,26 @@ function vvvvwar(location_vvvvwar)
 	if (location_vvvvwar == 2)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
-		if (jform_vvvvwarwad_required)
+		if (jform_vvvvwarwae_required)
 		{
 			updateFieldRequired('site_view',0);
 			jQuery('#jform_site_view').prop('required','required');
 			jQuery('#jform_site_view').attr('aria-required',true);
 			jQuery('#jform_site_view').addClass('required');
-			jform_vvvvwarwad_required = false;
+			jform_vvvvwarwae_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_site_view').closest('.control-group').hide();
-		if (!jform_vvvvwarwad_required)
+		if (!jform_vvvvwarwae_required)
 		{
 			updateFieldRequired('site_view',1);
 			jQuery('#jform_site_view').removeAttr('required');
 			jQuery('#jform_site_view').removeAttr('aria-required');
 			jQuery('#jform_site_view').removeClass('required');
-			jform_vvvvwarwad_required = true;
+			jform_vvvvwarwae_required = true;
 		}
 	}
 }
@@ -134,26 +134,26 @@ function vvvvwas(type_vvvvwas)
 	if (type)
 	{
 		jQuery('#jform_url').closest('.control-group').show();
-		if (jform_vvvvwaswae_required)
+		if (jform_vvvvwaswaf_required)
 		{
 			updateFieldRequired('url',0);
 			jQuery('#jform_url').prop('required','required');
 			jQuery('#jform_url').attr('aria-required',true);
 			jQuery('#jform_url').addClass('required');
-			jform_vvvvwaswae_required = false;
+			jform_vvvvwaswaf_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_url').closest('.control-group').hide();
-		if (!jform_vvvvwaswae_required)
+		if (!jform_vvvvwaswaf_required)
 		{
 			updateFieldRequired('url',1);
 			jQuery('#jform_url').removeAttr('required');
 			jQuery('#jform_url').removeAttr('aria-required');
 			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwaswae_required = true;
+			jform_vvvvwaswaf_required = true;
 		}
 	}
 }
@@ -189,26 +189,26 @@ function vvvvwat(type_vvvvwat)
 	if (type)
 	{
 		jQuery('#jform_article').closest('.control-group').show();
-		if (jform_vvvvwatwaf_required)
+		if (jform_vvvvwatwag_required)
 		{
 			updateFieldRequired('article',0);
 			jQuery('#jform_article').prop('required','required');
 			jQuery('#jform_article').attr('aria-required',true);
 			jQuery('#jform_article').addClass('required');
-			jform_vvvvwatwaf_required = false;
+			jform_vvvvwatwag_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_article').closest('.control-group').hide();
-		if (!jform_vvvvwatwaf_required)
+		if (!jform_vvvvwatwag_required)
 		{
 			updateFieldRequired('article',1);
 			jQuery('#jform_article').removeAttr('required');
 			jQuery('#jform_article').removeAttr('aria-required');
 			jQuery('#jform_article').removeClass('required');
-			jform_vvvvwatwaf_required = true;
+			jform_vvvvwatwag_required = true;
 		}
 	}
 }
@@ -244,26 +244,26 @@ function vvvvwau(type_vvvvwau)
 	if (type)
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').show();
-		if (jform_vvvvwauwag_required)
+		if (jform_vvvvwauwah_required)
 		{
 			updateFieldRequired('content',0);
 			jQuery('#jform_content').prop('required','required');
 			jQuery('#jform_content').attr('aria-required',true);
 			jQuery('#jform_content').addClass('required');
-			jform_vvvvwauwag_required = false;
+			jform_vvvvwauwah_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').hide();
-		if (!jform_vvvvwauwag_required)
+		if (!jform_vvvvwauwah_required)
 		{
 			updateFieldRequired('content',1);
 			jQuery('#jform_content').removeAttr('required');
 			jQuery('#jform_content').removeAttr('aria-required');
 			jQuery('#jform_content').removeClass('required');
-			jform_vvvvwauwag_required = true;
+			jform_vvvvwauwah_required = true;
 		}
 	}
 }
@@ -286,26 +286,26 @@ function vvvvwav(target_vvvvwav)
 	if (target_vvvvwav == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
-		if (jform_vvvvwavwah_required)
+		if (jform_vvvvwavwai_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwavwah_required = false;
+			jform_vvvvwavwai_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
-		if (!jform_vvvvwavwah_required)
+		if (!jform_vvvvwavwai_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwavwah_required = true;
+			jform_vvvvwavwai_required = true;
 		}
 	}
 }

admin/models/forms/layout.js

@@ -23,7 +23,7 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvyxvyt_required = false;
+jform_vvvvvyxvyu_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -39,26 +39,26 @@ function vvvvvyx(add_php_view_vvvvvyx)
 	if (add_php_view_vvvvvyx == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyxvyt_required)
+		if (jform_vvvvvyxvyu_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyxvyt_required = false;
+			jform_vvvvvyxvyu_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyxvyt_required)
+		if (!jform_vvvvvyxvyu_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyxvyt_required = true;
+			jform_vvvvvyxvyu_required = true;
 		}
 	}
 }

admin/models/forms/library.js

@@ -23,8 +23,8 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvzzvzq_required = false;
+jform_vvvvvzzvzr_required = false;
-jform_vvvvwafvzr_required = false;
+jform_vvvvwafvzs_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -112,26 +112,26 @@ function vvvvvzz(how_vvvvvzz)
 	if (how)
 	{
 		jQuery('#jform_php_setdocument').closest('.control-group').show();
-		if (jform_vvvvvzzvzq_required)
+		if (jform_vvvvvzzvzr_required)
 		{
 			updateFieldRequired('php_setdocument',0);
 			jQuery('#jform_php_setdocument').prop('required','required');
 			jQuery('#jform_php_setdocument').attr('aria-required',true);
 			jQuery('#jform_php_setdocument').addClass('required');
-			jform_vvvvvzzvzq_required = false;
+			jform_vvvvvzzvzr_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_setdocument').closest('.control-group').hide();
-		if (!jform_vvvvvzzvzq_required)
+		if (!jform_vvvvvzzvzr_required)
 		{
 			updateFieldRequired('php_setdocument',1);
 			jQuery('#jform_php_setdocument').removeAttr('required');
 			jQuery('#jform_php_setdocument').removeAttr('aria-required');
 			jQuery('#jform_php_setdocument').removeClass('required');
-			jform_vvvvvzzvzq_required = true;
+			jform_vvvvvzzvzr_required = true;
 		}
 	}
 }
@@ -354,26 +354,26 @@ function vvvvwaf(type_vvvvwaf)
 	if (type_vvvvwaf == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
-		if (jform_vvvvwafvzr_required)
+		if (jform_vvvvwafvzs_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwafvzr_required = false;
+			jform_vvvvwafvzs_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
-		if (!jform_vvvvwafvzr_required)
+		if (!jform_vvvvwafvzs_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwafvzr_required = true;
+			jform_vvvvwafvzs_required = true;
 		}
 	}
 }

admin/models/forms/site_view.js

@@ -23,17 +23,17 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvylvyh_required = false;
+jform_vvvvvylvyi_required = false;
-jform_vvvvvymvyi_required = false;
+jform_vvvvvymvyj_required = false;
-jform_vvvvvynvyj_required = false;
+jform_vvvvvynvyk_required = false;
-jform_vvvvvyovyk_required = false;
+jform_vvvvvyovyl_required = false;
-jform_vvvvvypvyl_required = false;
+jform_vvvvvypvym_required = false;
-jform_vvvvvyqvym_required = false;
+jform_vvvvvyqvyn_required = false;
-jform_vvvvvyrvyn_required = false;
+jform_vvvvvyrvyo_required = false;
-jform_vvvvvysvyo_required = false;
+jform_vvvvvysvyp_required = false;
-jform_vvvvvytvyp_required = false;
+jform_vvvvvytvyq_required = false;
-jform_vvvvvyuvyq_required = false;
 jform_vvvvvyuvyr_required = false;
+jform_vvvvvyuvys_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -79,26 +79,26 @@ function vvvvvyl(add_php_view_vvvvvyl)
 	if (add_php_view_vvvvvyl == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvylvyh_required)
+		if (jform_vvvvvylvyi_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvylvyh_required = false;
+			jform_vvvvvylvyi_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvylvyh_required)
+		if (!jform_vvvvvylvyi_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvylvyh_required = true;
+			jform_vvvvvylvyi_required = true;
 		}
 	}
 }
@@ -110,26 +110,26 @@ function vvvvvym(add_php_jview_display_vvvvvym)
 	if (add_php_jview_display_vvvvvym == 1)
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvymvyi_required)
+		if (jform_vvvvvymvyj_required)
 		{
 			updateFieldRequired('php_jview_display',0);
 			jQuery('#jform_php_jview_display').prop('required','required');
 			jQuery('#jform_php_jview_display').attr('aria-required',true);
 			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvymvyi_required = false;
+			jform_vvvvvymvyj_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').hide();
-		if (!jform_vvvvvymvyi_required)
+		if (!jform_vvvvvymvyj_required)
 		{
 			updateFieldRequired('php_jview_display',1);
 			jQuery('#jform_php_jview_display').removeAttr('required');
 			jQuery('#jform_php_jview_display').removeAttr('aria-required');
 			jQuery('#jform_php_jview_display').removeClass('required');
-			jform_vvvvvymvyi_required = true;
+			jform_vvvvvymvyj_required = true;
 		}
 	}
 }
@@ -141,26 +141,26 @@ function vvvvvyn(add_php_jview_vvvvvyn)
 	if (add_php_jview_vvvvvyn == 1)
 	{
 		jQuery('#jform_php_jview').closest('.control-group').show();
-		if (jform_vvvvvynvyj_required)
+		if (jform_vvvvvynvyk_required)
 		{
 			updateFieldRequired('php_jview',0);
 			jQuery('#jform_php_jview').prop('required','required');
 			jQuery('#jform_php_jview').attr('aria-required',true);
 			jQuery('#jform_php_jview').addClass('required');
-			jform_vvvvvynvyj_required = false;
+			jform_vvvvvynvyk_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview').closest('.control-group').hide();
-		if (!jform_vvvvvynvyj_required)
+		if (!jform_vvvvvynvyk_required)
 		{
 			updateFieldRequired('php_jview',1);
 			jQuery('#jform_php_jview').removeAttr('required');
 			jQuery('#jform_php_jview').removeAttr('aria-required');
 			jQuery('#jform_php_jview').removeClass('required');
-			jform_vvvvvynvyj_required = true;
+			jform_vvvvvynvyk_required = true;
 		}
 	}
 }
@@ -172,26 +172,26 @@ function vvvvvyo(add_php_document_vvvvvyo)
 	if (add_php_document_vvvvvyo == 1)
 	{
 		jQuery('#jform_php_document').closest('.control-group').show();
-		if (jform_vvvvvyovyk_required)
+		if (jform_vvvvvyovyl_required)
 		{
 			updateFieldRequired('php_document',0);
 			jQuery('#jform_php_document').prop('required','required');
 			jQuery('#jform_php_document').attr('aria-required',true);
 			jQuery('#jform_php_document').addClass('required');
-			jform_vvvvvyovyk_required = false;
+			jform_vvvvvyovyl_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_document').closest('.control-group').hide();
-		if (!jform_vvvvvyovyk_required)
+		if (!jform_vvvvvyovyl_required)
 		{
 			updateFieldRequired('php_document',1);
 			jQuery('#jform_php_document').removeAttr('required');
 			jQuery('#jform_php_document').removeAttr('aria-required');
 			jQuery('#jform_php_document').removeClass('required');
-			jform_vvvvvyovyk_required = true;
+			jform_vvvvvyovyl_required = true;
 		}
 	}
 }
@@ -203,26 +203,26 @@ function vvvvvyp(add_css_document_vvvvvyp)
 	if (add_css_document_vvvvvyp == 1)
 	{
 		jQuery('#jform_css_document').closest('.control-group').show();
-		if (jform_vvvvvypvyl_required)
+		if (jform_vvvvvypvym_required)
 		{
 			updateFieldRequired('css_document',0);
 			jQuery('#jform_css_document').prop('required','required');
 			jQuery('#jform_css_document').attr('aria-required',true);
 			jQuery('#jform_css_document').addClass('required');
-			jform_vvvvvypvyl_required = false;
+			jform_vvvvvypvym_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_document').closest('.control-group').hide();
-		if (!jform_vvvvvypvyl_required)
+		if (!jform_vvvvvypvym_required)
 		{
 			updateFieldRequired('css_document',1);
 			jQuery('#jform_css_document').removeAttr('required');
 			jQuery('#jform_css_document').removeAttr('aria-required');
 			jQuery('#jform_css_document').removeClass('required');
-			jform_vvvvvypvyl_required = true;
+			jform_vvvvvypvym_required = true;
 		}
 	}
 }
@@ -234,26 +234,26 @@ function vvvvvyq(add_javascript_file_vvvvvyq)
 	if (add_javascript_file_vvvvvyq == 1)
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').show();
-		if (jform_vvvvvyqvym_required)
+		if (jform_vvvvvyqvyn_required)
 		{
 			updateFieldRequired('javascript_file',0);
 			jQuery('#jform_javascript_file').prop('required','required');
 			jQuery('#jform_javascript_file').attr('aria-required',true);
 			jQuery('#jform_javascript_file').addClass('required');
-			jform_vvvvvyqvym_required = false;
+			jform_vvvvvyqvyn_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').hide();
-		if (!jform_vvvvvyqvym_required)
+		if (!jform_vvvvvyqvyn_required)
 		{
 			updateFieldRequired('javascript_file',1);
 			jQuery('#jform_javascript_file').removeAttr('required');
 			jQuery('#jform_javascript_file').removeAttr('aria-required');
 			jQuery('#jform_javascript_file').removeClass('required');
-			jform_vvvvvyqvym_required = true;
+			jform_vvvvvyqvyn_required = true;
 		}
 	}
 }
@@ -265,26 +265,26 @@ function vvvvvyr(add_js_document_vvvvvyr)
 	if (add_js_document_vvvvvyr == 1)
 	{
 		jQuery('#jform_js_document').closest('.control-group').show();
-		if (jform_vvvvvyrvyn_required)
+		if (jform_vvvvvyrvyo_required)
 		{
 			updateFieldRequired('js_document',0);
 			jQuery('#jform_js_document').prop('required','required');
 			jQuery('#jform_js_document').attr('aria-required',true);
 			jQuery('#jform_js_document').addClass('required');
-			jform_vvvvvyrvyn_required = false;
+			jform_vvvvvyrvyo_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_js_document').closest('.control-group').hide();
-		if (!jform_vvvvvyrvyn_required)
+		if (!jform_vvvvvyrvyo_required)
 		{
 			updateFieldRequired('js_document',1);
 			jQuery('#jform_js_document').removeAttr('required');
 			jQuery('#jform_js_document').removeAttr('aria-required');
 			jQuery('#jform_js_document').removeClass('required');
-			jform_vvvvvyrvyn_required = true;
+			jform_vvvvvyrvyo_required = true;
 		}
 	}
 }
@@ -296,26 +296,26 @@ function vvvvvys(add_css_vvvvvys)
 	if (add_css_vvvvvys == 1)
 	{
 		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvysvyo_required)
+		if (jform_vvvvvysvyp_required)
 		{
 			updateFieldRequired('css',0);
 			jQuery('#jform_css').prop('required','required');
 			jQuery('#jform_css').attr('aria-required',true);
 			jQuery('#jform_css').addClass('required');
-			jform_vvvvvysvyo_required = false;
+			jform_vvvvvysvyp_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvysvyo_required)
+		if (!jform_vvvvvysvyp_required)
 		{
 			updateFieldRequired('css',1);
 			jQuery('#jform_css').removeAttr('required');
 			jQuery('#jform_css').removeAttr('aria-required');
 			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvysvyo_required = true;
+			jform_vvvvvysvyp_required = true;
 		}
 	}
 }
@@ -328,13 +328,13 @@ function vvvvvyt(add_php_ajax_vvvvvyt)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvytvyp_required)
+		if (jform_vvvvvytvyq_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvytvyp_required = false;
+			jform_vvvvvytvyq_required = false;
 		}
 
 	}
@@ -342,13 +342,13 @@ function vvvvvyt(add_php_ajax_vvvvvyt)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvytvyp_required)
+		if (!jform_vvvvvytvyq_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvytvyp_required = true;
+			jform_vvvvvytvyq_required = true;
 		}
 	}
 }
@@ -361,23 +361,23 @@ function vvvvvyu(add_custom_button_vvvvvyu)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvyuvyq_required)
+		if (jform_vvvvvyuvyr_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvyuvyq_required = false;
+			jform_vvvvvyuvyr_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvyuvyr_required)
+		if (jform_vvvvvyuvys_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvyuvyr_required = false;
+			jform_vvvvvyuvys_required = false;
 		}
 
 	}
@@ -385,22 +385,22 @@ function vvvvvyu(add_custom_button_vvvvvyu)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvyuvyq_required)
+		if (!jform_vvvvvyuvyr_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvyuvyq_required = true;
+			jform_vvvvvyuvyr_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvyuvyr_required)
+		if (!jform_vvvvvyuvys_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvyuvyr_required = true;
+			jform_vvvvvyuvys_required = true;
 		}
 	}
 }

admin/models/forms/template.js

@@ -23,7 +23,7 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvywvys_required = false;
+jform_vvvvvywvyt_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -39,26 +39,26 @@ function vvvvvyw(add_php_view_vvvvvyw)
 	if (add_php_view_vvvvvyw == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvywvys_required)
+		if (jform_vvvvvywvyt_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvywvys_required = false;
+			jform_vvvvvywvyt_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvywvys_required)
+		if (!jform_vvvvvywvyt_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvywvys_required = true;
+			jform_vvvvvywvyt_required = true;
 		}
 	}
 }

admin/models/ftp.php

@@ -122,7 +122,7 @@ class ComponentbuilderModelFtp extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getWablinked_components()
+	public function getWaclinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();

admin/models/ftps.php

@@ -283,33 +283,6 @@ class ComponentbuilderModelFtps extends JModelList
 		return false;
 	} 
 	
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_ftp");
-		if (ComponentbuilderHelper::checkArray($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	} 
-	
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/models/help_documents.php

@@ -375,33 +375,6 @@ class ComponentbuilderModelHelp_documents extends JModelList
 		return false;
 	} 
 	
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_help_document");
-		if (ComponentbuilderHelper::checkArray($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	} 
-	
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/models/import_language_translations.php

@@ -0,0 +1,660 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		import_language_translations.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * Componentbuilder Import_language_translations Model
+ */
+class ComponentbuilderModelImport_language_translations extends JModelLegacy
+{
+	// set uploading values
+	protected $use_streams = false;
+	protected $allow_unsafe = false;
+	protected $safeFileOptions = array();
+	
+	/**
+	 * @var object JTable object
+	 */
+	protected $_table = null;
+
+	/**
+	 * @var object JTable object
+	 */
+	protected $_url = null;
+
+	/**
+	 * Model context string.
+	 *
+	 * @var        string
+	 */
+	protected $_context = 'com_componentbuilder.import_language_translations';
+	
+	/**
+	 * 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_componentbuilder.message'));
+		$app->setUserState('com_componentbuilder.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);
+		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_componentbuilder.message', JText::_('COM_COMPONENTBUILDER_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_componentbuilder.message', JText::_('COM_COMPONENTBUILDER_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_COMPONENTBUILDER_IMPORT_ERROR');
+			$back = $session->get('backto_VDM_IMPORT', NULL);
+			if ($back)
+			{
+				$app->setUserState('com_componentbuilder.redirect_url', 'index.php?option=com_componentbuilder&view='.$back);
+				$session->clear('backto_VDM_IMPORT');
+			}
+			$result = false;
+		}
+		else
+		{
+			// Package imported sucessfully
+			$msg = JText::sprintf('COM_COMPONENTBUILDER_IMPORT_SUCCESS', $package['packagename']);
+			$back = $session->get('backto_VDM_IMPORT', NULL);
+			if ($back)
+			{
+			    $app->setUserState('com_componentbuilder.redirect_url', 'index.php?option=com_componentbuilder&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
+		$app = JFactory::getApplication();
+		$input = $app->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'))
+		{
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_WARNIMPORTFILE'), 'warning');
+			return false;
+		}
+
+		// If there is no uploaded file, we have a problem...
+		if (!is_array($userfile))
+		{
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_NO_FILE_SELECTED'), 'warning');
+			return false;
+		}
+
+		// Check if there was a problem uploading the file.
+		if ($userfile['error'] || $userfile['size'] < 1)
+		{
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_WARNIMPORTUPLOADERROR'), 'warning');
+			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()
+	{
+		$app = JFactory::getApplication();
+		$input = $app->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))
+		{
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'), 'warning');
+			return false;
+		}
+
+		// Detect the package type
+		$type = $this->getType;
+
+		// Did you give us a valid package?
+		if (!$type)
+		{
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'), 'warning');
+		}
+		
+		// check the extention
+		if(!$this->checkExtension($p_dir))
+		{
+			// set error message
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
+			return false;
+		}
+		
+		$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()
+	{
+		$app = JFactory::getApplication();
+		$input = $app->input;
+
+		// Get the URL of the package to import
+		$url = $input->getString('import_url');
+
+		// Did you give us a URL?
+		if (!$url)
+		{
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_ENTER_A_URL'), 'warning');
+			return false;
+		}
+
+		// Download the package at the URL given
+		$p_file = JInstallerHelper::downloadPackage($url);
+
+		// Was the package downloaded?
+		if (!$p_file)
+		{
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_INVALID_URL'), 'warning');
+			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)
+	{
+		$app = JFactory::getApplication();
+		// Clean the name
+		$archivename = JPath::clean($archivename);
+		
+		// check the extention
+		if(!$this->checkExtension($archivename))
+		{
+			// Cleanup the import files
+			$this->remove($archivename);
+			$app->enqueueMessage(JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
+			return false;
+		}
+		
+		$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;
+	}
+	
+	/**
+	 * Check the extension
+	 *
+	 * @param   string  $file    Name of the uploaded file
+	 *
+	 * @return  boolean  True on success
+	 *
+	 */
+	protected function checkExtension($file)
+	{
+		// check the extention
+		switch(strtolower(pathinfo($file, PATHINFO_EXTENSION)))
+		{
+			case 'xls':
+			case 'ods':
+			case 'csv':
+			return true;
+			break;
+		}
+		return false;
+	} 
+	
+	/**
+	 * 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)
+	{
+		if (ComponentbuilderHelper::checkArray($target_headers))
+		{
+			// make sure the file is loaded		
+			JLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers');
+			$jinput = JFactory::getApplication()->input;
+			foreach($target_headers as $header)
+			{
+				$data['target_headers'][$header] = $jinput->getString($header, null);
+			}
+			// set the data
+			if(isset($package['dir']))
+			{
+				$inputFileType = PHPExcel_IOFactory::identify($package['dir']);
+				$excelReader = PHPExcel_IOFactory::createReader($inputFileType);
+				$excelReader->setReadDataOnly(true);
+				$excelObj = $excelReader->load($package['dir']);
+				$data['array'] = $excelObj->getActiveSheet()->toArray(null, true,true,true);
+				$excelObj->disconnectWorksheets();
+				unset($excelObj);
+				return $this->save($data,$table);
+			}
+		}
+		return false;
+	} 
+	
+	/**
+	* 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 the data if there is any
+		if(ComponentbuilderHelper::checkArray($data['array']))
+		{
+			// get user object
+			$user  		= JFactory::getUser();
+			// remove header if it has headers
+			$id_key 	= $data['target_headers']['id'];
+			$english_key 	= $data['target_headers']['English'];
+			// get the first array set
+			$firstSet = reset($data['array']);
+
+			// check if first array is a header array and remove if true
+			if($firstSet[$id_key] == 'id' || $firstSet[$english_key] == 'English')
+			{
+				array_shift($data['array']);
+			}
+			
+			// make sure there is still values in array and that it was not only headers
+			if(ComponentbuilderHelper::checkArray($data['array']) && $user->authorise($table.'.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
+			{
+				// set target.
+				$target	= array_flip($data['target_headers']);
+				// Get a db connection.
+				$db = JFactory::getDbo();
+				// set some defaults
+				$todayDate		= JFactory::getDate()->toSql();
+				// get global action permissions
+				$canDo			= ComponentbuilderHelper::getActions($table);
+				$canEdit		= $canDo->get('core.edit');
+				// proses the data
+				foreach($data['array'] as $row)
+				{
+					$found = false;
+					if (isset($row[$id_key]) && is_numeric($row[$id_key]) && $row[$id_key] > 0)
+					{
+						// raw items import & update!
+						$query = $db->getQuery(true);
+						$query
+							->select('version')
+							->from($db->quoteName('#__componentbuilder_'.$table))
+							->where($db->quoteName('id') . ' = '. $db->quote($row[$id_key]));
+						// Reset the query using our newly populated query object.
+						$db->setQuery($query);
+						$db->execute();
+						$found = $db->getNumRows();
+					}
+					
+					if($found && $canEdit)
+					{
+						// update item
+						$id 		= $row[$id_key];
+						$version	= $db->loadResult();
+						// get languages
+						$languages = ComponentbuilderHelper::getVars('language', 1, 'published', 'langtag');
+						// reset all buckets
+						$query 		= $db->getQuery(true);
+						$fields 	= array();
+						$translations = array();
+						$counter = 0;
+						// Fields to update.
+						foreach($row as $key => $cell)
+						{
+							// ignore column
+							if ('IGNORE' === $target[$key] || 'modified_by' === $target[$key] || 'modified' === $target[$key] || 'English' === $target[$key] )
+							{
+								continue;
+							}
+							// update version
+							if ('version' == $target[$key])
+							{
+								$cell = (int) $version + 1;
+							}
+							// verify publish authority
+							if ('published' == $target[$key] && !$canState)
+							{
+								continue;
+							}
+							// set to translations
+							if(in_array($target[$key], $languages))
+							{
+								// only add if it has a string
+								if (ComponentbuilderHelper::checkString($cell))
+								{
+									$translations['translation'.$counter] = array('language' => $target[$key], 'translation' => $cell);
+									$counter++;
+								}
+							}
+							// set to update array
+							elseif(in_array($key, $data['target_headers']) && is_numeric($cell))
+							{
+								$fields[] = $db->quoteName($target[$key]) . ' = ' . $cell;
+							}
+							elseif(in_array($key, $data['target_headers']) && is_string($cell))
+							{
+								$fields[] = $db->quoteName($target[$key]) . ' = ' . $db->quote($cell);
+							}
+							elseif(in_array($key, $data['target_headers']) && is_null($cell))
+							{
+								// if import data is null then set empty
+								$fields[] = $db->quoteName($target[$key]) . " = ''";
+							}
+						}
+						// set the translation
+						if (ComponentbuilderHelper::checkArray($translations))
+						{
+							$fields[] = $db->quoteName('translation') . ' = ' . $db->quote(json_encode($translations, JSON_FORCE_OBJECT));
+						}
+						// load the defaults
+						$fields[]	= $db->quoteName('modified_by') . ' = ' . $db->quote($user->id);
+						$fields[]	= $db->quoteName('modified') . ' = ' . $db->quote($todayDate);
+						// Conditions for which records should be updated.
+						$conditions = array(
+							$db->quoteName('id') . ' = ' . $id
+						);
+						
+						$query->update($db->quoteName('#__componentbuilder_'.$table))->set($fields)->where($conditions);
+						$db->setQuery($query);
+						$db->execute();
+					}
+					else
+					{
+						return false;
+					}
+				}
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	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('#__componentbuilder_'.$table);
+		if(isset($columns['alias'])){
+			// Create a new query object.
+			$query = $db->getQuery(true);
+			$query->select($db->quoteName(array('alias')));
+			$query->from($db->quoteName('#__componentbuilder_'.$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;
+	}
+}

admin/models/joomla_component.php

@@ -415,6 +415,43 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 					}
 				}
 			}
+			// prep the lang strings for export
+			if (isset($_export) && $_export && ComponentbuilderHelper::checkArray($items))
+			{
+				foreach ($items as $nr => &$item)
+				{
+					// remove some values completely
+					unset($item->components);
+					unset($item->params);
+					unset($item->published);
+					unset($item->created_by);
+					unset($item->modified_by);
+					unset($item->created);
+					unset($item->modified);
+					unset($item->version);
+					unset($item->hits);
+					unset($item->access);
+					unset($item->ordering);
+					// now adapt the entranslation
+					if (isset($item->translation) && ComponentbuilderHelper::checkJson($item->translation))
+					{
+						$translations = json_decode($item->translation, true);
+						if (ComponentbuilderHelper::checkArray($translations))
+						{
+							foreach ($translations as $language)
+							{
+								if (isset($language['translation']) && ComponentbuilderHelper::checkString($language['translation'])
+								&& isset($language['language']) && ComponentbuilderHelper::checkString($language['language']))
+								{
+									$item->{$language['language']} = $language['translation'];
+								}
+							}
+						}
+					}
+					// remove translation
+					unset($item->translation);
+				}
+			}
 			return $items;
 		}
 		return false;

admin/models/language_translations.php

@@ -161,6 +161,43 @@ class ComponentbuilderModelLanguage_translations extends JModelList
 					}
 				}
 			}
+			// prep the lang strings for export
+			if (isset($_export) && $_export && ComponentbuilderHelper::checkArray($items))
+			{
+				foreach ($items as $nr => &$item)
+				{
+					// remove some values completely
+					unset($item->components);
+					unset($item->params);
+					unset($item->published);
+					unset($item->created_by);
+					unset($item->modified_by);
+					unset($item->created);
+					unset($item->modified);
+					unset($item->version);
+					unset($item->hits);
+					unset($item->access);
+					unset($item->ordering);
+					// now adapt the entranslation
+					if (isset($item->translation) && ComponentbuilderHelper::checkJson($item->translation))
+					{
+						$translations = json_decode($item->translation, true);
+						if (ComponentbuilderHelper::checkArray($translations))
+						{
+							foreach ($translations as $language)
+							{
+								if (isset($language['translation']) && ComponentbuilderHelper::checkString($language['translation'])
+								&& isset($language['language']) && ComponentbuilderHelper::checkString($language['language']))
+								{
+									$item->{$language['language']} = $language['translation'];
+								}
+							}
+						}
+					}
+					// remove translation
+					unset($item->translation);
+				}
+			}
         
 		// return items
 		return $items;
@@ -346,6 +383,43 @@ class ComponentbuilderModelLanguage_translations extends JModelList
 						$item->entranslation = '<small><em>(' . JText::_('COM_COMPONENTBUILDER_NOTRANSLATION') . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150) . $componentCounter;
 					}
 				}
+			}
+			// prep the lang strings for export
+			if (isset($_export) && $_export && ComponentbuilderHelper::checkArray($items))
+			{
+				foreach ($items as $nr => &$item)
+				{
+					// remove some values completely
+					unset($item->components);
+					unset($item->params);
+					unset($item->published);
+					unset($item->created_by);
+					unset($item->modified_by);
+					unset($item->created);
+					unset($item->modified);
+					unset($item->version);
+					unset($item->hits);
+					unset($item->access);
+					unset($item->ordering);
+					// now adapt the entranslation
+					if (isset($item->translation) && ComponentbuilderHelper::checkJson($item->translation))
+					{
+						$translations = json_decode($item->translation, true);
+						if (ComponentbuilderHelper::checkArray($translations))
+						{
+							foreach ($translations as $language)
+							{
+								if (isset($language['translation']) && ComponentbuilderHelper::checkString($language['translation'])
+								&& isset($language['language']) && ComponentbuilderHelper::checkString($language['language']))
+								{
+									$item->{$language['language']} = $language['translation'];
+								}
+							}
+						}
+					}
+					// remove translation
+					unset($item->translation);
+				}
 			}
 				return $items;
 			}
@@ -360,25 +434,18 @@ class ComponentbuilderModelLanguage_translations extends JModelList
 	*/
 	public function getExImPortHeaders()
 	{
-		// Get a db connection.
+		$languages = ComponentbuilderHelper::getVars('language', 1, 'published', 'langtag');
-		$db = JFactory::getDbo();
+		// start setup of headers
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_language_translation");
-		if (ComponentbuilderHelper::checkArray($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
 		$headers = new stdClass();
-			foreach ($columns as $column => $type)
+		$headers->id = 'id';
+		$headers->English = 'English';
+		// add the languages
+		foreach ($languages as $language)
 		{
-				$headers->{$column} = $column;
+			$headers->{$language} = $language;
 		}
 		return $headers;
 	} 
-		return false;
-	} 
 	
 	/**
 	 * Method to get a store id based on model configuration state.

admin/models/languages.php

@@ -272,33 +272,6 @@ class ComponentbuilderModelLanguages extends JModelList
 		return false;
 	} 
 	
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_language");
-		if (ComponentbuilderHelper::checkArray($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	} 
-	
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/models/layouts.php

@@ -293,33 +293,6 @@ class ComponentbuilderModelLayouts extends JModelList
 		return false;
 	} 
 	
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_layout");
-		if (ComponentbuilderHelper::checkArray($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	} 
-	
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/models/site_views.php

@@ -308,33 +308,6 @@ class ComponentbuilderModelSite_views extends JModelList
 		return false;
 	} 
 	
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_site_view");
-		if (ComponentbuilderHelper::checkArray($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	} 
-	
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/models/snippets.php

@@ -418,33 +418,6 @@ class ComponentbuilderModelSnippets extends JModelList
 		return false;
 	} 
 	
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_snippet");
-		if (ComponentbuilderHelper::checkArray($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	} 
-	
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/models/templates.php

@@ -284,33 +284,6 @@ class ComponentbuilderModelTemplates extends JModelList
 		return false;
 	} 
 	
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_template");
-		if (ComponentbuilderHelper::checkArray($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	} 
-	
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/sql/install.mysql.utf8.sql

@@ -193,6 +193,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`php_import` MEDIUMTEXT NOT NULL,
 	`php_import_display` MEDIUMTEXT NOT NULL,
 	`php_import_ext` MEDIUMTEXT NOT NULL,
+	`php_import_headers` MEDIUMTEXT NOT NULL,
 	`php_import_save` MEDIUMTEXT NOT NULL,
 	`php_import_setdata` MEDIUMTEXT NOT NULL,
 	`php_model` MEDIUMTEXT NOT NULL,
@@ -224,33 +225,33 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	KEY `idx_state` (`published`),
 	KEY `idx_name_single` (`name_single`),
 	KEY `idx_name_list` (`name_list`),
-	KEY `idx_type` (`type`),
-	KEY `idx_add_fadein` (`add_fadein`),
-	KEY `idx_source` (`source`),
-	KEY `idx_add_css_view` (`add_css_view`),
-	KEY `idx_add_php_getitems` (`add_php_getitems`),
-	KEY `idx_add_css_views` (`add_css_views`),
-	KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`),
-	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
-	KEY `idx_add_javascript_view_file` (`add_javascript_view_file`),
-	KEY `idx_add_php_before_save` (`add_php_before_save`),
-	KEY `idx_add_php_save` (`add_php_save`),
-	KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`),
-	KEY `idx_add_php_postsavehook` (`add_php_postsavehook`),
-	KEY `idx_add_php_allowedit` (`add_php_allowedit`),
-	KEY `idx_add_javascript_views_file` (`add_javascript_views_file`),
-	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
-	KEY `idx_add_php_batchmove` (`add_php_batchmove`),
-	KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`),
-	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
-	KEY `idx_add_php_after_publish` (`add_php_after_publish`),
-	KEY `idx_add_custom_button` (`add_custom_button`),
-	KEY `idx_add_php_before_delete` (`add_php_before_delete`),
-	KEY `idx_add_php_after_delete` (`add_php_after_delete`),
 	KEY `idx_add_php_document` (`add_php_document`),
-	KEY `idx_add_sql` (`add_sql`),
+	KEY `idx_add_php_postsavehook` (`add_php_postsavehook`),
-	KEY `idx_add_php_ajax` (`add_php_ajax`),
 	KEY `idx_add_custom_import` (`add_custom_import`),
+	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
+	KEY `idx_type` (`type`),
+	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
+	KEY `idx_add_fadein` (`add_fadein`),
+	KEY `idx_add_php_before_delete` (`add_php_before_delete`),
+	KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`),
+	KEY `idx_add_php_before_save` (`add_php_before_save`),
+	KEY `idx_add_php_getitems` (`add_php_getitems`),
+	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
+	KEY `idx_add_php_save` (`add_php_save`),
+	KEY `idx_add_php_allowedit` (`add_php_allowedit`),
+	KEY `idx_add_php_batchmove` (`add_php_batchmove`),
+	KEY `idx_add_php_after_publish` (`add_php_after_publish`),
+	KEY `idx_add_php_after_delete` (`add_php_after_delete`),
+	KEY `idx_add_sql` (`add_sql`),
+	KEY `idx_add_css_view` (`add_css_view`),
+	KEY `idx_add_css_views` (`add_css_views`),
+	KEY `idx_add_javascript_view_file` (`add_javascript_view_file`),
+	KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`),
+	KEY `idx_add_javascript_views_file` (`add_javascript_views_file`),
+	KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`),
+	KEY `idx_add_custom_button` (`add_custom_button`),
+	KEY `idx_source` (`source`),
+	KEY `idx_add_php_ajax` (`add_php_ajax`),
 	KEY `idx_add_php_getitem` (`add_php_getitem`)
 ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
 

admin/sql/updates/mysql/2.6.11.sql

@@ -0,0 +1 @@
+ALTER TABLE `#__componentbuilder_admin_view` ADD `php_import_headers` MEDIUMTEXT NOT NULL AFTER `php_import_ext`;

admin/views/fieldtype/view.html.php

@@ -64,7 +64,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->waafields = $this->get('Waafields');
+		$this->wabfields = $this->get('Wabfields');
 
 		// Set the toolbar
 		$this->addToolBar();

admin/views/ftp/view.html.php

@@ -64,7 +64,7 @@ class ComponentbuilderViewFtp extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->wablinked_components = $this->get('Wablinked_components');
+		$this->waclinked_components = $this->get('Waclinked_components');
 
 		// Set the toolbar
 		$this->addToolBar();

admin/views/import_language_translations/index.html

@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>

admin/views/import_language_translations/tmpl/default.php

@@ -0,0 +1,247 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		default.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+JHtml::_('jquery.framework');
+JHtml::_('bootstrap.tooltip');
+JHtml::_('script', 'system/core.js', false, true);
+JHtml::_('behavior.keepalive');
+?>
+<script type="text/javascript">
+<?php if ($this->hasPackage && ComponentbuilderHelper::checkArray($this->headerList)) : ?>
+	Joomla.continueImport = function()
+	{
+		var form = document.getElementById('adminForm');
+		var error = false;
+		var therequired = [<?php $i = 0; foreach($this->headerList as $name => $title) { echo ($i != 0)? ', "vdm_'.$name.'"':'"vdm_'.$name.'"'; $i++; } ?>];
+		for(i = 0; i < therequired.length; i++)
+		{
+			if(jQuery('#'+therequired[i]).val() == "" )
+			{
+				error = true;
+				break;
+			}
+		}
+		// do field validation
+		if (error)
+		{
+			alert("<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_PLEASE_SELECT_ALL_COLUMNS', true); ?>");
+		}
+		else
+		{
+			jQuery('#loading').css('display', 'block');
+
+
+			form.gettype.value = 'continue';
+			form.submit();
+		}
+	};
+<?php else: ?>
+	Joomla.submitbutton = function()
+	{
+		var form = document.getElementById('adminForm');
+
+
+		// do field validation
+		if (form.import_package.value == "")
+		{
+			alert("<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_PLEASE_SELECT_A_FILE', true); ?>");
+		}
+		else
+		{
+			jQuery('#loading').css('display', 'block');
+
+
+			form.gettype.value = 'upload';
+			form.submit();
+		}
+	};
+
+
+	Joomla.submitbutton3 = function()
+	{
+		var form = document.getElementById('adminForm');
+
+
+		// do field validation
+		if (form.import_directory.value == ""){
+			alert("<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_PLEASE_SELECT_A_DIRECTORY', true); ?>");
+		}
+		else
+		{
+			jQuery('#loading').css('display', 'block');
+
+
+			form.gettype.value = 'folder';
+			form.submit();
+		}
+	};
+
+
+	Joomla.submitbutton4 = function()
+	{
+		var form = document.getElementById('adminForm');
+
+
+		// do field validation
+		if (form.import_url.value == "" || form.import_url.value == "http://")
+		{
+			alert("<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_MSG_ENTER_A_URL', true); ?>");
+		}
+		else
+		{
+			jQuery('#loading').css('display', 'block');
+
+
+			form.gettype.value = 'url';
+			form.submit();
+		}
+	};
+<?php endif; ?>
+
+
+// Add spindle-wheel for importations:
+jQuery(document).ready(function($) {
+	var outerDiv = $('body');
+
+
+	$('<div id="loading"></div>')
+		.css("background", "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat")
+		.css("top", outerDiv.position().top - $(window).scrollTop())
+		.css("left", outerDiv.position().left - $(window).scrollLeft())
+		.css("width", outerDiv.width())
+		.css("height", outerDiv.height())
+		.css("position", "fixed")
+		.css("opacity", "0.80")
+		.css("-ms-filter", "progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)")
+		.css("filter", "alpha(opacity = 80)")
+		.css("display", "none")
+		.appendTo(outerDiv);
+});
+
+
+</script>
+
+
+<div id="installer-import" class="clearfix">
+<form enctype="multipart/form-data" action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=import_language_translations');?>" method="post" name="adminForm" id="adminForm" class="form-horizontal form-validate">
+
+
+	<?php if (!empty( $this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+	<?php else : ?>
+		<div id="j-main-container">
+	<?php endif;?>
+
+
+	<?php if ($this->hasPackage && ComponentbuilderHelper::checkArray($this->headerList) && ComponentbuilderHelper::checkArray($this->headers)) : ?>
+		<fieldset class="uploadform">
+			<legend><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_LINK_FILE_TO_TABLE_COLUMNS'); ?></legend>
+			<div class="control-group">
+				<label class="control-label" ><h4><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_TABLE_COLUMNS'); ?></h4></label>
+				<div class="controls">
+					<label class="control-label" ><h4><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_FILE_COLUMNS'); ?></h4></label>
+				</div>
+			</div>
+			<?php foreach($this->headerList as $name => $title): ?>
+				<div class="control-group">
+					<label for="<?php echo $name; ?>" class="control-label" ><?php echo $title; ?></label>
+					<div class="controls">
+						<select  name="<?php echo $name; ?>"  id="vdm_<?php echo $name; ?>" required class="required input_box" >
+							<option value=""><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_PLEASE_SELECT_COLUMN'); ?></option>
+							<option value="IGNORE"><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_IGNORE_COLUMN'); ?></option>
+							<?php foreach($this->headers as $value => $option): ?>
+								<?php $selected = (strtolower($option) ==  strtolower ($title) || strtolower($option) == strtolower($name))? 'selected="selected"':''; ?>
+								<option value="<?php echo ComponentbuilderHelper::htmlEscape($value); ?>" class="required" <?php echo $selected ?>><?php echo ComponentbuilderHelper::htmlEscape($option); ?></option>
+							<?php endforeach; ?>
+						</select>
+					</div>
+				</div>
+			<?php endforeach; ?>
+			<div class="form-actions">
+				<input class="btn btn-primary" type="button" value="<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_CONTINUE'); ?>" onclick="Joomla.continueImport()" />
+			</div>
+		</fieldset>
+		<input type="hidden" name="gettype" value="continue" />
+	<?php else: ?>
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'upload')); ?>
+		
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'upload', JText::_('COM_COMPONENTBUILDER_IMPORT_FROM_UPLOAD', true)); ?>
+			<fieldset class="uploadform">
+				<legend><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_UPDATE_DATA'); ?></legend>
+				<div class="control-group">
+					<label for="import_package" class="control-label"><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE'); ?></label>
+					<div class="controls">
+						<input class="input_box" id="import_package" name="import_package" type="file" size="57" />
+					</div>
+				</div>
+				<div class="form-actions">
+					<input class="btn btn-primary" type="button" value="<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_UPLOAD_BOTTON'); ?>" onclick="Joomla.submitbutton()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
+				</div>
+			</fieldset>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'directory', JText::_('COM_COMPONENTBUILDER_IMPORT_FROM_DIRECTORY', true)); ?>
+			<fieldset class="uploadform">
+				<legend><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_UPDATE_DATA'); ?></legend>
+				<div class="control-group">
+					<label for="import_directory" class="control-label"><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_DIRECTORY'); ?></label>
+					<div class="controls">
+						<input type="text" id="import_directory" name="import_directory" class="span5 input_box" size="70" value="<?php echo $this->state->get('import.directory'); ?>" />
+					</div>
+				</div>
+				<div class="form-actions">
+					<input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton3()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
+				</div>
+				</fieldset>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'url', JText::_('COM_COMPONENTBUILDER_IMPORT_FROM_URL', true)); ?>
+			<fieldset class="uploadform">
+				<legend><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_UPDATE_DATA'); ?></legend>
+				<div class="control-group">
+					<label for="import_url" class="control-label"><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_URL'); ?></label>
+					<div class="controls">
+						<input type="text" id="import_url" name="import_url" class="span5 input_box" size="70" value="http://" />
+					</div>
+				</div>
+				<div class="form-actions">
+					<input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton4()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
+				</div>
+			</fieldset>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+		<input type="hidden" name="gettype" value="upload" />
+	<?php endif; ?>
+	<input type="hidden" name="task" value="import_language_translations.import" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
+</div>

admin/views/import_language_translations/tmpl/index.html

@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>

admin/views/import_language_translations/view.html.php

@@ -0,0 +1,109 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		view.html.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import Joomla view library
+jimport('joomla.application.component.view');
+
+/**
+ * Componentbuilder Import_language_translations View
+ */
+class ComponentbuilderViewImport_language_translations 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
+			ComponentbuilderHelper::addSubmenu('import');
+		}
+
+		$paths = new stdClass;
+		$paths->first = '';
+		$state = $this->get('state');
+
+		$this->paths = &$paths;
+		$this->state = &$state;
+		// get global action permissions
+		$this->canDo = ComponentbuilderHelper::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 		= ComponentbuilderHelper::getFileHeaders($this->dataType);
+			// clear the data type
+			$session->clear('dataType');
+		}
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors'))){
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Display the template
+		parent::display($tpl);
+	}
+
+	/**
+	 * Setting the toolbar
+	 */
+	protected function addToolBar()
+	{
+		JToolBarHelper::title(JText::_('COM_COMPONENTBUILDER_IMPORT_TITLE'), 'upload');
+		JHtmlSidebar::setAction('index.php?option=com_componentbuilder&view=import_language_translations');
+
+		if ($this->canDo->get('core.admin') || $this->canDo->get('core.options'))
+		{
+			JToolBarHelper::preferences('com_componentbuilder');
+		}
+
+		// set help url for this view if found
+		$help_url = ComponentbuilderHelper::getHelpUrl('import_language_translations');
+		if (ComponentbuilderHelper::checkString($help_url))
+		{
+			   JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+		}
+	}
+}

componentbuilder.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>16th January, 2018</creationDate>
+	<creationDate>17th January, 2018</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://joomlacomponentbuilder.com</authorUrl>
 	<copyright>Copyright (C) 2015. All Rights Reserved</copyright>
 	<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
-	<version>2.6.11</version>
+	<version>2.6.12</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.6.11)</h1>
+		<h1>Component Builder (v.2.6.12)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 

componentbuilder_update_server.xml

@@ -356,4 +356,21 @@
 		<maintainerurl>http://joomlacomponentbuilder.com</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.6.12</version>
+		<infourl title="Component Builder!">http://joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">http://domain.com/demo.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://joomlacomponentbuilder.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>

script.php

@@ -3218,9 +3218,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","icon":"icon","php_after_delete":"php_after_delete","icon_category":"icon_category","icon_add":"icon_add","php_save":"php_save","php_batchmove":"php_batchmove","type":"type","description":"description","php_allowedit":"php_allowedit","add_fadein":"add_fadein","php_after_publish":"php_after_publish","source":"source","php_getitems":"php_getitems","php_import":"php_import","php_getlistquery":"php_getlistquery","php_getitem":"php_getitem","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","icon":"icon","add_php_document":"add_php_document","icon_category":"icon_category","icon_add":"icon_add","add_php_postsavehook":"add_php_postsavehook","add_custom_import":"add_custom_import","add_php_before_publish":"add_php_before_publish","type":"type","description":"description","add_php_batchcopy":"add_php_batchcopy","add_fadein":"add_fadein","add_php_before_delete":"add_php_before_delete","add_php_getitems_after_all":"add_php_getitems_after_all","php_import_headers":"php_import_headers","add_php_before_save":"add_php_before_save","add_php_getitems":"add_php_getitems","not_required":"not_required","add_php_getlistquery":"add_php_getlistquery","add_php_save":"add_php_save","add_php_allowedit":"add_php_allowedit","add_php_batchmove":"add_php_batchmove","add_php_after_publish":"add_php_after_publish","add_php_after_delete":"add_php_after_delete","add_sql":"add_sql","html_import_view":"html_import_view","php_import_save":"php_import_save","add_css_view":"add_css_view","php_getitem":"php_getitem","css_view":"css_view","php_getitems":"php_getitems","add_css_views":"add_css_views","php_getitems_after_all":"php_getitems_after_all","css_views":"css_views","php_getlistquery":"php_getlistquery","add_javascript_view_file":"add_javascript_view_file","php_before_save":"php_before_save","javascript_view_file":"javascript_view_file","php_save":"php_save","add_javascript_view_footer":"add_javascript_view_footer","php_postsavehook":"php_postsavehook","javascript_view_footer":"javascript_view_footer","php_allowedit":"php_allowedit","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","source":"source","php_controller_list":"php_controller_list","sql":"sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_import_display":"php_import_display","php_ajaxmethod":"php_ajaxmethod","php_import":"php_import","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","add_fadein","source","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_document","add_php_postsavehook","add_custom_import","add_php_before_publish","type","add_php_batchcopy","add_fadein","add_php_before_delete","add_php_getitems_after_all","add_php_before_save","add_php_getitems","not_required","add_php_getlistquery","add_php_save","add_php_allowedit","add_php_batchmove","add_php_after_publish","add_php_after_delete","add_sql","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$admin_view_Inserted = $db->insertObject('#__content_types', $admin_view);
@@ -3645,9 +3645,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","icon":"icon","php_after_delete":"php_after_delete","icon_category":"icon_category","icon_add":"icon_add","php_save":"php_save","php_batchmove":"php_batchmove","type":"type","description":"description","php_allowedit":"php_allowedit","add_fadein":"add_fadein","php_after_publish":"php_after_publish","source":"source","php_getitems":"php_getitems","php_import":"php_import","php_getlistquery":"php_getlistquery","php_getitem":"php_getitem","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","icon":"icon","add_php_document":"add_php_document","icon_category":"icon_category","icon_add":"icon_add","add_php_postsavehook":"add_php_postsavehook","add_custom_import":"add_custom_import","add_php_before_publish":"add_php_before_publish","type":"type","description":"description","add_php_batchcopy":"add_php_batchcopy","add_fadein":"add_fadein","add_php_before_delete":"add_php_before_delete","add_php_getitems_after_all":"add_php_getitems_after_all","php_import_headers":"php_import_headers","add_php_before_save":"add_php_before_save","add_php_getitems":"add_php_getitems","not_required":"not_required","add_php_getlistquery":"add_php_getlistquery","add_php_save":"add_php_save","add_php_allowedit":"add_php_allowedit","add_php_batchmove":"add_php_batchmove","add_php_after_publish":"add_php_after_publish","add_php_after_delete":"add_php_after_delete","add_sql":"add_sql","html_import_view":"html_import_view","php_import_save":"php_import_save","add_css_view":"add_css_view","php_getitem":"php_getitem","css_view":"css_view","php_getitems":"php_getitems","add_css_views":"add_css_views","php_getitems_after_all":"php_getitems_after_all","css_views":"css_views","php_getlistquery":"php_getlistquery","add_javascript_view_file":"add_javascript_view_file","php_before_save":"php_before_save","javascript_view_file":"javascript_view_file","php_save":"php_save","add_javascript_view_footer":"add_javascript_view_footer","php_postsavehook":"php_postsavehook","javascript_view_footer":"javascript_view_footer","php_allowedit":"php_allowedit","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","source":"source","php_controller_list":"php_controller_list","sql":"sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_import_display":"php_import_display","php_ajaxmethod":"php_ajaxmethod","php_import":"php_import","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","add_fadein","source","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_document","add_php_postsavehook","add_custom_import","add_php_before_publish","type","add_php_batchcopy","add_fadein","add_php_before_delete","add_php_getitems_after_all","add_php_before_save","add_php_getitems","not_required","add_php_getlistquery","add_php_save","add_php_allowedit","add_php_batchmove","add_php_after_publish","add_php_after_delete","add_sql","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if admin_view type is already in content_type DB.
 			$admin_view_id = null;
@@ -4739,7 +4739,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://joomlacomponentbuilder.com" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.6.11 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.6.12 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}
 }

site/helpers/componentbuilder.php

@@ -723,7 +723,7 @@ abstract class ComponentbuilderHelper
 			
 	public static function getImportScripts($type, $fieldName = false)
 	{
-		// if field name is pased the convert to type
+		// if field name is passed the convert to type
 		if ($fieldName)
 		{
 			$fieldNames = array(
@@ -732,7 +732,8 @@ abstract class ComponentbuilderHelper
 				'php_import_save' => 'save',
 				'html_import_view' => 'view',
 				'php_import' => 'import',
-				'php_import_ext' => 'ext'
+				'php_import_ext' => 'ext',
+				'php_import_headers' => 'headers'
 			);
 			// first check if the field name is found
 			if (isset($fieldNames[$type]))
@@ -832,6 +833,36 @@ abstract class ComponentbuilderHelper
 			$script['setdata'][] = "\t\treturn false;";
 			$script['setdata'][] = "\t}";
 		}
+		elseif ('headers' === $type)
+		{
+			$script['headers'] = array();
+			$script['headers'][] = "\t/**";
+			$script['headers'][] = "\t* Method to get header.";
+			$script['headers'][] = "\t*";
+			$script['headers'][] = "\t* @return mixed  An array of data items on success, false on failure.";
+			$script['headers'][] = "\t*/";
+			$script['headers'][] = "\tpublic function getExImPortHeaders()";
+			$script['headers'][] = "\t{";
+			$script['headers'][] = "\t\t// Get a db connection.";
+			$script['headers'][] = "\t\t\$db = JFactory::getDbo();";
+			$script['headers'][] = "\t\t// get the columns";
+			$script['headers'][] = "\t\t\$columns = \$db->getTableColumns(\"#__###-#-#-component###_###-#-#-view###\");";
+			$script['headers'][] = "\t\tif (###-#-#-Component###Helper::checkArray(\$columns))";
+			$script['headers'][] = "\t\t{";
+			$script['headers'][] = "\t\t\t// remove the headers you don't import/export.";
+			$script['headers'][] = "\t\t\tunset(\$columns['asset_id']);";
+			$script['headers'][] = "\t\t\tunset(\$columns['checked_out']);";
+			$script['headers'][] = "\t\t\tunset(\$columns['checked_out_time']);";
+			$script['headers'][] = "\t\t\t\$headers = new stdClass();";
+			$script['headers'][] = "\t\t\tforeach (\$columns as \$column => \$type)";
+			$script['headers'][] = "\t\t\t{";
+			$script['headers'][] = "\t\t\t\t\$headers->{\$column} = \$column;";
+			$script['headers'][] = "\t\t\t}";
+			$script['headers'][] = "\t\t\treturn \$headers;";
+			$script['headers'][] = "\t\t}";
+			$script['headers'][] = "\t\treturn false;";
+			$script['headers'][] = "\t}";
+		}
 		elseif ('save' === $type)
 		{
 			$script['save'] = array();