Passed
Pull Request — development (#359)
by Markus
08:05
created
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/menu.class.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
         // add country-dependent town list for small map
35 35
         $country = $login->getUserCountry();
36 36
         if ($opt['map']['towns']['enable'] &&
37
-            isset($build_map_towns_menu) && $build_map_towns_menu &&   // optimization
37
+            isset($build_map_towns_menu) && $build_map_towns_menu && // optimization
38 38
             isset($opt['map']['towns'][$country]['enable']) && $opt['map']['towns'][$country]['enable']
39 39
         ) {
40 40
             $rsTowns = sqlf(
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
                         'parent' => MNU_MAP
74 74
                     ];
75 75
                     $menuitem[MNU_MAP]['subitems'][] = $menu_map;
76
-                    ++ $menu_map;
76
+                    ++$menu_map;
77 77
                 }
78 78
             }
79 79
         }
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
         $rsSubmenu = sqlf("SELECT `id` FROM `sys_menu` WHERE `parent`=0 ORDER BY `parent` ASC, `position` ASC");
101 101
         while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
102 102
             $aMenu[MNU_ROOT]['subitems'][$nPos] = $rSubmenu['id'];
103
-            $nPos ++;
103
+            $nPos++;
104 104
         }
105 105
         sql_free_result($rsSubmenu);
106 106
         fwrite($f, "\n");
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
             );
138 138
             while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
139 139
                 $aMenu[$r['id']]['subitems'][$nPos] = $rSubmenu['id'];
140
-                $nPos ++;
140
+                $nPos++;
141 141
             }
142 142
             sql_free_result($rsSubmenu);
143 143
         }
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/db.inc.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -185,10 +185,10 @@  discard block
 block discarded – undo
185 185
         // & escaped?
186 186
         $escapesCount = 0;
187 187
         while ((($nextarg - $escapesCount - 1) > 0) && (substr($sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
188
-            $escapesCount ++;
188
+            $escapesCount++;
189 189
         }
190 190
         if (($escapesCount % 2) == 1) {
191
-            $nextarg ++;
191
+            $nextarg++;
192 192
         } else {
193 193
             $nextchar = substr($sql, $nextarg + 1, 1);
194 194
             if (is_numeric($nextchar)) {
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
                 while (preg_match('/^[0-9]{1}/', $nextchar) == 1) {
200 200
                     $arg .= $nextchar;
201 201
 
202
-                    $arglength ++;
202
+                    $arglength++;
203 203
                     $nextchar = substr($sql, $nextarg + $arglength + 1, 1);
204 204
                 }
205 205
 
@@ -225,13 +225,13 @@  discard block
 block discarded – undo
225 225
                         // strip apostroph and insert NULL
226 226
                         $filtered_sql = substr($filtered_sql, 0, strlen($filtered_sql) - 1);
227 227
                         $filtered_sql .= 'NULL';
228
-                        $sqlpos ++;
228
+                        $sqlpos++;
229 229
                     } else {
230 230
                         $filtered_sql .= 'NULL';
231 231
                     }
232 232
                 }
233 233
 
234
-                $sqlpos ++;
234
+                $sqlpos++;
235 235
             } else {
236 236
                 $arglength = 0;
237 237
                 $arg = '';
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
                 while (preg_match('/^[a-zA-Z0-9_]{1}/', $nextchar) == 1) {
242 242
                     $arg .= $nextchar;
243 243
 
244
-                    $arglength ++;
244
+                    $arglength++;
245 245
                     $nextchar = substr($sql, $nextarg + $arglength + 1, 1);
246 246
                 }
247 247
 
@@ -288,12 +288,12 @@  discard block
 block discarded – undo
288 288
         $escapesCount = 0;
289 289
         while ((($nextarg - $escapesCount - 1) > 0)
290 290
             && (substr($filtered_sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
291
-            $escapesCount ++;
291
+            $escapesCount++;
292 292
         }
293 293
         if (($escapesCount % 2) == 0) {
294 294
             // strip escapes of &
295 295
             $filtered_sql = substr($filtered_sql, 0, $nextarg) . '&' . substr($filtered_sql, $nextarg + 2);
296
-            $nextarg --;
296
+            $nextarg--;
297 297
         }
298 298
 
299 299
         $nextarg = strpos($filtered_sql, '\&', $nextarg + 2);
@@ -837,7 +837,7 @@  discard block
 block discarded – undo
837 837
         AND `online`= 1
838 838
         AND (TIMESTAMP(NOW())-TIMESTAMP(`last_check`)+`time_diff`<'&1')
839 839
         ORDER BY `w` DESC LIMIT 1",
840
-        - 1,
840
+        -1,
841 841
         $nMaxTimeDiff
842 842
     );
843 843
 
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/lib2/util.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -229,7 +229,7 @@
 block discarded – undo
229 229
 
230 230
     while ($nCurPos < mb_strlen($str)) {
231 231
         $nNextSep = mb_strlen($str);
232
-        for ($nSepPos = 0; $nSepPos < mb_strlen($sep); $nSepPos ++) {
232
+        for ($nSepPos = 0; $nSepPos < mb_strlen($sep); $nSepPos++) {
233 233
             $nThisPos = mb_strpos($str, mb_substr($sep, $nSepPos, 1), $nCurPos);
234 234
             if ($nThisPos !== false) {
235 235
                 if ($nNextSep > $nThisPos) {
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.