From 69d358ca06d8ae25d1d606bf6ccb793c993260c5 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Fri, 6 Jul 2018 17:47:27 +0200
Subject: [PATCH] fixed line spacing in getform method

---
 README.md                                     | 2 +-
 admin/README.txt                              | 2 +-
 admin/helpers/compiler/e_Interpretation.php   | 3 +--
 admin/models/admin_fields.php                 | 1 -
 admin/models/admin_fields_conditions.php      | 1 -
 admin/models/admin_fields_relations.php       | 1 -
 admin/models/admin_view.php                   | 1 +
 admin/models/component_admin_views.php        | 1 -
 admin/models/component_config.php             | 1 -
 admin/models/component_custom_admin_menus.php | 1 -
 admin/models/component_custom_admin_views.php | 1 -
 admin/models/component_dashboard.php          | 1 -
 admin/models/component_files_folders.php      | 1 -
 admin/models/component_mysql_tweaks.php       | 1 -
 admin/models/component_site_views.php         | 1 -
 admin/models/component_updates.php            | 1 -
 admin/models/custom_admin_view.php            | 1 +
 admin/models/custom_code.php                  | 1 +
 admin/models/dynamic_get.php                  | 1 +
 admin/models/field.php                        | 1 -
 admin/models/fieldtype.php                    | 1 -
 admin/models/help_document.php                | 1 -
 admin/models/joomla_component.php             | 1 +
 admin/models/language.php                     | 1 -
 admin/models/language_translation.php         | 1 -
 admin/models/layout.php                       | 1 +
 admin/models/library.php                      | 1 -
 admin/models/library_config.php               | 1 -
 admin/models/library_files_folders_urls.php   | 1 -
 admin/models/server.php                       | 1 -
 admin/models/site_view.php                    | 1 +
 admin/models/snippet.php                      | 1 -
 admin/models/snippet_type.php                 | 1 -
 admin/models/template.php                     | 1 +
 admin/models/validation_rule.php              | 1 -
 35 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 1f836f8e3..765f1a29c 100644
--- a/README.md
+++ b/README.md
@@ -129,7 +129,7 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 + *Version*: 2.8.2
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **186216**
++ *Line count*: **186200**
 + *Field count*: **1058**
 + *File count*: **1238**
 + *Folder count*: **197**
diff --git a/admin/README.txt b/admin/README.txt
index 1f836f8e3..765f1a29c 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -129,7 +129,7 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 + *Version*: 2.8.2
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **186216**
++ *Line count*: **186200**
 + *Field count*: **1058**
 + *File count*: **1238**
 + *Folder count*: **197**
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 9b0cf47a5..d734f4f99 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -10936,9 +10936,8 @@ class Interpretation extends Fields
 		$allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " Now set the local-redirected field default value";
 		$allow[] = $this->_t(4) . "\$form->setValue(\$redirectedField, null, \$redirectedValue);";
 		$allow[] = $this->_t(3) . "}";
-		$allow[] = $this->_t(2) . "}";
 		// load custom script if found
-		$allow[] = $this->getCustomScriptBuilder('php_getform', $viewName_single);
+		$allow[] = $this->_t(2) . "}" . $this->getCustomScriptBuilder('php_getform', $viewName_single, PHP_EOL . PHP_EOL);
 		// setup the default script
 		$allow[] = PHP_EOL . $this->_t(2) . "return \$form;";
 
diff --git a/admin/models/admin_fields.php b/admin/models/admin_fields.php
index cc326582d..1a5ca4e1d 100644
--- a/admin/models/admin_fields.php
+++ b/admin/models/admin_fields.php
@@ -206,7 +206,6 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php
index 3575e0a84..182c96f78 100644
--- a/admin/models/admin_fields_conditions.php
+++ b/admin/models/admin_fields_conditions.php
@@ -206,7 +206,6 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/admin_fields_relations.php b/admin/models/admin_fields_relations.php
index 0fe37b035..49fd62aac 100644
--- a/admin/models/admin_fields_relations.php
+++ b/admin/models/admin_fields_relations.php
@@ -186,7 +186,6 @@ class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index c014bbb53..0b70d9852 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -506,6 +506,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			}
 		}
 
