OpencachingDeutschland / oc-server3

htdocs/lib2/OcSmarty.class.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
     public $main_template = 'sys_main';
     public $bench = null;
     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 = '';
     public $menuitem = null;
     public $nowpsearch = false;
@@ -385,7 +385,7 @@ 
 
         $args = func_get_args();
         unset($args[0]);
-        for ($i = 1; isset($args[$i]); $i ++) {
+        for ($i = 1; isset($args[$i]); $i++) {
             $this->assign('p' . $i, $args[$i]);
         }
 

Doc Comments +2 added lines, -2 removed lines

@@ -114,8 +114,8 @@
     /* ATTENTION: copied from internal implementation!
      */
     /**
-     * @param $resource_name
-     * @param null $compile_id
+     * @param string $resource_name
+     * @param string $compile_id
      */
     public function compile($resource_name, $compile_id = null)
     {

htdocs/lib2/translate_filescan.class.php

Spacing +2 added lines, -2 removed lines

@@ -120,9 +120,9 @@
     {
         $nLine = 1;
 
-        for ($n = 0; $n < $nPos; $n ++) {
+        for ($n = 0; $n < $nPos; $n++) {
             if (substr($this->msContent, $n, 1) == "\n") {
-                $nLine ++;
+                $nLine++;
             }
         }
 

Doc Comments +3 added lines, -3 removed lines

@@ -86,8 +86,8 @@ 
     }
 
     /**
-     * @param $sCode
-     * @param $nStartSearch
+     * @param string $sCode
+     * @param integer $nStartSearch
      *
      * @return bool|int
      */
@@ -132,7 +132,7 @@ 
 
     // TODO: performance ... scan once at __construct and store line positions
     /**
-     * @param $nPos
+     * @param integer $nPos
      *
      * @return int
      */

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

Spacing +7 added lines, -7 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,28 +511,28 @@ 
             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);
             $thiswp = mb_ereg_replace('{cacheid}', $r['cacheid'], $thiswp);
             $waypoints .= $thiswp;
-            ++ $n;
+            ++$n;
         }
 
         if ($cacheNote && !empty($cacheNote['latitude']) && !empty($cacheNote['longitude'])) {

htdocs/lib2/search/search.inc.php

Spacing +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
     }
 
     // doppelte chars ersetzen
-    for ($c = ord('a'); $c <= ord('z'); $c ++) {
+    for ($c = ord('a'); $c <= ord('z'); $c++) {
         $str = mb_ereg_replace(chr($c) . chr($c), chr($c), $str);
     }
 

htdocs/lib2/pager.class.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
             $to_page = min($last_page, max($first_page, $current_page - $lrspan) + $this->max_pages_shown - 1);
             $from_page = max($first_page, $to_page - $this->max_pages_shown + 1);
 
-            for ($page = $from_page; $page <= $to_page; $page ++) {
+            for ($page = $from_page; $page <= $to_page; $page++) {
                 if ($page == $current_page) {
                     $pages[$page] = false;
                 } else {

Doc Comments +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
      * Use {page} in link_url als placeholder for the selected page number
      * and/or {offset} for the 0-based data offset of the selected page.
      *
-     * @param $link_url
+     * @param string $link_url
      * @param int $min_pages_shown
      * @param int $max_pages_shown
      */
@@ -42,8 +42,8 @@ 
 
 
     /**
-     * @param $current_page
-     * @param $total_pages
+     * @param double $current_page
+     * @param double $total_pages
      * @param bool $page_size
      */
     public function make_from_pagenr($current_page, $total_pages, $page_size = false)
@@ -116,7 +116,7 @@ 
 
     /**
      * @param $page
-     * @param $page_size
+     * @param boolean $page_size
      *
      * @return string
      */

htdocs/lib2/error.inc.php

Indentation +27 added lines, -27 removed lines

@@ -7,34 +7,34 @@
  *  Common error messages
  ***************************************************************************/
 
- define('ERROR_UNKNOWN', 1000);
- define('ERROR_TEMPLATE_NOT_FOUND', 1001);
- define('ERROR_COMPILATION_FAILED', 1002);
- define('ERROR_NO_ACCESS', 1003);
- define('ERROR_INVALID_OPERATION', 1004);
- define('ERROR_LOGIN_REQUIRED', 1005);
- define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006);
- define('ERROR_NO_COOKIES', 1007);
- define('ERROR_ALREADY_LOGGEDIN', 1008);
- define('ERROR_USER_NOT_ACTIVE', 1009);
- define('ERROR_USER_NO_EMAIL', 1010);
- define('ERROR_CACHE_NOT_PUBLISHED', 1011);
- define('ERROR_CACHE_LOCKED', 1012);
+    define('ERROR_UNKNOWN', 1000);
+    define('ERROR_TEMPLATE_NOT_FOUND', 1001);
+    define('ERROR_COMPILATION_FAILED', 1002);
+    define('ERROR_NO_ACCESS', 1003);
+    define('ERROR_INVALID_OPERATION', 1004);
+    define('ERROR_LOGIN_REQUIRED', 1005);
+    define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006);
+    define('ERROR_NO_COOKIES', 1007);
+    define('ERROR_ALREADY_LOGGEDIN', 1008);
+    define('ERROR_USER_NOT_ACTIVE', 1009);
+    define('ERROR_USER_NO_EMAIL', 1010);
+    define('ERROR_CACHE_NOT_PUBLISHED', 1011);
+    define('ERROR_CACHE_LOCKED', 1012);
 
- define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013);
- define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014);
- define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015);
  
