Merge remote-tracking branch 'upstream/staging' into editors_xtd

2022-02-23 13:20:10 +03:30 · 2022-02-23 13:20:10 +03:30 · a106c53b65
parent c37dfc0b21 dd3335771c
commit a106c53b65
193 changed files with 1694 additions and 848 deletions
--- a/README.md
+++ b/README.md
@ -12,7 +12,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 save 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.12.14) 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.12.15) 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)

@ -143,13 +143,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 21st December, 2021
-+ *Version*: 2.12.14
+ *Last Build*: 12th February, 2022
+ *Version*: 2.12.15
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **285607**
-+ *Field count*: **1562**
-+ *File count*: **1824**
+ *Line count*: **286261**
+ *Field count*: **1580**
+ *File count*: **1829**
 + *Folder count*: **256**

 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
--- a/admin/README.txt
+++ b/admin/README.txt
@ -12,7 +12,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 save 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.12.14) 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.12.15) 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)

@ -143,13 +143,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 21st December, 2021
-+ *Version*: 2.12.14
+ *Last Build*: 12th February, 2022
+ *Version*: 2.12.15
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **285607**
-+ *Field count*: **1562**
-+ *File count*: **1824**
+ *Line count*: **286261**
+ *Field count*: **1580**
+ *File count*: **1829**
 + *Folder count*: **256**

 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
--- a/admin/compiler/joomla_3/DASHJViewLagacy.php
+++ b/admin/compiler/joomla_3/DASHJViewLagacy.php
@ -62,10 +62,10 @@ class ###Component###View###Component### extends JViewLegacy
 		JToolBarHelper::title(JText::_('COM_###COMPONENT###_DASHBOARD'), 'grid-2');

 		// set help url for this view if found
-		$help_url = ###Component###Helper::getHelpUrl('###component###');
-		if (###Component###Helper::checkString($help_url))
+		$this->help_url = ###Component###Helper::getHelpUrl('###component###');
+		if (###Component###Helper::checkString($this->help_url))
 		{
-			JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url);
+			JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}

 		if ($canDo->get('core.admin') || $canDo->get('core.options'))
--- a/admin/compiler/joomla_3/JViewLegacy_custom_admin.php
+++ b/admin/compiler/joomla_3/JViewLegacy_custom_admin.php
@ -63,10 +63,10 @@ class ###Component###View###SView### extends JViewLegacy
 		JToolbarHelper::title($title,'###ICOMOON###');###CUSTOM_ADMIN_CUSTOM_BUTTONS###

 		// set help url for this view if found
-		$help_url = ###Component###Helper::getHelpUrl('###sviews###');
-		if (###Component###Helper::checkString($help_url))
+		$this->help_url = ###Component###Helper::getHelpUrl('###sviews###');
+		if (###Component###Helper::checkString($this->help_url))
 		{
-			JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url);
+			JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}

 		// add the options comp button
--- a/admin/compiler/joomla_3/JViewLegacy_import.php
+++ b/admin/compiler/joomla_3/JViewLegacy_import.php
@ -89,10 +89,10 @@ class ###Component###ViewImport extends JViewLegacy
 		}

 		// set help url for this view if found
-		$help_url = ###Component###Helper::getHelpUrl('import');
-		if (###Component###Helper::checkString($help_url))
+		$this->help_url = ###Component###Helper::getHelpUrl('import');
+		if (###Component###Helper::checkString($this->help_url))
 		{
-			   JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url);
+			   JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
 	}
 }
--- a/admin/compiler/joomla_3/JViewLegacy_import_custom.php
+++ b/admin/compiler/joomla_3/JViewLegacy_import_custom.php
@ -37,10 +37,10 @@ class ###Component###View###View### extends JViewLegacy
 		}

 		// set help url for this view if found
-		$help_url = ###Component###Helper::getHelpUrl('###view###');
-		if (###Component###Helper::checkString($help_url))
+		$this->help_url = ###Component###Helper::getHelpUrl('###view###');
+		if (###Component###Helper::checkString($this->help_url))
 		{
-			   JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url);
+			   JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
 	}
 }
--- a/admin/compiler/joomla_3/JViewLegacy_list.php
+++ b/admin/compiler/joomla_3/JViewLegacy_list.php
@ -129,10 +129,10 @@ class ###Component###View###Views### extends JViewLegacy
 		}###ADMIN_CUSTOM_FUNCTION_ONLY_BUTTONS_LIST######IMPORTBUTTON###

 		// set help url for this view if found
