OpencachingDeutschland / oc-server3

htdocs/lib2/search/search.html.inc.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
         // decide if the cache is new
         $dDiff = dateDiff('d', $rCache['date_created'], date('Y-m-d'));
 
-        $rCache['isnew'] = ($dDiff <= NEWCACHES_DAYS && (int) $rCache['type'] !== 6);
+        $rCache['isnew'] = ($dDiff <= NEWCACHES_DAYS && (int)$rCache['type'] !== 6);
 
         // get last logs
         if ($options['sort'] != 'bymylastlog' || !$login->logged_in()) {

htdocs/addtolist.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 $tpl->menuitem = MNU_CACHES_ADDTOLIST;
 
 $login->verify();
-if ($login->userid  == 0) {
+if ($login->userid == 0) {
     $tpl->redirect_login();
 }
 
@@ -32,7 +32,7 @@ 
 $default_list = isset($_REQUEST['listid']) ? (int)$_REQUEST['listid'] : cachelist::getMyLastAddedToListId();
 
 if (isset($_REQUEST['save'], $_REQUEST['listid'])) {
-    $listId = (int) $_REQUEST['listid'];
+    $listId = (int)$_REQUEST['listid'];
     if ($listId === 0) {
         $cacheList = new cachelist(ID_NEW, $login->userid);
         $name_error = $cacheList->setNameAndVisibility($newListName, $newListPublic ? 2 : 0);

htdocs/adoptcache.php

Spacing +8 added lines, -8 removed lines

@@ -14,11 +14,11 @@ 
 }
 
 $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'listbyuser';
-$cacheId = isset($_REQUEST['cacheid']) ? (int) $_REQUEST['cacheid'] : 0;
+$cacheId = isset($_REQUEST['cacheid']) ? (int)$_REQUEST['cacheid'] : 0;
 $tpl->assign('action', $action);
 $tpl->assign('error', '');
 if (isset($_REQUEST['cacheid'])) {
-    $tpl->assign('cacheid', (int) $_REQUEST['cacheid']);
+    $tpl->assign('cacheid', (int)$_REQUEST['cacheid']);
 }
 
 if ($action === 'listbycache') {
@@ -26,14 +26,14 @@ 
 } elseif ($action === 'add') {
     $tpl->assign('action', 'listbycache');
 
-    $tou = isset($_REQUEST['tou']) ? (int) $_REQUEST['tou'] : 0;
-    $submit = isset($_REQUEST['submit']) ? (int) $_REQUEST['submit'] : 0;
+    $tou = isset($_REQUEST['tou']) ? (int)$_REQUEST['tou'] : 0;
+    $submit = isset($_REQUEST['submit']) ? (int)$_REQUEST['submit'] : 0;
 
     $username = isset($_REQUEST['username']) ? $_REQUEST['username'] : '';
     $tpl->assign('adoptusername', $username);
 
     if ($submit === 1) {
-        $userId = (int) sql_value("SELECT `user_id` FROM `user` WHERE `username`='&1'", 0, $username);
+        $userId = (int)sql_value("SELECT `user_id` FROM `user` WHERE `username`='&1'", 0, $username);
         if ($userId === 0) {
             $tpl->assign('error', 'userunknown');
         } elseif ($tou !== 1) {
@@ -45,11 +45,11 @@ 
 
     listRequestsByCacheId($cacheId);
 } elseif ($action === 'cancel') {
-    $userId = isset($_REQUEST['userid']) ? (int) $_REQUEST['userid']: 0;
+    $userId = isset($_REQUEST['userid']) ? (int)$_REQUEST['userid'] : 0;
     cancelRequest($cacheId, $userId);
 } elseif ($action === 'commit') {
-    $submit = isset($_REQUEST['submit']) ? (int) $_REQUEST['submit'] : 0;
-    $tou = isset($_REQUEST['tou']) ? (int) $_REQUEST['tou'] : 0;
+    $submit = isset($_REQUEST['submit']) ? (int)$_REQUEST['submit'] : 0;
+    $tou = isset($_REQUEST['tou']) ? (int)$_REQUEST['tou'] : 0;
 
     if ($submit === 1 && $tou === 1) {
         commitRequest($cacheId);

htdocs/xml/csv/cache.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
 $cache = null;
 if (isset($_REQUEST['cacheid'])) {
-    $cacheId = (int) $_REQUEST['cacheid'];
+    $cacheId = (int)$_REQUEST['cacheid'];
     $cache = new cache($cacheId);
 } else {
     if (isset($_REQUEST['uuid'])) {

htdocs/lib/login.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
     }
 
     /**
-     * @param int|bool $privilege
+     * @param integer $privilege
      * @return bool
      */
     public function hasAdminPriv($privilege = false)

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
         // user.last_login gives the overall last login date, including OKAPI logins.
 
         if ($rUser = sql_fetch_assoc($rs)) {
-            if ((($this->permanent == true) && (strtotime($rUser['last_login']) + LOGIN_TIME_PERMANENT  / 2 < time())) ||
+            if ((($this->permanent == true) && (strtotime($rUser['last_login']) + LOGIN_TIME_PERMANENT / 2 < time())) ||
                 (($this->permanent == false) && (strtotime($rUser['last_login']) + LOGIN_TIME / 2 < time()))
             ) {
                 sql(

htdocs/lib2/login.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
     }
 
     /**
-     * @param int|bool $privilege
+     * @param integer $privilege
      * @return bool
      */
     public function hasAdminPriv($privilege = false)

Spacing +10 added lines, -10 removed lines

@@ -15,13 +15,13 @@ 
 
 use OcLegacy\Util\PasswordCrypt;
 
-define('LOGIN_UNKNOWN_ERROR', -1);     // unknown error occurred
-define('LOGIN_OK', 0);                 // login succeeded
-define('LOGIN_BADUSERPW', 1);          // bad username or password
-define('LOGIN_TOOMUCHLOGINS', 2);      // too many logins in short time
-define('LOGIN_USERNOTACTIVE', 3);      // the userAccount locked
+define('LOGIN_UNKNOWN_ERROR', -1); // unknown error occurred
+define('LOGIN_OK', 0); // login succeeded
+define('LOGIN_BADUSERPW', 1); // bad username or password
+define('LOGIN_TOOMUCHLOGINS', 2); // too many logins in short time
+define('LOGIN_USERNOTACTIVE', 3); // the userAccount locked
 define('LOGIN_EMPTY_USERPASSWORD', 4); // given username/password was empty
-define('LOGIN_LOGOUT_OK', 5);          // logout was successful
+define('LOGIN_LOGOUT_OK', 5); // logout was successful
 
 // login times in seconds
 define('LOGIN_TIME', 60 * 60);
@@ -69,7 +69,7 @@ 
 
         // TODO good input evaluation
         if ($cookie->is_set('userid') && $cookie->is_set('username')) {
-            $this->userid = (int) $cookie->get('userid');
+            $this->userid = (int)$cookie->get('userid');
             $this->username = $cookie->get('username');
             $this->permanent = (($cookie->get('permanent') + 0) == 1);
             $this->lastlogin = $cookie->get('lastlogin');
@@ -100,7 +100,7 @@ 
     public function pStoreCookie()
     {
         global $cookie;
-        $cookie->set('userid', (int) $this->userid);
+        $cookie->set('userid', (int)$this->userid);
         $cookie->set('username', $this->username);
         $cookie->set('permanent', ($this->permanent === true ? 1 : 0));
         $cookie->set('lastlogin', $this->lastlogin);
@@ -297,7 +297,7 @@ 
                     $rUser['user_id'],
                     ($permanent != false ? 1 : 0)
                 );
-                $this->userid = (int) $rUser['user_id'];
+                $this->userid = (int)$rUser['user_id'];
                 $this->username = $rUser['username'];
                 $this->permanent = $permanent;
                 $this->lastlogin = date('Y-m-d H:i:s');
@@ -343,7 +343,7 @@ 
             );
             if ($rUser = sql_fetch_assoc($rs)) {
                 $this->username = $rUser['username'];
-                $this->userid = (int) $rUser['user_id'];
+                $this->userid = (int)$rUser['user_id'];
                 $this->admin = $rUser['admin'];
                 $this->verified = true;
                 sqlf("UPDATE `user` SET `user`.`last_login`=NOW() WHERE `user`.`user_id`='&1'", $this->userid);

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 (mysql_num_rows($rs) == 1) {
@@ -89,7 +89,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'])) {
@@ -122,7 +122,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;
@@ -137,7 +137,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'])) {
@@ -296,7 +296,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/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 {