Passed
Push — development ( 11bc13...35360b )
by Mirco
09:07
created
htdocs/lib2/logic/const.inc.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -16,12 +16,12 @@  discard block
 block discarded – undo
16 16
 define('RE_TYPE_FLOAT', 5);
17 17
 define('RE_TYPE_DOUBLE', 6);
18 18
 
19
-define('RE_INSERT_NOTHING', 0);       //
20
-define('RE_INSERT_OVERWRITE', 1);     // ignore given values and use function
21
-define('RE_INSERT_IGNORE', 2);        // dont use this column on insert
19
+define('RE_INSERT_NOTHING', 0); //
20
+define('RE_INSERT_OVERWRITE', 1); // ignore given values and use function
21
+define('RE_INSERT_IGNORE', 2); // dont use this column on insert
22 22
 define('RE_INSERT_AUTOINCREMENT', 4); // column is an auto increment column
23
-define('RE_INSERT_AUTOUUID', 8);      // if empty, UUID is generated by before insert trigger (not supported for primary key fields)
24
-define('RE_INSERT_NOW', 16);          // NOW()
23
+define('RE_INSERT_AUTOUUID', 8); // if empty, UUID is generated by before insert trigger (not supported for primary key fields)
24
+define('RE_INSERT_NOW', 16); // NOW()
25 25
 
26 26
 define('EUROPEAN_LETTERS', 'A-Za-zÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖרÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ');
27 27
 // ASCII + ISO-8859-1 0xC0..0xFF
@@ -31,13 +31,13 @@  discard block
 block discarded – undo
31 31
 define('REGEX_FIRST_NAME', REGEX_LAST_NAME);
32 32
 define('REGEX_STATPIC_TEXT', '^[' . EUROPEAN_LETTERS . '0-9\.\-_ @=)(\/\\\&*\$+~#!§%;,-?:\[\]{}¹²³\'\"`\|µ°\%]{0,30}$');
33 33
 
34
-define('ADMIN_TRANSLATE', 1);     // edit translation
35
-define('ADMIN_MAINTAINANCE', 2);  // check table etc.
36
-define('ADMIN_USER', 4);          // drop users, caches etc.
37
-define('ADMIN_NEWS', 8);          // obsolete / reserved
38
-define('ADMIN_RESTORE', 16);      // restore vandalized listings
39
-define('ADMIN_ROOT', 128 | 127);  // root + all previous rights
40
-define('ADMIN_LISTING', 1024);    // can edit any cache listings
34
+define('ADMIN_TRANSLATE', 1); // edit translation
35
+define('ADMIN_MAINTAINANCE', 2); // check table etc.
36
+define('ADMIN_USER', 4); // drop users, caches etc.
37
+define('ADMIN_NEWS', 8); // obsolete / reserved
38
+define('ADMIN_RESTORE', 16); // restore vandalized listings
39
+define('ADMIN_ROOT', 128 | 127); // root + all previous rights
40
+define('ADMIN_LISTING', 1024); // can edit any cache listings
41 41
 
42 42
 define('ATTRIB_SELECTED', 1);
43 43
 define('ATTRIB_UNSELECTED', 2);
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 define('USR_OPT_GMZOOM', 1);
69 69
 define('USR_OPT_SHOWSTATS', 5);
70 70
 define('USR_OPT_MAP_MENU', 6);
71
-define('USR_OPT_MAP_OVERVIEW', 7);   // obsolete, no longer supported since Google Maps 3.22
71
+define('USR_OPT_MAP_OVERVIEW', 7); // obsolete, no longer supported since Google Maps 3.22
72 72
 define('USR_OPT_MAP_MAXCACHES', 8);
73 73
 define('USR_OPT_MAP_ICONSET', 9);
74 74
 define('USR_OPT_MAP_PREVIEW', 10);
@@ -79,11 +79,11 @@  discard block
 block discarded – undo
79 79
 // ID 15 was temporarily used and is reserved, see commit dda7ef0. Continue with 16.
