Further improved #37 to ensure language strings are set and reversed, also add extra buttons to the compiler page. Major restructure of custom code implementation to make it more stable. Resolved #40 by updating the default field sql values.

README.md

@@ -1,4 +1,4 @@
-# Component Builder (2.3.1)
+# Component Builder (2.3.4)
 
 This is a [Joomla 3.x](http://www.joomla.org/) component.
 
@@ -8,7 +8,7 @@ The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanc
 
 Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.3.1) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.3.4) with **ALL** its features and **ALL** concepts totally open-source and free!
 
 Once installed upgrades are quick and easy via the default Joomla upgrade area.
 
@@ -104,12 +104,12 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 9th February, 2017
++ *Last Build*: 13th February, 2017
-+ *Version*: 2.3.1
++ *Version*: 2.3.4
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **91404**
++ *Line count*: **91942**
-+ *File count*: **591**
++ *File count*: **594**
 + *Folder count*: **105**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/README.txt

@@ -1,4 +1,4 @@
-# Component Builder (2.3.1)
+# Component Builder (2.3.4)
 
 This is a [Joomla 3.x](http://www.joomla.org/) component.
 
@@ -8,7 +8,7 @@ The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanc
 
 Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.3.1) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.3.4) with **ALL** its features and **ALL** concepts totally open-source and free!
 
 Once installed upgrades are quick and easy via the default Joomla upgrade area.
 
@@ -104,12 +104,12 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 9th February, 2017
++ *Last Build*: 13th February, 2017
-+ *Version*: 2.3.1
++ *Version*: 2.3.4
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **91404**
++ *Line count*: **91942**
-+ *File count*: **591**
++ *File count*: **594**
 + *Folder count*: **105**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/assets/css/admin.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css

admin/assets/css/compiler.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 11 of this MVC
+	@version		@update number 17 of this MVC
-	@build			2nd February, 2017
+	@build			13th February, 2017
 	@created		1st February, 2017
 	@package		Component Builder
 	@subpackage		compiler.css

admin/assets/css/component.css

@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 81 of this MVC
-	@build			3rd February, 2017
+	@build			13th February, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		component.css

admin/assets/css/components.css

@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 81 of this MVC
-	@build			3rd February, 2017
+	@build			13th February, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		components.css

admin/assets/css/custom_code.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 28 of this MVC
+	@version		@update number 55 of this MVC
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.css

admin/assets/css/custom_codes.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 28 of this MVC
+	@version		@update number 55 of this MVC
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_codes.css

admin/assets/css/dashboard.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css

admin/assets/css/layout.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 66 of this MVC
+	@version		@update number 67 of this MVC
-	@build			3rd February, 2017
+	@build			11th February, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layout.css

admin/assets/css/layouts.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 66 of this MVC
+	@version		@update number 67 of this MVC
-	@build			3rd February, 2017
+	@build			11th February, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layouts.css

admin/compiler/joomla_3/Helper.php

@@ -683,9 +683,9 @@ abstract class ###Component###Helper
 
 	public static function safeString($string, $type = 'L', $spacer = '_')
 	{
-		// remove all numbers and replace with english text version (works well only up to a thousand)
+		// remove all numbers and replace with english text version (works well only up to millions)
                 $string = self::replaceNumbers($string);
-
+		// 0nly continue if we have a string
                 if (self::checkString($string))
                 {
 			// remove all other characters
@@ -693,45 +693,57 @@ abstract class ###Component###Helper
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
 			$string = preg_replace('/\s+/', ' ', $string);
 			$string = preg_replace("/[^A-Za-z ]/", '', $string);
-                        // return a string with all first letter of each word uppercase(no undersocre)
+			// select final adaptations
-                        if ($type == 'W')
+			if ($type === 'L' || $type === 'strtolower')
-                                    {
-                            return ucwords(strtolower($string));
-                        }
-                        elseif ($type == 'w')
-                        {
-                            return strtolower($string);
-                        }
-                        elseif ($type == 'Ww')
-                        {
-                            return ucfirst(strtolower($string));
-                        }
-                        elseif ($type == 'WW')
-                        {
-                            return strtoupper($string);
-                        }
-                        elseif ($type == 'U')
-                        {
-                                // replace white space with underscore
-                                $string = preg_replace('/\s+/', $spacer, $string);
-                                // return all upper
-                                return strtoupper($string);
-                        }
-                        elseif ($type == 'F')
-                        {
-                                // replace white space with underscore
-                                $string = preg_replace('/\s+/', $spacer, $string);
-                                // return with first caracter to upper
-                                return ucfirst(strtolower($string));
-                        }
-                        elseif ($type == 'L')
                         {
                                 // replace white space with underscore
                                 $string = preg_replace('/\s+/', $spacer, $string);
                                 // default is to return lower
                                 return strtolower($string);
                         }
-
+			elseif ($type === 'W')
+			{
+				// return a string with all first letter of each word uppercase(no undersocre)
+				return ucwords(strtolower($string));
+			}
+			elseif ($type === 'w' || $type === 'word')
+			{
+				// return a string with all lowercase(no undersocre)
+				return strtolower($string);
+			}
+			elseif ($type === 'Ww' || $type === 'Word')
+			{
+				// return a string with first letter of the first word uppercase and all the rest lowercase(no undersocre)
+				return ucfirst(strtolower($string));
+			}
+			elseif ($type === 'WW' || $type === 'WORD')
+			{
+				// return a string with all the uppercase(no undersocre)
+				return strtoupper($string);
+			}
+                        elseif ($type === 'U' || $type === 'strtoupper')
+                        {
+                                // replace white space with underscore
+                                $string = preg_replace('/\s+/', $spacer, $string);
+                                // return all upper
+                                return strtoupper($string);
+                        }
+                        elseif ($type === 'F' || $type === 'ucfirst')
+                        {
+                                // replace white space with underscore
+                                $string = preg_replace('/\s+/', $spacer, $string);
+                                // return with first caracter to upper
+                                return ucfirst(strtolower($string));
+                        }
+                        elseif ($type === 'cA' || $type === 'cAmel' || $type === 'camelcase')
+			{
+				// convert all words to first letter uppercase
+				$string = ucwords(strtolower($string));
+				// remove white space
+				$string = preg_replace('/\s+/', '', $string);
+				// now return first letter lowercase
+				return lcfirst($string);
+			}
                         // return string
                         return $string;
                 }

admin/compiler/joomla_3/Helper_site.php

@@ -675,9 +675,9 @@ abstract class ###Component###Helper
 
 	public static function safeString($string, $type = 'L', $spacer = '_')
 	{
-		// remove all numbers and replace with english text version (works well only up to a thousand)
+		// remove all numbers and replace with english text version (works well only up to millions)
                 $string = self::replaceNumbers($string);
-
+		// 0nly continue if we have a string
                 if (self::checkString($string))
                 {
 			// remove all other characters
@@ -685,45 +685,57 @@ abstract class ###Component###Helper
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
 			$string = preg_replace('/\s+/', ' ', $string);
 			$string = preg_replace("/[^A-Za-z ]/", '', $string);
-			// return a string with all first letter of each word uppercase(no undersocre)
+			// select final adaptations
-			if ($type == 'W')
+			if ($type === 'L' || $type === 'strtolower')
-				    {
-			    return ucwords(strtolower($string));
-			}
-				    elseif ($type == 'w')
-				    {
-			    return strtolower($string);
-			}
-				    elseif ($type == 'Ww')
-				    {
-			    return ucfirst(strtolower($string));
-			}
-				    elseif ($type == 'WW')
-				    {
-			    return strtoupper($string);
-			}
-			elseif ($type == 'U')
-			{
-				// replace white space with underscore
-				$string = preg_replace('/\s+/', $spacer, $string);
-				// return all upper
-				return strtoupper($string);
-			}
-			elseif ($type == 'F')
-			{
-				// replace white space with underscore
-				$string = preg_replace('/\s+/', $spacer, $string);
-				// return with first caracter to upper
-				return ucfirst(strtolower($string));
-			}
-			elseif ($type == 'L')
                         {
                                 // replace white space with underscore
                                 $string = preg_replace('/\s+/', $spacer, $string);
                                 // default is to return lower
                                 return strtolower($string);
                         }
-
+			elseif ($type === 'W')
+			{
+				// return a string with all first letter of each word uppercase(no undersocre)
+				return ucwords(strtolower($string));
+			}
+			elseif ($type === 'w' || $type === 'word')
+			{
+				// return a string with all lowercase(no undersocre)
+				return strtolower($string);
+			}
+			elseif ($type === 'Ww' || $type === 'Word')
+			{
+				// return a string with first letter of the first word uppercase and all the rest lowercase(no undersocre)
+				return ucfirst(strtolower($string));
+			}
+			elseif ($type === 'WW' || $type === 'WORD')
+			{
+				// return a string with all the uppercase(no undersocre)
+				return strtoupper($string);
+			}
+                        elseif ($type === 'U' || $type === 'strtoupper')
+                        {
+                                // replace white space with underscore
+                                $string = preg_replace('/\s+/', $spacer, $string);
+                                // return all upper
+                                return strtoupper($string);
+                        }
+                        elseif ($type === 'F' || $type === 'ucfirst')
+                        {
+                                // replace white space with underscore
+                                $string = preg_replace('/\s+/', $spacer, $string);
+                                // return with first caracter to upper
+                                return ucfirst(strtolower($string));
+                        }
+                        elseif ($type === 'cA' || $type === 'cAmel' || $type === 'camelcase')
+			{
+				// convert all words to first letter uppercase
+				$string = ucwords(strtolower($string));
+				// remove white space
+				$string = preg_replace('/\s+/', '', $string);
+				// now return first letter lowercase
+				return lcfirst($string);
+			}
                         // return string
                         return $string;
                 }

admin/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controller.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php

admin/controllers/ajax.json.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php
@@ -54,6 +54,8 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 		$this->registerTask('dynamicFormDetails', 'ajax');
 		$this->registerTask('dbTableColumns', 'ajax');
 		$this->registerTask('viewTableColumns', 'ajax');
+		$this->registerTask('checkFunctionName', 'ajax');
+		$this->registerTask('usedin', 'ajax');
 		$this->registerTask('fieldOptions', 'ajax');
 	}
 
@@ -530,6 +532,84 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						}
 					}
 				break;
