Passed
Pull Request — development (#358)
by Mirko
07:35
created
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/slave_cleanup.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
         }
29 29
         sql_free_result($rs);
30 30
 
31
-        $this->cleanup_slave(- 1);
31
+        $this->cleanup_slave(-1);
32 32
     }
33 33
 
34 34
     public function cleanup_slave($slaveId)
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/util2/cron/modules/cache_waypoint_pool.class.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
                 $free_wp = $opt['logic']['waypoint_pool']['prefix'] . '0001';
82 82
             }
83 83
             $nInsertCount += $this->fill_turn($free_wp, $max_inserts_count - $nInsertCount);
84
-            $rowCount ++;
84
+            $rowCount++;
85 85
         }
86 86
         sql_free_result($rsStartWp);
87 87
 
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
         $nWaypointsGenerated = 0;
122 122
         while (($nWaypointsGenerated < $max_inserts_count) && ($start_wp != $end_wp)) {
123 123
             sql("INSERT INTO `cache_waypoint_pool` (`wp_oc`) VALUES ('&1')", $start_wp);
124
-            $nWaypointsGenerated ++;
124
+            $nWaypointsGenerated++;
125 125
             $start_wp = $this->increment_waypoint($start_wp, $opt['logic']['waypoint_pool']['prefix']);
126 126
         }
127 127
 
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 
143 143
         $wp_value = substr($wp, 2);
144 144
         $b36_value = '';
145
-        for ($i = 0; $i < strlen($wp_value); $i ++) {
145
+        for ($i = 0; $i < strlen($wp_value); $i++) {
146 146
             $b36_value .= substr($b36_chars, strpos($wp_chars, substr($wp_value, $i, 1)), 1);
147 147
         }
148 148
 
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
         $b36_value = strtoupper(base_convert($dec_value, 10, strlen($wp_chars)));
151 151
 
152 152
         $wp_value = '';
153
-        for ($i = 0; $i < strlen($b36_value); $i ++) {
153
+        for ($i = 0; $i < strlen($b36_value); $i++) {
154 154
             $wp_value .= substr($wp_chars, strpos($b36_chars, substr($b36_value, $i, 1)), 1);
155 155
         }
156 156
 
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.
htdocs/config2/settings-dist-common.inc.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,11 +15,11 @@  discard block
 block discarded – undo
15 15
  *   bin/dbsv-update.php will then migrate the tables' charset.
16 16
  */
17 17
 $opt['charset']['iconv'] = 'UTF-8'; // 'ISO-8859-1'; // use iconv compatible charset-name
18
-$opt['charset']['mysql'] = 'utf8';     // use mysql compatible charset-name
18
+$opt['charset']['mysql'] = 'utf8'; // use mysql compatible charset-name
19 19
 
20 20
 // handling of SQL and PHP errors
21 21
 $opt['db']['error']['display'] = false;
22
-$opt['db']['error']['mail'] = 'root';  // set '' to disable
22
+$opt['db']['error']['mail'] = 'root'; // set '' to disable
23 23
 
24 24
 // page title
25 25
 $opt['page']['title'] = 'OPENCACHING';
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
  * Additionally, the cookie domain (different vor lib1 and lib2) can be overwritten.
58 58
  * See examples for overriding in settings-sample.inc.php.
59 59
  */
60
-$opt['page']['meta']['keywords'] = 'Geocaching, Geocache, Cache, Schatzsuche, GPS, kostenlos, GPX, Koordinaten, Hobby, Natur';  // 5-10 keywords are recommended
60
+$opt['page']['meta']['keywords'] = 'Geocaching, Geocache, Cache, Schatzsuche, GPS, kostenlos, GPX, Koordinaten, Hobby, Natur'; // 5-10 keywords are recommended
61 61
 // see http://forum.opencaching.de/index.php?topic=3065.0
62 62
 // and http://forum.opencaching.de/index.php?topic=3065.0 regarding description
63 63
 $opt['page']['meta']['description'] = 'Opencaching.de ist das freie Portal für Geocaching, ein Schatzsuche-Spiel. Mittels GPS-Koordinaten sind Behälter oder Objekte zu finden.';
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 // see also setting in lib/settings.inc.php!
95 95
 $opt['logic']['admin']['team_comments_only_for_reports'] = true;
96 96
 $opt['logic']['admin']['enable_listing_admins'] = false;
97
-$opt['logic']['admin']['listingadmin_notification'] = '';  // Email address(es), comma separated
97
+$opt['logic']['admin']['listingadmin_notification'] = ''; // Email address(es), comma separated
98 98
 
99 99
 /*
100 100
  * html purifier
Please login to merge, or discard this patch.
htdocs/config2/settings-sample.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
  * other parameters may be customized
67 67
  */
68 68
 $opt['session']['mode'] = SAVE_COOKIE;
69
-$opt['session']['cookiename'] = '<cookiename>';   // e.g. 'ocde'
70
-$opt['session']['domain'] = '<.do.main>';  // may be overwritten by $opt['domain'][...]['cookiedomain']
69
+$opt['session']['cookiename'] = '<cookiename>'; // e.g. 'ocde'
70
+$opt['session']['domain'] = '<.do.main>'; // may be overwritten by $opt['domain'][...]['cookiedomain']
71 71
 
72 72
 /* If the Referer was sent by the client and the substring was not found,
73 73
  * the embedded session id will be marked as invalid.
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 
101 101
 /* default locale
102 102
  */
103
-$opt['template']['default']['locale'] = 'DE';   // can be overwritten by $opt['domain'][<domain>]['locale']
103
+$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale']
104 104
 
105 105
 /* multi-domain settings
106 106
  *
Please login to merge, or discard this patch.