-		$help_url = ###Component###Helper::getHelpUrl('###views###');
-		if (###Component###Helper::checkString($help_url))
+		$this->help_url = ###Component###Helper::getHelpUrl('###views###');
+		if (###Component###Helper::checkString($this->help_url))
 		{
-				JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url);
+				JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}

 		// add the options comp button
--- a/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php
+++ b/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php
@ -53,10 +53,10 @@ class ###Component###View###SViews### extends JViewLegacy
 		JToolbarHelper::title(JText::_('COM_###COMPONENT###_###SVIEWS###'),'###ICOMOON###');###CUSTOM_ADMIN_CUSTOM_BUTTONS###

 		// set help url for this view if found
-		$help_url = ###Component###Helper::getHelpUrl('###sviews###');
-		if (###Component###Helper::checkString($help_url))
+		$this->help_url = ###Component###Helper::getHelpUrl('###sviews###');
+		if (###Component###Helper::checkString($this->help_url))
 		{
-			JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url);
+			JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}

 		// add the options comp button
--- a/admin/compiler/joomla_3/JViewLegacy_list_site.php
+++ b/admin/compiler/joomla_3/JViewLegacy_list_site.php
@ -49,10 +49,10 @@ class ###Component###View###SViews### extends JViewLegacy
 	{###SITE_CUSTOM_BUTTONS###
 		
 		// set help url for this view if found
-		$help_url = ###Component###Helper::getHelpUrl('###sviews###');
-		if (###Component###Helper::checkString($help_url))
+		$this->help_url = ###Component###Helper::getHelpUrl('###sviews###');
+		if (###Component###Helper::checkString($this->help_url))
 		{
-			JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url);
+			JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
 		// now initiate the toolbar
 		$this->toolbar = JToolbar::getInstance();
--- a/admin/compiler/joomla_3/JViewLegacy_site.php
+++ b/admin/compiler/joomla_3/JViewLegacy_site.php
@ -49,10 +49,10 @@ class ###Component###View###SView### extends JViewLegacy
 	{###SITE_CUSTOM_BUTTONS###

 		// set help url for this view if found
-		$help_url = ###Component###Helper::getHelpUrl('###sview###');
-		if (###Component###Helper::checkString($help_url))
+		$this->help_url = ###Component###Helper::getHelpUrl('###sview###');
+		if (###Component###Helper::checkString($this->help_url))
 		{
-			JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url);
+			JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $this->help_url);
 		}
 		// now initiate the toolbar
 		$this->toolbar = JToolbar::getInstance();
--- a/admin/custom/marked.js
+++ b/admin/custom/marked.js
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@ -4703,6 +4703,11 @@ class Get
 					                       'type'  => 'php');
 					foreach ($results as $_nr => &$result)
 					{
+						// Trigger Event: jcb_ce_onBeforeModelDynamicGetData
+						$this->triggerEvent(
+							'jcb_ce_onBeforeModelDynamicGetData',
+							array(&$this->componentContext, &$result, &$result->id, &$view_code, &$context)
+						);
 						// set GUI mapper id
 						$guiMapper['id'] = (int) $result->id;
 						// add calculations if set
@ -5213,6 +5218,11 @@ class Get
 						{
 							$result->plugin_events = '';
 						}
+						// Trigger Event: jcb_ce_onAfterModelDynamicGetData
+						$this->triggerEvent(
+							'jcb_ce_onAfterModelDynamicGetData',
+							array(&$this->componentContext, &$result, &$result->id, &$view_code, &$context)
+						);
 					}

 					return $results;
@ -9379,6 +9389,8 @@ class Get
 				$module->form_files      = array();
 				$module->fieldsets_label = array();
 				$module->fieldsets_paths = array();
+				$module->add_rule_path = array();
+				$module->add_field_path = array();
 				// set global fields rule to default component path
 				$module->fields_rules_paths = 1;
 				// set the fields data
@ -9453,6 +9465,30 @@ class Get
 							// set where to path is pointing
 							$module->fieldsets_paths[$unique]
 								= $form['fields_rules_paths'];
+							// check for extra rule paths
+							if (isset($form['addrulepath'])
+								&& ComponentbuilderHelper::checkArray($form['addrulepath']))
+							{
+								foreach ($form['addrulepath'] as $add_rule_path)
+								{
+									if (ComponentbuilderHelper::checkString($add_rule_path['path']))
+									{
+										$module->add_rule_path[$unique] = $add_rule_path['path'];
+									}
+								}
+							}
+							// check for extra field paths
+							if (isset($form['addfieldpath'])
+								&& ComponentbuilderHelper::checkArray($form['addfieldpath']))
+							{
+								foreach ($form['addfieldpath'] as $add_field_path)
+								{
+									if (ComponentbuilderHelper::checkString($add_field_path['path']))
+									{
+										$module->add_field_path[$unique] = $add_field_path['path'];
+									}
+								}
+							}
 							// add the label if set to lang
 							if (isset($form['label'])
 								&& ComponentbuilderHelper::checkString(
@ -10287,6 +10323,8 @@ class Get
 				$plugin->form_files      = array();
 				$plugin->fieldsets_label = array();
 				$plugin->fieldsets_paths = array();
+				$plugin->add_rule_path = array();
+				$plugin->add_field_path = array();
 				// set global fields rule to default component path
 				$plugin->fields_rules_paths = 1;
 				// set the fields data
@ -10370,6 +10408,30 @@ class Get
 								$plugin->fieldsets_label[$unique]
 									= $this->setLang($form['label']);
 							}
+							// check for extra rule paths
+							if (isset($form['addrulepath'])
+								&& ComponentbuilderHelper::checkArray($form['addrulepath']))
+							{
+								foreach ($form['addrulepath'] as $add_rule_path)
+								{
+									if (ComponentbuilderHelper::checkString($add_rule_path['path']))
+									{
+										$plugin->add_rule_path[$unique] = $add_rule_path['path'];
+									}
+								}
+							}
+							// check for extra field paths
+							if (isset($form['addfieldpath'])
+								&& ComponentbuilderHelper::checkArray($form['addfieldpath']))
+							{
+								foreach ($form['addfieldpath'] as $add_field_path)
+								{
+									if (ComponentbuilderHelper::checkString($add_field_path['path']))
+									{
+										$plugin->add_field_path[$unique] = $add_field_path['path'];
+									}
+								}
+							}
 							// build the fields
 							$form['fields'] = array_map(
 								function ($field) use ($key, $unique) {
--- a/admin/helpers/compiler/b_Structure.php
+++ b/admin/helpers/compiler/b_Structure.php
@ -946,44 +946,78 @@ class Structure extends Get
 								{
 									// default to the field set name
 									$label = $fieldset;
-									if (isset(
-										$module->fieldsets_label[$file
-										. $field_name . $fieldset]
-									))
+									if (isset($module->fieldsets_label[$file . $field_name . $fieldset]))
 									{
-										$label = $module->fieldsets_label[$file
-										. $field_name . $fieldset];
+										$label = $module->fieldsets_label[$file . $field_name . $fieldset];
 									}
 									// add path to module rules and custom fields
-									if (isset(
-											$module->fieldsets_paths[$file
-											. $field_name . $fieldset]
-										)
-										&& $module->fieldsets_paths[$file
-										. $field_name . $fieldset] == 2)
+									if (isset($module->fieldsets_paths[$file . $field_name . $fieldset])
+										&& ($module->fieldsets_paths[$file . $field_name . $fieldset] == 2
+											|| $module->fieldsets_paths[$file . $field_name . $fieldset] == 3))
 									{
+										if ($module->target == 2)
+										{
+											if (!isset($module->add_rule_path[$file . $field_name . $fieldset]))
+											{
+												$module->add_rule_path[$file . $field_name . $fieldset] =
+													'/administrator/modules/'
+													. $module->file_name . '/rules';
+											}
+
+											if (!isset($module->add_field_path[$file . $field_name . $fieldset]))
+											{
+												$module->add_field_path[$file . $field_name . $fieldset] =
+													'/administrator/modules/'
+													. $module->file_name . '/fields';
+											}
+										}
+										else
+										{
+											if (!isset($module->add_rule_path[$file . $field_name . $fieldset]))
+											{
+												$module->add_rule_path[$file . $field_name . $fieldset] =
+													'/modules/' . $module->file_name
+													. '/rules';
+											}
+
+											if (!isset($module->add_field_path[$file . $field_name . $fieldset]))
+											{
+												$module->add_field_path[$file . $field_name . $fieldset] =
+													'/modules/' . $module->file_name
+													. '/fields';
+											}
+										}
+									}
+									// add path to module rules and custom fields
+									if (isset($module->add_rule_path[$file . $field_name . $fieldset])
+										|| isset($module->add_field_path[$file . $field_name . $fieldset]))
+									{
+
 										$xml .= PHP_EOL . $this->_t(1) . '<!--'
-											. $this->setLine(__LINE__)
-											. ' default paths of ' . $fieldset
-											. ' fieldset points to the module -->';
-										$xml .= PHP_EOL . $this->_t(1)
-											. '<fieldset name="' . $fieldset
-											. '" label="' . $label . '"';
-										$xml .= PHP_EOL . $this->_t(2)
-											. 'addrulepath="/modules/'
-											. strtolower($module->code_name)
-											. '/rules"';
-										$xml .= PHP_EOL . $this->_t(2)
-											. 'addfieldpath="/modules/'
-											. strtolower($module->code_name)
-											. '/fields"';
+											. $this->setLine(__LINE__) . ' default paths of '
+											. $fieldset . ' fieldset points to the module -->';
+
+										$xml .= PHP_EOL . $this->_t(1) . '<fieldset name="'
+											. $fieldset . '" label="' . $label . '"';
+
+										if (isset($module->add_rule_path[$file . $field_name . $fieldset]))
+										{
+											$xml .= PHP_EOL . $this->_t(2)
+												. 'addrulepath="' . $module->add_rule_path[$file . $field_name . $fieldset] . '"';
+										}
+
+										if (isset($module->add_field_path[$file . $field_name . $fieldset]))
+										{
+											$xml .= PHP_EOL . $this->_t(2)
+												. 'addfieldpath="' . $module->add_field_path[$file . $field_name . $fieldset] . '"';
+										}
+
 										$xml .= PHP_EOL . $this->_t(1) . '>';
 									}
 									else
 									{
-										$xml .= PHP_EOL . $this->_t(1)
-											. '<fieldset name="' . $fieldset
-											. '" label="' . $label . '">';
+										$xml .= PHP_EOL . $this->_t(1) . '<fieldset name="'
+											. $fieldset . '" label="' . $label . '">';
 									}
 									// check if we have an inner field set
 									if (ComponentbuilderHelper::checkString(
@ -1321,46 +1355,60 @@ class Structure extends Get
 								{
 									// default to the field set name
 									$label = $fieldset;
-									if (isset(
-										$plugin->fieldsets_label[$file
-										. $field_name . $fieldset]
-									))
+									if (isset($plugin->fieldsets_label[$file . $field_name . $fieldset]))
 									{
-										$label = $plugin->fieldsets_label[$file
-										. $field_name . $fieldset];
+										$label = $plugin->fieldsets_label[$file . $field_name . $fieldset];
 									}
 									// add path to plugin rules and custom fields
-									if (isset(
-											$plugin->fieldsets_paths[$file
-											. $field_name . $fieldset]
-										)
-										&& $plugin->fieldsets_paths[$file
-										. $field_name . $fieldset] == 2)
+									if (isset($plugin->fieldsets_paths[$file . $field_name . $fieldset])
+										&& ($plugin->fieldsets_paths[$file . $field_name . $fieldset] == 2
+											|| $plugin->fieldsets_paths[$file . $field_name . $fieldset] == 3))
+									{
+										if (!isset($plugin->add_rule_path[$file . $field_name . $fieldset]))
+										{
+											$plugin->add_rule_path[$file . $field_name . $fieldset] =
+												'/plugins/' . strtolower($plugin->group
+												) . '/' . strtolower($plugin->code_name)
+												. '/rules';
+										}
+
+										if (!isset($plugin->add_field_path[$file . $field_name . $fieldset]))
+										{
+											$plugin->add_field_path[$file . $field_name . $fieldset] =
+												'/plugins/' . strtolower($plugin->group
+												) . '/' . strtolower($plugin->code_name)
+												. '/fields';
+										}
+									}
+									// add path to plugin rules and custom fields
+									if (isset($plugin->add_rule_path[$file . $field_name . $fieldset])
+										|| isset($plugin->add_field_path[$file . $field_name . $fieldset]))
 									{
 										$xml .= PHP_EOL . $this->_t(1) . '<!--'
-											. $this->setLine(__LINE__)
-											. ' default paths of ' . $fieldset
-											. ' fieldset points to the plugin -->';
-										$xml .= PHP_EOL . $this->_t(1)
-											. '<fieldset name="' . $fieldset
-											. '" label="' . $label . '"';
-										$xml .= PHP_EOL . $this->_t(2)
-											. 'addrulepath="/plugins/'
-											. strtolower($plugin->group) . '/'
-											. strtolower($plugin->code_name)
-											. '/rules"';
-										$xml .= PHP_EOL . $this->_t(2)
-											. 'addfieldpath="/plugins/'
-											. strtolower($plugin->group) . '/'
-											. strtolower($plugin->code_name)
-											. '/fields"';
+											. $this->setLine(__LINE__) . ' default paths of '
+											. $fieldset . ' fieldset points to the plugin -->';
+
+										$xml .= PHP_EOL . $this->_t(1) . '<fieldset name="'
+											. $fieldset . '" label="' . $label . '"';
+
+										if (isset($plugin->add_rule_path[$file . $field_name . $fieldset]))
+										{
+											$xml .= PHP_EOL . $this->_t(2)
+												. 'addrulepath="' . $plugin->add_rule_path[$file . $field_name . $fieldset] . '"';
+										}
+
+										if (isset($plugin->add_field_path[$file . $field_name . $fieldset]))
+										{
+											$xml .= PHP_EOL . $this->_t(2)
+												. 'addfieldpath="' . $plugin->add_field_path[$file . $field_name . $fieldset] . '"';
+										}
+
 										$xml .= PHP_EOL . $this->_t(1) . '>';
 									}
 									else
 									{
-										$xml .= PHP_EOL . $this->_t(1)
-											. '<fieldset name="' . $fieldset
-											. '" label="' . $label . '">';
+										$xml .= PHP_EOL . $this->_t(1) . '<fieldset name="'
+											. $fieldset . '" label="' . $label . '">';
 									}
 									// check if we have an inner field set
 									if (ComponentbuilderHelper::checkString(
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@ -3771,17 +3771,8 @@ class Interpretation extends Fields
 			{
 				$getItem .= $this->setCustomViewGroup($get->group, $code, $tab);
 			}
-			// get ready to get query
-			$getItem .= PHP_EOL . PHP_EOL . $tab . $this->_t(2) . "//"
-				. $this->setLine(__LINE__)
-				. " Reset the query using our newly populated query object.";
-			$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1)
-				. "\$db->setQuery(\$query);";
-			$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//"
-				. $this->setLine(__LINE__)
-				. " Load the results as a stdClass object.";
-			$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1)
-				. "\$data = \$db->loadObject();";
+			// db set query data placeholder
+			$getItem .= $this->hhh . "DB_SET_QUERY_DATA" . $this->hhh;
 			// set after item php
 			if (isset($get->add_php_after_getitem)
 				&& $get->add_php_after_getitem == 1
@ -3792,6 +3783,36 @@ class Interpretation extends Fields
 					$get->php_after_getitem, $this->placeholders
 				);
 			}
+			// check the getItem string to see if we should still add set query to data
+			if (strpos($getItem, '$data =') === false)
+			{
+				// get ready to get query
+				$setQuery[$this->hhh . "DB_SET_QUERY_DATA" . $this->hhh] =
+					PHP_EOL . PHP_EOL . $tab . $this->_t(2) . "//"
+					. $this->setLine(__LINE__)
+					. " Reset the query using our newly populated query object.";
+				$setQuery[$this->hhh . "DB_SET_QUERY_DATA" . $this->hhh] .=
+					PHP_EOL . $this->_t(1) . $tab . $this->_t(1)
+					. "\$db->setQuery(\$query);";
+				$setQuery[$this->hhh . "DB_SET_QUERY_DATA" . $this->hhh] .=
+					PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//"
+					. $this->setLine(__LINE__)
+					. " Load the results as a stdClass object.";
+				$setQuery[$this->hhh . "DB_SET_QUERY_DATA" . $this->hhh] .=
+					PHP_EOL . $this->_t(1) . $tab . $this->_t(1)
+					. "\$data = \$db->loadObject();";
+				// add the db set query to data
+			}
+			else
+			{
+				// remove our placeholder
+				$setQuery[$this->hhh . "DB_SET_QUERY_DATA" . $this->hhh] = '';
+			}
+			// add the db set query to data
+			$getItem = str_replace(
+				array_keys($setQuery),
+				array_values($setQuery), $getItem
+			);
 			$getItem .= PHP_EOL . PHP_EOL . $tab . $this->_t(2)
 				. "if (empty(\$data))";
 			$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "{";
@ -3849,7 +3870,7 @@ class Interpretation extends Fields
 					. "return false;";
 			}
 			$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "}";
-			// dispatcher placholder
+			// dispatcher placeholder
 			$getItem .= $this->hhh . "DISPATCHER" . $this->hhh;
 			if (ComponentbuilderHelper::checkArray($get->main_get))
 			{
@ -10334,7 +10355,7 @@ class Interpretation extends Fields
 			$db = '';
 			foreach ($this->queryBuilder as $view => $fields)
 			{
-				// build the uninstall array
+				// build the uninstallation array
 				$this->uninstallBuilder[] = "DROP TABLE IF EXISTS `#__"
 					. $component . "_" . $view . "`;";

@ -10426,10 +10447,17 @@ class Interpretation extends Fields
 						)
 						&& in_array($data['ID'], $this->addSQL['field'][$view]))
 					{
+						// to soon....
+						//$this->updateSQLBuilder["ALTERTABLE`#__" . $component
+						//. "_" . $view . "`ADDCOLUMNIFNOTEXISTS`" . $field . "`"]
+						//	= "ALTER TABLE `#__" . $component . "_" . $view
+						//	. "` ADD COLUMN IF NOT EXISTS `" . $field . "` " . $data['type']
+						//	. $lenght . " " . $default . " AFTER `" . $last_name
+						//	. "`;";
 						$this->updateSQLBuilder["ALTERTABLE`#__" . $component
-						. "_" . $view . "`ADDCOLUMNIFNOTEXISTS`" . $field . "`"]
+						. "_" . $view . "`ADD`" . $field . "`"]
 							= "ALTER TABLE `#__" . $component . "_" . $view
-							. "` ADD COLUMN IF NOT EXISTS `" . $field . "` " . $data['type']
+							. "` ADD `" . $field . "` " . $data['type']
 							. $lenght . " " . $default . " AFTER `" . $last_name
 							. "`;";
 					}
@ -10480,55 +10508,55 @@ class Interpretation extends Fields
 				{
 					$db_ .= PHP_EOL . $this->_t(1) . "`params` text NULL,";
 				}
-				// check if default field was over written
+				// check if default field was overwritten
 				if (!isset($this->fieldsNames[$view]['published']))
 				{
 					$db_ .= PHP_EOL . $this->_t(1)
 						. "`published` TINYINT(3) NOT NULL DEFAULT 1,";
 				}
-				// check if default field was over written
+				// check if default field was overwritten
 				if (!isset($this->fieldsNames[$view]['created_by']))
 				{
 					$db_ .= PHP_EOL . $this->_t(1)
 						. "`created_by` INT(10) unsigned NOT NULL DEFAULT 0,";
 				}
-				// check if default field was over written
+				// check if default field was overwritten
 				if (!isset($this->fieldsNames[$view]['modified_by']))
 				{
 					$db_ .= PHP_EOL . $this->_t(1)
 						. "`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,";
 				}
-				// check if default field was over written
+				// check if default field was overwritten
 				if (!isset($this->fieldsNames[$view]['created']))
 				{
 					$db_ .= PHP_EOL . $this->_t(1)
 						. "`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
 				}
-				// check if default field was over written
+				// check if default field was overwritten
 				if (!isset($this->fieldsNames[$view]['modified']))
 				{
 					$db_ .= PHP_EOL . $this->_t(1)
 						. "`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
 				}
-				// check if default field was over written
+				// check if default field was overwritten
 				if (!isset($this->fieldsNames[$view]['checked_out']))
 				{
 					$db_ .= PHP_EOL . $this->_t(1)
 						. "`checked_out` int(11) unsigned NOT NULL DEFAULT 0,";
 				}
-				// check if default field was over written
+				// check if default field was overwritten
 				if (!isset($this->fieldsNames[$view]['checked_out_time']))
 				{
 					$db_ .= PHP_EOL . $this->_t(1)
 						. "`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
 				}
-				// check if default field was over written
+				// check if default field was overwritten
 				if (!isset($this->fieldsNames[$view]['version']))
 				{
 					$db_ .= PHP_EOL . $this->_t(1)
 						. "`version` INT(10) unsigned NOT NULL DEFAULT 1,";
 				}
-				// check if default field was over written
+				// check if default field was overwritten
 				if (!isset($this->fieldsNames[$view]['hits']))
 				{
 					$db_ .= PHP_EOL . $this->_t(1)
@ -21487,16 +21515,16 @@ class Interpretation extends Fields
 			$toolBar .= PHP_EOL . $this->_t(2) . "JToolbarHelper::divider();";
 			$toolBar .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
 				. " set help url for this view if found";
-			$toolBar .= PHP_EOL . $this->_t(2) . "\$help_url = "
+			$toolBar .= PHP_EOL . $this->_t(2) . "\$this->help_url = "
 				. $this->fileContentStatic[$this->hhh . 'Component'
 				. $this->hhh] . "Helper::getHelpUrl('" . $nameSingleCode
 				. "');";
 			$toolBar .= PHP_EOL . $this->_t(2) . "if ("
 				. $this->fileContentStatic[$this->hhh . 'Component'
-				. $this->hhh] . "Helper::checkString(\$help_url))";
+				. $this->hhh] . "Helper::checkString(\$this->help_url))";
 			$toolBar .= PHP_EOL . $this->_t(2) . "{";
 			$toolBar .= PHP_EOL . $this->_t(3) . "JToolbarHelper::help('"
-				. $this->langPrefix . "_HELP_MANAGER', false, \$help_url);";
+				. $this->langPrefix . "_HELP_MANAGER', false, \$this->help_url);";
 			$toolBar .= PHP_EOL . $this->_t(2) . "}";
 		}

@ -21748,7 +21776,7 @@ class Interpretation extends Fields
 	public function setCheckinCall()
 	{
 		$call = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
-			. " check in items";
+			. " Check in items";
 		$call .= PHP_EOL . $this->_t(2) . "\$this->checkInNow();" . PHP_EOL;

 		return $call;
@ -21777,22 +21805,28 @@ class Interpretation extends Fields
 			) . " Get a db connection.";
 		$checkin .= PHP_EOL . $this->_t(3) . "\$db = JFactory::getDbo();";
 		$checkin .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__)
-			. " reset query";
+			. " Reset query.";
 		$checkin .= PHP_EOL . $this->_t(3) . "\$query = \$db->getQuery(true);";
 		$checkin .= PHP_EOL . $this->_t(3) . "\$query->select('*');";
 		$checkin .= PHP_EOL . $this->_t(3)
 			. "\$query->from(\$db->quoteName('#__" . $component . "_" . $view
 			. "'));";
-		$checkin .= PHP_EOL . $this->_t(3) . "\$db->setQuery(\$query);";
+		$checkin .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__)
+			. " Only select items that are checked out.";
+		$checkin .= PHP_EOL . $this->_t(3)
+			. "\$query->where(\$db->quoteName('checked_out') . '!=0');";
+		$this->_t(3) . "//" . $this->setLine(__LINE__)
+		. " Query only to see if we have a rows";
+		$checkin .= PHP_EOL . $this->_t(3) . "\$db->setQuery(\$query, 0, 1);";
 		$checkin .= PHP_EOL . $this->_t(3) . "\$db->execute();";
 		$checkin .= PHP_EOL . $this->_t(3) . "if (\$db->getNumRows())";
 		$checkin .= PHP_EOL . $this->_t(3) . "{";
 		$checkin .= PHP_EOL . $this->_t(4) . "//" . $this->setLine(__LINE__)
-			. " Get Yesterdays date";
+			. " Get Yesterdays date.";
 		$checkin .= PHP_EOL . $this->_t(4)
 			. "\$date = JFactory::getDate()->modify(\$time)->toSql();";
 		$checkin .= PHP_EOL . $this->_t(4) . "//" . $this->setLine(__LINE__)
-			. " reset query";
+			. " Reset query.";
 		$checkin .= PHP_EOL . $this->_t(4) . "\$query = \$db->getQuery(true);";
 		$checkin .= PHP_EOL . PHP_EOL . $this->_t(4) . "//" . $this->setLine(
 				__LINE__
@ -21814,7 +21848,7 @@ class Interpretation extends Fields
 		$checkin .= PHP_EOL . $this->_t(4) . ");";
 		$checkin .= PHP_EOL . PHP_EOL . $this->_t(4) . "//" . $this->setLine(
 				__LINE__
-			) . " Check table";
+			) . " Check table.";
 		$checkin .= PHP_EOL . $this->_t(4)
 			. "\$query->update(\$db->quoteName('#__" . $component . "_" . $view
 			. "'))->set(\$fields)->where(\$conditions); ";
@ -28597,43 +28631,72 @@ function vdm_dkim() {
 				{
 					// default to the field set name
 					$label = $fieldset;
-					if (isset(
-						$module->fieldsets_label[$field_name . $fieldset]
-					))
+					if (isset($module->fieldsets_label[$field_name . $fieldset]))
 					{
-						$label = $module->fieldsets_label[$field_name
-						. $fieldset];
+						$label = $module->fieldsets_label[$field_name . $fieldset];
 					}
 					// add path to module rules and custom fields
 					if (isset($module->fieldsets_paths[$field_name . $fieldset])
-						&& $module->fieldsets_paths[$field_name . $fieldset]
-						== 2)
+						&& ($module->fieldsets_paths[$field_name . $fieldset] == 2
+							|| $module->fieldsets_paths[$field_name . $fieldset] == 3))
 					{
-						$xml .= PHP_EOL . $this->_t(1) . '<!--'
-							. $this->setLine(__LINE__) . ' default paths of '
-							. $fieldset . ' fieldset points to the module -->';
-						$xml .= PHP_EOL . $this->_t(1) . '<fieldset name="'
-							. $fieldset . '" label="' . $label . '"';
 						if ($module->target == 2)
 						{
-							$xml .= PHP_EOL . $this->_t(2)
-								. 'addrulepath="/administrator/modules/'
-								. $module->file_name
-								. '/rules"';
-							$xml .= PHP_EOL . $this->_t(2)
-								. 'addfieldpath="/administrator/modules/'
-								. $module->file_name
-								. '/fields"';
+							if (!isset($module->add_rule_path[$field_name . $fieldset]))
+							{
+								$module->add_rule_path[$field_name . $fieldset] =
+									'/administrator/modules/'
+									. $module->file_name . '/rules';
+							}
+
+							if (!isset($module->add_field_path[$field_name . $fieldset]))
+							{
+								$module->add_field_path[$field_name . $fieldset] =
+									'/administrator/modules/'
+									. $module->file_name . '/fields';
+							}
 						}
 						else
 						{
-							$xml .= PHP_EOL . $this->_t(2)
-								. 'addrulepath="/modules/' . $module->file_name
-								. '/rules"';
-							$xml .= PHP_EOL . $this->_t(2)
-								. 'addfieldpath="/modules/' . $module->file_name
-								. '/fields"';
+							if (!isset($module->add_rule_path[$field_name . $fieldset]))
+							{
+								$module->add_rule_path[$field_name . $fieldset] =
+									'/modules/' . $module->file_name
+									. '/rules';
+							}
+
+							if (!isset($module->add_field_path[$field_name . $fieldset]))
+							{
+								$module->add_field_path[$field_name . $fieldset] =
+									'/modules/' . $module->file_name
+									. '/fields';
+							}
 						}
+					}
+					// add path to module rules and custom fields
+					if (isset($module->add_rule_path[$field_name . $fieldset])
+						|| isset($module->add_field_path[$field_name . $fieldset]))
+					{
+
+						$xml .= PHP_EOL . $this->_t(1) . '<!--'
+							. $this->setLine(__LINE__) . ' default paths of '
+							. $fieldset . ' fieldset points to the module -->';
+
+						$xml .= PHP_EOL . $this->_t(1) . '<fieldset name="'
+							. $fieldset . '" label="' . $label . '"';
+
+						if (isset($module->add_rule_path[$field_name . $fieldset]))
+						{
+							$xml .= PHP_EOL . $this->_t(2)
+								. 'addrulepath="' . $module->add_rule_path[$field_name . $fieldset] . '"';
+						}
+
+						if (isset($module->add_field_path[$field_name . $fieldset]))
+						{
+							$xml .= PHP_EOL . $this->_t(2)
+								. 'addfieldpath="' . $module->add_field_path[$field_name . $fieldset] . '"';
+						}
+
 						$xml .= PHP_EOL . $this->_t(1) . '>';
 					}
 					else
@ -28974,33 +29037,54 @@ function vdm_dkim() {
 				{
 					// default to the field set name
 					$label = $fieldset;
-					if (isset(
-						$plugin->fieldsets_label[$field_name . $fieldset]
-					))
+					if (isset($plugin->fieldsets_label[$field_name . $fieldset]))
 					{
-						$label = $plugin->fieldsets_label[$field_name
-						. $fieldset];
+						$label = $plugin->fieldsets_label[$field_name . $fieldset];
 					}
 					// add path to plugin rules and custom fields
 					if (isset($plugin->fieldsets_paths[$field_name . $fieldset])
-						&& $plugin->fieldsets_paths[$field_name . $fieldset]
-						== 2)
+						&& ($plugin->fieldsets_paths[$field_name . $fieldset] == 2
+							|| $plugin->fieldsets_paths[$field_name . $fieldset] == 3))
+					{
+						if (!isset($plugin->add_rule_path[$field_name . $fieldset]))
+						{
+							$plugin->add_rule_path[$field_name . $fieldset] =
+								'/plugins/' . strtolower($plugin->group
+								) . '/' . strtolower($plugin->code_name)
+								. '/rules';
+						}
+
+						if (!isset($plugin->add_field_path[$field_name . $fieldset]))
+						{
+							$plugin->add_field_path[$field_name . $fieldset] =
+								'/plugins/' . strtolower($plugin->group
+								) . '/' . strtolower($plugin->code_name)
+								. '/fields';
+						}
+					}
+					// add path to plugin rules and custom fields
+					if (isset($plugin->add_rule_path[$field_name . $fieldset])
+						|| isset($plugin->add_field_path[$field_name . $fieldset]))
 					{
 						$xml .= PHP_EOL . $this->_t(1) . '<!--'
 							. $this->setLine(__LINE__) . ' default paths of '
 							. $fieldset . ' fieldset points to the plugin -->';
+
 						$xml .= PHP_EOL . $this->_t(1) . '<fieldset name="'
 							. $fieldset . '" label="' . $label . '"';
-						$xml .= PHP_EOL . $this->_t(2)
-							. 'addrulepath="/plugins/' . strtolower(
-								$plugin->group
-							) . '/' . strtolower($plugin->code_name)
-							. '/rules"';
-						$xml .= PHP_EOL . $this->_t(2)
-							. 'addfieldpath="/plugins/' . strtolower(
-								$plugin->group
-							) . '/' . strtolower($plugin->code_name)
-							. '/fields"';
+
+						if (isset($plugin->add_rule_path[$field_name . $fieldset]))
+						{
+							$xml .= PHP_EOL . $this->_t(2)
+								. 'addrulepath="' . $plugin->add_rule_path[$field_name . $fieldset] . '"';
+						}
+
+						if (isset($plugin->add_field_path[$field_name . $fieldset]))
+						{
+							$xml .= PHP_EOL . $this->_t(2)
+								. 'addfieldpath="' . $plugin->add_field_path[$field_name . $fieldset] . '"';
+						}
+
 						$xml .= PHP_EOL . $this->_t(1) . '>';
 					}
 					else
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@ -2061,7 +2061,7 @@ abstract class ComponentbuilderHelper
 					'hash' => '84478dfa0cd880395815e0ee026812a4',
 					'html' => '<a href="https://vdm.bz/jcb-sponsor-vdm" target="_blank" title="VDM a JCB sponsor | Because community matters..."><img class="jcb-sponsor-banner" alt="VDM a JCB sponsor | Because community matters..." src="[[[ROOT-URL]]]administrator/components/com_componentbuilder/assets/images/banner/vdm_jcb_sponsor_728_90.gif" width="728" height="90" border="0" /></a>'),
 				array(
-					'url' => 'https://allmycms.com/images/banners/agerix/agerix-loves-jcb-728-90.gif',
+					'url' => 'https://cms-experts.org/images/banners/agerix/agerix-loves-jcb-728-90.gif',
 					'hash' => 'b24c0726aa809cdcc04bcffe7e1e1529',
 					'html' => '<a href="https://vdm.bz/jcb-sponsor-agerix" target="_blank" title="Agerix a JCB sponsor | Because community matters..."><img class="jcb-sponsor-banner" alt="Agerix a JCB sponsor | Because community matters..." src="[[[ROOT-URL]]]administrator/components/com_componentbuilder/assets/images/banner/agerix-loves-jcb-728-90.gif" width="728" height="90" border="0" /></a>')
 			),
@ -2823,8 +2823,8 @@ abstract class ComponentbuilderHelper
 		// delete an existing zip file (or use an exclusion parameter in Folder::files()
 		File::delete($filepath);

-		// get a list of files in the current directory tree
-		$files = Folder::files('.', '', true, true);
+		// get a list of files in the current directory tree (also the hidden files)
+		$files = Folder::files('.', '', true, true, array('.svn', 'CVS', '.DS_Store', '__MACOSX'), array('.*~'));
 		$zipArray = array();
 		// setup the zip array
 		foreach ($files as $file)
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@ -2813,6 +2813,8 @@ COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_YOUTUBE="Youtube"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ZOOM_IN="Zoom In"
 COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ZOOM_OUT="Zoom Out"
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD="Component Dashboard"
+COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_CLONE="Clone"
+COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_CLONE_ME_LABEL="Clone"
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_CREATED_BY_DESC="The user that created this Component Dashboard."
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_CREATED_DATE_DESC="The date this Component Dashboard was created."
@ -2843,6 +2845,8 @@ COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NAME_HINT="Name Here"
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NAME_LABEL="Name"
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NAME_MESSAGE="Error! Please add name here."
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NEW="A New Component Dashboard"
+COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NOTE_HOW_TO_CLONE_DESCRIPTION="There has often been the case that we have two or more components_dashboard that should be exactly the same. Just selecting that component_dashboard and clicking save, will overwrite this component_dashboard with that selected component_dashboard data."
+COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NOTE_HOW_TO_CLONE_LABEL="How to clone another component_dashboard's values into this one."
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NOTE_PHP_DASHBOARD_NOTE_DESCRIPTION="Adding custom PHP method to the dashboard model<br />use the <b>public function getMethodName()</b> to insure the data is set to the view,<br />Note the convention <b>public function get...()</b> replace the ... with the unique method name."
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PERMISSION="Permissions"
@ -2865,6 +2869,8 @@ COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFOLDERS_DESCRIPTION="Add custom
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFOLDERS_LABEL="Folder (custom folder)"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADVANCE="Advance"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_BASIC="Basic"
+COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_CLONE="Clone"
+COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_CLONE_ME_LABEL="Clone"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_CREATED_BY_DESC="The user that created this Component Files & Folders."
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_CREATED_DATE_DESC="The date this Component Files & Folders was created."
@ -2938,6 +2944,8 @@ If you are in the installation application:<br />
 JPATH_BASE == JPATH_INSTALLATION.<br />
 JPATH_ROOT is the root path for the Joomla install and does not depend upon any application.</p>"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_CONSTANT_PATHS_LABEL="Constant Paths"
+COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_HOW_TO_CLONE_DESCRIPTION="There has often been the case that we have two or more components_files_folders that should be exactly the same. Just selecting that component_files_folders and clicking save, will overwrite this component_files_folders with that selected component_files_folders data."
+COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_HOW_TO_CLONE_LABEL="How to clone another component_files_folders's values into this one."
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION="Should file be updated."
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL="Update"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ORDERING_LABEL="Ordering"
@ -2956,6 +2964,8 @@ COM_COMPONENTBUILDER_COMPONENT_GLOBAL_SETTINGS="Component Global Settings"
 COM_COMPONENTBUILDER_COMPONENT_MODULES="Component Modules"
 COM_COMPONENTBUILDER_COMPONENT_MODULES_ADDJOOMLA_MODULES_DESCRIPTION="Setup the Joomla modules for this component."
 COM_COMPONENTBUILDER_COMPONENT_MODULES_ADDJOOMLA_MODULES_LABEL="Joomla Modules"
+COM_COMPONENTBUILDER_COMPONENT_MODULES_CLONE="Clone"
+COM_COMPONENTBUILDER_COMPONENT_MODULES_CLONE_ME_LABEL="Clone"
 COM_COMPONENTBUILDER_COMPONENT_MODULES_COMPILE_AMP_EXPORT="Compile &amp; Export"
 COM_COMPONENTBUILDER_COMPONENT_MODULES_COMPILE_ONLY="Compile (only)"
 COM_COMPONENTBUILDER_COMPONENT_MODULES_CREATED_BY_DESC="The user that created this Component Modules."
@ -2976,6 +2986,8 @@ COM_COMPONENTBUILDER_COMPONENT_MODULES_MODULE="Module"
 COM_COMPONENTBUILDER_COMPONENT_MODULES_MODULES="Modules"
 COM_COMPONENTBUILDER_COMPONENT_MODULES_MODULE_LABEL="Modules"
 COM_COMPONENTBUILDER_COMPONENT_MODULES_NEW="A New Component Modules"
+COM_COMPONENTBUILDER_COMPONENT_MODULES_NOTE_HOW_TO_CLONE_DESCRIPTION="There has often been the case that we have two or more components_modules that should be exactly the same. Just selecting that component_modules and clicking save, will overwrite this component_modules with that selected component_modules data."
+COM_COMPONENTBUILDER_COMPONENT_MODULES_NOTE_HOW_TO_CLONE_LABEL="How to clone another component_modules's values into this one."
 COM_COMPONENTBUILDER_COMPONENT_MODULES_NOTE_ON_JOOMLA_MODULES_DESCRIPTION="Do not add the same Joomla modules twice it will not work."
 COM_COMPONENTBUILDER_COMPONENT_MODULES_NOTE_ON_JOOMLA_MODULES_LABEL="Setting Joomla Modules"
 COM_COMPONENTBUILDER_COMPONENT_MODULES_ORDERING_LABEL="Ordering"
@ -3034,6 +3046,8 @@ COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_YES_INCLUDE_BASED_ON_OPTIONS="Yes in
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS="Component Placeholders"
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_ADDPLACEHOLDERS_DESCRIPTION="Set dnamic placeholders for this component."
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_ADDPLACEHOLDERS_LABEL="Placeholders"
+COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_CLONE="Clone"
+COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_CLONE_ME_LABEL="Clone"
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_CREATED_BY_DESC="The user that created this Component Placeholders."
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_CREATED_DATE_DESC="The date this Component Placeholders was created."
@ -3049,6 +3063,8 @@ COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_MODIFIED_DATE_DESC="The date this Component Placeholders was modified."
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_NEW="A New Component Placeholders"
+COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_NOTE_HOW_TO_CLONE_DESCRIPTION="There has often been the case that we have two or more components_placeholders that should be exactly the same. Just selecting that component_placeholders and clicking save, will overwrite this component_placeholders with that selected component_placeholders data."
+COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_NOTE_HOW_TO_CLONE_LABEL="How to clone another component_placeholders's values into this one."
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_PUBLISHING="Publishing"
@ -3067,6 +3083,8 @@ COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_VERSION_LABEL="Version"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS="Component Plugins"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_ADDJOOMLA_PLUGINS_DESCRIPTION="Setup the Joomla plugins for this component."
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_ADDJOOMLA_PLUGINS_LABEL="Joomla Plugins"
+COM_COMPONENTBUILDER_COMPONENT_PLUGINS_CLONE="Clone"
+COM_COMPONENTBUILDER_COMPONENT_PLUGINS_CLONE_ME_LABEL="Clone"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_COMPILE_AMP_EXPORT="Compile &amp; Export"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_COMPILE_ONLY="Compile (only)"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_CREATED_BY_DESC="The user that created this Component Plugins."
@ -3084,6 +3102,8 @@ COM_COMPONENTBUILDER_COMPONENT_PLUGINS_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_MODIFIED_DATE_DESC="The date this Component Plugins was modified."
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_NEW="A New Component Plugins"
+COM_COMPONENTBUILDER_COMPONENT_PLUGINS_NOTE_HOW_TO_CLONE_DESCRIPTION="There has often been the case that we have two or more components_plugins that should be exactly the same. Just selecting that component_plugins and clicking save, will overwrite this component_plugins with that selected component_plugins data."
+COM_COMPONENTBUILDER_COMPONENT_PLUGINS_NOTE_HOW_TO_CLONE_LABEL="How to clone another component_plugins's values into this one."
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_NOTE_ON_JOOMLA_PLUGINS_DESCRIPTION="Do not add the same Joomla plugins twice it will not work."
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_NOTE_ON_JOOMLA_PLUGINS_LABEL="Setting Joomla Plugins"
 COM_COMPONENTBUILDER_COMPONENT_PLUGINS_ORDERING_LABEL="Ordering"
@ -3930,10 +3950,10 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NEW_TAB="New Tab"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NEW_TAB_2="New Tab 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NEXT="Next"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO="No"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_PHP_LANGUAGE_STRING_DESCRIPTION="<code>&lt;?= JText::_(&apos;Text&apos;) ?&gt;</code><br />
-<code>&lt;?= JText::sprintf(&apos;Hello %s&apos;, $this->user->name) ?&gt;</code><br />
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_PHP_LANGUAGE_STRING_DESCRIPTION="<code>&lt;?php echo JText::_(&apos;Text&apos;); ?&gt;</code><br />
+<code>&lt;?php echo JText::sprintf(&apos;Hello %s&apos;, $this->user->name); ?&gt;</code><br />
 <b>Just get UPPERCASE language string:</b><br />
-<code>&lt;?= JustTEXT::_(&apos;Text&apos;) ?&gt;</code>"
+<code>&lt;?php echo JustTEXT::_(&apos;Text&apos;); ?&gt;</code>"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_PHP_LANGUAGE_STRING_LABEL="Add PHP Language String"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION="All libraries you select will dynamically be added to the header of the page according to the settings of the selected library. Each library will also get its respective buttons added to the component global options if it has any set. Please take a look at the <span id='open-libraries'>libraries</span> for more details."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_LABEL="Select libraries you would like to use in your code"
@ -6217,7 +6237,11 @@ COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_N_ITEMS_UNFEATURED_1="%s Joomla Modu
 COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_N_ITEMS_UNPUBLISHED="%s Joomla Modules Updates unpublished."
 COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_N_ITEMS_UNPUBLISHED_1="%s Joomla Module Updates unpublished."
 COM_COMPONENTBUILDER_JOOMLA_MODULE_ABSTRACT_CLASS="abstract class"
+COM_COMPONENTBUILDER_JOOMLA_MODULE_ADDFIELDPATH_DESCRIPTION="Set other field path"
+COM_COMPONENTBUILDER_JOOMLA_MODULE_ADDFIELDPATH_LABEL="Other Field Path"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_ADDREADME_LABEL="Add README"
+COM_COMPONENTBUILDER_JOOMLA_MODULE_ADDRULEPATH_DESCRIPTION="Set other rule path"
+COM_COMPONENTBUILDER_JOOMLA_MODULE_ADDRULEPATH_LABEL="Other Rule Path"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_DESCRIPTION="You can add a helper class to your module."
 COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_HEADER_DESCRIPTION="You can add your own custom helper header script."
 COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_CLASS_HELPER_HEADER_LABEL="Add Class Helper Header"
@ -6419,10 +6443,10 @@ COM_COMPONENTBUILDER_JOOMLA_MODULE_NAME_MESSAGE="Error! Please add name here."
 COM_COMPONENTBUILDER_JOOMLA_MODULE_NEW="A New Joomla Module"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_NO="No"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_NONE="None"
-COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_ADD_PHP_LANGUAGE_STRING_DESCRIPTION="<code>&lt;?= JText::_(&apos;Text&apos;) ?&gt;</code><br />
-<code>&lt;?= JText::sprintf(&apos;Hello %s&apos;, $this->user->name) ?&gt;</code><br />
+COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_ADD_PHP_LANGUAGE_STRING_DESCRIPTION="<code>&lt;?php echo JText::_(&apos;Text&apos;); ?&gt;</code><br />
+<code>&lt;?php echo JText::sprintf(&apos;Hello %s&apos;, $this->user->name); ?&gt;</code><br />
 <b>Just get UPPERCASE language string:</b><br />
-<code>&lt;?= JustTEXT::_(&apos;Text&apos;) ?&gt;</code>"
+<code>&lt;?php echo JustTEXT::_(&apos;Text&apos;); ?&gt;</code>"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_ADD_PHP_LANGUAGE_STRING_LABEL="Add PHP Language String"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_LIBRARIES_OPTIONS_DESCRIPTION="<p>All libraries added to modules are added to the component media folder for now</p>
 <p>So over here you are able to manually add HTML code to your model default tmpl.</p>"
@ -6442,6 +6466,8 @@ COM_COMPONENTBUILDER_JOOMLA_MODULE_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL="The ZIP Op
 COM_COMPONENTBUILDER_JOOMLA_MODULE_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_OTHER="Other"
+COM_COMPONENTBUILDER_JOOMLA_MODULE_PATH_LABEL="Path"
+COM_COMPONENTBUILDER_JOOMLA_MODULE_PATH_MESSAGE="Error! Please add extra field path here."
 COM_COMPONENTBUILDER_JOOMLA_MODULE_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_METHOD_UNINSTALL_DESCRIPTION="PHP script that should run during uninstall."
 COM_COMPONENTBUILDER_JOOMLA_MODULE_PHP_METHOD_UNINSTALL_LABEL="PHP Method (uninstall)"
@ -6660,7 +6686,11 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_UNFEATURED="%s Joomla Plugin
 COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_UNFEATURED_1="%s Joomla Plugin Updates unfeatured."
 COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_UNPUBLISHED="%s Joomla Plugins Updates unpublished."
 COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_N_ITEMS_UNPUBLISHED_1="%s Joomla Plugin Updates unpublished."
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDFIELDPATH_DESCRIPTION="Set other field path"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDFIELDPATH_LABEL="Other Field Path"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDREADME_LABEL="Add README"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDRULEPATH_DESCRIPTION="Set other rule path"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDRULEPATH_LABEL="Other Rule Path"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_HEAD_DESCRIPTION="You can add your own custom header script, combined with the default header script that make the extended class work."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_HEAD_LABEL="Add Custom Class Header"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADD_PHP_METHOD_UNINSTALL_LABEL="Add PHP Method (uninstall)"
@ -6915,6 +6945,8 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL="The ZIP Op
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_OTHER="Other"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PATH_LABEL="Path"
+COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PATH_MESSAGE="Error! Please add extra field path here."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_METHOD_UNINSTALL_DESCRIPTION="PHP script that should run during uninstall."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_METHOD_UNINSTALL_LABEL="PHP Method (uninstall)"
@ -7265,10 +7297,10 @@ COM_COMPONENTBUILDER_LAYOUT_NAME_LABEL="Name"
 COM_COMPONENTBUILDER_LAYOUT_NAME_MESSAGE="Error! Please add name here."
 COM_COMPONENTBUILDER_LAYOUT_NEW="A New Layout"
 COM_COMPONENTBUILDER_LAYOUT_NO="No"
-COM_COMPONENTBUILDER_LAYOUT_NOTE_ADD_PHP_LANGUAGE_STRING_DESCRIPTION="<code>&lt;?= JText::_(&apos;Text&apos;) ?&gt;</code><br />
-<code>&lt;?= JText::sprintf(&apos;Hello %s&apos;, $this->user->name) ?&gt;</code><br />
+COM_COMPONENTBUILDER_LAYOUT_NOTE_ADD_PHP_LANGUAGE_STRING_DESCRIPTION="<code>&lt;?php echo JText::_(&apos;Text&apos;); ?&gt;</code><br />
+<code>&lt;?php echo JText::sprintf(&apos;Hello %s&apos;, $this->user->name); ?&gt;</code><br />
 <b>Just get UPPERCASE language string:</b><br />
-<code>&lt;?= JustTEXT::_(&apos;Text&apos;) ?&gt;</code>"
+<code>&lt;?php echo JustTEXT::_(&apos;Text&apos;); ?&gt;</code>"
 COM_COMPONENTBUILDER_LAYOUT_NOTE_ADD_PHP_LANGUAGE_STRING_LABEL="Add PHP Language String"
 COM_COMPONENTBUILDER_LAYOUT_NOTE_LIBRARIES_SELECTION_DESCRIPTION="All libraries you select will dynamically be added to the header of the page according to the settings of the selected library. Each library will also get its respective buttons added to the component global options if it has any set. Please take a look at the <span id='open-libraries'>libraries</span> for more details."
 COM_COMPONENTBUILDER_LAYOUT_NOTE_LIBRARIES_SELECTION_LABEL="Select libraries you would like to use in your code"
@ -8361,10 +8393,10 @@ COM_COMPONENTBUILDER_SITE_VIEW_NEW_TAB_2="New Tab 2"
 COM_COMPONENTBUILDER_SITE_VIEW_NEXT="Next"
 COM_COMPONENTBUILDER_SITE_VIEW_NO="No"
 COM_COMPONENTBUILDER_SITE_VIEW_NONE="None"
-COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_PHP_LANGUAGE_STRING_DESCRIPTION="<code>&lt;?= JText::_(&apos;Text&apos;) ?&gt;</code><br />
-<code>&lt;?= JText::sprintf(&apos;Hello %s&apos;, $this->user->name) ?&gt;</code><br />
+COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_PHP_LANGUAGE_STRING_DESCRIPTION="<code>&lt;?php echo JText::_(&apos;Text&apos;); ?&gt;</code><br />
+<code>&lt;?php echo JText::sprintf(&apos;Hello %s&apos;, $this->user->name); ?&gt;</code><br />
 <b>Just get UPPERCASE language string:</b><br />
-<code>&lt;?= JustTEXT::_(&apos;Text&apos;) ?&gt;</code>"
+<code>&lt;?php echo JustTEXT::_(&apos;Text&apos;); ?&gt;</code>"
 COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_PHP_LANGUAGE_STRING_LABEL="Add PHP Language String"
 COM_COMPONENTBUILDER_SITE_VIEW_NOTE_CUSTOM_TOOLBAR_PLACEHOLDER_DESCRIPTION="Use this placeholder in the body <code>[[[SITE_TOOLBAR]]]</code> to add the custom position of the toolbar."
 COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION="All libraries you select will dynamically be added to the header of the page according to the settings of the selected library. Each library will also get its respective buttons added to the component global options if it has any set. Please take a look at the <span id='open-libraries'>libraries</span> for more details."
@ -8835,10 +8867,10 @@ COM_COMPONENTBUILDER_TEMPLATE_NAME_LABEL="Name"
 COM_COMPONENTBUILDER_TEMPLATE_NAME_MESSAGE="Error! Please add name here."
 COM_COMPONENTBUILDER_TEMPLATE_NEW="A New Template"
 COM_COMPONENTBUILDER_TEMPLATE_NO="No"
-COM_COMPONENTBUILDER_TEMPLATE_NOTE_ADD_PHP_LANGUAGE_STRING_DESCRIPTION="<code>&lt;?= JText::_(&apos;Text&apos;) ?&gt;</code><br />
-<code>&lt;?= JText::sprintf(&apos;Hello %s&apos;, $this->user->name) ?&gt;</code><br />
+COM_COMPONENTBUILDER_TEMPLATE_NOTE_ADD_PHP_LANGUAGE_STRING_DESCRIPTION="<code>&lt;?php echo JText::_(&apos;Text&apos;); ?&gt;</code><br />
+<code>&lt;?php echo JText::sprintf(&apos;Hello %s&apos;, $this->user->name); ?&gt;</code><br />
 <b>Just get UPPERCASE language string:</b><br />
-<code>&lt;?= JustTEXT::_(&apos;Text&apos;) ?&gt;</code>"
+<code>&lt;?php echo JustTEXT::_(&apos;Text&apos;); ?&gt;</code>"
 COM_COMPONENTBUILDER_TEMPLATE_NOTE_ADD_PHP_LANGUAGE_STRING_LABEL="Add PHP Language String"
 COM_COMPONENTBUILDER_TEMPLATE_NOTE_LIBRARIES_SELECTION_DESCRIPTION="All libraries you select will dynamically be added to the header of the page according to the settings of the selected library. Each library will also get its respective buttons added to the component global options if it has any set. Please take a look at the <span id='open-libraries'>libraries</span> for more details."
 COM_COMPONENTBUILDER_TEMPLATE_NOTE_LIBRARIES_SELECTION_LABEL="Select libraries you would like to use in your code"
--- a/admin/layouts/component_dashboard/clone_left.php
+++ b/admin/layouts/component_dashboard/clone_left.php
@ -0,0 +1,44 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @gitea      Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'note_how_to_clone',
+	'clone_me'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>
--- a/admin/layouts/component_files_folders/clone_left.php
+++ b/admin/layouts/component_files_folders/clone_left.php
@ -0,0 +1,44 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @gitea      Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'note_how_to_clone',
+	'clone_me'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>
--- a/admin/layouts/component_modules/clone_left.php
+++ b/admin/layouts/component_modules/clone_left.php
@ -0,0 +1,44 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @gitea      Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'note_how_to_clone',
+	'clone_me'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>
--- a/admin/layouts/component_placeholders/clone_left.php
+++ b/admin/layouts/component_placeholders/clone_left.php
@ -0,0 +1,44 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @gitea      Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'note_how_to_clone',
+	'clone_me'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>
--- a/admin/layouts/component_plugins/clone_left.php
+++ b/admin/layouts/component_plugins/clone_left.php
@ -0,0 +1,44 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @gitea      Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'note_how_to_clone',
+	'clone_me'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>
--- a/admin/models/admin_views.php
+++ b/admin/models/admin_views.php
@ -203,7 +203,7 @@ class ComponentbuilderModelAdmin_views extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -817,17 +817,19 @@ class ComponentbuilderModelAdmin_views extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_admin_view'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -842,7 +844,7 @@ class ComponentbuilderModelAdmin_views extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_admin_view'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/admins_custom_tabs.php
+++ b/admin/models/admins_custom_tabs.php
@ -94,7 +94,7 @@ class ComponentbuilderModelAdmins_custom_tabs extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelAdmins_custom_tabs extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_admin_custom_tabs'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelAdmins_custom_tabs extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_admin_custom_tabs'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/admins_fields.php
+++ b/admin/models/admins_fields.php
@ -94,7 +94,7 @@ class ComponentbuilderModelAdmins_fields extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelAdmins_fields extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_admin_fields'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelAdmins_fields extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_admin_fields'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/admins_fields_conditions.php
+++ b/admin/models/admins_fields_conditions.php
@ -94,7 +94,7 @@ class ComponentbuilderModelAdmins_fields_conditions extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelAdmins_fields_conditions extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_admin_fields_conditions'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelAdmins_fields_conditions extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_admin_fields_conditions'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/admins_fields_relations.php
+++ b/admin/models/admins_fields_relations.php
@ -94,7 +94,7 @@ class ComponentbuilderModelAdmins_fields_relations extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelAdmins_fields_relations extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_admin_fields_relations'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelAdmins_fields_relations extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_admin_fields_relations'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@ -1803,10 +1803,10 @@ class ComponentbuilderModelAjax extends JModelList
 		$db = JFactory::getDbo();	
 		// Create a new query object.
 		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.alias','a.template','b.name','a.dynamic_get')));
+		$query->select($db->quoteName(array('a.id', 'a.alias', 'a.template', 'b.name', 'a.dynamic_get')));
 		$query->from($db->quoteName('#__componentbuilder_template', 'a'));
 		$query->join('LEFT', $db->quoteName('#__componentbuilder_dynamic_get', 'b') . ' ON (' . $db->quoteName('b.id') . ' = ' . $db->quoteName('a.dynamic_get') . ')');
-		$query->where($db->quoteName('a.id') . ' != '.(int) $id);
+		$query->where($db->quoteName('a.id') . ' != '. (int) $id);
 		$query->where($db->quoteName('a.published') . ' = 1');
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
@ -1839,10 +1839,10 @@ class ComponentbuilderModelAjax extends JModelList
 				$templateString[] = "<td><b>".$result->name."</b> ".$editget."</td><td><code>&lt;?php echo \$this->loadTemplate('".ComponentbuilderHelper::safeString($result->alias)."'); ?&gt;</code> ".$edit."</td>";
 			}
 			// build the table
-			$table = '<h2>'.JText::_('COM_COMPONENTBUILDER_TEMPLATE_CODE_SNIPPETS').'</h2><div class="uk-scrollable-box"><table class="uk-table uk-table-hover uk-table-striped uk-table-condensed">';
-			$table .= '<caption>'.JText::_('COM_COMPONENTBUILDER_TO_ADD_SIMPLY_COPY_AND_PAST_THE_SNIPPET_INTO_YOUR_CODE').'</caption>';
-			$table .= '<thead><tr><th>'.JText::_('COM_COMPONENTBUILDER_NAME_OF_DYNAMICGET').'</th><th>'.JText::_('COM_COMPONENTBUILDER_SNIPPET').'</th></thead>';
-			$table .= '<tbody><tr>'.implode("</tr><tr>",$templateString)."</tr></tbody></table></div>";
+			$table = '<h2>' . JText::_('COM_COMPONENTBUILDER_TEMPLATE_CODE_SNIPPETS') . '</h2><div class="uk-scrollable-box"><table class="uk-table uk-table-hover uk-table-striped uk-table-condensed">';
+			$table .= '<caption>' . JText::_('COM_COMPONENTBUILDER_TO_ADD_SIMPLY_COPY_AND_PAST_THE_SNIPPET_INTO_YOUR_CODE') . '</caption>';
+			$table .= '<thead><tr><th>' . JText::_('COM_COMPONENTBUILDER_NAME_OF_DYNAMICGET') . '</th><th>' . JText::_('COM_COMPONENTBUILDER_SNIPPET') . '</th></thead>';
+			$table .= '<tbody><tr>' . implode("</tr><tr>", $templateString) . "</tr></tbody></table></div>";
 		}
 		return $table;
 	}
@ -1892,34 +1892,38 @@ class ComponentbuilderModelAjax extends JModelList
 				switch ($result->gettype)
 				{
 					case 1:
-					// single
-					$layoutString[] = "<td><b>".$result->name."</b> ".$editget."</td><td><code>&lt;?php echo JLayoutHelper::render('".ComponentbuilderHelper::safeString($result->alias)."', \$this->item); ?&gt;</code> ".$edit."</td>";
+						// single
+						$layoutString[] = "<td><b>" . $result->name . "</b> " . $editget . "</td><td><code>&lt;?php echo JLayoutHelper::render('" . ComponentbuilderHelper::safeString($result->alias) . "', \$this->item); ?&gt;</code> " . $edit . "</td>";
 					break;
 					case 2:
-					// list
-					$layoutString[] = "<td><b>".$result->name."</b> ".$editget."</td><td><code>&lt;?php echo JLayoutHelper::render('".ComponentbuilderHelper::safeString($result->alias)."', \$this->items); ?&gt;</code> ".$edit."</td>";
+						// list
+						$layoutString[] = "<td><b>" . $result->name . "</b> " . $editget . "</td><td><code>&lt;?php echo JLayoutHelper::render('" . ComponentbuilderHelper::safeString($result->alias) . "', \$this->items); ?&gt;</code> " . $edit . "</td>";
 					break;
 					case 3:
 					case 4:
-					// custom
-					$result->getcustom = ComponentbuilderHelper::safeString($result->getcustom);
-					if (substr($result->getcustom, 0, strlen('get')) == 'get')
-					{
-						$varName = substr($result->getcustom, strlen('get'));
-					}
-					else
-					{
-						$varName = $result->getcustom;
-					}
-					$layoutString[] = "<td><b>".$result->name."</b> ".$editget."</td><td><code>&lt;?php echo JLayoutHelper::render('".ComponentbuilderHelper::safeString($result->alias)."', \$this->".$varName."); ?&gt;</code> ".$edit."</td>";
+						// custom
+						$result->getcustom = ComponentbuilderHelper::safeString($result->getcustom);
+						if (substr($result->getcustom, 0, strlen('get')) == 'get')
+						{
+							$varName = substr($result->getcustom, strlen('get'));
+						}
+						else
+						{
+							$varName = $result->getcustom;
+						}
+						$layoutString[] = "<td><b>" . $result->name . "</b> " . $editget . "</td><td><code>&lt;?php echo JLayoutHelper::render('" . ComponentbuilderHelper::safeString($result->alias) . "', \$this->" . $varName . "); ?&gt;</code> " . $edit . "</td>";
+					break;
+					default:
+						// no get
+						$layoutString[] = "<td>" . JText::_('COM_COMPONENTBUILDER_NONE_SELECTED') . "</td><td><code>&lt;?php echo JLayoutHelper::render('" . ComponentbuilderHelper::safeString($result->alias) . "', [?]); ?&gt;</code> " . $edit . "</td>";
 					break;
 				}
 			}
 			// build the table
-			$table = '<h2>'.JText::_('COM_COMPONENTBUILDER_LAYOUT_CODE_SNIPPETS').'</h2><div class="uk-scrollable-box"><table class="uk-table uk-table-hover uk-table-striped uk-table-condensed">';
-			$table .= '<caption>'.JText::_('COM_COMPONENTBUILDER_TO_ADD_SIMPLY_COPY_AND_PAST_THE_SNIPPET_INTO_YOUR_CODE').'</caption>';
-			$table .= '<thead><tr><th>'.JText::_('COM_COMPONENTBUILDER_NAME_OF_DYNAMICGET').'</th><th>'.JText::_('COM_COMPONENTBUILDER_SNIPPET').'</th></thead>';
-			$table .= '<tbody><tr>'.implode("</tr><tr>",$layoutString)."</tr></tbody></table></div>";
+			$table = '<h2>' . JText::_('COM_COMPONENTBUILDER_LAYOUT_CODE_SNIPPETS') . '</h2><div class="uk-scrollable-box"><table class="uk-table uk-table-hover uk-table-striped uk-table-condensed">';
+			$table .= '<caption>' . JText::_('COM_COMPONENTBUILDER_TO_ADD_SIMPLY_COPY_AND_PAST_THE_SNIPPET_INTO_YOUR_CODE') . '</caption>';
+			$table .= '<thead><tr><th>' . JText::_('COM_COMPONENTBUILDER_NAME_OF_DYNAMICGET') . '</th><th>' . JText::_('COM_COMPONENTBUILDER_SNIPPET') . '</th></thead>';
+			$table .= '<tbody><tr>' . implode("</tr><tr>",$layoutString) . "</tr></tbody></table></div>";
 		}
 		return $table;
 	}