+				case 'checkFunctionName':
+					try
+					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
+						$functioNameValue = $jinput->get('functioName', NULL, 'STRING');
+						$idValue = $jinput->get('id', NULL, 'INT');
+						if($functioNameValue && $idValue && $user->id != 0)
+						{
+							$result = $this->getModel('ajax')->checkFunctionName($functioNameValue, $idValue);
+						}
+						else
+						{
+							$result = false;
+						}
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback . "(".json_encode($result).");";
+						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
+						else
+						{
+							echo "(".json_encode($result).");";
+						}
+					}
+					catch(Exception $e)
+					{
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback."(".json_encode($e).");";
+						}
+						else
+						{
+							echo "(".json_encode($e).");";
+						}
+					}
+				break;
+				case 'usedin':
+					try
+					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
+						$functioNameValue = $jinput->get('functioName', NULL, 'WORD');
+						$idValue = $jinput->get('id', NULL, 'INT');
+						if($functioNameValue && $idValue && $user->id != 0)
+						{
+							$result = $this->getModel('ajax')->usedin($functioNameValue, $idValue);
+						}
+						else
+						{
+							$result = false;
+						}
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback . "(".json_encode($result).");";
+						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
+						else
+						{
+							echo "(".json_encode($result).");";
+						}
+					}
+					catch(Exception $e)
+					{
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback."(".json_encode($e).");";
+						}
+						else
+						{
+							echo "(".json_encode($e).");";
+						}
+					}
+				break;
 				case 'fieldOptions':
 					try
 					{

admin/controllers/compiler.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 11 of this MVC
+	@version		@update number 17 of this MVC
-	@build			2nd February, 2017
+	@build			13th February, 2017
 	@created		1st February, 2017
 	@package		Component Builder
 	@subpackage		compiler.php
@@ -71,10 +71,12 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin
 			$version			= $jinput->post->get('version', 0, 'INT');
 			$addBackup		= $jinput->post->get('backup', 0, 'INT');
 			$addGit			= $jinput->post->get('git', 0, 'INT');
+			$addPlaceholders	= $jinput->post->get('placeholders', 2, 'INT');
+			$debugLinenr		= $jinput->post->get('debuglinenr', 2, 'INT');
 			// include component compiler
 			require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/compiler.php';
 			$model		= $this->getModel('compiler');
-			if ($model->builder($version,$componentId,$addBackup,$addGit))
+			if ($model->builder($version,$componentId,$addBackup,$addGit,$addPlaceholders,$debugLinenr))
 			{
 				$cache = JFactory::getCache('mod_menu');
 				$cache->clean();
@@ -143,6 +145,7 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin
 				$message .= '<b>URL:</b> <code>'.$url.'</code><br /><br />';
 				$message .= '<small>Hey! you can also download the file right now!</small><br /><a class="btn btn-success" href="'.$url.'" ><span class="icon-download icon-white"></span>Download</a></p>';
 				$message .= '<p><small><b>Remember!</b> This file is in your tmp folder and therefore publicly accessible untill you click [Clear tmp]!</small> </p>';
+				$message .= '<p><small>Compilation took <b>'.$counter['time'].'</b> seconds to complete.</small> </p>';
 				// set redirect
 				$this->setRedirect($redirect_url,$message,'message');
 				$app->setUserState('com_componentbuilder.extension_name', $counter['filename']);

admin/controllers/component.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 81 of this MVC
-	@build			3rd February, 2017
+	@build			13th February, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		component.php

admin/controllers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controllers/components.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 81 of this MVC
-	@build			3rd February, 2017
+	@build			13th February, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		components.php

admin/controllers/custom_code.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 28 of this MVC
+	@version		@update number 55 of this MVC
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.php

admin/controllers/custom_codes.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 28 of this MVC
+	@version		@update number 55 of this MVC
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_codes.php

admin/controllers/help.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php

admin/controllers/import.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php

admin/controllers/layout.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 66 of this MVC
+	@version		@update number 67 of this MVC
-	@build			3rd February, 2017
+	@build			11th February, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layout.php

admin/controllers/layouts.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 66 of this MVC
+	@version		@update number 67 of this MVC
-	@build			3rd February, 2017
+	@build			11th February, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layouts.php

admin/helpers/compiler.php

@@ -41,6 +41,15 @@ class Compiler extends Infusion
 	 */
 	private $tempPath;
 	
+	/*
+	 * The timer
+	 * 
+	 * @var      string
+	 */
+	private $time_start;
+	private $time_end;
+	public  $secondsCompiled;
+	
 	public $filepath		= '';
 	// fixed pathes
 	protected $dynamicIntegration	= false;
@@ -53,6 +62,8 @@ class Compiler extends Infusion
 	 */
 	public function __construct($config = array ())
 	{
+		// to check the compiler speed
+		$this->time_start = microtime(true);
 		// first we run the perent constructor
 		if (parent::__construct($config))
 		{
@@ -87,43 +98,27 @@ class Compiler extends Infusion
 			{
 				return false;
 			}
-			// we can remove all undeeded data
-			$this->freeMemory();
-			// check if this component is install on the current website
-			if ($paths = $this->getLocalInstallPaths())
-			{
-				// start Automatic import of custom code
-				$userId = JFactory::getUser()->id;
-				$today = JFactory::getDate()->toSql();
-				// Get a db connection.
-				$db = JFactory::getDbo();
-				// get the custom code from installed files
-				$this->customCodeFactory($paths, $db, $userId, $today);
-			}
-			// check if we have custom code to add
-			$this->getCustomCode();
-			// now add the other custom code by placeholder
-			if (ComponentbuilderHelper::checkArray($this->addCustomCodeAt))
-			{
-				// load error messages incase code can not be added
-				$app = JFactory::getApplication();
-				$this->addCustomCodeViaPlaceholders($app);
-			}
 			// now insert into the new files
-			if (ComponentbuilderHelper::checkArray($this->customCode))
+			if ($this->getCustomCode())
 			{				
-				// load error messages incase code can not be added
+				$this->addCustomCode();
-				$app = JFactory::getApplication();
-				$this->addCustomCode($app);
 			}
+			// set the lang data now
+			$this->setLangFileData();
 			// move the update server into place
 			$this->setUpdateServer();
+			// build read me
+			$this->buildReadMe();
 			// zip the component
 			if (!$this->zipComponent())
 			{
-				// done
+				// done with error
 				return false;
 			}
+			// end the timer here
+			$this->time_end = microtime(true);
+			$this->secondsCompiled = $this->time_end - $this->time_start;
+			// completed the compilation
 			return true;
 		}
 		return false;
@@ -156,6 +151,8 @@ class Compiler extends Infusion
 	{
 		if (isset($this->newFiles['static']) && ComponentbuilderHelper::checkArray($this->newFiles['static']) && isset($this->newFiles['dynamic']) && ComponentbuilderHelper::checkArray($this->newFiles['dynamic']))
 		{			
+			// we don't update lang now since we will still posible add custom code
+			$langCheck = 'en-GB.com_'.$this->fileContentStatic['###component###'].'.';
 			// get the bom file
 			$bom = JFile::read($this->bomPath);
 			// first we do the static files
@@ -163,6 +160,12 @@ class Compiler extends Infusion
 			{
 				if (JFile::exists($static['path']))
 				{
+					// skip lang files and store for later
+					if (strpos($static['path'], $langCheck))
+					{
+						$this->langFiles[] = $static;
+						continue;
+					}
 					$this->fileContentStatic['###FILENAME###'] = $static['name'];
 					$php = '';
 					if (ComponentbuilderHelper::checkFileType($static['name'],'php'))
@@ -173,17 +176,14 @@ class Compiler extends Infusion
 					if (strpos($string,'###BOM###') !== false)
 					{
 						list($wast,$code) = explode('###BOM###',$string);
-						$answer = str_replace(array_keys($this->fileContentStatic),array_values($this->fileContentStatic),$php.$bom.$code);
+						$string = $php.$bom.$code;
-						// add custom Code by placeholder if found
+						$answer = $this->setPlaceholders($string, $this->fileContentStatic, 3);
-						$this->getPlaceHolderKeys($static['path'], $answer);
 						// add to zip array
 						$this->writeFile($static['path'],$answer);
 					}
 					else
 					{
-						$answer = str_replace(array_keys($this->fileContentStatic),array_values($this->fileContentStatic),$string);
+						$answer = $this->setPlaceholders($string, $this->fileContentStatic, 3);
-						// add custom Code by placeholder if found
-						$this->getPlaceHolderKeys($static['path'], $answer);
 						// add to zip array
 						$this->writeFile($static['path'],$answer);
 					}
@@ -213,19 +213,16 @@ class Compiler extends Infusion
 								if (strpos($string,'###BOM###') !== false)
 								{
 									list($bin,$code) = explode('###BOM###',$string);
-									$answer = str_replace(array_keys($this->fileContentStatic),array_values($this->fileContentStatic),$php.$bom.$code);
+									$string = $php.$bom.$code;
-									$answer = str_replace(array_keys($this->fileContentDynamic[$view]),array_values($this->fileContentDynamic[$view]),$answer);
+									$answer = $this->setPlaceholders($string, $this->fileContentStatic, 3);
-									// add custom Code by placeholder if found
+									$answer = $this->setPlaceholders($answer, $this->fileContentDynamic[$view], 3);
-									$this->getPlaceHolderKeys($file['path'], $answer, $view);
 									// add to zip array
 									$this->writeFile($file['path'],$answer);
 								}
 								else
 								{
-									$answer = str_replace(array_keys($this->fileContentStatic),array_values($this->fileContentStatic),$string);
+									$answer = $this->setPlaceholders($string, $this->fileContentStatic, 3);
-									$answer = str_replace(array_keys($this->fileContentDynamic[$view]),array_values($this->fileContentDynamic[$view]),$answer);
+									$answer = $this->setPlaceholders($answer, $this->fileContentDynamic[$view], 3);
-									// add custom Code by placeholder if found
-									$this->getPlaceHolderKeys($file['path'], $answer, $view);
 									// add to zip array
 									$this->writeFile($file['path'],$answer);
 								}
@@ -239,120 +236,11 @@ class Compiler extends Infusion
 			}
 			// free up some memory
 			unset($this->newFiles['dynamic']);
-			// do a final run to update the readme file
-			$two = 0;
-			foreach ($this->newFiles['static'] as $static)
-			{
-				if (('README.md' === $static['name'] || 'README.txt' === $static['name']) && $this->componentData->addreadme && JFile::exists($static['path']))
-				{
-					$this->buildReadMe($static['path']);
-					$two++;
-				}
-				if ($two == 2)
-				{
-					break;
-				}
-			}
 			return true;
 		}
 		return false;
 	}
 	
-	protected function getPlaceHolderKeys(&$file, &$content, &$view = '')
-	{
-		// check if line has custom code place holder
-		if (strpos($content, '[CUSTO'.'MCODE=') !== false)
-		{
-			if (!isset($this->addCustomCodeAt[$file]))
-			{
-				$this->addCustomCodeAt[$file] = array();
-				$this->addCustomCodeAt[$file]['ids'] = array();
-				$this->addCustomCodeAt[$file]['replace'] = array();
-				$this->addCustomCodeAt[$file]['view'] = $view;
-			}
-			$found = ComponentbuilderHelper::getAllBetween($content, '[CUSTO'.'MCODE=', ']');
-			if (ComponentbuilderHelper::checkArray($found))
-			{
-				foreach ($found as $id)
-				{
-					$this->addCustomCodeAt[$file]['ids'][$id] = $id;
-				}
-			}
-		}
-	}
-	
-	protected function freeMemory()
-	{		
-		// free up some memory
-		unset($this->newFiles['static']);
-		unset($this->customScriptBuilder);
-		unset($this->permissionCore);
-		unset($this->permissionDashboard);
-		unset($this->componentData->admin_views);
-		unset($this->componentData->site_views);
-		unset($this->componentData->custom_admin_views);
-		unset($this->componentData->config);
-		unset($this->joomlaVersionData);
-		unset($this->langContent);
-		unset($this->dbKeys);
-		unset($this->permissionBuilder);
-		unset($this->layoutBuilder);
-		unset($this->historyBuilder);
-		unset($this->aliasBuilder);
-		unset($this->titleBuilder);
-		unset($this->customBuilderList);
-		unset($this->hiddenFieldsBuilder);
-		unset($this->intFieldsBuilder);
-		unset($this->dynamicfieldsBuilder);
-		unset($this->maintextBuilder);
-		unset($this->customFieldLinksBuilder);
-		unset($this->setScriptUserSwitch);
-		unset($this->categoryBuilder);
-		unset($this->catCodeBuilder);
-		unset($this->checkboxBuilder);
-		unset($this->jsonItemBuilder);
-		unset($this->base64Builder);
-		unset($this->basicEncryptionBuilder);
-		unset($this->advancedEncryptionBuilder);
-		unset($this->getItemsMethodListStringFixBuilder);
-		unset($this->getItemsMethodEximportStringFixBuilder);
-		unset($this->selectionTranslationFixBuilder);
-		unset($this->listBuilder);
-		unset($this->customBuilder);
-		unset($this->editBodyViewScriptBuilder);
-		unset($this->queryBuilder);
-		unset($this->sortBuilder);
-		unset($this->searchBuilder);
-		unset($this->filterBuilder);
-		unset($this->fieldsNames);
-		unset($this->siteFields);
-		unset($this->siteFieldData);
-		unset($this->customFieldScript);
-		unset($this->configFieldSets);
-		unset($this->jsonStringBuilder);
-		unset($this->importCustomScripts);
-		unset($this->eximportView);
-		unset($this->uninstallBuilder);
-		unset($this->listColnrBuilder);
-		unset($this->customFieldBuilder);
-		unset($this->permissionFields);
-		unset($this->getAsLookup);
-		unset($this->secondRunAdmin);
-		unset($this->uninstallScriptBuilder);
-		unset($this->buildCategories);
-		unset($this->iconBuilder);
-		unset($this->validationFixBuilder);
-		unset($this->targetRelationControl);
-		unset($this->targetControlsScriptChecker);
-		unset($this->accessBuilder);
-		unset($this->tabCounter);
-		unset($this->linkedAdminViews);
-		unset($this->uniquekeys);
-		unset($this->uniquecodes);
-		$this->unsetNow('_adminViewData');
-		$this->unsetNow('_fieldData');
-	}
-	
 	/**
 	 * move the local update server xml file to a remote ftp server
 	 * 
@@ -415,7 +303,26 @@ class Compiler extends Infusion
 		$this->fileContentStatic['###VERSION###'] = $this->fileContentStatic['###VERSION###GLOBAL'];
 	}
 	
-	private function buildReadMe($path)
+	private function buildReadMe()
+	{
+		// do a final run to update the readme file
+		$two = 0;
+		foreach ($this->newFiles['static'] as $static)
+		{
+			if (('README.md' === $static['name'] || 'README.txt' === $static['name']) && $this->componentData->addreadme && JFile::exists($static['path']))
+			{
+				$this->setReadMe($static['path']);
+				$two++;
+			}
+			if ($two == 2)
+			{
+				break;
+			}
+		}
+		unset($this->newFiles['static']);
+	}
+	
+	private function setReadMe($path)
 	{
 		// set readme data if not set already
 		if (!isset($this->fileContentStatic['###LINE_COUNT###']) || $this->fileContentStatic['###LINE_COUNT###'] != $this->lineCount)
@@ -425,7 +332,7 @@ class Compiler extends Infusion
 		// get the file
 		$string = JFile::read($path);
 		// update the file
-		$answer = str_replace(array_keys($this->fileContentStatic),array_values($this->fileContentStatic),$string);
+		$answer = $this->setPlaceholders($string, $this->fileContentStatic);
 		// add to zip array
 		$this->writeFile($path,$answer);
 	}	
@@ -630,65 +537,13 @@ class Compiler extends Infusion
 		return false;
 	}
 	
-	protected function addCustomCodeViaPlaceholders($app)
+	protected function addCustomCode()
 	{
+		// load error messages incase code can not be added
+		$app = JFactory::getApplication();
 		// reset all these
-		unset($this->placeholders['###view###']);
+		$this->clearFromPlaceHolders('view');
-		unset($this->placeholders['###VIEW###']);
+		$this->clearFromPlaceHolders('arg');
-		unset($this->placeholders['###View###']);
-		unset($this->placeholders['[[[view]]]']);
-		unset($this->placeholders['[[[VIEW]]]']);
-		unset($this->placeholders['[[[View]]]']);
-		unset($this->placeholders['###views###']);
-		unset($this->placeholders['###VIEWS###']);
-		unset($this->placeholders['###Views###']);
-		unset($this->placeholders['[[[views]]]']);
-		unset($this->placeholders['[[[VIEWS]]]']);
-		unset($this->placeholders['[[[Views]]]']);
-		unset($this->placeholders['###SView###']);
-		unset($this->placeholders['###sview###']);
-		unset($this->placeholders['###SVIEW###']);
-		unset($this->placeholders['[[[SView]]]']);
-		unset($this->placeholders['[[[sview]]]']);
-		unset($this->placeholders['[[[SVIEW]]]']);
-		unset($this->placeholders['###SViews###']);
-		unset($this->placeholders['###sviews###']);
-		unset($this->placeholders['###SVIEWS###']);
-		unset($this->placeholders['[[[SViews]]]']);
-		unset($this->placeholders['[[[sviews]]]']);
-		unset($this->placeholders['[[[SVIEWS]]]']);
-		foreach ($this->addCustomCodeAt as $path => $item)
-		{
-			if (ComponentbuilderHelper::checkString($item['view']))
-			{
-				$this->placeholders['[[[view]]]'] = $item['view'];
-			}
-			elseif (isset($this->placeholders['[[[view]]]']))
-			{
-				unset($this->placeholders['[[[view]]]']);
-			}
-			if ($this->getCustomCode($item['ids']))
-			{
-				$code = array();
-				foreach($this->customCode as $item)
-				{
-					$placeholder	= $this->getPlaceHolder(2, $item['id']);
-					$code['[CUSTOM'.'CODE='.$item['id'].']'] = $placeholder['start'] . PHP_EOL . str_replace(array_keys($this->placeholders),array_values($this->placeholders),$item['code']) . $placeholder['end'];
-				}
-				// now update the file
-				$string = JFile::read($path);
-				$answer = str_replace(array_keys($code),array_values($code),$string);
-				$this->writeFile($path,$answer);
-			}
-			else
-			{
-				$app->enqueueMessage(JText::sprintf('Custom code could not be added to <b>%s</b> <br />Since there where no publish code returned from the database.', $path), 'warning');
-			}
-		}
-	}
-	
-	protected function addCustomCode($app)
-	{
 		foreach($this->customCode as $nr => $target)
 		{
 			// reset each time per custom code
@@ -718,7 +573,7 @@ class Compiler extends Infusion
 					$foundEnd	= true;
 				}
 				$counter	= 0;
-				// check if file is new structure			
+				// check if file exist			
 				if (JFile::exists($file))
 				{
 					foreach (new SplFileObject($file) as $lineNumber => $lineContent)
@@ -782,8 +637,8 @@ class Compiler extends Infusion
 					}
 					if ($found)
 					{
-						$placeholder	= $this->getPlaceHolder($target['type'], $target['id']);
+						$placeholder	= $this->getPlaceHolder((int) $target['comment_type'].$target['type'], $target['id']);
-						$data		= $placeholder['start'] . PHP_EOL . $target['code'] . $placeholder['end'];
+						$data		= $placeholder['start'] . PHP_EOL . $this->setPlaceholders($target['code'], $this->placeholders). $placeholder['end'] . PHP_EOL;
 						if ($target['type'] == 2)
 						{
 							// found it now add code from the next line
@@ -792,7 +647,7 @@ class Compiler extends Infusion
 						elseif ($target['type'] == 1 && $foundEnd)
 						{
 							// found it now add code from the next line
-							$this->addDataToFile($file, $data . PHP_EOL, $bites, (int) array_sum($replace));
+							$this->addDataToFile($file, $data, $bites, (int) array_sum($replace));
 						}
 						else
 						{
@@ -823,7 +678,7 @@ class Compiler extends Infusion
 		$code = explode(PHP_EOL, $target['code']);
 		$code = PHP_EOL."// " .implode(PHP_EOL."// ",$code). PHP_EOL;
 		// get place holders
-		$placeholder	= $this->getPlaceHolder($target['type'], $target['id']);
+		$placeholder	= $this->getPlaceHolder((int) $target['comment_type'].$target['type'], $target['id']);
 		// build the data
 		$data		= $placeholder['start'] . $code . $placeholder['end']. PHP_EOL;
 		// get the bites before insertion
@@ -842,23 +697,31 @@ class Compiler extends Infusion
 	// Thanks to http://stackoverflow.com/a/16813550/1429677
 	protected function addDataToFile($file, $data, $position, $replace = null)
 	{
+		// start the process
 		$fpFile = fopen($file, "rw+");
 		$fpTemp = fopen('php://temp', "rw+");
-
+		// make a copy of the file
-		$len = stream_copy_to_stream($fpFile, $fpTemp); // make a copy
+		stream_copy_to_stream($fpFile, $fpTemp);
-
+		// move to the position where we should add the data
-		fseek($fpFile, $position); // move to the position
+		fseek($fpFile, $position);
+		// Add the data
+		fwrite($fpFile, $data);
+		// truncate file at the end of the data that was added
+		$remove = bcadd($position, mb_strlen($data, '8bit'));
+		ftruncate($fpFile, $remove);
+		// check if this was a replacement of data
 		if ($replace)
 		{
 			$position = bcadd($position, $replace);
 		}
-		fseek($fpTemp, $position); // move to the position
+		// move to the position of the data that should remain below the new data
-
+		fseek($fpTemp, $position);
-		fwrite($fpFile, $data); // Add the data
+		// copy that remaining data to the file
-
 		stream_copy_to_stream($fpTemp, $fpFile); // @Jack
+		// done close both files
+		fclose($fpFile);
+		fclose($fpTemp);
 		
-		fclose($fpFile); // close file
+		// any help to improve this is welcome...
-		fclose($fpTemp); // close tmp
 	}
 }

admin/helpers/compiler/b_Structure.php

@@ -969,38 +969,4 @@ class Structure extends Get
 		}
 		return false;
 	}
-	
-	/**
-	 * get the local installed path of this component
-	 *
-	 * @return  array   of paths on success
-	 * 
-	 */
-	public function getLocalInstallPaths()
-	{
-		// set the local paths to search
-		$localPaths = array();
-		// the admin path
-		$localPaths['admin'] = JPATH_ADMINISTRATOR . '/components/com_'. $this->componentCodeName;
-		// only check for site path if the component has a site area!
-		if (!$this->removeSiteFolder)
-		{
-			$localPaths['site'] = JPATH_ROOT . '/components/com_'. $this->componentCodeName;
-		}
-		// TODO later to include the JS and CSS
-		// $localPaths['media'] = JPATH_ROOT . '/media/com_'. $this->fileContentStatic['###component###'];
-		// check if the local install is found
-		foreach ($localPaths as $key => $localPath)
-		{
-			if (!JFolder::exists($localPath))
-			{
-				unset($localPaths[$key]);
-			}
-		}
-		if (ComponentbuilderHelper::checkArray($localPaths))
-		{
-			return $localPaths;
-		}
-		return false;
-	}
 }

admin/helpers/compiler/c_Fields.php

@@ -1276,7 +1276,7 @@ class Fields extends Structure
 				{
 					$xmlValue = ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"');
 					// replace the placeholders
-					$xmlValue = str_replace(array_keys($placeholders), array_values($placeholders), $xmlValue);
+					$xmlValue = $this->setPlaceholders($xmlValue, $placeholders);
 				}
 				elseif (strpos($property['name'], 'type_php_') !== false && $setCustom)
 				{
@@ -1312,14 +1312,14 @@ class Fields extends Structure
 					// load the component name
 					$fieldAttributes['custom']['component'] = ComponentbuilderHelper::getBetween($field['settings']->xml, 'component="', '"');
 					// replace the placeholders
-					$fieldAttributes['custom']['component'] = str_replace(array_keys($placeholders), array_values($placeholders), $fieldAttributes['custom']['component']);
+					$fieldAttributes['custom']['component'] = $this->setPlaceholders($fieldAttributes['custom']['component'], $placeholders);
 				}
 				elseif ($property['name'] === 'table' && $setCustom)
 				{
 					// load the main table that is queried
 					$fieldAttributes['custom']['table'] = ComponentbuilderHelper::getBetween($field['settings']->xml, 'table="', '"');
 					// replace the placeholders
-					$fieldAttributes['custom']['table'] = str_replace(array_keys($placeholders), array_values($placeholders), $fieldAttributes['custom']['table']);
+					$fieldAttributes['custom']['table'] = $this->setPlaceholders($fieldAttributes['custom']['table'], $placeholders);
 				}
 				elseif ($property['name'] === 'value_field' && $setCustom)
 				{
@@ -1382,7 +1382,7 @@ class Fields extends Structure
 				if (ComponentbuilderHelper::checkString($xmlValue) && $property['translatable'] == 1)
 				{
 					// replace placeholders
-					$xmlValue = str_replace(array_keys($placeholders), array_values($placeholders), $xmlValue);
+					$xmlValue = $this->setPlaceholders($xmlValue, $placeholders);
 					// insure custom lables dont get messed up
 					if ($setCustom)
 					{
@@ -1818,16 +1818,16 @@ class Fields extends Structure
 					{
 						if ($line == 1)
 						{
-							$phpCode .= str_replace(array_keys($tabBreak),array_values($tabBreak),$code);
+							$phpCode .= $this->setPlaceholders($code, $tabBreak);
 						}
 						else
 						{
-							$phpCode .= PHP_EOL."\t\t".str_replace(array_keys($tabBreak),array_values($tabBreak),$code);
+							$phpCode .= PHP_EOL."\t\t".$this->setPlaceholders($code, $tabBreak);
 						}
 					}
 				}
 				// replace the placholders
-				$phpCode = str_replace(array_keys($replace),array_values($replace),$phpCode);
+				$phpCode = $this->setPlaceholders($phpCode, $replace);
 			}
 			else
 			{
@@ -1851,16 +1851,16 @@ class Fields extends Structure
 						{
 							if ($line == 1)
 							{
-								$phpxCode .= str_replace(array_keys($tabBreak),array_values($tabBreak),$code);
+								$phpxCode .= $this->setPlaceholders($code, $tabBreak);
 							}
 							else
 							{
-								$phpxCode .= PHP_EOL."\t\t".str_replace(array_keys($tabBreak),array_values($tabBreak),$code);
+								$phpxCode .= PHP_EOL."\t\t".$this->setPlaceholders($code, $tabBreak);
 							}
 						}
 					}
 					// replace the placholders
-					$phpxCode = str_replace(array_keys($replace),array_values($replace),$phpxCode);
+					$phpxCode = $this->setPlaceholders($phpxCode, $replace);
 				}
 				else
 				{

admin/helpers/compiler/e_Interpretation.php

@@ -31,15 +31,7 @@ defined('_JEXEC') or die('Restricted access');
  */
 class Interpretation extends Fields
 {	
-	/*
-	 * The line numbers Switch
-	 * 
-	 * @var      boolean
-	 */
-	public $loadLineNr			= false;
-	
 	public $theContributors			= '';
-	public $placeholders			= array();
 	public $uninstallBuilder		= array();
 	public $listColnrBuilder		= array();
 	public $permissionBuilder		= array();
@@ -65,8 +57,6 @@ class Interpretation extends Fields
 		// first we run the perent constructor
 		if (parent::__construct($config))
 		{
-			// set if line numbers should be added to comments
-			$this->loadLineNr = ($this->componentData->debug_linenr) ? true:false;
 			return true;
 		}
 		return false;
@@ -2271,7 +2261,7 @@ class Interpretation extends Fields
 						{
 							foreach ($joinedChecker as $joinedString)
 							{
-								$joine .= str_replace(array_keys($placeholders),array_values($placeholders),$joinedString);
+								$joine .= $this->setPlaceholders($joinedString, $placeholders);
 							}
 						}
 						if (ComponentbuilderHelper::checkString($decoder) || ComponentbuilderHelper::checkString($uikit) || ComponentbuilderHelper::checkString($decoder_filter) || ComponentbuilderHelper::checkString($joine))
@@ -2484,7 +2474,8 @@ class Interpretation extends Fields
 				$get->php_calculation = (array) explode(PHP_EOL,$get->php_calculation);
 				if (ComponentbuilderHelper::checkArray($get->php_calculation))
 				{
-					$getItem .= str_replace(array_keys($this->placeholders),array_values($this->placeholders),PHP_EOL."\t\t\t\t".implode(PHP_EOL."\t\t\t\t",$get->php_calculation));
+					$_tmp = PHP_EOL."\t\t\t\t".implode(PHP_EOL."\t\t\t\t",$get->php_calculation);
+					$getItem .= $this->setPlaceholders($_tmp, $this->placeholders);
 				}
 			}
 			$getItem .= PHP_EOL."\t\t\t}";
@@ -2573,7 +2564,8 @@ class Interpretation extends Fields
 				$view['settings']->php_jview_display = (array) explode(PHP_EOL,$view['settings']->php_jview_display);
 				if (ComponentbuilderHelper::checkArray($view['settings']->php_jview_display))
 				{
-					$method .= str_replace(array_keys($this->placeholders),array_values($this->placeholders),PHP_EOL."\t\t".implode(PHP_EOL."\t\t",$view['settings']->php_jview_display));
+					$_tmp = PHP_EOL."\t\t".implode(PHP_EOL."\t\t",$view['settings']->php_jview_display);
+					$method .= $this->setPlaceholders($_tmp, $this->placeholders);
 				}
 			}
 			if ('site' === $this->target)
@@ -2727,7 +2719,8 @@ class Interpretation extends Fields
 			$view['settings']->php_document = (array) explode(PHP_EOL,$view['settings']->php_document);
 			if (ComponentbuilderHelper::checkArray($view['settings']->php_document))
 			{
-				return str_replace(array_keys($this->placeholders),array_values($this->placeholders),PHP_EOL."\t\t".implode(PHP_EOL."\t\t",$view['settings']->php_document));
+				$_tmp = PHP_EOL."\t\t".implode(PHP_EOL."\t\t",$view['settings']->php_document);
+				return $this->setPlaceholders($_tmp, $this->placeholders);
 			}
 		}
 		return '';
@@ -2790,7 +2783,7 @@ class Interpretation extends Fields
 			{
 				// set the custom buttons ###CUSTOM_BUTTONS_CONTROLLER###
 				$this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_CONTROLLER###'] =
-				PHP_EOL.PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->php_controller);
+				PHP_EOL.PHP_EOL.$this->setPlaceholders($view['settings']->php_controller, $this->placeholders);
 				if ('site' === $this->target)
 				{
 					// add the controller for this view
@@ -2804,7 +2797,7 @@ class Interpretation extends Fields
 			{
 				// set the custom buttons ###CUSTOM_BUTTONS_METHOD###
 				$this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_METHOD###'] =
-				PHP_EOL.PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->php_model);
+				PHP_EOL.PHP_EOL.$this->setPlaceholders($view['settings']->php_model, $this->placeholders);
 			}
 			if (isset($view['settings']->custom_buttons) && ComponentbuilderHelper::checkArray($view['settings']->custom_buttons))
 			{
@@ -2840,7 +2833,7 @@ class Interpretation extends Fields
 		{
 			if (ComponentbuilderHelper::checkString($view['settings']->css))
 			{
-				return str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->css);
+				return $this->setPlaceholders($view['settings']->css, $this->placeholders);
 			}
 		}
 		return '';
@@ -2854,8 +2847,8 @@ class Interpretation extends Fields
 			if (ComponentbuilderHelper::checkArray($view['settings']->css_document))
 			{
 				$script = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Set the Custom CSS script to view".PHP_EOL."\t\t".'$this->document->addStyleDeclaration("';
-				$cssDocument = str_replace('"', '\"', implode(PHP_EOL."\t\t\t",$view['settings']->css_document));
+				$cssDocument = PHP_EOL."\t\t\t".str_replace('"', '\"', implode(PHP_EOL."\t\t\t",$view['settings']->css_document));
-				return $script.str_replace(array_keys($this->placeholders),array_values($this->placeholders),PHP_EOL."\t\t\t".$cssDocument).PHP_EOL."\t\t".'");';
+				return $script.$this->setPlaceholders($cssDocument, $this->placeholders).PHP_EOL."\t\t".'");';
 			}
 		}
 		return '';
@@ -2869,8 +2862,8 @@ class Interpretation extends Fields
 			if (ComponentbuilderHelper::checkArray($view['settings']->js_document))
 			{
 				$script = PHP_EOL."\t\t//".$this->setLine(__LINE__)." Set the Custom JS script to view".PHP_EOL."\t\t".'$this->document->addScriptDeclaration("';
-				$jsDocument = str_replace('"', '\"', implode(PHP_EOL."\t\t\t",$view['settings']->js_document));
+				$jsDocument = PHP_EOL."\t\t\t".str_replace('"', '\"', implode(PHP_EOL."\t\t\t",$view['settings']->js_document));
-				return $script.str_replace(array_keys($this->placeholders),array_values($this->placeholders),PHP_EOL."\t\t\t".$jsDocument).PHP_EOL."\t\t".'");';
+				return $script.$this->setPlaceholders($jsDocument, $this->placeholders).PHP_EOL."\t\t".'");';
 			}
 		}
 		return '';
