OpencachingDeutschland / oc-server3

htdocs/editcache.php

Spacing +20 added lines, -20 removed lines

@@ -73,7 +73,7 @@ 
 if ($error == false) {
     $cache_id = 0;
     if (isset($_REQUEST['cacheid'])) {
-        $cache_id = (int) $_REQUEST['cacheid'];
+        $cache_id = (int)$_REQUEST['cacheid'];
     }
 
     if ($usr === false) {
@@ -134,7 +134,7 @@ 
                 }
 
                 //here we read all used information from the form if submitted, otherwise from DB
-                $cache_name = trim(isset($_POST['name']) ? trim($_POST['name']) : $cache_record['name']);  // Ocprop
+                $cache_name = trim(isset($_POST['name']) ? trim($_POST['name']) : $cache_record['name']); // Ocprop
                 $cache_type = isset($_POST['type']) ? $_POST['type'] : $cache_record['type'];
                 if (!isset($_POST['size'])) {
                     if ($cache_type == 4 || $cache_type == 5) {
@@ -148,15 +148,15 @@ 
                 $cache_hidden_day = isset($_POST['hidden_day']) ? $_POST['hidden_day'] : date(
                     'd',
                     strtotime($cache_record['date_hidden'])
-                );  // Ocprop
+                ); // Ocprop
                 $cache_hidden_month = isset($_POST['hidden_month']) ? $_POST['hidden_month'] : date(
                     'm',
                     strtotime($cache_record['date_hidden'])
-                );  // Ocprop
+                ); // Ocprop
                 $cache_hidden_year = isset($_POST['hidden_year']) ? $_POST['hidden_year'] : date(
                     'Y',
                     strtotime($cache_record['date_hidden'])
-                );  // Ocprop
+                ); // Ocprop
 
                 if (is_null($cache_record['date_activate'])) {
                     $cache_activate_day = isset($_POST['activate_day']) ? $_POST['activate_day'] : date('d');
@@ -182,12 +182,12 @@ 
                     );
                 }
 
-                $cache_difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : $cache_record['difficulty'];  // Ocprop
-                $cache_terrain = isset($_POST['terrain']) ? $_POST['terrain'] : $cache_record['terrain'];  // Ocprop
-                $cache_country = isset($_POST['country']) ? $_POST['country'] : $cache_record['country'];  // Ocprop
+                $cache_difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : $cache_record['difficulty']; // Ocprop
+                $cache_terrain = isset($_POST['terrain']) ? $_POST['terrain'] : $cache_record['terrain']; // Ocprop
+                $cache_country = isset($_POST['country']) ? $_POST['country'] : $cache_record['country']; // Ocprop
                 $show_all_countries = isset($_POST['show_all_countries']) ? $_POST['show_all_countries'] : 0;
                 $listing_modified = isset($_POST['listing_modified']) ? $_POST['listing_modified'] + 0 : 0;
-                $status = isset($_POST['status']) ? $_POST['status'] : $cache_record['status'];  // Ocprop
+                $status = isset($_POST['status']) ? $_POST['status'] : $cache_record['status']; // Ocprop
                 $status_old = $cache_record['status'];
                 $search_time = isset($_POST['search_time']) ? trim($_POST['search_time']) : $cache_record['search_time'];
                 $way_length = isset($_POST['way_length']) ? trim($_POST['way_length']) : $cache_record['way_length'];
@@ -248,7 +248,7 @@ 
 
                 $log_pw = isset($_POST['log_pw']) ? mb_substr($_POST['log_pw'], 0, 20) : $cache_record['logpw'];
                 // fix #4356: gc waypoints are frequently copy&pasted with leading spaces
-                $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : $cache_record['wp_gc'];  // Ocprop
+                $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : $cache_record['wp_gc']; // Ocprop
                 $showlists = isset($_POST['showlists']) ? 1 : $cache_record['show_cachelists'] + 0;
                 $protect_old_coords = isset($_POST['protect_old_coords']) ? 1 : $cache_record['protect_old_coords'] + 0;
 
