OpencachingDeutschland / oc-server3

htdocs/newcache.php

Spacing +20 added lines, -20 removed lines

@@ -36,7 +36,7 @@ 
         require_once $stylepath . '/' . $tplname . '.inc.php';
 
         //set template replacements
-        tpl_set_var('reset', $reset);  // obsolete
+        tpl_set_var('reset', $reset); // obsolete
         tpl_set_var('submit', $submit);
         tpl_set_var('general_message', '');
         tpl_set_var('hidden_since_message', '');
@@ -53,7 +53,7 @@ 
         tpl_set_var('diff_message', '');
         tpl_set_var('safari_message', '');
 
-        $sel_type = isset($_POST['type']) ? $_POST['type'] : 0;  // Ocprop
+        $sel_type = isset($_POST['type']) ? $_POST['type'] : 0; // Ocprop
         if (!isset($_POST['size'])) {
             if ($sel_type == 4 || $sel_type == 5) {
                 $sel_size = 7;
@@ -61,15 +61,15 @@ 
                 $sel_size = -1;
             }
         } else {
-            $sel_size = isset($_POST['size']) ? $_POST['size'] : -1;  // Ocprop
+            $sel_size = isset($_POST['size']) ? $_POST['size'] : -1; // Ocprop
         }
         $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang;
-        $sel_country = isset($_POST['country']) ? $_POST['country'] : getUserCountry();  // Ocprop
+        $sel_country = isset($_POST['country']) ? $_POST['country'] : getUserCountry(); // Ocprop
         $show_all_countries = isset($_POST['show_all_countries']) ? $_POST['show_all_countries'] : 0;
         $show_all_langs = isset($_POST['show_all_langs']) ? $_POST['show_all_langs'] : 0;
 
         //coords
-        $lonEW = isset($_POST['lonEW']) ? $_POST['lonEW'] : $default_EW;  // Ocprop
+        $lonEW = isset($_POST['lonEW']) ? $_POST['lonEW'] : $default_EW; // Ocprop
         if ($lonEW == 'E') {
             tpl_set_var('lonEsel', ' selected="selected"');
             tpl_set_var('lonWsel', '');
@@ -77,13 +77,13 @@ 
             tpl_set_var('lonEsel', '');
             tpl_set_var('lonWsel', ' selected="selected"');
         }
-        $lon_h = isset($_POST['lon_h']) ? $_POST['lon_h'] : '0';  // Ocprop
+        $lon_h = isset($_POST['lon_h']) ? $_POST['lon_h'] : '0'; // Ocprop
         tpl_set_var('lon_h', htmlspecialchars($lon_h, ENT_COMPAT, 'UTF-8'));
 
-        $lon_min = isset($_POST['lon_min']) ? $_POST['lon_min'] : '00.000';  // Ocprop
+        $lon_min = isset($_POST['lon_min']) ? $_POST['lon_min'] : '00.000'; // Ocprop
         tpl_set_var('lon_min', htmlspecialchars($lon_min, ENT_COMPAT, 'UTF-8'));
 
-        $latNS = isset($_POST['latNS']) ? $_POST['latNS'] : $default_NS;  // Ocprop
+        $latNS = isset($_POST['latNS']) ? $_POST['latNS'] : $default_NS; // Ocprop
         if ($latNS == 'N') {
             tpl_set_var('latNsel', ' selected="selected"');
             tpl_set_var('latSsel', '');
@@ -91,14 +91,14 @@ 
             tpl_set_var('latNsel', '');
             tpl_set_var('latSsel', ' selected="selected"');
         }
-        $lat_h = isset($_POST['lat_h']) ? $_POST['lat_h'] : '0';  // Ocprop
+        $lat_h = isset($_POST['lat_h']) ? $_POST['lat_h'] : '0'; // Ocprop
         tpl_set_var('lat_h', htmlspecialchars($lat_h, ENT_COMPAT, 'UTF-8'));
 
-        $lat_min = isset($_POST['lat_min']) ? $_POST['lat_min'] : '00.000';  // Ocprop
+        $lat_min = isset($_POST['lat_min']) ? $_POST['lat_min'] : '00.000'; // Ocprop
         tpl_set_var('lat_min', htmlspecialchars($lat_min, ENT_COMPAT, 'UTF-8'));
 
         //name
-        $name = isset($_POST['name']) ? trim($_POST['name']) : '';  // Ocprop
+        $name = isset($_POST['name']) ? trim($_POST['name']) : ''; // Ocprop
         tpl_set_var('name', htmlspecialchars($name, ENT_COMPAT, 'UTF-8'));
 
         //shortdesc