--- a/admin/models/class_extendings.php
+++ b/admin/models/class_extendings.php
@ -110,7 +110,7 @@ class ComponentbuilderModelClass_extendings extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -323,17 +323,19 @@ class ComponentbuilderModelClass_extendings extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_class_extends'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -348,7 +350,7 @@ class ComponentbuilderModelClass_extendings extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_class_extends'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/class_methods.php
+++ b/admin/models/class_methods.php
@ -118,7 +118,7 @@ class ComponentbuilderModelClass_methods extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -502,17 +502,19 @@ class ComponentbuilderModelClass_methods extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_class_method'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -527,7 +529,7 @@ class ComponentbuilderModelClass_methods extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_class_method'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/class_properties.php
+++ b/admin/models/class_properties.php
@ -118,7 +118,7 @@ class ComponentbuilderModelClass_properties extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -498,17 +498,19 @@ class ComponentbuilderModelClass_properties extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_class_property'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -523,7 +525,7 @@ class ComponentbuilderModelClass_properties extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_class_property'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/component_dashboard.php
+++ b/admin/models/component_dashboard.php
@ -37,6 +37,12 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
 			'above' => array(
 				'joomla_component'
 			)
+		),
+		'clone' => array(
+			'left' => array(
+				'note_how_to_clone',
+				'clone_me'
+			)
 		)
 	);

