OpencachingDeutschland / oc-server3

htdocs/lib2/logic/cacheIcon.class.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 
     public static function get($user_id, $cache_id, $cache_status, $cache_userid, $iconname)
     {
-        $iconname = mb_eregi_replace('cache/', '', $iconname);   // for old cache_type table contents
+        $iconname = mb_eregi_replace('cache/', '', $iconname); // for old cache_type table contents
         $iconext = '.' . mb_eregi_replace("^.*\.", '', $iconname);
         $iconname = mb_eregi_replace("\..*", '', $iconname);
 
@@ -30,7 +30,7 @@ 
                 break;
             case 5:
                 $iconname .= '-s';
-                break;      // fix for RT ticket #3403
+                break; // fix for RT ticket #3403
             case 6:
                 $iconname .= '-a';
                 break;

htdocs/lib2/logic/mailcheck.class.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
     public $nConnectTimeout = 15; // (sec)
 
-    public $nReadTimeout = 25;   // (sec)
+    public $nReadTimeout = 25; // (sec)
 
     /* check if the mailserver of $sAddress
      * explicit says that the user does not exist

htdocs/lib2/logic/logtypes.inc.php

Spacing +10 added lines, -10 removed lines

@@ -91,28 +91,28 @@
 
     $allowed_logtypes = [];
     if ($owner || $admin_report || $admin_locked) {
-        $allowed_logtypes[] = 3;   // note
+        $allowed_logtypes[] = 3; // note
     }
     if (($owner && $statuslogs) || $admin_report) {
         if ($cache_status != 5 && (($cache_status != 4 && $cache_status != 7) || $admin_report)) {
-            $allowed_logtypes[] = 10;  // ready for search
-            $allowed_logtypes[] = 11;  // temporarily not available
-            $allowed_logtypes[] = 9;   // archived
-            $allowed_logtypes[] = 13;  // locked
+            $allowed_logtypes[] = 10; // ready for search
+            $allowed_logtypes[] = 11; // temporarily not available
+            $allowed_logtypes[] = 9; // archived
+            $allowed_logtypes[] = 13; // locked
         }
         if ($admin_report || $old_logtype == 14) {
             $allowed_logtypes[] = 14;
         }  // locked, invisible
     }
     if ($cache_type == 6) { // event
-        $allowed_logtypes[] = 8;   // will attend
-        $allowed_logtypes[] = 7;   // attended
+        $allowed_logtypes[] = 8; // will attend
+        $allowed_logtypes[] = 7; // attended
     } else {
-        $allowed_logtypes[] = 1;   // found
-        $allowed_logtypes[] = 2;   // not found
+        $allowed_logtypes[] = 1; // found
+        $allowed_logtypes[] = 2; // not found
     }
     if (!($owner || $admin_report || $admin_locked)) {
-        $allowed_logtypes[] = 3;   // note
+        $allowed_logtypes[] = 3; // note
     }
 
     // always allow to keep the existing logtype when the log is edited by an admin

htdocs/lib2/logic/picture.class.php

Indentation +15 added lines, -15 removed lines

@@ -313,25 +313,25 @@
             return null;
         }
 
-		$rs = sql(
-			"SELECT `id`
+        $rs = sql(
+            "SELECT `id`
 			 FROM `cache_logs`
 			 WHERE `cache_id`='&1'
 			 ORDER BY `date`, `id` DESC
 			 LIMIT &2",
-			$this->getCacheId(),
-			MAX_LOGENTRIES_ON_CACHEPAGE
-		);
-		$firstlogs = false;
-		while ($r = sql_fetch_assoc($rs)) {
-			if ($r['id'] == $this->getLogId()) {
-				$firstlogs = true;
-			}
-		}
-
-		sql_free_result($rs);
-
-		return $firstlogs;
+            $this->getCacheId(),
+            MAX_LOGENTRIES_ON_CACHEPAGE
+        );
+        $firstlogs = false;
+        while ($r = sql_fetch_assoc($rs)) {
+            if ($r['id'] == $this->getLogId()) {
+                $firstlogs = true;
+            }
+        }
+
+        sql_free_result($rs);
+
+        return $firstlogs;
     }
 
     public function getCacheId()

Spacing +3 added lines, -3 removed lines

@@ -444,9 +444,9 @@
             }
 
             // restore picture file
-            $this->setUrl($original_url);        // set the url, so that we can
-            $filename = $this->getFilename();    // .. retreive the file path+name
-            $this->setFilenames($filename);      // now set url(s) from the new uuid
+            $this->setUrl($original_url); // set the url, so that we can
+            $filename = $this->getFilename(); // .. retreive the file path+name
+            $this->setFilenames($filename); // now set url(s) from the new uuid
             try {
                 rename($this->deleted_filename($filename), $this->getFilename());
             } catch (Exception $e) {

htdocs/lib2/OcSmarty.class.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 
     public $compile_id = null;
 
-    public $cache_id = null;    // This is a smarty caching ID, not a caches.cache_id.
+    public $cache_id = null; // This is a smarty caching ID, not a caches.cache_id.
 
     public $title = '';
 

htdocs/lib2/rowEditor.class.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
     public $sAutoIncrementField = null;
 
-    public $pk;     // (idx:name; type, default, nullable, value, insertfunction)
+    public $pk; // (idx:name; type, default, nullable, value, insertfunction)
 
     public $fields; // (idx:name; type, default, nullable, value, changed, insertfunction)
 

htdocs/lib2/login.class.php

Spacing +6 added lines, -6 removed lines

@@ -20,13 +20,13 @@
  *
  ***************************************************************************/
 
-define('LOGIN_UNKNOWN_ERROR', -1);     // unkown error occured
-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); // unkown error occured
+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 successfull
+define('LOGIN_LOGOUT_OK', 5); // logout was successfull
 
 // login times in seconds
 define('LOGIN_TIME', 60 * 60);

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

