Fixed changelog direction so newest changes is listed at top of the file. Finished the init function of super powers. Adds rest function inside super power. Adds super powers to all templates. Updates many helper class methods to now use the utility classes. Adds the method to the component entry file (as-well). Moved most methods from the compiler fields class to powers. #955 Refactored many new builder classes from the registry class. Converted the Content class to two builder classes. Adds option to add additional templates to a module. Resolves #1002 by adding STRING instead of WORD. Ported the FOF encryption class into Powers. https://git.vdm.dev/joomla/fof Changed all CSS and JS to use instead of in compiler code. Adds option to turn jQuery off if UIKIT 3 is added. Adds option to auto write injection boilerplate code in Powers area. Adds option to auto write service provider boilerplate code in the Powers area. Improved the method and all banner locations to fetch from https://git.vdm.dev/joomla/jcb-external/ instead. Major stability improvements all over the new powers complier classes. New [base Registry class](https://git.vdm.dev/joomla/super-powers/src/branch/master/src/7e822c03-1b20-41d1-9427-f5b8d5836af7) has been created specially for JCB. Remember to update all plug-ins with this version update (use the package).

admin/models/admin_custom_tabs.php

@@ -284,7 +284,7 @@ class ComponentbuilderModelAdmin_custom_tabs extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('admin_custom_tabs.edit.state', 'com_componentbuilder');
 	}
     

admin/models/admin_fields.php

@@ -305,7 +305,7 @@ class ComponentbuilderModelAdmin_fields extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('admin_fields.edit.state', 'com_componentbuilder');
 	}
     

admin/models/admin_fields_conditions.php

@@ -305,7 +305,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('admin_fields_conditions.edit.state', 'com_componentbuilder');
 	}
     

admin/models/admin_fields_relations.php