+
 		// update all editors to use this components global editor
 		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
diff --git a/admin/models/component_admin_views.php b/admin/models/component_admin_views.php
index e846e0e3c..b43ae277a 100644
--- a/admin/models/component_admin_views.php
+++ b/admin/models/component_admin_views.php
@@ -217,7 +217,6 @@ class ComponentbuilderModelComponent_admin_views extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/component_config.php b/admin/models/component_config.php
index 4504f4e88..55683e1ff 100644
--- a/admin/models/component_config.php
+++ b/admin/models/component_config.php
@@ -217,7 +217,6 @@ class ComponentbuilderModelComponent_config extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/component_custom_admin_menus.php b/admin/models/component_custom_admin_menus.php
index bc585b836..261501f6d 100644
--- a/admin/models/component_custom_admin_menus.php
+++ b/admin/models/component_custom_admin_menus.php
@@ -217,7 +217,6 @@ class ComponentbuilderModelComponent_custom_admin_menus extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/component_custom_admin_views.php b/admin/models/component_custom_admin_views.php
index 8efc9b83d..5a5bc8d3f 100644
--- a/admin/models/component_custom_admin_views.php
+++ b/admin/models/component_custom_admin_views.php
@@ -217,7 +217,6 @@ class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/component_dashboard.php b/admin/models/component_dashboard.php
index 7417802a9..99ac42e4e 100644
--- a/admin/models/component_dashboard.php
+++ b/admin/models/component_dashboard.php
@@ -223,7 +223,6 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/component_files_folders.php b/admin/models/component_files_folders.php
index a80cbb659..5a7c7d138 100644
--- a/admin/models/component_files_folders.php
+++ b/admin/models/component_files_folders.php
@@ -242,7 +242,6 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/component_mysql_tweaks.php b/admin/models/component_mysql_tweaks.php
index 51a119b94..fe94e30a0 100644
--- a/admin/models/component_mysql_tweaks.php
+++ b/admin/models/component_mysql_tweaks.php
@@ -217,7 +217,6 @@ class ComponentbuilderModelComponent_mysql_tweaks extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/component_site_views.php b/admin/models/component_site_views.php
index 69d246e07..8f085e8bd 100644
--- a/admin/models/component_site_views.php
+++ b/admin/models/component_site_views.php
@@ -217,7 +217,6 @@ class ComponentbuilderModelComponent_site_views extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/component_updates.php b/admin/models/component_updates.php
index 6ec42de73..50f7e8228 100644
--- a/admin/models/component_updates.php
+++ b/admin/models/component_updates.php
@@ -217,7 +217,6 @@ class ComponentbuilderModelComponent_updates extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php
index b6358d6de..244f8241e 100644
--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@@ -327,6 +327,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			}
 		}
 
+
 		// update all editors to use this components global editor
 		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php
index 50eb037e0..220a5c60c 100644
--- a/admin/models/custom_code.php
+++ b/admin/models/custom_code.php
@@ -184,6 +184,7 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
 			}
 		}
 
+
 		// update all editors to use this components global editor
 		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php
index 96d32de62..1a98a8e8e 100644
--- a/admin/models/dynamic_get.php
+++ b/admin/models/dynamic_get.php
@@ -334,6 +334,7 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			}
 		}
 
+
 		// update all editors to use this components global editor
 		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
diff --git a/admin/models/field.php b/admin/models/field.php
index 7a266c62c..ce4d851e4 100644
--- a/admin/models/field.php
+++ b/admin/models/field.php
@@ -232,7 +232,6 @@ class ComponentbuilderModelField extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index 06a945109..e30f48c25 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -451,7 +451,6 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/help_document.php b/admin/models/help_document.php
index 5f6aa1e04..2a82a5397 100644
--- a/admin/models/help_document.php
+++ b/admin/models/help_document.php
@@ -182,7 +182,6 @@ class ComponentbuilderModelHelp_document extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php
index 931b2f23b..fc2ee568a 100644
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@@ -362,6 +362,7 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			}
 		}
 
