Passed
Pull Request — master (#329)
by Mirko
07:45
created
local/ocxml11client/settings-dist.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
 
28 28
 // Sessions verwenden?
29 29
 $opt['session'] = 1;
30
-$opt['zip'] = 'gzip';                // 0; zip; bzip2; gzip
30
+$opt['zip'] = 'gzip'; // 0; zip; bzip2; gzip
31 31
 
32 32
 // Gebietsauswahl nach Land
33 33
 $opt['bycountry'] = 0;
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
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
     $nFileNr = 0;
68 68
     $rs = sql('SELECT `id`, `url` FROM `pictures` WHERE `local`=0');
69 69
     while ($r = sql_fetch_array($rs)) {
70
-        $nFileNr ++;
70
+        $nFileNr++;
71 71
         $fileparts = mb_split('/', $r['url']);
72 72
         $filename = $fileparts[count($fileparts) - 1];
73 73
 
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
             exit;
238 238
         }
239 239
 
240
-        for ($i = 1; $i <= $filescount; $i ++) {
240
+        for ($i = 1; $i <= $filescount; $i++) {
241 241
             echo "Download Paket: " . $i . ' von ' . $filescount . "\n";
242 242
 
243 243
             $fileurl = $opt['url_getsession'];
@@ -411,11 +411,11 @@  discard block
 block discarded – undo
411 411
                             if ($sSubElement != '') {
412 412
                                 // vorheriges element zuerst schlißen
413 413
                                 $sSubElement = '';
414
-                                $nRecursionLevel --;
414
+                                $nRecursionLevel--;
415 415
                             }
416 416
 
417 417
                             $sSubElement = mb_strtoupper($xmlReader->name);
418
-                            $nRecursionLevel ++;
418
+                            $nRecursionLevel++;
419 419
 
420 420
                             // attribute auslesen
421 421
                             if ($xmlReader->moveToFirstAttribute()) {
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
                         } else {
433 433
                             if ($xmlReader->nodeType == XMLReader::END_ELEMENT) {
434 434
                                 $sSubElement = '';
435
-                                $nRecursionLevel --;
435
+                                $nRecursionLevel--;
436 436
                             }
437 437
                         }
438 438
                     }
Please login to merge, or discard this patch.
htdocs/src/Oc/Console/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/lib/settings-sample-vagrant.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 
19 19
 // database names
20 20
 $dbname = 'opencaching';
21
-$tmpdbname = 'octmp';   // empty db with CREATE and DROP privileges
21
+$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges
22 22
 
23 23
 // common developer system settings
24 24
 require 'settings-dev.inc.php';
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';
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 $opt['locale']['SV']['page']['subtitle1'] = 'Geocaching med Opencaching';
233 233
 $opt['locale']['SV']['page']['subtitle2'] = '';
234 234
 $opt['locale']['SV']['mostly_translated'] = false;
235
-$opt['locale']['SV']['what3words'] = true;  // "beta"
235
+$opt['locale']['SV']['what3words'] = true; // "beta"
236 236
 
237 237
 $opt['locale']['NO']['format']['dateshort'] = '%d.%m.%y';
238 238
 $opt['locale']['NO']['format']['dm'] = '%d.%m.';
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 $opt['locale']['RU']['format']['colonspace'] = '';
280 280
 $opt['locale']['RU']['country'] = 'RU';
281 281
 $opt['locale']['RU']['mostly_translated'] = false;
282
-$opt['locale']['RU']['what3words'] = true;   // "beta"
282
+$opt['locale']['RU']['what3words'] = true; // "beta"
283 283
 
284 284
 $opt['locale']['DA']['format']['dateshort'] = '%d.%m.%y';
285 285
 $opt['locale']['DA']['format']['dm'] = '%d.%m.';
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/main.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@
 block discarded – undo
175 175
                                         }
176 176
                                         $nLastGroup = $tpl_usercountries[$i]['group'];
177 177
 
178
-                                        echo '<option value="' . htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8') . '"' . (($sUserCountry==$tpl_usercountries[$i]['country']) ? ' selected="selected"' : '') . '>' . htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8') . '</option>';
178
+                                        echo '<option value="' . htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8') . '"' . (($sUserCountry == $tpl_usercountries[$i]['country']) ? ' selected="selected"' : '') . '>' . htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8') . '</option>';
179 179
                                     }