80 80
 
81 81
 // user.data_license values
82
-define('OLD_DATA_LICSENSE', 0);                       // before deadline
83
-define('NEW_DATA_LICENSE_ACTIVELY_DECLINED', 1);      // declined license
84
-define('NEW_DATA_LICENSE_ACTIVELY_ACCEPTED', 2);      // accepted new license on registration
85
-define('NEW_DATA_LICENSE_PASSIVELY_ACCEPTED', 3);     // did not decline license until deadline
86
-define('NEW_DATA_LICENSE_PASSIVELY_DECLINED', 4);     // could not accept/decline because disabled
82
+define('OLD_DATA_LICSENSE', 0); // before deadline
83
+define('NEW_DATA_LICENSE_ACTIVELY_DECLINED', 1); // declined license
84
+define('NEW_DATA_LICENSE_ACTIVELY_ACCEPTED', 2); // accepted new license on registration
85
+define('NEW_DATA_LICENSE_PASSIVELY_ACCEPTED', 3); // did not decline license until deadline
86
+define('NEW_DATA_LICENSE_PASSIVELY_DECLINED', 4); // could not accept/decline because disabled
87 87
 
88 88
 //picture upload/resize parameters
89 89
 define('PICTURE_QUALITY', 85);
Please login to merge, or discard this patch.
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 2 patches
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.
Doc Comments   +31 added lines patch added patch discarded remove patch
@@ -64,6 +64,12 @@  discard block
 block discarded – undo
64 64
 // prepare EMail-From
65 65
 $emailheaders = 'From: "' . $emailaddr . '" <' . $emailaddr . '>';
66 66
 
67
+/**
68
+ * @param string $module
69
+ * @param integer $eventid
70
+ * @param integer $objectid2
71
+ * @param string $logtext
72
+ */
67 73
 function logentry($module, $eventid, $userid, $objectid1, $objectid2, $logtext, $details)
68 74
 {
69 75
     sql(
@@ -104,6 +110,9 @@  discard block
 block discarded – undo
104 110
     sql_error();
105 111
 }
106 112
 
113
+/**
114
+ * @param string $sql
115
+ */
107 116
 function sqlValue($sql, $default)
108 117
 {
109 118
     $rs = sql($sql);
@@ -132,11 +141,21 @@  discard block
 block discarded – undo
132 141
     }
133 142
 }
134 143
 
144
+/**
145
+ * @param string $name
146
+ * @param string $default
147
+ *
148
+ * @return string
149
+ */
135 150
 function getSysConfig($name, $default)
136 151
 {
137 152
     return sqlValue('SELECT `value` FROM `sysconfig` WHERE `name`=\'' . sql_escape($name) . '\'', $default);
138 153
 }
139 154
 
155
+/**
156
+ * @param string $name
157
+ * @param string $value
158
+ */
140 159
 function setSysConfig($name, $value)
