OpencachingDeutschland / oc-server3

htdocs/lib2/menu.class.php

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
         // add country-dependent town list for small map
         $country = $login->getUserCountry();
         if ($opt['map']['towns']['enable'] &&
-            isset($build_map_towns_menu) && $build_map_towns_menu &&   // optimization
+            isset($build_map_towns_menu) && $build_map_towns_menu && // optimization
             isset($opt['map']['towns'][$country]['enable']) && $opt['map']['towns'][$country]['enable']
         ) {
             $rsTowns = sqlf(
@@ -73,7 +73,7 @@ 
                         'parent' => MNU_MAP
                     ];
                     $menuitem[MNU_MAP]['subitems'][] = $menu_map;
-                    ++ $menu_map;
+                    ++$menu_map;
                 }
             }
         }
@@ -100,7 +100,7 @@ 
         $rsSubmenu = sqlf("SELECT `id` FROM `sys_menu` WHERE `parent`=0 ORDER BY `parent` ASC, `position` ASC");
         while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
             $aMenu[MNU_ROOT]['subitems'][$nPos] = $rSubmenu['id'];
-            $nPos ++;
+            $nPos++;
         }
         sql_free_result($rsSubmenu);
         fwrite($f, "\n");
@@ -137,7 +137,7 @@ 
             );
             while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
                 $aMenu[$r['id']]['subitems'][$nPos] = $rSubmenu['id'];
-                $nPos ++;
+                $nPos++;
             }
             sql_free_result($rsSubmenu);
         }

htdocs/lib2/ss_zip.class.php

Spacing +9 added lines, -9 removed lines

@@ -143,9 +143,9 @@ 
 
         }
         $fnl = strlen($filename);
-        $fh = "\x14\x00";    // ver needed to extract
-        $fh .= "\x00\x00";    // gen purpose bit flag
-        $fh .= "\x08\x00";    // compression method
+        $fh = "\x14\x00"; // ver needed to extract
+        $fh .= "\x00\x00"; // gen purpose bit flag
+        $fh .= "\x08\x00"; // compression method
         $fh .= "\x00\x00\x00\x00"; // last mod time and date
         $fh .= pack(
             "V3v2",
@@ -170,16 +170,16 @@ 
                 "va*v3V2",
                 0,
                 $fh,
-                0,        // file comment length
-                0,        // disk number start
-                0,        // internal file attributes
-                $attr,    // external file attributes - 'archive/directory' bit set
+                0, // file comment length
+                0, // disk number start
+                0, // internal file attributes
+                $attr, // external file attributes - 'archive/directory' bit set
                 $this->offset
             ) . $filename;
 
         $this->offset += 42 + $fnl + $gzsize;
         $this->cdir[] = $cdir;
-        $this->cnt ++;
+        $this->cnt++;
         $this->idx = $this->cnt - 1;
     }
 
@@ -228,7 +228,7 @@ 
                 $cdsl, // size of central dir
                 $zdsl, // offset to start of central dir
                 0
-            );              // .zip file comment length
+            ); // .zip file comment length
         return $this->zipfile;
     }
 

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/lib2/db.inc.php

Spacing +9 added lines, -9 removed lines