180 180
 ?>
181 181
                                 </select>&nbsp;
Please login to merge, or discard this patch.
htdocs/newdesc.php 1 patch
Spacing   +7 added lines, -8 removed lines patch added patch discarded remove patch
@@ -44,11 +44,11 @@  discard block
 block discarded – undo
44 44
 
45 45
                 //get the posted data
46 46
                 $show_all_langs = isset($_POST['show_all_langs']) ? $_POST['show_all_langs'] : 0;
47
-                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : '';  // Ocprop
47
+                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : ''; // Ocprop
48 48
 
49
-                $hints = isset($_POST['hints']) ? $_POST['hints'] : '';  // Ocprop
50
-                $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang;  // Ocprop
51
-                $desc = isset($_POST['desc']) ? $_POST['desc'] : '';  // Ocprop
49
+                $hints = isset($_POST['hints']) ? $_POST['hints'] : ''; // Ocprop
50
+                $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang; // Ocprop
51
+                $desc = isset($_POST['desc']) ? $_POST['desc'] : ''; // Ocprop
52 52
 
53 53
                 // read descMode; if not set, initialize from user profile
54 54
                 if (isset($_POST['descMode'])) {  // Ocprop
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
                          WHERE `languages_list_default`.`lang`='" . sql_escape($locale) . "'
150 150
                          AND ISNULL(`cache_desc`.`cache_id`)",
151 151
                         0
152
-                    ) == 0 ) {
152
+                    ) == 0) {
153 153
                         $show_all_langs = 1;
154 154
                     }
155 155
                 }
@@ -199,8 +199,7 @@  discard block
 block discarded – undo
199 199
                 tpl_set_var('name', htmlspecialchars($cache_record['name'], ENT_COMPAT, 'UTF-8'));
200 200
                 tpl_set_var('cacheid', htmlspecialchars($cache_id, ENT_COMPAT, 'UTF-8'));
201 201
 
202
-                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message :
203
-                    (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
202
+                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message : (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
204 203
 
205 204
                 tpl_set_var('show_all_langs', $show_all_langs);
206 205
                 tpl_set_var('show_all_langs_submit', ($show_all_langs == 0) ? $show_all_langs_submit : '');
@@ -222,7 +221,7 @@  discard block
 block discarded – undo
222 221
                 $headers .= '<script language="javascript" type="text/javascript" src="' . editorJsPath() . '"></script>' . "\n";
223 222
                 tpl_set_var('htmlheaders', $headers);
224 223
 
225
-                tpl_set_var('reset', $reset);  // obsolete
224
+                tpl_set_var('reset', $reset); // obsolete
226 225
                 tpl_set_var('submit', $submit);
227 226
             } else {
228 227
                 //TODO: not the owner
Please login to merge, or discard this patch.
local/devel/strip_private_data.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -63,11 +63,11 @@
 block discarded – undo
63 63
 echo "clearing user data\n";
64 64
 sql('TRUNCATE `cache_adoption`');
65 65
 sql('TRUNCATE `cache_ignore`');
66
-sql('DELETE FROM `cache_lists` WHERE `is_public`<2');  // trigger deletes dependent data
66
+sql('DELETE FROM `cache_lists` WHERE `is_public`<2'); // trigger deletes dependent data
67 67
 sql('TRUNCATE `cache_list_bookmarks`');
68 68
 sql('TRUNCATE `cache_list_watches`');
69 69
 sql('TRUNCATE `cache_watches`');
70
-sql('DELETE FROM `coordinates` WHERE `type`=2');   // personal cache notes and coords
70
+sql('DELETE FROM `coordinates` WHERE `type`=2'); // personal cache notes and coords
71 71
 sql('TRUNCATE `queries`');
72 72
 sql('TRUNCATE `user_options`');
73 73
 sql(
Please login to merge, or discard this patch.
htdocs/util2/cron/modules/autoarchive_caches.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 
15 15
     public $name = 'autoarchive';
16 16
 
17
-    public $interval = 43200;  // twice per day
17
+    public $interval = 43200; // twice per day
18 18
 
19 19
 
20 20
     public function run()
Please login to merge, or discard this patch.