141 160
 {
142 161
     if (sqlValue('SELECT COUNT(*) FROM sysconfig WHERE name=\'' . sql_escape($name) . '\'', 0) == 1) {
@@ -448,6 +467,9 @@  discard block
 block discarded – undo
448 467
     die('sql_error');
449 468
 }
450 469
 
470
+/**
471
+ * @param string $warnmessage
472
+ */
451 473
 function sql_warn($warnmessage)
452 474
 {
453 475
     global $sql_errormail;
@@ -470,6 +492,9 @@  discard block
 block discarded – undo
470 492
 /*
471 493
     Ersatz für die in Mysql eingebauten Funktionen
472 494
 */
495
+/**
496
+ * @param resource $rs
497
+ */
473 498
 function sql_fetch_array($rs)
474 499
 {
475 500
     return mysql_fetch_array($rs);
@@ -485,6 +510,9 @@  discard block
 block discarded – undo
485 510
     return mysql_fetch_row($rs);
486 511
 }
487 512
 
513
+/**
514
+ * @param resource $rs
515
+ */
488 516
 function sql_fetch_column($rs)
489 517
 {
490 518
     $col = [];
@@ -694,6 +722,9 @@  discard block
 block discarded – undo
694 722
     ];
695 723
 }
696 724
 
725
+/**
726
+ * @param string $filename
727
+ */
697 728
 function fetch_email_template($filename, $language, $domain)
698 729
 {
699 730
     global $opt, $rootpath;
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/lib2/db.inc.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
         // & escaped?
182 182
         $escapesCount = 0;
183 183
         while ((($nextarg - $escapesCount - 1) > 0) && (substr($sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
184
-            $escapesCount ++;
184
+            $escapesCount++;
185 185
         }
186 186
         if (($escapesCount % 2) === 1) {
187 187
             $nextarg++;
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
                 while (preg_match('/^[0-9]{1}/', $nextchar) === 1) {
196 196
                     $arg .= $nextchar;
197 197
 
198
-                    $arglength ++;
198
+                    $arglength++;
199 199
                     $nextchar = substr($sql, $nextarg + $arglength + 1, 1);
200 200
                 }
201 201
 
@@ -221,13 +221,13 @@  discard block
 block discarded – undo
221 221
                         // strip apostroph and insert NULL
222 222
                         $filtered_sql = substr($filtered_sql, 0, strlen($filtered_sql) - 1);
223 223
                         $filtered_sql .= 'NULL';
224
-                        $sqlpos ++;
224
+                        $sqlpos++;
225 225
                     } else {
226 226
                         $filtered_sql .= 'NULL';
227 227
                     }
228 228
                 }
229 229
 
230
-                $sqlpos ++;
230
+                $sqlpos++;
231 231
             } else {
232 232
                 $arglength = 0;
233 233
                 $arg = '';
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
                 while (preg_match('/^[a-zA-Z0-9_]{1}/', $nextchar) == 1) {
238 238
                     $arg .= $nextchar;
239 239
 
240
-                    $arglength ++;
240
+                    $arglength++;
241 241
                     $nextchar = substr($sql, $nextarg + $arglength + 1, 1);
242 242
                 }
243 243
 
@@ -284,12 +284,12 @@  discard block
 block discarded – undo
284 284
         $escapesCount = 0;
285 285
         while ((($nextarg - $escapesCount - 1) > 0)
286 286
             && (substr($filtered_sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
287
-            $escapesCount ++;
287
+            $escapesCount++;
288 288
         }
289 289
         if (($escapesCount % 2) == 0) {
290 290
             // strip escapes of &
291 291
             $filtered_sql = substr($filtered_sql, 0, $nextarg) . '&' . substr($filtered_sql, $nextarg + 2);
292
-            $nextarg --;
292
+            $nextarg--;
293 293
         }
294 294
 
295 295
         $nextarg = strpos($filtered_sql, '\&', $nextarg + 2);
@@ -826,7 +826,7 @@  discard block
 block discarded – undo
826 826
         AND `online`= 1
827 827
         AND (TIMESTAMP(NOW())-TIMESTAMP(`last_check`)+`time_diff`<'&1')
828 828
         ORDER BY `w` DESC LIMIT 1",
829
-        - 1,
829
+        -1,
830 830
         $nMaxTimeDiff
831 831
     );
832 832
 
Please login to merge, or discard this patch.
Doc Comments   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
 }
347 347
 
348 348
 /**
349
- * @param $sql
349
+ * @param string $sql
350 350
  *
351 351
  * @return resource
352 352
  */
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
 }
365 365
 
366 366
 /**
367
- * @param $sql
367
+ * @param string $sql
368 368
  *
369 369
  * @return resource
370 370
  */
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 }
383 383
 
384 384
 /**
385
- * @param $sql
385
+ * @param string $sql
386 386
  *
387 387
  * @return resource
388 388
  */
@@ -400,8 +400,8 @@  discard block
 block discarded – undo
400 400
 }
401 401
 
