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 +26 added lines, -26 removed lines

@@ -175,8 +175,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
@@ -195,9 +195,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;
@@ -223,7 +223,7 @@ 
         if ($lzn < 10) {
             $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
@@ -268,20 +268,20 @@ 
         $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;
         }
 
-        $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);
         }
@@ -331,8 +331,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
@@ -410,8 +410,8 @@ 
                 0
             ];
         }
-        $lp = (float) $lp;
-        $bp = (float) $bp;
+        $lp = (float)$lp;
+        $bp = (float)$bp;
 
         // Potsdam Datum
         // Große Halbachse a und Abplattung f
@@ -429,9 +429,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;
@@ -469,18 +469,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 [
@@ -499,8 +499,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;
             }
@@ -535,8 +535,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))));
             }

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;

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 +5 added lines, -5 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;
@@ -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 +3 added lines, -3 removed lines

@@ -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
                 @rename($this->deleted_filename($filename), $this->getFilename());
             }
         }

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 +3 added lines, -3 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 = '';
@@ -75,7 +75,7 @@ 
 
         // open new XML file?
         if ($this->oSitemapFile === false) {
-            $this->nSitemapIndex ++;
+            $this->nSitemapIndex++;
             $sFilename = 'sitemap-' . $this->nSitemapIndex . '.xml.gz';
             $this->oSitemapFile = gzopen($this->sPath . $sFilename, 'wb');
 
@@ -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);

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 +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__. '/../vendor/autoload.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 
 class mail extends Smarty
 {

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 +4 added lines, -4 removed lines

@@ -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(
@@ -73,7 +73,7 @@ 
                         'parent' => MNU_MAP
                     ];
                     $menuitem[MNU_MAP]['subitems'][] = $menu_map;
-                    ++ $menu_map;
+                    ++$menu_map;
                 }
             }
         }
@@ -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,7 +137,7 @@ 
             );
             while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
                 $aMenu[$r['id']]['subitems'][$nPos] = $rSubmenu['id'];
-                $nPos ++;
+                $nPos++;
             }
             sql_free_result($rsSubmenu);
         }

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 +43 added lines, -47 removed lines

@@ -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)
     );
 
     /**
@@ -2282,7 +2282,7 @@ 
                     break;
 
                 default:
-                    throw new InvalidArgumentException('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                    throw new InvalidArgumentException('Set Parameter: Unknown parameter ' . $v . ' for option ' . $k);
                 }
 
                 break;
@@ -2299,7 +2299,7 @@ 
                 if (in_array($v, array('2003', '2008'))) {
                     $this->_version = $v;
                 } else {
-                    throw new InvalidArgumentException('Set Parameter: Invalid parameter '.$v.' for option '.$k);
+                    throw new InvalidArgumentException('Set Parameter: Invalid parameter ' . $v . ' for option ' . $k);
                 }
                 break;
 
@@ -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;
         }
@@ -2421,7 +2420,7 @@ 
             case 'ucs4_array':
                 break;
             default:
-                throw new InvalidArgumentException('Unknown encoding '.$one_time_encoding);
+                throw new InvalidArgumentException('Unknown encoding ' . $one_time_encoding);
             }
         }
         // Make sure to drop any newline characters around
@@ -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));
@@ -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;
@@ -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));
     }
 
     /**
@@ -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;
     }
 
     /**
@@ -3119,7 +3115,7 @@ 
                 $output[$out_len] = $v;
                 ++$out_len;
                 if ('add' == $mode) {
-                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte ' . $k);
                 }
                 continue;
             }
@@ -3143,10 +3139,10 @@ 
                     $next_byte = 4;
                     $v = ($v - 252) << 30;
                 } else {
-                    throw new UnexpectedValueException('This might be UTF-8, but I don\'t understand it at byte '.$k);
+                    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;
                 }
@@ -3155,7 +3151,7 @@ 
                 if (!$this->_allow_overlong && $test == 'range') {
                     $test = 'none';
                     if (($v < 0xA0 && $start_byte == 0xE0) || ($v < 0x90 && $start_byte == 0xF0) || ($v > 0x8F && $start_byte == 0xF4)) {
-                        throw new OutOfRangeException('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
+                        throw new OutOfRangeException('Bogus UTF-8 character detected (out of legal range) at byte ' . $k);
                     }
                 }
                 if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
@@ -3163,7 +3159,7 @@ 
                     $output[($out_len - 1)] += $v;
                     --$next_byte;
                 } else {
-                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte ' . $k);
                 }
                 if ($next_byte < 0) {
                     $mode = 'next';
@@ -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');
@@ -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 +12 added lines, -4 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;
@@ -2438,7 +2440,9 @@ 
             $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)
@@ -2452,7 +2456,9 @@ 
                 $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'])) {
@@ -2463,7 +2469,9 @@ 
                 $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);
             }