@ -927,6 +933,19 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		}

+
+		// check if we have a clone moment
+		if (isset($data['clone_me']) && $data['clone_me'] > 0)
+		{
+			// get the following data from clone_me (component_dashboard)
+			$keys = array('php_dashboard_methods','dashboard_tab','params');
+			foreach ($keys as $key)
+			{
+				$data[$key] = ComponentbuilderHelper::getVar('component_dashboard', $data['clone_me'], 'joomla_component', $key);
+			}
+		}
+
+
 		// Set the dashboard_tab items to data.
 		if (isset($data['dashboard_tab']) && is_array($data['dashboard_tab']))
 		{
--- a/admin/models/component_files_folders.php
+++ b/admin/models/component_files_folders.php
@ -39,6 +39,12 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
 				'joomla_component'
 			)
 		),
+		'clone' => array(
+			'left' => array(
+				'note_how_to_clone',
+				'clone_me'
+			)
+		),
 		'advance' => array(
 			'fullwidth' => array(
 				'note_add_files_fullpath',
@ -872,6 +878,19 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		}

+
+		// check if we have a clone moment
+		if (isset($data['clone_me']) && $data['clone_me'] > 0)
+		{
+			// get the following data from clone_me (component_files_folders)
+			$keys = array('addfiles','addfolders','addfilesfullpath','addfoldersfullpath');
+			foreach ($keys as $key)
+			{
+				$data[$key] = ComponentbuilderHelper::getVar('component_files_folders', $data['clone_me'], 'joomla_component', $key);
+			}
+		}
+
+
 		// Set the addfoldersfullpath items to data.
 		if (isset($data['addfoldersfullpath']) && is_array($data['addfoldersfullpath']))
 		{
--- a/admin/models/component_modules.php
+++ b/admin/models/component_modules.php
@ -36,6 +36,12 @@ class ComponentbuilderModelComponent_modules extends JModelAdmin
 			'above' => array(
 				'joomla_component'
 			)
+		),
+		'clone' => array(
+			'left' => array(
+				'note_how_to_clone',
+				'clone_me'
+			)
 		)
 	);

