OpencachingDeutschland / oc-server3

local/maintenance/email_recovery.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
             $er->resendActivationCodes();
             break;
         default:
-            die('invalid option: '. $option . "\n");
+            die('invalid option: ' . $option . "\n");
     }
 }
 
@@ -297,7 +297,7 @@ 
         while ($r = sql_fetch_assoc($rs)) {
             $user = new user($r['user_id']);
             $user->sendRegistrationCode();
-            ++ $n;
+            ++$n;
         }
         sql_free_result($rs);
         self::message(0, $n . ' users have been re-sent the activation code');

local/stat/coordstat.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
     $year = substr($cache['date_created'], 0, 4);
     if ($year >= 2005 && $year <= date("Y") && ($lat != 0 || $long != 0)) {
         $years[$year] = true;
-        $liste[$lat][$long]["caches"][$year] ++;
+        $liste[$lat][$long]["caches"][$year]++;
     }
 }
 mysql_free_result($rs);
@@ -50,7 +50,7 @@ 
         $year = substr($cache["date"], 0, 4);
         if ($year >= 2005 && $year <= date("Y") && ($lat != 0 || $long != 0)) {
             $years[$year] = true;
-            $liste[$lat][$long]["logs"][$year] ++;
+            $liste[$lat][$long]["logs"][$year]++;
         }
     }
     mysql_free_result($rs);
@@ -67,7 +67,7 @@ 
 while ($cache = sql_fetch_assoc($rs)) {
     $lat = floor($cache["latitude"] / $grid);
     $long = floor($cache["longitude"] / $grid);
-    $liste[$lat][$long]["caches"]["all"] ++;
+    $liste[$lat][$long]["caches"]["all"]++;
     $liste[$lat][$long]["logs"]["all"] += $cache["logs"];
 }
 mysql_free_result($rs);

local/ocxml11client/xml2array.inc.php

Spacing +3 added lines, -3 removed lines

@@ -16,14 +16,14 @@
 
     public function push_pos(&$pos)
     {
-        $this->stack[count($this->stack)] =& $pos;
-        $this->stack_ref =& $pos;
+        $this->stack[count($this->stack)] = & $pos;
+        $this->stack_ref = & $pos;
     }
 
     public function pop_pos()
     {
         unset($this->stack[count($this->stack) - 1]);
-        $this->stack_ref =& $this->stack[count($this->stack) - 1];
+        $this->stack_ref = & $this->stack[count($this->stack) - 1];
     }
 
     public function parse($strInputXML)

local/ocxml11client/settings-dist.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 // Sessions verwenden?
 $opt['session'] = 1;
-$opt['zip'] = 'gzip';                // 0; zip; bzip2; gzip
+$opt['zip'] = 'gzip'; // 0; zip; bzip2; gzip
 
 // Gebietsauswahl nach Land
 $opt['bycountry'] = 0;

local/ocxml11client/index.php

Spacing +5 added lines, -5 removed lines

@@ -67,7 +67,7 @@ 
     $nFileNr = 0;
     $rs = sql('SELECT `id`, `url` FROM `pictures` WHERE `local`=0');
     while ($r = sql_fetch_array($rs)) {
-        $nFileNr ++;
+        $nFileNr++;
         $fileparts = mb_split('/', $r['url']);
         $filename = $fileparts[count($fileparts) - 1];
 
@@ -237,7 +237,7 @@ 
             exit;
         }
 
-        for ($i = 1; $i <= $filescount; $i ++) {
+        for ($i = 1; $i <= $filescount; $i++) {
             echo "Download Paket: " . $i . ' von ' . $filescount . "\n";
 
             $fileurl = $opt['url_getsession'];
@@ -411,11 +411,11 @@ 
                             if ($sSubElement != '') {
                                 // vorheriges element zuerst schlißen
                                 $sSubElement = '';
-                                $nRecursionLevel --;
+                                $nRecursionLevel--;
                             }
 
                             $sSubElement = mb_strtoupper($xmlReader->name);
-                            $nRecursionLevel ++;
+                            $nRecursionLevel++;
 
                             // attribute auslesen
                             if ($xmlReader->moveToFirstAttribute()) {
@@ -432,7 +432,7 @@ 
                         } else {
                             if ($xmlReader->nodeType == XMLReader::END_ELEMENT) {
                                 $sSubElement = '';
-                                $nRecursionLevel --;
+                                $nRecursionLevel--;
                             }
                         }
                     }

htdocs/lib/settings-sample-vagrant.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/lang/de/ocstyle/main.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -175,7 +175,7 @@
                                         }
                                         $nLastGroup = $tpl_usercountries[$i]['group'];
 
