Completed
Pull Request — development (#495)
by Mirco
07:09
created
local/ocxml11client/xml2array.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,14 +14,14 @@
 block discarded – undo
14 14
 
15 15
     public function push_pos(&$pos)
16 16
     {
17
-        $this->stack[count($this->stack)] =& $pos;
18
-        $this->stack_ref =& $pos;
17
+        $this->stack[count($this->stack)] = & $pos;
18
+        $this->stack_ref = & $pos;
19 19
     }
20 20
 
21 21
     public function pop_pos()
22 22
     {
23 23
         unset($this->stack[count($this->stack) - 1]);
24
-        $this->stack_ref =& $this->stack[count($this->stack) - 1];
24
+        $this->stack_ref = & $this->stack[count($this->stack) - 1];
25 25
     }
26 26
 
27 27
     /**
Please login to merge, or discard this patch.
htdocs/lib/settings-dist.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@
 block discarded – undo
142 142
 
143 143
 /* default locale
144 144
  */
145
-$opt['template']['default']['locale'] = 'DE';   // can be overwritten by $opt['domain'][<domain>]['locale']
145
+$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale']
146 146
 
147 147
 // include all locale settings
148 148
 require_once __DIR__ . '/../config2/locale.inc.php';
Please login to merge, or discard this patch.
htdocs/lib/settings-sample-dev.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/settings-dev.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 );
80 80
 
81 81
 $opt['page']['develsystem'] = true;
82
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
82
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
83 83
 
84 84
 $opt['mail']['from'] = 'root';
85 85
 $opt['mail']['subject'] = '[local.team-opencaching.de] ';
Please login to merge, or discard this patch.
htdocs/src/Oc/Util/StyleCleanUp.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@
 block discarded – undo
97 97
                         && (trim($line, " \n") !== '' || substr($line, -1) !== "\n")
98 98
                     ) {
99 99
                         $oldLine = $line;
100
-                        $line = rtrim($line);   # trims " \t\n\r\0\x0B"
100
+                        $line = rtrim($line); # trims " \t\n\r\0\x0B"
101 101
                         $line = $this->expandTabs($line);
102 102
                         $line .= "\n";
103 103
 
Please login to merge, or discard this patch.
htdocs/lib2/ss_zip.class.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -143,9 +143,9 @@  discard block
 block discarded – undo
143 143
         }
144 144
 
145 145
         $fnl = strlen($filename);
146
-        $fh = "\x14\x00";    // ver needed to extract
147
-        $fh .= "\x00\x00";    // gen purpose bit flag
148
-        $fh .= "\x08\x00";    // compression method
146
+        $fh = "\x14\x00"; // ver needed to extract
147
+        $fh .= "\x00\x00"; // gen purpose bit flag
148
+        $fh .= "\x08\x00"; // compression method
149 149
         $fh .= "\x00\x00\x00\x00"; // last mod time and date
150 150
         $fh .=
151 151
             pack(
@@ -172,16 +172,16 @@  discard block
 block discarded – undo
172 172
                 "va*v3V2",
173 173
                 0,
174 174
                 $fh,
175
-                0,        // file comment length
176
-                0,        // disk number start
177
-                0,        // internal file attributes
178
-                $attr,    // external file attributes - 'archive/directory' bit set
175
+                0, // file comment length
176
+                0, // disk number start
177
+                0, // internal file attributes
178
+                $attr, // external file attributes - 'archive/directory' bit set
179 179
                 $this->offset
180 180
             ) . $filename;
181 181
 
182 182
         $this->offset += 42 + $fnl + $gzsize;
183 183
         $this->cdir[] = $cdir;
184
-        $this->cnt ++;
184
+        $this->cnt++;
185 185
         $this->idx = $this->cnt - 1;
186 186
     }
187 187
 
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
                 $cdsl, // size of central dir
231 231
                 $zdsl, // offset to start of central dir
232 232
                 0
233
-            );              // .zip file comment length
233
+            ); // .zip file comment length
234 234
         return $this->zipfile;
235 235
     }
236 236
 
Please login to merge, or discard this patch.
htdocs/lib2/OcSmarty.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
     public $main_template = 'sys_main';
20 20
     public $bench = null;
21 21
     public $compile_id = null;
22
-    public $cache_id = null;    // This is a smarty caching ID, not a caches.cache_id.
22
+    public $cache_id = null; // This is a smarty caching ID, not a caches.cache_id.
23 23
     public $title = '';
24 24
     public $menuitem = null;
25 25
     public $nowpsearch = false;
Please login to merge, or discard this patch.
htdocs/lib2/errorhandler.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -134,7 +134,7 @@
 block discarded – undo
134 134
     $errorlog_dir = __DIR__ . '/../var/errorlog';
135 135
     $errorlog_path = $errorlog_dir . '/errorlog-' . date('Y-m-d');
136 136
 
137
-    $error_mail_limit = 32768;    // send max 32 KB = ca. 5-20 errors per day/logfile
137
+    $error_mail_limit = 32768; // send max 32 KB = ca. 5-20 errors per day/logfile
138 138
 
139 139
     // All errors which may happen here are ignored, to avoid error recursions.
140 140
 
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'] = 'http://www.opencaching.de/';  // production installation for this OC site
187
+$opt['page']['origin_url'] = 'http://www.opencaching.de/'; // production installation for this OC site
188 188
 $opt['page']['develsystem'] = false;
189 189
 $opt['page']['teampic_url'] = 'http://www.opencaching.de/images/team/';
190 190
 $opt['page']['teammember_url'] = 'http://www.opencaching.de/';
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
     'newcaches' => [
219 219
         'show' => true,
220 220
         'url' => 'http://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
 
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
 
378 378
 /* license-related functions
379 379
  */
380
-$opt['logic']['license']['newusers'] = 2;  // see license constants in lib2/logic/const.inc.php
380
+$opt['logic']['license']['newusers'] = 2; // see license constants in lib2/logic/const.inc.php
381 381
 $opt['logic']['license']['admin'] = true;
382 382
 $opt['logic']['license']['disclaimer'] = false;
383 383
 $opt['logic']['license']['terms'] = 'articles.php?page=impressum#datalicense';
@@ -385,18 +385,18 @@  discard block
 block discarded – undo
385 385
 
386 386
 /* optional APIs
387 387
  */
388
-$opt['logic']['api']['email_problems']['key'] = '';   // must be set to enable
389
-$opt['logic']['api']['user_inactivity']['key'] = '';  // must be set to enable
388
+$opt['logic']['api']['email_problems']['key'] = ''; // must be set to enable
389
+$opt['logic']['api']['user_inactivity']['key'] = ''; // must be set to enable
390 390
 
391 391
 /* cache report info settings
392 392
  */
393 393
 $opt['logic']['cache_reports']['delaydays'] = 2;
394
-$opt['logic']['cache_reports']['min_processperday'] = 5;   // set to 0 to disable
395
-$opt['logic']['cache_reports']['max_processperday'] = 20;  // set to 0 to disable
394
+$opt['logic']['cache_reports']['min_processperday'] = 5; // set to 0 to disable
395
+$opt['logic']['cache_reports']['max_processperday'] = 20; // set to 0 to disable
396 396
 
397 397
 /* cronjob
398 398
  */
399
-$opt['cron']['username'] = 'apache';   // system username for cronjobs
399
+$opt['cron']['username'] = 'apache'; // system username for cronjobs
400 400
 
401 401
 /* phpbb news integration (index.php, outdated)
402 402
  *
Please login to merge, or discard this patch.