@@ -185,10 +185,10 @@ 
         // & escaped?
         $escapesCount = 0;
         while ((($nextarg - $escapesCount - 1) > 0) && (substr($sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
-            $escapesCount ++;
+            $escapesCount++;
         }
         if (($escapesCount % 2) == 1) {
-            $nextarg ++;
+            $nextarg++;
         } else {
             $nextchar = substr($sql, $nextarg + 1, 1);
             if (is_numeric($nextchar)) {
@@ -199,7 +199,7 @@ 
                 while (preg_match('/^[0-9]{1}/', $nextchar) == 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -225,13 +225,13 @@ 
                         // strip apostroph and insert NULL
                         $filtered_sql = substr($filtered_sql, 0, strlen($filtered_sql) - 1);
                         $filtered_sql .= 'NULL';
-                        $sqlpos ++;
+                        $sqlpos++;
                     } else {
                         $filtered_sql .= 'NULL';
                     }
                 }
 
-                $sqlpos ++;
+                $sqlpos++;
             } else {
                 $arglength = 0;
                 $arg = '';
@@ -241,7 +241,7 @@ 
                 while (preg_match('/^[a-zA-Z0-9_]{1}/', $nextchar) == 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -288,12 +288,12 @@ 
         $escapesCount = 0;
         while ((($nextarg - $escapesCount - 1) > 0)
             && (substr($filtered_sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
-            $escapesCount ++;
+            $escapesCount++;
         }
         if (($escapesCount % 2) == 0) {
             // strip escapes of &
             $filtered_sql = substr($filtered_sql, 0, $nextarg) . '&' . substr($filtered_sql, $nextarg + 2);
-            $nextarg --;
+            $nextarg--;
         }
 
         $nextarg = strpos($filtered_sql, '\&', $nextarg + 2);
@@ -837,7 +837,7 @@ 
         AND `online`= 1
         AND (TIMESTAMP(NOW())-TIMESTAMP(`last_check`)+`time_diff`<'&1')
         ORDER BY `w` DESC LIMIT 1",
-        - 1,
+        -1,
         $nMaxTimeDiff
     );
 

htdocs/lib2/html2text.class.php

Spacing +2 added lines, -2 removed lines

@@ -534,7 +534,7 @@ 
         if (substr($link, 0, 7) == 'http://' || substr($link, 0, 8) == 'https://' ||
             substr($link, 0, 7) == 'mailto:'
         ) {
-            $this->_link_count ++;
+            $this->_link_count++;
             $this->_link_list .= "[" . $this->_link_count . "] $link\n";
             $additional = ' [' . $this->_link_count . ']';
         } elseif (substr($link, 0, 11) == 'javascript:') {
@@ -542,7 +542,7 @@ 
             $additional = '';
             // what about href="#anchor" ?
         } else {
-            $this->_link_count ++;
+            $this->_link_count++;
             $this->_link_list .= "[" . $this->_link_count . "] " . $this->url;
             if (substr($link, 0, 1) != '/') {
                 $this->_link_list .= '/';

htdocs/lib2/util.inc.php

Spacing +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
 
     while ($nCurPos < mb_strlen($str)) {
         $nNextSep = mb_strlen($str);
-        for ($nSepPos = 0; $nSepPos < mb_strlen($sep); $nSepPos ++) {
+        for ($nSepPos = 0; $nSepPos < mb_strlen($sep); $nSepPos++) {
             $nThisPos = mb_strpos($str, mb_substr($sep, $nSepPos, 1), $nCurPos);
             if ($nThisPos !== false) {
                 if ($nNextSep > $nThisPos) {

htdocs/map2.php

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
                        WHERE option_id=6 AND user_id='&1'", true, $login->userid))
 ) {
     $fullscreen = true;
-    $tpl->popup = true;        // disables page header and -frame
+    $tpl->popup = true; // disables page header and -frame
     $tpl->popupmargin = false;
 } else {
     $fullscreen = false;
@@ -456,7 +456,7 @@ 
     $caches_found = 0;
     while ($r = sql_fetch_assoc($rs)) {
         echo '<cache name="' . xmlentities($r['name']) . '" wpoc="' . xmlentities($r['wp_oc']) . '" />' . "\n";
-        ++ $caches_found;
+        ++$caches_found;
     }
     sql_free_result($rs);
 
@@ -496,7 +496,7 @@ 
         "SELECT `slave_id`
         FROM `map2_result`
         WHERE `result_id`='&1' AND DATE_ADD(`date_created`, INTERVAL '&2' SECOND)>NOW()",
-        - 2,
+        -2,
         $nResultId,
         $opt['map']['maxcacheage']
     );

htdocs/log.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
     // get logtext editormode (from form or from userprofile)
     // 1 = text; 2 = HTML; 3 = tinyMCE
     if (isset($_POST['descMode'])) {
-        $descMode = $_POST['descMode'] + 0;  // Ocprop: 2
+        $descMode = $_POST['descMode'] + 0; // Ocprop: 2
         if (($descMode < 1) || ($descMode > 3)) {
             $descMode = 3;
         }

htdocs/editcache.php

Spacing +23 added lines, -23 removed lines

@@ -139,7 +139,7 @@ 
                 }
 
                 //here we read all used information from the form if submitted, otherwise from DB
-                $cache_name = trim(isset($_POST['name']) ? $_POST['name'] : $cache_record['name']);  // Ocprop
+                $cache_name = trim(isset($_POST['name']) ? $_POST['name'] : $cache_record['name']); // Ocprop
                 $cache_type = isset($_POST['type']) ? $_POST['type'] : $cache_record['type'];
                 if (!isset($_POST['size'])) {
                     if ($cache_type == 4 || $cache_type == 5) {
@@ -153,15 +153,15 @@ 
                 $cache_hidden_day = isset($_POST['hidden_day']) ? $_POST['hidden_day'] : date(
                     'd',
                     strtotime($cache_record['date_hidden'])
-                );  // Ocprop
+                ); // Ocprop
                 $cache_hidden_month = isset($_POST['hidden_month']) ? $_POST['hidden_month'] : date(
                     'm',
                     strtotime($cache_record['date_hidden'])
-                );  // Ocprop
+                ); // Ocprop
                 $cache_hidden_year = isset($_POST['hidden_year']) ? $_POST['hidden_year'] : date(
                     'Y',
                     strtotime($cache_record['date_hidden'])
-                );  // Ocprop
+                ); // Ocprop
 
                 if (is_null($cache_record['date_activate'])) {
                     $cache_activate_day = isset($_POST['activate_day']) ? $_POST['activate_day'] : date('d');
@@ -187,11 +187,11 @@ 
                     );
                 }
 
-                $cache_difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : $cache_record['difficulty'];  // Ocprop
-                $cache_terrain = isset($_POST['terrain']) ? $_POST['terrain'] : $cache_record['terrain'];  // Ocprop
-                $cache_country = isset($_POST['country']) ? $_POST['country'] : $cache_record['country'];  // Ocprop
+                $cache_difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : $cache_record['difficulty']; // Ocprop
+                $cache_terrain = isset($_POST['terrain']) ? $_POST['terrain'] : $cache_record['terrain']; // Ocprop
+                $cache_country = isset($_POST['country']) ? $_POST['country'] : $cache_record['country']; // Ocprop
                 $show_all_countries = isset($_POST['show_all_countries']) ? $_POST['show_all_countries'] : 0;
-                $status = isset($_POST['status']) ? $_POST['status'] : $cache_record['status'];  // Ocprop
+                $status = isset($_POST['status']) ? $_POST['status'] : $cache_record['status']; // Ocprop
                 $status_old = $cache_record['status'];
                 $search_time = isset($_POST['search_time']) ? $_POST['search_time'] : $cache_record['search_time'];
                 $way_length = isset($_POST['way_length']) ? $_POST['way_length'] : $cache_record['way_length'];
@@ -253,7 +253,7 @@ 
 
                 $log_pw = isset($_POST['log_pw']) ? mb_substr($_POST['log_pw'], 0, 20) : $cache_record['logpw'];
                 // fix #4356: gc waypoints are frequently copy&pasted with leading spaces
-                $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : $cache_record['wp_gc'];  // Ocprop
+                $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : $cache_record['wp_gc']; // Ocprop
                 $showlists = isset($_POST['showlists']) ? 1 : $cache_record['show_cachelists'] + 0;
                 $protect_old_coords = isset($_POST['protect_old_coords']) ? 1 : $cache_record['protect_old_coords'] + 0;
 
@@ -265,12 +265,12 @@ 
 
                 if (isset($_POST['latNS'])) {
                     //get coords from post-form
-                    $coords_latNS = $_POST['latNS'];  // Ocprop
-                    $coords_lonEW = $_POST['lonEW'];  // Ocprop
-                    $coords_lat_h = $_POST['lat_h'];  // Ocprop
-                    $coords_lon_h = $_POST['lon_h'];  // Ocprop
-                    $coords_lat_min = $_POST['lat_min'];  // Ocprop
-                    $coords_lon_min = $_POST['lon_min'];  // Ocprop
+                    $coords_latNS = $_POST['latNS']; // Ocprop
+                    $coords_lonEW = $_POST['lonEW']; // Ocprop
+                    $coords_lat_h = $_POST['lat_h']; // Ocprop
+                    $coords_lon_h = $_POST['lon_h']; // Ocprop
+                    $coords_lat_min = $_POST['lat_min']; // Ocprop
+                    $coords_lon_min = $_POST['lon_min']; // Ocprop
                 } else {
                     //get coords from DB
                     $coords_lon = $cache_record['longitude'];
@@ -564,7 +564,7 @@ 
                                     $logtype = 13;
                                     break;
                                 default:
-                                    $logtype = 0;  // ???
+                                    $logtype = 0; // ???
                             }
                             if ($logtype > 0) {
                                 sql(
@@ -585,7 +585,7 @@ 
 
                         // update cache attributes
                         $attriblist = "999";
-                        for ($i = 0; $i < count($cache_attribs); $i ++) {
+                        for ($i = 0; $i < count($cache_attribs); $i++) {
                             if ($cache_attribs[$i] + 0 > 0) {
                                 sql(
                                     "INSERT IGNORE INTO `caches_attributes` (`cache_id`, `attrib_id`) VALUES('&1', '&2')",
@@ -719,7 +719,7 @@ 
                         $line = mb_ereg_replace('{name}', escape_javascript($record['name']), $line);
                         $line = mb_ereg_replace('{color}', $rAttrGroup['color'], $line);
                         $group_line .= $line;
-                        $nLineAttrCount ++;
+                        $nLineAttrCount++;
 
                         $line = $cache_attrib_js;
                         $line = mb_ereg_replace('{id}', $record['id'], $line);
@@ -776,7 +776,7 @@ 
 
                 //difficulty
                 $difficulty_options = '';
-                for ($i = 2; $i <= 10; $i ++) {
+                for ($i = 2; $i <= 10; $i++) {
                     if ($cache_difficulty == $i) {
                         $difficulty_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
                     } else {
@@ -788,7 +788,7 @@ 
 
                 //build terrain options
                 $terrain_options = '';
-                for ($i = 2; $i <= 10; $i ++) {
+                for ($i = 2; $i <= 10; $i++) {
                     if ($cache_terrain == $i) {
                         $terrain_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
                     } else {
@@ -955,7 +955,7 @@ 
                     $tmp = mb_ereg_replace('{publish_notnow_checked}', ($publish == 'notnow') ? 'checked' : '', $tmp);
 
                     $activation_hours = '';
-                    for ($i = 0; $i <= 23; $i ++) {
+                    for ($i = 0; $i <= 23; $i++) {
                         if ($cache_activate_hour == $i) {
                             $activation_hours .= '<option value="' . $i . '" selected="selected">' . $i . '</option>';
                         } else {
@@ -983,7 +983,7 @@ 
                         $cache_id
                     );
 
-                    for ($i = 0; $i < mysql_num_rows($rspictures); $i ++) {
+                    for ($i = 0; $i < mysql_num_rows($rspictures); $i++) {
                         $tmpline = ($i == 0 ? $pictureline0 : $pictureline);
                         $pic_record = sql_fetch_array($rspictures);
 
@@ -1066,7 +1066,7 @@ 
                 tpl_set_var('showlists_checked', $showlists ? 'checked="checked"' : '');
                 tpl_set_var('protectcoords_checked', $protect_old_coords ? 'checked="checked"' : '');
 
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
             } else {
                 //TODO: not the owner