402 402
 /**
403
- * @param $sql
404
- * @param $default
403
+ * @param string $sql
404
+ * @param integer $default
405 405
  *
406 406
  * @return mixed
407 407
  */
@@ -419,8 +419,8 @@  discard block
 block discarded – undo
419 419
 }
420 420
 
421 421
 /**
422
- * @param $sql
423
- * @param $default
422
+ * @param string $sql
423
+ * @param integer $default
424 424
  *
425 425
  * @return mixed
426 426
  */
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
440 440
 /**
441 441
  * @param $value
442 442
  *
443
- * @return mixed|string
443
+ * @return string
444 444
  */
445 445
 function sql_escape($value)
446 446
 {
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
 /**
466 466
  * @param $value
467 467
  *
468
- * @return mixed|string
468
+ * @return string
469 469
  */
470 470
 function sql_escape_backtick($value)
471 471
 {
@@ -522,7 +522,7 @@  discard block
 block discarded – undo
522 522
 }
523 523
 
524 524
 /**
525
- * @param $bQuerySlave
525
+ * @param boolean $bQuerySlave
526 526
  * @param $sql
527 527
  * @param $default
528 528
  *
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
     (includes database charset conversion)
572 572
 */
573 573
 /**
574
- * @param $rs
574
+ * @param resource $rs
575 575
  *
576 576
  * @return array
577 577
  */
@@ -611,7 +611,7 @@  discard block
 block discarded – undo
611 611
 }
612 612
 
613 613
 /**
614
- * @param $rs
614
+ * @param resource $rs
615 615
  *
616 616
  * @return array
617 617
  */
@@ -648,7 +648,7 @@  discard block
 block discarded – undo
648 648
 }
649 649
 
650 650
 /**
651
- * @param $rs
651
+ * @param resource $rs
652 652
  *
653 653
  * @return array
654 654
  */
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
 }
720 720
 
721 721
 /**
722
- * @param $rs
722
+ * @param resource $rs
723 723
  *
724 724
  * @return int
725 725
  */
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
 }
730 730
 
731 731
 /**
732
- * @param $table
732
+ * @param string $table
733 733
  */
734 734
 function sql_temp_table($table)
735 735
 {
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
761 761
 }
762 762
 
763 763
 /**
764
- * @param $table
764
+ * @param string $table
765 765
  */
766 766
 function sql_temp_table_slave($table)
767 767
 {
@@ -784,7 +784,7 @@  discard block
 block discarded – undo
784 784
 }
785 785
 
786 786
 /**
787
- * @param $table
787
+ * @param string $table
788 788
  */
789 789
 function sql_drop_temp_table($table)
790 790
 {
@@ -827,7 +827,7 @@  discard block
 block discarded – undo
827 827
 }
828 828
 
829 829
 /**
830
- * @param $table
830
+ * @param string $table
831 831
  */
832 832
 function sql_drop_temp_table_slave($table)
833 833
 {
@@ -1227,7 +1227,7 @@  discard block
 block discarded – undo
1227 1227
 }
1228 1228
 
1229 1229
 /**
1230
- * @param $warnmessage
1230
+ * @param string $warnmessage
1231 1231
  */
1232 1232
 function sql_warn($warnmessage)
1233 1233
 {
@@ -1258,7 +1258,7 @@  discard block
 block discarded – undo
1258 1258
 
1259 1259
 /**
1260 1260
  * @param $f
1261
- * @param $rs
1261
+ * @param resource $rs
1262 1262
  * @param $table
1263 1263
  * @param bool $truncate
1264 1264
  */
@@ -1293,7 +1293,7 @@  discard block
 block discarded – undo
1293 1293
 }
1294 1294
 
1295 1295
 /**
1296
- * @param $f
1296
+ * @param resource $f
1297 1297
  * @param $table
1298 1298
  */
1299 1299
 function sql_export_table($f, $table)
@@ -1318,8 +1318,8 @@  discard block
 block discarded – undo
