Completed
Pull Request — development (#405)
by Mirko
14:04 queued 06:05
created
htdocs/lib2/menu.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
                         'parent' => MNU_MAP
81 81
                     ];
82 82
                     $menuitem[MNU_MAP]['subitems'][] = $menu_map;
83
-                    ++ $menu_map;
83
+                    ++$menu_map;
84 84
                 }
85 85
             }
86 86
         }
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
         $rsSubmenu = sqlf("SELECT `id` FROM `sys_menu` WHERE `parent`=0 ORDER BY `parent` ASC, `position` ASC");
108 108
         while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
109 109
             $aMenu[MNU_ROOT]['subitems'][$nPos] = $rSubmenu['id'];
110
-            $nPos ++;
110
+            $nPos++;
111 111
         }
112 112
         sql_free_result($rsSubmenu);
113 113
         fwrite($f, "\n");
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
             );
145 145
             while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
146 146
                 $aMenu[$r['id']]['subitems'][$nPos] = $rSubmenu['id'];
147
-                $nPos ++;
147
+                $nPos++;
148 148
             }
149 149
             sql_free_result($rsSubmenu);
150 150
         }
Please login to merge, or discard this patch.
htdocs/lib2/common.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,9 +43,9 @@
 block discarded – undo
43 43
 mb_regex_encoding('UTF-8');
44 44
 
45 45
 // set options
46
-require_once __DIR__.'/../config2/settings-dist.inc.php';
47
-require_once __DIR__.'/../config2/settings.inc.php';
48
-require_once __DIR__.'/../config2/verify-settings.inc.php';
46
+require_once __DIR__ . '/../config2/settings-dist.inc.php';
47
+require_once __DIR__ . '/../config2/settings.inc.php';
48
+require_once __DIR__ . '/../config2/verify-settings.inc.php';
49 49
 
50 50
 foreach ($opt['page']['banned_user_agents'] as $ua) {
51 51
     if (strpos($useragent, $ua) !== false) {
Please login to merge, or discard this patch.
htdocs/src/Oc/Session/SessionDataNative.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
                     // TODO fix the following if statement, seems corrupted
51 51
                     if (strtolower(
52 52
                             substr(
53
-                                'http' + strstr($_SERVER['REFERER'], '://'),
53
+                                'http' +strstr($_SERVER['REFERER'], '://'),
54 54
                                 0,
55 55
                                 strlen($opt['page']['absolute_http_url'])
56 56
                             )
Please login to merge, or discard this patch.
htdocs/src/Oc/Cache/WebCache.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
                 \set_php_locale();
81 81
 
82 82
                 if ($this->translate->t('INTERNAL_LANG', 'all', 'OcSmarty.class.php', '') !== $sLanguage) {
83
-                    echo 'setlocale() failed to set language to ' . $sLanguage ."\n";
83
+                    echo 'setlocale() failed to set language to ' . $sLanguage . "\n";
84 84
                     die("Is the translation of INTERNAL_LANG correct?\n");
85 85
                 }
86 86
 
Please login to merge, or discard this patch.
htdocs/config2/settings-sample-vagrant.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 $opt['session']['mode'] = SAVE_COOKIE;
64 64
 $opt['session']['cookiename'] = 'ocvagrant'; // only with SAVE_COOKIE
65 65
 $opt['session']['path'] = '/';
66
-$opt['session']['domain'] = 'local.team-opencaching.de';    // may be overwritten by $opt['domain'][...]['cookiedomain']
66
+$opt['session']['domain'] = 'local.team-opencaching.de'; // may be overwritten by $opt['domain'][...]['cookiedomain']
67 67
 
68 68
 /* If the Referer was sent by the client and the substring was not found,
69 69
  * the embedded session id will be marked as invalid.
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
  * Take caution on caching issues (!)
222 222
  */
223 223
 
224
-$opt['map']['towns']['enable'] = true;  // for releasing v14
224
+$opt['map']['towns']['enable'] = true; // for releasing v14
225 225
 
226 226
 define('MNU_INFO', 1015);
227 227
 define('MNU_TEAMBLOG', 1016);
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
@@ -241,7 +241,7 @@
 block discarded – undo
241 241
     while ($nCurPos < mb_strlen($str)) {
242 242
         $nNextSep = mb_strlen($str);
243 243
         $sepLength = mb_strlen($sep);
244
-        for ($nSepPos = 0; $nSepPos < $sepLength; $nSepPos ++) {
244
+        for ($nSepPos = 0; $nSepPos < $sepLength; $nSepPos++) {
245 245
             $nThisPos = mb_strpos($str, mb_substr($sep, $nSepPos, 1), $nCurPos);
246 246
             if ($nThisPos !== false && $nNextSep > $nThisPos) {
247 247
                 $nNextSep = $nThisPos;
Please login to merge, or discard this patch.
htdocs/config2/settings-dist-travis.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-require_once __DIR__ .'/settings-sample-vagrant.inc.php';
3
+require_once __DIR__ . '/settings-sample-vagrant.inc.php';
4 4
 
5 5
 // database access
6 6
 $opt['db']['servername'] = '127.0.0.1';
Please login to merge, or discard this patch.
htdocs/src/AppBundle/Command/CodeCoverageCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
      */
37 37
     protected function execute(InputInterface $input, OutputInterface $output)
38 38
     {
39
-        $inputFile = __DIR__.'/../../../../build/logs/clover.xml';
39
+        $inputFile = __DIR__ . '/../../../../build/logs/clover.xml';
40 40
 
41 41
         if (!file_exists($inputFile)) {
42 42
             throw new \InvalidArgumentException('Invalid input file provided');
Please login to merge, or discard this patch.
htdocs/lib2/logic/picture.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -464,9 +464,9 @@
 block discarded – undo
464 464
                 return false;
465 465
             } else {
466 466
                 // restore picture file
467
-                $this->setUrl($original_url);     // set the url, so that we can
467
+                $this->setUrl($original_url); // set the url, so that we can
468 468
                 $filename = $this->getFilename(); // .. retrieve the file path+name
469
-                $this->setFilenames($filename);   // now set url(s) from the new uuid
469
+                $this->setFilenames($filename); // now set url(s) from the new uuid
470 470
                 try {
471 471
                     rename($this->deletedFilename($filename), $this->getFilename());
472 472
                 } catch (Exception $e) {
Please login to merge, or discard this patch.