OpencachingDeutschland / oc-server3

local/stat/coordstat.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,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]++;
     }
 }
 mysqli_free_result($rs);
@@ -48,7 +48,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]++;
         }
     }
     mysqli_free_result($rs);
@@ -65,7 +65,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'];
 }
 mysqli_free_result($rs);

htdocs/editdesc.php

Spacing +6 added lines, -6 removed lines

@@ -22,8 +22,8 @@ 
         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 (mysqli_num_rows($rs) == 1) {
@@ -90,7 +90,7 @@ 
                 //save to DB?
                 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 = trim($_POST['short_desc']);  // Ocprop
+                    $short_desc = trim($_POST['short_desc']); // Ocprop
                     $hint = htmlspecialchars(trim($_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 = trim($_POST['desc']);  // Ocprop
+                    $desc = trim($_POST['desc']); // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -295,7 +295,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/lang/de/ocstyle/varset.inc.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 // REQUEST-Variablen durchlaufen und an target anhaengen
 $allowed = ['cacheid', 'userid', 'logid', 'desclang', 'descid'];
 
-foreach($_REQUEST as $varname => $varvalue) {
+foreach ($_REQUEST as $varname => $varvalue) {
     if (in_array($varname, $allowed)) {
         $target .= $varname . '=' . $varvalue . '&';
     }

htdocs/lang/de/ocstyle/main.tpl.php

Spacing +3 added lines, -3 removed lines

@@ -155,7 +155,7 @@ 
 <?php
 foreach ($opt['template']['locales'] as $k => $lang) {
     if ($lang['status'] == OC_LOCALE_ACTIVE) {
-        echo '<a style="text-decoration: none;" href="'.$langUrl . $k . '"><img src="' . $lang['flag'] .
+        echo '<a style="text-decoration: none;" href="' . $langUrl . $k . '"><img src="' . $lang['flag'] .
             '" alt="' . $lang['name'] . '" title="' . $lang['name'] . '" width="24px" height="18px" /></a> ';
     }
 }
@@ -185,7 +185,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>
@@ -390,7 +390,7 @@ 
             </div> <!-- page-container-1 -->
 
         </div> <!-- overall -->
-        <?php if($opt['tracking']['googleAnalytics']) { ?>
+        <?php if ($opt['tracking']['googleAnalytics']) { ?>
             <script type="text/javascript">
                 // Set to the same value as the web property used on the site
                 var gaProperty = '<?= $opt['tracking']['googleAnalytics']; ?>';

htdocs/lib2/logic/cachelog.class.php

Spacing +3 added lines, -3 removed lines

@@ -357,7 +357,7 @@ 
         //     return array();
         // Logic Error - log types are still valid when no NEW logs are allowed for the cache.
         // (Would e.g. block admin logs and log-type restoring for locked caches.)
-        return get_cache_log_types($this->getCacheId(), $this->getType());  // depends on userid
+        return get_cache_log_types($this->getCacheId(), $this->getType()); // depends on userid
     }
 
     public static function isDuplicate($cacheId, $userId, $logType, $logDate, $logText)
@@ -443,8 +443,8 @@ 
             if ($dateOk && $submit) {
                 $dateOk = (
                     mktime(
-                        (int) $hour,
-                        (int) $minute,
+                        (int)$hour,
+                        (int)$minute,
                         0,
                         $month,
                         $day,

htdocs/okapi/meta.php

Indentation +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php return array (
-  'version_number' => 1908,
-  'git_revision' => '6be38dcd869651db7dd2fddf94a09e3f64519320',
+    'version_number' => 1908,
+    'git_revision' => '6be38dcd869651db7dd2fddf94a09e3f64519320',
 );
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php return array (
+<?php return array(
   'version_number' => 1908,
   'git_revision' => '6be38dcd869651db7dd2fddf94a09e3f64519320',
 );
\ No newline at end of file

htdocs/lib2/logic/getNew.class.php

Doc Comments +5 added lines, -5 removed lines

@@ -17,7 +17,7 @@ 
     }
 
     /**
-     * @param $userCountry
+     * @param string $userCountry
      */
     public function set_userCountry($userCountry): void
     {
@@ -41,7 +41,7 @@ 
      *
      * @param string $type type of the "new"-information, i.e. cache, event, rating, etc
      * @param array $args numeric array containing the parameter for "sql_slave"
-     * @return object mysql result used by smarty assign_rs
+     * @return mysqli_result|null mysql result used by smarty assign_rs
      */
     public function rsForSmarty($type, $args = null)
     {
@@ -89,7 +89,7 @@ 
      * cacheRs executes the database statements for type "cache"
      *
      * @param array $args numeric array containing the parameter for "sql_slave"
-     * @return object mysql result used by smarty assign_rs
+     * @return mysqli_result mysql result used by smarty assign_rs
      */
     private function cacheRs($args = null)
     {
@@ -143,7 +143,7 @@ 
      * eventRs executes the database statements for type "event"
      *
      * @param array $args numeric array containing the parameter for "sql_slave"
-     * @return object mysql result used by smarty assign_rs
+     * @return mysqli_result mysql result used by smarty assign_rs
      */
     private function eventRs($args = null)
     {
@@ -215,7 +215,7 @@ 
      * ratingRs executes the database statements for type "rating"
      *
      * @param array $args numeric array containing the parameter for "sql_slave"
-     * @return object mysql result used by smarty assign_rs
+     * @return mysqli_result mysql result used by smarty assign_rs
      */
     private function ratingRs($args = null)
     {

htdocs/src/OcLegacy/Map/StaticMap.php

Doc Comments +16 added lines

@@ -147,11 +147,17 @@ 
         }
     }
 
+    /**
+     * @param integer $zoom
+     */
     private function lonToTile($long, $zoom)
     {
         return (($long + 180) / 360) * (2 ** $zoom);
     }
 
+    /**
+     * @param integer $zoom
+     */
     private function latToTile($lat, $zoom)
     {
         return (1 - log(tan($lat * M_PI / 180) + 1 / cos($lat * M_PI / 180)) / M_PI) / 2 * (2 ** $zoom);
@@ -247,6 +253,10 @@ 
         }
     }
 
+    /**
+     * @param string $pathname
+     * @param integer $mode
+     */
     private function mkdirRecursive($pathname, $mode): bool
     {
         is_dir(dirname($pathname)) || $this->mkdirRecursive(dirname($pathname), $mode);
@@ -254,6 +264,9 @@ 
         return is_dir($pathname) || mkdir($pathname, $mode) || is_dir($pathname);
     }
 
+    /**
+     * @param string $data
+     */
     private function writeTileToCache($url, $data): void
     {
         $filename = $this->tileUrlToFilename($url);
@@ -261,6 +274,9 @@ 
         file_put_contents($filename, $data);
     }
 
+    /**
+     * @param string $url
+     */
     private function fetchTile($url)
     {
         if ($this->useTileCache && $cached = $this->checkTileCache($url)) {

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
     /**
      * @var string
      */
-    private $tileCacheBaseDir =  __DIR__ . '/../../../var/cache2/staticmap';
+    private $tileCacheBaseDir = __DIR__ . '/../../../var/cache2/staticmap';
 
     /**
      * @var int
@@ -127,11 +127,11 @@ 
 
         if (isset($_GET['size']) && !empty($_GET['size'])) {
             list($this->width, $this->height) = explode('x', $_GET['size']);
-            $this->width = (int) $this->width;
+            $this->width = (int)$this->width;
             if ($this->width > $this->maxWidth) {
                 $this->width = $this->maxWidth;
             }
-            $this->height = (int) $this->height;
+            $this->height = (int)$this->height;
             if ($this->height > $this->maxHeight) {
                 $this->height = $this->maxHeight;
             }

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

Doc Comments +3 added lines

@@ -133,6 +133,9 @@
         sql_free_result($rs);
     }
 
+    /**
+     * @param string $comment
+     */
     public function archiveCache($cache_id, $comment, $months = 0): void
     {
         global $login, $translate;