Passed
Pull Request — master (#329)
by Mirko
07:45
created
htdocs/lang/de/expressions.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 
22 22
 //common vars
23 23
 $dateformat = $opt['locale'][$locale]['format']['date'];
24
-$reset = t('Reset');  // obsolete
24
+$reset = t('Reset'); // obsolete
25 25
 $yes = t('Yes');
26 26
 $no = t('No');
27 27
 
Please login to merge, or discard this patch.
htdocs/util2/cron/modules/purge_logs.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 class purge_logs
13 13
 {
14 14
     public $name = 'purge_logs';
15
-    public $interval = 86400;    // daily
15
+    public $interval = 86400; // daily
16 16
 
17 17
     public function run()
18 18
     {
Please login to merge, or discard this patch.
htdocs/util2/cron/modules/maillog.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 class maillog
13 13
 {
14 14
     public $name = 'maillog';
15
-    public $interval = 600;  // every 10 minutes
15
+    public $interval = 600; // every 10 minutes
16 16
 
17 17
 
18 18
     public function run()
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
             $opt['system']['maillog']['syslog_db_user'],
34 34
             $opt['system']['maillog']['syslog_db_password'],
35 35
             true
36
-        );  // use separate connection even if on same DB host
36
+        ); // use separate connection even if on same DB host
37 37
         if ($dbc === false) {
38 38
             echo $this->name . ": could not connect to syslog database\n";
39 39
 
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
         }
100 100
 
101 101
         while ($logentry = mysql_fetch_assoc($rs)) {
102
-            $message = $logentry['message'];   // latin-1 charset
102
+            $message = $logentry['message']; // latin-1 charset
103 103
             $delivered = strpos($message, 'status=sent') > 0;
104 104
             $bounced = strpos($message, 'status=bounced') > 0;
105 105
             if ($delivered || $bounced) {
Please login to merge, or discard this patch.
htdocs/util2/cron/modules/geokrety.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
                         break;
116 116
                 }
117 117
 
118
-                $nRecordsCount ++;
118
+                $nRecordsCount++;
119 119
             }
120 120
         } while ($xr->next());
121 121
 
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
         $waypoints = $element->getElementsByTagName('waypoints');
254 254
         if ($waypoints->length > 0) {
255 255
             $wpItems = $waypoints->item(0)->getElementsByTagName('waypoint');
256
-            for ($i = 0; $i < $wpItems->length; $i ++) {
256
+            for ($i = 0; $i < $wpItems->length; $i++) {
257 257
                 $wp = mb_trim($wpItems->item($i)->nodeValue);
258 258
                 if ($wp != '') {
259 259
                     sql("INSERT INTO `gk_move_waypoint` (`id`, `wp`) VALUES ('&1', '&2')", $id, $wp);
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
                 WHERE `id`='&2' AND `wp`!=''",
286 286
                 $gkid,
287 287
                 $r['id']
288
-            );  // "late log" bugfix: replaced $id paramter by $r['id']
288
+            ); // "late log" bugfix: replaced $id paramter by $r['id']
289 289
         } else {
290 290
             // do nothing
291 291
         }
Please login to merge, or discard this patch.
htdocs/util2/cron/modules/gcwp_update.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
 class gcwp_update
14 14
 {
15 15
     public $name = 'gcwp_update';
16
-    public $interval = 3600;  // every hour
16
+    public $interval = 3600; // every hour
17 17
 
18 18
 
19 19
     public function run()
Please login to merge, or discard this patch.
htdocs/util2/cron/modules/orphan_cleanup.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
 class orphan_cleanup
14 14
 {
15 15
     public $name = 'orphan_cleanup';
16
-    public $interval = 86400;   // once per day
16
+    public $interval = 86400; // once per day
17 17
 
18 18
     public function run()
19 19
     {
Please login to merge, or discard this patch.
htdocs/login.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
     $target = 'myhome.php';
29 29
 }
30 30
 
31
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';   // Ocprop
31
+$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : ''; // Ocprop
32 32
 
33 33
 if ($action == 'cookieverify') {
34 34
     // we should be logged in ... check if cookie is set ...
@@ -58,8 +58,8 @@  discard block
 block discarded – undo
58 58
         $tpl->error(ERROR_ALREADY_LOGGEDIN);
59 59
     }
60 60
 
61
-    $username = isset($_POST['email']) ? $_POST['email'] : '';  // Ocprop
62
-    $password = isset($_POST['password']) ? $_POST['password'] : '';  // Ocprop
61
+    $username = isset($_POST['email']) ? $_POST['email'] : ''; // Ocprop
62
+    $password = isset($_POST['password']) ? $_POST['password'] : ''; // Ocprop
63 63
 
64 64
     $retval = $login->try_login($username, $password, null);
65 65
     $password = '';
Please login to merge, or discard this patch.
htdocs/config2/settings-dist.inc.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -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
 
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 
380 380
 /* license-related functions
381 381
  */
382
-$opt['logic']['license']['newusers'] = 2;  // see license constants in lib2/logic/const.inc.php
382
+$opt['logic']['license']['newusers'] = 2; // see license constants in lib2/logic/const.inc.php
383 383
 $opt['logic']['license']['admin'] = true;
384 384
 $opt['logic']['license']['disclaimer'] = false;
385 385
 $opt['logic']['license']['terms'] = 'articles.php?page=impressum#datalicense';
@@ -387,18 +387,18 @@  discard block
 block discarded – undo
387 387
 
388 388
 /* optional APIs
389 389
  */
390
-$opt['logic']['api']['email_problems']['key'] = '';   // must be set to enable
391
-$opt['logic']['api']['user_inactivity']['key'] = '';  // must be set to enable
390
+$opt['logic']['api']['email_problems']['key'] = ''; // must be set to enable
391
+$opt['logic']['api']['user_inactivity']['key'] = ''; // must be set to enable
392 392
 
393 393
 /* cache report info settings
394 394
  */
395 395
 $opt['logic']['cache_reports']['delaydays'] = 2;
396
-$opt['logic']['cache_reports']['min_processperday'] = 5;   // set to 0 to disable
397
-$opt['logic']['cache_reports']['max_processperday'] = 20;  // set to 0 to disable
396
+$opt['logic']['cache_reports']['min_processperday'] = 5; // set to 0 to disable
397
+$opt['logic']['cache_reports']['max_processperday'] = 20; // set to 0 to disable
398 398
 
399 399
 /* cronjob
400 400
  */
401
-$opt['cron']['username'] = 'apache';   // system username for cronjobs
401
+$opt['cron']['username'] = 'apache'; // system username for cronjobs
402 402
 
403 403
 /* phpbb news integration (index.php, outdated)
404 404
  *
Please login to merge, or discard this patch.
htdocs/config2/settings-dev.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
 );
81 81
 
82 82
 $opt['page']['develsystem'] = true;
83
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
83
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
84 84
 
85 85
 $opt['mail']['from'] = 'root';
86 86
 $opt['mail']['subject'] = '[local.opencaching.de] ';
Please login to merge, or discard this patch.