zikula / core

src/lib/legacy/util/ThemeUtil.php

Indentation +4 added lines, -4 removed lines

@@ -104,16 +104,16 @@
             /** @var $entityManager Doctrine\ORM\EntityManager */
             $entityManager = ServiceUtil::get('doctrine.orm.default_entity_manager');
             $qb = $entityManager->createQueryBuilder()
-                     ->select('t')
-                     ->from('ZikulaThemeModule:ThemeEntity', 't');
+                        ->select('t')
+                        ->from('ZikulaThemeModule:ThemeEntity', 't');
 
             if ($state != self::STATE_ALL) {
                 $qb->andWhere('t.state = :state')
-                   ->setParameter('state', $state);
+                    ->setParameter('state', $state);
             }
             if ($type != self::TYPE_ALL) {
                 $qb->andWhere('t.type = :type')
-                   ->setParameter('type', $type);
+                    ->setParameter('type', $type);
             }
             switch ($filter) {
                 case self::FILTER_USER:

Spacing +2 added lines, -2 removed lines

@@ -298,7 +298,7 @@ 
             $bundleRelativePath = str_replace('\\', '/', $bundleRelativePath);
         }
         $paths[] = null === $theme ?
-            "themes/$themeName/style/$osmodname" : $bundleRelativePath.'/Resources/css/'.$theme->getName();
+            "themes/$themeName/style/$osmodname" : $bundleRelativePath . '/Resources/css/' . $theme->getName();
 
         // module directory
         $modinfo = ModUtil::getInfoFromName($modname);
@@ -308,7 +308,7 @@ 
             $dir = ModUtil::getModuleBaseDir($modname);
             $bundleRelativePath = substr($module->getPath(), strpos($module->getPath(), $dir), strlen($module->getPath()));
             $bundleRelativePath = str_replace('\\', '/', $bundleRelativePath);
-            $paths[] = $bundleRelativePath."/Resources/public/css";
+            $paths[] = $bundleRelativePath . "/Resources/public/css";
         }
         $paths[] = "modules/$osmoddir/style";
         $paths[] = "system/$osmoddir/style";

src/lib/legacy/util/HtmlUtil.php

Spacing +2 added lines, -2 removed lines

@@ -108,8 +108,8 @@
         $multiple = $multipleSize > 1 ? 'multiple="multiple"' : '';
         $multipleSize = $multipleSize > 1 ? "size=\"$multipleSize\"" : '';
         $submit = $submit ? 'onchange="this.form.submit();"' : '';
-        $required = ($required) ? 'required="required" oninvalid="this.setCustomValidity(\''.__('Please select an item in the list.').'\');" onchange="this.setCustomValidity(\'\');" onblur="this.checkValidity();"' : '';
-        $title = (is_null($title)) ? '' : 'title="'.$title.'" x-moz-errormessage="'.$title.'"';
+        $required = ($required) ? 'required="required" oninvalid="this.setCustomValidity(\'' . __('Please select an item in the list.') . '\');" onchange="this.setCustomValidity(\'\');" onblur="this.checkValidity();"' : '';
+        $title = (is_null($title)) ? '' : 'title="' . $title . '" x-moz-errormessage="' . $title . '"';
 
         $html = "<select name=\"$name\" id=\"$id\" class=\"$class\" $multipleSize $multiple $submit $disabled $required $title>";
 

src/lib/legacy/util/Loader.php

Spacing +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
             throw new \Exception(__f("Error! Invalid 'base_obj_type' specification '%s'.", $base_obj_type));
         }
 
-        $prefix = (string) $prefix;
+        $prefix = (string)$prefix;
 
         if (strpos($base_obj_type, '_') !== false) {
             $c = $base_obj_type;

src/lib/legacy/dbobject/DBObjectArray.php

Spacing +1 added lines, -1 removed lines

@@ -894,7 +894,7 @@
             throw new \Exception(__f("Non-existing field [%s] received", $column));
         }
 