@@ -130,7 +130,7 @@ 
 
         // fuer alte Versionen von OCProp
         if (isset($_POST['submit']) && !isset($_POST['version2'])) {
-            $descMode = (isset($_POST['desc_html']) && ($_POST['desc_html'] == 1)) ? 2 : 1;  // Ocprop
+            $descMode = (isset($_POST['desc_html']) && ($_POST['desc_html'] == 1)) ? 2 : 1; // Ocprop
             $_POST['submitform'] = $_POST['submit'];
 
             $short_desc = iconv('ISO-8859-1', 'UTF-8', $short_desc);
@@ -196,7 +196,7 @@ 
         }
 
         //tos
-        $tos = isset($_POST['TOS']) ? 1 : 0;  // Ocprop
+        $tos = isset($_POST['TOS']) ? 1 : 0; // Ocprop
         if ($tos == 1) {
             tpl_set_var('toschecked', ' checked="checked"');
         } else {
@@ -204,9 +204,9 @@ 
         }
 
         //hidden_since
-        $hidden_day = isset($_POST['hidden_day']) ? $_POST['hidden_day'] : date('d');  // Ocprop
-        $hidden_month = isset($_POST['hidden_month']) ? $_POST['hidden_month'] : date('m');  // Ocprop
-        $hidden_year = isset($_POST['hidden_year']) ? $_POST['hidden_year'] : date('Y');  // Ocprop
+        $hidden_day = isset($_POST['hidden_day']) ? $_POST['hidden_day'] : date('d'); // Ocprop
+        $hidden_month = isset($_POST['hidden_month']) ? $_POST['hidden_month'] : date('m'); // Ocprop
+        $hidden_year = isset($_POST['hidden_year']) ? $_POST['hidden_year'] : date('Y'); // Ocprop
         tpl_set_var('hidden_day', htmlspecialchars($hidden_day, ENT_COMPAT, 'UTF-8'));
         tpl_set_var('hidden_month', htmlspecialchars($hidden_month, ENT_COMPAT, 'UTF-8'));
         tpl_set_var('hidden_year', htmlspecialchars($hidden_year, ENT_COMPAT, 'UTF-8'));
@@ -223,7 +223,7 @@ 
         tpl_set_var('publish_later_checked', '');
         tpl_set_var('publish_notnow_checked', '');
 