@ -805,6 +811,15 @@ class ComponentbuilderModelComponent_modules extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		}

+
+		// check if we have a clone moment
+		if (isset($data['clone_me']) && $data['clone_me'] > 0)
+		{
+			// get addjoomla_modules data from clone_me (component_modules)
+			$data['addjoomla_modules'] = ComponentbuilderHelper::getVar('component_modules', $data['clone_me'], 'joomla_component', 'addjoomla_modules');
+		}
+
+
 		// Set the addjoomla_modules items to data.
 		if (isset($data['addjoomla_modules']) && is_array($data['addjoomla_modules']))
 		{
--- a/admin/models/component_placeholders.php
+++ b/admin/models/component_placeholders.php
@ -35,6 +35,12 @@ class ComponentbuilderModelComponent_placeholders extends JModelAdmin
 			'above' => array(
 				'joomla_component'
 			)
+		),
+		'clone' => array(
+			'left' => array(
+				'note_how_to_clone',
+				'clone_me'
+			)
 		)
 	);

@ -804,6 +810,15 @@ class ComponentbuilderModelComponent_placeholders extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		}

+
+		// check if we have a clone moment
+		if (isset($data['clone_me']) && $data['clone_me'] > 0)
+		{
+			// get addplaceholders data from clone_me (component_placeholders)
+			$data['addplaceholders'] = ComponentbuilderHelper::getVar('component_placeholders', $data['clone_me'], 'joomla_component', 'addplaceholders');
+		}
+
+
 		// Set the addplaceholders items to data.
 		if (isset($data['addplaceholders']) && is_array($data['addplaceholders']))
 		{
--- a/admin/models/component_plugins.php
+++ b/admin/models/component_plugins.php
@ -36,6 +36,12 @@ class ComponentbuilderModelComponent_plugins extends JModelAdmin
 			'above' => array(
 				'joomla_component'
 			)
+		),
+		'clone' => array(
+			'left' => array(
+				'note_how_to_clone',
+				'clone_me'
+			)
 		)
 	);