@@ -260,12 +260,12 @@ 
 
                 if (isset($_POST['latNS'])) {
                     //get coords from post-form
-                    $coords_latNS = $_POST['latNS'];  // Ocprop
-                    $coords_lonEW = $_POST['lonEW'];  // Ocprop
-                    $coords_lat_h = trim($_POST['lat_h']);  // Ocprop
-                    $coords_lon_h = trim($_POST['lon_h']);  // Ocprop
-                    $coords_lat_min = trim($_POST['lat_min']);  // Ocprop
-                    $coords_lon_min = trim($_POST['lon_min']);  // Ocprop
+                    $coords_latNS = $_POST['latNS']; // Ocprop
+                    $coords_lonEW = $_POST['lonEW']; // Ocprop
+                    $coords_lat_h = trim($_POST['lat_h']); // Ocprop
+                    $coords_lon_h = trim($_POST['lon_h']); // Ocprop
+                    $coords_lat_min = trim($_POST['lat_min']); // Ocprop
+                    $coords_lon_min = trim($_POST['lon_min']); // Ocprop
                 } else {
                     //get coords from DB
                     $coords_lon = $cache_record['longitude'];
@@ -563,7 +563,7 @@ 
                                     $logtype = 13;
                                     break;
                                 default:
-                                    $logtype = 0;  // ???
+                                    $logtype = 0; // ???
                             }
                             if ($logtype > 0) {
                                 sql(
@@ -959,8 +959,8 @@ 
                         . '</option>';
                 }
                 tpl_set_var('statusoptions', $statusoptions);
-                $statuschange_a_msg =  mb_ereg_replace('%1', $cache_id, $status_change_a);
-                $statuschange_msg =  mb_ereg_replace('{a}', $statuschange_a_msg, $status_change);
+                $statuschange_a_msg = mb_ereg_replace('%1', $cache_id, $status_change_a);
+                $statuschange_msg = mb_ereg_replace('{a}', $statuschange_a_msg, $status_change);
                 tpl_set_var('statuschange', $status_old == 5 ? '' : $statuschange_msg);
 
                 // show activation form?
@@ -1105,7 +1105,7 @@ 
                 tpl_set_var('showlists_checked', $showlists ? 'checked="checked"' : '');
                 tpl_set_var('protectcoords_checked', $protect_old_coords ? 'checked="checked"' : '');
 
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
             }
         }

htdocs/newdesc.php

Spacing +6 added lines, -7 removed lines

@@ -43,11 +43,11 @@ 
 
                 //get the posted data
                 $show_all_langs = isset($_POST['show_all_langs']) ? $_POST['show_all_langs'] : 0;
-                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : '';  // Ocprop
+                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : ''; // Ocprop
 
