Passed
Pull Request — development (#390)
by Mirko
09:05
created
htdocs/lib2/logic/attribute.class.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -23,6 +23,10 @@
 block discarded – undo
23 23
         return self::getAttrbutesListArrayInternal($cacheId, false, $firstLetterUppercase);
24 24
     }
25 25
 
26
+    /**
27
+     * @param boolean $bOnlySelectable
28
+     * @param boolean $firstLetterUppercase
29
+     */
26 30
     public static function getAttrbutesListArrayInternal($cacheId, $bOnlySelectable, $firstLetterUppercase)
27 31
     {
28 32
         global $opt;
Please login to merge, or discard this patch.
htdocs/lib2/logic/coordinate.class.php 2 patches
Doc Comments   +10 added lines patch added patch discarded remove patch
@@ -303,6 +303,10 @@  discard block
 block discarded – undo
303 303
         return 'R ' . floor($result[0]) . ' H ' . floor($result[1]);
304 304
     }
305 305
 
306
+    /**
307
+     * @param integer $bw
308
+     * @param integer $lw
309
+     */
306 310
     public function wgs2pot($bw, $lw)
307 311
     {
308 312
         /* Copyright (c) 2006, HELMUT H. HEIMEIER
@@ -602,6 +606,9 @@  discard block
 block discarded – undo
602 606
         ];
603 607
     }
604 608
 
609
+    /**
610
+     * @param string $name
611
+     */
605 612
     public static function parseRequestLat($name)
606 613
     {
607 614
         if (!isset($_REQUEST[$name . 'NS']) || !isset($_REQUEST[$name . 'Lat']) || !isset($_REQUEST[$name . 'LatMin'])) {
@@ -620,6 +627,9 @@  discard block
 block discarded – undo
620 627
         return $lat;
621 628
     }
622 629
 
630
+    /**
631
+     * @param string $name
632
+     */
623 633
     public static function parseRequestLon($name)
624 634
     {
625 635
         if (!isset($_REQUEST[$name . 'EW']) || !isset($_REQUEST[$name . 'Lon']) || !isset($_REQUEST[$name . 'LonMin'])) {
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -175,8 +175,8 @@  discard block
 block discarded – undo
175 175
                 0
176 176
             ];
177 177
         }
178
-        $lw = (float) $this->nLon;
179
-        $bw = (float) $this->nLat;
178
+        $lw = (float)$this->nLon;
179
+        $bw = (float)$this->nLat;
180 180
 
181 181
         //WGS84 Datum
182 182
         //Große Halbachse a und Abplattung f
@@ -195,9 +195,9 @@  discard block
 block discarded – undo
195 195
 
196 196
         //Koeffizienten zur Berechnung der Meridianbogenlänge
197 197
         $e0 = $c * (pi() / 180) * (1 - 3 * $ex2 / 4 + 45 * $ex4 / 64 - 175 * $ex6 / 256 + 11025 * $ex8 / 16384);
198
-        $e2 = $c * (- 3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
198
+        $e2 = $c * (-3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
199 199
         $e4 = $c * (15 * $ex4 / 256 - 105 * $ex6 / 1024 + 2205 * $ex8 / 16384);
200
-        $e6 = $c * (- 35 * $ex6 / 3072 + 315 * $ex8 / 12288);
200
+        $e6 = $c * (-35 * $ex6 / 3072 + 315 * $ex8 / 12288);
201 201
 
202 202
         //Längenzone lz und Breitenzone (Band) bz
203 203
         $lzn = intval(($lw + 180) / 6) + 1;
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
         if ($lzn < 10) {
224 224
             $lz = "0" . $lzn;
225 225
         }
226
-        $bd = (int) (1 + ($bw + 80) / 8);
226
+        $bd = (int)(1 + ($bw + 80) / 8);
227 227
         $bz = substr($b_sel, $bd - 1, 1);
228 228
 
229 229
         //Geographische Breite in Radianten br
@@ -268,20 +268,20 @@  discard block
 block discarded – undo
268 268
         $ew = 0.9996 * ($nd * $cos1 * $dl + $nd * $cos3 * (1 - $tan2 + $etasq) * $dl3 / 6 +
269 269
                 $nd * $cos5 * (5 - 18 * $tan2 + $tan4) * $dl5 / 120) + 500000;
270 270
 
271
-        $nk = $nw - (int) $nw;
271
+        $nk = $nw - (int)$nw;
272 272
         if ($nk < 0.5) {
273
-            $nw = '' . (int) $nw;
273
+            $nw = '' . (int)$nw;
274 274
         } else {
275
-            $nw = '' . ((int) $nw + 1);
275
+            $nw = '' . ((int)$nw + 1);
276 276
         }
277 277
 
278 278
         while (strlen($nw) < 7) {
279 279
             $nw = '0' . $nw;
280 280
         }
281 281
 
282
-        $nk = $ew - (int) $ew;
282
+        $nk = $ew - (int)$ew;
283 283
         if ($nk < 0.5) {
284
-            $ew = '0' . (int) $ew;
284
+            $ew = '0' . (int)$ew;
285 285
         } else {
286 286
             $ew = '0' . intval($ew + 1);
287 287
         }
@@ -331,8 +331,8 @@  discard block
 block discarded – undo
331 331
                 0
332 332
             ];
333 333
         }
334
-        $lw = (float) $lw;
335
-        $bw = (float) $bw;
334
+        $lw = (float)$lw;
335
+        $bw = (float)$bw;
336 336
 
337 337
         // Quellsystem WGS 84 Datum
338 338
         // Große Halbachse a und Abplattung fq
@@ -410,8 +410,8 @@  discard block
 block discarded – undo
410 410
                 0
411 411
             ];
412 412
         }