@@ -3149,7 +3142,7 @@ class Interpretation extends Fields
 	{
 		if ($view['settings']->add_php_jview == 1)
 		{
-			return str_replace(array_keys($this->placeholders),array_values($this->placeholders),PHP_EOL.PHP_EOL.$view['settings']->php_jview);
+			return PHP_EOL.PHP_EOL.$this->setPlaceholders($view['settings']->php_jview, $this->placeholders);
 		}
 		return '';
 	}
@@ -3167,7 +3160,7 @@ class Interpretation extends Fields
 				{
 					$this->placeholders['[[[LIMITBOX]]]'] = '<?php echo $this->pagination->getLimitBox(); ?>';
 				}
-				$body[] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->default);
+				$body[] = $this->setPlaceholders($view['settings']->default, $this->placeholders);
 				$body[] = PHP_EOL.'<?php if (isset($this->items) && '.$this->fileContentStatic['###component###'].'Helper::checkArray($this->items) && count($this->items) > 4): ?>';
 				$body[] = '<form name="adminForm" method="post">';
 				$body[] = "\t".'<div class="pagination">';
@@ -3191,7 +3184,7 @@ class Interpretation extends Fields
 			}
 			else
 			{
-				return PHP_EOL. str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->default);
+				return PHP_EOL. $this->setPlaceholders($view['settings']->default, $this->placeholders);
 			}
 			
 		}
