PSR2 fixes for /settings

diff --git a/settings/defaults.php b/settings/defaults.php
index 4f8d58c5b66903f7857d6116c3e40ff991e15f9e..32625873aeda13338926a5152c559bf2fa473656 100644 (file)
--- a/settings/defaults.php
+++ b/settings/defaults.php
@@ -13,15 +13,15 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 @define('CONST_Limit_Reindexing', true);
 // Set to false to avoid importing extra postcodes for the US.
 @define('CONST_Use_Extra_US_Postcodes', true);
 @define('CONST_Limit_Reindexing', true);
 // Set to false to avoid importing extra postcodes for the US.
 @define('CONST_Use_Extra_US_Postcodes', true);

-// Set to true after importing Tiger house number data for the US.
-// Note: The tables must already exist or queries will throw errors.
-//       After changing this setting run ./utils/setup --create-functions
-//       again.
+/* Set to true after importing Tiger house number data for the US.
+   Note: The tables must already exist or queries will throw errors.
+         After changing this setting run ./utils/setup --create-functions
+         again. */

 @define('CONST_Use_US_Tiger_Data', false);
 @define('CONST_Use_US_Tiger_Data', false);

-// Set to true after importing other external house number data.
-// Note: the aux tables must already exist or queries will throw errors.
-//       After changing this setting run ./utils/setup --create-functions
-//       again.
+/* Set to true after importing other external house number data.
+   Note: the aux tables must already exist or queries will throw errors.
+        After changing this setting run ./utils/setup --create-functions
+        again. */

 @define('CONST_Use_Aux_Location_data', false);
 
 // Proxy settings
 @define('CONST_Use_Aux_Location_data', false);
 
 // Proxy settings


@@ -89,7 +89,7 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 
 // Maximum number of OSM ids that may be queried at once
 // for the places endpoint.
 
 // Maximum number of OSM ids that may be queried at once
 // for the places endpoint.

-@define('CONST_Places_Max_ID_count', 50); 
+@define('CONST_Places_Max_ID_count', 50);

 
 // Number of different geometry formats that may be queried in parallel.
 // Set to zero to disable polygon output.
 
 // Number of different geometry formats that may be queried in parallel.
 // Set to zero to disable polygon output.


@@ -101,4 +101,3 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 @define('CONST_Log_DB', false);
 // Set to a file name to enable logging to a file.
 @define('CONST_Log_File', false);
 @define('CONST_Log_DB', false);
 // Set to a file name to enable logging to a file.
 @define('CONST_Log_File', false);

-

diff --git a/settings/phrase_settings.php b/settings/phrase_settings.php
index a3447cc384b2e3270f19d7321105354b4c50309e..4ea5e021205a005c68d05bd40b1ecd4aefc83d8c 100644 (file)
--- a/settings/phrase_settings.php
+++ b/settings/phrase_settings.php
@@ -1,51 +1,56 @@
 <?php
 <?php

-# These settings control the import of special phrases from the wiki.

 
 

-# Languages to download the special phrases for.
-$aLanguageIn = array(
-                    'af',
-                    'ar',
-                    'br',
-                    'ca',
-                    'cs',
-                    'de',
-                    'en',
-                    'es',
-                    'et',
-                    'eu',
-                    'fa',
-                    'fi',
-                    'fr',
-                    'gl',
-                    'hr',
-                    'hu',
-                    'ia',
-                    'is',
-                    'it',
-                    'ja',
-                    'mk',
-                    'nl',
-                    'no',
-                    'pl',
-                    'ps',
-                    'pt',
-                    'ru',
-                    'sk',
-                    'sv',
-                    'uk',
-                    'vi',
-                );
+// These settings control the import of special phrases from the wiki.

 
 

-# class/type combinations to exclude
-$aTagsBlacklist = array(
+// Languages to download the special phrases for.
+$aLanguageIn
+ = array(
+    'af',
+    'ar',
+    'br',
+    'ca',
+    'cs',
+    'de',
+    'en',
+    'es',
+    'et',
+    'eu',
+    'fa',
+    'fi',
+    'fr',
+    'gl',
+    'hr',
+    'hu',
+    'ia',
+    'is',
+    'it',
+    'ja',
+    'mk',
+    'nl',
+    'no',
+    'pl',
+    'ps',
+    'pt',
+    'ru',
+    'sk',
+    'sv',
+    'uk',
+    'vi',
+   );
+
+// class/type combinations to exclude
+$aTagsBlacklist
+ = array(

     'boundary' => array('administrative'),
     'place' => array('house', 'houses'),
     'boundary' => array('administrative'),
     'place' => array('house', 'houses'),

-);
-# If a class is in the white list then all types will 
-# be ignored except the ones given in the list.
-# Also use this list to exclude an entire class from
-# special phrases.
-$aTagsWhitelist = array(
+   );
+
+// If a class is in the white list then all types will 
+// be ignored except the ones given in the list.
+// Also use this list to exclude an entire class from
+// special phrases.
+$aTagsWhitelist
+ = array(

     'highway' => array('bus_stop', 'rest_area', 'raceway'),
     'building' => array(),
     'highway' => array('bus_stop', 'rest_area', 'raceway'),
     'building' => array(),

-);
+   );

diff --git a/settings/settings.php b/settings/settings.php
index fcfc82950e6c21d196bb9517469e2e61837a85bf..d45a42376cb3cfe055b62b7dd672b5b927fd91f0 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -2,4 +2,3 @@
 
 echo "ERROR: Scripts must be run from build directory.\n";
 exit;
 
 echo "ERROR: Scripts must be run from build directory.\n";
 exit;

-