From 63a24951839f6b60b0fb36eff4a1eda7e113a2c4 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Tue, 28 Nov 2017 13:33:40 +0900 Subject: [PATCH] white space fixes --- www/admin/table_arrays/array_edit_access.inc | 1 - www/admin/table_arrays/array_edit_groups.inc | 10 +- .../table_arrays/array_edit_languages.inc | 20 ++-- .../table_arrays/array_edit_menu_group.inc | 2 +- www/admin/table_arrays/array_edit_pages.inc | 48 ++++---- www/admin/table_arrays/array_edit_schemes.inc | 108 +++++++++--------- 6 files changed, 94 insertions(+), 95 deletions(-) diff --git a/www/admin/table_arrays/array_edit_access.inc b/www/admin/table_arrays/array_edit_access.inc index c6898b8e..0aa9acde 100644 --- a/www/admin/table_arrays/array_edit_access.inc +++ b/www/admin/table_arrays/array_edit_access.inc @@ -70,7 +70,6 @@ "type" => "hidden", "fk_id" => 1 # reference main key from master table above ) - ) ) ) diff --git a/www/admin/table_arrays/array_edit_groups.inc b/www/admin/table_arrays/array_edit_groups.inc index 3d070678..9814adc4 100644 --- a/www/admin/table_arrays/array_edit_groups.inc +++ b/www/admin/table_arrays/array_edit_groups.inc @@ -8,17 +8,17 @@ ), "enabled" => array ( "value" => $GLOBALS["enabled"], - "output_name" => "Enabled", + "output_name" => "Enabled", "int" => 1, - "type" => "binary", + "type" => "binary", "element_list" => array ( - "1" => "Yes", + "1" => "Yes", "0" => "No" ) ), "name" => array ( - "value" => $GLOBALS["name"], - "output_name" => "Group Name", + "value" => $GLOBALS["name"], + "output_name" => "Group Name", "type" => "text", "mandatory" => 1 ), diff --git a/www/admin/table_arrays/array_edit_languages.inc b/www/admin/table_arrays/array_edit_languages.inc index d80790e2..f5196d03 100644 --- a/www/admin/table_arrays/array_edit_languages.inc +++ b/www/admin/table_arrays/array_edit_languages.inc @@ -12,7 +12,7 @@ "mandatory" => 1, "type" => "text", "size" => 2, - "length" => 2 + "length" => 2 ), "long_name" => array ( "value" => $GLOBALS["long_name"], @@ -26,29 +26,29 @@ "output_name" => "ISO Code", "mandatory" => 1, "type" => "text" - ), + ), "order_number" => array ( "value" => $GLOBALS["order_number"], "int" => 1, "order" => 1 ), "enabled" => array ( - "value" => $GLOBALS["enabled"], - "output_name" => "Enabled", + "value" => $GLOBALS["enabled"], + "output_name" => "Enabled", "int" => 1, - "type" => "binary", + "type" => "binary", "element_list" => array ( - "1" => "Yes", + "1" => "Yes", "0" => "No" ) ), "lang_default" => array ( - "value" => $GLOBALS["lang_default"], - "output_name" => "Default Language", + "value" => $GLOBALS["lang_default"], + "output_name" => "Default Language", "int" => 1, - "type" => "binary", + "type" => "binary", "element_list" => array ( - "1" => "Yes", + "1" => "Yes", "0" => "No" ) ) diff --git a/www/admin/table_arrays/array_edit_menu_group.inc b/www/admin/table_arrays/array_edit_menu_group.inc index 351529e9..f40c2ec5 100644 --- a/www/admin/table_arrays/array_edit_menu_group.inc +++ b/www/admin/table_arrays/array_edit_menu_group.inc @@ -20,7 +20,7 @@ "error_check" => "alphanumeric|unique" ), "order_number" => array ( - "value" => $GLOBALS["order_number"], + "value" => $GLOBALS["order_number"], "output_name" => "Group order", "type" => "order", "int" => 1, diff --git a/www/admin/table_arrays/array_edit_pages.inc b/www/admin/table_arrays/array_edit_pages.inc index 854086db..61c8444e 100644 --- a/www/admin/table_arrays/array_edit_pages.inc +++ b/www/admin/table_arrays/array_edit_pages.inc @@ -2,7 +2,7 @@ $edit_pages = array ( "table_array" => array ( "edit_page_id" => array ( - "value" => $GLOBALS["edit_page_id"], + "value" => $GLOBALS["edit_page_id"], "type" => "hidden", "pk" => 1 ), @@ -14,13 +14,13 @@ "query" => "SELECT DISTINCT temp_files.filename AS id, temp_files.filename AS name FROM temp_files LEFT JOIN edit_page ep ON temp_files.filename = ep.filename WHERE ep.filename IS NULL" ), "name" => array ( - "value" => $GLOBALS["name"], - "output_name" => "Page name", - "mandatory" => 1, + "value" => $GLOBALS["name"], + "output_name" => "Page name", + "mandatory" => 1, "type" => "text" ), "order_number" => array ( - "value" => $GLOBALS["order_number"], + "value" => $GLOBALS["order_number"], "output_name" => "Page order", "type" => "order", "int" => 1, @@ -37,57 +37,57 @@ "3" => "3", "4" => "4", "5" => "5" - ) + ) ),*/ "online" => array ( - "value" => $GLOBALS["online"], - "output_name" => "Online", + "value" => $GLOBALS["online"], + "output_name" => "Online", "int" => 1, - "type" => "binary", + "type" => "binary", "element_list" => array ( - "1" => "Yes", + "1" => "Yes", "0" => "No" ) ), "menu" => array ( "value" => $GLOBALS["menu"], - "output_name" => "Menu", + "output_name" => "Menu", "int" => 1, - "type" => "binary", + "type" => "binary", "element_list" => array ( - "1" => "Yes", + "1" => "Yes", "0" => "No" ) ), "popup" => array ( "value" => $GLOBALS["popup"], - "output_name" => "Popup", + "output_name" => "Popup", "int" => 1, - "type" => "binary", + "type" => "binary", "element_list" => array ( - "1" => "Yes", + "1" => "Yes", "0" => "No" ) - ), + ), "popup_x" => array ( - "value" => $GLOBALS["popup_x"], - "output_name" => "Popup Width", + "value" => $GLOBALS["popup_x"], + "output_name" => "Popup Width", "int_null" => 1, "type" => "text", "size" => 4, "length" => 4 ), "popup_y" => array ( - "value" => $GLOBALS["popup_y"], - "output_name" => "Popup Height", + "value" => $GLOBALS["popup_y"], + "output_name" => "Popup Height", "int_null" => 1, "type" => "text", "size" => 4, "length" => 4 )/*, "query_string" => array ( - "value" => $GLOBALS["query_string"], - "output_name" => "Query String for Link", + "value" => $GLOBALS["query_string"], + "output_name" => "Query String for Link", "type" => "text", "size" => "50" )*/ @@ -111,7 +111,7 @@ "name" => "menu", "binary" => array("Yes","No"), "before_value" => "Menu: " - ), + ), array( "name" => "popup", "binary" => array("Yes","No"), diff --git a/www/admin/table_arrays/array_edit_schemes.inc b/www/admin/table_arrays/array_edit_schemes.inc index 0b22b08a..967feb0d 100644 --- a/www/admin/table_arrays/array_edit_schemes.inc +++ b/www/admin/table_arrays/array_edit_schemes.inc @@ -1,55 +1,55 @@ array ( - "edit_scheme_id" => array ( - "value" => $GLOBALS["edit_scheme_id"], - "type" => "hidden", - "pk" => 1 - ), - "name" => array ( - "value" => $GLOBALS["name"], - "output_name" => "Scheme Name", - "mandatory" => 1, - "type" => "text" - ), - "header_color" => array ( - "value" => $GLOBALS["header_color"], - "output_name" => "Header Color", - "mandatory" => 1, - "type" => "text", - "size" => 6, - "length" => 6, - "error_check" => "custom", - "error_regex" => "/[\dA-Fa-f]{6}/", - "error_example" => "F6A544" - ), - "enabled" => array ( - "value" => $GLOBALS["enabled"], - "output_name" => "Enabled", - "int" => 1, - "type" => "binary", - "element_list" => array ( - "1" => "Yes", - "0" => "No" - ) - ), - "template" => array ( - "value" => $GLOBALS["template"], - "output_name" => "Template", - "type" => "text" - ) - ), - "table_name" => "edit_scheme", - "load_query" => "SELECT edit_scheme_id, name, enabled FROM edit_scheme ORDER BY name", - "show_fields" => array ( - array ( - "name" => "name" - ), - array ( - "name" => "enabled", - "binary" => array ("Yes", "No"), - "before_value" => "Enabled: " - ) - ) - ); // main array -?> + $edit_schemes = array ( + "table_array" => array ( + "edit_scheme_id" => array ( + "value" => $GLOBALS["edit_scheme_id"], + "type" => "hidden", + "pk" => 1 + ), + "name" => array ( + "value" => $GLOBALS["name"], + "output_name" => "Scheme Name", + "mandatory" => 1, + "type" => "text" + ), + "header_color" => array ( + "value" => $GLOBALS["header_color"], + "output_name" => "Header Color", + "mandatory" => 1, + "type" => "text", + "size" => 6, + "length" => 6, + "error_check" => "custom", + "error_regex" => "/[\dA-Fa-f]{6}/", + "error_example" => "F6A544" + ), + "enabled" => array ( + "value" => $GLOBALS["enabled"], + "output_name" => "Enabled", + "int" => 1, + "type" => "binary", + "element_list" => array ( + "1" => "Yes", + "0" => "No" + ) + ), + "template" => array ( + "value" => $GLOBALS["template"], + "output_name" => "Template", + "type" => "text" + ) + ), + "table_name" => "edit_scheme", + "load_query" => "SELECT edit_scheme_id, name, enabled FROM edit_scheme ORDER BY name", + "show_fields" => array ( + array ( + "name" => "name" + ), + array ( + "name" => "enabled", + "binary" => array ("Yes", "No"), + "before_value" => "Enabled: " + ) + ) + ); // main array + ?>