@@ -3233,7 +3226,8 @@ class Interpretation extends Fields
 			$view['settings']->php_view = (array) explode(PHP_EOL,$view['settings']->php_view);
 			if (ComponentbuilderHelper::checkArray($view['settings']->php_view))
 			{
-				return str_replace(array_keys($this->placeholders),array_values($this->placeholders),PHP_EOL.PHP_EOL.implode(PHP_EOL,$view['settings']->php_view));
+				$_tmp = PHP_EOL.PHP_EOL.implode(PHP_EOL,$view['settings']->php_view);
+				return $this->setPlaceholders($_tmp, $this->placeholders);
 			}
 		}
 		return '';
@@ -3254,7 +3248,7 @@ class Interpretation extends Fields
 				// set the file data
 				$TARGET = ComponentbuilderHelper::safeString($this->target,'U');
 				// ###SITE_TEMPLATE_BODY### <<<DYNAMIC>>>
-				$this->fileContentDynamic[$view['settings']->code.'_'.$template]['###'.$TARGET.'_TEMPLATE_BODY###'] = PHP_EOL . str_replace(array_keys($this->placeholders),array_values($this->placeholders),$data['html']);
+				$this->fileContentDynamic[$view['settings']->code.'_'.$template]['###'.$TARGET.'_TEMPLATE_BODY###'] = PHP_EOL . $this->setPlaceholders($data['html'], $this->placeholders);
 				// ###SITE_TEMPLATE_CODE_BODY### <<<DYNAMIC>>>
 				$this->fileContentDynamic[$view['settings']->code.'_'.$template]['###'.$TARGET.'_TEMPLATE_CODE_BODY###'] = $this->setCustomViewTemplateCode($data['php_view']);
 			}
