Completed
Pull Request — development (#546)
by Nick
07:54 queued 01:05
created
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/util/watchlist/runwatch.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -608,7 +608,7 @@
 block discarded – undo
608 608
         $pid_daemon = fgets($pidfile, 20);
609 609
         fclose($pidfile);
610 610
 
611
-        $pid_daemon = (int) $pid_daemon;
611
+        $pid_daemon = (int)$pid_daemon;
612 612
 
613 613
         // process running?
614 614
         if (posix_kill($pid_daemon, 0)) {
Please login to merge, or discard this patch.
htdocs/lib2/search/search.html.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
         // decide if the cache is new
87 87
         $dDiff = dateDiff('d', $rCache['date_created'], date('Y-m-d'));
88 88
 
89
-        $rCache['isnew'] = ($dDiff <= NEWCACHES_DAYS && (int) $rCache['type'] !== 6);
89
+        $rCache['isnew'] = ($dDiff <= NEWCACHES_DAYS && (int)$rCache['type'] !== 6);
90 90
 
91 91
         // get last logs
92 92
         if ($options['sort'] != 'bymylastlog' || !$login->logged_in()) {
Please login to merge, or discard this patch.
htdocs/viewprofile.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -371,7 +371,7 @@
 block discarded – undo
371 371
 $tpl->assign('hidden', $record['hidden'] <= 0 ? '0' : $record['hidden']);
372 372
 $tpl->assign('active', $active);
373 373
 $tpl->assign('recommended', sql_value("SELECT COUNT(*) FROM `cache_rating` WHERE `user_id`='&1'", 0, $userid));
374
-$tpl->assign('maxrecommended', (int) floor($record['found'] * $opt['logic']['rating']['percentageOfFounds'] / 100));
374
+$tpl->assign('maxrecommended', (int)floor($record['found'] * $opt['logic']['rating']['percentageOfFounds'] / 100));
375 375
 $tpl->assign('show_statistics', $show_statistics);
376 376
 $tpl->assign('show_oconly81', $show_oconly81);
377 377
 
Please login to merge, or discard this patch.