1318 1318
 }
1319 1319
 
1320 1320
 /**
1321
- * @param $filename
1322
- * @param $tables
1321
+ * @param string $filename
1322
+ * @param string[] $tables
1323 1323
  */
1324 1324
 function sql_export_tables_to_file($filename, $tables)
1325 1325
 {
@@ -1353,7 +1353,7 @@  discard block
 block discarded – undo
1353 1353
 }
1354 1354
 
1355 1355
 /**
1356
- * @param $f
1356
+ * @param resource $f
1357 1357
  * @param $table
1358 1358
  */
1359 1359
 function sql_export_structure($f, $table)
@@ -1372,7 +1372,7 @@  discard block
 block discarded – undo
1372 1372
 }
1373 1373
 
1374 1374
 /**
1375
- * @param $filename
1375
+ * @param string $filename
1376 1376
  * @param $table
1377 1377
  */
1378 1378
 function sql_export_structure_to_file($filename, $table)
@@ -1472,7 +1472,7 @@  discard block
 block discarded – undo
1472 1472
 
1473 1473
 // test if a function or procedure exists
1474 1474
 /**
1475
- * @param $type
1475
+ * @param string $type
1476 1476
  * @param $name
1477 1477
  *
1478 1478
  * @return bool
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/config2/settings-dist.inc.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -8,8 +8,8 @@  discard block
 block discarded – undo
8 8
  *  Do not modify this file - use settings.inc.php!
9 9
  ***************************************************************************/
10 10
 
11
-require_once __DIR__. '/locale.inc.php';
12
-require_once __DIR__. '/settings-dist-common.inc.php';
11
+require_once __DIR__ . '/locale.inc.php';
12
+require_once __DIR__ . '/settings-dist-common.inc.php';
13 13
 
14 14
 /* PHP settings
15 15
  *
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 // database placeholder
109 109
 
110 110
 // productive database with opencaching-tables
111
-$opt['db']['placeholder']['db'] = '';    // selected by default
111
+$opt['db']['placeholder']['db'] = ''; // selected by default
112 112
 
113 113
 // empty database for temporary table creation
114 114
 $opt['db']['placeholder']['tmpdb'] = '';
@@ -122,14 +122,14 @@  discard block
 block discarded – undo
122 122
 $opt['system']['maillog']['syslog_db_user'] = '';
123 123
 $opt['system']['maillog']['syslog_db_password'] = '';
124 124
 $opt['system']['maillog']['syslog_db_table'] = '';
125
-$opt['system']['maillog']['syslog_oc_host'] = '';  // 'host_name' column in syslog DB
126
-$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%';  // 'program' column in syslog DB
127
-$opt['system']['maillog']['column']['id'] = 'id';               // 'ID'
128
-$opt['system']['maillog']['column']['created'] = 'created';     // 'ReceivedAt'
125
+$opt['system']['maillog']['syslog_oc_host'] = ''; // 'host_name' column in syslog DB
126
+$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%'; // 'program' column in syslog DB
127
+$opt['system']['maillog']['column']['id'] = 'id'; // 'ID'
128
+$opt['system']['maillog']['column']['created'] = 'created'; // 'ReceivedAt'
129 129
 $opt['system']['maillog']['column']['host_name'] = 'host_name'; // 'FromHost'
130
-$opt['system']['maillog']['column']['message'] = 'message';     // 'Message'
131
-$opt['system']['maillog']['column']['program'] = 'program';     // 'SysLogTag'
132
-$opt['system']['maillog']['inactivity_warning'] = 30;   // warn after N days without new entries
130
+$opt['system']['maillog']['column']['message'] = 'message'; // 'Message'
131
+$opt['system']['maillog']['column']['program'] = 'program'; // 'SysLogTag'
132
+$opt['system']['maillog']['inactivity_warning'] = 30; // warn after N days without new entries
133 133
 
134 134
 /* cookie or session
135 135
  *
@@ -151,15 +151,15 @@  discard block
 block discarded – undo
151 151
  * 
152 152
  * other parameters may be customized
153 153
  */