Spacing +6 added lines, -6 removed lines

@@ -390,7 +390,7 @@ 
                 $thislog = mb_ereg_replace('{username}', text_xmlentities($rLog['username']), $thislog);
 
                 if ($rLog['type'] == 3 && $rLog['needs_maintenance'] == 2) {
-                    $logtype = 'Needs Maintenance';   // with capital M, other than cache attribute
+                    $logtype = 'Needs Maintenance'; // with capital M, other than cache attribute
                 } elseif (isset($gpxLogType[$rLog['type']])) {
                     $logtype = $gpxLogType[$rLog['type']];
                 } else {
@@ -511,22 +511,22 @@ 
             switch ($childWaypoint['type']) {
                 case 1:
                     $wp_typename = 'Parking Area';
-                    break;  // well-known garmin symbols
+                    break; // well-known garmin symbols
                 case 2:
                     $wp_typename = 'Flag, Green';
-                    break;   // stage / ref point
+                    break; // stage / ref point
                 case 3:
                     $wp_typename = 'Flag, Blue';
-                    break;    // path
+                    break; // path
                 case 4:
                     $wp_typename = 'Circle with X';
                     break; // final
                 case 5:
                     $wp_typename = 'Diamond, Green';
-                    break;  // point of interest
+                    break; // point of interest
                 default:
                     $wp_typename = 'Flag, Blue';
-                    break;  // for the case new types are forgotten here ..
+                    break; // for the case new types are forgotten here ..
             }
             $thiswp = mb_ereg_replace('{type}', text_xmlentities($wp_typename), $thiswp);
             $thiswp = mb_ereg_replace('{parent}', $r['waypoint'], $thiswp);

htdocs/newlogs.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
     $tpl->cache_lifetime = 900;
     $tpl->cache_id = $exclude_country;
     $logcount = 250;
-    $paging = false;  // paging would have poor performance for all logs
+    $paging = false; // paging would have poor performance for all logs
     $orderByDate = $logselection == 3 ? '{fromtable}.`order_date` DESC, ' : '';
 } else {
     // latest logs for all countries or for one country
@@ -88,7 +88,7 @@ 
     $tpl->cache_lifetime = 300;
     $tpl->cache_id = $country;
     $logcount = 250;
-    $paging = false;  // paging would have poor performance for all logs
+    $paging = false; // paging would have poor performance for all logs
     $orderByDate = $logselection == 3 ? '{fromtable}.`order_date` DESC, ' : '';
     $optimize_for_latest_logs = ($country == '' || $country == $opt['page']['main_country']);
 }