Completed
Pull Request — development (#407)
by Mirko
17:03 queued 09:20
created
htdocs/lib2/search/search.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -156,7 +156,7 @@
 block discarded – undo
156 156
     }
157 157
 
158 158
     // doppelte chars ersetzen
159
-    for ($c = ord('a'); $c <= ord('z'); $c ++) {
159
+    for ($c = ord('a'); $c <= ord('z'); $c++) {
160 160
         $str = mb_ereg_replace(chr($c) . chr($c), chr($c), $str);
161 161
     }
162 162
 
Please login to merge, or discard this patch.
htdocs/lib2/pager.class.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
             $to_page = min($last_page, max($first_page, $current_page - $lrspan) + $this->max_pages_shown - 1);
60 60
             $from_page = max($first_page, $to_page - $this->max_pages_shown + 1);
61 61
 
62
-            for ($page = $from_page; $page <= $to_page; $page ++) {
62
+            for ($page = $from_page; $page <= $to_page; $page++) {
63 63
                 if ($page == $current_page) {
64 64
                     $pages[$page] = false;
65 65
                 } else {
Please login to merge, or discard this patch.
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
      * Use {page} in link_url als placeholder for the selected page number
25 25
      * and/or {offset} for the 0-based data offset of the selected page.
26 26
      *
27
-     * @param $link_url
27
+     * @param string $link_url
28 28
      * @param int $min_pages_shown
29 29
      * @param int $max_pages_shown
30 30
      */
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 
43 43
 
44 44
     /**
45
-     * @param $current_page
46
-     * @param $total_pages
45
+     * @param double $current_page
46
+     * @param double $total_pages
47 47
      * @param bool $page_size
48 48
      */
49 49
     public function make_from_pagenr($current_page, $total_pages, $page_size = false)
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 
117 117
     /**
118 118
      * @param $page
119
-     * @param $page_size
119
+     * @param boolean $page_size
120 120
      *
121 121
      * @return string
122 122
      */
Please login to merge, or discard this patch.
htdocs/lib2/error.inc.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -7,34 +7,34 @@
 block discarded – undo
7 7
  *  Common error messages
8 8
  ***************************************************************************/
9 9
 
10
- define('ERROR_UNKNOWN', 1000);
11
- define('ERROR_TEMPLATE_NOT_FOUND', 1001);
12
- define('ERROR_COMPILATION_FAILED', 1002);
13
- define('ERROR_NO_ACCESS', 1003);
14
- define('ERROR_INVALID_OPERATION', 1004);
15
- define('ERROR_LOGIN_REQUIRED', 1005);
16
- define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006);
17
- define('ERROR_NO_COOKIES', 1007);
18
- define('ERROR_ALREADY_LOGGEDIN', 1008);
19
- define('ERROR_USER_NOT_ACTIVE', 1009);
20
- define('ERROR_USER_NO_EMAIL', 1010);
21
- define('ERROR_CACHE_NOT_PUBLISHED', 1011);
22
- define('ERROR_CACHE_LOCKED', 1012);
10
+    define('ERROR_UNKNOWN', 1000);
11
+    define('ERROR_TEMPLATE_NOT_FOUND', 1001);
12
+    define('ERROR_COMPILATION_FAILED', 1002);
13
+    define('ERROR_NO_ACCESS', 1003);
14
+    define('ERROR_INVALID_OPERATION', 1004);
15
+    define('ERROR_LOGIN_REQUIRED', 1005);
16
+    define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006);
17
+    define('ERROR_NO_COOKIES', 1007);
18
+    define('ERROR_ALREADY_LOGGEDIN', 1008);
19
+    define('ERROR_USER_NOT_ACTIVE', 1009);
20
+    define('ERROR_USER_NO_EMAIL', 1010);
21
+    define('ERROR_CACHE_NOT_PUBLISHED', 1011);
22
+    define('ERROR_CACHE_LOCKED', 1012);
23 23
 
24
- define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013);
25
- define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014);
26
- define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015);
24
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013);
25
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014);
26
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015);
27 27
  