@@ -3269,7 +3263,7 @@ class Interpretation extends Fields
 			if (ComponentbuilderHelper::checkArray($php_view))
 			{
 				$php_view = PHP_EOL.PHP_EOL.implode(PHP_EOL,$php_view);
-				return str_replace(array_keys($this->placeholders),array_values($this->placeholders),$php_view);
+				return $this->setPlaceholders($php_view, $this->placeholders);
 			}
 		}
 		return '';
@@ -3291,14 +3285,14 @@ class Interpretation extends Fields
 				if (ComponentbuilderHelper::checkArray($php_view))
 				{
 					$php_view = PHP_EOL.PHP_EOL.implode(PHP_EOL,$php_view);
-					$this->fileContentDynamic[$layout]['###'.$TARGET.'_LAYOUT_CODE###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$php_view);
+					$this->fileContentDynamic[$layout]['###'.$TARGET.'_LAYOUT_CODE###'] = $this->setPlaceholders($php_view, $this->placeholders);
 				}
 				else
 				{
 					$this->fileContentDynamic[$layout]['###'.$TARGET.'_LAYOUT_CODE###'] = '';
 				}
 				// ###SITE_LAYOUT_BODY### <<<DYNAMIC>>>
-				$this->fileContentDynamic[$layout]['###'.$TARGET.'_LAYOUT_BODY###'] = PHP_EOL . str_replace(array_keys($this->placeholders),array_values($this->placeholders),$data['html']);
+				$this->fileContentDynamic[$layout]['###'.$TARGET.'_LAYOUT_BODY###'] = PHP_EOL . $this->setPlaceholders($data['html'], $this->placeholders);
 
 			}
 		}
@@ -4776,7 +4770,7 @@ class Interpretation extends Fields
 				{
 					$db .= PHP_EOL."\t`id` INT(11) NOT NULL AUTO_INCREMENT,";
 				}
-				$db .= PHP_EOL."\t`asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0',";
+				$db .= PHP_EOL."\t`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',";
 				ksort($fields);
 				foreach ($fields as $field => $data)
 				{
@@ -4822,22 +4816,22 @@ class Interpretation extends Fields
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['params']))
 				{
-					$db .= PHP_EOL."\t`params` TEXT NOT NULL,";
+					$db .= PHP_EOL."\t`params` text NOT NULL DEFAULT '',";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['published']))
 				{
-					$db .= PHP_EOL."\t`published` TINYINT(1) NOT NULL DEFAULT '1',";
+					$db .= PHP_EOL."\t`published` TINYINT(3) NOT NULL DEFAULT 1,";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['created_by']))
 				{
-					$db .= PHP_EOL."\t`created_by` INT(11) NOT NULL DEFAULT '0',";
+					$db .= PHP_EOL."\t`created_by` INT(10) unsigned NOT NULL DEFAULT 0,";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['modified_by']))
 				{
-					$db .= PHP_EOL."\t`modified_by` INT(11) NOT NULL DEFAULT '0',";
+					$db .= PHP_EOL."\t`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['created']))
@@ -4852,7 +4846,7 @@ class Interpretation extends Fields
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['checked_out']))
 				{
-					$db .= PHP_EOL."\t`checked_out` INT(11) NOT NULL,";
+					$db .= PHP_EOL."\t`checked_out` int(11) unsigned NOT NULL DEFAULT 0,";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['checked_out_time']))
@@ -4862,22 +4856,22 @@ class Interpretation extends Fields
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['version']))
 				{
-					$db .= PHP_EOL."\t`version` INT(11) NOT NULL DEFAULT '1',";
+					$db .= PHP_EOL."\t`version` INT(10) unsigned NOT NULL DEFAULT 1,";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['hits']))
 				{
-					$db .= PHP_EOL."\t`hits` INT(11) NOT NULL DEFAULT '0',";
+					$db .= PHP_EOL."\t`hits` INT(10) unsigned NOT NULL DEFAULT 0,";
 				}
 				// check if view has access
 				if (isset($this->accessBuilder[$view]) && ComponentbuilderHelper::checkString($this->accessBuilder[$view]))
 				{
-					$db .= PHP_EOL."\t`access` INT(11) DEFAULT NULL,";
+					$db .= PHP_EOL."\t`access` INT(10) unsigned NOT NULL DEFAULT 0,";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['ordering']))
 				{
-					$db .= PHP_EOL."\t`ordering` INT(11) NOT NULL DEFAULT '0',";
+					$db .= PHP_EOL."\t`ordering` INT(11) NOT NULL DEFAULT 0,";
 				}
 				// check if metadata is added to this view
 				if (isset($this->metadataBuilder[$view]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$view]))
@@ -4934,7 +4928,7 @@ class Interpretation extends Fields
 				foreach ($this->customScriptBuilder['sql'] as $for => $customSql)
 				{
 					$placeholders = array('[[[component]]]' => $component, '[[[view]]]' => $for);
-					$db .= PHP_EOL.PHP_EOL.str_replace(array_keys($placeholders),array_values($placeholders),$customSql);
+					$db .= PHP_EOL.PHP_EOL.$this->setPlaceholders($customSql, $placeholders);
 				}
 
 			}
@@ -8019,12 +8013,12 @@ class Interpretation extends Fields
 			{
 				$fileScript = '';
 			}
-			$fileScript .= PHP_EOL.PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['view_file'][$viewName]);
+			$fileScript .= PHP_EOL.PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['view_file'][$viewName], $this->placeholders);
 		}
 		// add custom script to footer
 		if (isset($this->customScriptBuilder['view_footer'][$viewName]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['view_footer'][$viewName]))
 		{
-			$customFooterScript = PHP_EOL.PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['view_footer'][$viewName]);
+			$customFooterScript = PHP_EOL.PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['view_footer'][$viewName], $this->placeholders);
 			if (strpos($customFooterScript,'<?php') === false)
 			{
 				// only add now if no php is added to the footer script
@@ -8841,7 +8835,7 @@ class Interpretation extends Fields
 			foreach ($this->customScriptBuilder[$target]['ajax_model'] as $view => $method)
 			{
 				$methods .= PHP_EOL.PHP_EOL."\t//".$this->setLine(__LINE__)." Used in ".$view.PHP_EOL;
-				$methods .= str_replace(array_keys($this->placeholders),array_values($this->placeholders),$method);
+				$methods .= $this->setPlaceholders($method, $this->placeholders);
 			}
 		}
 		return $methods;
@@ -8961,7 +8955,7 @@ class Interpretation extends Fields
 						$function[] = "\t\t\t\$model = \$this->getModel();";
 					}
 					$function[] = "\t\t\t\$results = array_unique(\$results);";
-					$function[] = "\t\t\t\$filter = array();";
+					$function[] = "\t\t\t\$_filter = array();";
 					$function[] = "\t\t\tforeach (\$results as \$".$filter['code'].")";
 					$function[] = "\t\t\t{";
 
@@ -8971,20 +8965,20 @@ class Interpretation extends Fields
 						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Translate the ".$filter['code']." selection";
 						$function[] = "\t\t\t\t\$text = \$model->selectionTranslation(\$".$filter['code'].",'".$filter['code']."');";
 						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Now add the ".$filter['code']." and its text to the options array";
-						$function[] = "\t\t\t\t\$filter[] = JHtml::_('select.option', \$".$filter['code'].", JText::_(\$text));";
+						$function[] = "\t\t\t\t\$_filter[] = JHtml::_('select.option', \$".$filter['code'].", JText::_(\$text));";
 					}
 					elseif ($filter['type'] === 'user')
 					{
 						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Now add the ".$filter['code']." and its text to the options array";
-						$function[] = "\t\t\t\t\$filter[] = JHtml::_('select.option', \$".$filter['code'].", JFactory::getUser(\$".$filter['code'].")->name);";
+						$function[] = "\t\t\t\t\$_filter[] = JHtml::_('select.option', \$".$filter['code'].", JFactory::getUser(\$".$filter['code'].")->name);";
 					}
 					else
 					{
 						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Now add the ".$filter['code']." and its text to the options array";
-						$function[] = "\t\t\t\t\$filter[] = JHtml::_('select.option', \$".$filter['code'].", \$".$filter['code'].");";
+						$function[] = "\t\t\t\t\$_filter[] = JHtml::_('select.option', \$".$filter['code'].", \$".$filter['code'].");";
 					}
 					$function[] = "\t\t\t}";