154
-$opt['session']['mode'] = SAVE_COOKIE;     // don't change - other option "SAVE_SESSION" is not implemented properly
154
+$opt['session']['mode'] = SAVE_COOKIE; // don't change - other option "SAVE_SESSION" is not implemented properly
155 155
 $opt['session']['cookiename'] = 'oc_devel'; // only with SAVE_COOKIE
156 156
 $opt['session']['path'] = '/';
157
-$opt['session']['domain'] = '';    // may be overwritten by $opt['domain'][...]['cookiedomain']
157
+$opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain']
158 158
 
159 159
 /* maximum session lifetime
160 160
  */
161 161
 $opt['session']['expire']['cookie'] = 31536000; // when cookies used (default 1 year)
162
-$opt['session']['expire']['url'] = 1800;        // when no cookies used (default 30 min since last call), attention to session.js
162
+$opt['session']['expire']['url'] = 1800; // when no cookies used (default 30 min since last call), attention to session.js
163 163
 
164 164
 /* If the Referer was sent by the client and the substring was not found,
165 165
  * the embedded session id will be marked as invalid.
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 /* other template options
186 186
  *
187 187
  */
188
-$opt['page']['origin_url'] = 'http://www.opencaching.de/';  // production installation for this OC site
188
+$opt['page']['origin_url'] = 'http://www.opencaching.de/'; // production installation for this OC site
189 189
 $opt['page']['develsystem'] = false;
190 190
 $opt['page']['teampic_url'] = 'http://www.opencaching.de/images/team/';
191 191
 $opt['page']['teammember_url'] = 'http://www.opencaching.de/';
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
     'newcaches' => [
220 220
         'show' => true,
221 221
         'url' => 'http://www.opencaching.de',
222
-        'urlname' => '',  // optional: show other name than the url-domain
222
+        'urlname' => '', // optional: show other name than the url-domain
223 223
     ],
224 224
 ];
225 225
 
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 
379 379
 /* license-related functions
380 380
  */
381
-$opt['logic']['license']['newusers'] = 2;  // see license constants in lib2/logic/const.inc.php
381
+$opt['logic']['license']['newusers'] = 2; // see license constants in lib2/logic/const.inc.php
382 382
 $opt['logic']['license']['admin'] = true;
383 383
 $opt['logic']['license']['disclaimer'] = false;
384 384
 $opt['logic']['license']['terms'] = 'articles.php?page=impressum#datalicense';
@@ -386,18 +386,18 @@  discard block
 block discarded – undo
386 386
 
387 387
 /* optional APIs
388 388
  */
389
-$opt['logic']['api']['email_problems']['key'] = '';   // must be set to enable
390
-$opt['logic']['api']['user_inactivity']['key'] = '';  // must be set to enable
389
+$opt['logic']['api']['email_problems']['key'] = ''; // must be set to enable
390
+$opt['logic']['api']['user_inactivity']['key'] = ''; // must be set to enable
391 391
 
392 392
 /* cache report info settings
393 393
  */
394 394
 $opt['logic']['cache_reports']['delaydays'] = 2;
395
-$opt['logic']['cache_reports']['min_processperday'] = 5;   // set to 0 to disable
396
-$opt['logic']['cache_reports']['max_processperday'] = 20;  // set to 0 to disable
395
+$opt['logic']['cache_reports']['min_processperday'] = 5; // set to 0 to disable
396
+$opt['logic']['cache_reports']['max_processperday'] = 20; // set to 0 to disable
397 397
 
398 398
 /* cronjob
399 399
  */
400
-$opt['cron']['username'] = 'apache';   // system username for cronjobs
400
+$opt['cron']['username'] = 'apache'; // system username for cronjobs
401 401
 
402 402
 /* phpbb news integration (index.php, outdated)
403 403
  *
Please login to merge, or discard this patch.