28
- define('ERROR_DB_COULD_NOT_RECONNECT', 1016);
29
- define('ERROR_DB_NO_ROOT', 1017);
28
+    define('ERROR_DB_COULD_NOT_RECONNECT', 1016);
29
+    define('ERROR_DB_NO_ROOT', 1017);
30 30
 
31
- define('ERROR_USER_NOT_EXISTS', 1018);
32
- define('ERROR_CACHE_NOT_EXISTS', 1019);
33
- define('ERROR_CACHELOG_NOT_EXISTS', 1020);
34
- define('ERROR_PICTURE_NOT_EXISTS', 1021);
31
+    define('ERROR_USER_NOT_EXISTS', 1018);
32
+    define('ERROR_CACHE_NOT_EXISTS', 1019);
33
+    define('ERROR_CACHELOG_NOT_EXISTS', 1020);
34
+    define('ERROR_PICTURE_NOT_EXISTS', 1021);
35 35
 
36
- define('ERROR_UPLOAD_ERR_NO_FILE', 1022);
37
- define('ERROR_UPLOAD_ERR_SIZE', 1023);
38
- define('ERROR_UPLOAD_ERR_TYPE', 1024);
39
- define('ERROR_UPLOAD_UNKNOWN', 1025);
40
- define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026);
36
+    define('ERROR_UPLOAD_ERR_NO_FILE', 1022);
37
+    define('ERROR_UPLOAD_ERR_SIZE', 1023);
38
+    define('ERROR_UPLOAD_ERR_TYPE', 1024);
39
+    define('ERROR_UPLOAD_UNKNOWN', 1025);
40
+    define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026);
Please login to merge, or discard this patch.
htdocs/lib2/sqldebugger.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
                     break;
75 75
                 }
76 76
                 $command['result'][] = $r;
77
-                $c ++;
77
+                $c++;
78 78
             }
79 79
             sql_free_result($rs);
80 80
 
Please login to merge, or discard this patch.
htdocs/lib2/ss_zip.class.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -143,9 +143,9 @@  discard block
 block discarded – undo
143 143
 
144 144
         }
145 145
         $fnl = strlen($filename);
146
-        $fh = "\x14\x00";    // ver needed to extract
147
-        $fh .= "\x00\x00";    // gen purpose bit flag
148
-        $fh .= "\x08\x00";    // compression method
146
+        $fh = "\x14\x00"; // ver needed to extract
147
+        $fh .= "\x00\x00"; // gen purpose bit flag
148
+        $fh .= "\x08\x00"; // compression method
149 149
         $fh .= "\x00\x00\x00\x00"; // last mod time and date
150 150
         $fh .= pack(
151 151
             "V3v2",
@@ -170,16 +170,16 @@  discard block
 block discarded – undo
170 170
                 "va*v3V2",
171 171
                 0,
172 172
                 $fh,
173
-                0,        // file comment length
174
-                0,        // disk number start
175
-                0,        // internal file attributes
176
-                $attr,    // external file attributes - 'archive/directory' bit set
173
+                0, // file comment length
174
+                0, // disk number start
175
+                0, // internal file attributes
176
+                $attr, // external file attributes - 'archive/directory' bit set
177 177
                 $this->offset
178 178
             ) . $filename;
179 179
 
180 180
         $this->offset += 42 + $fnl + $gzsize;
181 181
         $this->cdir[] = $cdir;
182
-        $this->cnt ++;
182
+        $this->cnt++;
183 183
         $this->idx = $this->cnt - 1;
184 184
     }
185 185
 
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
                 $cdsl, // size of central dir
229 229
                 $zdsl, // offset to start of central dir
230 230
                 0
231
-            );              // .zip file comment length
231
+            ); // .zip file comment length
232 232
         return $this->zipfile;
233 233
     }
234 234
 
Please login to merge, or discard this patch.
htdocs/lib2/login.class.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -20,13 +20,13 @@
 block discarded – undo
20 20
  *
21 21
  ***************************************************************************/
