OpencachingDeutschland / oc-server3

htdocs/viewcache.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     if ($count > 0) {
         $formatter = new FormatterCoordinate();
 
-        for ($i = 0; $i < $count; $i ++) {
+        for ($i = 0; $i < $count; $i++) {
             $waypoints[$i]['coord']['lat'] = $waypoints[$i]['coordinate']->latitude();
             $waypoints[$i]['coord']['lon'] = $waypoints[$i]['coordinate']->longitude();
             $waypoints[$i]['coordinateHtml'] = $formatter->formatHtml($waypoints[$i]['coordinate'], '<br />');

htdocs/lib/settings-dev.inc.php

Spacing +2 added lines, -2 removed lines

@@ -117,11 +117,11 @@
 /* maximum number of failed logins per hour before that IP address is blocked
  * (used to prevent brute-force-attacks)
  */
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
 $opt['page']['headoverlay'] = 'oc_head_alpha3';
 
 // data license
-$opt['logic']['license']['disclaimer'] = true;   // also in lib2/settings-dist.inc.php
+$opt['logic']['license']['disclaimer'] = true; // also in lib2/settings-dist.inc.php
 $opt['logic']['license']['terms'] = $absolute_server_URI . 'articles.php?page=impressum#datalicense';
 
 $opt['logic']['admin']['listingadmin_notification'] = 'root';

htdocs/lib/common.inc.php

Spacing +1 added lines, -1 removed lines

@@ -680,7 +680,7 @@
 
     $str = $translate->t($str, '', basename(__FILE__), __LINE__);
     $args = func_get_args();
-    for ($nIndex = count($args) - 1; $nIndex > 0; $nIndex --) {
+    for ($nIndex = count($args) - 1; $nIndex > 0; $nIndex--) {
         $str = str_replace('%' . $nIndex, $args[$nIndex], $str);
     }
 

htdocs/lib/consts-common.inc.php

Spacing +2 added lines, -2 removed lines

@@ -7,10 +7,10 @@
  *  common constant definitions of lib1 and lib2
  ***************************************************************************/
 
-define('GUI_HTML', 0);   // also defined in lib/consts.inc.php
+define('GUI_HTML', 0); // also defined in lib/consts.inc.php
 define('GUI_TEXT', 1);
 
-define('HTTPS_DISABLED', 0);   // also defined in lib/consts.inc.php
+define('HTTPS_DISABLED', 0); // also defined in lib/consts.inc.php
 define('HTTPS_ENABLED', 1);
 define('HTTPS_ENFORCED', 2);
 

htdocs/lib/settings-sample-dev.inc.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 // database names
 $dbname = 'opencaching';
-$tmpdbname = 'octmp';   // empty db with CREATE and DROP privileges
+$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges
 
 // common developer system settings
 require 'settings-dev.inc.php';

htdocs/lib/sqldebugger.inc.php

Spacing +2 added lines, -2 removed lines

@@ -155,7 +155,7 @@ 
     global $sqldbg_cmdNo;
     global $sqldbg_sumTimes;
 
-    $sqldbg_cmdNo ++;
+    $sqldbg_cmdNo++;
 
     echo '<p class="sqlno"><span class="white">/*</span> SQL command ' . $sqldbg_cmdNo . ' ';
     if ($bSlave) {
@@ -230,7 +230,7 @@ 
 
         while ($r = sql_fetch_assoc($rs)) {
             $usebr = true;
-            $nLine ++;
+            $nLine++;
             if ($bFirstLine == true) {
                 echo '<tr>' . "\n";
                 foreach ($r as $field => $value) {

htdocs/lib/login.class.php

Spacing +4 added lines, -4 removed lines

@@ -18,13 +18,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_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/search.php

Spacing +25 added lines, -25 removed lines

@@ -128,7 +128,7 @@ 
     }
 }
 
-$queryid += 0;  // safety measure: force $queryid to be numeric
+$queryid += 0; // safety measure: force $queryid to be numeric
 
 
 //=========================================================
@@ -149,7 +149,7 @@ 
     if (sql_num_rows($query_rs) == 0) {
         // can happen if logged out after query was created (fix for RT #3915)
         $queryid = 0;
-        goto newquery;  // goto needs PHP 5.3
+        goto newquery; // goto needs PHP 5.3
         /*
         $tpl->error($error_query_not_found);
         */
@@ -185,7 +185,7 @@ 
         }
 
         // get findername from finderid
-        $options['finderid'] = isset($options['finderid']) ? $options['finderid'] + 0 : 0;  // Ocprop
+        $options['finderid'] = isset($options['finderid']) ? $options['finderid'] + 0 : 0; // Ocprop
         if (isset($options['finder']) && $options['finderid'] > 0) {
             $rs_name = sql("SELECT `username` FROM `user` WHERE `user_id`='&1'", $options['finderid']);
             if (sql_num_rows($rs_name) == 1) {
@@ -197,7 +197,7 @@ 
         }
 
         // get ownername from ownerid
-        $options['ownerid'] = isset($options['ownerid']) ? $options['ownerid'] + 0 : 0;  // Ocprop
+        $options['ownerid'] = isset($options['ownerid']) ? $options['ownerid'] + 0 : 0; // Ocprop
         if (isset($options['owner']) && $options['ownerid'] > 0) {
             $rs_name = sql("SELECT `username` FROM `user` WHERE `user_id`='&1'", $options['ownerid']);
             if (sql_num_rows($rs_name) == 1) {
@@ -226,10 +226,10 @@ 
     }
 
     // get the search options parameters and store them in the queries table (to view "the next page")
-    $options['f_userowner'] = isset($_REQUEST['f_userowner']) ? $_REQUEST['f_userowner'] : 0;  // Ocprop
-    $options['f_userfound'] = isset($_REQUEST['f_userfound']) ? $_REQUEST['f_userfound'] : 0;  // Ocprop
+    $options['f_userowner'] = isset($_REQUEST['f_userowner']) ? $_REQUEST['f_userowner'] : 0; // Ocprop
+    $options['f_userfound'] = isset($_REQUEST['f_userfound']) ? $_REQUEST['f_userfound'] : 0; // Ocprop
     $options['f_disabled'] = isset($_REQUEST['f_disabled']) ? $_REQUEST['f_disabled'] : 0;
-    $options['f_inactive'] = isset($_REQUEST['f_inactive']) ? $_REQUEST['f_inactive'] : 1;  // Ocprop
+    $options['f_inactive'] = isset($_REQUEST['f_inactive']) ? $_REQUEST['f_inactive'] : 1; // Ocprop
     // f_inactive formerly was used for both, archived and disabled caches.
     // After adding the separate f_disabled option, it is used only for archived
     // caches, but keeps its name for compatibility with existing stored or
@@ -237,15 +237,15 @@ 
     $options['f_ignored'] = isset($_REQUEST['f_ignored']) ? $_REQUEST['f_ignored'] : 1;
     $options['f_otherPlatforms'] = isset($_REQUEST['f_otherPlatforms']) ? $_REQUEST['f_otherPlatforms'] : 0;
     $options['f_geokrets'] = isset($_REQUEST['f_geokrets']) ? $_REQUEST['f_geokrets'] : 0;
-    $options['expert'] = isset($_REQUEST['expert']) ? $_REQUEST['expert'] : 0;  // Ocprop: 0
+    $options['expert'] = isset($_REQUEST['expert']) ? $_REQUEST['expert'] : 0; // Ocprop: 0
     $options['showresult'] = isset($_REQUEST['showresult']) ? $_REQUEST['showresult'] : 0;
-    $options['output'] = isset($_REQUEST['output']) ? $_REQUEST['output'] : 'HTML';  // Ocprop: HTML
+    $options['output'] = isset($_REQUEST['output']) ? $_REQUEST['output'] : 'HTML'; // Ocprop: HTML
     $options['bbox'] = isset($_REQUEST['bbox']) ? $_REQUEST['bbox'] : false;
 
     if (isset($_REQUEST['cache_attribs'])) {
         if ($_REQUEST['cache_attribs'] != '') {
             $aAttribs = mb_split(';', $_REQUEST['cache_attribs']);
-            for ($i = 0; $i < count($aAttribs); $i ++) {
+            for ($i = 0; $i < count($aAttribs); $i++) {
                 $options['cache_attribs'][$aAttribs[$i] + 0] = $aAttribs[$i] + 0;
             }
             unset($aAttribs);
@@ -259,7 +259,7 @@ 
     if (isset($_REQUEST['cache_attribs_not'])) {
         if ($_REQUEST['cache_attribs_not'] != '') {
             $aAttribs = mb_split(';', $_REQUEST['cache_attribs_not']);
-            for ($i = 0; $i < count($aAttribs); $i ++) {
+            for ($i = 0; $i < count($aAttribs); $i++) {
                 $options['cache_attribs_not'][$aAttribs[$i] + 0] = $aAttribs[$i] + 0;
             }
             unset($aAttribs);
@@ -297,7 +297,7 @@ 
 
         $options['finderid'] = isset($_REQUEST['finderid']) ? $_REQUEST['finderid'] : 0;
         $options['finder'] = isset($_REQUEST['finder']) ? stripslashes($_REQUEST['finder']) : '';
-        $options['logtype'] = isset($_REQUEST['logtype']) ? $_REQUEST['logtype'] : '1,7';  // Ocprop
+        $options['logtype'] = isset($_REQUEST['logtype']) ? $_REQUEST['logtype'] : '1,7'; // Ocprop
     } elseif (isset($_REQUEST['searchbyortplz'])) {
         $onlydigits = is_numeric($_REQUEST['ortplz']);
         if ($onlydigits == true) {
@@ -363,7 +363,7 @@ 
         if (!$list->allowView($password)) {
             $tpl->redirect("cachelists.php");
         }
-        $options['cachelist'] = cachelist::getListById($options['listid']);  // null for invalid ID
+        $options['cachelist'] = cachelist::getListById($options['listid']); // null for invalid ID
         $options['cachelist_pw'] = $password;
     } elseif (isset($_REQUEST['searchall'])) {
         if (!$login->logged_in() &&
@@ -640,7 +640,7 @@ 
                                 }
                                 $sqlhashes .= '`gns_search`.`simplehash`=' . sprintf("%u", crc32($searchstring));
 
-                                $wordscount ++;
+                                $wordscount++;
                             }
                         }
 
@@ -990,7 +990,7 @@ 
                 $sql_where[] = '`s' . $n . '`.`hash`=\'' . sql_escape($h) . '\'';
                 $sql_where[] = '`s' . $n . '`.`object_type` IN (' . implode(',', $ft_types) . ')';
 
-                $n ++;
+                $n++;
             }
 
             $sqlFilter =
@@ -1148,7 +1148,7 @@ 
         if ($options['cachetype'] != '') {
             $types = explode(';', $options['cachetype']);
             if (count($types) < sql_value_slave("SELECT COUNT(*) FROM `cache_type`", 0)) {
-                for ($i = 0; $i < count($types); $i ++) {
+                for ($i = 0; $i < count($types); $i++) {
                     $types[$i] = "'" . sql_escape($types[$i]) . "'";
                 }
                 $sql_where[] = '`caches`.`type` IN (' . implode(',', $types) . ')';
@@ -1158,7 +1158,7 @@ 
         if ($options['cachesize'] != '') {
             $sizes = explode(';', $options['cachesize']);
             if (count($sizes) < sql_value_slave("SELECT COUNT(*) FROM `cache_size`", 0)) {
-                for ($i = 0; $i < count($sizes); $i ++) {
+                for ($i = 0; $i < count($sizes); $i++) {
                     $sizes[$i] = "'" . sql_escape($sizes[$i]) . "'";
                 }
                 $sql_where[] = '`caches`.`size` IN (' . implode(',', $sizes) . ')';
@@ -1243,7 +1243,7 @@ 
     //  X6. load output module and output-dependent options
     //=================================================================
 
-    $output_module = mb_strtolower($options['output']);  // Ocprop: HTML, gpx
+    $output_module = mb_strtolower($options['output']); // Ocprop: HTML, gpx
 
     $map2_bounds = ($output_module == 'map2bounds');
     if ($map2_bounds) {
@@ -1785,9 +1785,9 @@ 
     }
     $tpl->assign('ortplz', $ortplz);
     if ($options['searchtype'] == 'byplz') {
-        $dByOrtPlzChecked = ($options['searchtype'] == 'byplz');  // Ocprop
+        $dByOrtPlzChecked = ($options['searchtype'] == 'byplz'); // Ocprop
     } elseif ($options['searchtype'] == 'byort') {
-        $dByOrtPlzChecked = ($options['searchtype'] == 'byort');  // Ocprop
+        $dByOrtPlzChecked = ($options['searchtype'] == 'byort'); // Ocprop
     } else {
         $dByOrtPlzChecked = false;
     }
@@ -2022,7 +2022,7 @@ 
             $line = mb_ereg_replace('{color}', $rAttrGroup['color'], $line);
 
             $group_line .= $line;
-            $nLineAttrCount2 ++;
+            $nLineAttrCount2++;
         }
         sql_free_result($rs);
 
@@ -2133,7 +2133,7 @@ 
             $line = mb_ereg_replace('{color}', $rAttrGroup['color'], $line);
 
             $group_line .= $line;
-            $nLineAttrCount1 ++;
+            $nLineAttrCount1++;
         }
         sql_free_result($rs);
 
@@ -2278,7 +2278,7 @@ 
 
 function outputUniidSelectionForm($uniSql, $options)
 {
-    global $tpl;  // settings
+    global $tpl; // settings
     global $locline, $secondlocationname;
 
     $urlparamString = prepareLocSelectionForm($options);
@@ -2388,7 +2388,7 @@ 
         $thislocation = mb_ereg_replace('{locid}', urlencode($r['uni_id']), $thislocation);
         $thislocation = mb_ereg_replace('{nr}', $nr, $thislocation);
 
-        $nr ++;
+        $nr++;
         $locations .= $thislocation . "\n";
     }
     sql_free_result($rs);
@@ -2481,7 +2481,7 @@ 
             $thislocation = mb_ereg_replace('{bgcolor}', $bgcolor2, $thislocation);
         }
 
-        $nr ++;
+        $nr++;
         $locations .= $thislocation . "\n";
     }
 

htdocs/newcachesrest.php

Spacing +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
 $tpl->caching = true;
 $tpl->cache_lifetime = 3600;
 
-$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :
-    (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
+$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
 
 if (!$tpl->is_cached()) {
     $newCaches = array();