@ -805,6 +811,15 @@ class ComponentbuilderModelComponent_plugins extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		}

+
+		// check if we have a clone moment
+		if (isset($data['clone_me']) && $data['clone_me'] > 0)
+		{
+			// get addjoomla_plugins data from clone_me (component_plugins)
+			$data['addjoomla_plugins'] = ComponentbuilderHelper::getVar('component_plugins', $data['clone_me'], 'joomla_component', 'addjoomla_plugins');
+		}
+
+
 		// Set the addjoomla_plugins items to data.
 		if (isset($data['addjoomla_plugins']) && is_array($data['addjoomla_plugins']))
 		{
--- a/admin/models/componentbuilder.php
+++ b/admin/models/componentbuilder.php
@ -423,7 +423,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList
            				.append("<h3><a href=\"" + issue.html_url + "\" target=\"_blank\">" + issue.title + "</a></h3>")
 					.append("<img alt=\"@" + issue.user.login + "\" style=\"vertical-align: baseline;\" src=\"" + issue.user.avatar_url +"&amp;s=60\" width=\"30\" height=\"30\"> ")
            				.append("<em><a href=\"" + issue.user.html_url + "\" target=\"_blank\">" + issue.user.login + "</a> '.JText::_('COM_COMPONENTBUILDER_OPENED_THIS').' <a href=\"" + issue.html_url + "\" target=\"_blank\">'.JText::_('COM_COMPONENTBUILDER_ISSUE').'-" + issue.number + "</a> (" + timeago + ")</em> ")
-            				.append(marked(issue.body))
+            				.append(marked.parse(issue.body))
            				.append("<a href=\"" + issue.html_url + "\" target=\"_blank\"><span class=\'icon-new-tab\'></span>'.JText::_('COM_COMPONENTBUILDER_RESPOND_TO_THIS_ISSUE_ON_GITHUB').'</a>...<hr />");
    				});
 			});
@ -436,7 +436,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList
            				.append("<h3><a href=\"" + issue.html_url + "\" target=\"_blank\">" + issue.title + "</a></h3>")
 					.append("<img alt=\"@" + issue.user.login + "\" style=\"vertical-align: baseline;\" src=\"" + issue.user.avatar_url +"&amp;s=60\" width=\"30\" height=\"30\"> ")
            				.append("<em><a href=\"" + issue.user.html_url + "\" target=\"_blank\">" + issue.user.login + "</a> '.JText::_('COM_COMPONENTBUILDER_OPENED').' <a href=\"" + issue.html_url + "\" target=\"_blank\">'.JText::_('COM_COMPONENTBUILDER_ISSUE').'-" + issue.number + "</a> (" + timeago + ")</em>")
-            				.append(marked(issue.body))
+            				.append(marked.parse(issue.body))
            				.append("<a href=\"" + issue.html_url + "\" target=\"_blank\"><span class=\'icon-new-tab\'></span>'.JText::_('COM_COMPONENTBUILDER_REVIEW_THIS_ISSUE_ON_GITHUB').'</a>...<hr />");
    				});
 			});
@ -475,7 +475,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 					.append(activeNotice)
 					.append("<img alt=\"@" + tagrelease.author.login + "\" style=\"vertical-align: baseline;\" src=\"" + tagrelease.author.avatar_url +"&amp;s=60\" width=\"30\" height=\"30\"> ")
            				.append("<em><a href=\"" + tagrelease.author.html_url + "\" target=\"_blank\">" + tagrelease.author.login + "</a> '.JText::_('COM_COMPONENTBUILDER_RELEASED_THIS').'<em> <b><span class=\'icon-tag-2\'></span>" + tagrelease.tag_name+ "</b> (" + timeago + ")")
-            				.append(marked(tagrelease.body))
+            				.append(marked.parse(tagrelease.body))
            				.append(" <a class=\"hasTooltip\" href=\"" + tagrelease.assets[0].browser_download_url + "\" title=\"'.JText::_('COM_COMPONENTBUILDER_DOWNLOAD').' " + tagrelease.assets[0].name + "\" target=\"_self\"><span class=\'icon-download\'></span>" + tagrelease.assets[0].name + "</a> (<a class=\"hasTooltip\" href=\"" + tagrelease.assets[0].browser_download_url + "\" title=\"'.JText::_('COM_COMPONENTBUILDER_TOTAL_DOWNLOADS').'\"><small>" + tagrelease.assets[0].download_count + "</small></a>) ")
            				.append("| <a href=\"" + tagrelease.html_url + "\" target=\"_blank\" title=\"'.JText::_('COM_COMPONENTBUILDER_OPEN').' " + tagrelease.name + " '.JText::_('COM_COMPONENTBUILDER_ON_GITHUB').'\"><span class=\'icon-new-tab\'></span>'.JText::_('COM_COMPONENTBUILDER_OPEN_ON_GITHUB').'</a>...<hr />");
    				});
