OpencachingDeutschland / oc-server3

htdocs/lib2/logic/coordinate.class.php

Doc Comments +10 added lines

@@ -303,6 +303,10 @@ 
         return 'R ' . floor($result[0]) . ' H ' . floor($result[1]);
     }
 
+    /**
+     * @param integer $bw
+     * @param integer $lw
+     */
     public function wgs2pot($bw, $lw)
     {
         /* Copyright (c) 2006, HELMUT H. HEIMEIER
@@ -602,6 +606,9 @@ 
         ];
     }
 
+    /**
+     * @param string $name
+     */
     public static function parseRequestLat($name)
     {
         if (!isset($_REQUEST[$name . 'NS']) || !isset($_REQUEST[$name . 'Lat']) || !isset($_REQUEST[$name . 'LatMin'])) {
@@ -620,6 +627,9 @@ 
         return $lat;
     }
 
+    /**
+     * @param string $name
+     */
     public static function parseRequestLon($name)
     {
         if (!isset($_REQUEST[$name . 'EW']) || !isset($_REQUEST[$name . 'Lon']) || !isset($_REQUEST[$name . 'LonMin'])) {

Spacing +53 added lines, -53 removed lines

@@ -31,15 +31,15 @@ 
     public function getDecimal()
     {
         if ($this->nLat < 0) {
-            $sLat = 'S ' . sprintf('%08.5f', - $this->nLat) . '°';
+            $sLat = 'S '.sprintf('%08.5f', - $this->nLat).'°';
         } else {
-            $sLat = 'N ' . sprintf('%08.5f', $this->nLat) . '°';
+            $sLat = 'N '.sprintf('%08.5f', $this->nLat).'°';
         }
 
         if ($this->nLon < 0) {
-            $sLon = 'W ' . sprintf('%09.5f', - $this->nLon) . '°';
+            $sLon = 'W '.sprintf('%09.5f', - $this->nLon).'°';
         } else {
-            $sLon = 'E ' . sprintf('%09.5f', $this->nLon) . '°';
+            $sLon = 'E '.sprintf('%09.5f', $this->nLon).'°';
         }
 
         return [
@@ -62,9 +62,9 @@ 
         $nLatDeg = floor($nLat);
         $nLatMin = ($nLat - $nLatDeg) * 60;
         if ($bLatN) {
-            $sLat = 'N ' . sprintf("%02d", $nLatDeg) . '° ' . sprintf($minute_format, $nLatMin) . '\'';
+            $sLat = 'N '.sprintf("%02d", $nLatDeg).'° '.sprintf($minute_format, $nLatMin).'\'';
         } else {
-            $sLat = 'S ' . sprintf("%02d", $nLatDeg) . '° ' . sprintf($minute_format, $nLatMin) . '\'';
+            $sLat = 'S '.sprintf("%02d", $nLatDeg).'° '.sprintf($minute_format, $nLatMin).'\'';
         }
 
         // Ocprop: ([E|W].*?)&#039;
@@ -76,9 +76,9 @@ 
         $nLonDeg = floor($nLon);
         $nLonMin = ($nLon - $nLonDeg) * 60;
         if ($bLonE) {
-            $sLon = 'E ' . sprintf("%03d", $nLonDeg) . '° ' . sprintf($minute_format, $nLonMin) . '\'';
+            $sLon = 'E '.sprintf("%03d", $nLonDeg).'° '.sprintf($minute_format, $nLonMin).'\'';
         } else {
-            $sLon = 'W ' . sprintf("%03d", $nLonDeg) . '° ' . sprintf($minute_format, $nLonMin) . '\'';
+            $sLon = 'W '.sprintf("%03d", $nLonDeg).'° '.sprintf($minute_format, $nLonMin).'\'';
         }
 
         return [
@@ -144,8 +144,8 @@ 
             return [
                 'zone' => "",
                 'letter' => "",
-                'north' => 'N ' . 0,
-                'east' => 'E ' . 0
+                'north' => 'N '.0,
+                'east' => 'E '.0
             ];
         }
         if ($this->nLon <= - 180 || $this->nLon > 180 || $this->nLat <= - 80 || $this->nLat >= 84) {
@@ -157,8 +157,8 @@ 
                 0
             ];
         }
-        $lw = (float) $this->nLon;
-        $bw = (float) $this->nLat;
+        $lw = (float)$this->nLon;
+        $bw = (float)$this->nLat;
 
         //WGS84 Datum
         //Große Halbachse a und Abplattung f
@@ -177,9 +177,9 @@ 
 
         //Koeffizienten zur Berechnung der Meridianbogenlänge
         $e0 = $c * (pi() / 180) * (1 - 3 * $ex2 / 4 + 45 * $ex4 / 64 - 175 * $ex6 / 256 + 11025 * $ex8 / 16384);
-        $e2 = $c * (- 3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
+        $e2 = $c * (-3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
         $e4 = $c * (15 * $ex4 / 256 - 105 * $ex6 / 1024 + 2205 * $ex8 / 16384);
-        $e6 = $c * (- 35 * $ex6 / 3072 + 315 * $ex8 / 12288);
+        $e6 = $c * (-35 * $ex6 / 3072 + 315 * $ex8 / 12288);
 
         //Längenzone lz und Breitenzone (Band) bz
         $lzn = intval(($lw + 180) / 6) + 1;
@@ -203,9 +203,9 @@ 
 
         $lz = "$lzn";
         if ($lzn < 10) {
-            $lz = "0" . $lzn;
+            $lz = "0".$lzn;
         }
-        $bd = (int) (1 + ($bw + 80) / 8);
+        $bd = (int)(1 + ($bw + 80) / 8);
         $bz = substr($b_sel, $bd - 1, 1);
 
         //Geographische Breite in Radianten br
@@ -250,29 +250,29 @@ 
         $ew = 0.9996 * ($nd * $cos1 * $dl + $nd * $cos3 * (1 - $tan2 + $etasq) * $dl3 / 6 +
                 $nd * $cos5 * (5 - 18 * $tan2 + $tan4) * $dl5 / 120) + 500000;
 
-        $nk = $nw - (int) $nw;
+        $nk = $nw - (int)$nw;
         if ($nk < 0.5) {
-            $nw = '' . (int) $nw;
+            $nw = ''.(int)$nw;
         } else {
-            $nw = '' . ((int) $nw + 1);
+            $nw = ''.((int)$nw + 1);
         }
 
         while (strlen($nw) < 7) {
-            $nw = '0' . $nw;
+            $nw = '0'.$nw;
         }
 
-        $nk = $ew - (int) $ew;
+        $nk = $ew - (int)$ew;
         if ($nk < 0.5) {
-            $ew = '0' . (int) $ew;
+            $ew = '0'.(int)$ew;
         } else {
-            $ew = '0' . intval($ew + 1);
+            $ew = '0'.intval($ew + 1);
         }
 
         return [
             'zone' => $lz,
             'letter' => $bz,
-            'north' => 'N ' . floor($nw),
-            'east' => 'E ' . floor($ew)
+            'north' => 'N '.floor($nw),
+            'east' => 'E '.floor($ew)
         ];
     }
 
@@ -282,7 +282,7 @@ 
         $pdResult = $this->wgs2pot($this->nLat, $this->nLon);
         $result = $this->geo2gk($pdResult[1], $pdResult[0]);
 
-        return 'R ' . floor($result[0]) . ' H ' . floor($result[1]);
+        return 'R '.floor($result[0]).' H '.floor($result[1]);
     }
 
     public function wgs2pot($bw, $lw)
@@ -313,8 +313,8 @@ 
                 0
             ];
         }
-        $lw = (float) $lw;
-        $bw = (float) $bw;
+        $lw = (float)$lw;
+        $bw = (float)$bw;
 
         // Quellsystem WGS 84 Datum
         // Große Halbachse a und Abplattung fq
@@ -392,8 +392,8 @@ 
                 0
             ];
         }
-        $lp = (float) $lp;
-        $bp = (float) $bp;
+        $lp = (float)$lp;
+        $bp = (float)$bp;
 
         // Potsdam Datum
         // Große Halbachse a und Abplattung f
@@ -411,9 +411,9 @@ 
 
         // Koeffizienten zur Berechnung der Meridianbogenlänge
         $e0 = $c * (pi() / 180) * (1 - 3 * $ex2 / 4 + 45 * $ex4 / 64 - 175 * $ex6 / 256 + 11025 * $ex8 / 16384);
-        $e2 = $c * (- 3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
+        $e2 = $c * (-3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
         $e4 = $c * (15 * $ex4 / 256 - 105 * $ex6 / 1024 + 2205 * $ex8 / 16384);
-        $e6 = $c * (- 35 * $ex6 / 3072 + 315 * $ex8 / 12288);
+        $e6 = $c * (-35 * $ex6 / 3072 + 315 * $ex8 / 12288);
 
         // Breite in Radianten
         $br = $bp * pi() / 180;
@@ -451,18 +451,18 @@ 
         $rw = ($nd * $cos1 * $dl + $nd * $cos3 * (1 - $tan2 + $etasq) * $dl3 / 6 +
             $nd * $cos5 * (5 - 18 * $tan2 + $tan4) * $dl5 / 120 + $kz * 1e6 + 500000);
 
-        $nk = $hw - (int) $hw;
+        $nk = $hw - (int)$hw;
         if ($nk < 0.5) {
-            $hw = (int) $hw;
+            $hw = (int)$hw;
         } else {
-            $hw = ((int) $hw) + 1;
+            $hw = ((int)$hw) + 1;
         }
 
-        $nk = $rw - (int) $rw;
+        $nk = $rw - (int)$rw;
         if ($nk < 0.5) {
-            $rw = (int) $rw;
+            $rw = (int)$rw;
         } else {
-            $rw = (int) ($rw + 1);
+            $rw = (int)($rw + 1);
         }
 
         return [
@@ -481,8 +481,8 @@ 
         $lat_base = 52.15517440;
         $lon_base = 5.38720621;
 
-        for ($i = 0; $i <= 6; $i ++) {
-            for ($j = 0; $j <= 5; $j ++) {
+        for ($i = 0; $i <= 6; $i++) {
+            for ($j = 0; $j <= 5; $j++) {
                 $rpq[$i][$j] = 0;
                 $spq[$i][$j] = 0;
             }
@@ -517,8 +517,8 @@ 
         $xOrigin = 0;
         $yOrigin = 0;
 
-        for ($q = 0; $q <= 5; $q ++) {
-            for ($p = 0; $p <= 6; $p ++) {
+        for ($q = 0; $q <= 5; $q++) {
+            for ($p = 0; $p <= 6; $p++) {
                 $xOrigin = $xOrigin + ($rpq[$p][$q] * ((pow($dlat, $p)) * (pow($dlon, $q))));
                 $yOrigin = $yOrigin + ($spq[$p][$q] * ((pow($dlat, $p)) * (pow($dlon, $q))));
             }
@@ -526,7 +526,7 @@ 
         $xOrigin = $xOrigin + $rdx_base;
         $yOrigin = $yOrigin + $rdy_base;
 
-        return 'X ' . floor($xOrigin) . ' Y ' . floor($yOrigin);
+        return 'X '.floor($xOrigin).' Y '.floor($yOrigin);
     }
 
     // returns string
@@ -586,13 +586,13 @@ 
 
     public static function parseRequestLat($name)
     {
-        if (!isset($_REQUEST[$name . 'NS']) || !isset($_REQUEST[$name . 'Lat']) || !isset($_REQUEST[$name . 'LatMin'])) {
+        if (!isset($_REQUEST[$name.'NS']) || !isset($_REQUEST[$name.'Lat']) || !isset($_REQUEST[$name.'LatMin'])) {
             return false;
         }
 
-        $coordNS = $_REQUEST[$name . 'NS'];
-        $coordLat = $_REQUEST[$name . 'Lat'] + 0;
-        $coordLatMin = str_replace(',', '.', $_REQUEST[$name . 'LatMin']) + 0;
+        $coordNS = $_REQUEST[$name.'NS'];
+        $coordLat = $_REQUEST[$name.'Lat'] + 0;
+        $coordLatMin = str_replace(',', '.', $_REQUEST[$name.'LatMin']) + 0;
 
         $lat = $coordLat + $coordLatMin / 60;
         if ($coordNS == 'S') {
@@ -604,13 +604,13 @@ 
 
     public static function parseRequestLon($name)
     {
-        if (!isset($_REQUEST[$name . 'EW']) || !isset($_REQUEST[$name . 'Lon']) || !isset($_REQUEST[$name . 'LonMin'])) {
+        if (!isset($_REQUEST[$name.'EW']) || !isset($_REQUEST[$name.'Lon']) || !isset($_REQUEST[$name.'LonMin'])) {
             return false;
         }
 
-        $coordEW = $_REQUEST[$name . 'EW'];
-        $coordLon = $_REQUEST[$name . 'Lon'] + 0;
-        $coordLonMin = str_replace(',', '.', $_REQUEST[$name . 'LonMin']) + 0;
+        $coordEW = $_REQUEST[$name.'EW'];
+        $coordLon = $_REQUEST[$name.'Lon'] + 0;
+        $coordLonMin = str_replace(',', '.', $_REQUEST[$name.'LonMin']) + 0;
 
         $lon = $coordLon + $coordLonMin / 60;
         if ($coordEW == 'W') {
@@ -638,8 +638,8 @@ 
             [
                 'http' => [
                     'method' => 'POST',
-                    'header' => "Content-Type: application/x-www-form-urlencoded\r\n" .
-                        "Content-Length: " . strlen($params_str) . "\r\n",
+                    'header' => "Content-Type: application/x-www-form-urlencoded\r\n".
+                        "Content-Length: ".strlen($params_str)."\r\n",
                     'content' => $params_str,
                 ],
             ]

htdocs/lib2/logic/geomath.class.php

Doc Comments +5 added lines

@@ -50,6 +50,11 @@
         }
     }
 
+    /**
+     * @param integer $parShortText
+     *
+     * @return string
+     */
     public static function Bearing2Text($parBearing, $parShortText, $language)
     {
         global $opt, $translate;

Spacing +3 added lines, -3 removed lines

@@ -179,12 +179,12 @@
         $b1_rad = (90 - $latFrom) * 3.14159 / 180;
         $l1_deg = $lonFrom;
 
-        $lonField = '`' . sql_escape_backtick($tableName) . '`.`' . sql_escape_backtick($lonField) . '`';
-        $latField = '`' . sql_escape_backtick($tableName) . '`.`' . sql_escape_backtick($latField) . '`';
+        $lonField = '`'.sql_escape_backtick($tableName).'`.`'.sql_escape_backtick($lonField).'`';
+        $latField = '`'.sql_escape_backtick($tableName).'`.`'.sql_escape_backtick($latField).'`';
 
         $r = 6370 * $distanceMultiplier;
 
-        $retval = 'acos(cos(' . $b1_rad . ') * cos((90-' . $latField . ') * 3.14159 / 180) + sin(' . $b1_rad . ') * sin((90-' . $latField . ') * 3.14159 / 180) * cos((' . $l1_deg . '-' . $lonField . ') * 3.14159 / 180)) * ' . $r;
+        $retval = 'acos(cos('.$b1_rad.') * cos((90-'.$latField.') * 3.14159 / 180) + sin('.$b1_rad.') * sin((90-'.$latField.') * 3.14159 / 180) * cos(('.$l1_deg.'-'.$lonField.') * 3.14159 / 180)) * '.$r;
 
         return $retval;
     }

htdocs/lib2/logic/mailcheck.class.php

Doc Comments +8 added lines

@@ -135,6 +135,11 @@ 
         fclose($fp);
     }
 
+    /**
+     * @param string $sResp
+     *
+     * @return string
+     */
     public function extract_return_code($sResp)
     {
         $nPos1 = strpos($sResp, ' ');
@@ -157,6 +162,9 @@ 
         return substr($sResp, 0, $nPos);
     }
 
+    /**
+     * @param string $out
+     */
     public function send_command($fp, $out)
     {
         fwrite($fp, $out . "\r\n");

Spacing +9 added lines, -9 removed lines

@@ -22,7 +22,7 @@ 
     public $sFrom = 'postmaster@somehost.org';
 
     public $nConnectTimeout = 15; // (sec)
-    public $nReadTimeout = 25;   // (sec)
+    public $nReadTimeout = 25; // (sec)
 
     /* check if the mailserver of $sAddress
      * explicit says that the user does not exist
@@ -50,7 +50,7 @@ 
 
         // sort MX records
         $mxs = [];
-        for ($i = 0; $i < count($mx_records); $i ++) {
+        for ($i = 0; $i < count($mx_records); $i++) {
             $mxs[$i] = [
                 'mx' => $mx_records[$i],
                 'prio' => $mx_weight[$i]
@@ -60,7 +60,7 @@ 
         reset($mxs);
 
         // check address with each MX until one mailserver can be connected
-        for ($i = 0; $i < count($mxs); $i ++) {
+        for ($i = 0; $i < count($mxs); $i++) {
             $retval = $this->pCheckAddress($sAddress, $mxs[$i]['mx']);
             if ($retval != CA_ERROR_CONNECT) {
                 return $retval;
@@ -92,7 +92,7 @@ 
             return CA_ERROR_CONNECT;
         }
 
-        $sResp = $this->send_command($fp, "HELO " . $this->sHostname);
+        $sResp = $this->send_command($fp, "HELO ".$this->sHostname);
         $sCode = $this->extract_return_code($sResp);
         if ($sCode != '220') {
             $this->close($fp);
@@ -100,7 +100,7 @@ 
             return CA_ERROR_UNKOWN;
         }
 
-        $sResp = $this->send_command($fp, "MAIL FROM: <" . $this->sFrom . ">");
+        $sResp = $this->send_command($fp, "MAIL FROM: <".$this->sFrom.">");
         $sCode = $this->extract_return_code($sResp);
         if ($sCode != '250') {
             $this->close($fp);
@@ -108,7 +108,7 @@ 
             return CA_ERROR_UNKOWN;
         }
 
-        $sResp = $this->send_command($fp, "RCPT TO: <" . $sAddress . ">");
+        $sResp = $this->send_command($fp, "RCPT TO: <".$sAddress.">");
         $sCode = $this->extract_return_code($sResp);
         if (strlen($sCode) == 3 && substr($sCode, 0, 1) == '4') {
             $this->close($fp);
@@ -159,7 +159,7 @@ 
 
     public function send_command($fp, $out)
     {
-        fwrite($fp, $out . "\r\n");
+        fwrite($fp, $out."\r\n");
 
         return $this->get_data($fp);
     }
@@ -169,7 +169,7 @@ 
         $s = "";
         stream_set_timeout($fp, $this->nReadTimeout);
 
-        for ($i = 0; $i < 2; $i ++) {
+        for ($i = 0; $i < 2; $i++) {
             $s .= fgets($fp, 1024);
         }
 
@@ -183,5 +183,5 @@ 
         return 0;
     }
 
-    return (($a['prio'] + 0) < ($b['prio'] + 0)) ? - 1 : 1;
+    return (($a['prio'] + 0) < ($b['prio'] + 0)) ? -1 : 1;
 }

htdocs/lib2/logic/picture.class.php

Doc Comments +27 added lines

@@ -102,6 +102,9 @@ 
         }
     }
 
+    /**
+     * @param string $sFilename
+     */
     public function setFilenames($sFilename)
     {
         global $opt;
@@ -129,6 +132,9 @@ 
         return $this->nPictureId;
     }
 
+    /**
+     * @param boolean $bRestoring
+     */
     private function setArchiveFlag($bRestoring, $original_id = 0)
     {
         global $login;
@@ -175,11 +181,17 @@ 
         sql_slave("SET @original_picid=0");
     }
 
+    /**
+     * @return string
+     */
     public function getUrl()
     {
         return $this->rePicture->getValue('url');
     }
 
+    /**
+     * @param string $value
+     */
     public function setUrl($value)
     {
         return $this->rePicture->setValue('url', $value);
@@ -224,6 +236,9 @@ 
         return $this->rePicture->getValue('local') != 0;
     }
 
+    /**
+     * @param integer $value
+     */
     public function setLocal($value)
     {
         return $this->rePicture->setValue('local', $value ? 1 : 0);
@@ -292,6 +307,9 @@ 
         return $opt['logic']['pictures']['thumb_dir'] . $dir1 . '/' . $dir2 . '/' . $filename;
     }
 
+    /**
+     * @return string
+     */
     public function getLogId()
     {
         if ($this->getObjectType() == OBJECT_CACHELOG) {
@@ -328,6 +346,9 @@ 
         return $firstlogs;
     }
 
+    /**
+     * @return string
+     */
     public function getCacheId()
     {
         if ($this->getObjectType() == OBJECT_CACHELOG) {
@@ -491,6 +512,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $filename
+     */
     private function deleted_filename($filename)
     {
         $fna = mb_split('\\/', $filename);
@@ -648,6 +672,9 @@ 
         return move_uploaded_file($tmpFile, $this->getFilename());
     }
 
+    /**
+     * @param Imagick $image
+     */
     public function imagick_rotate(&$image)
     {
         $exif = $image->getImageProperties();

Spacing +14 added lines, -14 removed lines

@@ -8,7 +8,7 @@ 
  *   add/remove etc. is executed instantly
  ***************************************************************************/
 
-require_once __DIR__ . '/const.inc.php';
+require_once __DIR__.'/const.inc.php';
 
 class picture
 {
@@ -95,7 +95,7 @@ 
 
         $sExtension = mb_strtolower(substr($sFilename, strrpos($sFilename, '.') + 1));
 
-        if (strpos(';' . $opt['logic']['pictures']['extensions'] . ';', ';' . $sExtension . ';') !== false) {
+        if (strpos(';'.$opt['logic']['pictures']['extensions'].';', ';'.$sExtension.';') !== false) {
             return true;
         } else {
             return false;
@@ -118,7 +118,7 @@ 
 
         $sUUID = $this->getUUID();
 
-        $this->setUrl($opt['logic']['pictures']['url'] . $sUUID . '.' . $sExtension);
+        $this->setUrl($opt['logic']['pictures']['url'].$sUUID.'.'.$sExtension);
         //$this->setThumbUrl($opt['logic']['pictures']['thumb_url'] . substr($sUUID, 0, 1) . '/' . substr($sUUID, 1, 1) . '/' . $sUUID . '.' . $sExtension);
 
         $this->bFilenamesSet = true;
@@ -158,8 +158,8 @@ 
             $archive = true;
         }
 
-        sql("SET @archive_picop=" . ($archive ? "TRUE" : "FALSE"));
-        sql_slave("SET @archive_picop=" . ($archive ? "TRUE" : "FALSE"));
+        sql("SET @archive_picop=".($archive ? "TRUE" : "FALSE"));
+        sql_slave("SET @archive_picop=".($archive ? "TRUE" : "FALSE"));
 
         sql("SET @original_picid='&1'", $original_id);
         sql_slave("SET @original_picid='&1'", $original_id);
@@ -271,7 +271,7 @@ 
         $url = $this->getUrl();
         $fna = mb_split('\\/', $url);
 
-        return $opt['logic']['pictures']['dir'] . end($fna);
+        return $opt['logic']['pictures']['dir'].end($fna);
     }
 
     public function getThumbFilename()
@@ -289,7 +289,7 @@ 
         $dir1 = mb_strtoupper(mb_substr($filename, 0, 1));
         $dir2 = mb_strtoupper(mb_substr($filename, 1, 1));
 
-        return $opt['logic']['pictures']['thumb_dir'] . $dir1 . '/' . $dir2 . '/' . $filename;
+        return $opt['logic']['pictures']['thumb_dir'].$dir1.'/'.$dir2.'/'.$filename;
     }
 
     public function getLogId()
@@ -435,9 +435,9 @@ 
                 return false;
             } else {
                 // restore picture file
-                $this->setUrl($original_url);        // set the url, so that we can
-                $filename = $this->getFilename();    // .. retreive the file path+name
-                $this->setFilenames($filename);      // now set url(s) from the new uuid
+                $this->setUrl($original_url); // set the url, so that we can
+                $filename = $this->getFilename(); // .. retreive the file path+name
+                $this->setFilenames($filename); // now set url(s) from the new uuid
                 try {
                     rename($this->deleted_filename($filename), $this->getFilename());
                 } catch (Exception $e) {
@@ -514,7 +514,7 @@ 
         $fna[count($fna) - 2] = 'deleted';
         $dp = "";
         foreach ($fna as $fp) {
-            $dp .= "/" . $fp;
+            $dp .= "/".$fp;
         }
 
         return substr($dp, 1);
@@ -538,13 +538,13 @@ 
     public function getPageLink()
     {
         if ($this->getObjectType() == OBJECT_CACHELOG) {
-            $pl = 'viewcache.php?cacheid=' . urlencode($this->getCacheId());
+            $pl = 'viewcache.php?cacheid='.urlencode($this->getCacheId());
             if (!$this->isVisibleOnCachePage()) {
                 $pl .= "&log=A";
             }
-            $pl .= "#log" . urlencode($this->getLogId());
+            $pl .= "#log".urlencode($this->getLogId());
         } elseif ($this->getObjectType() == OBJECT_CACHE) {
-            $pl = 'editcache.php?cacheid=' . urlencode($this->getCacheId()) . '#pictures';
+            $pl = 'editcache.php?cacheid='.urlencode($this->getCacheId()).'#pictures';
         } else {
             $pl = false;
         }

htdocs/lib2/logic/sitemapxml.class.php

Doc Comments +8 added lines

@@ -46,6 +46,11 @@ 
     /* sChaneFreq = {always, hourly, daily, weekly, monthly, yearly, never}
      * nPriority  = {0.0 to 1.0}
      */
+
+    /**
+     * @param string $sFile
+     * @param integer $dLastMod
+     */
     public function write($sFile, $dLastMod, $sChangeFreq = false, $nPriority = 0.5)
     {
         if ($sChangeFreq == false) {
@@ -62,6 +67,9 @@ 
         $this->writeInternal($sXML);
     }
 
+    /**
+     * @param string $str
+     */
     public function writeInternal($str)
     {
         global $opt;

Spacing +13 added lines, -13 removed lines

@@ -12,7 +12,7 @@ 
 {
     public $sDefaultChangeFreq = 'monthly';
     public $nMaxFileSize = 9961472; // max file size, 10MB by specification
-    public $nMaxUrlCount = 50000;   // max number of URLs per file, 50000 by specification
+    public $nMaxUrlCount = 50000; // max number of URLs per file, 50000 by specification
 
     public $sPath = '';
     public $sDomain = '';
@@ -34,12 +34,12 @@ 
         $this->sPath = $sPath;
         $this->sDomain = $sDomain;
 
-        $this->oIndexFile = fopen($sPath . 'sitemap.xml', 'w');
+        $this->oIndexFile = fopen($sPath.'sitemap.xml', 'w');
         if ($this->oIndexFile === false) {
             return false;
         }
 
-        fwrite($this->oIndexFile, '<?xml version="1.0" encoding="UTF-8"?>' . "\n");
+        fwrite($this->oIndexFile, '<?xml version="1.0" encoding="UTF-8"?>'."\n");
         fwrite($this->oIndexFile, '<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">');
     }
 
@@ -53,10 +53,10 @@ 
         }
 
         $sXML = '<url>';
-        $sXML .= '<loc>' . xmlentities($this->sDomain . $sFile) . '</loc>';
-        $sXML .= '<lastmod>' . xmlentities(date('c', $dLastMod)) . '</lastmod>';
-        $sXML .= '<changefreq>' . xmlentities($sChangeFreq) . '</changefreq>';
-        $sXML .= '<priority>' . xmlentities($nPriority) . '</priority>';
+        $sXML .= '<loc>'.xmlentities($this->sDomain.$sFile).'</loc>';
+        $sXML .= '<lastmod>'.xmlentities(date('c', $dLastMod)).'</lastmod>';
+        $sXML .= '<changefreq>'.xmlentities($sChangeFreq).'</changefreq>';
+        $sXML .= '<priority>'.xmlentities($nPriority).'</priority>';
         $sXML .= '</url>';
 
         $this->writeInternal($sXML);
@@ -75,13 +75,13 @@ 
 
         // open new XML file?
         if ($this->oSitemapFile === false) {
-            $this->nSitemapIndex ++;
-            $sFilename = 'sitemap-' . $this->nSitemapIndex . '.xml.gz';
-            $this->oSitemapFile = gzopen($this->sPath . $sFilename, 'wb');
+            $this->nSitemapIndex++;
+            $sFilename = 'sitemap-'.$this->nSitemapIndex.'.xml.gz';
+            $this->oSitemapFile = gzopen($this->sPath.$sFilename, 'wb');
 
-            fwrite($this->oIndexFile, '<sitemap><loc>' . xmlentities($this->sDomain . $sFilename) . '</loc><lastmod>' . xmlentities(date('c')) . '</lastmod></sitemap>');
+            fwrite($this->oIndexFile, '<sitemap><loc>'.xmlentities($this->sDomain.$sFilename).'</loc><lastmod>'.xmlentities(date('c')).'</lastmod></sitemap>');
 
-            gzwrite($this->oSitemapFile, '<?xml version="1.0" encoding="UTF-8"?>' . "\n");
+            gzwrite($this->oSitemapFile, '<?xml version="1.0" encoding="UTF-8"?>'."\n");
             gzwrite($this->oSitemapFile, '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">');
             // includes end of xml-tag
             $this->nWrittenSize = 108;
@@ -91,7 +91,7 @@ 
         // write string to XML
         gzwrite($this->oSitemapFile, $str);
         $this->nWrittenSize += strlen($str);
-        $this->nWrittenCount ++;
+        $this->nWrittenCount++;
     }
 
     public function close()

htdocs/lib2/logic/user.class.php

Doc Comments +36 added lines

@@ -143,6 +143,9 @@ 
         return $this->reUser->getValue('username');
     }
 
+    /**
+     * @param string $value
+     */
     public function setUsername($value)
     {
         if (!mb_ereg_match(REGEX_USERNAME, $value)) {
@@ -210,6 +213,9 @@ 
         return $this->reUser->getValue('first_name');
     }
 
+    /**
+     * @param string $value
+     */
     public function setFirstName($value)
     {
         if ($value != '') {
@@ -226,6 +232,9 @@ 
         return $this->reUser->getValue('last_name');
     }
 
+    /**
+     * @param string $value
+     */
     public function setLastName($value)
     {
         if ($value != '') {
@@ -275,6 +284,9 @@ 
         return $this->reUser->getValue('latitude');
     }
 
+    /**
+     * @param double $value
+     */
     public function setLatitude($value)
     {
         if (($value + 0) > 90 || ($value + 0) < - 90) {
@@ -289,6 +301,9 @@ 
         return $this->reUser->getValue('longitude');
     }
 
+    /**
+     * @param double $value
+     */
     public function setLongitude($value)
     {
         if (($value + 0) > 180 || ($value + 0) < - 180) {
@@ -303,6 +318,9 @@ 
         return $this->reUser->getValue('notify_radius');
     }
 
+    /**
+     * @param integer $value
+     */
     public function setNotifyRadius($value)
     {
         if (($value + 0) < 0 || ($value + 0) > 150) {
@@ -317,6 +335,9 @@ 
         return $this->reUser->getValue('notify_oconly') != 0;
     }
 
+    /**
+     * @param boolean $value
+     */
     public function setNotifyOconly($value)
     {
         return $this->reUser->setValue('notify_oconly', $value ? 1 : 0);
@@ -397,6 +418,9 @@ 
         return $this->reUser->getValue('new_pw_code');
     }
 
+    /**
+     * @param string|null $value
+     */
     public function setNewPWCode($value)
     {
         return $this->reUser->setValue('new_pw_code', $value);
@@ -407,6 +431,9 @@ 
         return $this->reUser->getValue('new_pw_date');
     }
 
+    /**
+     * @param integer|null $value
+     */
     public function setNewPWDate($value)
     {
         return $this->reUser->setValue('new_pw_date', $value);
@@ -417,6 +444,9 @@ 
         return $this->reUser->getValue('new_email_code');
     }
 
+    /**
+     * @param string|null $value
+     */
     public function setNewEMailCode($value)
     {
         return $this->reUser->setValue('new_email_code', $value);
@@ -427,6 +457,9 @@ 
         return $this->reUser->getValue('new_email_date');
     }
 
+    /**
+     * @param integer|null $value
+     */
     public function setNewEMailDate($value)
     {
         return $this->reUser->setValue('new_email_date', $value);
@@ -493,6 +526,9 @@ 
         return $this->reUser->getValue('watchmail_nextmail');
     }
 
+    /**
+     * @param string $value
+     */
     public function setWatchmailNext($value)
     {
         return $this->reUser->setValue('watchmail_nextmail', $value);

Spacing +21 added lines, -21 removed lines

@@ -8,8 +8,8 @@ 
  *   add/remove etc. is executed instantly
  ***************************************************************************/
 
-require_once __DIR__ . '/cracklib.inc.php';
-require_once __DIR__ . '/../translate.class.php';
+require_once __DIR__.'/cracklib.inc.php';
+require_once __DIR__.'/../translate.class.php';
 
 class user
 {
@@ -760,8 +760,8 @@ 
         $mail->to = $this->getEMail();
         $mail->subject = $translate->t('Registration confirmation', '', basename(__FILE__), __LINE__);
         $mail->assign('domain', $opt['page']['domain']);
-        $mail->assign('activation_page', $opt['page']['absolute_url'] . 'activation.php');
-        $mail->assign('short_activation_page', $opt['page']['absolute_url'] . 'a.php');
+        $mail->assign('activation_page', $opt['page']['absolute_url'].'activation.php');
+        $mail->assign('short_activation_page', $opt['page']['absolute_url'].'a.php');
         $mail->assign('username', $this->getUsername());
         $mail->assign('userid', $this->getUserId());
         $mail->assign('last_name', $this->getLastName());
@@ -834,7 +834,7 @@ 
             $mail->returnPath = $fromUser->getEMail();
         }
 
-        $mail->subject = $translate->t('E-Mail from', '', basename(__FILE__), __LINE__, '', 1, $language) . ' ' . $fromUser->getUsername() . ': ' . $sSubject;
+        $mail->subject = $translate->t('E-Mail from', '', basename(__FILE__), __LINE__, '', 1, $language).' '.$fromUser->getUsername().': '.$sSubject;
         $mail->assign('usersubject', $sSubject);
         $mail->assign('text', $sText);
         $mail->assign('username', $this->getUsername());
@@ -906,7 +906,7 @@ 
             $login->userid,
             $this->nUserId,
             0,
-            'User ' . sql_escape($this->getUsername()) . ' disabled',
+            'User '.sql_escape($this->getUsername()).' disabled',
             serialize($backup)
         );
 
@@ -1026,9 +1026,9 @@ 
         if ($num_caches > 0) {
             $cache_descs = array();
             $rs = sql(
-                "SELECT `id`, `language`, `desc`, `hint` " .
-                "FROM `cache_desc`,`caches` " .
-                "WHERE `caches`.`cache_id`=`cache_desc`.`cache_id` " .
+                "SELECT `id`, `language`, `desc`, `hint` ".
+                "FROM `cache_desc`,`caches` ".
+                "WHERE `caches`.`cache_id`=`cache_desc`.`cache_id` ".
                 "AND `caches`.`user_id`='&1'",
                 $this->getUserId()
             );
@@ -1073,10 +1073,10 @@ 
                 }
 
                 sql(
-                    "UPDATE `cache_desc` " .
-                    "SET `desc`='&1',`hint`='&2' " .
+                    "UPDATE `cache_desc` ".
+                    "SET `desc`='&1',`hint`='&2' ".
                     "WHERE `id`='&3'",
-                    "<em>" . $descmsg . "</em>",
+                    "<em>".$descmsg."</em>",
                     '',
                     $desc['id']
                 );
@@ -1175,7 +1175,7 @@ 
         global $opt;
 
         // load bmp-support
-        require_once $opt['rootpath'] . 'lib2/imagebmp.inc.php';
+        require_once $opt['rootpath'].'lib2/imagebmp.inc.php';
 
         // paths cleared by trailing '/'
         if (substr($opt['logic']['pictures']['dir'], - 1) != '/') {
@@ -1221,18 +1221,18 @@ 
          */
         if ($object_type == OBJECT_CACHE) {// get filenames of the pictures of $this' caches
             $rs = sql(
-                "SELECT `pictures`.`url` " .
-                "FROM `pictures`,`caches` " .
-                "WHERE `caches`.`cache_id`=`pictures`.`object_id`" .
+                "SELECT `pictures`.`url` ".
+                "FROM `pictures`,`caches` ".
+                "WHERE `caches`.`cache_id`=`pictures`.`object_id`".
                 " AND `pictures`.`object_type`='&1' AND `caches`.`user_id`='&2'",
                 OBJECT_CACHE,
                 $this->getUserId()
             );
         } elseif ($object_type == OBJECT_CACHELOG) {// get filenames of the pictures of $this' logs
             $rs = sql(
-                "SELECT `pictures`.`url` " .
-                "FROM `pictures`,`cache_logs` " .
-                "WHERE `cache_logs`.`id`=`pictures`.`object_id`" .
+                "SELECT `pictures`.`url` ".
+                "FROM `pictures`,`cache_logs` ".
+                "WHERE `cache_logs`.`id`=`pictures`.`object_id`".
                 " AND `pictures`.`object_type`='&1' AND `cache_logs`.`user_id`='&2'",
                 OBJECT_CACHELOG,
                 $this->getUserId()
@@ -1284,7 +1284,7 @@ 
 
                 // check for replacement-image
                 if ($pdummy && isset($opt['logic']['pictures']['dummy']['replacepic'])
-                    && $opt['logic']['pictures']['dummy']['replacepic'] != $opt['rootpath'] . 'images/'
+                    && $opt['logic']['pictures']['dummy']['replacepic'] != $opt['rootpath'].'images/'
                     && file_exists($opt['logic']['pictures']['dummy']['replacepic'])
                 ) {
 
@@ -1460,7 +1460,7 @@ 
             $login->userid,
             $this->nUserId,
             0,
-            'User ' . sql_escape($this->getUsername()) . ' deleted',
+            'User '.sql_escape($this->getUsername()).' deleted',
             serialize($backup)
         );
 

Braces +4 added lines, -2 removed lines

@@ -1219,7 +1219,8 @@ 
         /*
          * check log or cache
          */
-        if ($object_type == OBJECT_CACHE) {// get filenames of the pictures of $this' caches
+        if ($object_type == OBJECT_CACHE) {
+// get filenames of the pictures of $this' caches
             $rs = sql(
                 "SELECT `pictures`.`url` " .
                 "FROM `pictures`,`caches` " .
@@ -1228,7 +1229,8 @@ 
                 OBJECT_CACHE,
                 $this->getUserId()
             );
-        } elseif ($object_type == OBJECT_CACHELOG) {// get filenames of the pictures of $this' logs
+        } elseif ($object_type == OBJECT_CACHELOG) {
+// get filenames of the pictures of $this' logs
             $rs = sql(
                 "SELECT `pictures`.`url` " .
                 "FROM `pictures`,`cache_logs` " .

htdocs/lib2/mail.class.php

Doc Comments +6 added lines

@@ -130,6 +130,9 @@ 
         return mb_send_mail($this->to, $opt['mail']['subject'] . $this->subject, $body, $mailheaders);
     }
 
+    /**
+     * @param string $domain
+     */
     public static function is_existent_maildomain($domain)
     {
         if ($domain == "localhost") {
@@ -154,6 +157,9 @@ 
         return false;
     }
 
+    /**
+     * @param string $mail
+     */
     public static function getToMailDomain($mail)
     {
         if ($mail == '') {

Spacing +11 added lines, -11 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__. '/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 class mail extends Smarty
 {
@@ -29,11 +29,11 @@ 
 
         global $opt;
 
-        $this->template_dir = $opt['rootpath'] . 'templates2/mail/';
-        $this->compile_dir = $opt['rootpath'] . 'cache2/smarty/compiled/';
+        $this->template_dir = $opt['rootpath'].'templates2/mail/';
+        $this->compile_dir = $opt['rootpath'].'cache2/smarty/compiled/';
         $this->plugins_dir = [
             'plugins',
-            __DIR__ . '/../src/Oc/SmartyPlugins'
+            __DIR__.'/../src/Oc/SmartyPlugins'
         ];
 
         // disable caching ...
@@ -54,7 +54,7 @@ 
     {
         global $opt;
 
-        return 'mail|' . $opt['template']['locale'] . '|' . $this->compile_id;
+        return 'mail|'.$opt['template']['locale'].'|'.$this->compile_id;
     }
 
     public function assign_rs($name, $rs)
@@ -70,7 +70,7 @@ 
     {
         global $tpl, $opt;
 
-        if (!$this->template_exists($this->name . '.tpl')) {
+        if (!$this->template_exists($this->name.'.tpl')) {
             $tpl->error(ERROR_MAIL_TEMPLATE_NOT_FOUND);
         }
         $this->assign('template', $this->name);
@@ -100,7 +100,7 @@ 
             set_php_locale();
         }
 
-        $body = $this->fetch($this->main_template . '.tpl', '', $this->get_compile_id());
+        $body = $this->fetch($this->main_template.'.tpl', '', $this->get_compile_id());
 
         if ($this->recipient_locale != $sender_locale) {
             $opt['template']['locale'] = $sender_locale;
@@ -115,19 +115,19 @@ 
         }
 
         $aAddHeaders = array();
-        $aAddHeaders[] = 'From: "' . $this->from . '" <' . $this->from . '>';
+        $aAddHeaders[] = 'From: "'.$this->from.'" <'.$this->from.'>';
 
         if ($this->replyTo !== null) {
-            $aAddHeaders[] = 'Reply-To: ' . $this->replyTo;
+            $aAddHeaders[] = 'Reply-To: '.$this->replyTo;
         }
 
         if ($this->returnPath !== null) {
-            $aAddHeaders[] = 'Return-Path: ' . $this->returnPath;
+            $aAddHeaders[] = 'Return-Path: '.$this->returnPath;
         }
 
         $mailheaders = implode("\n", array_merge($aAddHeaders, $this->headers));
 
-        return mb_send_mail($this->to, $opt['mail']['subject'] . $this->subject, $body, $mailheaders);
+        return mb_send_mail($this->to, $opt['mail']['subject'].$this->subject, $body, $mailheaders);
     }
 
     public static function is_existent_maildomain($domain)

htdocs/lib2/menu.class.php

Doc Comments +3 added lines

@@ -245,6 +245,9 @@
         return $retval;
     }
 
+    /**
+     * @param integer|null $menuid
+     */
     public function pAppendSubMenu($menuid, $ids, &$items)
     {
         global $menuitem, $login;

Spacing +13 added lines, -13 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once $opt['rootpath'] . 'lib2/translate.class.php';
+require_once $opt['rootpath'].'lib2/translate.class.php';
 
 define('AUTH_LEVEL_ALL', 0);
 define('AUTH_LEVEL_ADMIN', '2');
@@ -22,7 +22,7 @@ 
     {
         global $opt, $login, $build_map_towns_menu;
 
-        $this->sMenuFilename = $opt['rootpath'] . 'cache2/menu-' . $opt['template']['locale'] . '.inc.php';
+        $this->sMenuFilename = $opt['rootpath'].'cache2/menu-'.$opt['template']['locale'].'.inc.php';
 
         if (!file_exists($this->sMenuFilename)) {
             $this->CreateCacheFile();
@@ -34,7 +34,7 @@ 
         // add country-dependent town list for small map
         $country = $login->getUserCountry();
         if ($opt['map']['towns']['enable'] &&
-            isset($build_map_towns_menu) && $build_map_towns_menu &&   // optimization
+            isset($build_map_towns_menu) && $build_map_towns_menu && // optimization
             isset($opt['map']['towns'][$country]['enable']) && $opt['map']['towns'][$country]['enable']
         ) {
             $rsTowns = sqlf(
@@ -67,13 +67,13 @@ 
                         'title' => $rTown['name'],
                         'menustring' => $rTown['name'],
                         'authlevel' => 0,
-                        'href' => 'map2.php?mode=normalscreen&lat=' . $rTown['coord_lat'] . '&lon=' . $rTown['coord_long'] . '&zoom=' . $zoom,
+                        'href' => 'map2.php?mode=normalscreen&lat='.$rTown['coord_lat'].'&lon='.$rTown['coord_long'].'&zoom='.$zoom,
                         'visible' => 1,
                         'sublevel' => 1,
                         'parent' => MNU_MAP
                     ];
                     $menuitem[MNU_MAP]['subitems'][] = $menu_map;
-                    ++ $menu_map;
+                    ++$menu_map;
                 }
             }
         }
@@ -85,12 +85,12 @@ 
 
         $f = fopen($this->sMenuFilename, 'w');
         fwrite($f, "<?php\n");
-        fwrite($f, 'global $menuitem;' . "\n");
+        fwrite($f, 'global $menuitem;'."\n");
         fwrite($f, "\n");
 
         $rsDefines = sqlf("SELECT `id`, `id_string` FROM `sys_menu`");
         while ($rDefine = sql_fetch_assoc($rsDefines)) {
-            fwrite($f, 'if (!defined(\'' . addslashes($rDefine['id_string']) . '\')) define(\'' . addslashes($rDefine['id_string']) . '\', ' . $rDefine['id'] . ");\n");
+            fwrite($f, 'if (!defined(\''.addslashes($rDefine['id_string']).'\')) define(\''.addslashes($rDefine['id_string']).'\', '.$rDefine['id'].");\n");
         }
         sql_free_result($rsDefines);
         fwrite($f, "\n");
@@ -100,7 +100,7 @@ 
         $rsSubmenu = sqlf("SELECT `id` FROM `sys_menu` WHERE `parent`=0 ORDER BY `parent` ASC, `position` ASC");
         while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
             $aMenu[MNU_ROOT]['subitems'][$nPos] = $rSubmenu['id'];
-            $nPos ++;
+            $nPos++;
         }
         sql_free_result($rsSubmenu);
         fwrite($f, "\n");
@@ -137,13 +137,13 @@ 
             );
             while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
                 $aMenu[$r['id']]['subitems'][$nPos] = $rSubmenu['id'];
-                $nPos ++;
+                $nPos++;
             }
             sql_free_result($rsSubmenu);
         }
         sql_free_result($rs);
 
-        fwrite($f, '$menuitem = unserialize("' . str_replace('"', '\\"', serialize($aMenu)) . '");' . "\n");
+        fwrite($f, '$menuitem = unserialize("'.str_replace('"', '\\"', serialize($aMenu)).'");'."\n");
 
         fwrite($f, "?>");
         fclose($f);
@@ -153,12 +153,12 @@ 
     {
         global $opt;
 
-        $dir = $opt['rootpath'] . 'cache2/';
+        $dir = $opt['rootpath'].'cache2/';
         if ($dh = opendir($dir)) {
             while (($file = readdir($dh)) !== false) {
-                if (filetype($dir . $file) == 'file') {
+                if (filetype($dir.$file) == 'file') {
                     if (preg_match('/^menu-[a-z]{2,2}.inc.php/', $file)) {
-                        unlink($dir . $file);
+                        unlink($dir.$file);
                     }
                 }
             }

htdocs/lib2/Net/IDNA2.php

Doc Comments +4 added lines, -4 removed lines

@@ -2760,7 +2760,7 @@ 
      *
      * @param int $d One digit to encode
      *
-     * @return char  Encoded digit
+     * @return string  Encoded digit
      * @access private
      */
     private function _encodeDigit($d)
@@ -2771,7 +2771,7 @@ 
     /**
      * Decode a certain digit.
      *
-     * @param char $cp One digit (character) to decode
+     * @param string $cp One digit (character) to decode
      *
      * @return int     Decoded digit
      * @access private
@@ -2785,7 +2785,7 @@ 
     /**
      * Do Nameprep according to RFC3491 and RFC3454.
      *
-     * @param array $input Unicode Characters
+     * @param string $input Unicode Characters
      *
      * @return string      Unicode Characters, Nameprep'd
      * @throws Exception
@@ -2885,7 +2885,7 @@ 
      *
      * @param integer $char 32bit UCS4 code point
      *
-     * @return array        Either Hangul Syllable decomposed or original 32bit
+     * @return integer[]        Either Hangul Syllable decomposed or original 32bit
      *                      value as one value array
      * @access private
      */

Switch Indentation +79 added lines, -79 removed lines

@@ -2273,38 +2273,38 @@ 
 
         foreach ($option as $k => $v) {
             switch ($k) {
-            case 'encoding':
-                switch ($v) {
-                case 'utf8':
-                case 'ucs4_string':
-                case 'ucs4_array':
-                    $this->_api_encoding = $v;
-                    break;
+                case 'encoding':
+                    switch ($v) {
+                        case 'utf8':
+                        case 'ucs4_string':
+                        case 'ucs4_array':
+                            $this->_api_encoding = $v;
+                            break;
 
-                default:
-                    throw new InvalidArgumentException('Set Parameter: Unknown parameter '.$v.' for option '.$k);
-                }
+                        default:
+                            throw new InvalidArgumentException('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                    }
 
                 break;
 
-            case 'overlong':
-                $this->_allow_overlong = ($v) ? true : false;
-                break;
+                case 'overlong':
+                    $this->_allow_overlong = ($v) ? true : false;
+                    break;
 
-            case 'strict':
-                $this->_strict_mode = ($v) ? true : false;
-                break;
+                case 'strict':
+                    $this->_strict_mode = ($v) ? true : false;
+                    break;
 
-            case 'version':
-                if (in_array($v, array('2003', '2008'))) {
-                    $this->_version = $v;
-                } else {
-                    throw new InvalidArgumentException('Set Parameter: Invalid parameter '.$v.' for option '.$k);
-                }
-                break;
+                case 'version':
+                    if (in_array($v, array('2003', '2008'))) {
+                        $this->_version = $v;
+                    } else {
+                        throw new InvalidArgumentException('Set Parameter: Invalid parameter '.$v.' for option '.$k);
+                    }
+                    break;
 
-            default:
-                return false;
+                default:
+                    return false;
             }
         }
 
@@ -2328,15 +2328,15 @@ 
         // Forcing conversion of input to UCS4 array
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            $decoded = $this->_utf8_to_ucs4($decoded);
-            break;
-        case 'ucs4_string':
-            $decoded = $this->_ucs4_string_to_ucs4($decoded);
-        case 'ucs4_array': // No break; before this line. Catch case, but do nothing
-            break;
-        default:
-            throw new InvalidArgumentException('Unsupported input format');
+            case 'utf8':
+                $decoded = $this->_utf8_to_ucs4($decoded);
+                break;
+            case 'ucs4_string':
+                $decoded = $this->_ucs4_string_to_ucs4($decoded);
+            case 'ucs4_array': // No break; before this line. Catch case, but do nothing
+                break;
+            default:
+                throw new InvalidArgumentException('Unsupported input format');
         }
 
         // No input, no output, what else did you expect?
@@ -2350,35 +2350,35 @@ 
         foreach ($decoded as $k => $v) {
             // Make sure to use just the plain dot
             switch($v) {
-            case 0x3002:
-            case 0xFF0E:
-            case 0xFF61:
-                $decoded[$k] = 0x2E;
-                // It's right, no break here
-                // The codepoints above have to be converted to dots anyway
-
-            // Stumbling across an anchoring character
-            case 0x2E:
-            case 0x2F:
-            case 0x3A:
-            case 0x3F:
-            case 0x40:
-                // Neither email addresses nor URLs allowed in strict mode
-                if ($this->_strict_mode) {
-                    throw new InvalidArgumentException('Neither email addresses nor URLs are allowed in strict mode.');
-                }
-                // Skip first char
-                if ($k) {
-                    $encoded = '';
-                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
-                    if ($encoded) {
-                        $output .= $encoded;
-                    } else {
-                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                case 0x3002:
+                case 0xFF0E:
+                case 0xFF61:
+                    $decoded[$k] = 0x2E;
+                    // It's right, no break here
+                    // The codepoints above have to be converted to dots anyway
+
+                // Stumbling across an anchoring character
+                case 0x2E:
+                case 0x2F:
+                case 0x3A:
+                case 0x3F:
+                case 0x40:
+                    // Neither email addresses nor URLs allowed in strict mode
+                    if ($this->_strict_mode) {
+                        throw new InvalidArgumentException('Neither email addresses nor URLs are allowed in strict mode.');
                     }
-                    $output .= chr($decoded[$k]);
-                }
-                $last_begin = $k + 1;
+                    // Skip first char
+                    if ($k) {
+                        $encoded = '';
+                        $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                        if ($encoded) {
+                            $output .= $encoded;
+                        } else {
+                            $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                        }
+                        $output .= chr($decoded[$k]);
+                    }
+                    $last_begin = $k + 1;
             }
         }
         // Catch the rest of the string
@@ -2416,12 +2416,12 @@ 
         // Optionally set
         if ($one_time_encoding) {
             switch ($one_time_encoding) {
-            case 'utf8':
-            case 'ucs4_string':
-            case 'ucs4_array':
-                break;
-            default:
-                throw new InvalidArgumentException('Unknown encoding '.$one_time_encoding);
+                case 'utf8':
+                case 'ucs4_string':
+                case 'ucs4_array':
+                    break;
+                default:
+                    throw new InvalidArgumentException('Unknown encoding '.$one_time_encoding);
             }
         }
         // Make sure to drop any newline characters around
@@ -2473,17 +2473,17 @@ 
         // The output is UTF-8 by default, other output formats need conversion here
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            return $return;
-            break;
-        case 'ucs4_string':
-            return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
-            break;
-        case 'ucs4_array':
-            return $this->_utf8_to_ucs4($return);
-            break;
-        default:
-            throw new InvalidArgumentException('Unsupported output format');
+            case 'utf8':
+                return $return;
+                break;
+            case 'ucs4_string':
+                return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
+                break;
+            case 'ucs4_array':
+                return $this->_utf8_to_ucs4($return);
+                break;
+            default:
+                throw new InvalidArgumentException('Unsupported output format');
         }
     }
 

Spacing +49 added lines, -53 removed lines

@@ -23,8 +23,8 @@ 
 //
 
 // }}}
-require_once __DIR__ . '/IDNA2/Exception.php';
-require_once __DIR__ . '/IDNA2/Exception/Nameprep.php';
+require_once __DIR__.'/IDNA2/Exception.php';
+require_once __DIR__.'/IDNA2/Exception/Nameprep.php';
 // adjusted paths for OC distribution
 
 /**
@@ -272,16 +272,16 @@ 
      * @access private
      */
     private static $_np_prohibit_ranges = array(
-        array(0x80,     0x9F    ),
-        array(0x2060,   0x206F  ),
-        array(0x1D173,  0x1D17A ),
-        array(0xE000,   0xF8FF  ),
-        array(0xF0000,  0xFFFFD ),
+        array(0x80, 0x9F),
+        array(0x2060, 0x206F),
+        array(0x1D173, 0x1D17A),
+        array(0xE000, 0xF8FF),
+        array(0xF0000, 0xFFFFD),
         array(0x100000, 0x10FFFD),
-        array(0xFDD0,   0xFDEF  ),
-        array(0xD800,   0xDFFF  ),
-        array(0x2FF0,   0x2FFB  ),
-        array(0xE0020,  0xE007F )
+        array(0xFDD0, 0xFDEF),
+        array(0xD800, 0xDFFF),
+        array(0x2FF0, 0x2FFB),
+        array(0xE0020, 0xE007F)
     );
 
     /**
@@ -2328,8 +2328,7 @@ 
         // Forcing conversion of input to UCS4 array
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            $decoded = $this->_utf8_to_ucs4($decoded);
+        case 'utf8' : $decoded = $this->_utf8_to_ucs4($decoded);
             break;
         case 'ucs4_string':
             $decoded = $this->_ucs4_string_to_ucs4($decoded);
@@ -2349,7 +2348,7 @@ 
 
         foreach ($decoded as $k => $v) {
             // Make sure to use just the plain dot
-            switch($v) {
+            switch ($v) {
             case 0x3002:
             case 0xFF0E:
             case 0xFF61:
@@ -2370,11 +2369,11 @@ 
                 // Skip first char
                 if ($k) {
                     $encoded = '';
-                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k) - $last_begin)));
                     if ($encoded) {
                         $output .= $encoded;
                     } else {
-                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k) - $last_begin)));
                     }
                     $output .= chr($decoded[$k]);
                 }
@@ -2385,11 +2384,11 @@ 
         if ($last_begin) {
             $inp_len = sizeof($decoded);
             $encoded = '';
-            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len) - $last_begin)));
             if ($encoded) {
                 $output .= $encoded;
             } else {
-                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len) - $last_begin)));
             }
             return $output;
         }
@@ -2440,7 +2439,7 @@ 
                 $conv = $this->_decode($v);
                 if ($conv) $arr[$k] = $conv;
             }
-            $return = $email_pref . '@' . join('.', $arr);
+            $return = $email_pref.'@'.join('.', $arr);
         } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
             // No no in strict mode
             if ($this->_strict_mode) {
@@ -2473,8 +2472,7 @@ 
         // The output is UTF-8 by default, other output formats need conversion here
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            return $return;
+        case 'utf8' : return $return;
             break;
         case 'ucs4_string':
             return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
@@ -2507,20 +2505,20 @@ 
         if (!empty($parts_arr['user'])) {
             $ret_url .= $parts_arr['user'];
             if (!empty($parts_arr['pass'])) {
-                $ret_url .= ':' . $parts_arr['pass'];
+                $ret_url .= ':'.$parts_arr['pass'];
             }
             $ret_url .= '@';
         }
         $ret_url .= $parts_arr['host'];
         if (!empty($parts_arr['port'])) {
-            $ret_url .= ':' . $parts_arr['port'];
+            $ret_url .= ':'.$parts_arr['port'];
         }
         $ret_url .= $parts_arr['path'];
         if (!empty($parts_arr['query'])) {
-            $ret_url .= '?' . $parts_arr['query'];
+            $ret_url .= '?'.$parts_arr['query'];
         }
         if (!empty($parts_arr['fragment'])) {
-            $ret_url .= '#' . $parts_arr['fragment'];
+            $ret_url .= '#'.$parts_arr['fragment'];
         }
         return $ret_url;
     }
@@ -2598,7 +2596,7 @@ 
         }
 
         // Start with the prefix; copy it to output
-        $encoded = $this->_punycode_prefix . $encoded;
+        $encoded = $this->_punycode_prefix.$encoded;
 
         // If we have basic code points in output, add an hyphen to the end
         if ($codecount) {
@@ -2629,9 +2627,8 @@ 
                     $delta++;
                 } else if ($decoded[$i] == $cur_code) {
                     for ($q = $delta, $k = $this->_base; 1; $k += $this->_base) {
-                        $t = ($k <= $bias)?
-                            $this->_tmin :
-                            (($k >= $bias + $this->_tmax)? $this->_tmax : $k - $bias);
+                        $t = ($k <= $bias) ?
+                            $this->_tmin : (($k >= $bias + $this->_tmax) ? $this->_tmax : $k - $bias);
 
                         if ($q < $t) {
                             break;
@@ -2668,11 +2665,11 @@ 
     private function _decode($encoded)
     {
         // We do need to find the Punycode prefix
-        if (!preg_match('!^' . preg_quote($this->_punycode_prefix, '!') . '!', $encoded)) {
+        if (!preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $encoded)) {
             return false;
         }
 
-        $encode_test = preg_replace('!^' . preg_quote($this->_punycode_prefix, '!') . '!', '', $encoded);
+        $encode_test = preg_replace('!^'.preg_quote($this->_punycode_prefix, '!').'!', '', $encoded);
 
         // If nothing left after removing the prefix, it is hopeless
         if (!$encode_test) {
@@ -2699,14 +2696,13 @@ 
         $idx      = 0;
         $char     = $this->_initial_n;
 
-        for ($enco_idx = ($delim_pos)? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
-            for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
+        for ($enco_idx = ($delim_pos) ? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
+            for ($old_idx = $idx, $w = 1, $k = $this->_base; 1; $k += $this->_base) {
                 $digit = $this->_decodeDigit($encoded{$enco_idx++});
                 $idx += $digit * $w;
 
                 $t = ($k <= $bias) ?
-                    $this->_tmin :
-                    (($k >= $bias + $this->_tmax)? $this->_tmax : ($k - $bias));
+                    $this->_tmin : (($k >= $bias + $this->_tmax) ? $this->_tmax : ($k - $bias));
 
                 if ($digit < $t) {
                     break;
@@ -2717,7 +2713,7 @@ 
 
             $bias      = $this->_adapt($idx - $old_idx, $deco_len + 1, $is_first);
             $is_first  = false;
-            $char     += (int) ($idx / ($deco_len + 1));
+            $char     += (int)($idx / ($deco_len + 1));
             $idx      %= ($deco_len + 1);
 
             if ($deco_len > 0) {
@@ -2745,14 +2741,14 @@ 
      */
     private function _adapt($delta, $npoints, $is_first)
     {
-        $delta = (int) ($is_first ? ($delta / $this->_damp) : ($delta / 2));
-        $delta += (int) ($delta / $npoints);
+        $delta = (int)($is_first ? ($delta / $this->_damp) : ($delta / 2));
+        $delta += (int)($delta / $npoints);
 
         for ($k = 0; $delta > (($this->_base - $this->_tmin) * $this->_tmax) / 2; $k += $this->_base) {
-            $delta = (int) ($delta / ($this->_base - $this->_tmin));
+            $delta = (int)($delta / ($this->_base - $this->_tmin));
         }
 
-        return (int) ($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
+        return (int)($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
     }
 
     /**
@@ -2779,7 +2775,7 @@ 
     private function _decodeDigit($cp)
     {
         $cp = ord($cp);
-        return ($cp - 48 < 10)? $cp - 22 : (($cp - 65 < 26)? $cp - 65 : (($cp - 97 < 26)? $cp - 97 : $this->_base));
+        return ($cp - 48 < 10) ? $cp - 22 : (($cp - 65 < 26) ? $cp - 65 : (($cp - 97 < 26) ? $cp - 97 : $this->_base));
     }
 
     /**
@@ -2807,12 +2803,12 @@ 
 
             // Try to find prohibited input
             if (in_array($v, self::$_np_prohibit) || in_array($v, self::$_general_prohibited)) {
-                throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+' . sprintf('%08X', $v));
+                throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+'.sprintf('%08X', $v));
             }
 
             foreach (self::$_np_prohibit_ranges as $range) {
                 if ($range[0] <= $v && $v <= $range[1]) {
-                    throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+' . sprintf('%08X', $v));
+                    throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+'.sprintf('%08X', $v));
                 }
             }
 
@@ -2862,7 +2858,7 @@ 
                     // Rewind the for loop by one, since there can be more possible compositions
                     $i--;
                     $out_len--;
-                    $last_class = ($i == $last_starter)? 0 : $this->_getCombiningClass($output[$i - 1]);
+                    $last_class = ($i == $last_starter) ? 0 : $this->_getCombiningClass($output[$i - 1]);
 
                     continue;
                 }
@@ -2899,7 +2895,7 @@ 
 
         $result   = array();
         $T        = $this->_tbase + $sindex % $this->_tcount;
-        $result[] = (int)($this->_lbase +  $sindex / $this->_ncount);
+        $result[] = (int)($this->_lbase + $sindex / $this->_ncount);
         $result[] = (int)($this->_vbase + ($sindex % $this->_ncount) / $this->_tcount);
 
         if ($T != $this->_tbase) {
@@ -2985,7 +2981,7 @@ 
      */
     private function _getCombiningClass($char)
     {
-        return isset(self::$_np_norm_combcls[$char])? self::$_np_norm_combcls[$char] : 0;
+        return isset(self::$_np_norm_combcls[$char]) ? self::$_np_norm_combcls[$char] : 0;
     }
 
     /**
@@ -3146,7 +3142,7 @@ 
                     throw new UnexpectedValueException('This might be UTF-8, but I don\'t understand it at byte '.$k);
                 }
                 if ('add' == $mode) {
-                    $output[$out_len] = (int) $v;
+                    $output[$out_len] = (int)$v;
                     ++$out_len;
                     continue;
                 }
@@ -3205,14 +3201,14 @@ 
                 // 4 bytes
                 $output .= chr(240 + ($v >> 18))
                     . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
+                    . chr(128 + (($v >> 6) & 63))
                     . chr(128 + ($v & 63));
             } else if ($v < 1 << 26) {
                 // 5 bytes
                 $output .= chr(248 + ($v >> 24))
                     . chr(128 + (($v >> 18) & 63))
                     . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
+                    . chr(128 + (($v >> 6) & 63))
                     . chr(128 + ($v & 63));
             } else if ($v < 1 << 31) {
                 // 6 bytes
@@ -3220,7 +3216,7 @@ 
                     . chr(128 + (($v >> 24) & 63))
                     . chr(128 + (($v >> 18) & 63))
                     . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
+                    . chr(128 + (($v >> 6) & 63))
                     . chr(128 + ($v & 63));
             } else {
                 throw new UnexpectedValueException('Conversion from UCS-4 to UTF-8 failed: malformed input');
@@ -3245,7 +3241,7 @@ 
         // Take array values and split output to 4 bytes per value
         // The bit mask is 255, which reads &11111111
         foreach ($input as $v) {
-            $output .= ($v & (255 << 24) >> 24) . ($v & (255 << 16) >> 16) . ($v & (255 << 8) >> 8) . ($v & 255);
+            $output .= ($v & (255 << 24) >> 24).($v & (255 << 16) >> 16).($v & (255 << 8) >> 8).($v & 255);
         }
         return $output;
     }
@@ -3280,7 +3276,7 @@ 
                 $out_len++;
                 $output[$out_len] = 0;
             }
-            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
+            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4)));
         }
         return $output;
     }
@@ -3331,7 +3327,7 @@ 
         $return = '';
 
         for ($i = $w; $i > -1; $i--) {
-            $return .= ($octet & (1 << $i))? '1' : '0';
+            $return .= ($octet & (1 << $i)) ? '1' : '0';
         }
 
         return $return;

Braces +36 added lines, -16 removed lines

@@ -2340,7 +2340,9 @@ 
         }
 
         // No input, no output, what else did you expect?
-        if (empty($decoded)) return '';
+        if (empty($decoded)) {
+            return '';
+        }
 
         // Anchors for iteration
         $last_begin = 0;
@@ -2429,7 +2431,8 @@ 
 
         // Negotiate input and try to determine, wether it is a plain string,
         // an email address or something like a complete URL
-        if (strpos($input, '@')) { // Maybe it is an email address
+        if (strpos($input, '@')) {
+// Maybe it is an email address
             // No no in strict mode
             if ($this->_strict_mode) {
                 throw new InvalidArgumentException('Only simple domain name parts can be handled in strict mode');
@@ -2438,10 +2441,13 @@ 
             $arr = explode('.', $input);
             foreach ($arr as $k => $v) {
                 $conv = $this->_decode($v);
-                if ($conv) $arr[$k] = $conv;
+                if ($conv) {
+                    $arr[$k] = $conv;
+                }
             }
             $return = $email_pref . '@' . join('.', $arr);
-        } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
+        } elseif (preg_match('![:\./]!', $input)) {
+// Or a complete domain name (with or without paths / parameters)
             // No no in strict mode
             if ($this->_strict_mode) {
                 throw new InvalidArgumentException('Only simple domain name parts can be handled in strict mode');
@@ -2452,22 +2458,28 @@ 
                 $arr = explode('.', $parsed['host']);
                 foreach ($arr as $k => $v) {
                     $conv = $this->_decode($v);
-                    if ($conv) $arr[$k] = $conv;
+                    if ($conv) {
+                        $arr[$k] = $conv;
+                    }
                 }
                 $parsed['host'] = join('.', $arr);
                 if (isset($parsed['scheme'])) {
                     $parsed['scheme'] .= (strtolower($parsed['scheme']) == 'mailto') ? ':' : '://';
                 }
                 $return = $this->_unparse_url($parsed);
-            } else { // parse_url seems to have failed, try without it
+            } else {
+// parse_url seems to have failed, try without it
                 $arr = explode('.', $input);
                 foreach ($arr as $k => $v) {
                     $conv = $this->_decode($v);
-                    if ($conv) $arr[$k] = $conv;
+                    if ($conv) {
+                        $arr[$k] = $conv;
+                    }
                 }
                 $return = join('.', $arr);
             }
-        } else { // Otherwise we consider it being a pure domain name string
+        } else {
+// Otherwise we consider it being a pure domain name string
             $return = $this->_decode($input);
         }
         // The output is UTF-8 by default, other output formats need conversion here
@@ -3115,7 +3127,8 @@ 
         for ($k = 0; $k < $inp_len; ++$k) {
             $v = ord($input{$k}); // Extract byte from input string
 
-            if ($v < 128) { // We found an ASCII char - put into stirng as is
+            if ($v < 128) {
+// We found an ASCII char - put into stirng as is
                 $output[$out_len] = $v;
                 ++$out_len;
                 if ('add' == $mode) {
@@ -3123,23 +3136,29 @@ 
                 }
                 continue;
             }
-            if ('next' == $mode) { // Try to find the next start byte; determine the width of the Unicode char
+            if ('next' == $mode) {
+// Try to find the next start byte; determine the width of the Unicode char
                 $start_byte = $v;
                 $mode = 'add';
                 $test = 'range';
-                if ($v >> 5 == 6) { // &110xxxxx 10xxxxx
+                if ($v >> 5 == 6) {
+// &110xxxxx 10xxxxx
                     $next_byte = 0; // Tells, how many times subsequent bitmasks must rotate 6bits to the left
                     $v = ($v - 192) << 6;
-                } elseif ($v >> 4 == 14) { // &1110xxxx 10xxxxxx 10xxxxxx
+                } elseif ($v >> 4 == 14) {
+// &1110xxxx 10xxxxxx 10xxxxxx
                     $next_byte = 1;
                     $v = ($v - 224) << 12;
-                } elseif ($v >> 3 == 30) { // &11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                } elseif ($v >> 3 == 30) {
+// &11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
                     $next_byte = 2;
                     $v = ($v - 240) << 18;
-                } elseif ($v >> 2 == 62) { // &111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+                } elseif ($v >> 2 == 62) {
+// &111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
                     $next_byte = 3;
                     $v = ($v - 248) << 24;
-                } elseif ($v >> 1 == 126) { // &1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+                } elseif ($v >> 1 == 126) {
+// &1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
                     $next_byte = 4;
                     $v = ($v - 252) << 30;
                 } else {
@@ -3158,7 +3177,8 @@ 
                         throw new OutOfRangeException('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
                     }
                 }
-                if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
+                if ($v >> 6 == 2) {
+// Bit mask must be 10xxxxxx
                     $v = ($v - 128) << ($next_byte * 6);
                     $output[($out_len - 1)] += $v;
                     --$next_byte;