From 769e31061caa2ee6b49b1b5d2915ccc3d5adbb78 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 6 Jul 2018 17:52:24 +0200 Subject: [PATCH] fixed line spacing in getform method --- README.md | 2 +- admin/README.txt | 2 +- admin/helpers/compiler/e_Interpretation.php | 2 +- 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, 3 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 765f1a29c..ac31212e4 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*: **186200** ++ *Line count*: **186168** + *Field count*: **1058** + *File count*: **1238** + *Folder count*: **197** diff --git a/admin/README.txt b/admin/README.txt index 765f1a29c..ac31212e4 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*: **186200** ++ *Line count*: **186168** + *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 d734f4f99..a20dc7fcd 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -10939,7 +10939,7 @@ class Interpretation extends Fields // load custom script if found $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;"; + $allow[] = $this->_t(2) . "return \$form;"; return implode(PHP_EOL, $allow); } diff --git a/admin/models/admin_fields.php b/admin/models/admin_fields.php index 1a5ca4e1d..b6e63d1df 100644 --- a/admin/models/admin_fields.php +++ b/admin/models/admin_fields.php @@ -205,7 +205,6 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php index 182c96f78..acaff146c 100644 --- a/admin/models/admin_fields_conditions.php +++ b/admin/models/admin_fields_conditions.php @@ -205,7 +205,6 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/admin_fields_relations.php b/admin/models/admin_fields_relations.php index 49fd62aac..60c8adcad 100644 --- a/admin/models/admin_fields_relations.php +++ b/admin/models/admin_fields_relations.php @@ -185,7 +185,6 @@ class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 0b70d9852..523213807 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -516,7 +516,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $form->setFieldAttribute($name, 'editor', $global_editor); } - return $form; } diff --git a/admin/models/component_admin_views.php b/admin/models/component_admin_views.php index b43ae277a..2991135a5 100644 --- a/admin/models/component_admin_views.php +++ b/admin/models/component_admin_views.php @@ -216,7 +216,6 @@ class ComponentbuilderModelComponent_admin_views extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/component_config.php b/admin/models/component_config.php index 55683e1ff..ca398cd29 100644 --- a/admin/models/component_config.php +++ b/admin/models/component_config.php @@ -216,7 +216,6 @@ class ComponentbuilderModelComponent_config extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/component_custom_admin_menus.php b/admin/models/component_custom_admin_menus.php index 261501f6d..3bc75b7e1 100644 --- a/admin/models/component_custom_admin_menus.php +++ b/admin/models/component_custom_admin_menus.php @@ -216,7 +216,6 @@ class ComponentbuilderModelComponent_custom_admin_menus extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/component_custom_admin_views.php b/admin/models/component_custom_admin_views.php index 5a5bc8d3f..c8bee38c5 100644 --- a/admin/models/component_custom_admin_views.php +++ b/admin/models/component_custom_admin_views.php @@ -216,7 +216,6 @@ class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/component_dashboard.php b/admin/models/component_dashboard.php index 99ac42e4e..f35f918af 100644 --- a/admin/models/component_dashboard.php +++ b/admin/models/component_dashboard.php @@ -222,7 +222,6 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/component_files_folders.php b/admin/models/component_files_folders.php index 5a7c7d138..7b323428e 100644 --- a/admin/models/component_files_folders.php +++ b/admin/models/component_files_folders.php @@ -241,7 +241,6 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/component_mysql_tweaks.php b/admin/models/component_mysql_tweaks.php index fe94e30a0..7841ff435 100644 --- a/admin/models/component_mysql_tweaks.php +++ b/admin/models/component_mysql_tweaks.php @@ -216,7 +216,6 @@ class ComponentbuilderModelComponent_mysql_tweaks extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/component_site_views.php b/admin/models/component_site_views.php index 8f085e8bd..d0be872db 100644 --- a/admin/models/component_site_views.php +++ b/admin/models/component_site_views.php @@ -216,7 +216,6 @@ class ComponentbuilderModelComponent_site_views extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/component_updates.php b/admin/models/component_updates.php index 50f7e8228..53ef224f4 100644 --- a/admin/models/component_updates.php +++ b/admin/models/component_updates.php @@ -216,7 +216,6 @@ class ComponentbuilderModelComponent_updates extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index 244f8241e..7f7a70f41 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -337,7 +337,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin $form->setFieldAttribute($name, 'editor', $global_editor); } - return $form; } diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php index 220a5c60c..4f441d559 100644 --- a/admin/models/custom_code.php +++ b/admin/models/custom_code.php @@ -194,7 +194,6 @@ class ComponentbuilderModelCustom_code extends JModelAdmin $form->setFieldAttribute($name, 'editor', $global_editor); } - return $form; } diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php index 1a98a8e8e..5b176769c 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -344,7 +344,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin $form->setFieldAttribute($name, 'editor', $global_editor); } - return $form; } diff --git a/admin/models/field.php b/admin/models/field.php index ce4d851e4..857610325 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -231,7 +231,6 @@ class ComponentbuilderModelField extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index e30f48c25..49791e0dd 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -450,7 +450,6 @@ class ComponentbuilderModelFieldtype extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/help_document.php b/admin/models/help_document.php index 2a82a5397..b3f186140 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -181,7 +181,6 @@ class ComponentbuilderModelHelp_document extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php index fc2ee568a..a9c197d64 100644 --- a/admin/models/joomla_component.php +++ b/admin/models/joomla_component.php @@ -372,7 +372,6 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $form->setFieldAttribute($name, 'editor', $global_editor); } - return $form; } diff --git a/admin/models/language.php b/admin/models/language.php index 74eda7f63..2c7ab6b0e 100644 --- a/admin/models/language.php +++ b/admin/models/language.php @@ -175,7 +175,6 @@ class ComponentbuilderModelLanguage extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/language_translation.php b/admin/models/language_translation.php index 3b320fdfc..500c3ae9a 100644 --- a/admin/models/language_translation.php +++ b/admin/models/language_translation.php @@ -215,7 +215,6 @@ class ComponentbuilderModelLanguage_translation extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/layout.php b/admin/models/layout.php index 861e61da3..7654dc207 100644 --- a/admin/models/layout.php +++ b/admin/models/layout.php @@ -232,7 +232,6 @@ class ComponentbuilderModelLayout extends JModelAdmin $form->setFieldAttribute($name, 'editor', $global_editor); } - return $form; } diff --git a/admin/models/library.php b/admin/models/library.php index 066009219..c754dbf3c 100644 --- a/admin/models/library.php +++ b/admin/models/library.php @@ -223,7 +223,6 @@ class ComponentbuilderModelLibrary extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/library_config.php b/admin/models/library_config.php index ff6351f6e..138367410 100644 --- a/admin/models/library_config.php +++ b/admin/models/library_config.php @@ -185,7 +185,6 @@ class ComponentbuilderModelLibrary_config extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/library_files_folders_urls.php b/admin/models/library_files_folders_urls.php index 3a43dfe0b..f08ea01ff 100644 --- a/admin/models/library_files_folders_urls.php +++ b/admin/models/library_files_folders_urls.php @@ -217,7 +217,6 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/server.php b/admin/models/server.php index dcb660ffc..b48836ee4 100644 --- a/admin/models/server.php +++ b/admin/models/server.php @@ -316,7 +316,6 @@ class ComponentbuilderModelServer extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/site_view.php b/admin/models/site_view.php index 7592ddbf2..c0412412a 100644 --- a/admin/models/site_view.php +++ b/admin/models/site_view.php @@ -355,7 +355,6 @@ class ComponentbuilderModelSite_view extends JModelAdmin $form->setFieldAttribute($name, 'editor', $global_editor); } - return $form; } diff --git a/admin/models/snippet.php b/admin/models/snippet.php index 4e4da37ca..5bf14a873 100644 --- a/admin/models/snippet.php +++ b/admin/models/snippet.php @@ -181,7 +181,6 @@ class ComponentbuilderModelSnippet extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/snippet_type.php b/admin/models/snippet_type.php index 30004297e..e32fdac90 100644 --- a/admin/models/snippet_type.php +++ b/admin/models/snippet_type.php @@ -175,7 +175,6 @@ class ComponentbuilderModelSnippet_type extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; } diff --git a/admin/models/template.php b/admin/models/template.php index 25d527600..834ccd29e 100644 --- a/admin/models/template.php +++ b/admin/models/template.php @@ -232,7 +232,6 @@ class ComponentbuilderModelTemplate extends JModelAdmin $form->setFieldAttribute($name, 'editor', $global_editor); } - return $form; } diff --git a/admin/models/validation_rule.php b/admin/models/validation_rule.php index 325bf2a38..a95849d67 100644 --- a/admin/models/validation_rule.php +++ b/admin/models/validation_rule.php @@ -207,7 +207,6 @@ class ComponentbuilderModelValidation_rule extends JModelAdmin $form->setValue($redirectedField, null, $redirectedValue); } } - return $form; }