OpencachingDeutschland / oc-server3

htdocs/editdesc.php

Spacing +6 added lines, -6 removed lines

@@ -21,8 +21,8 @@ 
     // check for old-style parameters
     if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid']))  // Ocprop
     {
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
-        $desc_lang = $_REQUEST['desclang'];  // Ocprop
+        $cache_id = $_REQUEST['cacheid']; // Ocprop
+        $desc_lang = $_REQUEST['desclang']; // Ocprop
 
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
         if (mysql_num_rows($rs) == 1) {
@@ -90,7 +90,7 @@ 
                 if (isset($_POST['post']))  // Ocprop
                 {
                     //here we read all used information from the form if submitted
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1; // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -123,7 +123,7 @@ 
                         $oldDescMode = $descMode;
                     }
 
-                    $short_desc = $_POST['short_desc'];  // Ocprop
+                    $short_desc = $_POST['short_desc']; // Ocprop
                     $hint = htmlspecialchars($_POST['hints'], ENT_COMPAT, 'UTF-8');
                     $desclang = $_POST['desclang'];
                     $show_all_langs = isset($_POST['show_all_langs_value']) ? $_POST['show_all_langs_value'] : 0;
@@ -138,7 +138,7 @@ 
                     }
 
                     // Text from textarea
-                    $desc = $_POST['desc'];  // Ocprop
+                    $desc = $_POST['desc']; // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -297,7 +297,7 @@ 
                 tpl_set_var('desclang', htmlspecialchars($desc_lang, ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('desclang_name', htmlspecialchars(db_LanguageFromShort($desc_lang), ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cachename', htmlspecialchars($desc_record['name'], ENT_COMPAT, 'UTF-8'));
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
 
                 // Text / normal HTML / HTML editor

htdocs/restorecaches.php

Indentation +1 added lines, -1 removed lines

@@ -1011,7 +1011,7 @@
                             }
                             $logs_restored = true;
                         }
-                       // if it was not already restored by a later restore operation ...
+                        // if it was not already restored by a later restore operation ...
                     } elseif (sql_value("SELECT `id` FROM `cache_logs` WHERE `id`='&1'", 0, $revert_logid) == 0) {
                         // id, uuid, date_created and last_modified are set automatically;
                         // picture will be updated automatically on picture-restore

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;

htdocs/newcaches.php

Spacing +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
 $tpl->change_country_inpage = true;
 
 $startat = isset($_REQUEST['startat']) ? floor($_REQUEST['startat'] + 0) : 0;
-$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :
-    (isset($_REQUEST['country']) ? $_REQUEST['country'] : '');
+$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : '');
 $cachetype = isset($_REQUEST['cachetype']) ? $_REQUEST['cachetype'] + 0 : 0;
 $bEvents = ($cachetype == 6);
 

htdocs/lib2/logic/logpics.class.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         global $login;
 
         $fields =
-          "`pics`.`uuid` AS `pic_uuid`,
+            "`pics`.`uuid` AS `pic_uuid`,
            `pics`.`url` AS `pic_url`,
            `pics`.`title`,
            `pics`.`date_created`,

Spacing +4 added lines, -4 removed lines

@@ -17,12 +17,12 @@
     const FOR_STARTPAGE_GALLERY = 1;
     const FOR_NEWPICS_GALLERY = 2;
     const FOR_USER_STAT = 3;
-    const FOR_USER_GALLERY = 4;   // params: userid
+    const FOR_USER_GALLERY = 4; // params: userid
     const FOR_MYHOME_GALLERY = 5;
-    const FOR_CACHE_STAT = 6;     // params: cacheid
-    const FOR_CACHE_GALLERY = 7;  // params: cacheid
+    const FOR_CACHE_STAT = 6; // params: cacheid
+    const FOR_CACHE_GALLERY = 7; // params: cacheid
 
-    const MAX_PICTURES_PER_GALLERY_PAGE = 48;   // must be multiple of 6
+    const MAX_PICTURES_PER_GALLERY_PAGE = 48; // must be multiple of 6
 
 
     public static function get($purpose, $userid = 0, $cacheid = 0)

htdocs/lib2/logic/logtypes.inc.php

Spacing +11 added lines, -11 removed lines

@@ -91,28 +91,28 @@ 
 
     $allowed_logtypes = array();
     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
@@ -151,7 +151,7 @@ 
             } elseif (!$opt['logic']['admin']['team_comments_only_for_reports'] || admin_has_open_report($cache_id)) {
                 // allowed for report processing by admins
                 $allowed = true;
-            } elseif ($login->hasAdminPriv(ADMIN_USER) && in_array($rCache['status'], [6,7])) {
+            } elseif ($login->hasAdminPriv(ADMIN_USER) && in_array($rCache['status'], [6, 7])) {
                 // allowed for admins && locked caches, see http://forum.opencaching.de/index.php?topic=3102.msg39517#msg39517
                 $allowed = true;
             } else {

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/sitemapxml.class.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 {
     public $sDefaultChangeFreq = 'monthly';
     public $nMaxFileSize = 9961472; // max file size, 10MB by specification
-    public $nMaxUrlCount = 50000;   // max number of URLs per file, 50000 by specification
+    public $nMaxUrlCount = 50000; // max number of URLs per file, 50000 by specification
 
     public $sPath = '';
     public $sDomain = '';
@@ -75,7 +75,7 @@ 
 
         // open new XML file?
         if ($this->oSitemapFile === false) {
-            $this->nSitemapIndex ++;
+            $this->nSitemapIndex++;
             $sFilename = 'sitemap-' . $this->nSitemapIndex . '.xml.gz';
             $this->oSitemapFile = gzopen($this->sPath . $sFilename, 'wb');
 
@@ -91,7 +91,7 @@ 
         // write string to XML
         gzwrite($this->oSitemapFile, $str);
         $this->nWrittenSize += strlen($str);
-        $this->nWrittenCount ++;
+        $this->nWrittenCount++;
     }
 
     public function close()

htdocs/lib2/logic/coordinate.class.php

Spacing +26 added lines, -26 removed lines

@@ -175,8 +175,8 @@ 
                 0
             ];
         }
-        $lw = (float) $this->nLon;
-        $bw = (float) $this->nLat;
+        $lw = (float)$this->nLon;
+        $bw = (float)$this->nLat;
 
         //WGS84 Datum
         //Große Halbachse a und Abplattung f
@@ -195,9 +195,9 @@ 
 
         //Koeffizienten zur Berechnung der Meridianbogenlänge
         $e0 = $c * (pi() / 180) * (1 - 3 * $ex2 / 4 + 45 * $ex4 / 64 - 175 * $ex6 / 256 + 11025 * $ex8 / 16384);
-        $e2 = $c * (- 3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
+        $e2 = $c * (-3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
         $e4 = $c * (15 * $ex4 / 256 - 105 * $ex6 / 1024 + 2205 * $ex8 / 16384);
-        $e6 = $c * (- 35 * $ex6 / 3072 + 315 * $ex8 / 12288);
+        $e6 = $c * (-35 * $ex6 / 3072 + 315 * $ex8 / 12288);
 
         //Längenzone lz und Breitenzone (Band) bz
         $lzn = intval(($lw + 180) / 6) + 1;
@@ -223,7 +223,7 @@ 
         if ($lzn < 10) {
             $lz = "0" . $lzn;
         }
-        $bd = (int) (1 + ($bw + 80) / 8);
+        $bd = (int)(1 + ($bw + 80) / 8);
         $bz = substr($b_sel, $bd - 1, 1);
 
         //Geographische Breite in Radianten br
@@ -268,20 +268,20 @@ 
         $ew = 0.9996 * ($nd * $cos1 * $dl + $nd * $cos3 * (1 - $tan2 + $etasq) * $dl3 / 6 +
                 $nd * $cos5 * (5 - 18 * $tan2 + $tan4) * $dl5 / 120) + 500000;
 
-        $nk = $nw - (int) $nw;
+        $nk = $nw - (int)$nw;
         if ($nk < 0.5) {
-            $nw = '' . (int) $nw;
+            $nw = '' . (int)$nw;
         } else {
-            $nw = '' . ((int) $nw + 1);
+            $nw = '' . ((int)$nw + 1);
         }
 
         while (strlen($nw) < 7) {
             $nw = '0' . $nw;
         }
 
-        $nk = $ew - (int) $ew;
+        $nk = $ew - (int)$ew;
         if ($nk < 0.5) {
-            $ew = '0' . (int) $ew;
+            $ew = '0' . (int)$ew;
         } else {
             $ew = '0' . intval($ew + 1);
         }
@@ -331,8 +331,8 @@ 
                 0
             ];
         }
-        $lw = (float) $lw;
-        $bw = (float) $bw;
+        $lw = (float)$lw;
+        $bw = (float)$bw;
 
         // Quellsystem WGS 84 Datum
         // Große Halbachse a und Abplattung fq
@@ -410,8 +410,8 @@ 
                 0
             ];
         }