- define('ERROR_DB_COULD_NOT_RECONNECT', 1016);
- define('ERROR_DB_NO_ROOT', 1017);
+    define('ERROR_DB_COULD_NOT_RECONNECT', 1016);
+    define('ERROR_DB_NO_ROOT', 1017);
 
- define('ERROR_USER_NOT_EXISTS', 1018);
- define('ERROR_CACHE_NOT_EXISTS', 1019);
- define('ERROR_CACHELOG_NOT_EXISTS', 1020);
- define('ERROR_PICTURE_NOT_EXISTS', 1021);
+    define('ERROR_USER_NOT_EXISTS', 1018);
+    define('ERROR_CACHE_NOT_EXISTS', 1019);
+    define('ERROR_CACHELOG_NOT_EXISTS', 1020);
+    define('ERROR_PICTURE_NOT_EXISTS', 1021);
 
- define('ERROR_UPLOAD_ERR_NO_FILE', 1022);
- define('ERROR_UPLOAD_ERR_SIZE', 1023);
- define('ERROR_UPLOAD_ERR_TYPE', 1024);
- define('ERROR_UPLOAD_UNKNOWN', 1025);
- define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026);
+    define('ERROR_UPLOAD_ERR_NO_FILE', 1022);
+    define('ERROR_UPLOAD_ERR_SIZE', 1023);
+    define('ERROR_UPLOAD_ERR_TYPE', 1024);
+    define('ERROR_UPLOAD_UNKNOWN', 1025);
+    define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026);

htdocs/lib2/sqldebugger.class.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
                     break;
                 }
                 $command['result'][] = $r;
-                $c ++;
+                $c++;
             }
             sql_free_result($rs);
 

htdocs/lib2/ss_zip.class.php

Spacing +9 added lines, -9 removed lines

@@ -143,9 +143,9 @@ 
 
         }
         $fnl = strlen($filename);
-        $fh = "\x14\x00";    // ver needed to extract
-        $fh .= "\x00\x00";    // gen purpose bit flag
-        $fh .= "\x08\x00";    // compression method
+        $fh = "\x14\x00"; // ver needed to extract
+        $fh .= "\x00\x00"; // gen purpose bit flag
+        $fh .= "\x08\x00"; // compression method
         $fh .= "\x00\x00\x00\x00"; // last mod time and date
         $fh .= pack(
             "V3v2",
@@ -170,16 +170,16 @@ 
                 "va*v3V2",
                 0,
                 $fh,
-                0,        // file comment length
-                0,        // disk number start
-                0,        // internal file attributes
-                $attr,    // external file attributes - 'archive/directory' bit set
+                0, // file comment length
+                0, // disk number start
+                0, // internal file attributes
+                $attr, // external file attributes - 'archive/directory' bit set
                 $this->offset
             ) . $filename;
 
         $this->offset += 42 + $fnl + $gzsize;
         $this->cdir[] = $cdir;
-        $this->cnt ++;
+        $this->cnt++;
         $this->idx = $this->cnt - 1;
     }
 
@@ -228,7 +228,7 @@ 
                 $cdsl, // size of central dir
                 $zdsl, // offset to start of central dir
                 0
-            );              // .zip file comment length
+            ); // .zip file comment length
         return $this->zipfile;
     }
 

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);