Completed
Pull Request — development (#546)
by Nick
07:54 queued 01:05
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/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.
htdocs/okapi_settings.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
         'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'],
34 34
         'DEBUG'            => ($opt['debug'] & DEBUG_DEVELOPER != 0),
35 35
         'DEBUG_PREVENT_SEMAPHORES'
36
-                           => !$opt['php']['semaphores'], # not available on old developer system
36
+                            => !$opt['php']['semaphores'], # not available on old developer system
37 37
         'DB_SERVER'        => $opt['db']['servername'],
38 38
         'DB_NAME'          => $opt['db']['placeholder']['db'],
39 39
         'DB_USERNAME'      => $opt['db']['username'],
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
         'OC_NODE_ID'       => $opt['logic']['node']['id'],
55 55
         'OC_COOKIE_NAME'   => $opt['session']['cookiename'] . 'data',
56 56
         'OCDE_HTML_PURIFIER_SETTINGS'
57
-                           => $opt['html_purifier'],
57
+                            => $opt['html_purifier'],
58 58
         'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'],
59 59
     );
60 60
 }
Please login to merge, or discard this patch.
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/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/lib2/logic/picture.class.php 2 patches
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.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -692,7 +692,7 @@  discard block
 block discarded – undo
692 692
     }
693 693
 
694 694
     /**
695
-     * @return bool|string
695
+     * @return string|false
696 696
      */
697 697
     public function getPageLink()
698 698
     {
@@ -724,7 +724,7 @@  discard block
 block discarded – undo
724 724
     /**
725 725
      * @param $tmpFile
726 726
      * @param $longSideSize
727
-     * @return bool
727
+     * @return null|boolean
728 728
      */
729 729
     public function rotate_and_shrink($tmpFile, $longSideSize)
730 730
     {
Please login to merge, or discard this patch.
htdocs/lib/clicompatbase.inc.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -506,6 +506,9 @@
 block discarded – undo
506 506
     return mysql_fetch_assoc($rs);
507 507
 }
508 508
 
509
+/**
510
+ * @param resource $rs
511
+ */
509 512
 function sql_fetch_row($rs)
510 513
 {
511 514
     return mysql_fetch_row($rs);
Please login to merge, or discard this patch.
htdocs/lib2/ss_zip.class.php 2 patches
Indentation   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,8 +34,7 @@
 block discarded – undo
34 34
     public $cdir = [];
35 35
 
36 36
     /**    constructor
37
-
38
-*
37
+     *
39 38
 *@param string $zipFile if not empty must contain path to valid zip file, ss_zip will try to open and parse it.
40 39
      *               If this parameter is empty, the new empty zip archive is created. This parameter has no meaning in
41 40
      *               LIGHT verion, please upgrade to PROfessional version.
Please login to merge, or discard this 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 .=
151 151
             pack(
@@ -172,16 +172,16 @@  discard block
 block discarded – undo
172 172
                 "va*v3V2",
173 173
                 0,
174 174
                 $fh,
175
-                0,        // file comment length
176
-                0,        // disk number start
177
-                0,        // internal file attributes
178
-                $attr,    // external file attributes - 'archive/directory' bit set
175
+                0, // file comment length
176
+                0, // disk number start
177
+                0, // internal file attributes
178
+                $attr, // external file attributes - 'archive/directory' bit set
179 179
                 $this->offset
180 180
             ) . $filename;
181 181
 
182 182
         $this->offset += 42 + $fnl + $gzsize;
183 183
         $this->cdir[] = $cdir;
184
-        $this->cnt ++;
184
+        $this->cnt++;
185 185
         $this->idx = $this->cnt - 1;
186 186
     }
187 187
 
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
                 $cdsl, // size of central dir
231 231
                 $zdsl, // offset to start of central dir
232 232
                 0
233
-            );              // .zip file comment length
233
+            ); // .zip file comment length
234 234
         return $this->zipfile;
235 235
     }
236 236
 
Please login to merge, or discard this patch.