-        $publish = isset($_POST['publish']) ? $_POST['publish'] : 'now2';  // Ocprop
+        $publish = isset($_POST['publish']) ? $_POST['publish'] : 'now2'; // Ocprop
         if ($publish == 'now2') {
             tpl_set_var('publish_now_checked', 'checked');
         } elseif ($publish == 'later') {
@@ -253,11 +253,11 @@ 
 
         // gc- and nc-waypoints
         // fix #4356: gc waypoints are frequently copy&pasted with leading spaces
-        $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : '';  // Ocprop
+        $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : ''; // Ocprop
         tpl_set_var('wp_gc', htmlspecialchars($wp_gc, ENT_COMPAT, 'UTF-8'));
 
         //difficulty
-        $difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : 1;  // Ocprop
+        $difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : 1; // Ocprop
         $difficulty_options = '<option value="1">' . $sel_message . '</option>';
         for ($i = 2; $i <= 10; $i++) {
             if ($difficulty == $i) {
@@ -270,7 +270,7 @@ 
         tpl_set_var('difficulty_options', $difficulty_options);
 
         //terrain
-        $terrain = isset($_POST['terrain']) ? $_POST['terrain'] : 1;  // Ocprop
+        $terrain = isset($_POST['terrain']) ? $_POST['terrain'] : 1; // Ocprop
         $terrain_options = '<option value="1">' . $sel_message . '</option>';
         for ($i = 2; $i <= 10; $i++) {
             if ($terrain == $i) {

htdocs/lib2/logic/cacheIcon.class.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 
     public static function get($user_id, $cache_id, $cache_status, $cache_userid, $iconname)
     {
-        $iconname = mb_eregi_replace('cache/', '', $iconname);   // for old cache_type table contents
+        $iconname = mb_eregi_replace('cache/', '', $iconname); // for old cache_type table contents
         $iconext = '.' . mb_eregi_replace("^.*\.", '', $iconname);
         $iconname = mb_eregi_replace("\..*", '', $iconname);
 
@@ -30,7 +30,7 @@ 
                 break;
             case 5:
                 $iconname .= '-s';
-                break;      // fix for RT ticket #3403
+                break; // fix for RT ticket #3403
             case 6:
                 $iconname .= '-a';
                 break;

htdocs/lib2/logic/logtypes.inc.php

Spacing +10 added lines, -10 removed lines

@@ -91,28 +91,28 @@
 
     $allowed_logtypes = [];
     if ($owner || $admin_report || $admin_locked) {
-        $allowed_logtypes[] = 3;   // note
+        $allowed_logtypes[] = 3; // note
     }
     if (($owner && $statuslogs) || $admin_report) {
         if ($cache_status != 5 && (($cache_status != 4 && $cache_status != 7) || $admin_report)) {
-            $allowed_logtypes[] = 10;  // ready for search
-            $allowed_logtypes[] = 11;  // temporarily not available
-            $allowed_logtypes[] = 9;   // archived
-            $allowed_logtypes[] = 13;  // locked
+            $allowed_logtypes[] = 10; // ready for search
+            $allowed_logtypes[] = 11; // temporarily not available
+            $allowed_logtypes[] = 9; // archived
+            $allowed_logtypes[] = 13; // locked
         }
         if ($admin_report || $old_logtype == 14) {
             $allowed_logtypes[] = 14;
         }  // locked, invisible
     }
     if ($cache_type == 6) { // event
-        $allowed_logtypes[] = 8;   // will attend
-        $allowed_logtypes[] = 7;   // attended
+        $allowed_logtypes[] = 8; // will attend
+        $allowed_logtypes[] = 7; // attended
     } else {
-        $allowed_logtypes[] = 1;   // found
-        $allowed_logtypes[] = 2;   // not found
+        $allowed_logtypes[] = 1; // found
+        $allowed_logtypes[] = 2; // not found
     }
     if (!($owner || $admin_report || $admin_locked)) {
-        $allowed_logtypes[] = 3;   // note
+        $allowed_logtypes[] = 3; // note
     }
 
     // always allow to keep the existing logtype when the log is edited by an admin

htdocs/lib2/login.class.php

Spacing +6 added lines, -6 removed lines

@@ -20,13 +20,13 @@
  *
  ***************************************************************************/
 
-define('LOGIN_UNKNOWN_ERROR', -1);     // unkown error occured
-define('LOGIN_OK', 0);                 // login succeeded
-define('LOGIN_BADUSERPW', 1);          // bad username or password
-define('LOGIN_TOOMUCHLOGINS', 2);      // too many logins in short time
-define('LOGIN_USERNOTACTIVE', 3);      // the useraccount locked
+define('LOGIN_UNKNOWN_ERROR', -1); // unkown error occured
+define('LOGIN_OK', 0); // login succeeded
+define('LOGIN_BADUSERPW', 1); // bad username or password
+define('LOGIN_TOOMUCHLOGINS', 2); // too many logins in short time
+define('LOGIN_USERNOTACTIVE', 3); // the useraccount locked
 define('LOGIN_EMPTY_USERPASSWORD', 4); // given username/password was empty
-define('LOGIN_LOGOUT_OK', 5);          // logout was successfull
+define('LOGIN_LOGOUT_OK', 5); // logout was successfull
 
 // login times in seconds
 define('LOGIN_TIME', 60 * 60);

htdocs/newlogs.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
     $tpl->cache_lifetime = 900;
     $tpl->cache_id = $exclude_country;
     $logcount = 250;
-    $paging = false;  // paging would have poor performance for all logs
+    $paging = false; // paging would have poor performance for all logs
     $orderByDate = $logselection == 3 ? '{fromtable}.`order_date` DESC, ' : '';
 } else {
     // latest logs for all countries or for one country
@@ -88,7 +88,7 @@ 
     $tpl->cache_lifetime = 300;
     $tpl->cache_id = $country;
     $logcount = 250;
-    $paging = false;  // paging would have poor performance for all logs
+    $paging = false; // paging would have poor performance for all logs
     $orderByDate = $logselection == 3 ? '{fromtable}.`order_date` DESC, ' : '';
     $optimize_for_latest_logs = ($country == '' || $country == $opt['page']['main_country']);
 }

htdocs/src/Oc/SmartyPlugins/function.rand.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  *
  * @return int
  */
-function smarty_function_rand(array $params, \OcSmarty &$smarty)
+function smarty_function_rand(array $params, \OcSmarty & $smarty)
 {
     $min = isset($params['min']) ? $params['min'] + 0 : 0;
     $max = isset($params['max']) ? $params['max'] + 0 : 0;

htdocs/src/Oc/SmartyPlugins/block.t.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
  *
  * @return string
  */
-function smarty_block_t(array $params, $text, \OcSmarty &$smarty, &$repeat)
+function smarty_block_t(array $params, $text, \OcSmarty & $smarty, &$repeat)
 {
     global $opt;
 

htdocs/src/Oc/SmartyPlugins/function.repeat.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  *
  * @return string
  */
-function smarty_function_repeat(array $params, \OcSmarty &$smarty)
+function smarty_function_repeat(array $params, \OcSmarty & $smarty)
 {
     return str_repeat($params['string'], $params['count']);
 }

htdocs/src/Oc/SmartyPlugins/function.season.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  *
  * @return string
  */
-function smarty_function_season(array $params, \OcSmarty &$smarty)
+function smarty_function_season(array $params, \OcSmarty & $smarty)
 {
     $seasons = [];