Added the SAFEHTML filter to the copyright textarea of the Joomla components.

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 safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.11.0) 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.11.3) 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)
 
@@ -144,14 +144,14 @@ 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*: 23rd April, 2020
++ *Last Build*: 29th July, 2020
-+ *Version*: 2.11.0
++ *Version*: 2.11.3
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **280795**
++ *Line count*: **283076**
-+ *Field count*: **1514**
++ *Field count*: **1527**
-+ *File count*: **1769**
++ *File count*: **1785**
-+ *Folder count*: **286**
++ *Folder count*: **295**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

SECURITY.md

@@ -0,0 +1,7 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Report all security issues on the JCB website, and not on GitHub.
+
+### [joomlacomponentbuilder.com/report-security-issues](http://joomlacomponentbuilder.com/report-security-issues)

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 safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.11.0) 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.11.3) 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)
 
@@ -144,14 +144,14 @@ 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*: 23rd April, 2020
++ *Last Build*: 29th July, 2020
-+ *Version*: 2.11.0
++ *Version*: 2.11.3
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **280795**
++ *Line count*: **283076**
-+ *Field count*: **1514**
++ *Field count*: **1527**
-+ *File count*: **1769**
++ *File count*: **1785**
-+ *Folder count*: **286**
++ *Folder count*: **295**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

admin/assets/css/admin.css

@@ -13,6 +13,7 @@
 	pointer-events: none;
 }
 .fieldMedium { width: 120px; }
+.fieldLarge { width: 320px; }
 .fieldMid { width: 80px; }
 .fieldFull { width: 100%; }
 .fieldSmall { width: 60px; }

admin/compiler/joomla_3/Helper.php

@@ -18,6 +18,7 @@ defined('_JEXEC') or die('Restricted access');
 defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\Language\Language;
+use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;###ADMIN_HELPER_CLASS_HEADER###
 

admin/compiler/joomla_3/Helper_category_view.php

@@ -20,7 +20,7 @@ defined('_JEXEC') or die('Restricted access');
 /**
  * ###Component### ###View### Component Category Tree
  */
