Added the overide option to the linked admin views. Added the option to remove line breaks in all langguage strings. Increased the field size to MEDIUMTEXT for the default input in joomla_module custom_admin_view and site_view.

2020-08-19 02:54:09 +02:00 · 2020-08-19 02:54:09 +02:00 · d062e03a04
parent c32baff933
commit d062e03a04
13 changed files with 303 additions and 187 deletions
--- a/README.md
+++ b/README.md
@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo

 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!

-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.11.4) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.11.6) with **ALL** its features and **ALL** concepts totally open-source and free! 

 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)

@ -144,13 +144,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 13th August, 2020
-+ *Version*: 2.11.4
+ *Last Build*: 19th August, 2020
+ *Version*: 2.11.6
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **283086**
-+ *Field count*: **1527**
-+ *File count*: **1785**
+ *Line count*: **283148**
+ *Field count*: **1528**
+ *File count*: **1787**
 + *Folder count*: **295**

 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
--- a/admin/README.txt
+++ b/admin/README.txt
@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo

 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!

-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.11.4) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.11.6) with **ALL** its features and **ALL** concepts totally open-source and free! 

 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)

@ -144,13 +144,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 13th August, 2020
-+ *Version*: 2.11.4
+ *Last Build*: 19th August, 2020
+ *Version*: 2.11.6
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **283086**
-+ *Field count*: **1527**
-+ *File count*: **1785**
+ *Line count*: **283148**
+ *Field count*: **1528**
+ *File count*: **1787**
 + *Folder count*: **295**

 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@ -102,6 +102,13 @@ class Get
 	 */
 	public $addPlaceholders = false;