@ -503,7 +503,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 		jQuery(document).ready(function () {
 			jQuery.get(gewiki)
 			.success(function(wiki) { 
-				jQuery("#wiki-md").html(marked(wiki));
+				jQuery("#wiki-md").html(marked.parse(wiki));
 			})
 			.error(function(jqXHR, textStatus, errorThrown) { 
 				jQuery("#wiki-md").html("'.JText::_('COM_COMPONENTBUILDER_PLEASE_CHECK_AGAIN_LATTER').'");
@ -527,7 +527,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 			jQuery.get(noticeboard)
 			.success(function(board) { 
 				if (board.length > 5) {
-					jQuery("#noticeboard-md").html(marked(board));
+					jQuery("#noticeboard-md").html(marked.parse(board));
 					getIS(1,board).done(function(result) {
 						if (result){
 							jQuery("#cpanel_tabTabs a").each(function() {
@ -599,7 +599,7 @@ jQuery(document).ready( function($) {
 			jQuery.get(proboard)
 			.success(function(board) {
 				if (board.length > 5) {
-					jQuery("#proboard-md").html(marked(board));
+					jQuery("#proboard-md").html(marked.parse(board));
 				} else {
 					jQuery("#proboard-md").html("'.JText::_('COM_COMPONENTBUILDER_ALL_IS_GOOD_PLEASE_CHECK_AGAIN_LATTER').'");
 				}
--- a/admin/models/components_admin_views.php
+++ b/admin/models/components_admin_views.php
@ -94,7 +94,7 @@ class ComponentbuilderModelComponents_admin_views extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelComponents_admin_views extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_component_admin_views'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelComponents_admin_views extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_component_admin_views'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/components_config.php
+++ b/admin/models/components_config.php
@ -94,7 +94,7 @@ class ComponentbuilderModelComponents_config extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelComponents_config extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_component_config'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelComponents_config extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_component_config'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/components_custom_admin_menus.php
+++ b/admin/models/components_custom_admin_menus.php
@ -94,7 +94,7 @@ class ComponentbuilderModelComponents_custom_admin_menus extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelComponents_custom_admin_menus extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_component_custom_admin_menus'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelComponents_custom_admin_menus extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_component_custom_admin_menus'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/components_custom_admin_views.php
+++ b/admin/models/components_custom_admin_views.php
@ -94,7 +94,7 @@ class ComponentbuilderModelComponents_custom_admin_views extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelComponents_custom_admin_views extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_component_custom_admin_views'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelComponents_custom_admin_views extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_component_custom_admin_views'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/components_dashboard.php
+++ b/admin/models/components_dashboard.php
@ -94,7 +94,7 @@ class ComponentbuilderModelComponents_dashboard extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelComponents_dashboard extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_component_dashboard'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelComponents_dashboard extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_component_dashboard'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/components_files_folders.php
+++ b/admin/models/components_files_folders.php
@ -94,7 +94,7 @@ class ComponentbuilderModelComponents_files_folders extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelComponents_files_folders extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_component_files_folders'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelComponents_files_folders extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_component_files_folders'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/components_modules.php
+++ b/admin/models/components_modules.php
@ -94,7 +94,7 @@ class ComponentbuilderModelComponents_modules extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelComponents_modules extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_component_modules'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelComponents_modules extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_component_modules'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/components_mysql_tweaks.php
+++ b/admin/models/components_mysql_tweaks.php
@ -94,7 +94,7 @@ class ComponentbuilderModelComponents_mysql_tweaks extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelComponents_mysql_tweaks extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_component_mysql_tweaks'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelComponents_mysql_tweaks extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_component_mysql_tweaks'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/components_placeholders.php
+++ b/admin/models/components_placeholders.php
@ -94,7 +94,7 @@ class ComponentbuilderModelComponents_placeholders extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelComponents_placeholders extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_component_placeholders'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelComponents_placeholders extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_component_placeholders'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/components_plugins.php
+++ b/admin/models/components_plugins.php
@ -94,7 +94,7 @@ class ComponentbuilderModelComponents_plugins extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelComponents_plugins extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_component_plugins'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelComponents_plugins extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_component_plugins'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/components_site_views.php
+++ b/admin/models/components_site_views.php
@ -94,7 +94,7 @@ class ComponentbuilderModelComponents_site_views extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelComponents_site_views extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_component_site_views'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelComponents_site_views extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_component_site_views'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/components_updates.php
+++ b/admin/models/components_updates.php
@ -94,7 +94,7 @@ class ComponentbuilderModelComponents_updates extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelComponents_updates extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_component_updates'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelComponents_updates extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_component_updates'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/custom_admin_views.php
+++ b/admin/models/custom_admin_views.php
@ -187,7 +187,7 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -672,17 +672,19 @@ class ComponentbuilderModelCustom_admin_views extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_custom_admin_view'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -697,7 +699,7 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_custom_admin_view'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/custom_codes.php
+++ b/admin/models/custom_codes.php
@ -134,7 +134,7 @@ class ComponentbuilderModelCustom_codes extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -590,17 +590,19 @@ class ComponentbuilderModelCustom_codes extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_custom_code'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -615,7 +617,7 @@ class ComponentbuilderModelCustom_codes extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_custom_code'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/dynamic_gets.php
+++ b/admin/models/dynamic_gets.php
@ -118,7 +118,7 @@ class ComponentbuilderModelDynamic_gets extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -503,17 +503,19 @@ class ComponentbuilderModelDynamic_gets extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_dynamic_get'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -528,7 +530,7 @@ class ComponentbuilderModelDynamic_gets extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_dynamic_get'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/fields.php
+++ b/admin/models/fields.php
@ -214,7 +214,7 @@ class ComponentbuilderModelFields extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -858,17 +858,19 @@ class ComponentbuilderModelFields extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_field'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -883,7 +885,7 @@ class ComponentbuilderModelFields extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_field'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/fieldtypes.php
+++ b/admin/models/fieldtypes.php
@ -126,7 +126,7 @@ class ComponentbuilderModelFieldtypes extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -467,17 +467,19 @@ class ComponentbuilderModelFieldtypes extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_fieldtype'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -492,7 +494,7 @@ class ComponentbuilderModelFieldtypes extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_fieldtype'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/forms/component_dashboard.xml
+++ b/admin/models/forms/component_dashboard.xml
@ -105,19 +105,19 @@
 			readonly="true"
 			button="false"
 		/>
-		<!-- Php_dashboard_methods Field. Type: Textarea. (joomla) -->
+		<!-- Clone_me Field. Type: Joomlacomponent. (custom) -->
 		<field
-			type="textarea"
-			name="php_dashboard_methods"
-			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_LABEL"
-			rows="17"
-			cols="5"
-			description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_HINT"
+			type="joomlacomponent"
+			name="clone_me"
+			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_CLONE_ME_LABEL"
+			class="list_class"
+			multiple="false"
+			default="0"
 			required="false"
+			button="false"
 		/>
+		<!-- Note_how_to_clone Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_how_to_clone" label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NOTE_HOW_TO_CLONE_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NOTE_HOW_TO_CLONE_DESCRIPTION" heading="h4" class="alert alert-info note_how_to_clone" />
 		<!-- Dashboard_tab Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@ -174,6 +174,19 @@
 				/>
 			</form>
 		</field>
+		<!-- Php_dashboard_methods Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_dashboard_methods"
+			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_LABEL"
+			rows="17"
+			cols="5"
+			description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_HINT"
+			required="false"
+		/>
 		<!-- Note_php_dashboard_note Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_php_dashboard_note" description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NOTE_PHP_DASHBOARD_NOTE_DESCRIPTION" class="note_php_dashboard_note" />
 	</fieldset>
--- a/admin/models/forms/component_files_folders.xml
+++ b/admin/models/forms/component_files_folders.xml
@ -105,6 +105,19 @@
 			readonly="true"
 			button="false"
 		/>
+		<!-- Clone_me Field. Type: Joomlacomponent. (custom) -->
+		<field
+			type="joomlacomponent"
+			name="clone_me"
+			label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_CLONE_ME_LABEL"
+			class="list_class"
+			multiple="false"
+			default="0"
+			required="false"
+			button="false"
+		/>
+		<!-- Note_how_to_clone Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_how_to_clone" label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_HOW_TO_CLONE_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_HOW_TO_CLONE_DESCRIPTION" heading="h4" class="alert alert-info note_how_to_clone" />
 		<!-- Note_constant_paths Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_constant_paths" label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_CONSTANT_PATHS_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_CONSTANT_PATHS_DESCRIPTION" heading="h4" class="alert alert-info note_constant_paths" />
 		<!-- Addfoldersfullpath Field. Type: Subform. (joomla) -->
--- a/admin/models/forms/component_modules.xml
+++ b/admin/models/forms/component_modules.xml
@ -105,6 +105,19 @@
 			readonly="true"
 			button="false"
 		/>
+		<!-- Clone_me Field. Type: Joomlacomponent. (custom) -->
+		<field
+			type="joomlacomponent"
+			name="clone_me"
+			label="COM_COMPONENTBUILDER_COMPONENT_MODULES_CLONE_ME_LABEL"
+			class="list_class"
+			multiple="false"
+			default="0"
+			required="false"
+			button="false"
+		/>
+		<!-- Note_how_to_clone Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_how_to_clone" label="COM_COMPONENTBUILDER_COMPONENT_MODULES_NOTE_HOW_TO_CLONE_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_MODULES_NOTE_HOW_TO_CLONE_DESCRIPTION" heading="h4" class="alert alert-info note_how_to_clone" />
 		<!-- Addjoomla_modules Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
--- a/admin/models/forms/component_placeholders.xml
+++ b/admin/models/forms/component_placeholders.xml
@ -105,6 +105,19 @@
 			readonly="true"
 			button="false"
 		/>
+		<!-- Clone_me Field. Type: Joomlacomponent. (custom) -->
+		<field
+			type="joomlacomponent"
+			name="clone_me"
+			label="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_CLONE_ME_LABEL"
+			class="list_class"
+			multiple="false"
+			default="0"
+			required="false"
+			button="false"
+		/>
+		<!-- Note_how_to_clone Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_how_to_clone" label="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_NOTE_HOW_TO_CLONE_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_NOTE_HOW_TO_CLONE_DESCRIPTION" heading="h4" class="alert alert-info note_how_to_clone" />
 		<!-- Addplaceholders Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
--- a/admin/models/forms/component_plugins.xml
+++ b/admin/models/forms/component_plugins.xml
@ -105,6 +105,19 @@
 			readonly="true"
 			button="false"
 		/>
+		<!-- Clone_me Field. Type: Joomlacomponent. (custom) -->
+		<field
+			type="joomlacomponent"
+			name="clone_me"
+			label="COM_COMPONENTBUILDER_COMPONENT_PLUGINS_CLONE_ME_LABEL"
+			class="list_class"
+			multiple="false"
+			default="0"
+			required="false"
+			button="false"
+		/>
+		<!-- Note_how_to_clone Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_how_to_clone" label="COM_COMPONENTBUILDER_COMPONENT_PLUGINS_NOTE_HOW_TO_CLONE_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_PLUGINS_NOTE_HOW_TO_CLONE_DESCRIPTION" heading="h4" class="alert alert-info note_how_to_clone" />
 		<!-- Addjoomla_plugins Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
--- a/admin/models/forms/joomla_module.xml
+++ b/admin/models/forms/joomla_module.xml
@ -647,6 +647,64 @@
 						COM_COMPONENTBUILDER_JOOMLA_MODULE_COMPONENT</option>
 					<option value="2">
 						COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE</option>
+					<option value="3">
+						COM_COMPONENTBUILDER_JOOMLA_MODULE_OTHER</option>
+				</field>
+				<!-- Addrulepath Field. Type: Subform. (joomla) -->
+				<field
+					type="subform"
+					name="addrulepath"
+					label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADDRULEPATH_LABEL"
+					layout="joomla.form.field.subform.repeatable-table"
+					multiple="true"
+					buttons="add,remove,move"
+					description="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADDRULEPATH_DESCRIPTION"
+					icon="list"
+					max="1"
+					showon="fields_rules_paths:3"
+					nested_depth="1">
+					<form hidden="true" name="list_addrulepath_modal" repeat="true">
+						<!-- Path Field. Type: Text. (joomla) -->
+						<field
+							type="text"
+							name="path"
+							label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PATH_LABEL"
+							size="50"
+							maxlength="150"
+							class="text_area"
+							filter="STRING"
+							message="COM_COMPONENTBUILDER_JOOMLA_MODULE_PATH_MESSAGE"
+							autocomplete="on"
+						/>
+					</form>
+				</field>
+				<!-- Addfieldpath Field. Type: Subform. (joomla) -->
+				<field
+					type="subform"
+					name="addfieldpath"
+					label="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADDFIELDPATH_LABEL"
+					layout="joomla.form.field.subform.repeatable-table"
+					multiple="true"
+					buttons="add,remove,move"
+					description="COM_COMPONENTBUILDER_JOOMLA_MODULE_ADDFIELDPATH_DESCRIPTION"
+					icon="list"
+					max="1"
+					showon="fields_rules_paths:3"
+					nested_depth="1">
+					<form hidden="true" name="list_addfieldpath_modal" repeat="true">
+						<!-- Path Field. Type: Text. (joomla) -->
+						<field
+							type="text"
+							name="path"
+							label="COM_COMPONENTBUILDER_JOOMLA_MODULE_PATH_LABEL"
+							size="50"
+							maxlength="150"
+							class="text_area"
+							filter="STRING"
+							message="COM_COMPONENTBUILDER_JOOMLA_MODULE_PATH_MESSAGE"
+							autocomplete="on"
+						/>
+					</form>
 				</field>
 				<!-- Fields Field. Type: Subform. (joomla) -->
 				<field
@ -658,7 +716,7 @@
 					buttons="add,remove,move"
 					description="COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELDS_DESCRIPTION"
 					icon="list"
-					max="50"
+					max="100"
 					nested_depth="1">
 					<form hidden="true" name="list_fields_modal" repeat="true">
 						<!-- Field Field. Type: Fields. (custom) -->
--- a/admin/models/forms/joomla_plugin.xml
+++ b/admin/models/forms/joomla_plugin.xml
@ -526,6 +526,64 @@
 						COM_COMPONENTBUILDER_JOOMLA_PLUGIN_COMPONENT</option>
 					<option value="2">
 						COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PLUGIN</option>
+					<option value="3">
+						COM_COMPONENTBUILDER_JOOMLA_PLUGIN_OTHER</option>
+				</field>
+				<!-- Addrulepath Field. Type: Subform. (joomla) -->
+				<field
+					type="subform"
+					name="addrulepath"
+					label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDRULEPATH_LABEL"
+					layout="joomla.form.field.subform.repeatable-table"
+					multiple="true"
+					buttons="add,remove,move"
+					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDRULEPATH_DESCRIPTION"
+					icon="list"
+					max="1"
+					showon="fields_rules_paths:3"
+					nested_depth="1">
+					<form hidden="true" name="list_addrulepath_modal" repeat="true">
+						<!-- Path Field. Type: Text. (joomla) -->
+						<field
+							type="text"
+							name="path"
+							label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PATH_LABEL"
+							size="50"
+							maxlength="150"
+							class="text_area"
+							filter="STRING"
+							message="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PATH_MESSAGE"
+							autocomplete="on"
+						/>
+					</form>
+				</field>
+				<!-- Addfieldpath Field. Type: Subform. (joomla) -->
+				<field
+					type="subform"
+					name="addfieldpath"
+					label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDFIELDPATH_LABEL"
+					layout="joomla.form.field.subform.repeatable-table"
+					multiple="true"
+					buttons="add,remove,move"
+					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDFIELDPATH_DESCRIPTION"
+					icon="list"
+					max="1"
+					showon="fields_rules_paths:3"
+					nested_depth="1">
+					<form hidden="true" name="list_addfieldpath_modal" repeat="true">
+						<!-- Path Field. Type: Text. (joomla) -->
+						<field
+							type="text"
+							name="path"
+							label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PATH_LABEL"
+							size="50"
+							maxlength="150"
+							class="text_area"
+							filter="STRING"
+							message="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PATH_MESSAGE"
+							autocomplete="on"
+						/>
+					</form>
 				</field>
 				<!-- Fields Field. Type: Subform. (joomla) -->
 				<field
@ -537,7 +595,7 @@
 					buttons="add,remove,move"
 					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELDS_DESCRIPTION"
 					icon="list"
-					max="50"
+					max="100"
 					nested_depth="1">
 					<form hidden="true" name="list_fields_modal" repeat="true">
 						<!-- Field Field. Type: Fields. (custom) -->
--- a/admin/models/help_documents.php
+++ b/admin/models/help_documents.php
@ -133,7 +133,7 @@ class ComponentbuilderModelHelp_documents extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -506,17 +506,19 @@ class ComponentbuilderModelHelp_documents extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_help_document'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -531,7 +533,7 @@ class ComponentbuilderModelHelp_documents extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_help_document'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/joomla_components.php
+++ b/admin/models/joomla_components.php
@ -2304,7 +2304,7 @@ class ComponentbuilderModelJoomla_components extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -2756,17 +2756,19 @@ class ComponentbuilderModelJoomla_components extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_joomla_component'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -2781,7 +2783,7 @@ class ComponentbuilderModelJoomla_components extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_joomla_component'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/joomla_modules.php
+++ b/admin/models/joomla_modules.php
@ -118,7 +118,7 @@ class ComponentbuilderModelJoomla_modules extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -329,17 +329,19 @@ class ComponentbuilderModelJoomla_modules extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_joomla_module'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -354,7 +356,7 @@ class ComponentbuilderModelJoomla_modules extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_joomla_module'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/joomla_modules_files_folders_urls.php
+++ b/admin/models/joomla_modules_files_folders_urls.php
@ -94,7 +94,7 @@ class ComponentbuilderModelJoomla_modules_files_folders_urls extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelJoomla_modules_files_folders_urls extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_joomla_module_files_folders_urls'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelJoomla_modules_files_folders_urls extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_joomla_module_files_folders_urls'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/joomla_modules_updates.php
+++ b/admin/models/joomla_modules_updates.php
@ -94,7 +94,7 @@ class ComponentbuilderModelJoomla_modules_updates extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelJoomla_modules_updates extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_joomla_module_updates'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelJoomla_modules_updates extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_joomla_module_updates'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/joomla_plugin_groups.php
+++ b/admin/models/joomla_plugin_groups.php
@ -110,7 +110,7 @@ class ComponentbuilderModelJoomla_plugin_groups extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -269,17 +269,19 @@ class ComponentbuilderModelJoomla_plugin_groups extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_joomla_plugin_group'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -294,7 +296,7 @@ class ComponentbuilderModelJoomla_plugin_groups extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_joomla_plugin_group'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/joomla_plugins.php
+++ b/admin/models/joomla_plugins.php
@ -112,7 +112,7 @@ class ComponentbuilderModelJoomla_plugins extends JModelList
 							// extract the boilerplate class comment
 							$class['comment'] = ComponentbuilderHelper::extractBoilerplateClassComment($fooClass, $classExtends, 'plugins');
 							// set the extension type
-							$class['target_type'] = 'plugins';
+							$class['extension_type'] = 'plugins';
 							// store the class
 							$this->storePluginBoilerplate($tables['e'], $models['e'], $class, $app);
 							// work around
@ -288,7 +288,7 @@ class ComponentbuilderModelJoomla_plugins extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -490,17 +490,19 @@ class ComponentbuilderModelJoomla_plugins extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_joomla_plugin'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -515,7 +517,7 @@ class ComponentbuilderModelJoomla_plugins extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_joomla_plugin'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/joomla_plugins_files_folders_urls.php
+++ b/admin/models/joomla_plugins_files_folders_urls.php
@ -94,7 +94,7 @@ class ComponentbuilderModelJoomla_plugins_files_folders_urls extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelJoomla_plugins_files_folders_urls extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_joomla_plugin_files_folders_urls'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelJoomla_plugins_files_folders_urls extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_joomla_plugin_files_folders_urls'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/joomla_plugins_updates.php
+++ b/admin/models/joomla_plugins_updates.php
@ -94,7 +94,7 @@ class ComponentbuilderModelJoomla_plugins_updates extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelJoomla_plugins_updates extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_joomla_plugin_updates'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelJoomla_plugins_updates extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_joomla_plugin_updates'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/language_translations.php
+++ b/admin/models/language_translations.php
@ -189,7 +189,7 @@ class ComponentbuilderModelLanguage_translations extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -676,17 +676,19 @@ class ComponentbuilderModelLanguage_translations extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_language_translation'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -701,7 +703,7 @@ class ComponentbuilderModelLanguage_translations extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_language_translation'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/languages.php
+++ b/admin/models/languages.php
@ -233,7 +233,7 @@ class ComponentbuilderModelLanguages extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -514,17 +514,19 @@ class ComponentbuilderModelLanguages extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_language'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -539,7 +541,7 @@ class ComponentbuilderModelLanguages extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_language'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/layouts.php
+++ b/admin/models/layouts.php
@ -126,7 +126,7 @@ class ComponentbuilderModelLayouts extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -485,17 +485,19 @@ class ComponentbuilderModelLayouts extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_layout'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -510,7 +512,7 @@ class ComponentbuilderModelLayouts extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_layout'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/libraries.php
+++ b/admin/models/libraries.php
@ -134,7 +134,7 @@ class ComponentbuilderModelLibraries extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -418,17 +418,19 @@ class ComponentbuilderModelLibraries extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_library'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -443,7 +445,7 @@ class ComponentbuilderModelLibraries extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_library'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/libraries_config.php
+++ b/admin/models/libraries_config.php
@ -94,7 +94,7 @@ class ComponentbuilderModelLibraries_config extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelLibraries_config extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_library_config'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelLibraries_config extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_library_config'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/libraries_files_folders_urls.php
+++ b/admin/models/libraries_files_folders_urls.php
@ -94,7 +94,7 @@ class ComponentbuilderModelLibraries_files_folders_urls extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -240,17 +240,19 @@ class ComponentbuilderModelLibraries_files_folders_urls extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_library_files_folders_urls'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -265,7 +267,7 @@ class ComponentbuilderModelLibraries_files_folders_urls extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_library_files_folders_urls'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/placeholders.php
+++ b/admin/models/placeholders.php
@ -110,7 +110,7 @@ class ComponentbuilderModelPlaceholders extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -395,17 +395,19 @@ class ComponentbuilderModelPlaceholders extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_placeholder'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -420,7 +422,7 @@ class ComponentbuilderModelPlaceholders extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_placeholder'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/servers.php
+++ b/admin/models/servers.php
@ -110,7 +110,7 @@ class ComponentbuilderModelServers extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -510,17 +510,19 @@ class ComponentbuilderModelServers extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_server'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -535,7 +537,7 @@ class ComponentbuilderModelServers extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_server'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/site_views.php
+++ b/admin/models/site_views.php
@ -195,7 +195,7 @@ class ComponentbuilderModelSite_views extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -681,17 +681,19 @@ class ComponentbuilderModelSite_views extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_site_view'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -706,7 +708,7 @@ class ComponentbuilderModelSite_views extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_site_view'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/snippet_types.php
+++ b/admin/models/snippet_types.php
@ -110,7 +110,7 @@ class ComponentbuilderModelSnippet_types extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -269,17 +269,19 @@ class ComponentbuilderModelSnippet_types extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_snippet_type'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -294,7 +296,7 @@ class ComponentbuilderModelSnippet_types extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_snippet_type'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/snippets.php
+++ b/admin/models/snippets.php
@ -248,7 +248,7 @@ class ComponentbuilderModelSnippets extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -576,17 +576,19 @@ class ComponentbuilderModelSnippets extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_snippet'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -601,7 +603,7 @@ class ComponentbuilderModelSnippets extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_snippet'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/templates.php
+++ b/admin/models/templates.php
@ -126,7 +126,7 @@ class ComponentbuilderModelTemplates extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -485,17 +485,19 @@ class ComponentbuilderModelTemplates extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_template'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -510,7 +512,7 @@ class ComponentbuilderModelTemplates extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_template'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/models/validation_rules.php
+++ b/admin/models/validation_rules.php
@ -110,7 +110,7 @@ class ComponentbuilderModelValidation_rules extends JModelList
 	 */
 	public function getItems()
 	{
-		// check in items
+		// Check in items
 		$this->checkInNow();

 		// load parent items
@ -393,17 +393,19 @@ class ComponentbuilderModelValidation_rules extends JModelList

 			// Get a db connection.
 			$db = JFactory::getDbo();
-			// reset query
+			// Reset query.
 			$query = $db->getQuery(true);
 			$query->select('*');
 			$query->from($db->quoteName('#__componentbuilder_validation_rule'));
-			$db->setQuery($query);
+			// Only select items that are checked out.
+			$query->where($db->quoteName('checked_out') . '!=0');
+			$db->setQuery($query, 0, 1);
 			$db->execute();
 			if ($db->getNumRows())
 			{
-				// Get Yesterdays date
+				// Get Yesterdays date.
 				$date = JFactory::getDate()->modify($time)->toSql();
-				// reset query
+				// Reset query.
 				$query = $db->getQuery(true);

 				// Fields to update.
@ -418,7 +420,7 @@ class ComponentbuilderModelValidation_rules extends JModelList
 					$db->quoteName('checked_out_time') . '<\''.$date.'\''
 				);

-				// Check table
+				// Check table.
 				$query->update($db->quoteName('#__componentbuilder_validation_rule'))->set($fields)->where($conditions); 

 				$db->setQuery($query);
--- a/admin/views/admin_custom_tabs/view.html.php
+++ b/admin/views/admin_custom_tabs/view.html.php
@ -150,10 +150,10 @@ class ComponentbuilderViewAdmin_custom_tabs extends JViewLegacy
 		}
 		JToolbarHelper::divider();
 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('admin_custom_tabs');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('admin_custom_tabs');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}
 	}

--- a/admin/views/admin_fields/view.html.php
+++ b/admin/views/admin_fields/view.html.php
@ -150,10 +150,10 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy
 		}
 		JToolbarHelper::divider();
 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('admin_fields');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('admin_fields');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}
 	}

--- a/admin/views/admin_fields_conditions/view.html.php
+++ b/admin/views/admin_fields_conditions/view.html.php
@ -150,10 +150,10 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy
 		}
 		JToolbarHelper::divider();
 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('admin_fields_conditions');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('admin_fields_conditions');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}
 	}

--- a/admin/views/admin_fields_relations/view.html.php
+++ b/admin/views/admin_fields_relations/view.html.php
@ -150,10 +150,10 @@ class ComponentbuilderViewAdmin_fields_relations extends JViewLegacy
 		}
 		JToolbarHelper::divider();
 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('admin_fields_relations');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('admin_fields_relations');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}
 	}

--- a/admin/views/admin_view/view.html.php
+++ b/admin/views/admin_view/view.html.php
@ -150,10 +150,10 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy
 		}
 		JToolbarHelper::divider();
 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('admin_view');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('admin_view');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}
 	}

--- a/admin/views/admin_views/view.html.php
+++ b/admin/views/admin_views/view.html.php
@ -152,10 +152,10 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 		}

 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('admin_views');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('admin_views');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}

 		// add the options comp button
