OpencachingDeutschland / oc-server3

htdocs/lib2/imagebmp.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -576,7 +576,7 @@
 }
 
 /**
- * @param $d
+ * @param integer $d
  * @param int $n
  *
  * @return string

htdocs/lib2/logic/geodb.class.php

Doc Comments +9 added lines

@@ -113,6 +113,9 @@ 
         return 0;
     }
 
+    /**
+     * @return string
+     */
     public static function landFromLocid($locid)
     {
         if (!is_numeric($locid)) {
@@ -140,6 +143,9 @@ 
         return '';
     }
 
+    /**
+     * @return string
+     */
     public static function regierungsbezirkFromLocid($locid)
     {
         if (!is_numeric($locid)) {
@@ -166,6 +172,9 @@ 
         return '';
     }
 
+    /**
+     * @return string
+     */
     public static function landkreisFromLocid($locid)
     {
         if (!is_numeric($locid)) {

htdocs/util2/cron/modules/geokrety.class.php

Doc Comments +3 added lines, -3 removed lines

@@ -291,7 +291,7 @@ 
 
     /**
      * @param int $id
-     * @param $name
+     * @param string $name
      */
     public function checkGeoKretType($id, $name)
     {
@@ -304,7 +304,7 @@ 
 
     /**
      * @param int $id
-     * @param $name
+     * @param string $name
      */
     public function checkUser($id, $name)
     {
@@ -317,7 +317,7 @@ 
 
     /**
      * @param int $id
-     * @param $name
+     * @param string $name
      */
     public function checkMoveType($id, $name)
     {

htdocs/lib2/rowEditor.class.php

Spacing +2 added lines, -2 removed lines

@@ -384,7 +384,7 @@ 
         }
 
         if ($type == RE_TYPE_INT) {
-            $value = (int) $value + 0;
+            $value = (int)$value + 0;
         } elseif ($type == RE_TYPE_FLOAT) {
             $value = $value + 0;
         } elseif ($type == RE_TYPE_DOUBLE) {
@@ -409,7 +409,7 @@ 
     public function pFormatValueSql($type, $value)
     {
         if ($type == RE_TYPE_INT) {
-            $value = (int) $value + 0;
+            $value = (int)$value + 0;
         } elseif ($type == RE_TYPE_FLOAT) {
             $value = $value + 0;
         } elseif ($type == RE_TYPE_DOUBLE) {

htdocs/lib2/search/search.gpx.inc.php

Spacing +15 added lines, -15 removed lines

@@ -140,19 +140,19 @@ 
     $gpxTimeFormat = 'Y-m-d\TH:i:s\Z';
 
     $gpxStatus[0] = 'available="False" archived="False"'; // other (unavailable, not archived)
-    $gpxStatus[1] = 'available="True" archived="False"';  // available, not archived
+    $gpxStatus[1] = 'available="True" archived="False"'; // available, not archived
     $gpxStatus[2] = 'available="False" archived="False"'; // unavailable, not archived
-    $gpxStatus[3] = 'available="False" archived="True"';  // unavailable, archived
-    $gpxStatus[6] = 'available="False" archived="True"';  // locked, visible
+    $gpxStatus[3] = 'available="False" archived="True"'; // unavailable, archived
+    $gpxStatus[6] = 'available="False" archived="True"'; // locked, visible
 
     $gpxContainer[1] = 'Other';
     $gpxContainer[2] = 'Micro';
     $gpxContainer[3] = 'Small';
     $gpxContainer[4] = 'Regular';
     $gpxContainer[5] = 'Large';
-    $gpxContainer[6] = 'Large';     // very large
-    $gpxContainer[7] = 'Virtual';   // no container
-    $gpxContainer[8] = 'Micro';     // nano
+    $gpxContainer[6] = 'Large'; // very large
+    $gpxContainer[7] = 'Virtual'; // no container
+    $gpxContainer[8] = 'Micro'; // nano
 
     $gpxOcSize[1] = 'Other';
     $gpxOcSize[2] = 'Micro';
@@ -169,10 +169,10 @@ 
     $gpxType[4] = 'Virtual Cache';
     $gpxType[5] = 'Webcam Cache';
     $gpxType[6] = 'Event Cache';
-    $gpxType[7] = 'Unknown Cache';        // quiz cache
-    $gpxType[8] = 'Unknown Cache';        // maths/physics cache
-    $gpxType[9] = 'Unknown Cache';        // moving cache
-    $gpxType[10] = 'Traditional Cache';   // drive-in cache
+    $gpxType[7] = 'Unknown Cache'; // quiz cache
+    $gpxType[8] = 'Unknown Cache'; // maths/physics cache
+    $gpxType[9] = 'Unknown Cache'; // moving cache
+    $gpxType[10] = 'Traditional Cache'; // drive-in cache
 
     $gpxOcType[1] = 'Other Cache';
     $gpxOcType[2] = 'Traditional Cache';
@@ -181,7 +181,7 @@ 
     $gpxOcType[5] = 'Webcam Cache';
     $gpxOcType[6] = 'Event Cache';
     $gpxOcType[7] = 'Quiz Cache';
-    $gpxOcType[8] = 'Quiz Cache';         // maths/physics cache
+    $gpxOcType[8] = 'Quiz Cache'; // maths/physics cache
     $gpxOcType[9] = 'Moving Cache';
     $gpxOcType[10] = 'Traditional Cache'; // drive-in cache
 
@@ -194,8 +194,8 @@ 
     $gpxLogType[9] = 'Archive';
     $gpxLogType[10] = 'Owner Maintenance';
     $gpxLogType[11] = 'Temporarily Disable Listing';
-    $gpxLogType[13] = 'Archive';          // locked
-    $gpxLogType[14] = 'Archive';          // locked/invisible
+    $gpxLogType[13] = 'Archive'; // locked
+    $gpxLogType[14] = 'Archive'; // locked/invisible
 
     $gpxSymNormal = 'Geocache';
     $gpxSymFound = 'Geocache Found';
@@ -524,9 +524,9 @@ 
         $thisline = mb_ereg_replace('{oc_logs}', $oc_logentries, $thisline);
 
         // attributes
-        $addAttributes = [-1];  // dummy
+        $addAttributes = [-1]; // dummy
         if ($r['type'] == 10) {   // Drive-in
-            $addAttributes[] = 24;  // near the car / park and grab
+            $addAttributes[] = 24; // near the car / park and grab
         }
         $rsAttributes = sql_slave(
             "

htdocs/lib2/search/search.ov2.inc.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         $cacheid = convert_string($r['wp_oc']);
 
         $line = "$name by $username, $type, $size, $cacheid";
-        $record = pack('CLllA*x', 2, 1 + 4 + 4 + 4 + strlen($line) + 1, (int) $lon, (int) $lat, $line);
+        $record = pack('CLllA*x', 2, 1 + 4 + 4 + 4 + strlen($line) + 1, (int)$lon, (int)$lat, $line);
 
         append_output($record);
     }

htdocs/lib2/menu.class.php

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,7 @@ 
                         'parent' => MNU_MAP,
                     ];
                     $menuitem[MNU_MAP]['subitems'][] = $menu_map;
-                    ++ $menu_map;
+                    ++$menu_map;
                 }
             }
         }
@@ -105,7 +105,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");
@@ -142,7 +142,7 @@ 
             );
             while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
                 $aMenu[$r['id']]['subitems'][$nPos] = $rSubmenu['id'];
-                $nPos ++;
+                $nPos++;
             }
             sql_free_result($rsSubmenu);
         }

htdocs/lib2/logic/coordinate.class.php

Spacing +18 added lines, -18 removed lines

@@ -155,8 +155,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
@@ -203,7 +203,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
@@ -248,20 +248,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);
         }
