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/log.php

Spacing +17 added lines, -17 removed lines

@@ -49,8 +49,8 @@ 
     $fieldNoteService = AppKernel::Container()->get(FieldNoteService::class);
 
     $fieldNote = $fieldNoteService->fetchOneBy([
-        'id' => (int) $_GET['fieldnoteid'],
-        'user_id' => (int) $user->getUserId()
+        'id' => (int)$_GET['fieldnoteid'],
+        'user_id' => (int)$user->getUserId()
     ]);
 
     if ($fieldNote !== null) {
@@ -96,7 +96,7 @@ 
     // check if masslog warning is accepted (in cookie)
     $masslogCookieSet = isset($_COOKIE['ocsuppressmasslogwarn']);
     if ($masslogCookieSet) {
-        $masslogCookieContent = (int) $_COOKIE['ocsuppressmasslogwarn'];
+        $masslogCookieContent = (int)$_COOKIE['ocsuppressmasslogwarn'];
     } else {
         // save masslog acception in cookie that expires on midnight if clicked
         if (isset($_REQUEST['suppressMasslogWarning']) && $_REQUEST['suppressMasslogWarning'] == 1) {
@@ -108,17 +108,17 @@ 
     //   logtext, logtype, logday, logmonth, logyear
 
     $logText = isset($_POST['logtext']) ? trim($_POST['logtext']) : '';
-    $logType = isset($_REQUEST['logtype']) ? (int) $_REQUEST['logtype'] : null;
+    $logType = isset($_REQUEST['logtype']) ? (int)$_REQUEST['logtype'] : null;
     $logDateDay = isset($_POST['logday']) ? trim($_POST['logday']) : ($datesaved ? $defaultLogDay : date('d'));
     $logDateMonth = isset($_POST['logmonth']) ? trim($_POST['logmonth']) : ($datesaved ? $defaultLogMonth : date('m'));
     $logDateYear = isset($_POST['logyear']) ? trim($_POST['logyear']) : ($datesaved ? $defaultLogYear : date('Y'));
     $logTimeHour = isset($_POST['loghour']) ? trim($_POST['loghour']) : '';
     $logTimeMinute = isset($_POST['logminute']) ? trim($_POST['logminute']) : '';
-    $needsMaintenance = isset($_POST['needs_maintenance2']) ? (int) $_POST['needs_maintenance2'] : (isset($_POST['needs_maintenance']) ? (int) $_POST['needs_maintenance'] : 0);
-    $listingOutdated = isset($_POST['listing_outdated2']) ? (int) $_POST['listing_outdated2'] : (isset($_POST['listing_outdated']) ? (int) $_POST['listing_outdated'] : 0);
-    $confirmListingOk = isset($_POST['confirm_listing_ok']) ? (int) $_POST['confirm_listing_ok'] : 0;
-    $rateOption = isset($_POST['ratingoption']) ? (int) $_POST['ratingoption'] : 0;
-    $rateCache = isset($_POST['rating']) ? (int) $_POST['rating'] : 0;
+    $needsMaintenance = isset($_POST['needs_maintenance2']) ? (int)$_POST['needs_maintenance2'] : (isset($_POST['needs_maintenance']) ? (int)$_POST['needs_maintenance'] : 0);
+    $listingOutdated = isset($_POST['listing_outdated2']) ? (int)$_POST['listing_outdated2'] : (isset($_POST['listing_outdated']) ? (int)$_POST['listing_outdated'] : 0);
+    $confirmListingOk = isset($_POST['confirm_listing_ok']) ? (int)$_POST['confirm_listing_ok'] : 0;
+    $rateOption = isset($_POST['ratingoption']) ? (int)$_POST['ratingoption'] : 0;
+    $rateCache = isset($_POST['rating']) ? (int)$_POST['rating'] : 0;
     $ocTeamComment = isset($_REQUEST['teamcomment']) ? $_REQUEST['teamcomment'] != 0 : 0;
     $suppressMasslogWarning = isset($_REQUEST['suppressMasslogWarning']) ? $_REQUEST['suppressMasslogWarning'] : ($masslogCookieSet ? $masslogCookieContent : 0);
 
@@ -164,12 +164,12 @@ 
     }
 
     // if not a found log, ignore the rating
-    $rateOption = (int) ($logType == 1 || $logType == 7);
+    $rateOption = (int)($logType == 1 || $logType == 7);
 
     // get log text editor mode (from form or from userprofile)
     // 1 = text; 2 = HTML; 3 = tinyMCE
     if (isset($_POST['descMode'])) {
-        $descMode = (int) $_POST['descMode'];  // Ocprop: 2
+        $descMode = (int)$_POST['descMode']; // Ocprop: 2
         if (($descMode < 1) || ($descMode > 3)) {
             $descMode = 3;
         }
@@ -251,7 +251,7 @@ 
          * set seconds 00:00:01, means "00:00 was logged"
          * set seconds 00:00:00, means "no time was logged"
          */
-        $logTimeSecond = (int) ($logTimeHour . $logTimeMinute != ''
+        $logTimeSecond = (int)($logTimeHour . $logTimeMinute != ''
                 && $logTimeHour == 0
                 && $logTimeMinute == 0);
 
@@ -259,8 +259,8 @@ 
         $logDate = date(
             $opt['db']['dateformat'],
             mktime(
-                (int) $logTimeHour,
-                (int) $logTimeMinute,
+                (int)$logTimeHour,
+                (int)$logTimeMinute,
                 $logTimeSecond,
                 $logDateMonth,
                 $logDateDay,
@@ -311,7 +311,7 @@ 
             if (isset($_REQUEST['fieldnoteid']) && $_REQUEST['fieldnoteid']) {
                 sql(
                     'DELETE FROM field_note WHERE `id` = &1 AND `user_id` = &2',
-                    (int) $_REQUEST['fieldnoteid'],
+                    (int)$_REQUEST['fieldnoteid'],
                     $user->getUserId()
                 );
 
@@ -398,8 +398,8 @@ 
 
 // prepare template and display
 $tpl->assign('logtype_allows_nm', implode(',', $logtype_allows_nm));
-$tpl->assign('scrollposx', isset($_REQUEST['scrollposx']) ? (int) $_REQUEST['scrollposx']: 0);
-$tpl->assign('scrollposy', isset($_REQUEST['scrollposy']) ? (int) $_REQUEST['scrollposy']: 0);
+$tpl->assign('scrollposx', isset($_REQUEST['scrollposx']) ? (int)$_REQUEST['scrollposx'] : 0);
+$tpl->assign('scrollposy', isset($_REQUEST['scrollposy']) ? (int)$_REQUEST['scrollposy'] : 0);
 $tpl->assign('validate', $validate);
 $tpl->assign('editlog', false);
 

htdocs/okapi/meta.php

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/src/Oc/Page/Persistence/PageRepository.php

Spacing +4 added lines, -4 removed lines

@@ -75,7 +75,7 @@ 
             $databaseArray
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -99,7 +99,7 @@ 
             ['id' => $entity->id]
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -147,13 +147,13 @@ 
     public function getEntityFromDatabaseArray(array $data): PageEntity
     {
         $entity = new PageEntity();
-        $entity->id = (int) $data['id'];
+        $entity->id = (int)$data['id'];
         $entity->slug = $data['slug'];
         $entity->metaKeywords = $data['meta_keywords'];
         $entity->metaDescription = $data['meta_description'];
         $entity->metaSocial = $data['meta_social'];
         $entity->updatedAt = new DateTime($data['updated_at']);
-        $entity->active = (bool) $data['active'];
+        $entity->active = (bool)$data['active'];
 
         return $entity;
     }

htdocs/src/Oc/Page/Persistence/BlockRepository.php

Spacing +7 added lines, -7 removed lines

@@ -83,7 +83,7 @@ 
             $databaseArray
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -107,7 +107,7 @@ 
             ['id' => $entity->id]
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -143,7 +143,7 @@ 
             'page_id' => $entity->pageId,
             'title' => $entity->title,
             'html' => $entity->html,
-            'position' => (int) $entity->position,
+            'position' => (int)$entity->position,
             'updated_at' => $entity->updatedAt->format(DateTime::ATOM),
             'active' => $entity->active,
         ];
@@ -155,13 +155,13 @@ 
     public function getEntityFromDatabaseArray(array $data): BlockEntity
     {
         $entity = new BlockEntity();
-        $entity->id = (int) $data['id'];
-        $entity->pageId = (int) $data['page_id'];
+        $entity->id = (int)$data['id'];
+        $entity->pageId = (int)$data['page_id'];
         $entity->title = $data['title'];
         $entity->html = $data['html'];
-        $entity->position = (int) $data['position'];
+        $entity->position = (int)$data['position'];
         $entity->updatedAt = new DateTime($data['updated_at']);
-        $entity->active = (bool) $data['active'];
+        $entity->active = (bool)$data['active'];
 
         return $entity;
     }