-					$function[] = "\t\t\treturn \$filter;";
+					$function[] = "\t\t\treturn \$_filter;";
 					$function[] = "\t\t}";
 					$function[] = "\t\treturn false;";
 					$function[] = "\t}";
@@ -11138,7 +11132,7 @@ class Interpretation extends Fields
 			$this->DashboardGetCustomData = ComponentbuilderHelper::getAllBetween($this->componentData->php_dashboard_methods,'public function get','()');
 
 			// return the methods
-			return PHP_EOL.PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->componentData->php_dashboard_methods);
+			return PHP_EOL.PHP_EOL.$this->setPlaceholders($this->componentData->php_dashboard_methods, $this->placeholders);
 		}
 		return '';
 	}
@@ -11176,7 +11170,7 @@ class Interpretation extends Fields
 			// build the tabs and accordians
 			foreach ($this->componentData->dashboard_tab as $data)
 			{
-				$builder[$data['name']][$data['header']] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$data['html']);
+				$builder[$data['name']][$data['header']] = $this->setPlaceholders($data['html'], $this->placeholders);
 			}
 			// since we have custom tabs we must load the tab structure around the cpanel
 			$display[] = '<div id="j-main-container" class="span12">';

admin/helpers/compiler/f_Infusion.php

@@ -34,6 +34,7 @@ class Infusion extends Interpretation
 
 	public $eximportView = array();
 	public $importCustomScripts = array();
+	public $langFiles = array();
 	public $removeSiteFolder = false;
 
 	/**
@@ -150,15 +151,15 @@ class Infusion extends Interpretation
 			$this->lang = $keepLang;
 			
 			// ###ADMINCSS###
-			$this->fileContentStatic['###ADMINCSS###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_css']);
+			$this->fileContentStatic['###ADMINCSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css'], $this->placeholders);
 			// ###SITECSS###
-			$this->fileContentStatic['###SITECSS###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_css']);
+			$this->fileContentStatic['###SITECSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css'], $this->placeholders);
 
 			// ###CUSTOM_HELPER_SCRIPT###
-			$this->fileContentStatic['###CUSTOM_HELPER_SCRIPT###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_helper_admin']);
+			$this->fileContentStatic['###CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_admin'], $this->placeholders);
 			
 			// ###BOTH_CUSTOM_HELPER_SCRIPT###
-			$this->fileContentStatic['###BOTH_CUSTOM_HELPER_SCRIPT###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_helper_both']);
+			$this->fileContentStatic['###BOTH_CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_both'], $this->placeholders);
 			
 			// ###ADMIN_GLOBAL_EVENT_HELPER###
 			$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = '';
@@ -181,7 +182,7 @@ class Infusion extends Interpretation
 				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'**/';
 				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'public static function globalEvent($document)';
 				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'{';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_admin_event']);
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['component_php_admin_event'], $this->placeholders);
 				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'}';
 			}
 			
@@ -290,7 +291,7 @@ class Infusion extends Interpretation
                                         {
                                                 // ###DOCUMENT_CUSTOM_PHP### <<<DYNAMIC>>>
                                                 $this->fileContentDynamic[$viewName_single]['###DOCUMENT_CUSTOM_PHP###'] 
-                                                        = PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_document'][$viewName_single]);
+                                                        = PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['php_document'][$viewName_single], $this->placeholders);
                                                 // clear some memory
                                                 unset($this->customScriptBuilder['php_document'][$viewName_single]);
                                         }
@@ -351,7 +352,7 @@ class Infusion extends Interpretation
                                         {
                                                 // ###VIEWCSS### <<<DYNAMIC>>>
                                                 $this->fileContentDynamic[$viewName_single]['###VIEWCSS###']
-                                                        = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['css_view'][$viewName_single]);
+                                                        = $this->setPlaceholders($this->customScriptBuilder['css_view'][$viewName_single], $this->placeholders);
                                                 // clear some memory
                                                 unset($this->customScriptBuilder['css_view'][$viewName_single]);
                                         }
@@ -497,7 +498,7 @@ class Infusion extends Interpretation
                                         {
                                                 // ###VIEWCSS### <<<DYNAMIC>>>
                                                 $this->fileContentDynamic[$viewName_list]['###VIEWSCSS###']
-                                                        = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['css_views'][$viewName_list]);
+                                                        = $this->setPlaceholders($this->customScriptBuilder['css_views'][$viewName_list], $this->placeholders);
                                                 // clear some memory
                                                 unset($this->customScriptBuilder['css_views'][$viewName_list]);
                                         }
@@ -629,7 +630,7 @@ class Infusion extends Interpretation
                                                 {
                                                         // ###CUSTOM_ADMIN_BEFORE_GET_ITEM### <<<DYNAMIC>>>
                                                         $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEM###']
-                                                                = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]);
+                                                                = $this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code], $this->placeholders);
                                                         // clear some memory
                                                         unset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]);
                                                 }
@@ -647,7 +648,7 @@ class Infusion extends Interpretation
                                                 {
                                                         // ###CUSTOM_ADMIN_AFTER_GET_ITEM### <<<DYNAMIC>>>
                                                         $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEM###']
-                                                                = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]);
+                                                                = $this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code], $this->placeholders);
                                                         // clear some memory
                                                         unset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]);
                                                 }
@@ -667,7 +668,7 @@ class Infusion extends Interpretation
                                                 {
                                                         // ###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY### <<<DYNAMIC>>>
                                                         $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY###']
-                                                                = PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]);
+                                                                = PHP_EOL.$this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code], $this->placeholders);
                                                         // clear some memory
                                                         unset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]);
                                                 }
@@ -682,7 +683,7 @@ class Infusion extends Interpretation
                                                 {
                                                         // ###CUSTOM_ADMIN_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
                                                         $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEMS###']
-                                                                = PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
+                                                                = PHP_EOL.$this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code], $this->placeholders);
                                                         // clear some memory
                                                         unset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
                                                 }
@@ -700,7 +701,7 @@ class Infusion extends Interpretation
                                                 {
                                                         // ###CUSTOM_ADMIN_AFTER_GET_ITEMS### <<<DYNAMIC>>>
                                                         $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEMS###']
-                                                                = PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
+                                                                = PHP_EOL.$this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code], $this->placeholders);
                                                         // clear some memory
                                                         unset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
                                                 }
@@ -896,7 +897,7 @@ class Infusion extends Interpretation
 						{
 							// ###SITE_BEFORE_GET_ITEM### <<<DYNAMIC>>>
 							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEM###']
-								= str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]);
+								= $this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code], $this->placeholders);
 							// clear some memory
 							unset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]);
 						}
@@ -914,7 +915,7 @@ class Infusion extends Interpretation
 						{
 							// ###SITE_AFTER_GET_ITEM### <<<DYNAMIC>>>
 							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEM###']
-								= str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]);
+								= $this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code], $this->placeholders);
 							// clear some memory
 							unset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]);
 						}
@@ -936,7 +937,7 @@ class Infusion extends Interpretation
 						{
 							// ###SITE_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
 							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEMS###']
-								= PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
+								= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code], $this->placeholders);
 							// clear some memory
 							unset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
 						}
@@ -954,7 +955,7 @@ class Infusion extends Interpretation
 						{
 							// ###SITE_AFTER_GET_ITEMS### <<<DYNAMIC>>>
 							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEMS###']
-								= PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
+								= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code], $this->placeholders);
 							// clear some memory
 							unset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
 						}
@@ -992,7 +993,7 @@ class Infusion extends Interpretation
 				}
 				// set site custom script to helper class
 				// ###SITE_CUSTOM_HELPER_SCRIPT###
-				$this->fileContentStatic['###SITE_CUSTOM_HELPER_SCRIPT###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_helper_site']);
+				$this->fileContentStatic['###SITE_CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_site'], $this->placeholders);
 				// ###SITE_GLOBAL_EVENT_HELPER###
 				$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] = '';
 				// ###SITE_GLOBAL_EVENT###
@@ -1008,7 +1009,7 @@ class Infusion extends Interpretation
 					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'**/';
 					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'public static function globalEvent($document)';
 					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'{';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL.str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_site_event']);
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['component_php_site_event'], $this->placeholders);
 					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'}';
 				}
 				// setup the layouts
@@ -1020,18 +1021,6 @@ class Infusion extends Interpretation
 				$this->removeSiteFolder = true;
 			}
 
-			// ###LANG_ADMIN###
-			$this->fileContentStatic['###LANG_ADMIN###'] = $this->setLangAdmin();
-
-			// ###LANG_ADMIN_SYS###
-			$this->fileContentStatic['###LANG_ADMIN_SYS###'] = $this->setLangAdminSys();
-			
-			// ###LANG_SITE###
-			$this->fileContentStatic['###LANG_SITE###'] = $this->setLangSite();
-			
-			// ###LANG_SITE_SYS###
-			$this->fileContentStatic['###LANG_SITE_SYS###'] = $this->setLangSiteSys();
-
 			// ###PREINSTALLSCRIPT###
 			$this->fileContentStatic['###PREINSTALLSCRIPT###'] = $this->getCustomScriptBuilder('php_preflight', 'install', PHP_EOL, null, true);
 
@@ -1073,4 +1062,40 @@ class Infusion extends Interpretation
 		return false;
 	}
 	
+	/**
+	 * Build the lang values and insert to fiel
+	 * 
+	 *
+	 * @return  boolean  on success
+	 * 
+	 */
+	
+	public function setLangFileData()
+	{
+		// First we build the strings
+		$lang = array();
+		// ###LANG_ADMIN###
+		$lang['###LANG_ADMIN###'] = $this->setLangAdmin();
+		// ###LANG_ADMIN_SYS###
+		$lang['###LANG_ADMIN_SYS###'] = $this->setLangAdminSys();
+		// ###LANG_SITE###
+		$lang['###LANG_SITE###'] = $this->setLangSite();
+		// ###LANG_SITE_SYS###
+		$lang['###LANG_SITE_SYS###'] = $this->setLangSiteSys();
+		// now we insert the values into the files
+		if (ComponentbuilderHelper::checkArray($this->langFiles))
+		{
+			foreach ($this->langFiles as $file)
+			{
+				$string = JFile::read($file['path']);
+				// load the data
+				$answer = $this->setPlaceholders($string, $lang, 3);
+				// add to zip array
+				$this->writeFile($file['path'],$answer);
+				// set the line counter
+				$this->lineCount = $this->lineCount + substr_count($answer, PHP_EOL);
+			}
+		}
+	}
+
 }