@@ -316,8 +316,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
@@ -395,8 +395,8 @@ 
                 0,
             ];
         }
-        $lp = (float) $lp;
-        $bp = (float) $bp;
+        $lp = (float)$lp;
+        $bp = (float)$bp;
 
         // Potsdam Datum
         // Große Halbachse a und Abplattung f
@@ -454,18 +454,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 [

htdocs/lib2/logic/attribute.class.php

Spacing +12 added lines, -12 removed lines

@@ -151,18 +151,18 @@
     public static function getConflictingAttribIds($attribId)
     {
         static $conflicts = [
-            [1, 38],    // only at night - 24/7
-            [1, 40],    // only at night - only by day
-            [24, 25],   // near the parking area - long walk
-            [24, 27],   // near the parking area - hilly area
-            [24, 29],   // near the parking area - swimming required
-            [24, 50],   // near the parking area - cave equipment
-            [24, 51],   // near the parking area - diving equipment
-            [24, 52],   // near the parking area - watercraft
-            [38, 39],   // 24/7 - only at specified times
-            [38, 40],   // 24/7 - only by day
-            [42, 43],   // all seasons - breeding season
-            [42, 60],    // all seassons - only during specified seasons
+            [1, 38], // only at night - 24/7
+            [1, 40], // only at night - only by day
+            [24, 25], // near the parking area - long walk
+            [24, 27], // near the parking area - hilly area
+            [24, 29], // near the parking area - swimming required
+            [24, 50], // near the parking area - cave equipment
+            [24, 51], // near the parking area - diving equipment
+            [24, 52], // near the parking area - watercraft
+            [38, 39], // 24/7 - only at specified times
+            [38, 40], // 24/7 - only by day
+            [42, 43], // all seasons - breeding season
+            [42, 60], // all seassons - only during specified seasons
         ];
 
         static $conflictsByAttr = [];