Completed
Pull Request — development (#405)
by Mirko
14:04 queued 06:05
created
local/stat/coordstat.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
     $year = substr($cache['date_created'], 0, 4);
27 27
     if ($year >= 2005 && $year <= date("Y") && ($lat != 0 || $long != 0)) {
28 28
         $years[$year] = true;
29
-        $liste[$lat][$long]["caches"][$year] ++;
29
+        $liste[$lat][$long]["caches"][$year]++;
30 30
     }
31 31
 }
32 32
 mysql_free_result($rs);
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
         $year = substr($cache["date"], 0, 4);
51 51
         if ($year >= 2005 && $year <= date("Y") && ($lat != 0 || $long != 0)) {
52 52
             $years[$year] = true;
53
-            $liste[$lat][$long]["logs"][$year] ++;
53
+            $liste[$lat][$long]["logs"][$year]++;
54 54
         }
55 55
     }
56 56
     mysql_free_result($rs);
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 while ($cache = sql_fetch_assoc($rs)) {
68 68
     $lat = floor($cache["latitude"] / $grid);
69 69
     $long = floor($cache["longitude"] / $grid);
70
-    $liste[$lat][$long]["caches"]["all"] ++;
70
+    $liste[$lat][$long]["caches"]["all"]++;
71 71
     $liste[$lat][$long]["logs"]["all"] += $cache["logs"];
72 72
 }
73 73
 mysql_free_result($rs);
Please login to merge, or discard this patch.
local/ocxml11client/xml2array.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,14 +16,14 @@
 block discarded – undo
16 16
 
17 17
     public function push_pos(&$pos)
18 18
     {
19
-        $this->stack[count($this->stack)] =& $pos;
20
-        $this->stack_ref =& $pos;
19
+        $this->stack[count($this->stack)] = & $pos;
20
+        $this->stack_ref = & $pos;
21 21
     }
22 22
 
23 23
     public function pop_pos()
24 24
     {
25 25
         unset($this->stack[count($this->stack) - 1]);
26
-        $this->stack_ref =& $this->stack[count($this->stack) - 1];
26
+        $this->stack_ref = & $this->stack[count($this->stack) - 1];
27 27
     }
28 28
 
29 29
     public function parse($strInputXML)
Please login to merge, or discard this patch.
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/lib2/search/search.txt.inc.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -203,6 +203,9 @@
 block discarded – undo
203 203
     return $str;
204 204
 }
205 205
 
206
+/**
207
+ * @param string $str
208
+ */
206 209
 function lf2crlf($str)
207 210
 {
208 211
     return str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $str));
Please login to merge, or discard this patch.
htdocs/src/Oc/Libse/ChildWp/ControllerChildWp.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -35,6 +35,9 @@  discard block
 block discarded – undo
35 35
         $this->init(0, 0);
36 36
     }
37 37
 
38
+    /**
39
+     * @param boolean $request
40
+     */
38 41
     private function initRequest($request)
39 42
     {
40 43
         if ($request) {
@@ -44,6 +47,9 @@  discard block
 block discarded – undo
44 47
         return new RequestHttp();
45 48
     }
46 49
 
50
+    /**
51
+     * @param boolean $translator
52
+     */
47 53
     private function initTranslator($translator)
48 54
     {
49 55
         if ($translator) {
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/lib2/common.inc.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -277,7 +277,7 @@
 block discarded – undo
277 277
     ) {
278 278
         return 'https' . strstr($url, '://');
279 279
     } elseif (strtolower(substr($url, 0, strlen($opt['page']['absolute_https_url'])))
280
-                  == $opt['page']['absolute_https_url']
280
+                    == $opt['page']['absolute_https_url']
281 281
               && !$opt['page']['https']['active']
282 282
     ) {
283 283
         return 'http' . strstr($url, '://');
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,9 +43,9 @@
 block discarded – undo
43 43
 mb_regex_encoding('UTF-8');
44 44
 
45 45
 // set options
46
-require_once __DIR__.'/../config2/settings-dist.inc.php';
47
-require_once __DIR__.'/../config2/settings.inc.php';
48
-require_once __DIR__.'/../config2/verify-settings.inc.php';
46
+require_once __DIR__ . '/../config2/settings-dist.inc.php';
47
+require_once __DIR__ . '/../config2/settings.inc.php';
48
+require_once __DIR__ . '/../config2/verify-settings.inc.php';
49 49
 
50 50
 foreach ($opt['page']['banned_user_agents'] as $ua) {
51 51
     if (strpos($useragent, $ua) !== false) {
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/main.tpl.php 2 patches
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.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -146,8 +146,9 @@
 block discarded – undo
146 146
                         <td>
147 147
 <?php
148 148
                             foreach ($opt['template']['locales'] AS $k => $lang) {
149
-                                                            if ($lang['status'] == OC_LOCALE_ACTIVE)
150
-                                    echo '<a style="text-decoration: none;" href="index.php?locale=' . $k . '"><img src="' . $lang['flag'] . '" alt="' . $lang['name'] . '" title="' . $lang['name'] . '" width="24px" height="18px" /></a> ';
149
+                                                            if ($lang['status'] == OC_LOCALE_ACTIVE) {
150
+                                                                                                echo '<a style="text-decoration: none;" href="index.php?locale=' . $k . '"><img src="' . $lang['flag'] . '" alt="' . $lang['name'] . '" title="' . $lang['name'] . '" width="24px" height="18px" /></a> ';
151
+                                                            }
151 152
                             }
152 153
                             ?>
153 154
                         </td>
Please login to merge, or discard this patch.