-                $hints = isset($_POST['hints']) ? trim($_POST['hints']) : '';  // Ocprop
-                $sel_lang = isset($_POST['desc_lang']) ? trim($_POST['desc_lang']) : $default_lang;  // Ocprop
-                $desc = isset($_POST['desc']) ? trim($_POST['desc']) : '';  // Ocprop
+                $hints = isset($_POST['hints']) ? trim($_POST['hints']) : ''; // Ocprop
+                $sel_lang = isset($_POST['desc_lang']) ? trim($_POST['desc_lang']) : $default_lang; // Ocprop
+                $desc = isset($_POST['desc']) ? trim($_POST['desc']) : ''; // Ocprop
 
                 // read descMode; if not set, initialize from user profile
                 if (isset($_POST['descMode'])) {  // Ocprop
@@ -212,8 +212,7 @@ 
                 tpl_set_var('name', htmlspecialchars($cache_record['name'], ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cacheid', htmlspecialchars($cache_id, ENT_COMPAT, 'UTF-8'));
 
-                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message :
-                    (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
+                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message : (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
 
                 tpl_set_var('show_all_langs', $show_all_langs);
                 tpl_set_var('show_all_langs_submit', ($show_all_langs == 0) ? $show_all_langs_submit : '');
@@ -235,7 +234,7 @@ 
                 $headers .= '<script language="javascript" type="text/javascript" src="' . editorJsPath() . '"></script>' . "\n";
                 tpl_set_var('htmlheaders', $headers);
 
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
             }
         } else {

htdocs/viewcache.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 // get cacheid
 $cacheid = 0;
 if (isset($_REQUEST['cacheid'])) {
-    $cacheid = (int) $_REQUEST['cacheid'];
+    $cacheid = (int)$_REQUEST['cacheid'];
 } else {
     if (isset($_REQUEST['uuid'])) {
         $cacheid = cache::cacheIdFromUUID($_REQUEST['uuid']);

htdocs/picture.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
     } else {
         $position = PHP_INT_MAX;
     }
-    $position = min($position, $allpics ? $allpics[count($allpics)-1]['seq'] + 1 : 1);
+    $position = min($position, $allpics ? $allpics[count($allpics) - 1]['seq'] + 1 : 1);
 
     // uploaded file ok?
     if (isset($_REQUEST['ok'])) { // Ocprop
@@ -233,7 +233,7 @@ 
     }
     $tpl->assign('allpics', $allpics);
     $tpl->assign('position', $position);
-    $tpl->assign('appendseq', $allpics ? $allpics[count($allpics)-1]['seq']+1 : 1);
+    $tpl->assign('appendseq', $allpics ? $allpics[count($allpics) - 1]['seq'] + 1 : 1);
 }
 
 $rsCache = sql("SELECT `wp_oc`, `name` FROM `caches` WHERE `cache_id`='&1'", $picture->getCacheId());

htdocs/src/Oc/Postfix/JournalLogs.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
                     $cursor[$key] = $value;
                 }
 
-                $logEntry->id = (int) hexdec($cursor['i']);
+                $logEntry->id = (int)hexdec($cursor['i']);
 
                 $timeStamp = $entry['__REALTIME_TIMESTAMP'];
                 $logEntry->created = \DateTimeImmutable::createFromFormat(

htdocs/lib2/logic/cache.class.php

Spacing +2 added lines, -2 removed lines

@@ -505,8 +505,8 @@
         }
 
         $coords = [];
-        if ($this->getType() != 7 && $this->getType() != 8 &&  // quiz cache
-            $this->hasAttribute(61) != true &&                 // safari cache
+        if ($this->getType() != 7 && $this->getType() != 8 && // quiz cache
+            $this->hasAttribute(61) != true && // safari cache
             $this->getStatus() != 5                            // unpublished cache
         ) {
             $rsCoords = sql(

htdocs/okapi/index.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 
-$GLOBALS['rootpath'] = __DIR__.'/../';
+$GLOBALS['rootpath'] = __DIR__ . '/../';
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-require_once __DIR__ .'/../vendor/opencaching/okapi/okapi/index.php';
+require_once __DIR__ . '/../vendor/opencaching/okapi/okapi/index.php';

htdocs/lib2/OcHTMLPurifier.class.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
         $config->set(
             'HTML.ForbiddenElements',
             [
-                'basefont',   // workaround for HTMLPurifier bug, which allows this in the <body>
+                'basefont', // workaround for HTMLPurifier bug, which allows this in the <body>
             ]
         );
 
@@ -98,7 +98,7 @@ 
         // add attributes
         $def->addAttribute('a', 'rel', 'CDATA');
         $def->addAttribute('img', 'usemap', 'CDATA');
-        $def->addAttribute('map', 'name', 'CDATA');   // workaround for HTMLPurifer bug
+        $def->addAttribute('map', 'name', 'CDATA'); // workaround for HTMLPurifer bug
 
         // create parent object with config
         parent::__construct($config);

htdocs/usertops.php

Spacing +2 added lines, -2 removed lines

@@ -13,10 +13,10 @@
 $tpl->name = 'usertops';
 $tpl->menuitem = MNU_CACHES_USERTOPS;
 
-$userId = (int) isset($_REQUEST['userid']) ? $_REQUEST['userid']: 0;
+$userId = (int)isset($_REQUEST['userid']) ? $_REQUEST['userid'] : 0;
 $ocOnly = isset($_REQUEST['oconly']) && $_REQUEST['oconly'];
 
-$sUsername = $connection->fetchColumn('SELECT `username` FROM `user` WHERE `user_id` = :userId',['userId' => $userId]);
+$sUsername = $connection->fetchColumn('SELECT `username` FROM `user` WHERE `user_id` = :userId', ['userId' => $userId]);
 if ($sUsername == null) {
     $tpl->error(ERROR_USER_NOT_EXISTS);
 }