--- a/admin/views/admins_custom_tabs/view.html.php
+++ b/admin/views/admins_custom_tabs/view.html.php
@ -137,10 +137,10 @@ class ComponentbuilderViewAdmins_custom_tabs extends JViewLegacy
 		}

 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('admins_custom_tabs');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('admins_custom_tabs');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}

 		// add the options comp button
--- a/admin/views/admins_fields/view.html.php
+++ b/admin/views/admins_fields/view.html.php
@ -137,10 +137,10 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy
 		}

 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('admins_fields');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('admins_fields');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}

 		// add the options comp button
--- a/admin/views/admins_fields_conditions/view.html.php
+++ b/admin/views/admins_fields_conditions/view.html.php
@ -137,10 +137,10 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy
 		}

 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('admins_fields_conditions');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('admins_fields_conditions');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}

 		// add the options comp button
--- a/admin/views/admins_fields_relations/view.html.php
+++ b/admin/views/admins_fields_relations/view.html.php
@ -137,10 +137,10 @@ class ComponentbuilderViewAdmins_fields_relations extends JViewLegacy
 		}

 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('admins_fields_relations');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('admins_fields_relations');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}

 		// add the options comp button
--- a/admin/views/class_extendings/view.html.php
+++ b/admin/views/class_extendings/view.html.php
@ -137,10 +137,10 @@ class ComponentbuilderViewClass_extendings extends JViewLegacy
 		}

 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('class_extendings');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('class_extendings');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}

 		// add the options comp button
--- a/admin/views/class_extends/view.html.php
+++ b/admin/views/class_extends/view.html.php
@ -150,10 +150,10 @@ class ComponentbuilderViewClass_extends extends JViewLegacy
 		}
 		JToolbarHelper::divider();
 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('class_extends');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('class_extends');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}
 	}

--- a/admin/views/class_method/view.html.php
+++ b/admin/views/class_method/view.html.php
@ -150,10 +150,10 @@ class ComponentbuilderViewClass_method extends JViewLegacy
 		}
 		JToolbarHelper::divider();
 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('class_method');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('class_method');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}
 	}

--- a/admin/views/class_methods/view.html.php
+++ b/admin/views/class_methods/view.html.php
@ -147,10 +147,10 @@ class ComponentbuilderViewClass_methods extends JViewLegacy
 		}

 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('class_methods');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('class_methods');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}

 		// add the options comp button
--- a/admin/views/class_properties/view.html.php
+++ b/admin/views/class_properties/view.html.php
@ -147,10 +147,10 @@ class ComponentbuilderViewClass_properties extends JViewLegacy
 		}

 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('class_properties');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('class_properties');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+				JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}

 		// add the options comp button
--- a/admin/views/class_property/view.html.php
+++ b/admin/views/class_property/view.html.php
@ -150,10 +150,10 @@ class ComponentbuilderViewClass_property extends JViewLegacy
 		}
 		JToolbarHelper::divider();
 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('class_property');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('class_property');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}
 	}

--- a/admin/views/compiler/view.html.php
+++ b/admin/views/compiler/view.html.php
@ -310,7 +310,7 @@ class ComponentbuilderViewCompiler extends JViewLegacy
 				jQuery.get(noticeboard)
 				.success(function(board) { 
 					if (board.length > 5) {
-						jQuery(\".noticeboard-md\").html(marked(board));
+						jQuery(\".noticeboard-md\").html(marked.parse(board));
 						getIS(1,board).done(function(result) {
 							if (result){
 								jQuery(\".vdm-new-notice\").show();
@ -327,7 +327,7 @@ class ComponentbuilderViewCompiler extends JViewLegacy
 				jQuery.get(proboard)
 				.success(function(board) { 
 					if (board.length > 5) {
-						jQuery(\".proboard-md\").html(marked(board));
+						jQuery(\".proboard-md\").html(marked.parse(board));
 					} else {
 						jQuery(\".proboard-md\").html(all_is_good);
 					}
@ -391,10 +391,10 @@ class ComponentbuilderViewCompiler extends JViewLegacy
 		}

 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('compiler');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('compiler');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}

 		// add the options comp button
--- a/admin/views/component_admin_views/view.html.php
+++ b/admin/views/component_admin_views/view.html.php
@ -150,10 +150,10 @@ class ComponentbuilderViewComponent_admin_views extends JViewLegacy
 		}
 		JToolbarHelper::divider();
 		// set help url for this view if found
-		$help_url = ComponentbuilderHelper::getHelpUrl('component_admin_views');
-		if (ComponentbuilderHelper::checkString($help_url))
+		$this->help_url = ComponentbuilderHelper::getHelpUrl('component_admin_views');
+		if (ComponentbuilderHelper::checkString($this->help_url))
 		{
-			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url);
+			JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
 		}
 	}

--- a/Show More
+++ b/Show More