-        $lp = (float) $lp;
-        $bp = (float) $bp;
+        $lp = (float)$lp;
+        $bp = (float)$bp;
 
         // Potsdam Datum
         // Große Halbachse a und Abplattung f
@@ -429,9 +429,9 @@ 
 
         // Koeffizienten zur Berechnung der Meridianbogenlänge
         $e0 = $c * (pi() / 180) * (1 - 3 * $ex2 / 4 + 45 * $ex4 / 64 - 175 * $ex6 / 256 + 11025 * $ex8 / 16384);
-        $e2 = $c * (- 3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
+        $e2 = $c * (-3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
         $e4 = $c * (15 * $ex4 / 256 - 105 * $ex6 / 1024 + 2205 * $ex8 / 16384);
-        $e6 = $c * (- 35 * $ex6 / 3072 + 315 * $ex8 / 12288);
+        $e6 = $c * (-35 * $ex6 / 3072 + 315 * $ex8 / 12288);
 
         // Breite in Radianten
         $br = $bp * pi() / 180;
@@ -469,18 +469,18 @@ 
         $rw = ($nd * $cos1 * $dl + $nd * $cos3 * (1 - $tan2 + $etasq) * $dl3 / 6 +
             $nd * $cos5 * (5 - 18 * $tan2 + $tan4) * $dl5 / 120 + $kz * 1e6 + 500000);
 
-        $nk = $hw - (int) $hw;
+        $nk = $hw - (int)$hw;
         if ($nk < 0.5) {
-            $hw = (int) $hw;
+            $hw = (int)$hw;
         } else {
-            $hw = ((int) $hw) + 1;
+            $hw = ((int)$hw) + 1;
         }
 
-        $nk = $rw - (int) $rw;
+        $nk = $rw - (int)$rw;
         if ($nk < 0.5) {
-            $rw = (int) $rw;
+            $rw = (int)$rw;
         } else {
-            $rw = (int) ($rw + 1);
+            $rw = (int)($rw + 1);
         }
 
         return [
@@ -499,8 +499,8 @@ 
         $lat_base = 52.15517440;
         $lon_base = 5.38720621;
 
-        for ($i = 0; $i <= 6; $i ++) {
-            for ($j = 0; $j <= 5; $j ++) {
+        for ($i = 0; $i <= 6; $i++) {
+            for ($j = 0; $j <= 5; $j++) {
                 $rpq[$i][$j] = 0;
                 $spq[$i][$j] = 0;
             }
@@ -535,8 +535,8 @@ 
         $xOrigin = 0;
         $yOrigin = 0;
 
-        for ($q = 0; $q <= 5; $q ++) {
-            for ($p = 0; $p <= 6; $p ++) {
+        for ($q = 0; $q <= 5; $q++) {
+            for ($p = 0; $p <= 6; $p++) {
                 $xOrigin = $xOrigin + ($rpq[$p][$q] * ((pow($dlat, $p)) * (pow($dlon, $q))));
                 $yOrigin = $yOrigin + ($spq[$p][$q] * ((pow($dlat, $p)) * (pow($dlon, $q))));
             }

htdocs/lib2/logic/picture.class.php

Spacing +3 added lines, -3 removed lines

@@ -435,9 +435,9 @@
                 return false;
             } else {
                 // restore picture file
-                $this->setUrl($original_url);        // set the url, so that we can
-                $filename = $this->getFilename();    // .. retreive the file path+name
-                $this->setFilenames($filename);      // now set url(s) from the new uuid
+                $this->setUrl($original_url); // set the url, so that we can
+                $filename = $this->getFilename(); // .. retreive the file path+name
+                $this->setFilenames($filename); // now set url(s) from the new uuid
                 @rename($this->deleted_filename($filename), $this->getFilename());
             }
         }