-        $where  = '';
+        $where = '';
         if ($filter) {
             $filter = $this->cleanFilter($filter);
             $where  = DBUtil::_checkWhereClause($this->genFilter($filter));

src/lib/legacy/dbobject/DBUtil.php

Spacing +9 added lines, -9 removed lines

@@ -293,7 +293,7 @@ 
                     list(, $tab) = explode(' ', $sql);
                 }
                 if (strpos($sql, 'delete') === 0) {
-                    list(, , $tab) = explode(' ', $sql);
+                    list(,, $tab) = explode(' ', $sql);
                 }
                 if ($tab && strpos($tab, 'session_info') === false) {
                     self::flushCache($tab);
@@ -752,7 +752,7 @@ 
                         }
                         $vArray[] = self::_formatForStore($str);
                     } else {
-                        $vArray[] =  self::_typesafeQuotedValue($table, $key, $object[$key]);
+                        $vArray[] = self::_typesafeQuotedValue($table, $key, $object[$key]);
                     }
                 }
             } else {
@@ -1995,7 +1995,7 @@ 
 
             // process the where depending of the operator
             if ($op == 'AND') {
-                $where[] = "obj_id IN (SELECT {$prefix}obj_id FROM $catmapobjtbl table$n WHERE {$prefix}reg_id = '".DataUtil::formatForStore($propids[$property])."' AND $wherecat)";
+                $where[] = "obj_id IN (SELECT {$prefix}obj_id FROM $catmapobjtbl table$n WHERE {$prefix}reg_id = '" . DataUtil::formatForStore($propids[$property]) . "' AND $wherecat)";
             } else {
                 $where[] = "(reg_id='" . DataUtil::formatForStore($propids[$property]) . "' AND $wherecat)";
             }
@@ -2312,7 +2312,7 @@ 
      */
     public static function selectObjectSum($table, $column, $where = '', $categoryFilter = null, $subquery = null)
     {
-        $key = $column . $where. serialize($categoryFilter) . $subquery;
+        $key = $column . $where . serialize($categoryFilter) . $subquery;
         $sum = self::getCache($table, $key);
         if ($sum !== false) {
             return $sum;
@@ -2361,7 +2361,7 @@ 
      */
     public static function selectObjectCount($table, $where = '', $column = '1', $distinct = false, $categoryFilter = null, $subquery = null)
     {
-        $key = $column . $where. (int)$distinct . serialize($categoryFilter) . $subquery;
+        $key = $column . $where . (int)$distinct . serialize($categoryFilter) . $subquery;
         $sum = self::getCache($table, $key);
         if ($sum !== false) {
             return $sum;
@@ -2518,7 +2518,7 @@ 
         $tables = self::getTables();
         $tableName = $tables[$table];
         $columns = $tables["{$table}_column"];
-        $fieldName = isset($columns[$field]) ? 'tbl.'.$columns[$field] : $field;
+        $fieldName = isset($columns[$field]) ? 'tbl.' . $columns[$field] : $field;
 
         $sqlJoinArray = self::_processJoinArray($table, $joinInfo);
         $sqlJoin = $sqlJoinArray[0];
@@ -2777,7 +2777,7 @@ 
         //$dst = ($distinct ? 'DISTINCT' : '');
         $sqlStart = "SELECT COUNT(*) ";
         $sqlFrom = "FROM $tableName AS tbl ";
-        $sqlGroupBy = (empty($sqlJoinArray[3])) ? '' : 'GROUP BY '.implode(', ', $sqlJoinArray[3]);
+        $sqlGroupBy = (empty($sqlJoinArray[3])) ? '' : 'GROUP BY ' . implode(', ', $sqlJoinArray[3]);
 
         $sql = "$sqlStart $sqlJoinFieldList $sqlFrom $sqlJoin $where $sqlGroupBy";
         $res = self::executeSQL($sql);
@@ -3056,9 +3056,9 @@ 
             // we have a {$tablename}_column_def array as defined in tables.php. This is a real array, not a string.
             // The format is like "C(24) NOTNULL DEFAULT ''" which means we have to prepend the field name now
             $typemap = [
-                'B' => 'blob',    // NOTE: not supported in Doctrine 2
+                'B' => 'blob', // NOTE: not supported in Doctrine 2
                 'C' => 'string',
-                'C2' => 'blob',   // NOTE: not supported in Doctrine 2
+                'C2' => 'blob', // NOTE: not supported in Doctrine 2
                 'D' => 'date',
                 'F' => 'float',
                 'I' => 'integer',

src/lib/legacy/idn/uctc.php

Spacing +24 added lines, -24 removed lines

@@ -39,8 +39,8 @@ 
         if (self::$safe_mode) self::$allow_overlong = true;
         if (!in_array($from, self::$mechs)) throw new Exception('Invalid input format specified');
         if (!in_array($to, self::$mechs)) throw new Exception('Invalid output format specified');
-        if ($from != 'ucs4array') eval('$data = self::'.$from.'_ucs4array($data);');
-        if ($to != 'ucs4array') eval('$data = self::ucs4array_'.$to.'($data);');
+        if ($from != 'ucs4array') eval('$data = self::' . $from . '_ucs4array($data);');
+        if ($to != 'ucs4array') eval('$data = self::ucs4array_' . $to . '($data);');
         return $data;
     }
 
@@ -66,10 +66,10 @@ 
                 ++$out_len;
                 if ('add' == $mode) {
                     if (self::$safe_mode) {
-                        $output[$out_len-2] = self::$safe_char;
+                        $output[$out_len - 2] = self::$safe_char;
                         $mode = 'next';
                     } else {
-                        throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                        throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte ' . $k);
                     }
                 }
                 continue;
@@ -93,16 +93,16 @@ 
                     ++$out_len;
                     continue;
                 } else {
-                    throw new Exception('This might be UTF-8, but I don\'t understand it at byte '.$k);
+                    throw new Exception('This might be UTF-8, but I don\'t understand it at byte ' . $k);
                 }
-                if ($inp_len-$k-$next_byte < 2) {
+                if ($inp_len - $k - $next_byte < 2) {
                     $output[$out_len] = self::$safe_char;
                     $mode = 'no';
                     continue;
                 }
 
                 if ('add' == $mode) {
-                    $output[$out_len] = (int) $v;
+                    $output[$out_len] = (int)$v;
                     ++$out_len;
                     continue;
                 }
@@ -111,21 +111,21 @@ 
                 if (!self::$allow_overlong && $test == 'range') {
                     $test = 'none';
                     if (($v < 0xA0 && $start_byte == 0xE0) || ($v < 0x90 && $start_byte == 0xF0) || ($v > 0x8F && $start_byte == 0xF4)) {
-                        throw new Exception('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
+                        throw new Exception('Bogus UTF-8 character detected (out of legal range) at byte ' . $k);
                     }
                 }
                 if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
-                    $v = ($v-128) << ($next_byte*6);
-                    $output[($out_len-1)] += $v;
+                    $v = ($v - 128) << ($next_byte * 6);
+                    $output[($out_len - 1)] += $v;
                     --$next_byte;
                 } else {
                     if (self::$safe_mode) {
-                        $output[$out_len-1] = ord(self::$safe_char);
+                        $output[$out_len - 1] = ord(self::$safe_char);
                         $k--;
                         $mode = 'next';
                         continue;
                     } else {
-                        throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                        throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte ' . $k);
                     }
                 }
                 if ($next_byte < 0) {
@@ -148,15 +148,15 @@ 
             if ($v < 128) { // 7bit are transferred literally
                 $output .= chr($v);
             } elseif ($v < (1 << 11)) { // 2 bytes
-                $output .= chr(192+($v >> 6)).chr(128+($v & 63));
+                $output .= chr(192 + ($v >> 6)) . chr(128 + ($v & 63));
             } elseif ($v < (1 << 16)) { // 3 bytes
-                $output .= chr(224+($v >> 12)).chr(128+(($v >> 6) & 63)).chr(128+($v & 63));
+                $output .= chr(224 + ($v >> 12)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
             } elseif ($v < (1 << 21)) { // 4 bytes
-                $output .= chr(240+($v >> 18)).chr(128+(($v >> 12) & 63)).chr(128+(($v >> 6) & 63)).chr(128+($v & 63));
+                $output .= chr(240 + ($v >> 18)) . chr(128 + (($v >> 12) & 63)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
             } elseif (self::$safe_mode) {
                 $output .= self::$safe_char;
             } else {
-                throw new Exception('Conversion from UCS-4 to UTF-8 failed: malformed input at byte '.$k);
+                throw new Exception('Conversion from UCS-4 to UTF-8 failed: malformed input at byte ' . $k);
             }
         }
         return $output;
@@ -180,7 +180,7 @@ 
             if (0 == ord($c)) continue; // Ignore zero bytes
             if ('b' == $mode) {
                 // Sequence got terminated
-                if (!preg_match('![A-Za-z0-9/'.preg_quote($sc, '!').']!', $c)) {
+                if (!preg_match('![A-Za-z0-9/' . preg_quote($sc, '!') . ']!', $c)) {
                     if ('-' == $c) {
                         if ($b64 == '') {
                             $output[$out_len] = ord($sc);
@@ -233,23 +233,23 @@ 
             $is_direct = (false !== $v) ? (0x20 <= $v && $v <= 0x7e && $v != ord($sc)) : true;
             if ($mode == 'b') {
                 if ($is_direct) {
-                    if ($b64 == chr(0).$sc) {
-                        $output .= $sc.'-';
+                    if ($b64 == chr(0) . $sc) {
+                        $output .= $sc . '-';
                         $b64 = '';
                     } elseif ($b64) {
-                        $output .= $sc.str_replace('=', '', base64_encode($b64)).'-';
+                        $output .= $sc . str_replace('=', '', base64_encode($b64)) . '-';
                         $b64 = '';
                     }
                     $mode = 'd';
                 } elseif (false !== $v) {
-                    $b64 .= chr(($v >> 8) & 255). chr($v & 255);
+                    $b64 .= chr(($v >> 8) & 255) . chr($v & 255);
                 }
             }
             if ($mode == 'd' && false !== $v) {
                 if ($is_direct) {
                     $output .= chr($v);
                 } else {
-                    $b64 = chr(($v >> 8) & 255). chr($v & 255);
+                    $b64 = chr(($v >> 8) & 255) . chr($v & 255);
                     $mode = 'b';
                 }
             }
@@ -266,7 +266,7 @@ 
     {
         $output = '';
         foreach ($input as $v) {
-            $output .= chr(($v >> 24) & 255).chr(($v >> 16) & 255).chr(($v >> 8) & 255).chr($v & 255);
+            $output .= chr(($v >> 24) & 255) . chr(($v >> 16) & 255) . chr(($v >> 8) & 255) . chr($v & 255);
         }
         return $output;
     }
@@ -292,7 +292,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;
     }

Braces +25 added lines, -8 removed lines

@@ -36,11 +36,21 @@ 
     {
         self::$safe_mode = ($safe_mode) ? true : false;
         self::$safe_char = ($safe_char) ? $safe_char : 0xFFFC;
-        if (self::$safe_mode) self::$allow_overlong = true;
-        if (!in_array($from, self::$mechs)) throw new Exception('Invalid input format specified');
-        if (!in_array($to, self::$mechs)) throw new Exception('Invalid output format specified');
-        if ($from != 'ucs4array') eval('$data = self::'.$from.'_ucs4array($data);');
-        if ($to != 'ucs4array') eval('$data = self::ucs4array_'.$to.'($data);');
+        if (self::$safe_mode) {
+            self::$allow_overlong = true;
+        }
+        if (!in_array($from, self::$mechs)) {
+            throw new Exception('Invalid input format specified');
+        }
+        if (!in_array($to, self::$mechs)) {
+            throw new Exception('Invalid output format specified');
+        }
+        if ($from != 'ucs4array') {
+            eval('$data = self::'.$from.'_ucs4array($data);');
+        }
+        if ($to != 'ucs4array') {
+            eval('$data = self::ucs4array_'.$to.'($data);');
+        }
         return $data;
     }
 
@@ -177,7 +187,10 @@ 
 
         for ($k = 0; $k < $inp_len; ++$k) {
             $c = $input{$k};
-            if (0 == ord($c)) continue; // Ignore zero bytes
+            if (0 == ord($c)) {
+                continue;
+            }
+            // Ignore zero bytes
             if ('b' == $mode) {
                 // Sequence got terminated
                 if (!preg_match('![A-Za-z0-9/'.preg_quote($sc, '!').']!', $c)) {
@@ -253,7 +266,9 @@ 
                     $mode = 'b';
                 }
             }
-            if (false === $v && $b64 == '') break;
+            if (false === $v && $b64 == '') {
+                break;
+            }
         }
         return $output;
     }
@@ -285,7 +300,9 @@ 
             throw new Exception('Input UCS4 string is broken');
         }
         // Empty input - return empty output
-        if (!$inp_len) return $output;
+        if (!$inp_len) {
+            return $output;
+        }
 
         for ($i = 0, $out_len = -1; $i < $inp_len; ++$i) {
             if (!($i % 4)) { // Increment output position every 4 input bytes

src/lib/legacy/idn/idna_convert.class.php

Spacing +39 added lines, -42 removed lines

@@ -73,16 +73,16 @@ 
     protected $_lcount = 19;
     protected $_vcount = 21;
     protected $_tcount = 28;
-    protected $_ncount = 588;   // _vcount * _tcount
+    protected $_ncount = 588; // _vcount * _tcount
     protected $_scount = 11172; // _lcount * _tcount * _vcount
     protected $_error = false;
     protected static $_mb_string_overload = null;
     // See {@link set_paramter()} for details of how to change the following
     // settings from within your script / application
-    protected $_api_encoding = 'utf8';   // Default input charset is UTF-8
-    protected $_allow_overlong = false;  // Overlong UTF-8 encodings are forbidden
-    protected $_strict_mode = false;     // Behave strict or not
-    protected $_idn_version = 2003;      // Can be either 2003 (old, default) or 2008
+    protected $_api_encoding = 'utf8'; // Default input charset is UTF-8
+    protected $_allow_overlong = false; // Overlong UTF-8 encodings are forbidden
+    protected $_strict_mode = false; // Behave strict or not
+    protected $_idn_version = 2003; // Can be either 2003 (old, default) or 2008
 
     /**
      * the constructor
@@ -107,7 +107,7 @@ 
 
     public function get_version()
     {
-        return $this->version.'-'.$this->sub_version;
+        return $this->version . '-' . $this->sub_version;
     }
 
     /**
@@ -241,12 +241,12 @@ 
                     }
                 }
                 $parsed['host'] = join('.', $arr);
-                $return = (empty($parsed['scheme']) ? '' : $parsed['scheme'] . (strtolower($parsed['scheme']) == 'mailto' ? ':' : '://')).
-                        (empty($parsed['user']) ? '' : $parsed['user'] . (empty($parsed['pass']) ? '' : ':' . $parsed['pass']) . '@').
-                        $parsed['host'].
-                        (empty($parsed['port']) ? '' : ':' . $parsed['port']).
-                        (empty($parsed['path']) ? '' : $parsed['path']).
-                        (empty($parsed['query']) ? '' : '?' . $parsed['query']).
+                $return = (empty($parsed['scheme']) ? '' : $parsed['scheme'] . (strtolower($parsed['scheme']) == 'mailto' ? ':' : '://')) .
+                        (empty($parsed['user']) ? '' : $parsed['user'] . (empty($parsed['pass']) ? '' : ':' . $parsed['pass']) . '@') .
+                        $parsed['host'] .
+                        (empty($parsed['port']) ? '' : ':' . $parsed['port']) .
+                        (empty($parsed['path']) ? '' : $parsed['path']) .
+                        (empty($parsed['query']) ? '' : '?' . $parsed['query']) .
                         (empty($parsed['fragment']) ? '' : '#' . $parsed['fragment']);
             } else { // parse_url seems to have failed, try without it
                 $arr = explode('.', $input);
@@ -265,8 +265,8 @@ 
         // 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 '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:            $this->_error('Unsupported output format'); return false;
         }
@@ -283,8 +283,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);
@@ -380,12 +379,12 @@ 
             }
         }
         $parsed['host'] = join('.', $arr);
-        $return = (empty($parsed['scheme']) ? '' : $parsed['scheme'] . (strtolower($parsed['scheme']) == 'mailto' ? ':' : '://')).
-                (empty($parsed['user']) ? '' : $parsed['user'] . (empty($parsed['pass']) ? '' : ':' . $parsed['pass']) . '@').
-                $parsed['host'].
-                (empty($parsed['port']) ? '' : ':' . $parsed['port']).
-                (empty($parsed['path']) ? '' : $parsed['path']).
-                (empty($parsed['query']) ? '' : '?' . $parsed['query']).
+        $return = (empty($parsed['scheme']) ? '' : $parsed['scheme'] . (strtolower($parsed['scheme']) == 'mailto' ? ':' : '://')) .
+                (empty($parsed['user']) ? '' : $parsed['user'] . (empty($parsed['pass']) ? '' : ':' . $parsed['pass']) . '@') .
+                $parsed['host'] .
+                (empty($parsed['port']) ? '' : ':' . $parsed['port']) .
+                (empty($parsed['path']) ? '' : $parsed['path']) .
+                (empty($parsed['query']) ? '' : '?' . $parsed['query']) .
                 (empty($parsed['fragment']) ? '' : '#' . $parsed['fragment']);
         return $return;
     }
@@ -439,16 +438,15 @@ 
             for ($old_idx = $idx, $w = 1, $k = $this->_base; 1; $k += $this->_base) {
                 $digit = $this->_decode_digit($encoded{$enco_idx++});
                 $idx += $digit * $w;
-                $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 ($digit < $t) {
                     break;
                 }
-                $w = (int) ($w * ($this->_base - $t));
+                $w = (int)($w * ($this->_base - $t));
             }
             $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) {
                 // Make room for the decoded char
@@ -540,13 +538,12 @@ 
                     $delta++;
                 } elseif ($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;
                         }
                         $encoded .= $this->_encode_digit(intval($t + (($q - $t) % ($this->_base - $t)))); //v0.4.5 Changed from ceil() to intval()
-                        $q = (int) (($q - $t) / ($this->_base - $t));
+                        $q = (int)(($q - $t) / ($this->_base - $t));
                     }
                     $encoded .= $this->_encode_digit($q);
                     $bias = $this->_adapt($delta, $codecount + 1, $is_first);
@@ -641,18 +638,18 @@ 
             if (0xAC00 <= $v && $v <= 0xD7AF) {
                 // Hangul syllable decomposition
                 foreach ($this->_hangul_decompose($v) as $out) {
-                    $output[] = (int) $out;
+                    $output[] = (int)$out;
                 }
             } elseif (($this->_idn_version == '2003') && isset(self::$NP['replacemaps_2003'][$v])) {
                 foreach ($this->_apply_cannonical_ordering(self::$NP['replacemaps_2003'][$v]) as $out) {
-                    $output[] = (int) $out;
+                    $output[] = (int)$out;
                 }
             } elseif (($this->_idn_version == '2008') && isset(self::$NP['replacemaps'][$v])) {
                 foreach ($this->_apply_cannonical_ordering(self::$NP['replacemaps'][$v]) as $out) {
-                    $output[] = (int) $out;
+                    $output[] = (int)$out;
                 }
             } else {
-                $output[] = (int) $v;
+                $output[] = (int)$v;
             }
         }
         // Before applying any Combining, try to rearrange any Hangul syllables
@@ -703,13 +700,13 @@ 
      */
     protected function _hangul_decompose($char)
     {
-        $sindex = (int) $char - $this->_sbase;
+        $sindex = (int)$char - $this->_sbase;
         if ($sindex < 0 || $sindex >= $this->_scount) {
             return array($char);
         }
         $result = array();
-        $result[] = (int) $this->_lbase + $sindex / $this->_ncount;
-        $result[] = (int) $this->_vbase + ($sindex % $this->_ncount) / $this->_tcount;
+        $result[] = (int)$this->_lbase + $sindex / $this->_ncount;
+        $result[] = (int)$this->_vbase + ($sindex % $this->_ncount) / $this->_tcount;
         $T = intval($this->_tbase + $sindex % $this->_tcount);
         if ($T != $this->_tbase) {
             $result[] = $T;
@@ -730,11 +727,11 @@ 
             return array();
         }
         $result = array();
-        $last = (int) $input[0];
+        $last = (int)$input[0];
         $result[] = $last; // copy first char from input to output
 
         for ($i = 1; $i < $inp_len; ++$i) {
-            $char = (int) $input[$i];
+            $char = (int)$input[$i];
             $sindex = $last - $this->_sbase;
             $lindex = $last - $this->_lbase;
             $vindex = $char - $this->_vbase;
@@ -749,7 +746,7 @@ 
             // Find out, whether two current characters form L and V
             if (0 <= $lindex && $lindex < $this->_lcount && 0 <= $vindex && $vindex < $this->_vcount) {
                 // create syllable of form LV
-                $last = (int) $this->_sbase + ($lindex * $this->_vcount + $vindex) * $this->_tcount;
+                $last = (int)$this->_sbase + ($lindex * $this->_vcount + $vindex) * $this->_tcount;
                 $result[(count($result) - 1)] = $last; // reset last
                 continue; // discard char
             }
@@ -898,7 +895,7 @@ 
                     return false;
                 }
                 if ('add' == $mode) {
-                    $output[$out_len] = (int) $v;
+                    $output[$out_len] = (int)$v;
                     ++$out_len;
                     continue;
                 }
@@ -995,7 +992,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;
     }
@@ -1012,7 +1009,7 @@ 
         if (self::$_mb_string_overload) {
             return mb_strlen($string, '8bit');
         }
-        return strlen((binary) $string);
+        return strlen((binary)$string);
     }
 
     /**

src/lib/legacy/idn/transcode_wrapper.php

Braces +27 added lines, -9 removed lines

@@ -30,15 +30,21 @@ 
     }
     if (function_exists('mb_convert_encoding')) {
         $conv = @mb_convert_encoding($string, 'UTF-8', strtoupper($encoding));
-        if ($conv) return $conv;
+        if ($conv) {
+            return $conv;
+        }
     }
     if (function_exists('iconv')) {
         $conv = @iconv(strtoupper($encoding), 'UTF-8', $string);
-        if ($conv) return $conv;
+        if ($conv) {
+            return $conv;
+        }
     }
     if (function_exists('libiconv')) {
         $conv = @libiconv(strtoupper($encoding), 'UTF-8', $string);
-        if ($conv) return $conv;
+        if ($conv) {
+            return $conv;
+        }
     }
     return $safe;
 }
@@ -55,7 +61,9 @@ 
 function decode_utf8($string = '', $encoding = 'iso-8859-1', $safe_mode = false)
 {
     $safe = ($safe_mode) ? $string : false;
-    if (!$encoding) $encoding = 'ISO-8859-1';
+    if (!$encoding) {
+        $encoding = 'ISO-8859-1';
+    }
     if (strtoupper($encoding) == 'UTF-8' || strtoupper($encoding) == 'UTF8') {
         return $string;
     } elseif (strtoupper($encoding) == 'ISO-8859-1') {
@@ -67,15 +75,21 @@ 
     }
     if (function_exists('mb_convert_encoding')) {
         $conv = @mb_convert_encoding($string, strtoupper($encoding), 'UTF-8');
-        if ($conv) return $conv;
+        if ($conv) {
+            return $conv;
+        }
     }
     if (function_exists('iconv')) {
         $conv = @iconv('UTF-8', strtoupper($encoding), $string);
-        if ($conv) return $conv;
+        if ($conv) {
+            return $conv;
+        }
     }
     if (function_exists('libiconv')) {
         $conv = @libiconv('UTF-8', strtoupper($encoding), $string);
-        if ($conv) return $conv;
+        if ($conv) {
+            return $conv;
+        }
     }
     return $safe;
 }
@@ -89,7 +103,9 @@ 
  */
 function map_w1252_iso8859_1($string = '')
 {
-    if ($string == '') return '';
+    if ($string == '') {
+        return '';
+    }
     $return = '';
     for ($i = 0; $i < strlen($string); ++$i) {
         $c = ord($string{$i});
@@ -116,7 +132,9 @@ 
  */
 function map_iso8859_1_w1252($string = '')
 {
-    if ($string == '') return '';
+    if ($string == '') {
+        return '';
+    }
     $return = '';
     for ($i = 0; $i < strlen($string); ++$i) {
         $c = ord($string{$i});

src/lib/legacy/idn/example.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 if (isset($_REQUEST['lang'])) {
     if ('de' == $_REQUEST['lang'] || 'en' == $_REQUEST['lang']) {
         $lang = $_REQUEST['lang'];
-        $add .= '<input type="hidden" name="lang" value="'.$lang.'" />'."\n";
+        $add .= '<input type="hidden" name="lang" value="' . $lang . '" />' . "\n";
     }
 }
 ?>