Completed
Pull Request — development (#546)
by Nick
06:21
created
htdocs/src/Oc/Translation/CrowdinImport.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
     }
42 42
 
43 43
     /**
44
-     * @param $path
44
+     * @param string $path
45 45
      * @return TranslationStruct[]
46 46
      */
47 47
     private function readCrowdinCsv($path)
Please login to merge, or discard this patch.
htdocs/src/AppBundle/Command/OkapiCronjobsCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 
26 26
     protected function execute(InputInterface $input, OutputInterface $output)
27 27
     {
28
-        require_once __DIR__.'/../../../okapi/autoload.php';
28
+        require_once __DIR__ . '/../../../okapi/autoload.php';
29 29
         Okapi::execute_prerequest_cronjobs();
30 30
         Okapi::execute_cron5_cronjobs();
31 31
     }
Please login to merge, or discard this patch.
htdocs/src/Oc/Postfix/JournalLogs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
                     $cursor[$key] = $value;
72 72
                 }
73 73
 
74
-                $logEntry->id = (int) hexdec($cursor['i']);
74
+                $logEntry->id = (int)hexdec($cursor['i']);
75 75
 
76 76
                 $timeStamp = $entry['__REALTIME_TIMESTAMP'];
77 77
                 $logEntry->created = \DateTimeImmutable::createFromFormat(
Please login to merge, or discard this patch.
htdocs/src/Oc/Postfix/LogEntity.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
     public function toDatabaseArray()
31 31
     {
32 32
         return [
33
-            'id' => (int) $this->id,
33
+            'id' => (int)$this->id,
34 34
             'email' => $this->email,
35 35
             'status' => $this->status,
36 36
             'created' => $this->created,
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
      */
44 44
     public function fromDatabaseArray(array $data)
45 45
     {
46
-        $this->id = (int) $data['id'];
46
+        $this->id = (int)$data['id'];
47 47
         $this->email = $data['email'];
48 48
         $this->status = $data['status'];
49 49
         $this->created = $data['created'];
Please login to merge, or discard this patch.
htdocs/src/Oc/Translation/TranslationStruct.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
 
57 57
     public function fromCsvArray(array $data)
58 58
     {
59
-        $this->identifier = (int) $data['Identifier'];
59
+        $this->identifier = (int)$data['Identifier'];
60 60
         $this->sourceString = $data['SourceString'];
61 61
         $this->comment = $data['Comment'];
62 62
         $this->de = $data['DE'];
Please login to merge, or discard this patch.
htdocs/lib2/logic/cache.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -505,8 +505,8 @@
 block discarded – undo
505 505
         }
506 506
 
507 507
         $coords = [];
508
-        if ($this->getType() != 7 && $this->getType() != 8 &&  // quiz cache
509
-            $this->hasAttribute(61) != true &&                 // safari cache
508
+        if ($this->getType() != 7 && $this->getType() != 8 && // quiz cache
509
+            $this->hasAttribute(61) != true && // safari cache
510 510
             $this->getStatus() != 5                            // unpublished cache
511 511
         ) {
512 512
             $rsCoords = sql(
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
@@ -7,8 +7,8 @@  discard block
 block discarded – undo
7 7
  *  Do not modify this file - use settings.inc.php!
8 8
  ***************************************************************************/
9 9
 
10
-require_once __DIR__. '/locale.inc.php';
11
-require_once __DIR__. '/settings-dist-common.inc.php';
10
+require_once __DIR__ . '/locale.inc.php';
11
+require_once __DIR__ . '/settings-dist-common.inc.php';
12 12
 
13 13
 /* PHP settings
14 14
  *
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 // database placeholder
108 108
 
109 109
 // productive database with opencaching-tables
110
-$opt['db']['placeholder']['db'] = '';    // selected by default
110
+$opt['db']['placeholder']['db'] = ''; // selected by default
111 111
 
112 112
 // empty database for temporary table creation
113 113
 $opt['db']['placeholder']['tmpdb'] = '';
@@ -121,14 +121,14 @@  discard block
 block discarded – undo
121 121
 $opt['system']['maillog']['syslog_db_user'] = '';
122 122
 $opt['system']['maillog']['syslog_db_password'] = '';
123 123
 $opt['system']['maillog']['syslog_db_table'] = '';
124
-$opt['system']['maillog']['syslog_oc_host'] = '';  // 'host_name' column in syslog DB
125
-$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%';  // 'program' column in syslog DB
126
-$opt['system']['maillog']['column']['id'] = 'id';               // 'ID'
127
-$opt['system']['maillog']['column']['created'] = 'created';     // 'ReceivedAt'
124
+$opt['system']['maillog']['syslog_oc_host'] = ''; // 'host_name' column in syslog DB
125
+$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%'; // 'program' column in syslog DB
126
+$opt['system']['maillog']['column']['id'] = 'id'; // 'ID'
127
+$opt['system']['maillog']['column']['created'] = 'created'; // 'ReceivedAt'
128 128
 $opt['system']['maillog']['column']['host_name'] = 'host_name'; // 'FromHost'
129
-$opt['system']['maillog']['column']['message'] = 'message';     // 'Message'
130
-$opt['system']['maillog']['column']['program'] = 'program';     // 'SysLogTag'
131
-$opt['system']['maillog']['inactivity_warning'] = 30;   // warn after N days without new entries
129
+$opt['system']['maillog']['column']['message'] = 'message'; // 'Message'
130
+$opt['system']['maillog']['column']['program'] = 'program'; // 'SysLogTag'
131
+$opt['system']['maillog']['inactivity_warning'] = 30; // warn after N days without new entries
132 132
 
133 133
 /* cookie or session
134 134
  *
@@ -150,15 +150,15 @@  discard block
 block discarded – undo
150 150
  *
151 151
  * other parameters may be customized
152 152
  */
153
-$opt['session']['mode'] = SAVE_COOKIE;     // don't change - other option "SAVE_SESSION" is not implemented properly
153
+$opt['session']['mode'] = SAVE_COOKIE; // don't change - other option "SAVE_SESSION" is not implemented properly
154 154
 $opt['session']['cookiename'] = 'ocvagrant'; // only with SAVE_COOKIE
155 155
 $opt['session']['path'] = '/';
156
-$opt['session']['domain'] = '';    // may be overwritten by $opt['domain'][...]['cookiedomain']
156
+$opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain']
157 157
 
158 158
 /* maximum session lifetime
159 159
  */
160 160
 $opt['session']['expire']['cookie'] = 31536000; // when cookies used (default 1 year)
161
-$opt['session']['expire']['url'] = 1800;        // when no cookies used (default 30 min since last call), attention to session.js
161
+$opt['session']['expire']['url'] = 1800; // when no cookies used (default 30 min since last call), attention to session.js
162 162
 
163 163
 /* If the Referer was sent by the client and the substring was not found,
164 164
  * the embedded session id will be marked as invalid.
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 /* other template options
185 185
  *
186 186
  */
187
-$opt['page']['origin_url'] = 'https://www.opencaching.de/';  // production installation for this OC site
187
+$opt['page']['origin_url'] = 'https://www.opencaching.de/'; // production installation for this OC site
188 188
 $opt['page']['develsystem'] = false;
189 189
 $opt['page']['teampic_url'] = 'https://www.opencaching.de/images/team/';
190 190
 $opt['page']['teammember_url'] = 'https://www.opencaching.de/';
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
     'newcaches' => [
219 219
         'show' => true,
220 220
         'url' => 'https://www.opencaching.de',
221
-        'urlname' => '',  // optional: show other name than the url-domain
221
+        'urlname' => '', // optional: show other name than the url-domain
222 222
     ],
223 223
 ];
224 224
 
@@ -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.
htdocs/lib2/search/ftsearch.inc.php 2 patches
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
 /**
69 69
  * str = single word
70 70
  * @param $str
71
- * @param $simple
71
+ * @param boolean $simple
72 72
  *
73
- * @return array
73
+ * @return string
74 74
  */
75 75
 function ftsearch_split(&$str, $simple)
76 76
 {
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
  * str = single word
142 142
  * @param $str
143 143
  *
144
- * @return mixed|string
144
+ * @return string
145 145
  */
146 146
 function ftsearch_text2simple($str)
147 147
 {
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
  * str = single word
172 172
  * @param $str
173 173
  *
174
- * @return mixed|string
174
+ * @return string
175 175
  */
176 176
 function ftsearch_text2sort($str)
177 177
 {
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 /**
315 315
  * @param $text
316 316
  *
317
- * @return mixed|string
317
+ * @return string
318 318
  */
319 319
 function ftsearch_strip_html($text)
320 320
 {
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
     ['ai', 'ei'],
18 18
     ['ou', 'u'],
19 19
     ['th', 't'],
20
-    ['ph','f'],
20
+    ['ph', 'f'],
21 21
     ['oh', 'o'],
22 22
     ['ah', 'a'],
23 23
     ['eh', 'e'],
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
     $str = '';
102 102
 
103 103
     ftsearch_load_ignores();
104
-    for ($i = count($astr) - 1; $i >= 0; $i --) {
104
+    for ($i = count($astr) - 1; $i >= 0; $i--) {
105 105
         // ignore?
106 106
         if (array_search(mb_strtolower($astr[$i]), $ftsearch_ignores) !== false) {
107 107
             unset($astr[$i]);
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 
157 157
     // doppelte chars ersetzen
158 158
     $ordZ = ord('z');
159
-    for ($c = ord('a'); $c <= $ordZ; $c ++) {
159
+    for ($c = ord('a'); $c <= $ordZ; $c++) {
160 160
         $old_str = '';
161 161
         while ($old_str !== $str) {
162 162
             $old_str = $str;
Please login to merge, or discard this patch.
htdocs/src/Oc/Translation/CrowdinExport.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
         $select = '';
28 28
         $joins = '';
29 29
         foreach (['de', 'fr', 'nl', 'es', 'pl', 'it', 'ru'] as $languageKey) {
30
-            $joins .= "\n".' LEFT JOIN sys_trans_text ' . $languageKey . ' ON ' . $languageKey . '.trans_id = source.trans_id AND ' . $languageKey . '.lang = "' . $languageKey . '" ';
30
+            $joins .= "\n" . ' LEFT JOIN sys_trans_text ' . $languageKey . ' ON ' . $languageKey . '.trans_id = source.trans_id AND ' . $languageKey . '.lang = "' . $languageKey . '" ';
31 31
             $select .= ', ' . $languageKey . '.text as ' . $languageKey . ' ';
32 32
         }
33 33
 
Please login to merge, or discard this patch.