413
-        $lp = (float) $lp;
414
-        $bp = (float) $bp;
413
+        $lp = (float)$lp;
414
+        $bp = (float)$bp;
415 415
 
416 416
         // Potsdam Datum
417 417
         // Große Halbachse a und Abplattung f
@@ -429,9 +429,9 @@  discard block
 block discarded – undo
429 429
 
430 430
         // Koeffizienten zur Berechnung der Meridianbogenlänge
431 431
         $e0 = $c * (pi() / 180) * (1 - 3 * $ex2 / 4 + 45 * $ex4 / 64 - 175 * $ex6 / 256 + 11025 * $ex8 / 16384);
432
-        $e2 = $c * (- 3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
432
+        $e2 = $c * (-3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
433 433
         $e4 = $c * (15 * $ex4 / 256 - 105 * $ex6 / 1024 + 2205 * $ex8 / 16384);
434
-        $e6 = $c * (- 35 * $ex6 / 3072 + 315 * $ex8 / 12288);
434
+        $e6 = $c * (-35 * $ex6 / 3072 + 315 * $ex8 / 12288);
435 435
 
436 436
         // Breite in Radianten
437 437
         $br = $bp * pi() / 180;
@@ -469,18 +469,18 @@  discard block
 block discarded – undo
469 469
         $rw = ($nd * $cos1 * $dl + $nd * $cos3 * (1 - $tan2 + $etasq) * $dl3 / 6 +
470 470
             $nd * $cos5 * (5 - 18 * $tan2 + $tan4) * $dl5 / 120 + $kz * 1e6 + 500000);
471 471
 
472
-        $nk = $hw - (int) $hw;
472
+        $nk = $hw - (int)$hw;
473 473
         if ($nk < 0.5) {
474
-            $hw = (int) $hw;
474
+            $hw = (int)$hw;
475 475
         } else {
476
-            $hw = ((int) $hw) + 1;
476
+            $hw = ((int)$hw) + 1;
477 477
         }
478 478
 
479
-        $nk = $rw - (int) $rw;
479
+        $nk = $rw - (int)$rw;
480 480
         if ($nk < 0.5) {
481
-            $rw = (int) $rw;
481
+            $rw = (int)$rw;
482 482
         } else {
483
-            $rw = (int) ($rw + 1);
483
+            $rw = (int)($rw + 1);
484 484
         }
485 485
 
486 486
         return [
@@ -499,8 +499,8 @@  discard block
 block discarded – undo
499 499
         $lat_base = 52.15517440;
500 500
         $lon_base = 5.38720621;
501 501
 
502
-        for ($i = 0; $i <= 6; $i ++) {
503
-            for ($j = 0; $j <= 5; $j ++) {
502
+        for ($i = 0; $i <= 6; $i++) {
503
+            for ($j = 0; $j <= 5; $j++) {
504 504
                 $rpq[$i][$j] = 0;
505 505
                 $spq[$i][$j] = 0;
506 506
             }
@@ -535,8 +535,8 @@  discard block
 block discarded – undo
535 535
         $xOrigin = 0;
536 536
         $yOrigin = 0;
537 537
 
538
-        for ($q = 0; $q <= 5; $q ++) {
539
-            for ($p = 0; $p <= 6; $p ++) {
538
+        for ($q = 0; $q <= 5; $q++) {
539
+            for ($p = 0; $p <= 6; $p++) {
540 540
                 $xOrigin = $xOrigin + ($rpq[$p][$q] * ((pow($dlat, $p)) * (pow($dlon, $q))));
541 541
                 $yOrigin = $yOrigin + ($spq[$p][$q] * ((pow($dlat, $p)) * (pow($dlon, $q))));
542 542
             }
Please login to merge, or discard this patch.
htdocs/lib2/logic/sitemapxml.class.php 2 patches
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -46,6 +46,11 @@  discard block
 block discarded – undo
46 46
     /* sChaneFreq = {always, hourly, daily, weekly, monthly, yearly, never}
47 47
      * nPriority  = {0.0 to 1.0}
48 48
      */
49
+
50
+    /**
51
+     * @param string $sFile
52
+     * @param integer $dLastMod
53
+     */
49 54
     public function write($sFile, $dLastMod, $sChangeFreq = false, $nPriority = 0.5)
50 55
     {
51 56
         if ($sChangeFreq == false) {
@@ -62,6 +67,9 @@  discard block
 block discarded – undo
62 67
         $this->writeInternal($sXML);
63 68
     }
64 69
 
70
+    /**
71
+     * @param string $str
72
+     */
65 73
     public function writeInternal($str)
66 74
     {
67 75
         global $opt;
Please login to merge, or discard this 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
 {
13 13
     public $sDefaultChangeFreq = 'monthly';
14 14
     public $nMaxFileSize = 9961472; // max file size, 10MB by specification
15
-    public $nMaxUrlCount = 50000;   // max number of URLs per file, 50000 by specification
15
+    public $nMaxUrlCount = 50000; // max number of URLs per file, 50000 by specification
16 16
 
17 17
     public $sPath = '';
18 18
     public $sDomain = '';
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 
76 76
         // open new XML file?
77 77
         if ($this->oSitemapFile === false) {
78
-            $this->nSitemapIndex ++;
78
+            $this->nSitemapIndex++;
79 79
             $sFilename = 'sitemap-' . $this->nSitemapIndex . '.xml.gz';
80 80
             $this->oSitemapFile = gzopen($this->sPath . $sFilename, 'wb');
81 81
 
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
         // write string to XML
92 92
         gzwrite($this->oSitemapFile, $str);
93 93
         $this->nWrittenSize += strlen($str);
94
-        $this->nWrittenCount ++;
94
+        $this->nWrittenCount++;
95 95
     }
96 96
 
97 97
     public function close()
Please login to merge, or discard this patch.
htdocs/lib2/mail.class.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -130,6 +130,9 @@  discard block
 block discarded – undo
130 130
         return mb_send_mail($this->to, $opt['mail']['subject'] . $this->subject, $body, $mailheaders);
131 131
     }
132 132
 
133
+    /**
134
+     * @param string $domain
135
+     */
133 136
     public static function is_existent_maildomain($domain)
134 137
     {
135 138
         if ($domain == "localhost") {
@@ -154,6 +157,9 @@  discard block
 block discarded – undo
154 157
         return false;
155 158
     }
156 159
 
160
+    /**
161
+     * @param string $mail
162
+     */
157 163
     public static function getToMailDomain($mail)
158 164
     {
159 165
         if ($mail == '') {
Please login to merge, or discard this patch.
htdocs/lib2/menu.class.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -245,6 +245,9 @@
 block discarded – undo
245 245
         return $retval;
246 246
     }
247 247
 
248
+    /**
249
+     * @param integer|null $menuid
250
+     */
248 251
     public function pAppendSubMenu($menuid, $ids, &$items)
249 252
     {
250 253
         global $menuitem, $login;
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
         // add country-dependent town list for small map
35 35
         $country = $login->getUserCountry();
36 36
         if ($opt['map']['towns']['enable'] &&
37
-            isset($build_map_towns_menu) && $build_map_towns_menu &&   // optimization
37
+            isset($build_map_towns_menu) && $build_map_towns_menu && // optimization
38 38
             isset($opt['map']['towns'][$country]['enable']) && $opt['map']['towns'][$country]['enable']
39 39
         ) {
40 40
             $rsTowns = sqlf(
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
                         'parent' => MNU_MAP
74 74
                     ];
75 75
                     $menuitem[MNU_MAP]['subitems'][] = $menu_map;
76
-                    ++ $menu_map;
76
+                    ++$menu_map;
77 77
                 }
78 78
             }
79 79
         }
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
         $rsSubmenu = sqlf("SELECT `id` FROM `sys_menu` WHERE `parent`=0 ORDER BY `parent` ASC, `position` ASC");
101 101
         while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
102 102
             $aMenu[MNU_ROOT]['subitems'][$nPos] = $rSubmenu['id'];
103
-            $nPos ++;
103
+            $nPos++;
104 104
         }
105 105
         sql_free_result($rsSubmenu);
106 106
         fwrite($f, "\n");
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
             );
138 138
             while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
139 139
                 $aMenu[$r['id']]['subitems'][$nPos] = $rSubmenu['id'];
140
-                $nPos ++;
140
+                $nPos++;
141 141
             }
142 142
             sql_free_result($rsSubmenu);
143 143
         }
Please login to merge, or discard this patch.
htdocs/lib2/Net/IDNA2.php 3 patches
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -2760,7 +2760,7 @@  discard block
 block discarded – undo
2760 2760
      *
2761 2761
      * @param int $d One digit to encode
2762 2762
      *
2763
-     * @return char  Encoded digit
2763
+     * @return string  Encoded digit
2764 2764
      * @access private
2765 2765
      */
2766 2766
     private function _encodeDigit($d)
@@ -2771,7 +2771,7 @@  discard block
 block discarded – undo
2771 2771
     /**
2772 2772
      * Decode a certain digit.
2773 2773
      *
2774
-     * @param char $cp One digit (character) to decode
2774
+     * @param string $cp One digit (character) to decode
2775 2775
      *
2776 2776
      * @return int     Decoded digit
2777 2777
      * @access private
@@ -2785,7 +2785,7 @@  discard block
 block discarded – undo
2785 2785
     /**
2786 2786
      * Do Nameprep according to RFC3491 and RFC3454.
2787 2787
      *
2788
-     * @param array $input Unicode Characters
2788
+     * @param string $input Unicode Characters
2789 2789
      *
2790 2790
      * @return string      Unicode Characters, Nameprep'd
2791 2791
      * @throws Exception
@@ -2885,7 +2885,7 @@  discard block
 block discarded – undo
2885 2885
      *
2886 2886
      * @param integer $char 32bit UCS4 code point
2887 2887
      *
2888
-     * @return array        Either Hangul Syllable decomposed or original 32bit
2888
+     * @return integer[]        Either Hangul Syllable decomposed or original 32bit
2889 2889
      *                      value as one value array
2890 2890
      * @access private
2891 2891
      */
Please login to merge, or discard this patch.
Switch Indentation   +79 added lines, -79 removed lines patch added patch discarded remove patch
@@ -2273,38 +2273,38 @@  discard block
 block discarded – undo
2273 2273
 
2274 2274
         foreach ($option as $k => $v) {
2275 2275
             switch ($k) {
2276
-            case 'encoding':
2277
-                switch ($v) {
2278
-                case 'utf8':
2279
-                case 'ucs4_string':
2280
-                case 'ucs4_array':
2281
-                    $this->_api_encoding = $v;
2282
-                    break;
2276
+                case 'encoding':
2277
+                    switch ($v) {
2278
+                        case 'utf8':
2279
+                        case 'ucs4_string':
2280
+                        case 'ucs4_array':
2281
+                            $this->_api_encoding = $v;
2282
+                            break;
2283 2283
 
2284
-                default:
2285
-                    throw new InvalidArgumentException('Set Parameter: Unknown parameter '.$v.' for option '.$k);
2286
-                }
2284
+                        default:
2285
+                            throw new InvalidArgumentException('Set Parameter: Unknown parameter '.$v.' for option '.$k);
2286
+                    }
2287 2287
 
2288 2288
                 break;
2289 2289
 
2290
-            case 'overlong':
2291
-                $this->_allow_overlong = ($v) ? true : false;
2292
-                break;
2290
+                case 'overlong':
2291
+                    $this->_allow_overlong = ($v) ? true : false;
2292
+                    break;
2293 2293
 
2294
-            case 'strict':
2295
-                $this->_strict_mode = ($v) ? true : false;
2296
-                break;
2294
+                case 'strict':
2295
+                    $this->_strict_mode = ($v) ? true : false;
2296
+                    break;
2297 2297
 
2298
-            case 'version':
2299
-                if (in_array($v, array('2003', '2008'))) {
2300
-                    $this->_version = $v;
2301
-                } else {
2302
-                    throw new InvalidArgumentException('Set Parameter: Invalid parameter '.$v.' for option '.$k);
2303
-                }
2304
-                break;
2298
+                case 'version':
2299
+                    if (in_array($v, array('2003', '2008'))) {
2300
+                        $this->_version = $v;
2301
+                    } else {
2302
+                        throw new InvalidArgumentException('Set Parameter: Invalid parameter '.$v.' for option '.$k);
2303
+                    }
2304
+                    break;
2305 2305
 
2306
-            default:
2307
-                return false;
2306
+                default:
2307
+                    return false;
2308 2308
             }
2309 2309
         }
2310 2310
 
@@ -2328,15 +2328,15 @@  discard block
 block discarded – undo
2328 2328
         // Forcing conversion of input to UCS4 array
2329 2329
         // If one time encoding is given, use this, else the objects property
2330 2330
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
2331
-        case 'utf8':
2332
-            $decoded = $this->_utf8_to_ucs4($decoded);
2333
-            break;
2334
-        case 'ucs4_string':
2335
-            $decoded = $this->_ucs4_string_to_ucs4($decoded);
2336
-        case 'ucs4_array': // No break; before this line. Catch case, but do nothing
2337
-            break;
2338
-        default:
2339
-            throw new InvalidArgumentException('Unsupported input format');
2331
+            case 'utf8':
2332
+                $decoded = $this->_utf8_to_ucs4($decoded);
2333
+                break;
2334
+            case 'ucs4_string':
2335
+                $decoded = $this->_ucs4_string_to_ucs4($decoded);
2336
+            case 'ucs4_array': // No break; before this line. Catch case, but do nothing
2337
+                break;
2338
+            default:
2339
+                throw new InvalidArgumentException('Unsupported input format');
2340 2340
         }
2341 2341
 
2342 2342
         // No input, no output, what else did you expect?
@@ -2350,35 +2350,35 @@  discard block
 block discarded – undo
2350 2350
         foreach ($decoded as $k => $v) {
2351 2351
             // Make sure to use just the plain dot
2352 2352
             switch($v) {
2353
-            case 0x3002:
2354
-            case 0xFF0E:
2355
-            case 0xFF61:
2356
-                $decoded[$k] = 0x2E;
2357
-                // It's right, no break here
2358
-                // The codepoints above have to be converted to dots anyway
2359
-
2360
-            // Stumbling across an anchoring character
2361
-            case 0x2E:
2362
-            case 0x2F:
2363
-            case 0x3A:
2364
-            case 0x3F:
2365
-            case 0x40:
2366
-                // Neither email addresses nor URLs allowed in strict mode
2367
-                if ($this->_strict_mode) {
2368
-                    throw new InvalidArgumentException('Neither email addresses nor URLs are allowed in strict mode.');
2369
-                }
2370
-                // Skip first char
2371
-                if ($k) {
2372
-                    $encoded = '';
2373
-                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
2374
-                    if ($encoded) {
2375
-                        $output .= $encoded;
2376
-                    } else {
2377
-                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
2353
+                case 0x3002:
2354
+                case 0xFF0E:
2355
+                case 0xFF61:
2356
+                    $decoded[$k] = 0x2E;
2357
+                    // It's right, no break here
2358
+                    // The codepoints above have to be converted to dots anyway
2359
+
2360
+                // Stumbling across an anchoring character
2361
+                case 0x2E:
2362
+                case 0x2F:
2363
+                case 0x3A:
2364
+                case 0x3F:
2365
+                case 0x40:
2366
+                    // Neither email addresses nor URLs allowed in strict mode
2367
+                    if ($this->_strict_mode) {
2368
+                        throw new InvalidArgumentException('Neither email addresses nor URLs are allowed in strict mode.');
2378 2369
                     }
2379
-                    $output .= chr($decoded[$k]);
2380
-                }
2381
-                $last_begin = $k + 1;
2370
+                    // Skip first char
2371
+                    if ($k) {
2372
+                        $encoded = '';
2373
+                        $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
2374
+                        if ($encoded) {
2375
+                            $output .= $encoded;
2376
+                        } else {
2377
+                            $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
2378
+                        }
2379
+                        $output .= chr($decoded[$k]);
2380
+                    }
2381
+                    $last_begin = $k + 1;
2382 2382
             }
2383 2383
         }
2384 2384
         // Catch the rest of the string
@@ -2416,12 +2416,12 @@  discard block
 block discarded – undo
2416 2416
         // Optionally set
2417 2417
         if ($one_time_encoding) {
2418 2418
             switch ($one_time_encoding) {
2419
-            case 'utf8':
2420
-            case 'ucs4_string':
2421
-            case 'ucs4_array':
2422
-                break;
2423
-            default:
2424
-                throw new InvalidArgumentException('Unknown encoding '.$one_time_encoding);
2419
+                case 'utf8':
2420
+                case 'ucs4_string':
2421
+                case 'ucs4_array':
2422
+                    break;
2423
+                default:
2424
+                    throw new InvalidArgumentException('Unknown encoding '.$one_time_encoding);
2425 2425
             }
2426 2426
         }
2427 2427
         // Make sure to drop any newline characters around
@@ -2473,17 +2473,17 @@  discard block
 block discarded – undo
2473 2473
         // The output is UTF-8 by default, other output formats need conversion here
2474 2474
         // If one time encoding is given, use this, else the objects property
2475 2475
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
2476
-        case 'utf8':
2477
-            return $return;
2478
-            break;
2479
-        case 'ucs4_string':
2480
-            return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
2481
-            break;
2482
-        case 'ucs4_array':
2483
-            return $this->_utf8_to_ucs4($return);
2484
-            break;
2485
-        default:
2486
-            throw new InvalidArgumentException('Unsupported output format');
2476
+            case 'utf8':
2477
+                return $return;
2478
+                break;
2479
+            case 'ucs4_string':
2480
+                return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
2481
+                break;
2482
+            case 'ucs4_array':
2483
+                return $this->_utf8_to_ucs4($return);
2484
+                break;
2485
+            default:
2486
+                throw new InvalidArgumentException('Unsupported output format');
2487 2487
         }
2488 2488
     }
2489 2489
 
Please login to merge, or discard this patch.
Spacing   +43 added lines, -47 removed lines patch added patch discarded remove patch
@@ -272,16 +272,16 @@  discard block
 block discarded – undo
272 272
      * @access private
273 273
      */
274 274
     private static $_np_prohibit_ranges = array(
275
-        array(0x80,     0x9F    ),
276
-        array(0x2060,   0x206F  ),
277
-        array(0x1D173,  0x1D17A ),
278
-        array(0xE000,   0xF8FF  ),
279
-        array(0xF0000,  0xFFFFD ),
275
+        array(0x80, 0x9F),
276
+        array(0x2060, 0x206F),
277
+        array(0x1D173, 0x1D17A),
278
+        array(0xE000, 0xF8FF),
279
+        array(0xF0000, 0xFFFFD),
280 280
         array(0x100000, 0x10FFFD),
281
-        array(0xFDD0,   0xFDEF  ),
282
-        array(0xD800,   0xDFFF  ),
283
-        array(0x2FF0,   0x2FFB  ),
284
-        array(0xE0020,  0xE007F )
281
+        array(0xFDD0, 0xFDEF),
282
+        array(0xD800, 0xDFFF),
283
+        array(0x2FF0, 0x2FFB),
284
+        array(0xE0020, 0xE007F)
285 285
     );
286 286
 
287 287
     /**
@@ -2282,7 +2282,7 @@  discard block
 block discarded – undo
2282 2282
                     break;
2283 2283
 
2284 2284
                 default:
2285
-                    throw new InvalidArgumentException('Set Parameter: Unknown parameter '.$v.' for option '.$k);
2285
+                    throw new InvalidArgumentException('Set Parameter: Unknown parameter ' . $v . ' for option ' . $k);
2286 2286
                 }
2287 2287
 
2288 2288
                 break;
@@ -2299,7 +2299,7 @@  discard block
 block discarded – undo
2299 2299
                 if (in_array($v, array('2003', '2008'))) {
2300 2300
                     $this->_version = $v;
2301 2301
                 } else {
2302
-                    throw new InvalidArgumentException('Set Parameter: Invalid parameter '.$v.' for option '.$k);
2302
+                    throw new InvalidArgumentException('Set Parameter: Invalid parameter ' . $v . ' for option ' . $k);
2303 2303
                 }
2304 2304
                 break;
2305 2305
 
@@ -2328,8 +2328,7 @@  discard block
 block discarded – undo
2328 2328
         // Forcing conversion of input to UCS4 array
2329 2329
         // If one time encoding is given, use this, else the objects property
2330 2330
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
2331
-        case 'utf8':
2332
-            $decoded = $this->_utf8_to_ucs4($decoded);
2331
+        case 'utf8' : $decoded = $this->_utf8_to_ucs4($decoded);
2333 2332
             break;
2334 2333
         case 'ucs4_string':
2335 2334
             $decoded = $this->_ucs4_string_to_ucs4($decoded);
@@ -2349,7 +2348,7 @@  discard block
 block discarded – undo
2349 2348
 
2350 2349
         foreach ($decoded as $k => $v) {
2351 2350
             // Make sure to use just the plain dot
2352
-            switch($v) {
2351
+            switch ($v) {
2353 2352
             case 0x3002:
2354 2353
             case 0xFF0E:
2355 2354
             case 0xFF61:
@@ -2370,11 +2369,11 @@  discard block
 block discarded – undo
2370 2369
                 // Skip first char
2371 2370
                 if ($k) {
2372 2371
                     $encoded = '';
2373
-                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
2372
+                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k) - $last_begin)));
2374 2373
                     if ($encoded) {
2375 2374
                         $output .= $encoded;
2376 2375
                     } else {
2377
-                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
2376
+                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k) - $last_begin)));
2378 2377
                     }
2379 2378
                     $output .= chr($decoded[$k]);
2380 2379
                 }
@@ -2385,11 +2384,11 @@  discard block
 block discarded – undo
2385 2384
         if ($last_begin) {
2386 2385
             $inp_len = sizeof($decoded);
2387 2386
             $encoded = '';
2388
-            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
2387
+            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len) - $last_begin)));
2389 2388
             if ($encoded) {
2390 2389
                 $output .= $encoded;
2391 2390
             } else {
2392
-                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
2391
+                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len) - $last_begin)));
2393 2392
             }
2394 2393
             return $output;
2395 2394
         }
@@ -2421,7 +2420,7 @@  discard block
 block discarded – undo
2421 2420
             case 'ucs4_array':
2422 2421
                 break;
2423 2422
             default:
2424
-                throw new InvalidArgumentException('Unknown encoding '.$one_time_encoding);
2423
+                throw new InvalidArgumentException('Unknown encoding ' . $one_time_encoding);
2425 2424
             }
2426 2425
         }
2427 2426
         // Make sure to drop any newline characters around
@@ -2473,8 +2472,7 @@  discard block
 block discarded – undo
2473 2472
         // The output is UTF-8 by default, other output formats need conversion here
2474 2473
         // If one time encoding is given, use this, else the objects property
2475 2474
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
2476
-        case 'utf8':
2477
-            return $return;
2475
+        case 'utf8' : return $return;
2478 2476
             break;
2479 2477
         case 'ucs4_string':
2480 2478
             return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
@@ -2629,9 +2627,8 @@  discard block
 block discarded – undo
2629 2627
                     $delta++;
2630 2628
                 } else if ($decoded[$i] == $cur_code) {
2631 2629
                     for ($q = $delta, $k = $this->_base; 1; $k += $this->_base) {
2632
-                        $t = ($k <= $bias)?
2633
-                            $this->_tmin :
2634
-                            (($k >= $bias + $this->_tmax)? $this->_tmax : $k - $bias);
2630
+                        $t = ($k <= $bias) ?
2631
+                            $this->_tmin : (($k >= $bias + $this->_tmax) ? $this->_tmax : $k - $bias);
2635 2632
 
2636 2633
                         if ($q < $t) {
2637 2634
                             break;
@@ -2699,14 +2696,13 @@  discard block
 block discarded – undo
2699 2696
         $idx      = 0;
2700 2697
         $char     = $this->_initial_n;
2701 2698
 
2702
-        for ($enco_idx = ($delim_pos)? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
2703
-            for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
2699
+        for ($enco_idx = ($delim_pos) ? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
2700
+            for ($old_idx = $idx, $w = 1, $k = $this->_base; 1; $k += $this->_base) {
2704 2701
                 $digit = $this->_decodeDigit($encoded{$enco_idx++});
2705 2702
                 $idx += $digit * $w;
2706 2703
 
2707 2704
                 $t = ($k <= $bias) ?
2708
-                    $this->_tmin :
2709
-                    (($k >= $bias + $this->_tmax)? $this->_tmax : ($k - $bias));
2705
+                    $this->_tmin : (($k >= $bias + $this->_tmax) ? $this->_tmax : ($k - $bias));
2710 2706
 
2711 2707
                 if ($digit < $t) {
2712 2708
                     break;
@@ -2717,7 +2713,7 @@  discard block
 block discarded – undo
2717 2713
 
2718 2714
             $bias      = $this->_adapt($idx - $old_idx, $deco_len + 1, $is_first);
2719 2715
             $is_first  = false;
2720
-            $char     += (int) ($idx / ($deco_len + 1));
2716
+            $char     += (int)($idx / ($deco_len + 1));
2721 2717
             $idx      %= ($deco_len + 1);
2722 2718
 
2723 2719
             if ($deco_len > 0) {
@@ -2745,14 +2741,14 @@  discard block
 block discarded – undo
2745 2741
      */
2746 2742
     private function _adapt($delta, $npoints, $is_first)
2747 2743
     {
2748
-        $delta = (int) ($is_first ? ($delta / $this->_damp) : ($delta / 2));
2749
-        $delta += (int) ($delta / $npoints);
2744
+        $delta = (int)($is_first ? ($delta / $this->_damp) : ($delta / 2));
2745
+        $delta += (int)($delta / $npoints);
2750 2746
 
2751 2747
         for ($k = 0; $delta > (($this->_base - $this->_tmin) * $this->_tmax) / 2; $k += $this->_base) {
2752
-            $delta = (int) ($delta / ($this->_base - $this->_tmin));
2748
+            $delta = (int)($delta / ($this->_base - $this->_tmin));
2753 2749
         }
2754 2750
 
2755
-        return (int) ($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
2751
+        return (int)($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
2756 2752
     }
2757 2753
 
2758 2754
     /**
@@ -2779,7 +2775,7 @@  discard block
 block discarded – undo
2779 2775
     private function _decodeDigit($cp)
2780 2776
     {
2781 2777
         $cp = ord($cp);
2782
-        return ($cp - 48 < 10)? $cp - 22 : (($cp - 65 < 26)? $cp - 65 : (($cp - 97 < 26)? $cp - 97 : $this->_base));
2778
+        return ($cp - 48 < 10) ? $cp - 22 : (($cp - 65 < 26) ? $cp - 65 : (($cp - 97 < 26) ? $cp - 97 : $this->_base));
2783 2779
     }
2784 2780
 
2785 2781
     /**
@@ -2862,7 +2858,7 @@  discard block
 block discarded – undo
2862 2858
                     // Rewind the for loop by one, since there can be more possible compositions
2863 2859
                     $i--;
2864 2860
                     $out_len--;
2865
-                    $last_class = ($i == $last_starter)? 0 : $this->_getCombiningClass($output[$i - 1]);
2861
+                    $last_class = ($i == $last_starter) ? 0 : $this->_getCombiningClass($output[$i - 1]);
2866 2862
 
2867 2863
                     continue;
2868 2864
                 }
@@ -2899,7 +2895,7 @@  discard block
 block discarded – undo
2899 2895
 
2900 2896
         $result   = array();
2901 2897
         $T        = $this->_tbase + $sindex % $this->_tcount;
2902
-        $result[] = (int)($this->_lbase +  $sindex / $this->_ncount);
2898
+        $result[] = (int)($this->_lbase + $sindex / $this->_ncount);
2903 2899
         $result[] = (int)($this->_vbase + ($sindex % $this->_ncount) / $this->_tcount);
2904 2900
 
2905 2901
         if ($T != $this->_tbase) {
@@ -2985,7 +2981,7 @@  discard block
 block discarded – undo
2985 2981
      */
2986 2982
     private function _getCombiningClass($char)
2987 2983
     {
2988
-        return isset(self::$_np_norm_combcls[$char])? self::$_np_norm_combcls[$char] : 0;
2984
+        return isset(self::$_np_norm_combcls[$char]) ? self::$_np_norm_combcls[$char] : 0;
2989 2985
     }
2990 2986
 
2991 2987
     /**
@@ -3119,7 +3115,7 @@  discard block
 block discarded – undo
3119 3115
                 $output[$out_len] = $v;
3120 3116
                 ++$out_len;
3121 3117
                 if ('add' == $mode) {
3122
-                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
3118
+                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte ' . $k);
3123 3119
                 }
3124 3120
                 continue;
3125 3121
             }
@@ -3143,10 +3139,10 @@  discard block
 block discarded – undo
3143 3139
                     $next_byte = 4;
3144 3140
                     $v = ($v - 252) << 30;
3145 3141
                 } else {
3146
-                    throw new UnexpectedValueException('This might be UTF-8, but I don\'t understand it at byte '.$k);
3142
+                    throw new UnexpectedValueException('This might be UTF-8, but I don\'t understand it at byte ' . $k);
3147 3143
                 }
3148 3144
                 if ('add' == $mode) {
3149
-                    $output[$out_len] = (int) $v;
3145
+                    $output[$out_len] = (int)$v;
3150 3146
                     ++$out_len;
3151 3147
                     continue;
3152 3148
                 }
@@ -3155,7 +3151,7 @@  discard block
 block discarded – undo
3155 3151
                 if (!$this->_allow_overlong && $test == 'range') {
3156 3152
                     $test = 'none';
3157 3153
                     if (($v < 0xA0 && $start_byte == 0xE0) || ($v < 0x90 && $start_byte == 0xF0) || ($v > 0x8F && $start_byte == 0xF4)) {
3158
-                        throw new OutOfRangeException('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
3154
+                        throw new OutOfRangeException('Bogus UTF-8 character detected (out of legal range) at byte ' . $k);
3159 3155
                     }
3160 3156
                 }
3161 3157
                 if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
@@ -3163,7 +3159,7 @@  discard block
 block discarded – undo
3163 3159
                     $output[($out_len - 1)] += $v;
3164 3160
                     --$next_byte;
3165 3161
                 } else {
3166
-                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
3162
+                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte ' . $k);
3167 3163
                 }
3168 3164
                 if ($next_byte < 0) {
3169 3165
                     $mode = 'next';
@@ -3205,14 +3201,14 @@  discard block
 block discarded – undo
3205 3201
                 // 4 bytes
3206 3202
                 $output .= chr(240 + ($v >> 18))
3207 3203
                     . chr(128 + (($v >> 12) & 63))
3208
-                    . chr(128 + (($v >>  6) & 63))
3204
+                    . chr(128 + (($v >> 6) & 63))
3209 3205
                     . chr(128 + ($v & 63));
3210 3206
             } else if ($v < 1 << 26) {
3211 3207
                 // 5 bytes
3212 3208
                 $output .= chr(248 + ($v >> 24))
3213 3209
                     . chr(128 + (($v >> 18) & 63))
3214 3210
                     . chr(128 + (($v >> 12) & 63))
3215
-                    . chr(128 + (($v >>  6) & 63))
3211
+                    . chr(128 + (($v >> 6) & 63))
3216 3212
                     . chr(128 + ($v & 63));
3217 3213
             } else if ($v < 1 << 31) {
3218 3214
                 // 6 bytes
@@ -3220,7 +3216,7 @@  discard block
 block discarded – undo
3220 3216
                     . chr(128 + (($v >> 24) & 63))
3221 3217
                     . chr(128 + (($v >> 18) & 63))
3222 3218
                     . chr(128 + (($v >> 12) & 63))
3223
-                    . chr(128 + (($v >>  6) & 63))
3219
+                    . chr(128 + (($v >> 6) & 63))
3224 3220
                     . chr(128 + ($v & 63));
3225 3221
             } else {
3226 3222
                 throw new UnexpectedValueException('Conversion from UCS-4 to UTF-8 failed: malformed input');
@@ -3280,7 +3276,7 @@  discard block
 block discarded – undo
3280 3276
                 $out_len++;
3281 3277
                 $output[$out_len] = 0;
3282 3278
             }
3283
-            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
3279
+            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4)));
3284 3280
         }
3285 3281
         return $output;
3286 3282
     }
@@ -3331,7 +3327,7 @@  discard block
 block discarded – undo
3331 3327
         $return = '';
3332 3328
 
3333 3329
         for ($i = $w; $i > -1; $i--) {
3334
-            $return .= ($octet & (1 << $i))? '1' : '0';
3330
+            $return .= ($octet & (1 << $i)) ? '1' : '0';
3335 3331
         }
3336 3332
 
3337 3333
         return $return;
Please login to merge, or discard this patch.
htdocs/lib2/pager.class.php 2 patches
Doc Comments   +10 added lines patch added patch discarded remove patch
@@ -18,6 +18,9 @@  discard block
 block discarded – undo
18 18
     // Use {page} in link_url als placeholder for the selected page number
19 19
     // and/or {offset} for the 0-based data offset of the selected page.
20 20
 
21
+    /**
22
+     * @param string $link_url
23
+     */
21 24
     public function __construct($link_url, $min_pages_shown = 2, $max_pages_shown = 15)
22 25
     {
23 26
         global $tpl;
@@ -31,6 +34,10 @@  discard block
 block discarded – undo
31 34
     }
32 35
 
33 36
 
37
+    /**
38
+     * @param double $current_page
39
+     * @param double $total_pages
40
+     */
34 41
     public function make_from_pagenr($current_page, $total_pages, $page_size = false)
35 42
     {
36 43
         global $tpl;
@@ -94,6 +101,9 @@  discard block
 block discarded – undo
94 101
     }
95 102
 
96 103
 
104
+    /**
105
+     * @param boolean $page_size
106
+     */
97 107
     private function pagelink($page, $page_size)
98 108
     {
99 109
         return mb_ereg_replace(
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
             $to_page = min($last_page, max($first_page, $current_page - $lrspan) + $this->max_pages_shown - 1);
60 60
             $from_page = max($first_page, $to_page - $this->max_pages_shown + 1);
61 61
 
62
-            for ($page = $from_page; $page <= $to_page; $page ++) {
62
+            for ($page = $from_page; $page <= $to_page; $page++) {
63 63
                 if ($page == $current_page) {
64 64
                     $pages[$page] = false;
65 65
                 } else {
Please login to merge, or discard this patch.
htdocs/lib2/translate_filescan.class.php 2 patches
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -76,6 +76,10 @@  discard block
 block discarded – undo
76 76
         }
77 77
     }
78 78
 
79
+    /**
80
+     * @param string $sCode
81
+     * @param integer $nStartSearch
82
+     */
79 83
     public function findEndOfPHPString($sCode, $nStartSearch)
80 84
     {
81 85
         $nEnd = 0;
@@ -116,6 +120,10 @@  discard block
 block discarded – undo
116 120
     }
117 121
 
118 122
     // TODO: performance ... scan once at __construct and store line positions
123
+
124
+    /**
125
+     * @param integer $nPos
126
+     */
119 127
     public function findLineOfPos($nPos)
120 128
     {
121 129
         $nLine = 1;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -120,9 +120,9 @@
 block discarded – undo
120 120
     {
121 121
         $nLine = 1;
122 122
 
123
-        for ($n = 0; $n < $nPos; $n ++) {
123
+        for ($n = 0; $n < $nPos; $n++) {
124 124
             if (substr($this->msContent, $n, 1) == "\n") {
125
-                $nLine ++;
125
+                $nLine++;
126 126
             }
127 127
         }
128 128
 
Please login to merge, or discard this patch.
htdocs/util/notification/run_notify.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -197,6 +197,9 @@
 block discarded – undo
197 197
     return 0;
198 198
 }
199 199
 
200
+/**
201
+ * @param string $domain
202
+ */
200 203
 function is_existent_maildomain($domain)
201 204
 {
202 205
     $smtp_serverlist = [];
Please login to merge, or discard this patch.