22 22
 
23
-define('LOGIN_UNKNOWN_ERROR', - 1);     // unkown error occured
24
-define('LOGIN_OK', 0);                 // login succeeded
25
-define('LOGIN_BADUSERPW', 1);          // bad username or password
26
-define('LOGIN_TOOMUCHLOGINS', 2);      // too many logins in short time
27
-define('LOGIN_USERNOTACTIVE', 3);      // the useraccount locked
23
+define('LOGIN_UNKNOWN_ERROR', - 1); // unkown error occured
24
+define('LOGIN_OK', 0); // login succeeded
25
+define('LOGIN_BADUSERPW', 1); // bad username or password
26
+define('LOGIN_TOOMUCHLOGINS', 2); // too many logins in short time
27
+define('LOGIN_USERNOTACTIVE', 3); // the useraccount locked
28 28
 define('LOGIN_EMPTY_USERPASSWORD', 4); // given username/password was empty
29
-define('LOGIN_LOGOUT_OK', 5);          // logout was successfull
29
+define('LOGIN_LOGOUT_OK', 5); // logout was successfull
30 30
 
31 31
 // login times in seconds
32 32
 define('LOGIN_TIME', 60 * 60);
Please login to merge, or discard this patch.
htdocs/lib2/html2text.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
         if (substr($link, 0, 7) == 'http://' || substr($link, 0, 8) == 'https://' ||
535 535
             substr($link, 0, 7) == 'mailto:'
536 536
         ) {
537
-            $this->_link_count ++;
537
+            $this->_link_count++;
538 538
             $this->_link_list .= "[" . $this->_link_count . "] $link\n";
539 539
             $additional = ' [' . $this->_link_count . ']';
540 540
         } elseif (substr($link, 0, 11) == 'javascript:') {
@@ -542,7 +542,7 @@  discard block
 block discarded – undo
542 542
             $additional = '';
543 543
             // what about href="#anchor" ?
544 544
         } else {
545
-            $this->_link_count ++;
545
+            $this->_link_count++;
546 546
             $this->_link_list .= "[" . $this->_link_count . "] " . $this->url;
547 547
             if (substr($link, 0, 1) != '/') {
548 548
                 $this->_link_list .= '/';
Please login to merge, or discard this patch.
htdocs/map2.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
                        WHERE option_id=6 AND user_id='&1'", true, $login->userid))
68 68
 ) {
69 69
     $fullscreen = true;
70
-    $tpl->popup = true;        // disables page header and -frame
70
+    $tpl->popup = true; // disables page header and -frame
71 71
     $tpl->popupmargin = false;
72 72
 } else {
73 73
     $fullscreen = false;
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
     $caches_found = 0;
457 457
     while ($r = sql_fetch_assoc($rs)) {
458 458
         echo '<cache name="' . xmlentities($r['name']) . '" wpoc="' . xmlentities($r['wp_oc']) . '" />' . "\n";
459
-        ++ $caches_found;
459
+        ++$caches_found;
460 460
     }
461 461
     sql_free_result($rs);
462 462
 
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
496 496
         "SELECT `slave_id`
497 497
         FROM `map2_result`
498 498
         WHERE `result_id`='&1' AND DATE_ADD(`date_created`, INTERVAL '&2' SECOND)>NOW()",
499
-        - 2,
499
+        -2,
500 500
         $nResultId,
501 501
         $opt['map']['maxcacheage']
502 502
     );
Please login to merge, or discard this patch.
htdocs/log.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@
 block discarded – undo
121 121
     // get logtext editormode (from form or from userprofile)
122 122
     // 1 = text; 2 = HTML; 3 = tinyMCE
123 123
     if (isset($_POST['descMode'])) {
124
-        $descMode = $_POST['descMode'] + 0;  // Ocprop: 2
124
+        $descMode = $_POST['descMode'] + 0; // Ocprop: 2
125 125
         if (($descMode < 1) || ($descMode > 3)) {
126 126
             $descMode = 3;
127 127
         }
Please login to merge, or discard this patch.