@@ -16,6 +16,8 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 /**
  * Componentbuilder Admin_fields_relations Admin Model
@@ -101,7 +103,7 @@ class ComponentbuilderModelAdmin_fields_relations extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'admin_fields_relations__'.$id);
 				ComponentbuilderHelper::set('admin_fields_relations__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -109,7 +111,7 @@ class ComponentbuilderModelAdmin_fields_relations extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -175,7 +177,7 @@ class ComponentbuilderModelAdmin_fields_relations extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'admin_fields_relations__'.$id);
 				ComponentbuilderHelper::set('admin_fields_relations__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -183,7 +185,7 @@ class ComponentbuilderModelAdmin_fields_relations extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -367,7 +369,7 @@ class ComponentbuilderModelAdmin_fields_relations extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('admin_fields_relations.edit.state', 'com_componentbuilder');
 	}
     

admin/models/admin_view.php

@@ -16,6 +16,11 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 /**
  * Componentbuilder Admin_view Admin Model
@@ -249,7 +254,7 @@ class ComponentbuilderModelAdmin_view extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'admin_view__'.$id);
 				ComponentbuilderHelper::set('admin_view__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -257,7 +262,7 @@ class ComponentbuilderModelAdmin_view extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -599,7 +604,7 @@ class ComponentbuilderModelAdmin_view extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'admin_view__'.$id);
 				ComponentbuilderHelper::set('admin_view__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -607,7 +612,7 @@ class ComponentbuilderModelAdmin_view extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -785,7 +790,7 @@ class ComponentbuilderModelAdmin_view extends AdminModel
 		// now get all the editor fields
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
 		// check if we found any
-		if (ComponentbuilderHelper::checkArray($editors))
+		if (UtilitiesArrayHelper::check($editors))
 		{
 			foreach ($editors as $editor)
 			{
@@ -800,7 +805,7 @@ class ComponentbuilderModelAdmin_view extends AdminModel
 		// Only load the GUID if new item (or empty)
 		if (0 == $id || !($val = $form->getValue('guid')))
 		{
-			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+			$form->setValue('guid', null, GuidHelper::get());
 		}
 
 		return $form;
@@ -864,7 +869,7 @@ class ComponentbuilderModelAdmin_view extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('admin_view.edit.state', 'com_componentbuilder');
 	}
     
@@ -1030,7 +1035,7 @@ class ComponentbuilderModelAdmin_view extends AdminModel
 		}
 
 		// we must also delete the linked tables found
-		if (ComponentbuilderHelper::checkArray($pks))
+		if (UtilitiesArrayHelper::check($pks))
 		{
 			$_tablesArray = array(
 				'admin_fields',
@@ -1072,7 +1077,7 @@ class ComponentbuilderModelAdmin_view extends AdminModel
 		}
 
 		// we must also update all linked tables
-		if (ComponentbuilderHelper::checkArray($pks))
+		if (UtilitiesArrayHelper::check($pks))
 		{
 			$_tablesArray = array(
 				'admin_fields',
@@ -1482,7 +1487,7 @@ class ComponentbuilderModelAdmin_view extends AdminModel
 		}
 
 		// if system name is empty create a system name from the name_single
-		if (empty($data['system_name']) || !ComponentbuilderHelper::checkString($data['system_name']))
+		if (empty($data['system_name']) || !UtilitiesStringHelper::check($data['system_name']))
 		{
 			$data['system_name'] = $data['name_single'];
 		}
@@ -1491,15 +1496,15 @@ class ComponentbuilderModelAdmin_view extends AdminModel
 		if (empty($data['guid']) && $data['id'] > 0)
 		{
 			// get the existing one
-			$data['guid'] = (string) ComponentbuilderHelper::getVar('admin_view', $data['id'], 'id', 'guid');
+			$data['guid'] = (string) GetHelper::var('admin_view', $data['id'], 'id', 'guid');
 		}
+
 		// Set the GUID if empty or not valid
-		while (!ComponentbuilderHelper::validGUID($data['guid'], "admin_view", $data['id']))
+		while (!GuidHelper::valid($data['guid'], "admin_view", $data['id']))
 		{
 			// must always be set
-			$data['guid'] = (string) ComponentbuilderHelper::GUID();
-		}
-
+			$data['guid'] = (string) GuidHelper::get();
+		}
 
 		// Set the addpermissions items to data.
 		if (isset($data['addpermissions']) && is_array($data['addpermissions']))

admin/models/admin_views.php

@@ -15,7 +15,7 @@ defined('_JEXEC') or die('Restricted access');
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Utilities\FilterHelper as JCBFilterHelper;
-use VDM\Joomla\Componentbuilder\Utilities\FormHelper as JCBFormHelper;
+use VDM\Joomla\Utilities\FormHelper as JCBFormHelper;
 
 /**
  * Admin_views List Model

admin/models/class_extends.php

@@ -16,6 +16,10 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\String\ClassfunctionHelper;
 
 /**
  * Componentbuilder Class_extends Admin Model
@@ -104,7 +108,7 @@ class ComponentbuilderModelClass_extends extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'class_extends__'.$id);
 				ComponentbuilderHelper::set('class_extends__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -112,7 +116,7 @@ class ComponentbuilderModelClass_extends extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -182,7 +186,7 @@ class ComponentbuilderModelClass_extends extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'class_extends__'.$id);
 				ComponentbuilderHelper::set('class_extends__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -190,7 +194,7 @@ class ComponentbuilderModelClass_extends extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -316,7 +320,7 @@ class ComponentbuilderModelClass_extends extends AdminModel
 		// now get all the editor fields
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
 		// check if we found any
-		if (ComponentbuilderHelper::checkArray($editors))
+		if (UtilitiesArrayHelper::check($editors))
 		{
 			foreach ($editors as $editor)
 			{
@@ -388,7 +392,7 @@ class ComponentbuilderModelClass_extends extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('class_extends.edit.state', 'com_componentbuilder');
 	}
     
@@ -912,7 +916,7 @@ class ComponentbuilderModelClass_extends extends AdminModel
 		}
 
 		// make sure the name is safe to be used as a class name
-		$data['name'] = ComponentbuilderHelper::safeClassFunctionName($data['name']);
+		$data['name'] = ClassfunctionHelper::safe($data['name']);
 
 		// Set the head string to base64 string.
 		if (isset($data['head']))

admin/models/class_method.php

@@ -16,6 +16,12 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\String\ClassfunctionHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 /**
  * Componentbuilder Class_method Admin Model
@@ -107,7 +113,7 @@ class ComponentbuilderModelClass_method extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'class_method__'.$id);
 				ComponentbuilderHelper::set('class_method__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -115,7 +121,7 @@ class ComponentbuilderModelClass_method extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -191,7 +197,7 @@ class ComponentbuilderModelClass_method extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'class_method__'.$id);
 				ComponentbuilderHelper::set('class_method__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -199,7 +205,7 @@ class ComponentbuilderModelClass_method extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -325,7 +331,7 @@ class ComponentbuilderModelClass_method extends AdminModel
 		// now get all the editor fields
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
 		// check if we found any
-		if (ComponentbuilderHelper::checkArray($editors))
+		if (UtilitiesArrayHelper::check($editors))
 		{
 			foreach ($editors as $editor)
 			{
@@ -340,9 +346,9 @@ class ComponentbuilderModelClass_method extends AdminModel
 		// Only load the GUID if new item (or empty)
 		if (0 == $id || !($val = $form->getValue('guid')))
 		{
-			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+			$form->setValue('guid', null, GuidHelper::get());
 		}
-
+ 
 		return $form;
 	}
 
@@ -404,7 +410,7 @@ class ComponentbuilderModelClass_method extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('class_method.edit.state', 'com_componentbuilder');
 	}
     
@@ -964,21 +970,21 @@ class ComponentbuilderModelClass_method extends AdminModel
 		}
 
 		// make sure the name is safe to be used as a function name
-		$data['name'] = ComponentbuilderHelper::safeClassFunctionName($data['name']);
+		$data['name'] = ClassfunctionHelper::safe($data['name']);
 
 		// Set the GUID if empty or not valid
 		if (empty($data['guid']) && $data['id'] > 0)
 		{
 			// get the existing one
-			$data['guid'] = (string) ComponentbuilderHelper::getVar('class_method', $data['id'], 'id', 'guid');
+			$data['guid'] = (string) GetHelper::var('class_method', $data['id'], 'id', 'guid');
 		}
+
 		// Set the GUID if empty or not valid
-		while (!ComponentbuilderHelper::validGUID($data['guid'], "class_method", $data['id']))
+		while (!GuidHelper::valid($data['guid'], "class_method", $data['id']))
 		{
 			// must always be set
-			$data['guid'] = (string) ComponentbuilderHelper::GUID();
-		}
-
+			$data['guid'] = (string) GuidHelper::get();
+		}
 
 		// Set the code string to base64 string.
 		if (isset($data['code']))

admin/models/class_property.php

@@ -16,6 +16,12 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\String\ClassfunctionHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 /**
  * Componentbuilder Class_property Admin Model
@@ -104,7 +110,7 @@ class ComponentbuilderModelClass_property extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'class_property__'.$id);
 				ComponentbuilderHelper::set('class_property__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -112,7 +118,7 @@ class ComponentbuilderModelClass_property extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -182,7 +188,7 @@ class ComponentbuilderModelClass_property extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'class_property__'.$id);
 				ComponentbuilderHelper::set('class_property__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -190,7 +196,7 @@ class ComponentbuilderModelClass_property extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -316,7 +322,7 @@ class ComponentbuilderModelClass_property extends AdminModel
 		// now get all the editor fields
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
 		// check if we found any
-		if (ComponentbuilderHelper::checkArray($editors))
+		if (UtilitiesArrayHelper::check($editors))
 		{
 			foreach ($editors as $editor)
 			{
@@ -331,9 +337,9 @@ class ComponentbuilderModelClass_property extends AdminModel
 		// Only load the GUID if new item (or empty)
 		if (0 == $id || !($val = $form->getValue('guid')))
 		{
-			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+			$form->setValue('guid', null, GuidHelper::get());
 		}
-
+ 
 		return $form;
 	}
 
@@ -395,7 +401,7 @@ class ComponentbuilderModelClass_property extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('class_property.edit.state', 'com_componentbuilder');
 	}
     
@@ -955,21 +961,21 @@ class ComponentbuilderModelClass_property extends AdminModel
 		}
 
 		// make sure the name is safe to be used as a function name
-		$data['name'] = ComponentbuilderHelper::safeClassFunctionName($data['name']);
+		$data['name'] = ClassfunctionHelper::safe($data['name']);
 
 		// Set the GUID if empty or not valid
 		if (empty($data['guid']) && $data['id'] > 0)
 		{
 			// get the existing one
-			$data['guid'] = (string) ComponentbuilderHelper::getVar('class_property', $data['id'], 'id', 'guid');
+			$data['guid'] = (string) GetHelper::var('class_property', $data['id'], 'id', 'guid');
 		}
+
 		// Set the GUID if empty or not valid
-		while (!ComponentbuilderHelper::validGUID($data['guid'], "class_property", $data['id']))
+		while (!GuidHelper::valid($data['guid'], "class_property", $data['id']))
 		{
 			// must always be set
-			$data['guid'] = (string) ComponentbuilderHelper::GUID();
-		}
-
+			$data['guid'] = (string) GuidHelper::get();
+		}
 
 		// Set the comment string to base64 string.
 		if (isset($data['comment']))

admin/models/compiler.php

@@ -14,6 +14,7 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 
 /**
  * Componentbuilder List Model for Compiler
@@ -373,7 +374,7 @@ class ComponentbuilderModelCompiler extends ListModel
 			}
 		}
 		// check if we had any errors
-		if (ComponentbuilderHelper::checkArray($errorMessage))
+		if (UtilitiesArrayHelper::check($errorMessage))
 		{
 			// flatten the error message array
 			$errorMessage = implode('<br />', $errorMessage);

admin/models/component_admin_views.php

@@ -322,7 +322,7 @@ class ComponentbuilderModelComponent_admin_views extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('component_admin_views.edit.state', 'com_componentbuilder');
 	}
     

admin/models/component_config.php

@@ -318,7 +318,7 @@ class ComponentbuilderModelComponent_config extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('component_config.edit.state', 'com_componentbuilder');
 	}
     

admin/models/component_custom_admin_menus.php

@@ -321,7 +321,7 @@ class ComponentbuilderModelComponent_custom_admin_menus extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('component_custom_admin_menus.edit.state', 'com_componentbuilder');
 	}
     

admin/models/component_custom_admin_views.php

@@ -322,7 +322,7 @@ class ComponentbuilderModelComponent_custom_admin_views extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('component_custom_admin_views.edit.state', 'com_componentbuilder');
 	}
     

admin/models/component_dashboard.php

@@ -16,6 +16,8 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 /**
  * Componentbuilder Component_dashboard Admin Model
@@ -108,7 +110,7 @@ class ComponentbuilderModelComponent_dashboard extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'component_dashboard__'.$id);
 				ComponentbuilderHelper::set('component_dashboard__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -116,7 +118,7 @@ class ComponentbuilderModelComponent_dashboard extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -188,7 +190,7 @@ class ComponentbuilderModelComponent_dashboard extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'component_dashboard__'.$id);
 				ComponentbuilderHelper::set('component_dashboard__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -196,7 +198,7 @@ class ComponentbuilderModelComponent_dashboard extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -410,7 +412,7 @@ class ComponentbuilderModelComponent_dashboard extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('component_dashboard.edit.state', 'com_componentbuilder');
 	}
     

admin/models/component_files_folders.php

@@ -355,7 +355,7 @@ class ComponentbuilderModelComponent_files_folders extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('component_files_folders.edit.state', 'com_componentbuilder');
 	}
     

admin/models/component_modules.php

@@ -288,7 +288,7 @@ class ComponentbuilderModelComponent_modules extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('component_modules.edit.state', 'com_componentbuilder');
 	}
     

admin/models/component_mysql_tweaks.php

@@ -318,7 +318,7 @@ class ComponentbuilderModelComponent_mysql_tweaks extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('component_mysql_tweaks.edit.state', 'com_componentbuilder');
 	}
     

admin/models/component_placeholders.php

@@ -287,7 +287,7 @@ class ComponentbuilderModelComponent_placeholders extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('component_placeholders.edit.state', 'com_componentbuilder');
 	}
     

admin/models/component_plugins.php

@@ -288,7 +288,7 @@ class ComponentbuilderModelComponent_plugins extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('component_plugins.edit.state', 'com_componentbuilder');
 	}
     

admin/models/component_site_views.php

@@ -322,7 +322,7 @@ class ComponentbuilderModelComponent_site_views extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('component_site_views.edit.state', 'com_componentbuilder');
 	}
     

admin/models/component_updates.php

@@ -321,7 +321,7 @@ class ComponentbuilderModelComponent_updates extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('component_updates.edit.state', 'com_componentbuilder');
 	}
     

admin/models/componentbuilder.php

@@ -32,7 +32,7 @@ class ComponentbuilderModelComponentbuilder extends ListModel
 			'main' => array('png.compiler', 'png.joomla_components', 'png.joomla_modules', 'png.joomla_plugins', 'png.powers', 'png.search', 'png||importjcbpackages||index.php?option=com_componentbuilder&view=joomla_components&task=joomla_components.smartImport', 'png.admin_views', 'png.custom_admin_views', 'png.site_views', 'png.template.add', 'png.templates', 'png.layouts', 'png.dynamic_get.add', 'png.dynamic_gets', 'png.custom_codes', 'png.placeholders', 'png.libraries', 'png.snippets', 'png.get_snippets', 'png.validation_rules', 'png.field.add', 'png.fields', 'png.fields.catid_qpo0O0oqp_com_componentbuilder_po0O0oq_field', 'png.fieldtypes', 'png.fieldtypes.catid_qpo0O0oqp_com_componentbuilder_po0O0oq_fieldtype', 'png.language_translations', 'png.servers', 'png.help_documents')
 		);
 		// view access array
-		$viewAccess = array(
+		$viewAccess = [
 			'compiler.submenu' => 'compiler.submenu',
 			'compiler.dashboard_list' => 'compiler.dashboard_list',
 			'search.access' => 'search.access',
@@ -221,7 +221,8 @@ class ComponentbuilderModelComponentbuilder extends ListModel
 			'joomla_plugin_updates.access' => 'joomla_plugin_updates.access',
 			'joomla_plugin_files_folders_urls.create' => 'joomla_plugin_files_folders_urls.create',
 			'joomla_plugins_files_folders_urls.access' => 'joomla_plugin_files_folders_urls.access',
-			'joomla_plugin_files_folders_urls.access' => 'joomla_plugin_files_folders_urls.access');
+			'joomla_plugin_files_folders_urls.access' => 'joomla_plugin_files_folders_urls.access',
+		];
 		// loop over the $views
 		foreach($viewGroups as $group => $views)
 		{
@@ -527,6 +528,12 @@ jQuery(document).ready( function($) {
 		return '<div id="readme-md"><small>'.JText::_('COM_COMPONENTBUILDER_THE_README_IS_LOADING').'.<span class="loading-dots">.</span></small></div>';
 	}
 
+	/**
+	 * get Current Version Bay adding JavaScript to the Page
+	 *
+	 * @return  void
+	 * @since   2.3.0
+	 */
 	public function getVersion()
 	{
 		// the call URL

admin/models/custom_admin_view.php

@@ -16,6 +16,11 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 /**
  * Componentbuilder Custom_admin_view Admin Model
@@ -166,7 +171,7 @@ class ComponentbuilderModelCustom_admin_view extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'custom_admin_view__'.$id);
 				ComponentbuilderHelper::set('custom_admin_view__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -174,7 +179,7 @@ class ComponentbuilderModelCustom_admin_view extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -336,7 +341,7 @@ class ComponentbuilderModelCustom_admin_view extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'custom_admin_view__'.$id);
 				ComponentbuilderHelper::set('custom_admin_view__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -344,7 +349,7 @@ class ComponentbuilderModelCustom_admin_view extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -489,7 +494,7 @@ class ComponentbuilderModelCustom_admin_view extends AdminModel
 		// now get all the editor fields
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
 		// check if we found any
-		if (ComponentbuilderHelper::checkArray($editors))
+		if (UtilitiesArrayHelper::check($editors))
 		{
 			foreach ($editors as $editor)
 			{
@@ -504,9 +509,9 @@ class ComponentbuilderModelCustom_admin_view extends AdminModel
 		// Only load the GUID if new item (or empty)
 		if (0 == $id || !($val = $form->getValue('guid')))
 		{
-			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+			$form->setValue('guid', null, GuidHelper::get());
 		}
-
+ 
 		return $form;
 	}
 
@@ -568,7 +573,7 @@ class ComponentbuilderModelCustom_admin_view extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return parent::canEditState($record);
 	}
     
@@ -838,7 +843,7 @@ class ComponentbuilderModelCustom_admin_view extends AdminModel
 			$this->canDo		= ComponentbuilderHelper::getActions('custom_admin_view');
 		}
 
-		if (!$this->canDo->get('core.create') || !$this->canDo->get('core.batch'))
+		if (!$this->canDo->get('core.create') && !$this->canDo->get('custom_admin_view.batch'))
 		{
 			return false;
 		}
@@ -981,7 +986,7 @@ class ComponentbuilderModelCustom_admin_view extends AdminModel
 			$this->canDo		= ComponentbuilderHelper::getActions('custom_admin_view');
 		}
 
-		if (!$this->canDo->get('core.edit') && !$this->canDo->get('core.batch'))
+		if (!$this->canDo->get('core.edit') && !$this->canDo->get('custom_admin_view.batch'))
 		{
 			$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
 			return false;
@@ -1094,44 +1099,44 @@ class ComponentbuilderModelCustom_admin_view extends AdminModel
 		// always reset the snippets
 		$data['snippet'] = 0;
 		// if system name is empty create from name
-		if (empty($data['system_name']) || !ComponentbuilderHelper::checkString($data['system_name']))
+		if (empty($data['system_name']) || !UtilitiesStringHelper::check($data['system_name']))
 		{
 			$data['system_name'] = $data['name'];
 		}
 		// if codename is empty create from name
-		if (empty($data['codename']) || !ComponentbuilderHelper::checkString($data['codename']))
+		if (empty($data['codename']) || !UtilitiesStringHelper::check($data['codename']))
 		{
-			$data['codename'] = ComponentbuilderHelper::safeString($data['name']);
+			$data['codename'] = UtilitiesStringHelper::safe($data['name']);
 		}
 		else
 		{
 			// always make safe string
-			$data['codename'] = ComponentbuilderHelper::safeString($data['codename']);
+			$data['codename'] = UtilitiesStringHelper::safe($data['codename']);
 		}
 		// if context is empty create from codename
-		if (empty($data['context']) || !ComponentbuilderHelper::checkString($data['context']))
+		if (empty($data['context']) || !UtilitiesStringHelper::check($data['context']))
 		{
 			$data['context'] = $data['codename'];
 		}
 		else
 		{
 			// always make safe string
-			$data['context'] = ComponentbuilderHelper::safeString($data['context']);
+			$data['context'] = UtilitiesStringHelper::safe($data['context']);
 		}
 
 		// Set the GUID if empty or not valid
 		if (empty($data['guid']) && $data['id'] > 0)
 		{
 			// get the existing one
-			$data['guid'] = (string) ComponentbuilderHelper::getVar('custom_admin_view', $data['id'], 'id', 'guid');
+			$data['guid'] = (string) GetHelper::var('custom_admin_view', $data['id'], 'id', 'guid');
 		}
+
 		// Set the GUID if empty or not valid
-		while (!ComponentbuilderHelper::validGUID($data['guid'], "custom_admin_view", $data['id']))
+		while (!GuidHelper::valid($data['guid'], "custom_admin_view", $data['id']))
 		{
 			// must always be set
-			$data['guid'] = (string) ComponentbuilderHelper::GUID();
-		}
-
+			$data['guid'] = (string) GuidHelper::get();
+		}
 
 		// Set the custom_get items to data.
 		if (isset($data['custom_get']) && is_array($data['custom_get']))

admin/models/custom_admin_views.php

@@ -14,7 +14,7 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Utilities\ArrayHelper;
-use VDM\Joomla\Componentbuilder\Utilities\FormHelper as JCBFormHelper;
+use VDM\Joomla\Utilities\FormHelper as JCBFormHelper;
 use VDM\Joomla\Componentbuilder\Utilities\FilterHelper as JCBFilterHelper;
 
 /**

admin/models/custom_code.php

@@ -16,6 +16,10 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 /**
  * Componentbuilder Custom_code Admin Model
@@ -119,7 +123,7 @@ class ComponentbuilderModelCustom_code extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'custom_code__'.$id);
 				ComponentbuilderHelper::set('custom_code__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -127,7 +131,7 @@ class ComponentbuilderModelCustom_code extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -191,7 +195,7 @@ class ComponentbuilderModelCustom_code extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'custom_code__'.$id);
 				ComponentbuilderHelper::set('custom_code__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -199,7 +203,7 @@ class ComponentbuilderModelCustom_code extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -325,7 +329,7 @@ class ComponentbuilderModelCustom_code extends AdminModel
 		// now get all the editor fields
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
 		// check if we found any
-		if (ComponentbuilderHelper::checkArray($editors))
+		if (UtilitiesArrayHelper::check($editors))
 		{
 			foreach ($editors as $editor)
 			{
@@ -397,7 +401,7 @@ class ComponentbuilderModelCustom_code extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('custom_code.edit.state', 'com_componentbuilder');
 	}
     
@@ -957,8 +961,8 @@ class ComponentbuilderModelCustom_code extends AdminModel
 		}
 
 		// few checks with the new option of using custom code in custom code
-		if (isset($data['code']) && ($placeholders = ComponentbuilderHelper::getAllBetween($data['code'], '[CUSTOM' . 'CODE=', ']'))
-			&& ComponentbuilderHelper::checkArray($placeholders))
+		if (isset($data['code']) && ($placeholders = GetHelper::allBetween($data['code'], '[CUSTOM' . 'CODE=', ']'))
+			&& UtilitiesArrayHelper::check($placeholders))
 		{
 			// make sure custom code as Hash (automation)  target does not have other custom code placeholders
 			if (isset($data['target']) && 1 == $data['target'])

admin/models/custom_codes.php

@@ -14,6 +14,8 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 /**
  * Custom_codes List Model
@@ -161,7 +163,7 @@ class ComponentbuilderModelCustom_codes extends ListModel
 			}
 		}
 
-		if (ComponentbuilderHelper::checkArray($items) && !isset($_export))
+		if (UtilitiesArrayHelper::check($items) && !isset($_export))
 		{
 			foreach ($items as $nr => &$item) 
 			{
@@ -169,7 +171,7 @@ class ComponentbuilderModelCustom_codes extends ListModel
 				{
 					$item->component_system_name = $item->system_name;
 					$item->path = '[CUSTO'.'MCODE='.$item->id.']'; // so it is not detected
-					if (ComponentbuilderHelper::checkString($item->function_name))
+					if (StringHelper::check($item->function_name))
 					{
 						$item->path =  '[CUSTO'.'MCODE='.$item->function_name.']'; // so it is not detected
 					}
@@ -489,7 +491,7 @@ class ComponentbuilderModelCustom_codes extends ListModel
 					array_unshift($items,$headers);
 				}
 
-				if (ComponentbuilderHelper::checkArray($items) && !isset($_export))
+				if (UtilitiesArrayHelper::check($items) && !isset($_export))
 		{
 			foreach ($items as $nr => &$item) 
 			{
@@ -497,7 +499,7 @@ class ComponentbuilderModelCustom_codes extends ListModel
 				{
 					$item->component_system_name = $item->system_name;
 					$item->path = '[CUSTO'.'MCODE='.$item->id.']'; // so it is not detected
-					if (ComponentbuilderHelper::checkString($item->function_name))
+					if (StringHelper::check($item->function_name))
 					{
 						$item->path =  '[CUSTO'.'MCODE='.$item->function_name.']'; // so it is not detected
 					}

admin/models/dynamic_get.php

@@ -16,6 +16,11 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 /**
  * Componentbuilder Dynamic_get Admin Model
@@ -159,7 +164,7 @@ class ComponentbuilderModelDynamic_get extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'dynamic_get__'.$id);
 				ComponentbuilderHelper::set('dynamic_get__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -167,7 +172,7 @@ class ComponentbuilderModelDynamic_get extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -335,7 +340,7 @@ class ComponentbuilderModelDynamic_get extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'dynamic_get__'.$id);
 				ComponentbuilderHelper::set('dynamic_get__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -343,7 +348,7 @@ class ComponentbuilderModelDynamic_get extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -503,7 +508,7 @@ class ComponentbuilderModelDynamic_get extends AdminModel
 		// now get all the editor fields
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
 		// check if we found any
-		if (ComponentbuilderHelper::checkArray($editors))
+		if (UtilitiesArrayHelper::check($editors))
 		{
 			foreach ($editors as $editor)
 			{
@@ -518,9 +523,9 @@ class ComponentbuilderModelDynamic_get extends AdminModel
 		// Only load the GUID if new item (or empty)
 		if (0 == $id || !($val = $form->getValue('guid')))
 		{
-			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+			$form->setValue('guid', null, GuidHelper::get());
 		}
-
+ 
 
 		// update the join_view_table (sub form) layout
 		$form->setFieldAttribute('join_view_table', 'layout', ComponentbuilderHelper::getSubformLayout('dynamic_get', 'join_view_table'));
@@ -588,7 +593,7 @@ class ComponentbuilderModelDynamic_get extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('dynamic_get.edit.state', 'com_componentbuilder');
 	}
     
@@ -1152,15 +1157,15 @@ class ComponentbuilderModelDynamic_get extends AdminModel
 		if (empty($data['guid']) && $data['id'] > 0)
 		{
 			// get the existing one
-			$data['guid'] = (string) ComponentbuilderHelper::getVar('dynamic_get', $data['id'], 'id', 'guid');
+			$data['guid'] = (string) GetHelper::var('dynamic_get', $data['id'], 'id', 'guid');
 		}
+
 		// Set the GUID if empty or not valid
-		while (!ComponentbuilderHelper::validGUID($data['guid'], "dynamic_get", $data['id']))
+		while (!GuidHelper::valid($data['guid'], "dynamic_get", $data['id']))
 		{
 			// must always be set
-			$data['guid'] = (string) ComponentbuilderHelper::GUID();
-		}
-
+			$data['guid'] = (string) GuidHelper::get();
+		}
 
 		// Set the join_db_table items to data.
 		if (isset($data['join_db_table']) && is_array($data['join_db_table']))

admin/models/field.php

@@ -16,6 +16,13 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\String\FieldHelper;
+use VDM\Joomla\Utilities\String\TypeHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 /**
  * Componentbuilder Field Admin Model
@@ -54,6 +61,8 @@ class ComponentbuilderModelField extends AdminModel
 				'indexes',
 				'null_switch',
 				'store',
+				'medium_encryption_note',
+				'basic_encryption_note',
 				'note_whmcs_encryption',
 				'note_expert_field_save_mode',
 				'initiator_on_save_model',
@@ -66,6 +75,12 @@ class ComponentbuilderModelField extends AdminModel
 				'note_database_settings_needed'
 			)
 		),
+		'type_info' => array(
+			'fullwidth' => array(
+				'helpnote',
+				'xml'
+			)
+		),
 		'scripts' => array(
 			'left' => array(
 				'add_css_view',
@@ -79,12 +94,6 @@ class ComponentbuilderModelField extends AdminModel
 				'add_javascript_views_footer',
 				'javascript_views_footer'
 			)
-		),
-		'type_info' => array(
-			'fullwidth' => array(
-				'helpnote',
-				'xml'
-			)
 		)
 	);
 
@@ -150,7 +159,7 @@ class ComponentbuilderModelField extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'field__'.$id);
 				ComponentbuilderHelper::set('field__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -158,7 +167,7 @@ class ComponentbuilderModelField extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -199,12 +208,6 @@ class ComponentbuilderModelField extends AdminModel
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->on_get_model_field))
-			{
-				// base64 Decode on_get_model_field.
-				$item->on_get_model_field = base64_decode($item->on_get_model_field);
-			}
-
 			if (!empty($item->on_save_model_field))
 			{
 				// base64 Decode on_save_model_field.
@@ -217,16 +220,10 @@ class ComponentbuilderModelField extends AdminModel
 				$item->initiator_on_get_model = base64_decode($item->initiator_on_get_model);
 			}
 
-			if (!empty($item->css_view))
+			if (!empty($item->initiator_on_save_model))
 			{
-				// base64 Decode css_view.
-				$item->css_view = base64_decode($item->css_view);
-			}
-
-			if (!empty($item->javascript_view_footer))
-			{
-				// base64 Decode javascript_view_footer.
-				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+				// base64 Decode initiator_on_save_model.
+				$item->initiator_on_save_model = base64_decode($item->initiator_on_save_model);
 			}
 
 			if (!empty($item->css_views))
@@ -235,18 +232,30 @@ class ComponentbuilderModelField extends AdminModel
 				$item->css_views = base64_decode($item->css_views);
 			}
 
+			if (!empty($item->css_view))
+			{
+				// base64 Decode css_view.
+				$item->css_view = base64_decode($item->css_view);
+			}
+
+			if (!empty($item->on_get_model_field))
+			{
+				// base64 Decode on_get_model_field.
+				$item->on_get_model_field = base64_decode($item->on_get_model_field);
+			}
+
+			if (!empty($item->javascript_view_footer))
+			{
+				// base64 Decode javascript_view_footer.
+				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+			}
+
 			if (!empty($item->javascript_views_footer))
 			{
 				// base64 Decode javascript_views_footer.
 				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 			}
 
-			if (!empty($item->initiator_on_save_model))
-			{
-				// base64 Decode initiator_on_save_model.
-				$item->initiator_on_save_model = base64_decode($item->initiator_on_save_model);
-			}
-
 			if (!empty($item->xml))
 			{
 				// JSON Decode xml.
@@ -270,7 +279,7 @@ class ComponentbuilderModelField extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'field__'.$id);
 				ComponentbuilderHelper::set('field__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -278,7 +287,7 @@ class ComponentbuilderModelField extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -402,7 +411,7 @@ class ComponentbuilderModelField extends AdminModel
 		// now get all the editor fields
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
 		// check if we found any
-		if (ComponentbuilderHelper::checkArray($editors))
+		if (UtilitiesArrayHelper::check($editors))
 		{
 			foreach ($editors as $editor)
 			{
@@ -417,7 +426,7 @@ class ComponentbuilderModelField extends AdminModel
 		// Only load the GUID if new item (or empty)
 		if (0 == $id || !($val = $form->getValue('guid')))
 		{
-			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+			$form->setValue('guid', null, GuidHelper::get());
 		}
 
 		return $form;
@@ -481,7 +490,7 @@ class ComponentbuilderModelField extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('field.edit.state', 'com_componentbuilder');
 	}
     
@@ -1076,14 +1085,14 @@ class ComponentbuilderModelField extends AdminModel
 			$typephp[$x] = $input->get('property_type_php' . $x, null, 'RAW');
 		}
 		// make sure we have an array
-		if (ComponentbuilderHelper::checkArray($properties))
+		if (UtilitiesArrayHelper::check($properties))
 		{
 			// set the bucket
 			$bucket = array();
 			foreach($properties as $property)
 			{
 				// make sure we have the correct values
-				if (ComponentbuilderHelper::checkArray($property) && isset($property['name']) && ComponentbuilderHelper::checkString($property['name']) && (isset($property['value']) || 'default' === $property['name']))
+				if (UtilitiesArrayHelper::check($property) && isset($property['name']) && UtilitiesStringHelper::check($property['name']) && (isset($property['value']) || 'default' === $property['name']))
 				{
 					// some fixes, just in case (more can be added)
 					switch ($property['name'])
@@ -1097,11 +1106,11 @@ class ComponentbuilderModelField extends AdminModel
 							}
 							else
 							{
-								$property['value'] = ComponentbuilderHelper::safeFieldName($property['value']);
+								$property['value'] = FieldHelper::safe($property['value']);
 							}
 						break;
 						case 'type':
-							$property['value'] = ComponentbuilderHelper::safeTypeName($property['value']);
+							$property['value'] = TypeHelper::safe($property['value']);
 						break;
 					}
 					// load the property
@@ -1109,15 +1118,15 @@ class ComponentbuilderModelField extends AdminModel
 				}
 			}
 			// make sure we have an array
-			if (ComponentbuilderHelper::checkArray($extraproperties))
+			if (UtilitiesArrayHelper::check($extraproperties))
 			{
 				foreach($extraproperties as $xproperty)
 				{
 					// make sure we have the correct values
-					if (ComponentbuilderHelper::checkArray($xproperty) && isset($xproperty['name']) && ComponentbuilderHelper::checkString($xproperty['name']) && isset($xproperty['value']))
+					if (UtilitiesArrayHelper::check($xproperty) && isset($xproperty['name']) && UtilitiesStringHelper::check($xproperty['name']) && isset($xproperty['value']))
 					{
 						// load the extra property
-						$bucket[] = "\t" . ComponentbuilderHelper::safeString($xproperty['name']) . '="' . str_replace('"', """, $xproperty['value']) . '"';
+						$bucket[] = "\t" . UtilitiesStringHelper::safe($xproperty['name']) . '="' . str_replace('"', """, $xproperty['value']) . '"';
 					}
 				}
 			}
@@ -1125,14 +1134,14 @@ class ComponentbuilderModelField extends AdminModel
 			foreach ($typephp as $x => $phpvalue)
 			{
 				// make sure we have a string
-				if (ComponentbuilderHelper::checkString($phpvalue))
+				if (UtilitiesStringHelper::check($phpvalue))
 				{
 					// load the type_php property
 					$bucket[] = "\t" . 'type_php' . $x . '_1="__.o0=base64=Oo.__' . base64_encode($phpvalue) . '"';
 				}
 			}
 			// if the bucket has been loaded
-			if (ComponentbuilderHelper::checkArray($bucket))
+			if (UtilitiesArrayHelper::check($bucket))
 			{
 				$data['xml'] = "<field" . PHP_EOL . implode(PHP_EOL, $bucket) . PHP_EOL . "/>";
 			}
@@ -1142,15 +1151,15 @@ class ComponentbuilderModelField extends AdminModel
 		if (empty($data['guid']) && $data['id'] > 0)
 		{
 			// get the existing one
-			$data['guid'] = (string) ComponentbuilderHelper::getVar('field', $data['id'], 'id', 'guid');
+			$data['guid'] = (string) GetHelper::var('field', $data['id'], 'id', 'guid');
 		}
+
 		// Set the GUID if empty or not valid
-		while (!ComponentbuilderHelper::validGUID($data['guid'], "field", $data['id']))
+		while (!GuidHelper::valid($data['guid'], "field", $data['id']))
 		{
 			// must always be set
-			$data['guid'] = (string) ComponentbuilderHelper::GUID();
-		}
-
+			$data['guid'] = (string) GuidHelper::get();
+		}
 
 		// Set the xml string to JSON string.
 		if (isset($data['xml']))
@@ -1158,12 +1167,6 @@ class ComponentbuilderModelField extends AdminModel
 			$data['xml'] = (string) json_encode($data['xml']);
 		}
 
-		// Set the on_get_model_field string to base64 string.
-		if (isset($data['on_get_model_field']))
-		{
-			$data['on_get_model_field'] = base64_encode($data['on_get_model_field']);
-		}
-
 		// Set the on_save_model_field string to base64 string.
 		if (isset($data['on_save_model_field']))
 		{
@@ -1176,16 +1179,10 @@ class ComponentbuilderModelField extends AdminModel
 			$data['initiator_on_get_model'] = base64_encode($data['initiator_on_get_model']);
 		}
 
-		// Set the css_view string to base64 string.
-		if (isset($data['css_view']))
+		// Set the initiator_on_save_model string to base64 string.
+		if (isset($data['initiator_on_save_model']))
 		{
-			$data['css_view'] = base64_encode($data['css_view']);
-		}
-
-		// Set the javascript_view_footer string to base64 string.
-		if (isset($data['javascript_view_footer']))
-		{
-			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
+			$data['initiator_on_save_model'] = base64_encode($data['initiator_on_save_model']);
 		}
 
 		// Set the css_views string to base64 string.
@@ -1194,17 +1191,29 @@ class ComponentbuilderModelField extends AdminModel
 			$data['css_views'] = base64_encode($data['css_views']);
 		}
 
+		// Set the css_view string to base64 string.
+		if (isset($data['css_view']))
+		{
+			$data['css_view'] = base64_encode($data['css_view']);
+		}
+
+		// Set the on_get_model_field string to base64 string.
+		if (isset($data['on_get_model_field']))
+		{
+			$data['on_get_model_field'] = base64_encode($data['on_get_model_field']);
+		}
+
+		// Set the javascript_view_footer string to base64 string.
+		if (isset($data['javascript_view_footer']))
+		{
+			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
+		}
+
 		// Set the javascript_views_footer string to base64 string.
 		if (isset($data['javascript_views_footer']))
 		{
 			$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
 		}
-
-		// Set the initiator_on_save_model string to base64 string.
-		if (isset($data['initiator_on_save_model']))
-		{
-			$data['initiator_on_save_model'] = base64_encode($data['initiator_on_save_model']);
-		}
         
 		// Set the Params Items to data
 		if (isset($data['params']) && is_array($data['params']))

admin/models/fields.php

@@ -14,8 +14,9 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Utilities\ArrayHelper;
-use VDM\Joomla\Componentbuilder\Utilities\FormHelper as JCBFormHelper;
+use VDM\Joomla\Utilities\FormHelper as JCBFormHelper;
 use VDM\Joomla\Componentbuilder\Utilities\FilterHelper as JCBFilterHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 
 /**
  * Fields List Model
@@ -411,7 +412,7 @@ class ComponentbuilderModelFields extends ListModel
 				}
 			}
 			// now check if we have IDs
-			if ($get_ids && ComponentbuilderHelper::checkArray($field_ids))
+			if ($get_ids && UtilitiesArrayHelper::check($field_ids))
 			{
 				$query->where($db->quoteName('a.id') . ' IN (' . implode(',', $field_ids) . ')');
 			}
@@ -676,7 +677,7 @@ class ComponentbuilderModelFields extends ListModel
 				}
 			}
 			// now check if we have IDs
-			if ($get_ids && ComponentbuilderHelper::checkArray($field_ids))
+			if ($get_ids && UtilitiesArrayHelper::check($field_ids))
 			{
 				$query->where($db->quoteName('a.id') . ' IN (' . implode(',', $field_ids) . ')');
 			}
@@ -711,22 +712,22 @@ class ComponentbuilderModelFields extends ListModel
 							continue;
 						}
 
-						// decode on_get_model_field
-						$item->on_get_model_field = base64_decode($item->on_get_model_field);
 						// decode on_save_model_field
 						$item->on_save_model_field = base64_decode($item->on_save_model_field);
 						// decode initiator_on_get_model
 						$item->initiator_on_get_model = base64_decode($item->initiator_on_get_model);
-						// decode css_view
-						$item->css_view = base64_decode($item->css_view);
-						// decode javascript_view_footer
-						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
-						// decode css_views
-						$item->css_views = base64_decode($item->css_views);
-						// decode javascript_views_footer
-						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 						// decode initiator_on_save_model
 						$item->initiator_on_save_model = base64_decode($item->initiator_on_save_model);
+						// decode css_views
+						$item->css_views = base64_decode($item->css_views);
+						// decode css_view
+						$item->css_view = base64_decode($item->css_view);
+						// decode on_get_model_field
+						$item->on_get_model_field = base64_decode($item->on_get_model_field);
+						// decode javascript_view_footer
+						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+						// decode javascript_views_footer
+						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);

admin/models/fields/adminlistvieworderfields.php

@@ -120,8 +120,17 @@ class JFormFieldAdminlistvieworderfields extends JFormFieldList
 					foreach($items as $item)
 					{
 						// get the field name (TODO this could slow down the system so we will need to improve on this)
-						$field_name = ComponentbuilderHelper::safeFieldName(ComponentbuilderHelper::getBetween(json_decode($item->xml),'name="','"'));
-						$options[] = JHtml::_('select.option', $item->id, $item->name . ' [ ' . $field_name . ' - ' . $item->type . ' ]');
+						if (isset($item->xml) && ComponentbuilderHelper::checkJson($item->xml))
+						{
+							$field_xml = json_decode($item->xml);
+							$field_name = ComponentbuilderHelper::getBetween($field_xml,'name="','"');
+							$field_name = ComponentbuilderHelper::safeFieldName($field_name);
+							$options[] = JHtml::_('select.option', $item->id, $item->name . ' [ ' . $field_name . ' - ' . $item->type . ' ]');
+						}
+						else
+						{
+							$options[] = JHtml::_('select.option', $item->id, $item->name . ' [ empty - ' . $item->type . ' ]');
+						}
 					}
 				}
 				return $options;

admin/models/fields/adminviewsfilteraddcustombutton.php

@@ -49,21 +49,21 @@ class JFormFieldAdminviewsfilteraddcustombutton extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_CUSTOM_BUTTONS') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get admin_viewsmodel
-			$model = ComponentbuilderHelper::getModel('admin_views');
-			$results = array_unique($results);
-			foreach ($results as $add_custom_button)
+			$_model = ComponentbuilderHelper::getModel('admin_views');
+			$_results = array_unique($_results);
+			foreach ($_results as $add_custom_button)
 			{
 				// Translate the add_custom_button selection
-				$text = $model->selectionTranslation($add_custom_button,'add_custom_button');
+				$_text = $_model->selectionTranslation($add_custom_button,'add_custom_button');
 				// Now add the add_custom_button and its text to the options array
-				$_filter[] = JHtml::_('select.option', $add_custom_button, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $add_custom_button, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/adminviewsfilteraddcustomimport.php

@@ -49,21 +49,21 @@ class JFormFieldAdminviewsfilteraddcustomimport extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_CUSTOM_IMPORT') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get admin_viewsmodel
-			$model = ComponentbuilderHelper::getModel('admin_views');
-			$results = array_unique($results);
-			foreach ($results as $add_custom_import)
+			$_model = ComponentbuilderHelper::getModel('admin_views');
+			$_results = array_unique($_results);
+			foreach ($_results as $add_custom_import)
 			{
 				// Translate the add_custom_import selection
-				$text = $model->selectionTranslation($add_custom_import,'add_custom_import');
+				$_text = $_model->selectionTranslation($add_custom_import,'add_custom_import');
 				// Now add the add_custom_import and its text to the options array
-				$_filter[] = JHtml::_('select.option', $add_custom_import, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $add_custom_import, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/adminviewsfilteraddfadein.php

@@ -49,21 +49,21 @@ class JFormFieldAdminviewsfilteraddfadein extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_FADE_IN_AFFECT') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get admin_viewsmodel
-			$model = ComponentbuilderHelper::getModel('admin_views');
-			$results = array_unique($results);
-			foreach ($results as $add_fadein)
+			$_model = ComponentbuilderHelper::getModel('admin_views');
+			$_results = array_unique($_results);
+			foreach ($_results as $add_fadein)
 			{
 				// Translate the add_fadein selection
-				$text = $model->selectionTranslation($add_fadein,'add_fadein');
+				$_text = $_model->selectionTranslation($add_fadein,'add_fadein');
 				// Now add the add_fadein and its text to the options array
-				$_filter[] = JHtml::_('select.option', $add_fadein, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $add_fadein, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/adminviewsfilteraddphpajax.php

@@ -49,21 +49,21 @@ class JFormFieldAdminviewsfilteraddphpajax extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_PHP_AJAX') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get admin_viewsmodel
-			$model = ComponentbuilderHelper::getModel('admin_views');
-			$results = array_unique($results);
-			foreach ($results as $add_php_ajax)
+			$_model = ComponentbuilderHelper::getModel('admin_views');
+			$_results = array_unique($_results);
+			foreach ($_results as $add_php_ajax)
 			{
 				// Translate the add_php_ajax selection
-				$text = $model->selectionTranslation($add_php_ajax,'add_php_ajax');
+				$_text = $_model->selectionTranslation($add_php_ajax,'add_php_ajax');
 				// Now add the add_php_ajax and its text to the options array
-				$_filter[] = JHtml::_('select.option', $add_php_ajax, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $add_php_ajax, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/adminviewsfiltertype.php

@@ -49,20 +49,20 @@ class JFormFieldAdminviewsfiltertype extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 
-		if ($results)
+		if ($_results)
 		{
 			// get admin_viewsmodel
-			$model = ComponentbuilderHelper::getModel('admin_views');
-			$results = array_unique($results);
-			foreach ($results as $type)
+			$_model = ComponentbuilderHelper::getModel('admin_views');
+			$_results = array_unique($_results);
+			foreach ($_results as $type)
 			{
 				// Translate the type selection
-				$text = $model->selectionTranslation($type,'type');
+				$_text = $_model->selectionTranslation($type,'type');
 				// Now add the type and its text to the options array
-				$_filter[] = JHtml::_('select.option', $type, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $type, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/classextendingsfilterextensiontype.php

@@ -49,21 +49,21 @@ class JFormFieldClassextendingsfilterextensiontype extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_TYPE') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get class_extendingsmodel
-			$model = ComponentbuilderHelper::getModel('class_extendings');
-			$results = array_unique($results);
-			foreach ($results as $extension_type)
+			$_model = ComponentbuilderHelper::getModel('class_extendings');
+			$_results = array_unique($_results);
+			foreach ($_results as $extension_type)
 			{
 				// Translate the extension_type selection
-				$text = $model->selectionTranslation($extension_type,'extension_type');
+				$_text = $_model->selectionTranslation($extension_type,'extension_type');
 				// Now add the extension_type and its text to the options array
-				$_filter[] = JHtml::_('select.option', $extension_type, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $extension_type, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/classmethodsfilterextensiontype.php

@@ -49,21 +49,21 @@ class JFormFieldClassmethodsfilterextensiontype extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_TYPE') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get class_methodsmodel
-			$model = ComponentbuilderHelper::getModel('class_methods');
-			$results = array_unique($results);
-			foreach ($results as $extension_type)
+			$_model = ComponentbuilderHelper::getModel('class_methods');
+			$_results = array_unique($_results);
+			foreach ($_results as $extension_type)
 			{
 				// Translate the extension_type selection
-				$text = $model->selectionTranslation($extension_type,'extension_type');
+				$_text = $_model->selectionTranslation($extension_type,'extension_type');
 				// Now add the extension_type and its text to the options array
-				$_filter[] = JHtml::_('select.option', $extension_type, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $extension_type, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/classmethodsfiltervisibility.php

@@ -49,21 +49,21 @@ class JFormFieldClassmethodsfiltervisibility extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_VISIBILITY') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get class_methodsmodel
-			$model = ComponentbuilderHelper::getModel('class_methods');
-			$results = array_unique($results);
-			foreach ($results as $visibility)
+			$_model = ComponentbuilderHelper::getModel('class_methods');
+			$_results = array_unique($_results);
+			foreach ($_results as $visibility)
 			{
 				// Translate the visibility selection
-				$text = $model->selectionTranslation($visibility,'visibility');
+				$_text = $_model->selectionTranslation($visibility,'visibility');
 				// Now add the visibility and its text to the options array
-				$_filter[] = JHtml::_('select.option', $visibility, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $visibility, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/classpropertiesfilterextensiontype.php

@@ -49,21 +49,21 @@ class JFormFieldClasspropertiesfilterextensiontype extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_TYPE') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get class_propertiesmodel
-			$model = ComponentbuilderHelper::getModel('class_properties');
-			$results = array_unique($results);
-			foreach ($results as $extension_type)
+			$_model = ComponentbuilderHelper::getModel('class_properties');
+			$_results = array_unique($_results);
+			foreach ($_results as $extension_type)
 			{
 				// Translate the extension_type selection
-				$text = $model->selectionTranslation($extension_type,'extension_type');
+				$_text = $_model->selectionTranslation($extension_type,'extension_type');
 				// Now add the extension_type and its text to the options array
-				$_filter[] = JHtml::_('select.option', $extension_type, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $extension_type, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/classpropertiesfiltervisibility.php

@@ -49,21 +49,21 @@ class JFormFieldClasspropertiesfiltervisibility extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_VISIBILITY') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get class_propertiesmodel
-			$model = ComponentbuilderHelper::getModel('class_properties');
-			$results = array_unique($results);
-			foreach ($results as $visibility)
+			$_model = ComponentbuilderHelper::getModel('class_properties');
+			$_results = array_unique($_results);
+			foreach ($_results as $visibility)
 			{
 				// Translate the visibility selection
-				$text = $model->selectionTranslation($visibility,'visibility');
+				$_text = $_model->selectionTranslation($visibility,'visibility');
 				// Now add the visibility and its text to the options array
-				$_filter[] = JHtml::_('select.option', $visibility, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $visibility, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/customadminviewsfilteraddcustombutton.php

@@ -49,21 +49,21 @@ class JFormFieldCustomadminviewsfilteraddcustombutton extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_CUSTOM_BUTTONS') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get custom_admin_viewsmodel
-			$model = ComponentbuilderHelper::getModel('custom_admin_views');
-			$results = array_unique($results);
-			foreach ($results as $add_custom_button)
+			$_model = ComponentbuilderHelper::getModel('custom_admin_views');
+			$_results = array_unique($_results);
+			foreach ($_results as $add_custom_button)
 			{
 				// Translate the add_custom_button selection
-				$text = $model->selectionTranslation($add_custom_button,'add_custom_button');
+				$_text = $_model->selectionTranslation($add_custom_button,'add_custom_button');
 				// Now add the add_custom_button and its text to the options array
-				$_filter[] = JHtml::_('select.option', $add_custom_button, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $add_custom_button, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/customadminviewsfilteraddphpajax.php

@@ -49,21 +49,21 @@ class JFormFieldCustomadminviewsfilteraddphpajax extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_PHP_AJAX') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get custom_admin_viewsmodel
-			$model = ComponentbuilderHelper::getModel('custom_admin_views');
-			$results = array_unique($results);
-			foreach ($results as $add_php_ajax)
+			$_model = ComponentbuilderHelper::getModel('custom_admin_views');
+			$_results = array_unique($_results);
+			foreach ($_results as $add_php_ajax)
 			{
 				// Translate the add_php_ajax selection
-				$text = $model->selectionTranslation($add_php_ajax,'add_php_ajax');
+				$_text = $_model->selectionTranslation($add_php_ajax,'add_php_ajax');
 				// Now add the add_php_ajax and its text to the options array
-				$_filter[] = JHtml::_('select.option', $add_php_ajax, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $add_php_ajax, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/customcodesfiltercommenttype.php

@@ -49,21 +49,21 @@ class JFormFieldCustomcodesfiltercommenttype extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_COMMENT_TYPE_USED_IN_PLACEHOLDER') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get custom_codesmodel
-			$model = ComponentbuilderHelper::getModel('custom_codes');
-			$results = array_unique($results);
-			foreach ($results as $comment_type)
+			$_model = ComponentbuilderHelper::getModel('custom_codes');
+			$_results = array_unique($_results);
+			foreach ($_results as $comment_type)
 			{
 				// Translate the comment_type selection
-				$text = $model->selectionTranslation($comment_type,'comment_type');
+				$_text = $_model->selectionTranslation($comment_type,'comment_type');
 				// Now add the comment_type and its text to the options array
-				$_filter[] = JHtml::_('select.option', $comment_type, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $comment_type, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/customcodesfiltertarget.php

@@ -49,21 +49,21 @@ class JFormFieldCustomcodesfiltertarget extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_TARGET') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get custom_codesmodel
-			$model = ComponentbuilderHelper::getModel('custom_codes');
-			$results = array_unique($results);
-			foreach ($results as $target)
+			$_model = ComponentbuilderHelper::getModel('custom_codes');
+			$_results = array_unique($_results);
+			foreach ($_results as $target)
 			{
 				// Translate the target selection
-				$text = $model->selectionTranslation($target,'target');
+				$_text = $_model->selectionTranslation($target,'target');
 				// Now add the target and its text to the options array
-				$_filter[] = JHtml::_('select.option', $target, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $target, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/customcodesfiltertype.php

@@ -49,21 +49,21 @@ class JFormFieldCustomcodesfiltertype extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_TYPE') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get custom_codesmodel
-			$model = ComponentbuilderHelper::getModel('custom_codes');
-			$results = array_unique($results);
-			foreach ($results as $type)
+			$_model = ComponentbuilderHelper::getModel('custom_codes');
+			$_results = array_unique($_results);
+			foreach ($_results as $type)
 			{
 				// Translate the type selection
-				$text = $model->selectionTranslation($type,'type');
+				$_text = $_model->selectionTranslation($type,'type');
 				// Now add the type and its text to the options array
-				$_filter[] = JHtml::_('select.option', $type, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $type, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/dynamicgetsfiltergettype.php

@@ -49,21 +49,21 @@ class JFormFieldDynamicgetsfiltergettype extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_GETTYPE') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get dynamic_getsmodel
-			$model = ComponentbuilderHelper::getModel('dynamic_gets');
-			$results = array_unique($results);
-			foreach ($results as $gettype)
+			$_model = ComponentbuilderHelper::getModel('dynamic_gets');
+			$_results = array_unique($_results);
+			foreach ($_results as $gettype)
 			{
 				// Translate the gettype selection
-				$text = $model->selectionTranslation($gettype,'gettype');
+				$_text = $_model->selectionTranslation($gettype,'gettype');
 				// Now add the gettype and its text to the options array
-				$_filter[] = JHtml::_('select.option', $gettype, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $gettype, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/dynamicgetsfiltermainsource.php

@@ -49,21 +49,21 @@ class JFormFieldDynamicgetsfiltermainsource extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_MAIN_SOURCE') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get dynamic_getsmodel
-			$model = ComponentbuilderHelper::getModel('dynamic_gets');
-			$results = array_unique($results);
-			foreach ($results as $main_source)
+			$_model = ComponentbuilderHelper::getModel('dynamic_gets');
+			$_results = array_unique($_results);
+			foreach ($_results as $main_source)
 			{
 				// Translate the main_source selection
-				$text = $model->selectionTranslation($main_source,'main_source');
+				$_text = $_model->selectionTranslation($main_source,'main_source');
 				// Now add the main_source and its text to the options array
-				$_filter[] = JHtml::_('select.option', $main_source, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $main_source, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/fields.php

@@ -51,8 +51,17 @@ class JFormFieldFields extends JFormFieldList
 			foreach($items as $item)
 			{
 				// get the field name (TODO this could slow down the system so we will need to improve on this)
-				$field_name = ComponentbuilderHelper::safeFieldName(ComponentbuilderHelper::getBetween(json_decode($item->xml),'name="','"'));
-				$options[] = JHtml::_('select.option', $item->id, $item->field_name . ' [ ' . $field_name . ' - ' . $item->type . ' ]');
+				if (isset($item->xml) && ComponentbuilderHelper::checkJson($item->xml))
+				{
+					$field_xml = json_decode($item->xml);
+					$field_name = ComponentbuilderHelper::getBetween($field_xml,'name="','"');
+					$field_name = ComponentbuilderHelper::safeFieldName($field_name);
+					$options[] = JHtml::_('select.option', $item->id, $item->field_name . ' [ ' . $field_name . ' - ' . $item->type . ' ]');
+				}
+				else
+				{
+					$options[] = JHtml::_('select.option', $item->id, $item->field_name . ' [ empty - ' . $item->type . ' ]');
+				}
 			}
 		}
 

admin/models/fields/fieldsfilterdatatype.php

@@ -49,21 +49,21 @@ class JFormFieldFieldsfilterdatatype extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_DATA_TYPE') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get fieldsmodel
-			$model = ComponentbuilderHelper::getModel('fields');
-			$results = array_unique($results);
-			foreach ($results as $datatype)
+			$_model = ComponentbuilderHelper::getModel('fields');
+			$_results = array_unique($_results);
+			foreach ($_results as $datatype)
 			{
 				// Translate the datatype selection
-				$text = $model->selectionTranslation($datatype,'datatype');
+				$_text = $_model->selectionTranslation($datatype,'datatype');
 				// Now add the datatype and its text to the options array
-				$_filter[] = JHtml::_('select.option', $datatype, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $datatype, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/fieldsfilterindexes.php

@@ -49,21 +49,21 @@ class JFormFieldFieldsfilterindexes extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_INDEXES_TYPE') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get fieldsmodel
-			$model = ComponentbuilderHelper::getModel('fields');
-			$results = array_unique($results);
-			foreach ($results as $indexes)
+			$_model = ComponentbuilderHelper::getModel('fields');
+			$_results = array_unique($_results);
+			foreach ($_results as $indexes)
 			{
 				// Translate the indexes selection
-				$text = $model->selectionTranslation($indexes,'indexes');
+				$_text = $_model->selectionTranslation($indexes,'indexes');
 				// Now add the indexes and its text to the options array
-				$_filter[] = JHtml::_('select.option', $indexes, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $indexes, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/fieldsfilternullswitch.php

@@ -49,21 +49,21 @@ class JFormFieldFieldsfilternullswitch extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_NULL_SWITCH') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get fieldsmodel
-			$model = ComponentbuilderHelper::getModel('fields');
-			$results = array_unique($results);
-			foreach ($results as $null_switch)
+			$_model = ComponentbuilderHelper::getModel('fields');
+			$_results = array_unique($_results);
+			foreach ($_results as $null_switch)
 			{
 				// Translate the null_switch selection
-				$text = $model->selectionTranslation($null_switch,'null_switch');
+				$_text = $_model->selectionTranslation($null_switch,'null_switch');
 				// Now add the null_switch and its text to the options array
-				$_filter[] = JHtml::_('select.option', $null_switch, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $null_switch, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/fieldsfilterstore.php

@@ -49,21 +49,21 @@ class JFormFieldFieldsfilterstore extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
-		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_MODELING_METHOD') . ' -');
+		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_MODELLING_METHOD') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get fieldsmodel
-			$model = ComponentbuilderHelper::getModel('fields');
-			$results = array_unique($results);
-			foreach ($results as $store)
+			$_model = ComponentbuilderHelper::getModel('fields');
+			$_results = array_unique($_results);
+			foreach ($_results as $store)
 			{
 				// Translate the store selection
-				$text = $model->selectionTranslation($store,'store');
+				$_text = $_model->selectionTranslation($store,'store');
 				// Now add the store and its text to the options array
-				$_filter[] = JHtml::_('select.option', $store, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $store, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/helpdocumentsfilterlocation.php

@@ -49,21 +49,21 @@ class JFormFieldHelpdocumentsfilterlocation extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_LOCATION') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get help_documentsmodel
-			$model = ComponentbuilderHelper::getModel('help_documents');
-			$results = array_unique($results);
-			foreach ($results as $location)
+			$_model = ComponentbuilderHelper::getModel('help_documents');
+			$_results = array_unique($_results);
+			foreach ($_results as $location)
 			{
 				// Translate the location selection
-				$text = $model->selectionTranslation($location,'location');
+				$_text = $_model->selectionTranslation($location,'location');
 				// Now add the location and its text to the options array
-				$_filter[] = JHtml::_('select.option', $location, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $location, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/helpdocumentsfiltertype.php

@@ -49,21 +49,21 @@ class JFormFieldHelpdocumentsfiltertype extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_TYPE') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get help_documentsmodel
-			$model = ComponentbuilderHelper::getModel('help_documents');
-			$results = array_unique($results);
-			foreach ($results as $type)
+			$_model = ComponentbuilderHelper::getModel('help_documents');
+			$_results = array_unique($_results);
+			foreach ($_results as $type)
 			{
 				// Translate the type selection
-				$text = $model->selectionTranslation($type,'type');
+				$_text = $_model->selectionTranslation($type,'type');
 				// Now add the type and its text to the options array
-				$_filter[] = JHtml::_('select.option', $type, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $type, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/joomlacomponentsfilterauthor.php

@@ -49,13 +49,13 @@ class JFormFieldJoomlacomponentsfilterauthor extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 
-		if ($results)
+		if ($_results)
 		{
-			$results = array_unique($results);
-			foreach ($results as $author)
+			$_results = array_unique($_results);
+			foreach ($_results as $author)
 			{
 				// Now add the author and its text to the options array
 				$_filter[] = JHtml::_('select.option', $author, $author);

admin/models/fields/joomlacomponentsfiltercompanyname.php

@@ -49,13 +49,13 @@ class JFormFieldJoomlacomponentsfiltercompanyname extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 
-		if ($results)
+		if ($_results)
 		{
-			$results = array_unique($results);
-			foreach ($results as $companyname)
+			$_results = array_unique($_results);
+			foreach ($_results as $companyname)
 			{
 				// Now add the companyname and its text to the options array
 				$_filter[] = JHtml::_('select.option', $companyname, $companyname);

admin/models/fields/joomlamodulesfiltertarget.php

@@ -49,21 +49,21 @@ class JFormFieldJoomlamodulesfiltertarget extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_TARGET_AREA') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get joomla_modulesmodel
-			$model = ComponentbuilderHelper::getModel('joomla_modules');
-			$results = array_unique($results);
-			foreach ($results as $target)
+			$_model = ComponentbuilderHelper::getModel('joomla_modules');
+			$_results = array_unique($_results);
+			foreach ($_results as $target)
 			{
 				// Translate the target selection
-				$text = $model->selectionTranslation($target,'target');
+				$_text = $_model->selectionTranslation($target,'target');
 				// Now add the target and its text to the options array
-				$_filter[] = JHtml::_('select.option', $target, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $target, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/layoutsfilteraddphpview.php

@@ -49,21 +49,21 @@ class JFormFieldLayoutsfilteraddphpview extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_PHP_CUSTOM_VIEW_SCRIPT') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get layoutsmodel
-			$model = ComponentbuilderHelper::getModel('layouts');
-			$results = array_unique($results);
-			foreach ($results as $add_php_view)
+			$_model = ComponentbuilderHelper::getModel('layouts');
+			$_results = array_unique($_results);
+			foreach ($_results as $add_php_view)
 			{
 				// Translate the add_php_view selection
-				$text = $model->selectionTranslation($add_php_view,'add_php_view');
+				$_text = $_model->selectionTranslation($add_php_view,'add_php_view');
 				// Now add the add_php_view and its text to the options array
-				$_filter[] = JHtml::_('select.option', $add_php_view, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $add_php_view, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/librariesfiltertarget.php

@@ -49,21 +49,21 @@ class JFormFieldLibrariesfiltertarget extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_TARGET_FOLDER') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get librariesmodel
-			$model = ComponentbuilderHelper::getModel('libraries');
-			$results = array_unique($results);
-			foreach ($results as $target)
+			$_model = ComponentbuilderHelper::getModel('libraries');
+			$_results = array_unique($_results);
+			foreach ($_results as $target)
 			{
 				// Translate the target selection
-				$text = $model->selectionTranslation($target,'target');
+				$_text = $_model->selectionTranslation($target,'target');
 				// Now add the target and its text to the options array
-				$_filter[] = JHtml::_('select.option', $target, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $target, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/librariesfiltertype.php

@@ -49,21 +49,21 @@ class JFormFieldLibrariesfiltertype extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_TYPE_BEHAVIOR') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get librariesmodel
-			$model = ComponentbuilderHelper::getModel('libraries');
-			$results = array_unique($results);
-			foreach ($results as $type)
+			$_model = ComponentbuilderHelper::getModel('libraries');
+			$_results = array_unique($_results);
+			foreach ($_results as $type)
 			{
 				// Translate the type selection
-				$text = $model->selectionTranslation($type,'type');
+				$_text = $_model->selectionTranslation($type,'type');
 				// Now add the type and its text to the options array
-				$_filter[] = JHtml::_('select.option', $type, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $type, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/linkedviewsorderfields.php

@@ -87,8 +87,17 @@ class JFormFieldLinkedviewsorderfields extends JFormFieldList
 					foreach($items as $item)
 					{
 						// get the field name (TODO this could slow down the system so we will need to improve on this)
-						$field_name = ComponentbuilderHelper::safeFieldName(ComponentbuilderHelper::getBetween(json_decode($item->xml),'name="','"'));
-						$options[] = JHtml::_('select.option', $item->id, $item->name . ' [ ' . $field_name . ' - ' . $item->type . ' ]');
+						if (isset($item->xml) && ComponentbuilderHelper::checkJson($item->xml))
+						{
+							$field_xml = json_decode($item->xml);
+							$field_name = ComponentbuilderHelper::getBetween($field_xml,'name="','"');
+							$field_name = ComponentbuilderHelper::safeFieldName($field_name);
+							$options[] = JHtml::_('select.option', $item->id, $item->name . ' [ ' . $field_name . ' - ' . $item->type . ' ]');
+						}
+						else
+						{
+							$options[] = JHtml::_('select.option', $item->id, $item->name . ' [ empty - ' . $item->type . ' ]');
+						}
 					}
 				}
 				return $options;

admin/models/fields/listfields.php

@@ -94,8 +94,17 @@ class JFormFieldListfields extends JFormFieldList
 					foreach($items as $item)
 					{
 						// get the field name (TODO this could slow down the system so we will need to improve on this)
-						$field_name = ComponentbuilderHelper::safeFieldName(ComponentbuilderHelper::getBetween(json_decode($item->xml),'name="','"'));
-						$options[] = JHtml::_('select.option', $item->id, $item->name . ' [ ' . $field_name . ' - ' . $item->type . ' ]');
+						if (isset($item->xml) && ComponentbuilderHelper::checkJson($item->xml))
+						{
+							$field_xml = json_decode($item->xml);
+							$field_name = ComponentbuilderHelper::getBetween($field_xml,'name="','"');
+							$field_name = ComponentbuilderHelper::safeFieldName($field_name);
+							$options[] = JHtml::_('select.option', $item->id, $item->name . ' [ ' . $field_name . ' - ' . $item->type . ' ]');
+						}
+						else
+						{
+							$options[] = JHtml::_('select.option', $item->id, $item->name . ' [ empty - ' . $item->type . ' ]');
+						}
 					}
 				}
 				return $options;

admin/models/fields/powersclassmethods.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/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');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Powersclassmethods Form Field class for the Componentbuilder component
+ */
+class JFormFieldPowersclassmethods extends JFormFieldList
+{
+	/**
+	 * The powersclassmethods field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'powersclassmethods';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		
+// Get the user object.
+		$user = JFactory::getUser();
+		// Get the databse object.
+		$db = JFactory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.id','a.name','a.visibility'),array('id','method_name','visibility')));
+		$query->from($db->quoteName('#__componentbuilder_class_method', 'a'));
+		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->where($db->quoteName('a.extension_type') . ' = ' . $db->quote('powers'));
+		$query->order('a.name ASC');
+		// Implement View Level Access (if set in table)
+		if (!$user->authorise('core.options', 'com_componentbuilder'))
+		{
+			$columns = $db->getTableColumns('#__componentbuilder_class_method');
+			if(isset($columns['access']))
+			{
+				$groups = implode(',', $user->getAuthorisedViewLevels());
+				$query->where('a.access IN (' . $groups . ')');
+			}
+		}
+		$db->setQuery((string)$query);
+		$items = $db->loadObjectList();
+		$options = array();
+		if ($items)
+		{
+			$options[] = JHtml::_('select.option', '', 'Select a method');
+			foreach($items as $item)
+			{
+				// we are using this code in more then one field JCB custom_code
+				if ('method' === 'method')
+				{
+					$select = $item->visibility  . ' function ' . $item->method_name . '()';
+				}
+				else
+				{
+					$select = $item->visibility  . ' $' . $item->method_name;
+				}
+				$options[] = JHtml::_('select.option', $item->id, $select);
+			}
+		}
+		return $options;
+	}
+}

admin/models/fields/powersclassproperties.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/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');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Powersclassproperties Form Field class for the Componentbuilder component
+ */
+class JFormFieldPowersclassproperties extends JFormFieldList
+{
+	/**
+	 * The powersclassproperties field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'powersclassproperties';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		
+// Get the user object.
+		$user = JFactory::getUser();
+		// Get the databse object.
+		$db = JFactory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.id','a.name','a.visibility'),array('id','property_name','visibility')));
+		$query->from($db->quoteName('#__componentbuilder_class_property', 'a'));
+		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->where($db->quoteName('a.extension_type') . ' = ' . $db->quote('powers'));
+		$query->order('a.name ASC');
+		// Implement View Level Access (if set in table)
+		if (!$user->authorise('core.options', 'com_componentbuilder'))
+		{
+			$columns = $db->getTableColumns('#__componentbuilder_class_property');
+			if(isset($columns['access']))
+			{
+				$groups = implode(',', $user->getAuthorisedViewLevels());
+				$query->where('a.access IN (' . $groups . ')');
+			}
+		}
+		$db->setQuery((string)$query);
+		$items = $db->loadObjectList();
+		$options = array();
+		if ($items)
+		{
+			$options[] = JHtml::_('select.option', '', 'Select a property');
+			foreach($items as $item)
+			{
+				// we are using this code in more then one field JCB custom_code
+				if ('method' === 'property')
+				{
+					$select = $item->visibility  . ' function ' . $item->property_name . '()';
+				}
+				else
+				{
+					$select = $item->visibility  . ' $' . $item->property_name;
+				}
+				$options[] = JHtml::_('select.option', $item->id, $select);
+			}
+		}
+		return $options;
+	}
+}

admin/models/fields/powersfilterapproved.php

@@ -49,21 +49,21 @@ class JFormFieldPowersfilterapproved extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_SUPER_POWER') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get powersmodel
-			$model = ComponentbuilderHelper::getModel('powers');
-			$results = array_unique($results);
-			foreach ($results as $approved)
+			$_model = ComponentbuilderHelper::getModel('powers');
+			$_results = array_unique($_results);
+			foreach ($_results as $approved)
 			{
 				// Translate the approved selection
-				$text = $model->selectionTranslation($approved,'approved');
+				$_text = $_model->selectionTranslation($approved,'approved');
 				// Now add the approved and its text to the options array
-				$_filter[] = JHtml::_('select.option', $approved, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $approved, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/powersfiltertype.php

@@ -49,20 +49,20 @@ class JFormFieldPowersfiltertype extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 
-		if ($results)
+		if ($_results)
 		{
 			// get powersmodel
-			$model = ComponentbuilderHelper::getModel('powers');
-			$results = array_unique($results);
-			foreach ($results as $type)
+			$_model = ComponentbuilderHelper::getModel('powers');
+			$_results = array_unique($_results);
+			foreach ($_results as $type)
 			{
 				// Translate the type selection
-				$text = $model->selectionTranslation($type,'type');
+				$_text = $_model->selectionTranslation($type,'type');
 				// Now add the type and its text to the options array
-				$_filter[] = JHtml::_('select.option', $type, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $type, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/serversfiltername.php

@@ -49,14 +49,14 @@ class JFormFieldServersfiltername extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_NAME') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
-			$results = array_unique($results);
-			foreach ($results as $name)
+			$_results = array_unique($_results);
+			foreach ($_results as $name)
 			{
 				// Now add the name and its text to the options array
 				$_filter[] = JHtml::_('select.option', $name, $name);

admin/models/fields/serversfilterprotocol.php

@@ -49,21 +49,21 @@ class JFormFieldServersfilterprotocol extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_PROTOCOL') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get serversmodel
-			$model = ComponentbuilderHelper::getModel('servers');
-			$results = array_unique($results);
-			foreach ($results as $protocol)
+			$_model = ComponentbuilderHelper::getModel('servers');
+			$_results = array_unique($_results);
+			foreach ($_results as $protocol)
 			{
 				// Translate the protocol selection
-				$text = $model->selectionTranslation($protocol,'protocol');
+				$_text = $_model->selectionTranslation($protocol,'protocol');
 				// Now add the protocol and its text to the options array
-				$_filter[] = JHtml::_('select.option', $protocol, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $protocol, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/siteviewsfilteraddcustombutton.php

@@ -49,21 +49,21 @@ class JFormFieldSiteviewsfilteraddcustombutton extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_CUSTOM_BUTTONS') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get site_viewsmodel
-			$model = ComponentbuilderHelper::getModel('site_views');
-			$results = array_unique($results);
-			foreach ($results as $add_custom_button)
+			$_model = ComponentbuilderHelper::getModel('site_views');
+			$_results = array_unique($_results);
+			foreach ($_results as $add_custom_button)
 			{
 				// Translate the add_custom_button selection
-				$text = $model->selectionTranslation($add_custom_button,'add_custom_button');
+				$_text = $_model->selectionTranslation($add_custom_button,'add_custom_button');
 				// Now add the add_custom_button and its text to the options array
-				$_filter[] = JHtml::_('select.option', $add_custom_button, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $add_custom_button, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/siteviewsfilteraddphpajax.php

@@ -49,21 +49,21 @@ class JFormFieldSiteviewsfilteraddphpajax extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_PHP_AJAX') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get site_viewsmodel
-			$model = ComponentbuilderHelper::getModel('site_views');
-			$results = array_unique($results);
-			foreach ($results as $add_php_ajax)
+			$_model = ComponentbuilderHelper::getModel('site_views');
+			$_results = array_unique($_results);
+			foreach ($_results as $add_php_ajax)
 			{
 				// Translate the add_php_ajax selection
-				$text = $model->selectionTranslation($add_php_ajax,'add_php_ajax');
+				$_text = $_model->selectionTranslation($add_php_ajax,'add_php_ajax');
 				// Now add the add_php_ajax and its text to the options array
-				$_filter[] = JHtml::_('select.option', $add_php_ajax, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $add_php_ajax, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fields/templatesfilteraddphpview.php

@@ -49,21 +49,21 @@ class JFormFieldTemplatesfilteraddphpview extends JFormFieldList
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
 
-		$results = $db->loadColumn();
+		$_results = $db->loadColumn();
 		$_filter = array();
 		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_PHP_CUSTOM_VIEW_SCRIPT') . ' -');
 
-		if ($results)
+		if ($_results)
 		{
 			// get templatesmodel
-			$model = ComponentbuilderHelper::getModel('templates');
-			$results = array_unique($results);
-			foreach ($results as $add_php_view)
+			$_model = ComponentbuilderHelper::getModel('templates');
+			$_results = array_unique($_results);
+			foreach ($_results as $add_php_view)
 			{
 				// Translate the add_php_view selection
-				$text = $model->selectionTranslation($add_php_view,'add_php_view');
+				$_text = $_model->selectionTranslation($add_php_view,'add_php_view');
 				// Now add the add_php_view and its text to the options array
-				$_filter[] = JHtml::_('select.option', $add_php_view, JText::_($text));
+				$_filter[] = JHtml::_('select.option', $add_php_view, JText::_($_text));
 			}
 		}
 		return $_filter;

admin/models/fieldtype.php

@@ -16,6 +16,11 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 /**
  * Componentbuilder Fieldtype Admin Model
@@ -58,6 +63,8 @@ class ComponentbuilderModelFieldtype extends AdminModel
 				'indexes',
 				'null_switch',
 				'store',
+				'basic_encryption_note',
+				'medium_encryption_note',
 				'note_whmcs_encryption'
 			)
 		)
@@ -125,7 +132,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'fieldtype__'.$id);
 				ComponentbuilderHelper::set('fieldtype__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -133,7 +140,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -199,7 +206,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'fieldtype__'.$id);
 				ComponentbuilderHelper::set('fieldtype__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -207,7 +214,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -300,7 +307,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
 				}
 			}
 			// now check if we have IDs
-			if ($get_ids && ComponentbuilderHelper::checkArray($field_ids))
+			if ($get_ids && UtilitiesArrayHelper::check($field_ids))
 			{
 				$query->where($db->quoteName('a.id') . ' IN (' . implode(',', $field_ids) . ')');
 			}
@@ -599,7 +606,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
 		// Only load the GUID if new item (or empty)
 		if (0 == $id || !($val = $form->getValue('guid')))
 		{
-			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+			$form->setValue('guid', null, GuidHelper::get());
 		}
 
 		return $form;
@@ -663,7 +670,7 @@ class ComponentbuilderModelFieldtype extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('fieldtype.edit.state', 'com_componentbuilder');
 	}
     
@@ -1252,15 +1259,15 @@ class ComponentbuilderModelFieldtype extends AdminModel
 		if (empty($data['guid']) && $data['id'] > 0)
 		{
 			// get the existing one
-			$data['guid'] = (string) ComponentbuilderHelper::getVar('fieldtype', $data['id'], 'id', 'guid');
+			$data['guid'] = (string) GetHelper::var('fieldtype', $data['id'], 'id', 'guid');
 		}
+
 		// Set the GUID if empty or not valid
-		while (!ComponentbuilderHelper::validGUID($data['guid'], "fieldtype", $data['id']))
+		while (!GuidHelper::valid($data['guid'], "fieldtype", $data['id']))
 		{
 			// must always be set
-			$data['guid'] = (string) ComponentbuilderHelper::GUID();
-		}
-
+			$data['guid'] = (string) GuidHelper::get();
+		}
 
 		// Set the properties items to data.
 		if (isset($data['properties']) && is_array($data['properties']))

admin/models/forms/admin_view.xml

@@ -731,7 +731,7 @@
 					readonly="false"
 					disabled="false"
 					required="true"
-					filter="WORD"
+					filter="STRING"
 					message="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_MESSAGE"
 					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_HINT"
 				/>

admin/models/forms/field.xml

@@ -239,21 +239,6 @@
 			description="COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION"
 			class="inputbox"
 		/>
-		<!-- Note_no_database_settings_needed Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_no_database_settings_needed" label="COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_DESCRIPTION" heading="h4" class="alert alert-info note_no_database_settings_needed" />
-		<!-- On_get_model_field Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="on_get_model_field"
-			label="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_LABEL"
-			rows="5"
-			cols="10"
-			description="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_HINT"
-			required="true"
-		/>
 		<!-- On_save_model_field Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@@ -280,8 +265,28 @@
 			hint="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_GET_MODEL_HINT"
 			required="false"
 		/>
+		<!-- Initiator_on_save_model Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="initiator_on_save_model"
+			label="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_LABEL"
+			rows="5"
+			cols="10"
+			description="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_HINT"
+			required="false"
+		/>
 		<!-- Note_filter_information Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_filter_information" description="COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION" class="note_filter_information" />
+		<!-- Xml Field. Type: Hidden. (joomla) -->
+		<field
+			type="hidden"
+			name="xml"
+			default="1"
+			filter="raw"
+		/>
 		<!-- Datalenght Field. Type: List. (joomla) -->
 		<field
 			type="list"
@@ -318,12 +323,14 @@
 			<option value="Other">
 				COM_COMPONENTBUILDER_FIELD_OTHER</option>
 		</field>
-		<!-- Css_view Field. Type: Editor. (joomla) -->
+		<!-- Note_database_settings_needed Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_database_settings_needed" label="COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_DESCRIPTION" heading="h4" class="alert alert-info note_database_settings_needed" />
+		<!-- Css_views Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="css_view"
-			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL"
-			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_DESCRIPTION"
+			name="css_views"
+			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_LABEL"
+			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -334,28 +341,12 @@
 			filter="raw"
 			validate="code"
 		/>
-		<!-- Javascript_view_footer Field. Type: Editor. (joomla) -->
+		<!-- Css_view Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="javascript_view_footer"
-			label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL"
-			description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="javascript"
-			editor="codemirror|none"
-			filter="raw"
-			validate="code"
-		/>
-		<!-- Css_views Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="css_views"
-			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_LABEL"
-			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_DESCRIPTION"
+			name="css_view"
+			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL"
+			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -419,8 +410,37 @@
 			message="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE"
 			hint="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_HINT"
 		/>
-		<!-- Note_database_settings_needed Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_database_settings_needed" label="COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_DATABASE_SETTINGS_NEEDED_DESCRIPTION" heading="h4" class="alert alert-info note_database_settings_needed" />
+		<!-- On_get_model_field Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="on_get_model_field"
+			label="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_LABEL"
+			rows="5"
+			cols="10"
+			description="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_FIELD_ON_GET_MODEL_FIELD_HINT"
+			required="true"
+		/>
+		<!-- Javascript_view_footer Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="javascript_view_footer"
+			label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL"
+			description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="javascript"
+			editor="codemirror|none"
+			filter="raw"
+			validate="code"
+		/>
+		<!-- Note_no_database_settings_needed Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_no_database_settings_needed" label="COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_NO_DATABASE_SETTINGS_NEEDED_DESCRIPTION" heading="h4" class="alert alert-info note_no_database_settings_needed" />
 		<!-- Javascript_views_footer Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -451,12 +471,11 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_FIELD_NO</option>
 		</field>
-		<!-- Xml Field. Type: Hidden. (joomla) -->
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
-			name="xml"
-			default="1"
-			filter="raw"
+			name="not_required"
+			default="一_一"
 		/>
 		<!-- Add_css_views Field. Type: Radio. (joomla) -->
 		<field
@@ -472,12 +491,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_FIELD_NO</option>
 		</field>
-		<!-- Not_required Field. Type: Hidden. (joomla) -->
-		<field
-			type="hidden"
-			name="not_required"
-			default="一_一"
-		/>
+		<!-- Medium_encryption_note Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="medium_encryption_note" label="COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_NOTE_LABEL" description="COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_NOTE_DESCRIPTION" heading="h4" class="alert alert-error medium_encryption_note" showon="store:5" />
 		<!-- Add_javascript_view_footer Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -492,8 +507,8 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_FIELD_NO</option>
 		</field>
-		<!-- Note_whmcs_encryption Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_whmcs_encryption" label="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_encryption" />
+		<!-- Basic_encryption_note Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="basic_encryption_note" label="COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_NOTE_LABEL" description="COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_NOTE_DESCRIPTION" heading="h4" class="alert alert-error basic_encryption_note" showon="store:3" />
 		<!-- Add_javascript_views_footer Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -508,23 +523,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_FIELD_NO</option>
 		</field>
-		<!-- Note_expert_field_save_mode Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_expert_field_save_mode" label="COM_COMPONENTBUILDER_FIELD_NOTE_EXPERT_FIELD_SAVE_MODE_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_EXPERT_FIELD_SAVE_MODE_DESCRIPTION" heading="h4" class="alert alert-success note_expert_encryption note_expert_field_save_mode" />
+		<!-- Note_whmcs_encryption Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_whmcs_encryption" label="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_encryption" />
 		<!-- Helpnote Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="helpnote" label="COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL" class="helpNote helpnote" />
-		<!-- Initiator_on_save_model Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="initiator_on_save_model"
-			label="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_LABEL"
-			rows="5"
-			cols="10"
-			description="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_FIELD_INITIATOR_ON_SAVE_MODEL_HINT"
-			required="false"
-		/>
+		<!-- Note_expert_field_save_mode Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_expert_field_save_mode" label="COM_COMPONENTBUILDER_FIELD_NOTE_EXPERT_FIELD_SAVE_MODE_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_EXPERT_FIELD_SAVE_MODE_DESCRIPTION" heading="h4" class="alert alert-success note_expert_encryption note_expert_field_save_mode" />
 		<!-- Guid Field. Type: Text. (joomla) -->
 		<field
 			type="text"

admin/models/forms/fieldtype.xml

@@ -207,20 +207,6 @@
 			<option value="Other">
 				COM_COMPONENTBUILDER_FIELDTYPE_OTHER</option>
 		</field>
-		<!-- Datalenght_other Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="datalenght_other"
-			label="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_LABEL"
-			size="10"
-			maxlength="50"
-			description="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_DESCRIPTION"
-			class="text_area"
-			required="true"
-			filter="STRING"
-			message="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_MESSAGE"
-			hint="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_HINT"
-		/>
 		<!-- Short_description Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@@ -235,6 +221,8 @@
 			message="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_MESSAGE"
 			hint="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_HINT"
 		/>
+		<!-- Note_whmcs_encryption Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_whmcs_encryption" label="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_WHMCS_ENCRYPTION_LABEL" description="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_WHMCS_ENCRYPTION_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_encryption" />
 		<!-- Datatype Field. Type: List. (joomla) -->
 		<field
 			type="list"
@@ -400,8 +388,8 @@
 			filter="HTML"
 			hint="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_HINT"
 		/>
-		<!-- Note_whmcs_encryption Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_whmcs_encryption" label="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_WHMCS_ENCRYPTION_LABEL" description="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_WHMCS_ENCRYPTION_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_encryption" />
+		<!-- Basic_encryption_note Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="basic_encryption_note" label="COM_COMPONENTBUILDER_FIELDTYPE_BASIC_ENCRYPTION_NOTE_LABEL" description="COM_COMPONENTBUILDER_FIELDTYPE_BASIC_ENCRYPTION_NOTE_DESCRIPTION" heading="h4" class="alert alert-error basic_encryption_note" showon="store:3" />
 		<!-- Datalenght Field. Type: List. (joomla) -->
 		<field
 			type="list"
@@ -438,6 +426,22 @@
 			<option value="Other">
 				COM_COMPONENTBUILDER_FIELDTYPE_OTHER</option>
 		</field>
+		<!-- Medium_encryption_note Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="medium_encryption_note" label="COM_COMPONENTBUILDER_FIELDTYPE_MEDIUM_ENCRYPTION_NOTE_LABEL" description="COM_COMPONENTBUILDER_FIELDTYPE_MEDIUM_ENCRYPTION_NOTE_DESCRIPTION" heading="h4" class="alert alert-error medium_encryption_note" showon="store:5" />
+		<!-- Datalenght_other Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="datalenght_other"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_LABEL"
+			size="10"
+			maxlength="50"
+			description="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_DESCRIPTION"
+			class="text_area"
+			required="true"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_MESSAGE"
+			hint="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_HINT"
+		/>
 		<!-- Guid Field. Type: Text. (joomla) -->
 		<field
 			type="text"

admin/models/forms/filter_fields.xml

@@ -104,8 +104,8 @@
 			<option value="a.indexes DESC">COM_COMPONENTBUILDER_FILTER_INDEXES_TYPE_DESCENDING</option>
 			<option value="a.null_switch ASC">COM_COMPONENTBUILDER_FILTER_NULL_SWITCH_ASCENDING</option>
 			<option value="a.null_switch DESC">COM_COMPONENTBUILDER_FILTER_NULL_SWITCH_DESCENDING</option>
-			<option value="a.store ASC">COM_COMPONENTBUILDER_FILTER_MODELING_METHOD_ASCENDING</option>
-			<option value="a.store DESC">COM_COMPONENTBUILDER_FILTER_MODELING_METHOD_DESCENDING</option>
+			<option value="a.store ASC">COM_COMPONENTBUILDER_FILTER_MODELLING_METHOD_ASCENDING</option>
+			<option value="a.store DESC">COM_COMPONENTBUILDER_FILTER_MODELLING_METHOD_DESCENDING</option>
 			<option value="category_title ASC">COM_COMPONENTBUILDER_FILTER_FIELDS_CATEGORIES_ASCENDING</option>
 			<option value="category_title DESC">COM_COMPONENTBUILDER_FILTER_FIELDS_CATEGORIES_DESCENDING</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>

admin/models/forms/power.xml

@@ -178,9 +178,9 @@
 			max="150"
 			min="0">
 			<form hidden="true" name="list_method_selection_modal" repeat="true">
-				<!-- Method Field. Type: Pluginsclassmethods. (custom) -->
+				<!-- Method Field. Type: Powersclassmethods. (custom) -->
 				<field
-					type="pluginsclassmethods"
+					type="powersclassmethods"
 					name="method"
 					label="COM_COMPONENTBUILDER_POWER_METHOD_LABEL"
 					class="list_class span12 method_selection_list"
@@ -342,9 +342,9 @@
 			max="150"
 			min="0">
 			<form hidden="true" name="list_property_selection_modal" repeat="true">
-				<!-- Property Field. Type: Pluginsclassproperties. (custom) -->
+				<!-- Property Field. Type: Powersclassproperties. (custom) -->
 				<field
-					type="pluginsclassproperties"
+					type="powersclassproperties"
 					name="property"
 					label="COM_COMPONENTBUILDER_POWER_PROPERTY_LABEL"
 					class="list_class span12 property_selection_list"

admin/models/help_document.php

@@ -293,7 +293,7 @@ class ComponentbuilderModelHelp_document extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('help_document.edit.state', 'com_componentbuilder');
 	}
     

admin/models/import_joomla_components.php

@@ -357,7 +357,7 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 				if (JFile::exists($infoFile))
 				{
 					// load the data
-					if ($info = @file_get_contents($infoFile))
+					if ($info = FileHelper::getContent($infoFile))
 					{
 						// unlock the info data
 						if ((($info_ = PackageFactory::_('Crypt')->decrypt($info, 'local')) !== null && JsonHelper::check($info_)) ||
@@ -644,7 +644,7 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 					if (JFile::exists($dbFile))
 					{
 						// load the data
-						if ($data = @file_get_contents($dbFile))
+						if ($data = FileHelper::getContent($dbFile))
 						{
 							// prep the data
 							if ($this->extractData($data))
@@ -679,7 +679,7 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 	protected function extractData($data)
 	{
 		// remove all line breaks
-		if (($data = $this->decrypt($data, $this->sleutle)) !== false)
+		if (($data = $this->decrypt($data, $this->sleutle)) !== null)
 		{
 			// final check if we have success
 			$data = @unserialize($data);
@@ -1058,7 +1058,7 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 		foreach ($files as $file)
 		{
 			// open the file content
-			if (($data = $this->decrypt(file_get_contents($file), $this->sleutle)) !== false)
+			if (($data = $this->decrypt(file_get_contents($file), $this->sleutle)) !== null)
 			{
 				// write the decrypted data back to file
 				if (!FileHelper::write($file, $data))
@@ -1104,20 +1104,20 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 			{
 				// try phpseclib version 3
 				if(($this->isPhpseclib3Enabled() || $force) &&
-					($data_ = $this->decryptWithPhpseclib3($data, $password)) !== false)
+					($data_ = $this->decryptWithPhpseclib3($data, $password)) !== null)
 				{
 					return $data_;
 				}
 
 				// try phpseclib version 2
 				if(($this->isPhpseclib2Enabled() || $force) &&
-					($data_ = $this->decryptWithPhpseclib2($data, $password)) !== false)
+					($data_ = $this->decryptWithPhpseclib2($data, $password)) !== null)
 				{
 					return $data_;
 				}
 
 				// try FOF the outdated method
-				if (($data_ = $this->decryptWithFof($data, $password)) !== false)
+				if (($data_ = $this->decryptWithFof($data, $password)) !== null)
 				{
 					return $data_;
 				}
@@ -1185,12 +1185,16 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 	 * @param string $data
 	 * @param string $password
 	 *
-	 * @return string|bool
+	 * @return string|null
 	 */
-	private function decryptWithPhpseclib2(string $data, string $password)
+	private function decryptWithPhpseclib2(string $data, string $password): ?string
 	{
 		$data_ = PackageFactory::_('Crypt')->decrypt($data, 'legacy', $password);
-		return strcmp($data, $data_) !== 0 ? $data_ : false;
+		if ($data_ !== null)
+		{
+			return strcmp($data, $data_) !== 0 ? $data_ : null;
+		}
+		return null;
 	}
 
 	/**
@@ -1209,12 +1213,16 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 	 * @param string $data
 	 * @param string $password
 	 *
-	 * @return string|bool
+	 * @return string|null
 	 */
-	private function decryptWithPhpseclib3(string $data, string $password)
+	private function decryptWithPhpseclib3(string $data, string $password): ?string
 	{
 		$data_ = PackageFactory::_('Crypt')->decrypt($data, 'aes', $password);
-		return strcmp($data, $data_) !== 0 ? $data_ : false;
+		if ($data_ !== null)
+		{
+			return strcmp($data, $data_) !== 0 ? $data_ : null;
+		}
+		return null;
 	}
 
 	/**
@@ -1223,12 +1231,16 @@ class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel
 	 * @param string $data
 	 * @param string $password
 	 *
-	 * @return string|bool
+	 * @return string|null
 	 */
-	private function decryptWithFof(string $data, string $password)
+	private function decryptWithFof(string $data, string $password): ?string
 	{
 		$data_ = PackageFactory::_('Crypt')->decrypt($data, 'fof', $password);
-		return strcmp($data, $data_) !== 0 ? $data_ : false;
+		if ($data_ !== null)
+		{
+			return strcmp($data, $data_) !== 0 ? $data_ : null;
+		}
+		return null;
 	}
 
 	/**

admin/models/import_language_translations.php

@@ -17,6 +17,8 @@ use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\Utilities\ArrayHelper;
 use PhpOffice\PhpSpreadsheet\IOFactory;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 /**
  * Componentbuilder Import_language_translations Base Database Model
@@ -419,7 +421,7 @@ class ComponentbuilderModelImport_language_translations extends BaseDatabaseMode
 	**/
 	protected function setData($package,$table,$target_headers)
 	{
-		if (ComponentbuilderHelper::checkArray($target_headers))
+		if (UtilitiesArrayHelper::check($target_headers))
 		{
 			// make sure the file is loaded
 			ComponentbuilderHelper::composerAutoload('phpspreadsheet');
@@ -510,7 +512,7 @@ class ComponentbuilderModelImport_language_translations extends BaseDatabaseMode
 					$found = false;
 					$has_id = false;
 					// check that we have a string or a number<-(which is weird... but happens at times)
-					if ($canEdit && isset($row[$source_key]) && (ComponentbuilderHelper::checkString($row[$source_key]) || is_numeric($row[$source_key])))
+					if ($canEdit && isset($row[$source_key]) && (StringHelper::check($row[$source_key]) || is_numeric($row[$source_key])))
 					{
 						// raw items import & update!
 						$query = $db->getQuery(true);

admin/models/joomla_component.php

@@ -16,6 +16,12 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\FOF\Encrypt\AES;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 /**
  * Componentbuilder Joomla_component Admin Model
@@ -273,7 +279,7 @@ class ComponentbuilderModelJoomla_component extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'joomla_component__'.$id);
 				ComponentbuilderHelper::set('joomla_component__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -281,7 +287,7 @@ class ComponentbuilderModelJoomla_component extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -447,7 +453,7 @@ class ComponentbuilderModelJoomla_component extends AdminModel
 			// Get the basic encryption.
 			$basickey = ComponentbuilderHelper::getCryptKey('basic');
 			// Get the encryption object.
-			$basic = new FOFEncryptAes($basickey);
+			$basic = new AES($basickey);
 
 			if (!empty($item->whmcs_key) && $basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true)))
 			{
@@ -504,7 +510,7 @@ class ComponentbuilderModelJoomla_component extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'joomla_component__'.$id);
 				ComponentbuilderHelper::set('joomla_component__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -512,7 +518,7 @@ class ComponentbuilderModelJoomla_component extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -680,7 +686,7 @@ class ComponentbuilderModelJoomla_component extends AdminModel
 		// now get all the editor fields
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
 		// check if we found any
-		if (ComponentbuilderHelper::checkArray($editors))
+		if (UtilitiesArrayHelper::check($editors))
 		{
 			foreach ($editors as $editor)
 			{
@@ -695,7 +701,7 @@ class ComponentbuilderModelJoomla_component extends AdminModel
 		// Only load the GUID if new item (or empty)
 		if (0 == $id || !($val = $form->getValue('guid')))
 		{
-			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+			$form->setValue('guid', null, GuidHelper::get());
 		}
 
 		return $form;
@@ -759,7 +765,7 @@ class ComponentbuilderModelJoomla_component extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('joomla_component.edit.state', 'com_componentbuilder');
 	}
     
@@ -925,7 +931,7 @@ class ComponentbuilderModelJoomla_component extends AdminModel
 		}
 
 		// we must also delete the linked tables found
-		if (ComponentbuilderHelper::checkArray($pks))
+		if (UtilitiesArrayHelper::check($pks))
 		{
 			$_tablesArray = array(
 				'component_admin_views' => 'joomla_component',
@@ -974,7 +980,7 @@ class ComponentbuilderModelJoomla_component extends AdminModel
 		}
 
 		// we must also update all linked tables
-		if (ComponentbuilderHelper::checkArray($pks))
+		if (UtilitiesArrayHelper::check($pks))
 		{
 			$_tablesArray = array(
 				'component_admin_views' => 'joomla_component',
@@ -1377,7 +1383,7 @@ class ComponentbuilderModelJoomla_component extends AdminModel
 		}
 
 		// if system name is empty create from name
-		if (empty($data['system_name']) || !ComponentbuilderHelper::checkString($data['system_name']))
+		if (empty($data['system_name']) || !UtilitiesStringHelper::check($data['system_name']))
 		{
 			$data['system_name'] = $data['name'];
 		}
@@ -1386,15 +1392,15 @@ class ComponentbuilderModelJoomla_component extends AdminModel
 		if (empty($data['guid']) && $data['id'] > 0)
 		{
 			// get the existing one
-			$data['guid'] = (string) ComponentbuilderHelper::getVar('joomla_component', $data['id'], 'id', 'guid');
+			$data['guid'] = (string) GetHelper::var('joomla_component', $data['id'], 'id', 'guid');
 		}
+
 		// Set the GUID if empty or not valid
-		while (!ComponentbuilderHelper::validGUID($data['guid'], "joomla_component", $data['id']))
+		while (!GuidHelper::valid($data['guid'], "joomla_component", $data['id']))
 		{
 			// must always be set
-			$data['guid'] = (string) ComponentbuilderHelper::GUID();
-		}
-
+			$data['guid'] = (string) GuidHelper::get();
+		}
 
 		// Set the addcontributors items to data.
 		if (isset($data['addcontributors']) && is_array($data['addcontributors']))
@@ -1514,7 +1520,7 @@ class ComponentbuilderModelJoomla_component extends AdminModel
 		// Get the basic encryption key.
 		$basickey = ComponentbuilderHelper::getCryptKey('basic');
 		// Get the encryption object
-		$basic = new FOFEncryptAes($basickey);
+		$basic = new AES($basickey);
 
 		// Encrypt data whmcs_key.
 		if (isset($data['whmcs_key']) && $basickey)

admin/models/joomla_components.php

@@ -21,6 +21,8 @@ use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GetHelper;
 use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\Base64Helper;
+use VDM\Joomla\FOF\Encrypt\AES;
 
 /**
  * Joomla_components List Model
@@ -998,7 +1000,7 @@ class ComponentbuilderModelJoomla_components extends ListModel
 						// check if this field has multiple fields
 						if ($this->checkMultiFields($item->fieldtype))
 						{
-							$fields = ComponentbuilderHelper::getBetween(json_decode($item->xml), 'fields="', '"');
+							$fields = GetHelper::between(json_decode($item->xml), 'fields="', '"');
 							$fieldsSets = array();
 							if (strpos($fields, ',') !== false)
 							{
@@ -1017,7 +1019,7 @@ class ComponentbuilderModelJoomla_components extends ListModel
 							}
 						}
 						// check if validation rule is found
-						$validationRule = ComponentbuilderHelper::getBetween(json_decode($item->xml), 'validate="', '"');
+						$validationRule = GetHelper::between(json_decode($item->xml), 'validate="', '"');
 						if (StringHelper::check($validationRule))
 						{
 							// make sure it is lowercase
@@ -1799,7 +1801,7 @@ class ComponentbuilderModelJoomla_components extends ListModel
 				}
 				elseif (!isset($keys['not_base64'][$key]))
 				{
-					$value = ComponentbuilderHelper::openValidBase64($item->{$key}, null);
+					$value = Base64Helper::open($item->{$key}, null);
 				}
 				elseif (isset($keys['not_base64'][$key]) && 'json' === $keys['not_base64'][$key] && 'xml' === $key) // just for field search
 				{
@@ -2033,9 +2035,9 @@ class ComponentbuilderModelJoomla_components extends ListModel
 		if (isset($target['_start']))
 		{
 			// get all values
-			$allBetween = ComponentbuilderHelper::getAllBetween($value, $target['start'], $target['_start']);
+			$allBetween = GetHelper::allBetween($value, $target['start'], $target['_start']);
 			// just again make sure we found some
-			if (ComponentbuilderHelper::checkArray($allBetween))
+			if (JCBArrayHelper::check($allBetween))
 			{
 				if (count((array) $allBetween) > 1)
 				{
@@ -2066,14 +2068,14 @@ class ComponentbuilderModelJoomla_components extends ListModel
 			$starts[] = $target['start'];
 		}
 		// has any been found
-		if (ComponentbuilderHelper::checkArray($starts))
+		if (JCBArrayHelper::check($starts))
 		{
 			foreach ($starts as $_start)
 			{
 				// get the base64 string
-				$base64 = ComponentbuilderHelper::getBetween($value, $_start, $target['end']);
+				$base64 = GetHelper::between($value, $_start, $target['end']);
 				// now open the base64 text
-				$tmp = ComponentbuilderHelper::openValidBase64($base64);
+				$tmp = Base64Helper::open($base64);
 				// insert it back into the value (so we still search the whole string)
 				$value = str_replace($base64, $tmp, $value);
 			}
@@ -2670,7 +2672,7 @@ class ComponentbuilderModelJoomla_components extends ListModel
 				// Get the basic encryption key.
 				$basickey = ComponentbuilderHelper::getCryptKey('basic');
 				// Get the encryption object.
-				$basic = new FOFEncryptAes($basickey);
+				$basic = new AES($basickey);
 
 				// Set values to display correctly.
 				if (ComponentbuilderHelper::checkArray($items))

admin/models/joomla_module.php

@@ -16,6 +16,12 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\String\ClassfunctionHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 /**
  * Componentbuilder Joomla_module Admin Model
@@ -189,7 +195,7 @@ class ComponentbuilderModelJoomla_module extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'joomla_module__'.$id);
 				ComponentbuilderHelper::set('joomla_module__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -197,7 +203,7 @@ class ComponentbuilderModelJoomla_module extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -363,7 +369,7 @@ class ComponentbuilderModelJoomla_module extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'joomla_module__'.$id);
 				ComponentbuilderHelper::set('joomla_module__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -371,7 +377,7 @@ class ComponentbuilderModelJoomla_module extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -497,7 +503,7 @@ class ComponentbuilderModelJoomla_module extends AdminModel
 		// now get all the editor fields
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
 		// check if we found any
-		if (ComponentbuilderHelper::checkArray($editors))
+		if (UtilitiesArrayHelper::check($editors))
 		{
 			foreach ($editors as $editor)
 			{
@@ -512,9 +518,9 @@ class ComponentbuilderModelJoomla_module extends AdminModel
 		// Only load the GUID if new item (or empty)
 		if (0 == $id || !($val = $form->getValue('guid')))
 		{
-			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+			$form->setValue('guid', null, GuidHelper::get());
 		}
-
+ 
 		return $form;
 	}
 
@@ -576,7 +582,7 @@ class ComponentbuilderModelJoomla_module extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('joomla_module.edit.state', 'com_componentbuilder');
 	}
     
@@ -742,7 +748,7 @@ class ComponentbuilderModelJoomla_module extends AdminModel
 		}
 
 		// we must also delete the linked tables found
-		if (ComponentbuilderHelper::checkArray($pks))
+		if (UtilitiesArrayHelper::check($pks))
 		{
 			// linked tables to update
 			$_tablesArray = array(
@@ -784,7 +790,7 @@ class ComponentbuilderModelJoomla_module extends AdminModel
 		}
 
 		// we must also update all linked tables
-		if (ComponentbuilderHelper::checkArray($pks))
+		if (UtilitiesArrayHelper::check($pks))
 		{
 			// linked tables to update
 			$_tablesArray = array(
@@ -1183,12 +1189,12 @@ class ComponentbuilderModelJoomla_module extends AdminModel
 		if (strpos($data['name'], '[[[') === false && strpos($data['name'], '###') === false)
 		{
 			// make sure the name is safe to be used as a function name
-			$data['name'] = ComponentbuilderHelper::safeClassFunctionName($data['name']);
+			$data['name'] = ClassfunctionHelper::safe($data['name']);
 		}
 		// always reset the snippets
 		$data['snippet'] = 0;
 		// if system name is empty create from name
-		if (empty($data['system_name']) || !ComponentbuilderHelper::checkString($data['system_name']))
+		if (empty($data['system_name']) || !UtilitiesStringHelper::check($data['system_name']))
 		{
 			$data['system_name'] = $data['name'];
 		}
@@ -1197,15 +1203,15 @@ class ComponentbuilderModelJoomla_module extends AdminModel
 		if (empty($data['guid']) && $data['id'] > 0)
 		{
 			// get the existing one
-			$data['guid'] = (string) ComponentbuilderHelper::getVar('joomla_module', $data['id'], 'id', 'guid');
+			$data['guid'] = (string) GetHelper::var('joomla_module', $data['id'], 'id', 'guid');
 		}
+
 		// Set the GUID if empty or not valid
-		while (!ComponentbuilderHelper::validGUID($data['guid'], "joomla_module", $data['id']))
+		while (!GuidHelper::valid($data['guid'], "joomla_module", $data['id']))
 		{
 			// must always be set
-			$data['guid'] = (string) ComponentbuilderHelper::GUID();
-		}
-
+			$data['guid'] = (string) GuidHelper::get();
+		}
 
 		// Set the libraries items to data.
 		if (isset($data['libraries']) && is_array($data['libraries']))

admin/models/joomla_module_files_folders_urls.php

@@ -327,7 +327,7 @@ class ComponentbuilderModelJoomla_module_files_folders_urls extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('joomla_module_files_folders_urls.edit.state', 'com_componentbuilder');
 	}
     

admin/models/joomla_module_updates.php

@@ -284,7 +284,7 @@ class ComponentbuilderModelJoomla_module_updates extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('joomla_module_updates.edit.state', 'com_componentbuilder');
 	}
     

admin/models/joomla_plugin.php

@@ -16,6 +16,12 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\String\ClassfunctionHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 /**
  * Componentbuilder Joomla_plugin Admin Model
@@ -166,7 +172,7 @@ class ComponentbuilderModelJoomla_plugin extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'joomla_plugin__'.$id);
 				ComponentbuilderHelper::set('joomla_plugin__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -174,7 +180,7 @@ class ComponentbuilderModelJoomla_plugin extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -328,7 +334,7 @@ class ComponentbuilderModelJoomla_plugin extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'joomla_plugin__'.$id);
 				ComponentbuilderHelper::set('joomla_plugin__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -336,7 +342,7 @@ class ComponentbuilderModelJoomla_plugin extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -462,7 +468,7 @@ class ComponentbuilderModelJoomla_plugin extends AdminModel
 		// now get all the editor fields
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
 		// check if we found any
-		if (ComponentbuilderHelper::checkArray($editors))
+		if (UtilitiesArrayHelper::check($editors))
 		{
 			foreach ($editors as $editor)
 			{
@@ -477,9 +483,9 @@ class ComponentbuilderModelJoomla_plugin extends AdminModel
 		// Only load the GUID if new item (or empty)
 		if (0 == $id || !($val = $form->getValue('guid')))
 		{
-			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+			$form->setValue('guid', null, GuidHelper::get());
 		}
-
+ 
 		return $form;
 	}
 
@@ -541,7 +547,7 @@ class ComponentbuilderModelJoomla_plugin extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('joomla_plugin.edit.state', 'com_componentbuilder');
 	}
     
@@ -707,7 +713,7 @@ class ComponentbuilderModelJoomla_plugin extends AdminModel
 		}
 
 		// we must also delete the linked tables found
-		if (ComponentbuilderHelper::checkArray($pks))
+		if (UtilitiesArrayHelper::check($pks))
 		{
 			// linked tables to update
 			$_tablesArray = array(
@@ -749,7 +755,7 @@ class ComponentbuilderModelJoomla_plugin extends AdminModel
 		}
 
 		// we must also update all linked tables
-		if (ComponentbuilderHelper::checkArray($pks))
+		if (UtilitiesArrayHelper::check($pks))
 		{
 			// linked tables to update
 			$_tablesArray = array(
@@ -1148,10 +1154,10 @@ class ComponentbuilderModelJoomla_plugin extends AdminModel
 		if (strpos($data['name'], '[[[') === false && strpos($data['name'], '###') === false)
 		{
 			// make sure the name is safe to be used as a function name
-			$data['name'] = ComponentbuilderHelper::safeClassFunctionName($data['name']);
+			$data['name'] = ClassfunctionHelper::safe($data['name']);
 		}
 		// if system name is empty create from name
-		if (empty($data['system_name']) || !ComponentbuilderHelper::checkString($data['system_name']))
+		if (empty($data['system_name']) || !UtilitiesStringHelper::check($data['system_name']))
 		{
 			$data['system_name'] = $data['name'];
 		}
@@ -1160,15 +1166,15 @@ class ComponentbuilderModelJoomla_plugin extends AdminModel
 		if (empty($data['guid']) && $data['id'] > 0)
 		{
 			// get the existing one
-			$data['guid'] = (string) ComponentbuilderHelper::getVar('joomla_plugin', $data['id'], 'id', 'guid');
+			$data['guid'] = (string) GetHelper::var('joomla_plugin', $data['id'], 'id', 'guid');
 		}
+
 		// Set the GUID if empty or not valid
-		while (!ComponentbuilderHelper::validGUID($data['guid'], "joomla_plugin", $data['id']))
+		while (!GuidHelper::valid($data['guid'], "joomla_plugin", $data['id']))
 		{
 			// must always be set
-			$data['guid'] = (string) ComponentbuilderHelper::GUID();
-		}
-
+			$data['guid'] = (string) GuidHelper::get();
+		}
 
 		// Set the method_selection items to data.
 		if (isset($data['method_selection']) && is_array($data['method_selection']))

admin/models/joomla_plugin_files_folders_urls.php

@@ -327,7 +327,7 @@ class ComponentbuilderModelJoomla_plugin_files_folders_urls extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('joomla_plugin_files_folders_urls.edit.state', 'com_componentbuilder');
 	}
     

admin/models/joomla_plugin_group.php

@@ -16,6 +16,7 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\String\ClassfunctionHelper;
 
 /**
  * Componentbuilder Joomla_plugin_group Admin Model
@@ -271,7 +272,7 @@ class ComponentbuilderModelJoomla_plugin_group extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return parent::canEditState($record);
 	}
     
@@ -540,7 +541,7 @@ class ComponentbuilderModelJoomla_plugin_group extends AdminModel
 			$this->canDo		= ComponentbuilderHelper::getActions('joomla_plugin_group');
 		}
 
-		if (!$this->canDo->get('core.create') || !$this->canDo->get('core.batch'))
+		if (!$this->canDo->get('core.create') && !$this->canDo->get('joomla_plugin_group.batch'))
 		{
 			return false;
 		}
@@ -683,7 +684,7 @@ class ComponentbuilderModelJoomla_plugin_group extends AdminModel
 			$this->canDo		= ComponentbuilderHelper::getActions('joomla_plugin_group');
 		}
 
-		if (!$this->canDo->get('core.edit') && !$this->canDo->get('core.batch'))
+		if (!$this->canDo->get('core.edit') && !$this->canDo->get('joomla_plugin_group.batch'))
 		{
 			$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
 			return false;
@@ -794,7 +795,7 @@ class ComponentbuilderModelJoomla_plugin_group extends AdminModel
 		}
 
 		// make sure the name is safe to be used as a function name
-		$data['name'] = ComponentbuilderHelper::safeClassFunctionName($data['name']);
+		$data['name'] = ClassfunctionHelper::safe($data['name']);
         
 		// Set the Params Items to data
 		if (isset($data['params']) && is_array($data['params']))

admin/models/joomla_plugin_updates.php

@@ -284,7 +284,7 @@ class ComponentbuilderModelJoomla_plugin_updates extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('joomla_plugin_updates.edit.state', 'com_componentbuilder');
 	}
     

admin/models/joomla_plugins.php

@@ -14,6 +14,8 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 /**
  * Joomla_plugins List Model
@@ -62,7 +64,7 @@ class ComponentbuilderModelJoomla_plugins extends ListModel
 				}
 			));
 			// make sure we have the correct boilerplate
-			if (ComponentbuilderHelper::checkArray($found) && count($found) == 1 && method_exists(__CLASS__, 'getPluginsBoilerplate'))
+			if (UtilitiesArrayHelper::check($found) && count($found) == 1 && method_exists(__CLASS__, 'getPluginsBoilerplate'))
 			{
 				// get the plugins boilerplate
 				return $this->getPluginsBoilerplate($found[0]->url);
@@ -99,7 +101,7 @@ class ComponentbuilderModelJoomla_plugins extends ListModel
 			// get the needed data of each plugin group
 			$groups = array_map(
 				function($tree) use(&$app, &$models, &$tables){
-					if (($fooClass = ComponentbuilderHelper::getFileContents(ComponentbuilderHelper::$bolerplatePath . '/plugins/' . $tree->path . '/foo.php')) !== false && ComponentbuilderHelper::checkString($fooClass))
+					if (($fooClass = ComponentbuilderHelper::getFileContents(ComponentbuilderHelper::$bolerplatePath . '/plugins/' . $tree->path . '/foo.php')) !== false && StringHelper::check($fooClass))
 					{
 						// extract the boilerplate class extends and check if already set
 						if (($classExtends = ComponentbuilderHelper::extractBoilerplateClassExtends($fooClass, 'plugins')) !== false &&
@@ -132,7 +134,7 @@ class ComponentbuilderModelJoomla_plugins extends ListModel
 						if (($classProperiesMethods = ComponentbuilderHelper::extractBoilerplateClassPropertiesMethods($fooClass, $classExtends, 'plugins', $pluginGroupID)) !== false)
 						{
 							// create the properties found
-							if (isset($classProperiesMethods['property']) && ComponentbuilderHelper::checkArray($classProperiesMethods['property']))
+							if (isset($classProperiesMethods['property']) && UtilitiesArrayHelper::check($classProperiesMethods['property']))
 							{
 								foreach ($classProperiesMethods['property'] as $_property)
 								{
@@ -141,7 +143,7 @@ class ComponentbuilderModelJoomla_plugins extends ListModel
 								}
 							}
 							// create the method found (TODO just create for now but we could later add a force update)
-							if (isset($classProperiesMethods['method']) && ComponentbuilderHelper::checkArray($classProperiesMethods['method']))
+							if (isset($classProperiesMethods['method']) && UtilitiesArrayHelper::check($classProperiesMethods['method']))
 							{
 								foreach ($classProperiesMethods['method'] as $_method)
 								{

admin/models/language.php

@@ -271,7 +271,7 @@ class ComponentbuilderModelLanguage extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('language.edit.state', 'com_componentbuilder');
 	}
     

admin/models/language_translation.php

@@ -16,6 +16,8 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 /**
  * Componentbuilder Language_translation Admin Model
@@ -101,7 +103,7 @@ class ComponentbuilderModelLanguage_translation extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'language_translation__'.$id);
 				ComponentbuilderHelper::set('language_translation__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -109,7 +111,7 @@ class ComponentbuilderModelLanguage_translation extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -181,7 +183,7 @@ class ComponentbuilderModelLanguage_translation extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'language_translation__'.$id);
 				ComponentbuilderHelper::set('language_translation__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -189,7 +191,7 @@ class ComponentbuilderModelLanguage_translation extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -368,7 +370,7 @@ class ComponentbuilderModelLanguage_translation extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('language_translation.edit.state', 'com_componentbuilder');
 	}
     

admin/models/language_translations.php

@@ -14,8 +14,11 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Utilities\ArrayHelper;
-use VDM\Joomla\Componentbuilder\Utilities\FormHelper as JCBFormHelper;
+use VDM\Joomla\Utilities\FormHelper as JCBFormHelper;
 use VDM\Joomla\Componentbuilder\Utilities\FilterHelper as JCBFilterHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
 
 /**
  * Language_translations List Model
@@ -218,12 +221,12 @@ class ComponentbuilderModelLanguage_translations extends ListModel
 				// escape all strings if not being exported
 				if (!isset($_export))
 				{
-					$item->source = ComponentbuilderHelper::htmlEscape($item->source, 'UTF-8', true, 150);
+					$item->source = StringHelper::html($item->source, 'UTF-8', true, 150);
 				}
 			}
 		}
 			// prep the lang strings for export
-			if (isset($_export) && $_export && ComponentbuilderHelper::checkArray($items))
+			if (isset($_export) && $_export && UtilitiesArrayHelper::check($items))
 			{
 				// insure we have the same order in the languages
 				$languages = ComponentbuilderHelper::getVars('language', 1, 'published', 'langtag');
@@ -251,15 +254,15 @@ class ComponentbuilderModelLanguage_translations extends ListModel
 							$item->{$lanTag} = '';
 						}
 						// now adapt the source
-						if (isset($item->translation) && ComponentbuilderHelper::checkJson($item->translation))
+						if (isset($item->translation) && JsonHelper::check($item->translation))
 						{
 							$translations = json_decode($item->translation, true);
-							if (ComponentbuilderHelper::checkArray($translations))
+							if (UtilitiesArrayHelper::check($translations))
 							{
 								foreach ($translations as $language)
 								{
-									if (isset($language['translation']) && ComponentbuilderHelper::checkString($language['translation'])
-									&& isset($language['language']) && ComponentbuilderHelper::checkString($language['language']))
+									if (isset($language['translation']) && StringHelper::check($language['translation'])
+									&& isset($language['language']) && StringHelper::check($language['language']))
 									{
 										$item->{$language['language']} = $language['translation'];
 									}
@@ -537,7 +540,7 @@ class ComponentbuilderModelLanguage_translations extends ListModel
 						// escape all strings if not being exported
 						if (!isset($_export))
 						{
-							$item->source = ComponentbuilderHelper::htmlEscape($item->source, 'UTF-8', true, 150);
+							$item->source = StringHelper::html($item->source, 'UTF-8', true, 150);
 						}
 						// unset the values we don't want exported.
 						unset($item->asset_id);
@@ -553,7 +556,7 @@ class ComponentbuilderModelLanguage_translations extends ListModel
 				}
 
 					// prep the lang strings for export
-			if (isset($_export) && $_export && ComponentbuilderHelper::checkArray($items))
+			if (isset($_export) && $_export && UtilitiesArrayHelper::check($items))
 			{
 				// insure we have the same order in the languages
 				$languages = ComponentbuilderHelper::getVars('language', 1, 'published', 'langtag');
@@ -581,15 +584,15 @@ class ComponentbuilderModelLanguage_translations extends ListModel
 							$item->{$lanTag} = '';
 						}
 						// now adapt the source
-						if (isset($item->translation) && ComponentbuilderHelper::checkJson($item->translation))
+						if (isset($item->translation) && JsonHelper::check($item->translation))
 						{
 							$translations = json_decode($item->translation, true);
-							if (ComponentbuilderHelper::checkArray($translations))
+							if (UtilitiesArrayHelper::check($translations))
 							{
 								foreach ($translations as $language)
 								{
-									if (isset($language['translation']) && ComponentbuilderHelper::checkString($language['translation'])
-									&& isset($language['language']) && ComponentbuilderHelper::checkString($language['language']))
+									if (isset($language['translation']) && StringHelper::check($language['translation'])
+									&& isset($language['language']) && StringHelper::check($language['language']))
 									{
 										$item->{$language['language']} = $language['translation'];
 									}
@@ -620,7 +623,7 @@ class ComponentbuilderModelLanguage_translations extends ListModel
 		$headers->id = 'id';
 		$headers->Source = 'Source';
 		// add the languages
-		if (ComponentbuilderHelper::checkArray($languages))
+		if (UtilitiesArrayHelper::check($languages))
 		{
 			foreach ($languages as $language)
 			{

admin/models/languages.php

@@ -14,6 +14,7 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 
 /**
  * Languages List Model
@@ -51,7 +52,7 @@ class ComponentbuilderModelLanguages extends ListModel
 		if ($languages = $this->getLanguages())
 		{
 			// make sure we have an array
-			if (ComponentbuilderHelper::checkArray($languages))
+			if (UtilitiesArrayHelper::check($languages))
 			{
 				// get the model
 				$model = ComponentbuilderHelper::getModel('language');

admin/models/layout.php

@@ -16,6 +16,9 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 
 /**
  * Componentbuilder Layout Admin Model
@@ -123,7 +126,7 @@ class ComponentbuilderModelLayout extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'layout__'.$id);
 				ComponentbuilderHelper::set('layout__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -131,7 +134,7 @@ class ComponentbuilderModelLayout extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -209,7 +212,7 @@ class ComponentbuilderModelLayout extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'layout__'.$id);
 				ComponentbuilderHelper::set('layout__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -217,7 +220,7 @@ class ComponentbuilderModelLayout extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -341,7 +344,7 @@ class ComponentbuilderModelLayout extends AdminModel
 		// now get all the editor fields
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
 		// check if we found any
-		if (ComponentbuilderHelper::checkArray($editors))
+		if (UtilitiesArrayHelper::check($editors))
 		{
 			foreach ($editors as $editor)
 			{
@@ -413,7 +416,7 @@ class ComponentbuilderModelLayout extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return parent::canEditState($record);
 	}
     
@@ -683,7 +686,7 @@ class ComponentbuilderModelLayout extends AdminModel
 			$this->canDo		= ComponentbuilderHelper::getActions('layout');
 		}
 
-		if (!$this->canDo->get('core.create') || !$this->canDo->get('core.batch'))
+		if (!$this->canDo->get('core.create') && !$this->canDo->get('layout.batch'))
 		{
 			return false;
 		}
@@ -821,7 +824,7 @@ class ComponentbuilderModelLayout extends AdminModel
 			$this->canDo		= ComponentbuilderHelper::getActions('layout');
 		}
 
-		if (!$this->canDo->get('core.edit') && !$this->canDo->get('core.batch'))
+		if (!$this->canDo->get('core.edit') && !$this->canDo->get('layout.batch'))
 		{
 			$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
 			return false;

admin/models/library.php

@@ -16,6 +16,11 @@ use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 /**
  * Componentbuilder Library Admin Model
@@ -138,7 +143,7 @@ class ComponentbuilderModelLibrary extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'library__'.$id);
 				ComponentbuilderHelper::set('library__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -146,7 +151,7 @@ class ComponentbuilderModelLibrary extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -226,7 +231,7 @@ class ComponentbuilderModelLibrary extends AdminModel
 			else
 			{
 				// set the vast development method key
-				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				$this->vastDevMod = UtilitiesStringHelper::random(50);
 				ComponentbuilderHelper::set($this->vastDevMod, 'library__'.$id);
 				ComponentbuilderHelper::set('library__'.$id, $this->vastDevMod);
 				// set a return value if found
@@ -234,7 +239,7 @@ class ComponentbuilderModelLibrary extends AdminModel
 				$return = $jinput->get('return', null, 'base64');
 				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
-				if (isset($item) && ComponentbuilderHelper::checkObject($item) && isset($item->guid)
+				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& method_exists('ComponentbuilderHelper', 'validGUID')
 					&& ComponentbuilderHelper::validGUID($item->guid))
 				{
@@ -356,9 +361,9 @@ class ComponentbuilderModelLibrary extends AdminModel
 		// Only load the GUID if new item (or empty)
 		if (0 == $id || !($val = $form->getValue('guid')))
 		{
-			$form->setValue('guid', null, ComponentbuilderHelper::GUID());
+			$form->setValue('guid', null, GuidHelper::get());
 		}
-
+ 
 		return $form;
 	}
 
@@ -420,7 +425,7 @@ class ComponentbuilderModelLibrary extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('library.edit.state', 'com_componentbuilder');
 	}
     
@@ -596,7 +601,7 @@ class ComponentbuilderModelLibrary extends AdminModel
 			}
 		}
 		// check if we can still continue
-		if (!ComponentbuilderHelper::checkArray($pks))
+		if (!UtilitiesArrayHelper::check($pks))
 		{
 			return false;
 		}
@@ -606,7 +611,7 @@ class ComponentbuilderModelLibrary extends AdminModel
 		}
 
 		// we must also delete the linked tables found
-		if (ComponentbuilderHelper::checkArray($pks))
+		if (UtilitiesArrayHelper::check($pks))
 		{
 			$_tablesArray = array(
 				'snippet',
@@ -647,7 +652,7 @@ class ComponentbuilderModelLibrary extends AdminModel
 		}
 
 		// we must also update all linked tables
-		if (ComponentbuilderHelper::checkArray($pks))
+		if (UtilitiesArrayHelper::check($pks))
 		{
 			$_tablesArray = array(
 				'snippet',
@@ -1046,15 +1051,15 @@ class ComponentbuilderModelLibrary extends AdminModel
 		if (empty($data['guid']) && $data['id'] > 0)
 		{
 			// get the existing one
-			$data['guid'] = (string) ComponentbuilderHelper::getVar('library', $data['id'], 'id', 'guid');
+			$data['guid'] = (string) GetHelper::var('library', $data['id'], 'id', 'guid');
 		}
+
 		// Set the GUID if empty or not valid
-		while (!ComponentbuilderHelper::validGUID($data['guid'], "library", $data['id']))
+		while (!GuidHelper::valid($data['guid'], "library", $data['id']))
 		{
 			// must always be set
-			$data['guid'] = (string) ComponentbuilderHelper::GUID();
-		}
-
+			$data['guid'] = (string) GuidHelper::get();
+		}
 
 		// Set the libraries items to data.
 		if (isset($data['libraries']) && is_array($data['libraries']))

admin/models/library_config.php

@@ -281,7 +281,7 @@ class ComponentbuilderModelLibrary_config extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('library_config.edit.state', 'com_componentbuilder');
 	}
     

admin/models/library_files_folders_urls.php

@@ -327,7 +327,7 @@ class ComponentbuilderModelLibrary_files_folders_urls extends AdminModel
 				return false;
 			}
 		}
-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('library_files_folders_urls.edit.state', 'com_componentbuilder');
 	}