Completed
Pull Request — development (#738)
by Kai
04:36
created
htdocs/config2/settings-dist.inc.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -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
 /* generate sitemap.xml and upload to search engines
403 403
  *
Please login to merge, or discard this patch.
local/ocxml11client/index.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
     $nFileNr = 0;
65 65
     $rs = sql('SELECT `id`, `url` FROM `pictures` WHERE `local`=0');
66 66
     while ($r = sql_fetch_array($rs)) {
67
-        $nFileNr ++;
67
+        $nFileNr++;
68 68
         $fileparts = mb_split('/', $r['url']);
69 69
         $filename = $fileparts[count($fileparts) - 1];
70 70
 
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
             exit;
234 234
         }
235 235
 
236
-        for ($i = 1; $i <= $filescount; $i ++) {
236
+        for ($i = 1; $i <= $filescount; $i++) {
237 237
             echo 'Download Paket: ' . $i . ' von ' . $filescount . "\n";
238 238
 
239 239
             $fileurl = $opt['url_getsession'];
@@ -407,11 +407,11 @@  discard block
 block discarded – undo
407 407
                             if ($sSubElement != '') {
408 408
                                 // vorheriges element zuerst schlißen
409 409
                                 $sSubElement = '';
410
-                                $nRecursionLevel --;
410
+                                $nRecursionLevel--;
411 411
                             }
412 412
 
413 413
                             $sSubElement = mb_strtoupper($xmlReader->name);
414
-                            $nRecursionLevel ++;
414
+                            $nRecursionLevel++;
415 415
 
416 416
                             // attribute auslesen
417 417
                             if ($xmlReader->moveToFirstAttribute()) {
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
                         } else {
429 429
                             if ($xmlReader->nodeType == XMLReader::END_ELEMENT) {
430 430
                                 $sSubElement = '';
431
-                                $nRecursionLevel --;
431
+                                $nRecursionLevel--;
432 432
                             }
433 433
                         }
434 434
                     }
Please login to merge, or discard this patch.
htdocs/src/Oc/Page/PageProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
 
76 76
         $sameLocale = $preferredLocale === $defaultLocale;
77 77
 
78
-        if(!$sameLocale && count($pageBlocks) === 0) {
78
+        if (!$sameLocale && count($pageBlocks) === 0) {
79 79
             //Fetch fallback if blocks are empty
80 80
             $pageBlocks = $this->getPageBlocks(
81 81
                 $page,
Please login to merge, or discard this patch.
htdocs/src/Oc/Page/Persistence/PageRepository.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
             $databaseArray
90 90
         );
91 91
 
92
-        $entity->id = (int) $this->connection->lastInsertId();
92
+        $entity->id = (int)$this->connection->lastInsertId();
93 93
 
94 94
         return $entity;
95 95
     }
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
             ['id' => $entity->id]
117 117
         );
118 118
 
119
-        $entity->id = (int) $this->connection->lastInsertId();
119
+        $entity->id = (int)$this->connection->lastInsertId();
120 120
 
121 121
         return $entity;
122 122
     }
@@ -175,13 +175,13 @@  discard block
 block discarded – undo
175 175
     public function getEntityFromDatabaseArray(array $data)
176 176
     {
177 177
         $entity = new PageEntity();
178
-        $entity->id = (int) $data['id'];
178
+        $entity->id = (int)$data['id'];
179 179
         $entity->slug = $data['slug'];
180 180
         $entity->metaKeywords = $data['meta_keywords'];
181 181
         $entity->metaDescription = $data['meta_description'];
182 182
         $entity->metaSocial = $data['meta_social'];
183 183
         $entity->updatedAt = new DateTime($data['updated_at']);
184
-        $entity->active = (bool) $data['active'];
184
+        $entity->active = (bool)$data['active'];
185 185
 
186 186
         return $entity;
187 187
     }
Please login to merge, or discard this patch.
htdocs/src/Oc/Page/Persistence/BlockRepository.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
             $databaseArray
94 94
         );
95 95
 
96
-        $entity->id = (int) $this->connection->lastInsertId();
96
+        $entity->id = (int)$this->connection->lastInsertId();
97 97
 
98 98
         return $entity;
99 99
     }
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
             ['id' => $entity->id]
121 121
         );
122 122
 
123
-        $entity->id = (int) $this->connection->lastInsertId();
123
+        $entity->id = (int)$this->connection->lastInsertId();
124 124
 
125 125
         return $entity;
126 126
     }
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
             'page_id' => $entity->pageId,
164 164
             'title' => $entity->title,
165 165
             'html' => $entity->html,
166
-            'position' => (int) $entity->position,
166
+            'position' => (int)$entity->position,
167 167
             'updated_at' => $entity->updatedAt->format(DateTime::ATOM),
168 168
             'active' => $entity->active,
169 169
         ];
@@ -179,13 +179,13 @@  discard block
 block discarded – undo
179 179
     public function getEntityFromDatabaseArray(array $data)
180 180
     {
181 181
         $entity = new BlockEntity();
182
-        $entity->id = (int) $data['id'];
183
-        $entity->pageId = (int) $data['page_id'];
182
+        $entity->id = (int)$data['id'];
183
+        $entity->pageId = (int)$data['page_id'];
184 184
         $entity->title = $data['title'];
185 185
         $entity->html = $data['html'];
186
-        $entity->position = (int) $data['position'];
186
+        $entity->position = (int)$data['position'];
187 187
         $entity->updatedAt = new DateTime($data['updated_at']);
188
-        $entity->active = (bool) $data['active'];
188
+        $entity->active = (bool)$data['active'];
189 189
 
190 190
         return $entity;
191 191
     }
Please login to merge, or discard this patch.
local/devel/Repositories/LanguagesRepository.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
             $databaseArray
122 122
         );
123 123
 
124
-        $entity->short = (int) $this->connection->lastInsertId();
124
+        $entity->short = (int)$this->connection->lastInsertId();
125 125
 
126 126
         return $entity;
127 127
     }
@@ -193,15 +193,15 @@  discard block
 block discarded – undo
193 193
     public function getEntityFromDatabaseArray(array $data)
194 194
     {
195 195
         $entity = new LanguagesEntity();
196
-        $entity->short = (string) $data['short'];
197
-        $entity->name = (string) $data['name'];
198
-        $entity->transId = (int) $data['trans_id'];
199
-        $entity->nativeName = (string) $data['native_name'];
200
-        $entity->de = (string) $data['de'];
201
-        $entity->en = (string) $data['en'];
202
-        $entity->listDefaultDe = (int) $data['list_default_de'];
203
-        $entity->listDefaultEn = (int) $data['list_default_en'];
204
-        $entity->isTranslated = (int) $data['is_translated'];
196
+        $entity->short = (string)$data['short'];
197
+        $entity->name = (string)$data['name'];
198
+        $entity->transId = (int)$data['trans_id'];
199
+        $entity->nativeName = (string)$data['native_name'];
200
+        $entity->de = (string)$data['de'];
201
+        $entity->en = (string)$data['en'];
202
+        $entity->listDefaultDe = (int)$data['list_default_de'];
203
+        $entity->listDefaultEn = (int)$data['list_default_en'];
204
+        $entity->isTranslated = (int)$data['is_translated'];
205 205
 
206 206
         return $entity;
207 207
     }
Please login to merge, or discard this patch.
local/devel/Repositories/CacheCoordinatesRepository.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
             $databaseArray
122 122
         );
123 123
 
124
-        $entity->id = (int) $this->connection->lastInsertId();
124
+        $entity->id = (int)$this->connection->lastInsertId();
125 125
 
126 126
         return $entity;
127 127
     }
@@ -190,12 +190,12 @@  discard block
 block discarded – undo
190 190
     public function getEntityFromDatabaseArray(array $data)
191 191
     {
192 192
         $entity = new GeoCacheCoordinatesEntity();
193
-        $entity->id = (int) $data['id'];
193
+        $entity->id = (int)$data['id'];
194 194
         $entity->dateCreated = new DateTime($data['date_created']);
195
-        $entity->cacheId = (int) $data['cache_id'];
195
+        $entity->cacheId = (int)$data['cache_id'];
196 196
         $entity->longitude = $data['longitude'];
197 197
         $entity->latitude = $data['latitude'];
198
-        $entity->restoredBy = (int) $data['restored_by'];
198
+        $entity->restoredBy = (int)$data['restored_by'];
199 199
 
200 200
         return $entity;
201 201
     }
Please login to merge, or discard this patch.
local/devel/Repositories/SearchIgnoreRepository.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
             $databaseArray
122 122
         );
123 123
 
124
-        $entity->word = (int) $this->connection->lastInsertId();
124
+        $entity->word = (int)$this->connection->lastInsertId();
125 125
 
126 126
         return $entity;
127 127
     }
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
     public function getEntityFromDatabaseArray(array $data)
186 186
     {
187 187
         $entity = new SearchIgnoreEntity();
188
-        $entity->word = (string) $data['word'];
188
+        $entity->word = (string)$data['word'];
189 189
 
190 190
         return $entity;
191 191
     }
Please login to merge, or discard this patch.
local/devel/Repositories/NotifyWaitingRepository.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
             $databaseArray
122 122
         );
123 123
 
124
-        $entity->id = (int) $this->connection->lastInsertId();
124
+        $entity->id = (int)$this->connection->lastInsertId();
125 125
 
126 126
         return $entity;
127 127
     }
@@ -188,10 +188,10 @@  discard block
 block discarded – undo
188 188
     public function getEntityFromDatabaseArray(array $data)
189 189
     {
190 190
         $entity = new NotifyWaitingEntity();
191
-        $entity->id = (int) $data['id'];
192
-        $entity->cacheId = (int) $data['cache_id'];
193
-        $entity->userId = (int) $data['user_id'];
194
-        $entity->type = (int) $data['type'];
191
+        $entity->id = (int)$data['id'];
192
+        $entity->cacheId = (int)$data['cache_id'];
193
+        $entity->userId = (int)$data['user_id'];
194
+        $entity->type = (int)$data['type'];
195 195
 
196 196
         return $entity;
197 197
     }
Please login to merge, or discard this patch.