admin/helpers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@@ -1332,9 +1332,9 @@ abstract class ComponentbuilderHelper
 
 	public static function safeString($string, $type = 'L', $spacer = '_')
 	{
-		// remove all numbers and replace with english text version (works well only up to a thousand)
+		// remove all numbers and replace with english text version (works well only up to millions)
                 $string = self::replaceNumbers($string);
-
+		// 0nly continue if we have a string
                 if (self::checkString($string))
                 {
 			// remove all other characters
@@ -1342,45 +1342,57 @@ abstract class ComponentbuilderHelper
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
 			$string = preg_replace('/\s+/', ' ', $string);
 			$string = preg_replace("/[^A-Za-z ]/", '', $string);
-                        // return a string with all first letter of each word uppercase(no undersocre)
+			// select final adaptations
-                        if ($type == 'W')
+			if ($type === 'L' || $type === 'strtolower')
-                                    {
-                            return ucwords(strtolower($string));
-                        }
-                        elseif ($type == 'w')
-                        {
-                            return strtolower($string);
-                        }
-                        elseif ($type == 'Ww')
-                        {
-                            return ucfirst(strtolower($string));
-                        }
-                        elseif ($type == 'WW')
-                        {
-                            return strtoupper($string);
-                        }
-                        elseif ($type == 'U')
-                        {
-                                // replace white space with underscore
-                                $string = preg_replace('/\s+/', $spacer, $string);
-                                // return all upper
-                                return strtoupper($string);
-                        }
-                        elseif ($type == 'F')
-                        {
-                                // replace white space with underscore
-                                $string = preg_replace('/\s+/', $spacer, $string);
-                                // return with first caracter to upper
-                                return ucfirst(strtolower($string));
-                        }
-                        elseif ($type == 'L')
                         {
                                 // replace white space with underscore
                                 $string = preg_replace('/\s+/', $spacer, $string);
                                 // default is to return lower
                                 return strtolower($string);
                         }
-
+			elseif ($type === 'W')
+			{
+				// return a string with all first letter of each word uppercase(no undersocre)
+				return ucwords(strtolower($string));
+			}
+			elseif ($type === 'w' || $type === 'word')
+			{
+				// return a string with all lowercase(no undersocre)
+				return strtolower($string);
+			}
+			elseif ($type === 'Ww' || $type === 'Word')
+			{
+				// return a string with first letter of the first word uppercase and all the rest lowercase(no undersocre)
+				return ucfirst(strtolower($string));
+			}
+			elseif ($type === 'WW' || $type === 'WORD')
+			{
+				// return a string with all the uppercase(no undersocre)
+				return strtoupper($string);
+			}
+                        elseif ($type === 'U' || $type === 'strtoupper')
+                        {
+                                // replace white space with underscore
+                                $string = preg_replace('/\s+/', $spacer, $string);
+                                // return all upper
+                                return strtoupper($string);
+                        }
+                        elseif ($type === 'F' || $type === 'ucfirst')
+                        {
+                                // replace white space with underscore
+                                $string = preg_replace('/\s+/', $spacer, $string);
+                                // return with first caracter to upper
+                                return ucfirst(strtolower($string));
+                        }
+                        elseif ($type === 'cA' || $type === 'cAmel' || $type === 'camelcase')
+			{
+				// convert all words to first letter uppercase
+				$string = ucwords(strtolower($string));
+				// remove white space
+				$string = preg_replace('/\s+/', '', $string);
+				// now return first letter lowercase
+				return lcfirst($string);
+			}
                         // return string
                         return $string;
                 }

admin/helpers/headercheck.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		headercheck.php

admin/helpers/html/batch_.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php

admin/helpers/indenter.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php

admin/helpers/js.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php

admin/helpers/minify.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php

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

@@ -1,4 +1,8 @@
 COM_COMPONENTBUILDER="Component Builder"
+COM_COMPONENTBUILDER_ADD_CORRESPONDING_LINE_NUMBERS_TO_THE_DYNAMIC_COMMENTS_SO_TO_SEE_WHERE_IN_THE_COMPILER_THE_LINES_OF_CODE_WAS_BUILD_THIS_WILL_HELP_IF_YOU_NEED_TO_GET_MORE_TECHNICAL_WITH_AN_ISSUE_ON_GITHUB="Add corresponding line numbers to the dynamic comments, so to see where in the compiler the lines of code was build. This will help if you need to get more technical with an issue on github."
+COM_COMPONENTBUILDER_ADD_CUSTOM_CODE_PLACEHOLDERS="Add Custom Code Placeholders"
+COM_COMPONENTBUILDER_ADD_TO_BACKUP_FOLDER_AMP_SALES_SERVER_LTSMALLGTIF_SETLTSMALLGT="Add to Backup Folder & Sales Server <small>(if set)</small>"
+COM_COMPONENTBUILDER_ADD_TO_GIT_FOLDER="Add to Git Folder"
 COM_COMPONENTBUILDER_ADMIN_VIEW="Admin View"
 COM_COMPONENTBUILDER_ADMIN_VIEWS="Admin Views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS="Admin Views Access"
@@ -923,7 +927,7 @@ COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_TAB_LABEL="Dashboard Tabs"
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_TAB_SELECT="Add"
 COM_COMPONENTBUILDER_COMPONENT_DATABASE="Database"
 COM_COMPONENTBUILDER_COMPONENT_DEBUG_LINENR="Debug Linenr"
-COM_COMPONENTBUILDER_COMPONENT_DEBUG_LINENR_DESCRIPTION="Add corresponding line numbers, so to see where in the compiler the line of code was build."
+COM_COMPONENTBUILDER_COMPONENT_DEBUG_LINENR_DESCRIPTION="Add corresponding line numbers to the dynamic comments, so to see where in the compiler the lines of code was build. This will help if you need to get more technical with an issue on github."
 COM_COMPONENTBUILDER_COMPONENT_DEBUG_LINENR_LABEL="Debug (line numbers)"
 COM_COMPONENTBUILDER_COMPONENT_DEFAULT_VIEW_DESCRIPTION="Select only one."
 COM_COMPONENTBUILDER_COMPONENT_DEFAULT_VIEW_LABEL="Default View"
@@ -1907,6 +1911,9 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_CODE="Code"
 COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_HINT="// Custom PHP that will be added to the file."
 COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_LABEL="Custom code"
+COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE="Comment Type"
+COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_DESCRIPTION="Select what type of comment is used to mark the placement of this code."
+COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL="Comment Type (used in placeholder)"
 COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT="Component"
 COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL="Component"
 COM_COMPONENTBUILDER_CUSTOM_CODE_CREATED_BY_DESC="The user that created this Custom Code."
@@ -1920,6 +1927,9 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE="From Line"
 COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_DESCRIPTION="The line from where to start adding the code."
 COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_HINT="Only Numbers"
 COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_LABEL="From Line (Zero based)"
+COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME="Function Name"
+COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_DESCRIPTION="The name for this code snippet"
+COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_LABEL="Function Name"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET="Hashendtarget"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_DESCRIPTION="The end hash target to help insert the code until the correct place, if the line position change. This hash is the md5 of a few lines below the custom code"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_HINT="autogenerated md5 hash"
@@ -1929,6 +1939,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_DESCRIPTION="The start hash target t
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_HINT="autogenerated md5 hash"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_LABEL="Start Hash Target"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASH_AUTOMATION="Hash (automation)"
+COM_COMPONENTBUILDER_CUSTOM_CODE_HTML="HTML"
 COM_COMPONENTBUILDER_CUSTOM_CODE_ID="Id"
 COM_COMPONENTBUILDER_CUSTOM_CODE_INSERTION="Insertion"
 COM_COMPONENTBUILDER_CUSTOM_CODE_JCB_MANUAL="JCB (manual)"
@@ -1937,8 +1948,28 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_DESC="The date this Custom Code was modified."
 COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_CUSTOM_CODE_NEW="A New Custom Code"
-COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION="<span id='jcb-placeholder'><code>[save to see]</code></span>"
+COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION="<span id='jcb-placeholder'><code>[save to see placeholder]</code></span><br />You can also pass values to this code like this: <span id='jcb-placeholder-arg'><code>[save to see placeholder trick]</code></span> <br />Those values will be replace placeholders called args. These placeholders are zero based and should look like this: [[[arg0]]], [[[arge1]]] ... as many as you like. If you use 5 args in your code, you must always pass 5 values, since they are zero based your fifth arg will look like this [[[arg4]]]<br />Please note that you can not use this placeholder in other custom code views, but in all other custom code areas in JCB found in other views like the admin, site and custom admin views.<br />Another important note, all code with args will not be reversed updated from the changes in the editor out side of JCB at this time, since that will remove all the arg placeholders this means you will only be able to update the code here in the JCB UI. <br />This note will change once we have resolved these limitations."
-COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL="Use This Place Holder"
+COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL="You can use this code in any JCB code area, simply add this PlaceHolder."
+COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION="<div class='span6'><h1>Understand how the placeholders work</h1><h2>Comment Type PHP/JS</h2>
+<p>New Insert Code = <code>/***[INSERT&lt;&gt;$$$$]***/</code> &lt;YOUR CODE HERE&gt; <code>/***[/INSERT&lt;&gt;$$$$]***/</code>
+<br />New Replace Codec= <code>/***[REPLACE&lt;&gt;$$$$]***/</code> &lt;YOUR CODE HERE&gt; <code>/***[/REPLACE&lt;&gt;$$$$]***/</code></p>
+<h3>When JCB adds it back</h3>
+<p>JCB Add Inserted Code = <code>/***[INSERTED$$$$]***//*<span class='placeholder-key-id'>x</span>*/</code> &lt;YOUR CODE HERE&gt; <code>/***[/INSERTED$$$$]***/</code>
+<br />JCB Add Replaced Code = <code>/***[REPLACED$$$$]***//*<span class='placeholder-key-id'>x</span>*/</code> &lt;YOUR CODE HERE&gt; <code>/***[/REPLACED$$$$]***/</code></p>
+<h3>To changing existing custom code</h3>
+<p>Update Inserted Code = <code>/***[INSERTED&lt;&gt;$$$$]***//*<span class='placeholder-key-id'>x</span>*/</code> &lt;YOUR CODE HERE&gt; <code>/***[/INSERTED&lt;&gt;$$$$]***/</code>
+<br />Update Replaced Code = <code>/***[REPLACED&lt;&gt;$$$$]***//*<span class='placeholder-key-id'>x</span>*/</code> &lt;YOUR CODE HERE&gt; <code>/***[/REPLACED&lt;&gt;$$$$]***/</code></p>
+<h2>Comment Type HTML</h2>
+<p>New Insert Code = <code>&lt;!--[INSERT&lt;&gt;$$$$]--&gt;</code> &lt;YOUR CODE HERE&gt; <code>&lt;!--[/INSERT&lt;&gt;$$$$]--&gt;</code>
+<br />New Replace Code = <code>&lt;!--[REPLACE&lt;&gt;$$$$]--&gt;</code> &lt;YOUR CODE HERE&gt; <code>&lt;!--[/REPLACE&lt;&gt;$$$$]--&gt;</code></p>
+<h3>When JCB adds it back</h3>
+<p>JCB Add Inserted Code = <code>&lt;!--[INSERTED$$$$]--&gt;&lt;!--<span class='placeholder-key-id'>x</span>--&gt;</code> &lt;YOUR CODE HERE&gt; <code>&lt;!--[/INSERTED$$$$]--&gt;</code>
+<br />JCB Add Replaced Code = <code>&lt;!--[REPLACED$$$$]--&gt;&lt;!--<span class='placeholder-key-id'>x</span>--&gt;</code> &lt;YOUR CODE HERE&gt; <code>&lt;!--[/REPLACED$$$$]--&gt;</code></p>
+<h3>To changing existing custom code</h3>
+<p>Update Inserted Code = <code>&lt;!--[INSERTED&lt;&gt;$$$$]--&gt;&lt;!--<span class='placeholder-key-id'>x</span>--&gt;</code> &lt;YOUR CODE HERE&gt; <code>&lt;!--[/INSERTED&lt;&gt;$$$$]--&gt;</code>
+<br />Update Replaced Code = <code>&lt;!--[REPLACED&lt;&gt;$$$$]--&gt;&lt;!--<span class='placeholder-key-id'>x</span>--&gt;</code> &lt;YOUR CODE HERE&gt; <code>&lt;!--[/REPLACED&lt;&gt;$$$$]--&gt;</code></p>
+<p><span class='placeholder-key-id'>x</span> is the ID of the code in the system don&apos;t change it when you edit the code in your IDE outside of JCB!</p></div><div class='span6' id='usedin'></div>"
+COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_LABEL="Information Area."
 COM_COMPONENTBUILDER_CUSTOM_CODE_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_CUSTOM_CODE_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_CUSTOM_CODE_PATH="Path"
@@ -1946,10 +1977,15 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_DESCRIPTION="File path of where this code
 COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_HINT="File Path Here"
 COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_LABEL="File Path"
 COM_COMPONENTBUILDER_CUSTOM_CODE_PERMISSION="Permissions"
+COM_COMPONENTBUILDER_CUSTOM_CODE_PHPJS="PHP/JS"
 COM_COMPONENTBUILDER_CUSTOM_CODE_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_CUSTOM_CODE_REPLACEMENT="Replacement"
 COM_COMPONENTBUILDER_CUSTOM_CODE_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Custom Code to customise the alias."
 COM_COMPONENTBUILDER_CUSTOM_CODE_STATUS="Status"
+COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME="System Name"
+COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_DESCRIPTION="Used only in the system."
+COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_HINT="The System Name Here"
+COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_LABEL="System Name"
 COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET="Target"
 COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_DESCRIPTION="Set the way this code will be added to the component.<br />Hash automation means it is added using the hash target of the lines surrounding the code.<br />JCB manual means you add a place-holder in Component Builder User Interface area in one of the custom code blocks manually, and this code is added in at those place holders in any component."
 COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL="Target"
@@ -1991,6 +2027,7 @@ COM_COMPONENTBUILDER_DASHBOARD_SNIPPET_ADD="Add&nbsp;Snippet<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_TEMPLATES="Templates<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_TEMPLATE_ADD="Add&nbsp;Template<br /><br />"
 COM_COMPONENTBUILDER_DATE="Date"
+COM_COMPONENTBUILDER_DEBUG_LINE_NUMBERS="Debug (line numbers)"
 COM_COMPONENTBUILDER_DYNAMIC_GET="Dynamic Get"
 COM_COMPONENTBUILDER_DYNAMIC_GETS="Dynamic Gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS="Dynamic Gets Access"
@@ -2591,6 +2628,8 @@ COM_COMPONENTBUILDER_FIELD_XML_HINT="Field XML Go Here"
 COM_COMPONENTBUILDER_FIELD_XML_LABEL="XML field definition (Please set the field details here to fit your needs)"
 COM_COMPONENTBUILDER_FIELD_YES="Yes"
 COM_COMPONENTBUILDER_FIELD_ZERO="0"
+COM_COMPONENTBUILDER_GLOBAL="Global"
+COM_COMPONENTBUILDER_GREAT_THIS_FUNCTION_NAME_WILL_WORK="Great, this function name will work!"
 COM_COMPONENTBUILDER_HELP_DOCUMENT="Help Document"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS="Help Documents"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_ACCESS="Help Documents Access"
@@ -2856,6 +2895,7 @@ COM_COMPONENTBUILDER_LAYOUT_YES="Yes"
 COM_COMPONENTBUILDER_LICENSE="License"
 COM_COMPONENTBUILDER_NEW="New"
 COM_COMPONENTBUILDER_NEW_ISSUE="New Issue"
+COM_COMPONENTBUILDER_NO="No"
 COM_COMPONENTBUILDER_NO_ACCESS_GRANTED="No Access Granted!"
 COM_COMPONENTBUILDER_OPENED_BY="opened by"
 COM_COMPONENTBUILDER_PLEASE_CHECK_AGAIN_LATTER="Please check again latter."
@@ -2863,6 +2903,10 @@ COM_COMPONENTBUILDER_RESPOND_TO_THIS_ISSUE_ON_GITHUB="Respond to this issue on G
 COM_COMPONENTBUILDER_REVIEW_THIS_ISSUE_ON_GITHUB="Review this issue on Github"
 COM_COMPONENTBUILDER_SAVE_SUCCESS="Great! Item successfully saved."
 COM_COMPONENTBUILDER_SAVE_WARNING="The value already existed so please select another."
+COM_COMPONENTBUILDER_SELECT_THE_COMPONENT_TO_COMPILE="Select the component to compile"
+COM_COMPONENTBUILDER_SHOULD_JCB_INSERT_THE_CUSTOM_CODE_PLACEHOLDERS_THIS_IS_ONLY_APPLICABLE_IF_THIS_COMPONENT_HAS_CUSTOM_CODE="Should JCB insert the custom code placeholders? This is only applicable if this component has custom code."
+COM_COMPONENTBUILDER_SHOULD_THE_COMPONENT_BE_MOVED_TO_YOUR_LOCAL_GIT_FOLDER="Should the component be moved to your local git folder?"
+COM_COMPONENTBUILDER_SHOULD_THE_ZIPPED_PACKAGE_OF_THE_COMPONENT_BE_MOVED_TO_THE_LOCAL_BACKUP_AND_REMOTE_SALES_SERVER_THIS_IS_ONLY_APPLICABLE_IF_THIS_COMPONENT_HAS_THOSE_VALUES_SET="Should the zipped package of the component be moved to the local backup and remote sales server? This is only applicable if this component has those values set."
 COM_COMPONENTBUILDER_SITE_VIEW="Site View"
 COM_COMPONENTBUILDER_SITE_VIEWS="Site Views"
 COM_COMPONENTBUILDER_SITE_VIEWS_ACCESS="Site Views Access"
@@ -3395,6 +3439,7 @@ COM_COMPONENTBUILDER_SNIPPET_USAGE_HINT="Add Usage Here"
 COM_COMPONENTBUILDER_SNIPPET_USAGE_LABEL="Usage"
 COM_COMPONENTBUILDER_SNIPPET_VERSION_DESC="A count of the number of times this Snippet has been revised."
 COM_COMPONENTBUILDER_SNIPPET_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_SORRY_THIS_FUNCTION_NAME_IS_ALREADY_IN_USE="Sorry this function name is already in use!"
 COM_COMPONENTBUILDER_SUBMENU_ADMIN_VIEWS="Admin Views"
 COM_COMPONENTBUILDER_SUBMENU_COMPILER="Compiler"
 COM_COMPONENTBUILDER_SUBMENU_COMPONENTS="Components"
@@ -3520,3 +3565,5 @@ COM_COMPONENTBUILDER_USE_BATCH_DESC=" Allows users in this group to use batch co
 COM_COMPONENTBUILDER_VERSION="Version"
 COM_COMPONENTBUILDER_VIEW_MORE_ISSUES_ON_GITHUB="View more issues on Github"
 COM_COMPONENTBUILDER_WEBSITE="Website"
+COM_COMPONENTBUILDER_YES="Yes"
+COM_COMPONENTBUILDER__SELECT_COMPONENT_="- Select Component -"

admin/layouts/admin_view/css_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php

admin/layouts/admin_view/custom_buttons_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php

admin/layouts/admin_view/custom_buttons_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php

admin/layouts/admin_view/custom_import_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php

admin/layouts/admin_view/fields_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php

admin/layouts/admin_view/javascript_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php

admin/layouts/admin_view/linked_components_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php

admin/layouts/admin_view/mysql_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php

admin/layouts/admin_view/mysql_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php

admin/layouts/admin_view/php_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php

admin/layouts/admin_view/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/admin_view/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/admin_view/settings_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php

admin/layouts/admin_view/settings_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/admin_view/settings_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/admin_view/settings_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php

admin/layouts/batchselection.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php

admin/layouts/component/admin_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views_fullwidth.php

admin/layouts/component/custom_admin_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views_fullwidth.php

admin/layouts/component/details_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/component/details_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/component/details_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/component/details_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/component/dynamic_build_beta_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_build_beta_fullwidth.php

admin/layouts/component/dynamic_integration_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_integration_fullwidth.php

admin/layouts/component/libs_helpers_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		libs_helpers_fullwidth.php

admin/layouts/component/mysql_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php

admin/layouts/component/php_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php

admin/layouts/component/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/component/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/component/readme_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_left.php

admin/layouts/component/readme_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_right.php

admin/layouts/component/settings_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/component/settings_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/component/site_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views_fullwidth.php

admin/layouts/custom_admin_view/custom_buttons_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php

admin/layouts/custom_admin_view/custom_buttons_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php

admin/layouts/custom_admin_view/custom_script_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php

admin/layouts/custom_admin_view/details_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/custom_admin_view/details_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php

admin/layouts/custom_admin_view/details_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/custom_admin_view/details_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/custom_admin_view/details_rightside.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_rightside.php

admin/layouts/custom_admin_view/details_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/custom_admin_view/linked_components_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php

admin/layouts/custom_admin_view/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/custom_admin_view/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/custom_code/details_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
@@ -30,7 +30,9 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();
 
 $fields = array(
-	'target'
+	'target',
+	'system_name',
+	'function_name'
 );
 
 ?>

admin/layouts/custom_code/details_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
@@ -31,7 +31,9 @@ $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
 	'path',
-	'code'
+	'note_jcb_placeholder',
+	'code',
+	'note_placeholders_explained'
 );
 
 ?>

admin/layouts/custom_code/details_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
@@ -30,10 +30,10 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
+	'comment_type',
 	'component',
 	'type',
-	'hashtarget',
+	'hashtarget'
-	'note_jcb_placeholder'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();

admin/layouts/custom_code/details_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/custom_code/details_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/custom_code/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/custom_code/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/dynamic_get/abacus_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		abacus_fullwidth.php

admin/layouts/dynamic_get/abacus_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		abacus_left.php

admin/layouts/dynamic_get/custom_script_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php

admin/layouts/dynamic_get/gettable_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_above.php

admin/layouts/dynamic_get/gettable_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_fullwidth.php

admin/layouts/dynamic_get/gettable_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_left.php

admin/layouts/dynamic_get/gettable_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.3.1
+	@version		2.3.4
-	@build			9th February, 2017
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_right.php