+	/**
+	 * Switch to remove line breaks from language strings
+	 *
+	 * @var     bool
+	 */
+	public $removeLineBreaks = false;
+
 	/**
 	 * The placeholders for custom code keys
 	 *
@ -814,6 +821,8 @@ class Get
 	{
 		if (isset($config) && count($config))
 		{
+			// we do not yet have this set as an option
+			$config['remove_line_breaks'] = 2; // 2 is global (use the components value)
 			// load application
 			$this->app = JFactory::getApplication();
 			// Set the params
@ -891,6 +900,14 @@ class Get
 				// set component context
 				$this->componentContext = $this->componentCodeName . '.'
 					. $this->componentID;
+				// set if language strings line breaks should be removed
+				$global                = ((int) ComponentbuilderHelper::getVar(
+						'joomla_component', $this->componentID, 'id',
+						'remove_line_breaks'
+					) == 1) ? true : false;
+				$this->removeLineBreaks = ((int) $config['remove_line_breaks'] == 0)
+					? false
+					: (((int) $config['remove_line_breaks'] == 1) ? true : $global);
 				// set if placeholders should be added to customcode
 				$global                = ((int) ComponentbuilderHelper::getVar(
 						'joomla_component', $this->componentID, 'id',
@ -2059,14 +2076,31 @@ class Get
 			))
 		{
 			$this->langContent[$target][$this->langPrefix . '_' . $language]
-				= trim($string);
+				= $this->fixLangString($string);
 		}
 		elseif (!isset($this->langContent[$target][$language]))
 		{
-			$this->langContent[$target][$language] = trim($string);
+			$this->langContent[$target][$language] = $this->fixLangString($string);
 		}
 	}

+	/**
+	 * We need to remove all text breaks from all language strings
+	 *
+	 * @param   string   $string     The language string
+	 *
+	 * @return  string
+	 *
+	 */
+	public function fixLangString(&$string)
+	{
+		if ($this->removeLineBreaks)
+		{
+			return trim(str_replace(array(PHP_EOL, "\r", "\n"), '', $string));
+		}
+		return trim($string);
+	}
+
 	/**
 	 * Get all Admin View Data
 	 *
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@ -13454,63 +13454,81 @@ class Interpretation extends Fields
 					$counter++;
 				}
 			}
-			$counter    = $counter + 2;
 			$data_value = (3 == $this->footableVersion) ? 'data-sort-value'
-				: 'data-value';
+					: 'data-value';
+
 			// add the defaults
-			$body .= PHP_EOL . $this->_t(2)
-				. "<?php if (\$item->published == 1):?>";
-			$body .= PHP_EOL . $this->_t(3) . '<td class="center"  '
-				. $data_value . '="1">';
-			$body .= PHP_EOL . $this->_t(4)
-				. '<span class="status-metro status-published" title="<?php echo JText:'
-				. ':_(' . "'" . $this->langPrefix . "_PUBLISHED'" . ');  ?>">';
-			$body .= PHP_EOL . $this->_t(5) . '<?php echo JText:' . ':_(' . "'"
-				. $this->langPrefix . "_PUBLISHED'" . '); ?>';
-			$body .= PHP_EOL . $this->_t(4) . '</span>';
-			$body .= PHP_EOL . $this->_t(3) . '</td>';
+			if (!isset($this->fieldsNames[$viewName_single]['published']))
+			{
+				$counter++;
+				// add the defaults
+				$body .= PHP_EOL . $this->_t(2)
+					. "<?php if (\$item->published == 1):?>";
+				$body .= PHP_EOL . $this->_t(3) . '<td class="center"  '
+					. $data_value . '="1">';
+				$body .= PHP_EOL . $this->_t(4)
+					. '<span class="status-metro status-published" title="<?php echo JText:'
+					. ':_(' . "'" . $this->langPrefix . "_PUBLISHED'"
+					. ');  ?>">';
+				$body .= PHP_EOL . $this->_t(5) . '<?php echo JText:' . ':_('
+					. "'"
+					. $this->langPrefix . "_PUBLISHED'" . '); ?>';
+				$body .= PHP_EOL . $this->_t(4) . '</span>';
+				$body .= PHP_EOL . $this->_t(3) . '</td>';

-			$body .= PHP_EOL . $this->_t(2)
-				. "<?php elseif (\$item->published == 0):?>";
-			$body .= PHP_EOL . $this->_t(3) . '<td class="center"  '
-				. $data_value . '="2">';
-			$body .= PHP_EOL . $this->_t(4)
-				. '<span class="status-metro status-inactive" title="<?php echo JText:'
-				. ':_(' . "'" . $this->langPrefix . "_INACTIVE'" . ');  ?>">';
-			$body .= PHP_EOL . $this->_t(5) . '<?php echo JText:' . ':_(' . "'"
-				. $this->langPrefix . "_INACTIVE'" . '); ?>';
-			$body .= PHP_EOL . $this->_t(4) . '</span>';
-			$body .= PHP_EOL . $this->_t(3) . '</td>';
+				$body .= PHP_EOL . $this->_t(2)
+					. "<?php elseif (\$item->published == 0):?>";
+				$body .= PHP_EOL . $this->_t(3) . '<td class="center"  '
+					. $data_value . '="2">';
+				$body .= PHP_EOL . $this->_t(4)
+					. '<span class="status-metro status-inactive" title="<?php echo JText:'
+					. ':_(' . "'" . $this->langPrefix . "_INACTIVE'"
+					. ');  ?>">';
+				$body .= PHP_EOL . $this->_t(5) . '<?php echo JText:' . ':_('
+					. "'"
+					. $this->langPrefix . "_INACTIVE'" . '); ?>';
+				$body .= PHP_EOL . $this->_t(4) . '</span>';
+				$body .= PHP_EOL . $this->_t(3) . '</td>';

-			$body .= PHP_EOL . $this->_t(2)
-				. "<?php elseif (\$item->published == 2):?>";
-			$body .= PHP_EOL . $this->_t(3) . '<td class="center"  '
-				. $data_value . '="3">';
-			$body .= PHP_EOL . $this->_t(4)
-				. '<span class="status-metro status-archived" title="<?php echo JText:'
-				. ':_(' . "'" . $this->langPrefix . "_ARCHIVED'" . ');  ?>">';
-			$body .= PHP_EOL . $this->_t(5) . '<?php echo JText:' . ':_(' . "'"
-				. $this->langPrefix . "_ARCHIVED'" . '); ?>';
-			$body .= PHP_EOL . $this->_t(4) . '</span>';
-			$body .= PHP_EOL . $this->_t(3) . '</td>';
+				$body .= PHP_EOL . $this->_t(2)
+					. "<?php elseif (\$item->published == 2):?>";
+				$body .= PHP_EOL . $this->_t(3) . '<td class="center"  '
+					. $data_value . '="3">';
+				$body .= PHP_EOL . $this->_t(4)
+					. '<span class="status-metro status-archived" title="<?php echo JText:'
+					. ':_(' . "'" . $this->langPrefix . "_ARCHIVED'"
+					. ');  ?>">';
+				$body .= PHP_EOL . $this->_t(5) . '<?php echo JText:' . ':_('
+					. "'"
+					. $this->langPrefix . "_ARCHIVED'" . '); ?>';
+				$body .= PHP_EOL . $this->_t(4) . '</span>';
+				$body .= PHP_EOL . $this->_t(3) . '</td>';

-			$body .= PHP_EOL . $this->_t(2)
-				. "<?php elseif (\$item->published == -2):?>";
-			$body .= PHP_EOL . $this->_t(3) . '<td class="center"  '
-				. $data_value . '="4">';
-			$body .= PHP_EOL . $this->_t(4)
-				. '<span class="status-metro status-trashed" title="<?php echo JText:'
-				. ':_(' . "'" . $this->langPrefix . "_TRASHED'" . ');  ?>">';
-			$body .= PHP_EOL . $this->_t(5) . '<?php echo JText:' . ':_(' . "'"
-				. $this->langPrefix . "_TRASHED'" . '); ?>';
-			$body .= PHP_EOL . $this->_t(4) . '</span>';
-			$body .= PHP_EOL . $this->_t(3) . '</td>';
-			$body .= PHP_EOL . $this->_t(2) . '<?php endif; ?>';
+				$body .= PHP_EOL . $this->_t(2)
+					. "<?php elseif (\$item->published == -2):?>";
+				$body .= PHP_EOL . $this->_t(3) . '<td class="center"  '
+					. $data_value . '="4">';
+				$body .= PHP_EOL . $this->_t(4)
+					. '<span class="status-metro status-trashed" title="<?php echo JText:'
+					. ':_(' . "'" . $this->langPrefix . "_TRASHED'"
+					. ');  ?>">';
+				$body .= PHP_EOL . $this->_t(5) . '<?php echo JText:' . ':_('
+					. "'"
+					. $this->langPrefix . "_TRASHED'" . '); ?>';
+				$body .= PHP_EOL . $this->_t(4) . '</span>';
+				$body .= PHP_EOL . $this->_t(3) . '</td>';
+				$body .= PHP_EOL . $this->_t(2) . '<?php endif; ?>';
+			}

-			$body .= PHP_EOL . $this->_t(2)
-				. '<td class="nowrap center hidden-phone">';
-			$body .= PHP_EOL . $this->_t(3) . "<?php echo \$item->id; ?>";
-			$body .= PHP_EOL . $this->_t(2) . "</td>";
+			// add the defaults
+			if (!isset($this->fieldsNames[$viewName_single]['id']))
+			{
+				$counter++;
+				$body .= PHP_EOL . $this->_t(2)
+					. '<td class="nowrap center hidden-phone">';
+				$body .= PHP_EOL . $this->_t(3) . "<?php echo \$item->id; ?>";
+				$body .= PHP_EOL . $this->_t(2) . "</td>";
+			}
 			$body .= PHP_EOL . $this->_t(1) . "</tr>";
 			$body .= PHP_EOL . "<?php endforeach; ?>";
 			$body .= PHP_EOL . "</tbody>";
@ -13714,17 +13732,25 @@ class Interpretation extends Fields
 				? 'data-hide="phone,tablet"' : 'data-breakpoints="xs sm md"';
 			$data_type = (2 == $this->footableVersion) ? 'data-type="numeric"'
 				: 'data-type="number"';
-			// set default
-			$head .= PHP_EOL . $this->_t(2) . '<th width="10" ' . $data_hide
-				. '>';
-			$head .= PHP_EOL . $this->_t(3) . "<?php echo JText:" . ":_('"
-				. $statusLangName . "'); ?>";
-			$head .= PHP_EOL . $this->_t(2) . "</th>";
-			$head .= PHP_EOL . $this->_t(2) . '<th width="5" ' . $data_type
-				. ' ' . $data_hide . '>';
-			$head .= PHP_EOL . $this->_t(3) . "<?php echo JText:" . ":_('"
-				. $idLangName . "'); ?>";
-			$head .= PHP_EOL . $this->_t(2) . "</th>";
+			// add the defaults
+			if (!isset($this->fieldsNames[$viewName_single]['published']))
+			{
+				$head .= PHP_EOL . $this->_t(2) . '<th width="10" ' . $data_hide
+					. '>';
+				$head .= PHP_EOL . $this->_t(3) . "<?php echo JText:" . ":_('"
+					. $statusLangName . "'); ?>";
+				$head .= PHP_EOL . $this->_t(2) . "</th>";
+			}
+
+			// add the defaults
+			if (!isset($this->fieldsNames[$viewName_single]['id']))
+			{
+				$head .= PHP_EOL . $this->_t(2) . '<th width="5" ' . $data_type
+					. ' ' . $data_hide . '>';
+				$head .= PHP_EOL . $this->_t(3) . "<?php echo JText:" . ":_('"
+					. $idLangName . "'); ?>";
+				$head .= PHP_EOL . $this->_t(2) . "</th>";
+			}
 			$head .= PHP_EOL . $this->_t(1) . "</tr>";
 			$head .= PHP_EOL . "</thead>";

--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@ -5947,6 +5947,9 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_LABEL="Global Helper Site E
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README="Readme"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README_LABEL="README.md"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_REMOVE_LINE_BREAKS="Remove Line Breaks"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_REMOVE_LINE_BREAKS_DESCRIPTION="Should we remove all line breaks (&quot;\r&quot;, &quot;\n&quot;) from all language strings in this component."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_REMOVE_LINE_BREAKS_LABEL="Remove line breaks<br /><small>from language strings</small>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS="Joomla Component Run Expansion Button Access"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER="Sales Server"
--- a/admin/layouts/joomla_component/details_left.php
+++ b/admin/layouts/joomla_component/details_left.php
@ -31,13 +31,13 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'component_version',
 	'debug_linenr',
 	'add_placeholders',
+	'remove_line_breaks',
 	'mvc_versiondate',
 	'note_version_options_one',
 	'note_version_options_two',
 	'note_version_options_three',
 	'short_description',
-	'description',
-	'copyright'
+	'description'
 );

 $hiddenFields = $displayData->get('hidden_fields') ?: array();
--- a/admin/layouts/joomla_component/details_right.php
+++ b/admin/layouts/joomla_component/details_right.php
@ -38,7 +38,8 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'whmcs_buy_link',
 	'license',
 	'bom',
-	'image'
+	'image',
+	'copyright'
 );

 $hiddenFields = $displayData->get('hidden_fields') ?: array();
--- a/admin/models/forms/joomla_component.xml
+++ b/admin/models/forms/joomla_component.xml
@ -292,6 +292,21 @@
 			<option value="3">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_ONLY_FIRST_NUMBER_OF_GLOBAL_VERSION_ONEXX</option>
 		</field>
+		<!-- Remove_line_breaks Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="remove_line_breaks"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_REMOVE_LINE_BREAKS_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_REMOVE_LINE_BREAKS_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+		</field>
 		<!-- Add_placeholders Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@ -357,34 +372,6 @@
 			multiple="false"
 			default=""
 		/>
-		<!-- Copyright Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="copyright"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COPYRIGHT_LABEL"
-			rows="7"
-			cols="10"
-			default="Copyright (C) 2015. All Rights Reserved"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COPYRIGHT_DESCRIPTION"
-			class="text_area span12"
-			filter="SAFEHTML"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COPYRIGHT_HINT"
-			required="true"
-		/>
-		<!-- Add_php_postflight_update Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_postflight_update"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_POSTFLIGHT_UPDATE_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
-		</field>
 		<!-- Author Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@ -401,13 +388,14 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_HINT"
 		/>
-		<!-- Addreadme Field. Type: Radio. (joomla) -->
+		<!-- Add_php_postflight_update Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="addreadme"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDREADME_LABEL"
+			name="add_php_postflight_update"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_POSTFLIGHT_UPDATE_LABEL"
 			class="btn-group btn-group-yesno"
-			default="0">
+			default="0"
+			required="true">
 			<!-- Option Set. -->
 			<option value="1">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
@ -429,15 +417,13 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_HINT"
 		/>
-		<!-- Debug_linenr Field. Type: Radio. (joomla) -->
+		<!-- Addreadme Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="debug_linenr"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_DESCRIPTION"
+			name="addreadme"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDREADME_LABEL"
 			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
+			default="0">
 			<!-- Option Set. -->
 			<option value="1">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
@ -460,19 +446,21 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT"
 		/>
-		<!-- Buildcompsql Field. Type: Textarea. (joomla) -->
+		<!-- Debug_linenr Field. Type: Radio. (joomla) -->
 		<field
-			type="textarea"
-			name="buildcompsql"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMPSQL_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMPSQL_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMPSQL_HINT"
-			required="true"
-		/>
+			type="radio"
+			name="debug_linenr"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+		</field>
 		<!-- Add_license Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@ -488,20 +476,19 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
-		<!-- Add_php_helper_both Field. Type: Radio. (joomla) -->
+		<!-- Buildcompsql Field. Type: Textarea. (joomla) -->
 		<field
-			type="radio"
-			name="add_php_helper_both"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_HELPER_BOTH_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
-		</field>
+			type="textarea"
+			name="buildcompsql"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMPSQL_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMPSQL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMPSQL_HINT"
+			required="true"
+		/>
 		<!-- License_type Field. Type: List. (joomla) -->
 		<field
 			type="list"
@ -523,11 +510,11 @@
 			<option value="4">
 				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE</option>
 		</field>
-		<!-- Add_admin_event Field. Type: Radio. (joomla) -->
+		<!-- Add_php_helper_both Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_admin_event"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_ADMIN_EVENT_LABEL"
+			name="add_php_helper_both"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_HELPER_BOTH_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@ -539,11 +526,11 @@
 		</field>
 		<!-- Note_whmcs_lisencing_note Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_whmcs_lisencing_note" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_lisencing_note" />
-		<!-- Add_site_event Field. Type: Radio. (joomla) -->
+		<!-- Add_admin_event Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_site_event"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SITE_EVENT_LABEL"
+			name="add_admin_event"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_ADMIN_EVENT_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@ -566,11 +553,11 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_HINT"
 		/>
-		<!-- Add_css_admin Field. Type: Radio. (joomla) -->
+		<!-- Add_site_event Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_css_admin"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_ADMIN_LABEL"
+			name="add_site_event"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SITE_EVENT_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@ -595,20 +582,19 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_HINT"
 		/>
-		<!-- Dashboard_type Field. Type: Radio. (joomla) -->
+		<!-- Add_css_admin Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="dashboard_type"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_TYPE_LABEL"
-			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_TYPE_DESCRIPTION"
+			name="add_css_admin"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_ADMIN_LABEL"
 			class="btn-group btn-group-yesno"
-			default="1"
+			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEFAULT</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC</option>
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
 		</field>
 		<!-- Whmcs_buy_link Field. Type: Url. (joomla) -->
 		<field
@ -625,19 +611,20 @@
 			message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_MESSAGE"
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_HINT"
 		/>
-		<!-- Add_php_preflight_install Field. Type: Radio. (joomla) -->
+		<!-- Dashboard_type Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_preflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_PREFLIGHT_INSTALL_LABEL"
+			name="dashboard_type"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_TYPE_LABEL"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_TYPE_DESCRIPTION"
 			class="btn-group btn-group-yesno"
-			default="0"
+			default="1"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEFAULT</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC</option>
 		</field>
 		<!-- License Field. Type: Textarea. (joomla) -->
 		<field
@ -653,11 +640,11 @@
 			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LICENSE_HINT"
 			required="true"
 		/>
-		<!-- Add_php_postflight_install Field. Type: Radio. (joomla) -->
+		<!-- Add_php_preflight_install Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_postflight_install"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_POSTFLIGHT_INSTALL_LABEL"
+			name="add_php_preflight_install"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_PREFLIGHT_INSTALL_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@ -679,11 +666,11 @@
 			hide_none="true"
 			hide_default="true"
 		/>
-		<!-- Add_php_method_uninstall Field. Type: Radio. (joomla) -->
+		<!-- Add_php_postflight_install Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_method_uninstall"
-			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_METHOD_UNINSTALL_LABEL"
+			name="add_php_postflight_install"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_POSTFLIGHT_INSTALL_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@ -701,6 +688,34 @@
 			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_DESCRIPTION"
 			directory=""
 		/>
+		<!-- Add_php_method_uninstall Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_method_uninstall"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_METHOD_UNINSTALL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+		</field>
+		<!-- Copyright Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="copyright"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COPYRIGHT_LABEL"
+			rows="7"
+			cols="10"
+			default="Copyright (C) 2015. All Rights Reserved"
+			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COPYRIGHT_DESCRIPTION"
+			class="text_area span12"
+			filter="SAFEHTML"
+			hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COPYRIGHT_HINT"
+			required="true"
+		/>
 		<!-- Add_sql_uninstall Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@ -34,13 +34,13 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				'component_version',
 				'debug_linenr',
 				'add_placeholders',
+				'remove_line_breaks',
 				'mvc_versiondate',
 				'note_version_options_one',
 				'note_version_options_two',
 				'note_version_options_three',
 				'short_description',
-				'description',
-				'copyright'
+				'description'
 			),
 			'right' => array(
 				'companyname',
@ -55,7 +55,8 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				'whmcs_buy_link',
 				'license',
 				'bom',
-				'image'
+				'image',
+				'copyright'
 			),
 			'above' => array(
 				'system_name'
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@ -70,6 +70,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
 	`php_preflight_update` MEDIUMTEXT NOT NULL,
 	`php_site_event` MEDIUMTEXT NOT NULL,
 	`readme` TEXT NOT NULL,
+	`remove_line_breaks` TINYINT(1) NOT NULL DEFAULT 0,
 	`sales_server` INT(11) NOT NULL DEFAULT 0,
 	`short_description` VARCHAR(255) NOT NULL DEFAULT '',
 	`sql` MEDIUMTEXT NOT NULL,
@ -108,6 +109,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
 	KEY `idx_add_php_preflight_update` (`add_php_preflight_update`),
 	KEY `idx_add_css_site` (`add_css_site`),
 	KEY `idx_mvc_versiondate` (`mvc_versiondate`),
+	KEY `idx_remove_line_breaks` (`remove_line_breaks`),
 	KEY `idx_add_placeholders` (`add_placeholders`),
 	KEY `idx_add_php_helper_site` (`add_php_helper_site`),
 	KEY `idx_add_javascript` (`add_javascript`),
@ -115,8 +117,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
 	KEY `idx_addreadme` (`addreadme`),
 	KEY `idx_debug_linenr` (`debug_linenr`),
 	KEY `idx_add_license` (`add_license`),
-	KEY `idx_add_php_helper_both` (`add_php_helper_both`),
 	KEY `idx_license_type` (`license_type`),
+	KEY `idx_add_php_helper_both` (`add_php_helper_both`),
 	KEY `idx_add_admin_event` (`add_admin_event`),
 	KEY `idx_add_site_event` (`add_site_event`),
 	KEY `idx_add_css_admin` (`add_css_admin`),
@ -162,7 +164,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module` (
 	`class_helper_code` MEDIUMTEXT NOT NULL,
 	`class_helper_header` TEXT NOT NULL,
 	`custom_get` TEXT NOT NULL,
-	`default` TEXT NOT NULL,
+	`default` MEDIUMTEXT NOT NULL,
 	`description` TEXT NOT NULL,
 	`fields` TEXT NOT NULL,
 	`guid` VARCHAR(36) NOT NULL DEFAULT '',
@ -476,7 +478,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
 	`css_document` TEXT NOT NULL,
 	`custom_button` TEXT NOT NULL,
 	`custom_get` TEXT NOT NULL,
-	`default` TEXT NOT NULL,
+	`default` MEDIUMTEXT NOT NULL,
 	`description` VARCHAR(255) NOT NULL DEFAULT '',
 	`dynamic_get` INT(11) NOT NULL DEFAULT 0,
 	`guid` VARCHAR(36) NOT NULL DEFAULT '',
@ -552,7 +554,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
 	`css_document` TEXT NOT NULL,
 	`custom_button` TEXT NOT NULL,
 	`custom_get` TEXT NOT NULL,
-	`default` TEXT NOT NULL,
+	`default` MEDIUMTEXT NOT NULL,
 	`description` VARCHAR(255) NOT NULL DEFAULT '',
 	`dynamic_get` INT(11) NOT NULL DEFAULT 0,
 	`guid` VARCHAR(36) NOT NULL DEFAULT '',
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>13th August, 2020</creationDate>
+	<creationDate>19th August, 2020</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
 	<copyright>Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.11.4</version>
+	<version>2.11.6</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.11.4)</h1>
+		<h1>Component Builder (v.2.11.6)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.

--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@ -968,4 +968,38 @@
 		<maintainerurl>http://www.joomlacomponentbuilder.com</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.11.5</version>
+		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.11.6/JCB_v2.11.6.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://www.joomlacomponentbuilder.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.11.6</version>
+		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.11.6/JCB_v2.11.6.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://www.joomlacomponentbuilder.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>
--- a/script.php
+++ b/script.php
@ -6003,9 +6003,9 @@ class com_componentbuilderInstallerScript
 			$joomla_component->type_title = 'Componentbuilder Joomla_component';
 			$joomla_component->type_alias = 'com_componentbuilder.joomla_component';
 			$joomla_component->table = '{"special": {"dbtable": "#__componentbuilder_joomla_component","key": "id","type": "Joomla_component","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_helper_both","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","short_description":"short_description","companyname":"companyname","add_php_helper_admin":"add_php_helper_admin","addfootable":"addfootable","crowdin_username":"crowdin_username","update_server_url":"update_server_url","add_sql":"add_sql","add_php_preflight_update":"add_php_preflight_update","add_css_site":"add_css_site","mvc_versiondate":"mvc_versiondate","add_placeholders":"add_placeholders","add_php_helper_site":"add_php_helper_site","add_javascript":"add_javascript","description":"description","dashboard":"dashboard","copyright":"copyright","add_php_postflight_update":"add_php_postflight_update","author":"author","addreadme":"addreadme","email":"email","debug_linenr":"debug_linenr","website":"website","buildcompsql":"buildcompsql","add_license":"add_license","add_php_helper_both":"add_php_helper_both","license_type":"license_type","add_admin_event":"add_admin_event","add_site_event":"add_site_event","whmcs_key":"whmcs_key","add_css_admin":"add_css_admin","whmcs_url":"whmcs_url","dashboard_type":"dashboard_type","whmcs_buy_link":"whmcs_buy_link","add_php_preflight_install":"add_php_preflight_install","license":"license","add_php_postflight_install":"add_php_postflight_install","bom":"bom","add_php_method_uninstall":"add_php_method_uninstall","image":"image","add_sql_uninstall":"add_sql_uninstall","translation_tool":"translation_tool","component_version":"component_version","add_sales_server":"add_sales_server","not_required":"not_required","crowdin_project_identifier":"crowdin_project_identifier","add_email_helper":"add_email_helper","php_helper_both":"php_helper_both","php_helper_admin":"php_helper_admin","php_admin_event":"php_admin_event","php_helper_site":"php_helper_site","php_site_event":"php_site_event","add_menu_prefix":"add_menu_prefix","javascript":"javascript","menu_prefix":"menu_prefix","css_admin":"css_admin","css_site":"css_site","toignore":"toignore","php_preflight_install":"php_preflight_install","php_preflight_update":"php_preflight_update","export_key":"export_key","php_postflight_install":"php_postflight_install","joomla_source_link":"joomla_source_link","php_postflight_update":"php_postflight_update","export_buy_link":"export_buy_link","php_method_uninstall":"php_method_uninstall","sql":"sql","sql_uninstall":"sql_uninstall","readme":"readme","emptycontributors":"emptycontributors","add_update_server":"add_update_server","number":"number","update_server_target":"update_server_target","update_server":"update_server","sales_server":"sales_server","crowdin_project_api_key":"crowdin_project_api_key","crowdin_account_api_key":"crowdin_account_api_key","creatuserhelper":"creatuserhelper","buildcomp":"buildcomp","adduikit":"adduikit","guid":"guid","name":"name"}}';
+			$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_helper_both","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","short_description":"short_description","companyname":"companyname","add_php_helper_admin":"add_php_helper_admin","addfootable":"addfootable","crowdin_username":"crowdin_username","update_server_url":"update_server_url","add_sql":"add_sql","add_php_preflight_update":"add_php_preflight_update","add_css_site":"add_css_site","mvc_versiondate":"mvc_versiondate","remove_line_breaks":"remove_line_breaks","add_placeholders":"add_placeholders","add_php_helper_site":"add_php_helper_site","add_javascript":"add_javascript","description":"description","dashboard":"dashboard","author":"author","add_php_postflight_update":"add_php_postflight_update","email":"email","addreadme":"addreadme","website":"website","debug_linenr":"debug_linenr","add_license":"add_license","buildcompsql":"buildcompsql","license_type":"license_type","add_php_helper_both":"add_php_helper_both","add_admin_event":"add_admin_event","whmcs_key":"whmcs_key","add_site_event":"add_site_event","whmcs_url":"whmcs_url","add_css_admin":"add_css_admin","whmcs_buy_link":"whmcs_buy_link","dashboard_type":"dashboard_type","license":"license","add_php_preflight_install":"add_php_preflight_install","bom":"bom","add_php_postflight_install":"add_php_postflight_install","image":"image","add_php_method_uninstall":"add_php_method_uninstall","copyright":"copyright","add_sql_uninstall":"add_sql_uninstall","translation_tool":"translation_tool","component_version":"component_version","add_sales_server":"add_sales_server","not_required":"not_required","crowdin_project_identifier":"crowdin_project_identifier","add_email_helper":"add_email_helper","php_helper_both":"php_helper_both","php_helper_admin":"php_helper_admin","php_admin_event":"php_admin_event","php_helper_site":"php_helper_site","php_site_event":"php_site_event","add_menu_prefix":"add_menu_prefix","javascript":"javascript","menu_prefix":"menu_prefix","css_admin":"css_admin","css_site":"css_site","toignore":"toignore","php_preflight_install":"php_preflight_install","php_preflight_update":"php_preflight_update","export_key":"export_key","php_postflight_install":"php_postflight_install","joomla_source_link":"joomla_source_link","php_postflight_update":"php_postflight_update","export_buy_link":"export_buy_link","php_method_uninstall":"php_method_uninstall","sql":"sql","sql_uninstall":"sql_uninstall","readme":"readme","emptycontributors":"emptycontributors","add_update_server":"add_update_server","number":"number","update_server_target":"update_server_target","update_server":"update_server","sales_server":"sales_server","crowdin_project_api_key":"crowdin_project_api_key","crowdin_account_api_key":"crowdin_account_api_key","creatuserhelper":"creatuserhelper","buildcomp":"buildcomp","adduikit":"adduikit","guid":"guid","name":"name"}}';
 			$joomla_component->router = 'ComponentbuilderHelperRoute::getJoomla_componentRoute';
-			$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_helper_admin","addfootable","add_sql","add_php_preflight_update","add_css_site","mvc_versiondate","add_placeholders","add_php_helper_site","add_javascript","add_php_postflight_update","addreadme","debug_linenr","add_license","add_php_helper_both","license_type","add_admin_event","add_site_event","add_css_admin","dashboard_type","add_php_preflight_install","add_php_postflight_install","add_php_method_uninstall","add_sql_uninstall","translation_tool","add_sales_server","add_email_helper","emptycontributors","add_update_server","number","update_server_target","update_server","sales_server","creatuserhelper","buildcomp","adduikit"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"}]}';
+			$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_helper_admin","addfootable","add_sql","add_php_preflight_update","add_css_site","mvc_versiondate","remove_line_breaks","add_placeholders","add_php_helper_site","add_javascript","add_php_postflight_update","addreadme","debug_linenr","add_license","license_type","add_php_helper_both","add_admin_event","add_site_event","add_css_admin","dashboard_type","add_php_preflight_install","add_php_postflight_install","add_php_method_uninstall","add_sql_uninstall","translation_tool","add_sales_server","add_email_helper","emptycontributors","add_update_server","number","update_server_target","update_server","sales_server","creatuserhelper","buildcomp","adduikit"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"}]}';

 			// Set the object into the content types table.
 			$joomla_component_Inserted = $db->insertObject('#__content_types', $joomla_component);
@ -7428,9 +7428,9 @@ class com_componentbuilderInstallerScript
 			$joomla_component->type_title = 'Componentbuilder Joomla_component';
 			$joomla_component->type_alias = 'com_componentbuilder.joomla_component';
 			$joomla_component->table = '{"special": {"dbtable": "#__componentbuilder_joomla_component","key": "id","type": "Joomla_component","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_helper_both","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","short_description":"short_description","companyname":"companyname","add_php_helper_admin":"add_php_helper_admin","addfootable":"addfootable","crowdin_username":"crowdin_username","update_server_url":"update_server_url","add_sql":"add_sql","add_php_preflight_update":"add_php_preflight_update","add_css_site":"add_css_site","mvc_versiondate":"mvc_versiondate","add_placeholders":"add_placeholders","add_php_helper_site":"add_php_helper_site","add_javascript":"add_javascript","description":"description","dashboard":"dashboard","copyright":"copyright","add_php_postflight_update":"add_php_postflight_update","author":"author","addreadme":"addreadme","email":"email","debug_linenr":"debug_linenr","website":"website","buildcompsql":"buildcompsql","add_license":"add_license","add_php_helper_both":"add_php_helper_both","license_type":"license_type","add_admin_event":"add_admin_event","add_site_event":"add_site_event","whmcs_key":"whmcs_key","add_css_admin":"add_css_admin","whmcs_url":"whmcs_url","dashboard_type":"dashboard_type","whmcs_buy_link":"whmcs_buy_link","add_php_preflight_install":"add_php_preflight_install","license":"license","add_php_postflight_install":"add_php_postflight_install","bom":"bom","add_php_method_uninstall":"add_php_method_uninstall","image":"image","add_sql_uninstall":"add_sql_uninstall","translation_tool":"translation_tool","component_version":"component_version","add_sales_server":"add_sales_server","not_required":"not_required","crowdin_project_identifier":"crowdin_project_identifier","add_email_helper":"add_email_helper","php_helper_both":"php_helper_both","php_helper_admin":"php_helper_admin","php_admin_event":"php_admin_event","php_helper_site":"php_helper_site","php_site_event":"php_site_event","add_menu_prefix":"add_menu_prefix","javascript":"javascript","menu_prefix":"menu_prefix","css_admin":"css_admin","css_site":"css_site","toignore":"toignore","php_preflight_install":"php_preflight_install","php_preflight_update":"php_preflight_update","export_key":"export_key","php_postflight_install":"php_postflight_install","joomla_source_link":"joomla_source_link","php_postflight_update":"php_postflight_update","export_buy_link":"export_buy_link","php_method_uninstall":"php_method_uninstall","sql":"sql","sql_uninstall":"sql_uninstall","readme":"readme","emptycontributors":"emptycontributors","add_update_server":"add_update_server","number":"number","update_server_target":"update_server_target","update_server":"update_server","sales_server":"sales_server","crowdin_project_api_key":"crowdin_project_api_key","crowdin_account_api_key":"crowdin_account_api_key","creatuserhelper":"creatuserhelper","buildcomp":"buildcomp","adduikit":"adduikit","guid":"guid","name":"name"}}';
+			$joomla_component->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "system_name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_helper_both","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_code":"name_code","short_description":"short_description","companyname":"companyname","add_php_helper_admin":"add_php_helper_admin","addfootable":"addfootable","crowdin_username":"crowdin_username","update_server_url":"update_server_url","add_sql":"add_sql","add_php_preflight_update":"add_php_preflight_update","add_css_site":"add_css_site","mvc_versiondate":"mvc_versiondate","remove_line_breaks":"remove_line_breaks","add_placeholders":"add_placeholders","add_php_helper_site":"add_php_helper_site","add_javascript":"add_javascript","description":"description","dashboard":"dashboard","author":"author","add_php_postflight_update":"add_php_postflight_update","email":"email","addreadme":"addreadme","website":"website","debug_linenr":"debug_linenr","add_license":"add_license","buildcompsql":"buildcompsql","license_type":"license_type","add_php_helper_both":"add_php_helper_both","add_admin_event":"add_admin_event","whmcs_key":"whmcs_key","add_site_event":"add_site_event","whmcs_url":"whmcs_url","add_css_admin":"add_css_admin","whmcs_buy_link":"whmcs_buy_link","dashboard_type":"dashboard_type","license":"license","add_php_preflight_install":"add_php_preflight_install","bom":"bom","add_php_postflight_install":"add_php_postflight_install","image":"image","add_php_method_uninstall":"add_php_method_uninstall","copyright":"copyright","add_sql_uninstall":"add_sql_uninstall","translation_tool":"translation_tool","component_version":"component_version","add_sales_server":"add_sales_server","not_required":"not_required","crowdin_project_identifier":"crowdin_project_identifier","add_email_helper":"add_email_helper","php_helper_both":"php_helper_both","php_helper_admin":"php_helper_admin","php_admin_event":"php_admin_event","php_helper_site":"php_helper_site","php_site_event":"php_site_event","add_menu_prefix":"add_menu_prefix","javascript":"javascript","menu_prefix":"menu_prefix","css_admin":"css_admin","css_site":"css_site","toignore":"toignore","php_preflight_install":"php_preflight_install","php_preflight_update":"php_preflight_update","export_key":"export_key","php_postflight_install":"php_postflight_install","joomla_source_link":"joomla_source_link","php_postflight_update":"php_postflight_update","export_buy_link":"export_buy_link","php_method_uninstall":"php_method_uninstall","sql":"sql","sql_uninstall":"sql_uninstall","readme":"readme","emptycontributors":"emptycontributors","add_update_server":"add_update_server","number":"number","update_server_target":"update_server_target","update_server":"update_server","sales_server":"sales_server","crowdin_project_api_key":"crowdin_project_api_key","crowdin_account_api_key":"crowdin_account_api_key","creatuserhelper":"creatuserhelper","buildcomp":"buildcomp","adduikit":"adduikit","guid":"guid","name":"name"}}';
 			$joomla_component->router = 'ComponentbuilderHelperRoute::getJoomla_componentRoute';
-			$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_helper_admin","addfootable","add_sql","add_php_preflight_update","add_css_site","mvc_versiondate","add_placeholders","add_php_helper_site","add_javascript","add_php_postflight_update","addreadme","debug_linenr","add_license","add_php_helper_both","license_type","add_admin_event","add_site_event","add_css_admin","dashboard_type","add_php_preflight_install","add_php_postflight_install","add_php_method_uninstall","add_sql_uninstall","translation_tool","add_sales_server","add_email_helper","emptycontributors","add_update_server","number","update_server_target","update_server","sales_server","creatuserhelper","buildcomp","adduikit"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"}]}';
+			$joomla_component->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/joomla_component.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_helper_admin","addfootable","add_sql","add_php_preflight_update","add_css_site","mvc_versiondate","remove_line_breaks","add_placeholders","add_php_helper_site","add_javascript","add_php_postflight_update","addreadme","debug_linenr","add_license","license_type","add_php_helper_both","add_admin_event","add_site_event","add_css_admin","dashboard_type","add_php_preflight_install","add_php_postflight_install","add_php_method_uninstall","add_sql_uninstall","translation_tool","add_sales_server","add_email_helper","emptycontributors","add_update_server","number","update_server_target","update_server","sales_server","creatuserhelper","buildcomp","adduikit"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dashboard","targetTable": "#__componentbuilder_custom_admin_view","targetColumn": "","displayColumn": "system_name"},{"sourceColumn": "update_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "sales_server","targetTable": "#__componentbuilder_server","targetColumn": "id","displayColumn": "name"}]}';

 			// Check if joomla_component type is already in content_type DB.
 			$joomla_component_id = null;
@ -9213,7 +9213,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://www.joomlacomponentbuilder.com" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.11.4 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.11.6 Was Successful! Let us know if anything is not working as expected.</h3>';

 			// Set db if not set already.
 			if (!isset($db))