+
 		// update all editors to use this components global editor
 		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
diff --git a/admin/models/language.php b/admin/models/language.php
index a596e758b..74eda7f63 100644
--- a/admin/models/language.php
+++ b/admin/models/language.php
@@ -176,7 +176,6 @@ class ComponentbuilderModelLanguage extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/language_translation.php b/admin/models/language_translation.php
index 5068ab549..3b320fdfc 100644
--- a/admin/models/language_translation.php
+++ b/admin/models/language_translation.php
@@ -216,7 +216,6 @@ class ComponentbuilderModelLanguage_translation extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/layout.php b/admin/models/layout.php
index 932378524..861e61da3 100644
--- a/admin/models/layout.php
+++ b/admin/models/layout.php
@@ -222,6 +222,7 @@ class ComponentbuilderModelLayout extends JModelAdmin
 			}
 		}
 
+
 		// update all editors to use this components global editor
 		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
diff --git a/admin/models/library.php b/admin/models/library.php
index 72564ed31..066009219 100644
--- a/admin/models/library.php
+++ b/admin/models/library.php
@@ -224,7 +224,6 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/library_config.php b/admin/models/library_config.php
index 634dd21ef..ff6351f6e 100644
--- a/admin/models/library_config.php
+++ b/admin/models/library_config.php
@@ -186,7 +186,6 @@ class ComponentbuilderModelLibrary_config extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/library_files_folders_urls.php b/admin/models/library_files_folders_urls.php
index 6b373214b..3a43dfe0b 100644
--- a/admin/models/library_files_folders_urls.php
+++ b/admin/models/library_files_folders_urls.php
@@ -218,7 +218,6 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/server.php b/admin/models/server.php
index 1b5c3f02d..dcb660ffc 100644
--- a/admin/models/server.php
+++ b/admin/models/server.php
@@ -317,7 +317,6 @@ class ComponentbuilderModelServer extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/site_view.php b/admin/models/site_view.php
index 901be94b7..7592ddbf2 100644
--- a/admin/models/site_view.php
+++ b/admin/models/site_view.php
@@ -345,6 +345,7 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			}
 		}
 
+
 		// update all editors to use this components global editor
 		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
diff --git a/admin/models/snippet.php b/admin/models/snippet.php
index ed12e8beb..4e4da37ca 100644
--- a/admin/models/snippet.php
+++ b/admin/models/snippet.php
@@ -182,7 +182,6 @@ class ComponentbuilderModelSnippet extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/snippet_type.php b/admin/models/snippet_type.php
index cf8f226fd..30004297e 100644
--- a/admin/models/snippet_type.php
+++ b/admin/models/snippet_type.php
@@ -176,7 +176,6 @@ class ComponentbuilderModelSnippet_type extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}
 
diff --git a/admin/models/template.php b/admin/models/template.php
index f68d2dff3..25d527600 100644
--- a/admin/models/template.php
+++ b/admin/models/template.php
@@ -222,6 +222,7 @@ class ComponentbuilderModelTemplate extends JModelAdmin
 			}
 		}
 
+
 		// update all editors to use this components global editor
 		$global_editor = JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
 		$editors = $form->getXml()->xpath("//field[@type='editor']");
diff --git a/admin/models/validation_rule.php b/admin/models/validation_rule.php
index dd965092a..325bf2a38 100644
--- a/admin/models/validation_rule.php
+++ b/admin/models/validation_rule.php
@@ -208,7 +208,6 @@ class ComponentbuilderModelValidation_rule extends JModelAdmin
 			}
 		}
 
-
 		return $form;
 	}