-                                        echo '<option value="' . htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8') . '"' . (($sUserCountry==$tpl_usercountries[$i]['country']) ? ' selected="selected"' : '') . '>' . htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8') . '</option>';
+                                        echo '<option value="' . htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8') . '"' . (($sUserCountry == $tpl_usercountries[$i]['country']) ? ' selected="selected"' : '') . '>' . htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8') . '</option>';
                                     }
 ?>
                                 </select>&nbsp;

htdocs/newcache.php

Spacing +25 added lines, -25 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') {
@@ -237,7 +237,7 @@ 
         // fill activate hours
         $activate_hour = isset($_POST['activate_hour']) ? $_POST['activate_hour'] + 0 : date('H') + 0;
         $activation_hours = '';
-        for ($i = 0; $i <= 23; $i ++) {
+        for ($i = 0; $i <= 23; $i++) {
             if ($activate_hour == $i) {
                 $activation_hours .= '<option value="' . $i . '" selected="selected">' . $i . '</option>';
             } else {
@@ -253,13 +253,13 @@ 
 
         // 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 ++) {
+        for ($i = 2; $i <= 10; $i++) {
             if ($difficulty == $i) {
                 $difficulty_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
             } else {
@@ -270,9 +270,9 @@ 
         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 ++) {
+        for ($i = 2; $i <= 10; $i++) {
             if ($terrain == $i) {
                 $terrain_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
             } else {
@@ -508,7 +508,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);
@@ -903,7 +903,7 @@ 
                 );
 
                 // insert cache-attributes
-                for ($i = 0; $i < count($cache_attribs); $i ++) {
+                for ($i = 0; $i < count($cache_attribs); $i++) {
                     if (($cache_attribs[$i] + 0) > 0) {
                         sql(
                             "INSERT INTO `caches_attributes` (`cache_id`, `attrib_id`) VALUES ('&1', '&2')",

htdocs/restorecaches.php

Spacing +7 added lines, -7 removed lines

@@ -367,7 +367,7 @@ 
     $rs = sql("SELECT * FROM `caches` WHERE `cache_id` IN " . $cachelist);
     while ($r = sql_fetch_assoc($rs)) {
         $nextcd[$r['wp_oc']] = $r;
-        $user_id = $r['user_id'];     // is used later for logs
+        $user_id = $r['user_id']; // is used later for logs
     }
     sql_free_result($rs);
 
@@ -467,7 +467,7 @@ 
         "SELECT * FROM `caches_attributes_modified`
          WHERE `cache_id` IN " . $cachelist . "  /* OConly attrib is shown, but not restorable */
          ORDER BY `date_modified` ASC"
-    );   // order doesn't matter as long it is date only
+    ); // order doesn't matter as long it is date only
     while ($r = sql_fetch_assoc($rs)) {
         append_data(
             $data,
@@ -623,7 +623,7 @@ 
         "SELECT *, " . $piccacheid . "AS `cache_id` FROM `pictures_modified`
          WHERE " . $piccacheid . " IN " . $cachelist . "
          ORDER BY `date_modified` ASC"
-    );  // order is relevant for the case of restore-reverts
+    ); // order is relevant for the case of restore-reverts
     while ($r = sql_fetch_assoc($rs)) {
         $r['date_modified'] = substr($r['date_modified'], 0, 10);
         switch ($r['operation']) {
@@ -727,7 +727,7 @@ 
 {
     global $opt, $login;
 
-    sql("SET @restoredby='&1'", $login->userid);         // is evaluated by trigger functions
+    sql("SET @restoredby='&1'", $login->userid); // is evaluated by trigger functions
     sql_slave("SET @restoredby='&1'", $login->userid);
 
     $restored = array();
@@ -1019,7 +1019,7 @@ 
                         // id, uuid, date_created and last_modified are set automatically;
                         // picture will be updated automatically on picture-restore
                         $log = new cachelog();
-                        $log->setNode($r['node']);  // cachelog class currently does not initialize node field
+                        $log->setNode($r['node']); // cachelog class currently does not initialize node field
                         $log->setCacheId($r['cache_id']);
                         $log->setUserId($r['user_id']);
                         $log->setType($r['type'], true);
@@ -1071,7 +1071,7 @@ 
                 }  // not already processed
 
                 if ($error != "") {
-                    $restored[$wp]['internal error - could not $error log ' + $r['id'] + "/" + $logid];
+                    $restored[$wp]['internal error - could not $error log ' +$r['id'] + "/" +$logid];
                 }
                 if ($logs_restored) {
                     $restored[$wp]['logs'] = true;
@@ -1203,7 +1203,7 @@ 
                 }  // not already processed
 
                 if ($error != "") {
-                    $restored[$wp]['internal error - could not $error picture ' . $r['id'] + "/" + $picid] = true;
+                    $restored[$wp]['internal error - could not $error picture ' . $r['id'] + "/" +$picid] = true;
                 }
                 if ($pics_restored) {
                     $restored[$wp]['pictures'] = true;