Passed
Pull Request — development (#375)
by Thomas
07:56
created
htdocs/config2/locale.inc.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -17,9 +17,9 @@  discard block
 block discarded – undo
17 17
  *                 $opt['locale']
18 18
  ***************************************************************************/
19 19
 
20
-define('OC_LOCALE_ACTIVE', 2);    // enable language and show language button in header line
21
-define('OC_LOCALE_HIDDEN', 1);    // enable language but hide language button in header line
22
-define('OC_LOCALE_DISABLED', 0);  // disable language
20
+define('OC_LOCALE_ACTIVE', 2); // enable language and show language button in header line
21
+define('OC_LOCALE_HIDDEN', 1); // enable language but hide language button in header line
22
+define('OC_LOCALE_DISABLED', 0); // disable language
23 23
 
24 24
 $opt['template']['locales']['DE']['status'] = OC_LOCALE_ACTIVE;
25 25
 $opt['template']['locales']['DE']['flag'] = 'images/flag/DE.png';
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 $opt['locale']['DE']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="resource2/ocstyle/images/media/cc-by-nc-nd-small.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Die <a href="articles.php?page=impressum#datalicense">Inhalte</a> von {site} stehen unter der Creative-Commons-Lizenz <a rel="license" href="%1">BY-NC-ND 3.0 DE</a>.</div>';
132 132
 $opt['locale']['DE']['helpwiki'] = 'http://wiki.opencaching.de/index.php/';
133 133
 $opt['locale']['DE']['mostly_translated'] = true;
134
-$opt['locale']['DE']['what3words'] = true;  // "beta"
134
+$opt['locale']['DE']['what3words'] = true; // "beta"
135 135
 
136 136
 $opt['locale']['IT']['format']['dateshort'] = '%d/%m/%y';
137 137
 $opt['locale']['IT']['format']['dm'] = '%d/%m';
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 $opt['locale']['SV']['page']['subtitle1'] = 'Geocaching med Opencaching';
234 234
 $opt['locale']['SV']['page']['subtitle2'] = '';
235 235
 $opt['locale']['SV']['mostly_translated'] = false;
236
-$opt['locale']['SV']['what3words'] = true;  // "beta"
236
+$opt['locale']['SV']['what3words'] = true; // "beta"
237 237
 
238 238
 $opt['locale']['NO']['format']['dateshort'] = '%d.%m.%y';
239 239
 $opt['locale']['NO']['format']['dm'] = '%d.%m.';
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 $opt['locale']['RU']['country'] = 'RU';
284 284
 $opt['locale']['RU']['primary_lang_of'] = ['RU'];
285 285
 $opt['locale']['RU']['mostly_translated'] = false;
286
-$opt['locale']['RU']['what3words'] = true;   // "beta"
286
+$opt['locale']['RU']['what3words'] = true; // "beta"
287 287
 
288 288
 $opt['locale']['DA']['format']['dateshort'] = '%d.%m.%y';
289 289
 $opt['locale']['DA']['format']['dm'] = '%d.%m.';
Please login to merge, or discard this patch.
htdocs/lib/settings-dist.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@
 block discarded – undo
144 144
 
145 145
 /* default locale
146 146
  */
147
-$opt['template']['default']['locale'] = 'DE';   // can be overwritten by $opt['domain'][<domain>]['locale']
147
+$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale']
148 148
 
149 149
 // include all locale settings
150 150
 require_once $rootpath . 'config2/locale.inc.php';
Please login to merge, or discard this patch.
htdocs/lib/clicompatbase.inc.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -239,10 +239,10 @@  discard block
 block discarded – undo
239 239
         // muss dieses & ersetzt werden, oder ist es escaped?
240 240
         $escapesCount = 0;
241 241
         while ((($nextarg - $escapesCount - 1) > 0) && (mb_substr($sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
242
-            $escapesCount ++;
242
+            $escapesCount++;
243 243
         }
244 244
         if (($escapesCount % 2) == 1) {
245
-            $nextarg ++;
245
+            $nextarg++;
246 246
         } else {
247 247
             $nextchar = mb_substr($sql, $nextarg + 1, 1);
248 248
             if (is_numeric($nextchar)) {
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
                 while (mb_ereg_match('^[0-9]{1}', $nextchar) == 1) {
254 254
                     $arg .= $nextchar;
255 255
 
256
-                    $arglength ++;
256
+                    $arglength++;
257 257
                     $nextchar = mb_substr($sql, $nextarg + $arglength + 1, 1);
258 258
                 }
259 259
 
@@ -285,13 +285,13 @@  discard block
 block discarded – undo
285 285
                         // Anführungszeichen weg machen und NULL einsetzen
286 286
                         $filtered_sql = mb_substr($filtered_sql, 0, mb_strlen($filtered_sql) - 1);
287 287
                         $filtered_sql .= 'NULL';
288
-                        $sqlpos ++;
288
+                        $sqlpos++;
289 289
                     } else {
290 290
                         $filtered_sql .= 'NULL';
291 291
                     }
292 292
                 }
293 293
 
294
-                $sqlpos ++;
294
+                $sqlpos++;
295 295
             } else {
296 296
                 $arglength = 0;
297 297
                 $arg = '';
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
                 while (mb_ereg_match('^[a-zA-Z0-9]{1}', $nextchar) == 1) {
301 301
                     $arg .= $nextchar;
302 302
 
303
-                    $arglength ++;
303
+                    $arglength++;
304 304
                     $nextchar = mb_substr($sql, $nextarg + $arglength + 1, 1);
305 305
                 }
306 306
 
@@ -329,12 +329,12 @@  discard block
 block discarded – undo
329 329
         $escapesCount = 0;
330 330
         while ((($nextarg - $escapesCount - 1) > 0) &&
331 331
                (mb_substr($filtered_sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
332
-            $escapesCount ++;
332
+            $escapesCount++;
333 333
         }
334 334
         if (($escapesCount % 2) == 0) {
335 335
             // \& ersetzen durch &
336 336
             $filtered_sql = mb_substr($filtered_sql, 0, $nextarg) . '&' . mb_substr($filtered_sql, $nextarg + 2);
337
-            $nextarg --;
337
+            $nextarg--;
338 338
         }
339 339
 
340 340
         $nextarg = mb_strpos($filtered_sql, '\&', $nextarg + 2);
Please login to merge, or discard this patch.
htdocs/src/AppBundle/Command/CodeSnifferCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
         }
44 44
 
45 45
         $process = new Process($cmd, $this->rootPath, null, null, 9600);
46
-        $process->run(function ($type, $buffer) {
46
+        $process->run(function($type, $buffer) {
47 47
             echo $buffer;
48 48
         });
49 49
 
Please login to merge, or discard this patch.
htdocs/src/AppBundle/Form/UploadFieldNotesType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
                 ]
55 55
             );
56 56
 
57
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
57
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
58 58
             $data = $event->getData();
59 59
             $form = $event->getForm();
60 60
 
Please login to merge, or discard this patch.
local/prodsys/phpzip.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@
 block discarded – undo
83 83
     }
84 84
 
85 85
     $countParts = count($parts);
86
-    for ($i = 0; $i < $countParts; $i ++) {
86
+    for ($i = 0; $i < $countParts; $i++) {
87 87
         if (($parts[$i] == '..') || ($parts[$i] == '.')) {
88 88
             return false;
89 89
         }
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/lib/menu.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
     /* selmenuitem contains the selected (bold) menu item */
286 286
     global $mnu_selmenuitem;
287 287
 
288
-    for ($i = 0, $ret = - 1; ($i < count($menustructure)) && ($ret == - 1); $i ++) {
288
+    for ($i = 0, $ret = - 1; ($i < count($menustructure)) && ($ret == - 1); $i++) {
289 289
         if ($menustructure[$i]['siteid'] == $pageid) {
290 290
             $mnu_selmenuitem = $menustructure[$i];
291 291
 
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
     global $menu;
314 314
     $c = 0;
315 315
     $max = count($menu);
316
-    for ($i = 0; $i < $max; $i ++) {
316
+    for ($i = 0; $i < $max; $i++) {
317 317
         if ($menu[$i]['visible'] == true) {
318 318
             $sTarget = isset($menu[$i]['target']) ? $menu[$i]['target'] : '';
319 319
             $sItem = '<a href="' . $menu[$i]['filename'] . '" ' . $sTarget . '>' . htmlspecialchars(t($menu[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a>';
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
 
329 329
             echo $sItem . "\n";
330 330
 
331
-            $c ++;
331
+            $c++;
332 332
         }
333 333
     }
334 334
 }
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 
349 349
     if (!$bHasSubmenu) {
350 350
         /* prüfen, ob ein Submenü vorhanden ist */
351
-        for ($i = 0, $bSubmenu = false; ($i < count($menustructure)) && ($bSubmenu == false); $i ++) {
351
+        for ($i = 0, $bSubmenu = false; ($i < count($menustructure)) && ($bSubmenu == false); $i++) {
352 352
             if (isset($menustructure[$i]['submenu'])) {
353 353
                 $bSubmenu = true;
354 354
             }
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
         }
366 366
     }
367 367
     $maxMenuStructure = count($menustructure);
368
-    for ($i = 0; $i < $maxMenuStructure; $i ++) {
368
+    for ($i = 0; $i < $maxMenuStructure; $i++) {
369 369
         if ($menustructure[$i]['visible'] == true) {
370 370
             if ($menustructure[$i]['siteid'] == $pageid) {
371 371
                 echo '<li class="' . $cssclass . ' group_active"><a href="' . $menustructure[$i]['filename'] . '">' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a></li>' . "\n";
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
398 398
 function mnu_IsMenuParentOf($parentmenuitems, $menuitemid)
399 399
 {
400 400
     $countParentMenuItems = count($parentmenuitems);
401
-    for ($i = 0; $i < $countParentMenuItems; $i ++) {
401
+    for ($i = 0; $i < $countParentMenuItems; $i++) {
402 402
         if ($parentmenuitems[$i]['siteid'] == $menuitemid) {
403 403
             return true;
404 404
         }
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
440 440
 function mnu_prv_EchoBreadCrumbSubItem($pageid, $menustructure)
441 441
 {
442 442
     $maxMenuStructure = count($menustructure);
443
-    for ($i = 0; $i < $maxMenuStructure; $i ++) {
443
+    for ($i = 0; $i < $maxMenuStructure; $i++) {
444 444
         if ($menustructure[$i]['siteid'] == $pageid) {
445 445
             echo '&nbsp;&gt;&nbsp;' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8');
446 446
 
Please login to merge, or discard this patch.
htdocs/src/Oc/SmartyPlugins/function.season.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
 
82 82
     $nTimestamp = time();
83 83
     $countSeason = count($seasons);
84
-    for ($nIndex = 0; $nIndex < $countSeason; $nIndex ++) {
84
+    for ($nIndex = 0; $nIndex < $countSeason; $nIndex++) {
85 85
         if (strtotime($seasons[$nIndex][0]) > $nTimestamp) {
86 86
             return $params['winter'];
87 87
         } //'';
Please login to merge, or discard this patch.
htdocs/lib2/edithelper.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
     } else {
85 85
         // convert smilies ...
86 86
         $countSmileyImage = count($smiley['image']);
87
-        for ($n = 0; $n < $countSmileyImage; $n ++) {
87
+        for ($n = 0; $n < $countSmileyImage; $n++) {
88 88
             $text = mb_ereg_replace(
89 89
                 "<img [^>]*?src=[^>]+?" . str_replace('.', '\.', $smiley['file'][$n]) . "[^>]+?>",
90 90
                 "[s![" . $smiley['text'][$n] . "]!s]",
Please login to merge, or discard this patch.