-class ###Component######Views###Categories extends JCategories
+class ###Component######View###Categories extends JCategories
 {
 	/**
 	 * Class constructor
@@ -31,7 +31,7 @@ class ###Component######Views###Categories extends JCategories
 	public function __construct($options = array())
 	{
 		$options['table'] = '#__###component###_###view###';
-		$options['extension'] = 'com_###component###.###views###';
+		$options['extension'] = 'com_###component###.###view###';
 
 		parent::__construct($options);
 	}

admin/compiler/joomla_3/Helper_site.php

@@ -18,6 +18,7 @@ defined('_JEXEC') or die('Restricted access');
 defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\Language\Language;
+use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;###SITE_HELPER_CLASS_HEADER###
 

admin/compiler/joomla_3/JControllerAdmin.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Views### Controller
  */

admin/compiler/joomla_3/JControllerAdmin_custom_admin.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###SViews### Controller
  */

admin/compiler/joomla_3/JControllerForm.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###View### Controller
  */

admin/compiler/joomla_3/JControllerForm_custom_site.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### ###SView### Controller
  */

admin/compiler/joomla_3/JControllerForm_site.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###View### Controller
  */

admin/compiler/joomla_3/JControllerLegacy.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * General Controller of ###Component### component
  */

admin/compiler/joomla_3/JControllerLegacyAjax.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### Ajax Controller
  */

admin/compiler/joomla_3/JControllerLegacyAjaxSite.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### Ajax Controller
  */

admin/compiler/joomla_3/JControllerLegacyHelp.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### Help Controller
  */

admin/compiler/joomla_3/JControllerLegacyHelp_site.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### Help Controller
  */

admin/compiler/joomla_3/JControllerLegacySITE.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### Component Controller
  */

admin/compiler/joomla_3/JControllerLegacy_custom_admin.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### ###SView### Controller
  */

admin/compiler/joomla_3/JControllerLegacy_import.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### Import Controller
  */

admin/compiler/joomla_3/JControllerLegacy_import_custom.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### ###View### Controller
  */

admin/compiler/joomla_3/JFormFieldCustom.php

@@ -17,9 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the ###JFORM_extends### field type
+###JFORM_TYPE_HEADER###
-jimport('joomla.form.helper');
-JFormHelper::loadFieldClass('###JFORM_extends###');
 
 /**
  * ###Type### Form Field class for the ###Component### component

admin/compiler/joomla_3/JModelAdmin.php

@@ -18,6 +18,8 @@ defined('_JEXEC') or die('Restricted access');
 defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
 
 /**
  * ###Component### ###View### Model
@@ -303,7 +305,7 @@ class ###Component###Model###View### extends JModelAdmin
 	{
 		// Sanitize ids.
 		$pks = array_unique($pks);
-		JArrayHelper::toInteger($pks);
+		ArrayHelper::toInteger($pks);
 
 		// Remove any values of zero.
 		if (array_search(0, $pks, true))
@@ -344,7 +346,7 @@ class ###Component###Model###View### extends JModelAdmin
 
 		if (!empty($commands['move_copy']))
 		{
-			$cmd = JArrayHelper::getValue($commands, 'move_copy', 'c');
+			$cmd = ArrayHelper::getValue($commands, 'move_copy', 'c');
 
 			if ($cmd == 'c')
 			{
@@ -424,7 +426,7 @@ class ###Component###Model###View### extends JModelAdmin
 	}
 	
 	/**
-	 * Method to generate a uniqe value.
+	 * Method to generate a unique value.
 	 *
 	 * @param   string  $field name.
 	 * @param   string  $value data.
@@ -433,15 +435,15 @@ class ###Component###Model###View### extends JModelAdmin
 	 *
 	 * @since   3.0
 	 */
-	protected function generateUniqe($field,$value)
+	protected function generateUnique($field,$value)
 	{
 
-		// set field value uniqe 
+		// set field value unique
 		$table = $this->getTable();
 
 		while ($table->load(array($field => $value)))
 		{
-			$value = JString::increment($value);
+			$value = StringHelper::increment($value);
 		}
 
 		return $value;

admin/compiler/joomla_3/JModelAdmin_site.php

@@ -18,6 +18,8 @@ defined('_JEXEC') or die('Restricted access');
 defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
 
 /**
  * ###Component### ###View### Model
@@ -303,7 +305,7 @@ class ###Component###Model###View### extends JModelAdmin
 	{
 		// Sanitize ids.
 		$pks = array_unique($pks);
-		JArrayHelper::toInteger($pks);
+		ArrayHelper::toInteger($pks);
 
 		// Remove any values of zero.
 		if (array_search(0, $pks, true))
@@ -344,7 +346,7 @@ class ###Component###Model###View### extends JModelAdmin
 
 		if (!empty($commands['move_copy']))
 		{
-			$cmd = JArrayHelper::getValue($commands, 'move_copy', 'c');
+			$cmd = ArrayHelper::getValue($commands, 'move_copy', 'c');
 
 			if ($cmd == 'c')
 			{
@@ -424,7 +426,7 @@ class ###Component###Model###View### extends JModelAdmin
 	}
 	
 	/**
-	 * Method to generate a uniqe value.
+	 * Method to generate a unique value.
 	 *
 	 * @param   string  $field name.
 	 * @param   string  $value data.
@@ -433,15 +435,15 @@ class ###Component###Model###View### extends JModelAdmin
 	 *
 	 * @since   3.0
 	 */
-	protected function generateUniqe($field,$value)
+	protected function generateUnique($field,$value)
 	{
 
-		// set field value uniqe 
+		// set field value unique
 		$table = $this->getTable();
 
 		while ($table->load(array($field => $value)))
 		{
-			$value = JString::increment($value);
+			$value = StringHelper::increment($value);
 		}
 
 		return $value;

admin/compiler/joomla_3/JModelItem_custom_admin.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### ###SView### Model
  */

admin/compiler/joomla_3/JModelItem_site.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### ###SView### Model
  */

admin/compiler/joomla_3/JModelLegacy_import.php

@@ -17,6 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 
 /**

admin/compiler/joomla_3/JModelLegacy_import_custom.php

@@ -17,6 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 
 /**

admin/compiler/joomla_3/JModelList.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Views### Model
  */

admin/compiler/joomla_3/JModelListAjax.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### Ajax Model
  */

admin/compiler/joomla_3/JModelListAjaxSite.php

@@ -17,7 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-jimport('joomla.application.component.helper');
+use Joomla\Utilities\ArrayHelper;
 
 /**
  * ###Component### Ajax Model

admin/compiler/joomla_3/JModelList_custom_admin.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### Model for ###SViews###
  */

admin/compiler/joomla_3/JModelList_site.php

@@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * ###Component### Model for ###SViews###
  */

admin/compiler/joomla_3/JTable.php

@@ -18,6 +18,8 @@ defined('_JEXEC') or die('Restricted access');
 defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
 
 /**
  * ###Views### Table class
@@ -142,7 +144,7 @@ class ###Component###Table###View### extends JTable
 
 			while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0))
 			{
-				$this->alias = JString::increment($this->alias, 'dash');
+				$this->alias = StringHelper::increment($this->alias, 'dash');
 			}
 		}
 		
@@ -157,7 +159,7 @@ class ###Component###Table###View### extends JTable
 			$bad_characters = array("\n", "\r", "\"", "<", ">");
 
 			// Remove bad characters.
-			$after_clean = JString::str_ireplace($bad_characters, "", $this->metakey);
+			$after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey);
 
 			// Create array using commas as delimiter.
 			$keys = explode(',', $after_clean);
@@ -181,7 +183,7 @@ class ###Component###Table###View### extends JTable
 		{
 			// Only process if not empty
 			$bad_characters = array("\"", "<", ">");
-			$this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc);
+			$this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc);
 		}
 
 		// If we don't have any access rules set at this point just use an empty JAccessRules class
@@ -220,7 +222,7 @@ class ###Component###Table###View### extends JTable
 		$db->execute();
 		if ($db->loadRowList())
 		{
-			// asset alread set so use saved rules
+			// asset already set so use saved rules
 			$assetId = (int) $db->loadResult();
 			return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed.
 		}

admin/compiler/joomla_3/JViewLegacy_list.php

@@ -38,9 +38,7 @@ class ###Component###View###Views### extends JViewLegacy
 		$this->items = $this->get('Items');
 		$this->pagination = $this->get('Pagination');
 		$this->state = $this->get('State');
-		$this->user = JFactory::getUser();
+		$this->user = JFactory::getUser();###ADMIN_DIPLAY_METHOD###
-		$this->listOrder = $this->escape($this->state->get('list.ordering'));
-		$this->listDirn = $this->escape($this->state->get('list.direction'));
 		$this->saveOrder = $this->listOrder == 'ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));

admin/compiler/joomla_3/edit_site.php

@@ -24,9 +24,10 @@ JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.tabstate');
 JHtml::_('behavior.calendar');
-$componentParams = $this->params; // will be removed just use $this->params instead
 ?>
+<div class="###component###-###view###">
 <?php echo $this->toolbar->render(); ?>
 <form action="<?php echo JRoute::_('index.php?option=com_###component###&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 ###EDITBODY###
-</form>###EDITBODYSCRIPT###
+</form>
+</div>###EDITBODYSCRIPT###

admin/compiler/joomla_3/layout_admin.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2018 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');
+?>
+###BOM###
+
+// No direct access to this file
+defined('JPATH_BASE') or die('Restricted access');###ADMIN_LAYOUT_CODE###
+
+?>###ADMIN_LAYOUT_BODY###

admin/compiler/joomla_3/settings.json

@@ -376,6 +376,11 @@
 					"rename": "JFormRule",
 					"type": "rule"
 				},
+				"layout_admin.php": {
+					"path": "c0mp0n3nt/admin/layouts",
+					"rename": "layout_admin",
+					"type": "layout"
+				},
 				"layoutitems.php": {
 					"path": "c0mp0n3nt/admin/layouts/VIEW",
 					"rename": "layoutitems",

admin/config.xml

@@ -47,6 +47,71 @@
 		/>
 		<field type="spacer" name="spacerHistory" hr="true" />
 
+		<!-- Subform_layouts Field. Type: Subform. (joomla) -->
+		<field
+			type="subform"
+			name="subform_layouts"
+			label="COM_COMPONENTBUILDER_CONFIG_SUBFORM_LAYOUTS_LABEL"
+			layout="joomla.form.field.subform.repeatable-table"
+			multiple="true"
+			buttons="add,remove,move"
+			description="COM_COMPONENTBUILDER_CONFIG_SUBFORM_LAYOUTS_DESCRIPTION"
+			icon="list"
+			max="9"
+			min="1">
+			<form hidden="true" name="list_subform_layouts_modal" repeat="true">
+				<!-- View_field Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="view_field"
+					label="COM_COMPONENTBUILDER_CONFIG_VIEW_FIELD_LABEL"
+					class="list_class"
+					multiple="false"
+					filter="CMD"
+					required="true"
+					default="default">
+					<!-- Option Set. -->
+					<option value="default">
+						COM_COMPONENTBUILDER_CONFIG_DEFAULT</option>
+					<option value="admin_custom_tabs.tabs">
+						COM_COMPONENTBUILDER_CONFIG_ADMIN_CUSTOM_TABS_TABS</option>
+					<option value="admin_fields.addfields">
+						COM_COMPONENTBUILDER_CONFIG_ADMIN_FIELDS_ADDFIELDS</option>
+					<option value="admin_fields_conditions.addconditions">
+						COM_COMPONENTBUILDER_CONFIG_ADMIN_FIELDS_CONDITIONS_ADDCONDITIONS</option>
+					<option value="admin_fields_relations.addrelations">
+						COM_COMPONENTBUILDER_CONFIG_ADMIN_FIELDS_RELATIONS_ADDRELATIONS</option>
+					<option value="component_admin_views.addadmin_views">
+						COM_COMPONENTBUILDER_CONFIG_COMPONENT_ADMIN_VIEWS_ADDADMIN_VIEWS</option>
+					<option value="component_custom_admin_views.addcustom_admin_views">
+						COM_COMPONENTBUILDER_CONFIG_COMPONENT_CUSTOM_ADMIN_VIEWS_ADDCUSTOM_ADMIN_VIEWS</option>
+					<option value="component_site_views.addsite_views">
+						COM_COMPONENTBUILDER_CONFIG_COMPONENT_SITE_VIEWS_ADDSITE_VIEWS</option>
+					<option value="dynamic_get.join_db_table">
+						COM_COMPONENTBUILDER_CONFIG_DYNAMIC_GET_JOIN_DB_TABLE</option>
+					<option value="dynamic_get.join_view_table">
+						COM_COMPONENTBUILDER_CONFIG_DYNAMIC_GET_JOIN_VIEW_TABLE</option>
+				</field>
+				<!-- Layout Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="layout"
+					label="COM_COMPONENTBUILDER_CONFIG_LAYOUT_LABEL"
+					class="list_class"
+					multiple="false"
+					filter="CMD"
+					required="true"
+					default="joomla.form.field.subform.repeatable-table">
+					<!-- Option Set. -->
+					<option value="joomla.form.field.subform.repeatable-table">
+						COM_COMPONENTBUILDER_CONFIG_REPEATABLETABLE_JOOMLA</option>
+					<option value="joomla.form.field.subform.repeatable">
+						COM_COMPONENTBUILDER_CONFIG_REPEATABLE_JOOMLA</option>
+					<option value="repeatablejcb">
+						COM_COMPONENTBUILDER_CONFIG_REPEATABLE_UIKIT</option>
+				</field>
+			</form>
+		</field>
 		<!-- Editor Field. Type: Plugins. (joomla) -->
 		<field
 			type="plugins"
@@ -246,6 +311,20 @@
 			max="100"
 			step="10"
 		/>
+		<!-- Export_language_strings Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="export_language_strings"
+			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_LANGUAGE_STRINGS_LABEL"
+			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_LANGUAGE_STRINGS_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CONFIG_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_CONFIG_NO</option>
+		</field>
 		<!-- Spacer_hr_six Field. Type: Spacer. A None Database Field. (joomla) -->
 		<field type="spacer" name="spacer_hr_six" hr="true" class="spacer_hr_six" />
 		<!-- Compiler_field_builder_type Field. Type: List. (joomla) -->

admin/controller.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * General Controller of Componentbuilder component
  */

admin/controllers/admin_custom_tabs.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Admin_custom_tabs Controller
  */

admin/controllers/admin_fields.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Admin_fields Controller
  */

admin/controllers/admin_fields_conditions.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Admin_fields_conditions Controller
  */

admin/controllers/admin_fields_relations.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Admin_fields_relations Controller
  */

admin/controllers/admin_view.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Admin_view Controller
  */

admin/controllers/admin_views.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Admin_views Controller
  */
@@ -53,7 +55,7 @@ class ComponentbuilderControllerAdmin_views extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			JArrayHelper::toInteger($pks);
+			ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Admin_views');
 			// get the data to export

admin/controllers/admins_custom_tabs.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Admins_custom_tabs Controller
  */

admin/controllers/admins_fields.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Admins_fields Controller
  */

admin/controllers/admins_fields_conditions.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Admins_fields_conditions Controller
  */

admin/controllers/admins_fields_relations.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Admins_fields_relations Controller
  */

admin/controllers/ajax.json.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Componentbuilder Ajax Controller
  */

admin/controllers/class_extendings.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Class_extendings Controller
  */

admin/controllers/class_extends.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Class_extends Controller
  */

admin/controllers/class_method.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Class_method Controller
  */

admin/controllers/class_methods.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Class_methods Controller
  */
@@ -53,7 +55,7 @@ class ComponentbuilderControllerClass_methods extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			JArrayHelper::toInteger($pks);
+			ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Class_methods');
 			// get the data to export

admin/controllers/class_properties.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Class_properties Controller
  */
@@ -53,7 +55,7 @@ class ComponentbuilderControllerClass_properties extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			JArrayHelper::toInteger($pks);
+			ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Class_properties');
 			// get the data to export

admin/controllers/class_property.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Class_property Controller
  */

admin/controllers/compiler.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Compiler Controller
  */

admin/controllers/component_admin_views.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Component_admin_views Controller
  */

admin/controllers/component_config.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Component_config Controller
  */

admin/controllers/component_custom_admin_menus.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Component_custom_admin_menus Controller
  */

admin/controllers/component_custom_admin_views.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Component_custom_admin_views Controller
  */

admin/controllers/component_dashboard.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Component_dashboard Controller
  */

admin/controllers/component_files_folders.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Component_files_folders Controller
  */

admin/controllers/component_modules.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Component_modules Controller
  */

admin/controllers/component_mysql_tweaks.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Component_mysql_tweaks Controller
  */

admin/controllers/component_placeholders.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Component_placeholders Controller
  */

admin/controllers/component_plugins.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Component_plugins Controller
  */

admin/controllers/component_site_views.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Component_site_views Controller
  */

admin/controllers/component_updates.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Component_updates Controller
  */

admin/controllers/components_admin_views.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Components_admin_views Controller
  */

admin/controllers/components_config.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Components_config Controller
  */

admin/controllers/components_custom_admin_menus.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Components_custom_admin_menus Controller
  */

admin/controllers/components_custom_admin_views.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Components_custom_admin_views Controller
  */

admin/controllers/components_dashboard.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Components_dashboard Controller
  */

admin/controllers/components_files_folders.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Components_files_folders Controller
  */

admin/controllers/components_modules.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Components_modules Controller
  */

admin/controllers/components_mysql_tweaks.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Components_mysql_tweaks Controller
  */

admin/controllers/components_placeholders.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Components_placeholders Controller
  */

admin/controllers/components_plugins.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Components_plugins Controller
  */

admin/controllers/components_site_views.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Components_site_views Controller
  */

admin/controllers/components_updates.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Components_updates Controller
  */

admin/controllers/custom_admin_view.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Custom_admin_view Controller
  */

admin/controllers/custom_admin_views.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Custom_admin_views Controller
  */
@@ -53,7 +55,7 @@ class ComponentbuilderControllerCustom_admin_views extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			JArrayHelper::toInteger($pks);
+			ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Custom_admin_views');
 			// get the data to export

admin/controllers/custom_code.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Custom_code Controller
  */

admin/controllers/custom_codes.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Custom_codes Controller
  */
@@ -53,7 +55,7 @@ class ComponentbuilderControllerCustom_codes extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			JArrayHelper::toInteger($pks);
+			ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Custom_codes');
 			// get the data to export

admin/controllers/dynamic_get.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Dynamic_get Controller
  */

admin/controllers/dynamic_gets.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Dynamic_gets Controller
  */
@@ -53,7 +55,7 @@ class ComponentbuilderControllerDynamic_gets extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			JArrayHelper::toInteger($pks);
+			ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Dynamic_gets');
 			// get the data to export

admin/controllers/field.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Field Controller
  */

admin/controllers/fields.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Fields Controller
  */
@@ -53,7 +55,7 @@ class ComponentbuilderControllerFields extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			JArrayHelper::toInteger($pks);
+			ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Fields');
 			// get the data to export

admin/controllers/fieldtype.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Fieldtype Controller
  */

admin/controllers/fieldtypes.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Fieldtypes Controller
  */
@@ -53,7 +55,7 @@ class ComponentbuilderControllerFieldtypes extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			JArrayHelper::toInteger($pks);
+			ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Fieldtypes');
 			// get the data to export

admin/controllers/get_snippets.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Get_snippets Controller
  */

admin/controllers/help.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Componentbuilder Help Controller
  */

admin/controllers/help_document.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Help_document Controller
  */

admin/controllers/help_documents.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Help_documents Controller
  */
@@ -53,7 +55,7 @@ class ComponentbuilderControllerHelp_documents extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			JArrayHelper::toInteger($pks);
+			ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Help_documents');
 			// get the data to export

admin/controllers/import.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Componentbuilder Import Controller
  */

admin/controllers/import_joomla_components.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Componentbuilder Import_joomla_components Controller
  */

admin/controllers/import_language_translations.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Componentbuilder Import_language_translations Controller
  */

admin/controllers/joomla_component.php

@@ -12,6 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Joomla_component Controller
  */