injitools / cms-Inji

system/objects/CodeGenerator.php

Doc Comments +3 added lines

@@ -31,6 +31,9 @@
         return $return;
     }
 
+    /**
+     * @param string $path
+     */
     static function parseClass($path)
     {
         $code = file_get_contents($path);

Spacing +2 added lines, -2 removed lines

@@ -16,13 +16,13 @@
         if ($level == 0)
             $return = "[";
         foreach ($data as $key => $item) {
-            $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "'{$key}' => ";
+            $return .= "\n" . str_repeat(' ', ($level * 4 + 4)) . "'{$key}' => ";
             if (!is_array($item))
                 $return .= "'{$item}',";
             else {
                 $return .= "[";
                 $return .= rtrim(self::genArray($item, $level + 1), ',');
-                $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "],";
+                $return .= "\n" . str_repeat(' ', ($level * 4 + 4)) . "],";
             }
         }
         if ($level == 0)

Braces +9 added lines, -7 removed lines

@@ -13,20 +13,22 @@
     static function genArray($data, $level = 0)
     {
         $return = '';
-        if ($level == 0)
-            $return = "[";
+        if ($level == 0) {
+                    $return = "[";
+        }
         foreach ($data as $key => $item) {
             $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "'{$key}' => ";
-            if (!is_array($item))
-                $return .= "'{$item}',";
-            else {
+            if (!is_array($item)) {
+                            $return .= "'{$item}',";
+            } else {
                 $return .= "[";
                 $return .= rtrim(self::genArray($item, $level + 1), ',');
                 $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "],";
             }
         }
-        if ($level == 0)
-            $return = rtrim($return, ',') . "\n];";
+        if ($level == 0) {
+                    $return = rtrim($return, ',') . "\n];";
+        }
 
         return $return;
     }

system/objects/IdnaConvert.php

Doc Comments +5 added lines, -5 removed lines

@@ -89,7 +89,7 @@ 
      * the constructor
      *
      * @param array $options
-     * @return boolean
+     * @return boolean|null
      * @since 0.5.2
      */
     public function __construct($options = false)
@@ -388,7 +388,7 @@ 
     /**
      * Use this method to get the last error ocurred
      * @param    void
-     * @return   string   The last error, that occured
+     * @return   boolean   The last error, that occured
      */
     public function get_last_error()
     {
@@ -398,7 +398,7 @@ 
     /**
      * The actual decoding algorithm
      * @param string
-     * @return mixed
+     * @return false|string
      */
     protected function _decode($encoded)
     {
@@ -455,7 +455,7 @@ 
     /**
      * The actual encoding algorithm
      * @param  string
-     * @return mixed
+     * @return false|string
      */
     protected function _encode($decoded)
     {
@@ -675,7 +675,7 @@ 
      * Decomposes a Hangul syllable
      * (see http://www.unicode.org/unicode/reports/tr15/#Hangul
      * @param    integer  32bit UCS4 code point
-     * @return   array    Either Hangul Syllable decomposed or original 32bit value as one value array
+     * @return   integer[]    Either Hangul Syllable decomposed or original 32bit value as one value array
      */
     protected function _hangul_decompose($char)
     {

Indentation +3 added lines, -3 removed lines

@@ -260,7 +260,7 @@ 
             break;
         case 'ucs4_string':
            return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
-           break;
+            break;
         case 'ucs4_array':
             return $this->_utf8_to_ucs4($return);
             break;
@@ -316,8 +316,8 @@ 
             case 0x40:
                 // Neither email addresses nor URLs allowed in strict mode
                 if ($this->_strict_mode) {
-                   $this->_error('Neither email addresses nor URLs are allowed in strict mode.');
-                   return false;
+                    $this->_error('Neither email addresses nor URLs are allowed in strict mode.');
+                    return false;
                 } else {
                     // Skip first char
                     if ($k) {

Switch Indentation +88 added lines, -88 removed lines

@@ -129,41 +129,41 @@ 
         }
         foreach ($option as $k => $v) {
             switch ($k) {
-            case 'encoding':
-                switch ($v) {
-                case 'utf8':
-                case 'ucs4_string':
-                case 'ucs4_array':
-                    $this->_api_encoding = $v;
+                case 'encoding':
+                    switch ($v) {
+                        case 'utf8':
+                        case 'ucs4_string':
+                        case 'ucs4_array':
+                            $this->_api_encoding = $v;
+                            break;
+                        default:
+                            $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                            return false;
+                    }
+                break;
+                case 'overlong':
+                    $this->_allow_overlong = ($v) ? true : false;
+                    break;
+                case 'strict':
+                    $this->_strict_mode = ($v) ? true : false;
+                    break;
+                case 'idn_version':
+                    if (in_array($v, array('2003', '2008'))) {
+                        $this->_idn_version = $v;
+                    } else {
+                        $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                    }
+                    break;
+                case 'encode_german_sz': // Deprecated
+                    if (!$v) {
+                        self::$NP['replacemaps'][0xDF] = array(0x73, 0x73);
+                    } else {
+                        unset(self::$NP['replacemaps'][0xDF]);
+                    }
                     break;
                 default:
-                    $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                    $this->_error('Set Parameter: Unknown option '.$k);
                     return false;
-                }
-                break;
-            case 'overlong':
-                $this->_allow_overlong = ($v) ? true : false;
-                break;
-            case 'strict':
-                $this->_strict_mode = ($v) ? true : false;
-                break;
-            case 'idn_version':
-                if (in_array($v, array('2003', '2008'))) {
-                    $this->_idn_version = $v;
-                } else {
-                    $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
-                }
-                break;
-            case 'encode_german_sz': // Deprecated
-                if (!$v) {
-                    self::$NP['replacemaps'][0xDF] = array(0x73, 0x73);
-                } else {
-                    unset(self::$NP['replacemaps'][0xDF]);
-                }
-                break;
-            default:
-                $this->_error('Set Parameter: Unknown option '.$k);
-                return false;
             }
         }
         return true;
@@ -180,13 +180,13 @@ 
         // Optionally set
         if ($one_time_encoding) {
             switch ($one_time_encoding) {
-            case 'utf8':
-            case 'ucs4_string':
-            case 'ucs4_array':
-                break;
-            default:
-                $this->_error('Unknown encoding '.$one_time_encoding);
-                return false;
+                case 'utf8':
+                case 'ucs4_string':
+                case 'ucs4_array':
+                    break;
+                default:
+                    $this->_error('Unknown encoding '.$one_time_encoding);
+                    return false;
             }
         }
         // Make sure to drop any newline characters around
@@ -255,18 +255,18 @@ 
         // 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:
-            $this->_error('Unsupported output format');
-            return false;
+            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;
         }
     }
 
@@ -281,16 +281,16 @@ 
         // 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':
-           break;
-        default:
-            $this->_error('Unsupported input format: '.($one_time_encoding ? $one_time_encoding : $this->_api_encoding));
-            return false;
+            case 'utf8':
+                $decoded = $this->_utf8_to_ucs4($decoded);
+                break;
+            case 'ucs4_string':
+               $decoded = $this->_ucs4_string_to_ucs4($decoded);
+            case 'ucs4_array':
+               break;
+            default:
+                $this->_error('Unsupported input format: '.($one_time_encoding ? $one_time_encoding : $this->_api_encoding));
+                return false;
         }
 
         // No input, no output, what else did you expect?
@@ -303,35 +303,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;
-                // Right, no break here, the above are 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) {
-                   $this->_error('Neither email addresses nor URLs are allowed in strict mode.');
-                   return false;
-                } else {
-                    // 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;
+                    // Right, no break here, the above are 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) {
+                       $this->_error('Neither email addresses nor URLs are allowed in strict mode.');
+                       return false;
+                    } else {
+                        // 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]);
                         }
-                        $output .= chr($decoded[$k]);
+                        $last_begin = $k + 1;
                     }
-                    $last_begin = $k + 1;
-                }
             }
         }
         // Catch the rest of the string

Spacing +74 added lines, -79 removed lines

@@ -72,7 +72,7 @@ 
     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;
 
@@ -80,10 +80,10 @@ 
 
     // 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
@@ -137,7 +137,7 @@ 
                     $this->_api_encoding = $v;
                     break;
                 default:
-                    $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                    $this->_error('Set Parameter: Unknown parameter ' . $v . ' for option ' . $k);
                     return false;
                 }
                 break;
@@ -151,7 +151,7 @@ 
                 if (in_array($v, array('2003', '2008'))) {
                     $this->_idn_version = $v;
                 } else {
-                    $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                    $this->_error('Set Parameter: Unknown parameter ' . $v . ' for option ' . $k);
                 }
                 break;
             case 'encode_german_sz': // Deprecated
@@ -162,7 +162,7 @@ 
                 }
                 break;
             default:
-                $this->_error('Set Parameter: Unknown option '.$k);
+                $this->_error('Set Parameter: Unknown option ' . $k);
                 return false;
             }
         }
@@ -185,7 +185,7 @@ 
             case 'ucs4_array':
                 break;
             default:
-                $this->_error('Unknown encoding '.$one_time_encoding);
+                $this->_error('Unknown encoding ' . $one_time_encoding);
                 return false;
             }
         }
@@ -203,7 +203,7 @@ 
             list ($email_pref, $input) = explode('@', $input, 2);
             $arr = explode('.', $input);
             foreach ($arr as $k => $v) {
-                if (preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $v)) {
+                if (preg_match('!^' . preg_quote($this->_punycode_prefix, '!') . '!', $v)) {
                     $conv = $this->_decode($v);
                     if ($conv) $arr[$k] = $conv;
                 }
@@ -211,7 +211,7 @@ 
             $input = join('.', $arr);
             $arr = explode('.', $email_pref);
             foreach ($arr as $k => $v) {
-                if (preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $v)) {
+                if (preg_match('!^' . preg_quote($this->_punycode_prefix, '!') . '!', $v)) {
                     $conv = $this->_decode($v);
                     if ($conv) $arr[$k] = $conv;
                 }
@@ -233,13 +233,13 @@ 
                 }
                 $parsed['host'] = join('.', $arr);
                 $return =
-                        (empty($parsed['scheme']) ? '' : $parsed['scheme'].(strtolower($parsed['scheme']) == 'mailto' ? ':' : '://'))
-                        .(empty($parsed['user']) ? '' : $parsed['user'].(empty($parsed['pass']) ? '' : ':'.$parsed['pass']).'@')
+                        (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['port']) ? '' : ':' . $parsed['port'])
                         .(empty($parsed['path']) ? '' : $parsed['path'])
-                        .(empty($parsed['query']) ? '' : '?'.$parsed['query'])
-                        .(empty($parsed['fragment']) ? '' : '#'.$parsed['fragment']);
+                        .(empty($parsed['query']) ? '' : '?' . $parsed['query'])
+                        .(empty($parsed['fragment']) ? '' : '#' . $parsed['fragment']);
             } else { // parse_url seems to have failed, try without it
                 $arr = explode('.', $input);
                 foreach ($arr as $k => $v) {
@@ -255,8 +255,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));
@@ -281,15 +280,14 @@ 
         // 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);
         case 'ucs4_array':
            break;
         default:
-            $this->_error('Unsupported input format: '.($one_time_encoding ? $one_time_encoding : $this->_api_encoding));
+            $this->_error('Unsupported input format: ' . ($one_time_encoding ? $one_time_encoding : $this->_api_encoding));
             return false;
         }
 
@@ -302,7 +300,7 @@ 
         $output = '';
         foreach ($decoded as $k => $v) {
             // Make sure to use just the plain dot
-            switch($v) {
+            switch ($v) {
             case 0x3002:
             case 0xFF0E:
             case 0xFF61:
@@ -322,11 +320,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]);
                     }
@@ -338,11 +336,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;
         } else {
@@ -375,13 +373,13 @@ 
         }
         $parsed['host'] = join('.', $arr);
         $return =
-                (empty($parsed['scheme']) ? '' : $parsed['scheme'].(strtolower($parsed['scheme']) == 'mailto' ? ':' : '://'))
-                .(empty($parsed['user']) ? '' : $parsed['user'].(empty($parsed['pass']) ? '' : ':'.$parsed['pass']).'@')
+                (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['port']) ? '' : ':' . $parsed['port'])
                 .(empty($parsed['path']) ? '' : $parsed['path'])
-                .(empty($parsed['query']) ? '' : '?'.$parsed['query'])
-                .(empty($parsed['fragment']) ? '' : '#'.$parsed['fragment']);
+                .(empty($parsed['query']) ? '' : '?' . $parsed['query'])
+                .(empty($parsed['fragment']) ? '' : '#' . $parsed['fragment']);
         return $return;
     }
 
@@ -404,11 +402,11 @@ 
     {
         $decoded = array();
         // find the Punycode prefix
-        if (!preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $encoded)) {
+        if (!preg_match('!^' . preg_quote($this->_punycode_prefix, '!') . '!', $encoded)) {
             $this->_error('This is not a punycode string');
             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) {
             $this->_error('The given encoded string was empty');
@@ -431,11 +429,10 @@ 
         $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 ($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));
             }
@@ -500,7 +497,7 @@ 
         if ($codecount == $deco_len) return $encoded; // All codepoints were basic ones
 
         // 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) $encoded .= '-';
         // Now find and encode all non-basic code points
@@ -525,14 +522,13 @@ 
                     $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));
                     }
                     $encoded .= $this->_encode_digit($q);
-                    $bias = $this->_adapt($delta, $codecount+1, $is_first);
+                    $bias = $this->_adapt($delta, $codecount + 1, $is_first);
                     $codecount++;
                     $delta = 0;
                     $is_first = false;
@@ -610,12 +606,12 @@ 
             if (in_array($v, self::$NP['map_nothing'])) continue;
             // Try to find prohibited input
             if (in_array($v, self::$NP['prohibit']) || in_array($v, self::$NP['general_prohibited'])) {
-                $this->_error('NAMEPREP: Prohibited input U+'.sprintf('%08X', $v));
+                $this->_error('NAMEPREP: Prohibited input U+' . sprintf('%08X', $v));
                 return false;
             }
             foreach (self::$NP['prohibit_ranges'] as $range) {
                 if ($range[0] <= $v && $v <= $range[1]) {
-                    $this->_error('NAMEPREP: Prohibited input U+'.sprintf('%08X', $v));
+                    $this->_error('NAMEPREP: Prohibited input U+' . sprintf('%08X', $v));
                     return false;
                 }
             }
@@ -654,13 +650,13 @@ 
                 if ($out) {
                     $output[$last_starter] = $out;
                     if (count($out) != $seq_len) {
-                        for ($j = $i+1; $j < $out_len; ++$j) $output[$j-1] = $output[$j];
+                        for ($j = $i + 1; $j < $out_len; ++$j) $output[$j - 1] = $output[$j];
                         unset($output[$out_len]);
                     }
                     // Rewind the for loop by one, since there can be more possible compositions
                     $i--;
                     $out_len--;
-                    $last_class = ($i == $last_starter) ? 0 : $this->_get_combining_class($output[$i-1]);
+                    $last_class = ($i == $last_starter) ? 0 : $this->_get_combining_class($output[$i - 1]);
                     continue;
                 }
             }
@@ -752,15 +748,15 @@ 
         while ($swap) {
             $swap = false;
             $last = $this->_get_combining_class(intval($input[0]));
-            for ($i = 0; $i < $size-1; ++$i) {
-                $next = $this->_get_combining_class(intval($input[$i+1]));
+            for ($i = 0; $i < $size - 1; ++$i) {
+                $next = $this->_get_combining_class(intval($input[$i + 1]));
                 if ($next != 0 && $last > $next) {
                     // Move item leftward until it fits
                     for ($j = $i + 1; $j > 0; --$j) {
-                        if ($this->_get_combining_class(intval($input[$j-1])) <= $next) break;
+                        if ($this->_get_combining_class(intval($input[$j - 1])) <= $next) break;
                         $t = intval($input[$j]);
-                        $input[$j] = intval($input[$j-1]);
-                        $input[$j-1] = $t;
+                        $input[$j] = intval($input[$j - 1]);
+                        $input[$j - 1] = $t;
                         $swap = true;
                     }
                     // Reentering the loop looking at the old character again
@@ -831,7 +827,7 @@ 
                 $output[$out_len] = $v;
                 ++$out_len;
                 if ('add' == $mode) {
-                    $this->_error('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                    $this->_error('Conversion from UTF-8 to UCS-4 failed: malformed input at byte ' . $k);
                     return false;
                 }
                 continue;
@@ -856,7 +852,7 @@ 
                     $next_byte = 4;
                     $v = ($v - 252) << 30;
                 } else {
-                    $this->_error('This might be UTF-8, but I don\'t understand it at byte '.$k);
+                    $this->_error('This might be UTF-8, but I don\'t understand it at byte ' . $k);
                     return false;
                 }
                 if ('add' == $mode) {
@@ -869,7 +865,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)) {
-                        $this->_error('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
+                        $this->_error('Bogus UTF-8 character detected (out of legal range) at byte ' . $k);
                         return false;
                     }
                 }
@@ -878,7 +874,7 @@ 
                     $output[($out_len - 1)] += $v;
                     --$next_byte;
                 } else {
-                    $this->_error('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                    $this->_error('Conversion from UTF-8 to UCS-4 failed: malformed input at byte ' . $k);
                     return false;
                 }
                 if ($next_byte < 0) {
@@ -902,13 +898,13 @@ 
             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));
             } else {
-                $this->_error('Conversion from UCS-4 to UTF-8 failed: malformed input at byte '.$k);
+                $this->_error('Conversion from UCS-4 to UTF-8 failed: malformed input at byte ' . $k);
                 return false;
             }
         }
@@ -927,7 +923,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 .= 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;
     }
@@ -955,7 +951,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;
     }
@@ -1017,13 +1013,12 @@ 
      * @private array
      * @since 0.5.2
      */
-    protected static $NP = array
-            ('map_nothing' => array(0xAD, 0x34F, 0x1806, 0x180B, 0x180C, 0x180D, 0x200B, 0x200C
+    protected static $NP = array('map_nothing' => array(0xAD, 0x34F, 0x1806, 0x180B, 0x180C, 0x180D, 0x200B, 0x200C
                     ,0x200D, 0x2060, 0xFE00, 0xFE01, 0xFE02, 0xFE03, 0xFE04, 0xFE05, 0xFE06, 0xFE07
                     ,0xFE08, 0xFE09, 0xFE0A, 0xFE0B, 0xFE0C, 0xFE0D, 0xFE0E, 0xFE0F, 0xFEFF
                     )
             ,'general_prohibited' => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
-                    ,20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 ,33, 34, 35, 36, 37, 38, 39, 40, 41, 42
+                    ,20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42
                     ,43, 44, 47, 59, 60, 61, 62, 63, 64, 91, 92, 93, 94, 95, 96, 123, 124, 125, 126, 127, 0x3002
                     )
             ,'prohibit' => array(0xA0, 0x340, 0x341, 0x6DD, 0x70F, 0x1680, 0x180E, 0x2000, 0x2001, 0x2002, 0x2003
@@ -1035,7 +1030,7 @@ 
                     ,0xCFFFE, 0xCFFFF, 0xDFFFE, 0xDFFFF, 0xE0001, 0xEFFFE, 0xEFFFF, 0xFFFFE, 0xFFFFF, 0x10FFFE, 0x10FFFF
                     )
             ,'prohibit_ranges' => array(array(0x80, 0x9F), array(0x2060, 0x206F), array(0x1D173, 0x1D17A)
-                    ,array(0xE000, 0xF8FF) ,array(0xF0000, 0xFFFFD), array(0x100000, 0x10FFFD)
+                    ,array(0xE000, 0xF8FF), array(0xF0000, 0xFFFFD), array(0x100000, 0x10FFFD)
                     ,array(0xFDD0, 0xFDEF), array(0xD800, 0xDFFF), array(0x2FF0, 0x2FFB), array(0xE0020, 0xE007F)
                     )
             ,'replacemaps' => array(0x41 => array(0x61), 0x42 => array(0x62), 0x43 => array(0x63)
@@ -1301,7 +1296,7 @@ 
                     ,0x2128  => array(0x7A), 0x212A  => array(0x6B), 0x212B  => array(0xE5)
                     ,0x212C  => array(0x62), 0x212D  => array(0x63), 0x2130  => array(0x65)
                     ,0x2131  => array(0x66), 0x2133  => array(0x6D), 0x213E  => array(0x3B3)
-                    ,0x213F  => array(0x3C0), 0x2145  => array(0x64) ,0x2160  => array(0x2170)
+                    ,0x213F  => array(0x3C0), 0x2145  => array(0x64), 0x2160  => array(0x2170)
                     ,0x2161  => array(0x2171), 0x2162  => array(0x2172), 0x2163  => array(0x2173)
                     ,0x2164  => array(0x2174), 0x2165  => array(0x2175), 0x2166  => array(0x2176)
                     ,0x2167  => array(0x2177), 0x2168  => array(0x2178), 0x2169  => array(0x2179)
@@ -1449,7 +1444,7 @@ 
                     ,0x1D5E5 => array(0x72), 0x1D5E6 => array(0x73), 0x1D5E7 => array(0x74)
                     ,0x1D5E8 => array(0x75), 0x1D5E9 => array(0x76), 0x1D5EA => array(0x77)
                     ,0x1D5EB => array(0x78), 0x1D5EC => array(0x79), 0x1D5ED => array(0x7A)
-                    ,0x1D608 => array(0x61), 0x1D609 => array(0x62) ,0x1D60A => array(0x63)
+                    ,0x1D608 => array(0x61), 0x1D609 => array(0x62), 0x1D60A => array(0x63)
                     ,0x1D60B => array(0x64), 0x1D60C => array(0x65), 0x1D60D => array(0x66)
                     ,0x1D60E => array(0x67), 0x1D60F => array(0x68), 0x1D610 => array(0x69)
                     ,0x1D611 => array(0x6A), 0x1D612 => array(0x6B), 0x1D613 => array(0x6C)
@@ -1489,9 +1484,9 @@ 
                     ,0x1D6E9 => array(0x3B8), 0x1D6EA => array(0x3B9), 0x1D6EB => array(0x3BA)
                     ,0x1D6EC => array(0x3BB), 0x1D6ED => array(0x3BC), 0x1D6EE => array(0x3BD)
                     ,0x1D6EF => array(0x3BE), 0x1D6F0 => array(0x3BF), 0x1D6F1 => array(0x3C0)
-                    ,0x1D6F2 => array(0x3C1), 0x1D6F3 => array(0x3B8) ,0x1D6F4 => array(0x3C3)
+                    ,0x1D6F2 => array(0x3C1), 0x1D6F3 => array(0x3B8), 0x1D6F4 => array(0x3C3)
                     ,0x1D6F5 => array(0x3C4), 0x1D6F6 => array(0x3C5), 0x1D6F7 => array(0x3C6)
-                    ,0x1D6F8 => array(0x3C7), 0x1D6F9 => array(0x3C8) ,0x1D6FA => array(0x3C9)
+                    ,0x1D6F8 => array(0x3C7), 0x1D6F9 => array(0x3C8), 0x1D6FA => array(0x3C9)
                     ,0x1D70D => array(0x3C3), 0x1D71C => array(0x3B1), 0x1D71D => array(0x3B2)
                     ,0x1D71E => array(0x3B3), 0x1D71F => array(0x3B4), 0x1D720 => array(0x3B5)
                     ,0x1D721 => array(0x3B6), 0x1D722 => array(0x3B7), 0x1D723 => array(0x3B8)
@@ -1531,18 +1526,18 @@ 
                     ,0x337A  => array(0x69, 0x75), 0x33DE  => array(0x76, 0x2215, 0x6D)
                     ,0x33DF  => array(0x61, 0x2215, 0x6D)
                     )
-            ,'norm_combcls' => array(0x334   => 1,   0x335   => 1,   0x336   => 1,   0x337   => 1
-                    ,0x338   => 1,   0x93C   => 7,   0x9BC   => 7,   0xA3C   => 7,   0xABC   => 7
-                    ,0xB3C   => 7,   0xCBC   => 7,   0x1037  => 7,   0x3099  => 8,   0x309A  => 8
-                    ,0x94D   => 9,   0x9CD   => 9,   0xA4D   => 9,   0xACD   => 9,   0xB4D   => 9
-                    ,0xBCD   => 9,   0xC4D   => 9,   0xCCD   => 9,   0xD4D   => 9,   0xDCA   => 9
-                    ,0xE3A   => 9,   0xF84   => 9,   0x1039  => 9,   0x1714  => 9,   0x1734  => 9
-                    ,0x17D2  => 9,   0x5B0   => 10,  0x5B1   => 11,  0x5B2   => 12,  0x5B3   => 13
-                    ,0x5B4   => 14,  0x5B5   => 15,  0x5B6   => 16,  0x5B7   => 17,  0x5B8   => 18
-                    ,0x5B9   => 19,  0x5BB   => 20,  0x5Bc   => 21,  0x5BD   => 22,  0x5BF   => 23
-                    ,0x5C1   => 24,  0x5C2   => 25,  0xFB1E  => 26,  0x64B   => 27,  0x64C   => 28
-                    ,0x64D   => 29,  0x64E   => 30,  0x64F   => 31,  0x650   => 32,  0x651   => 33
-                    ,0x652   => 34,  0x670   => 35,  0x711   => 36,  0xC55   => 84,  0xC56   => 91
+            ,'norm_combcls' => array(0x334   => 1, 0x335   => 1, 0x336   => 1, 0x337   => 1
+                    ,0x338   => 1, 0x93C   => 7, 0x9BC   => 7, 0xA3C   => 7, 0xABC   => 7
+                    ,0xB3C   => 7, 0xCBC   => 7, 0x1037  => 7, 0x3099  => 8, 0x309A  => 8
+                    ,0x94D   => 9, 0x9CD   => 9, 0xA4D   => 9, 0xACD   => 9, 0xB4D   => 9
+                    ,0xBCD   => 9, 0xC4D   => 9, 0xCCD   => 9, 0xD4D   => 9, 0xDCA   => 9
+                    ,0xE3A   => 9, 0xF84   => 9, 0x1039  => 9, 0x1714  => 9, 0x1734  => 9
+                    ,0x17D2  => 9, 0x5B0   => 10, 0x5B1   => 11, 0x5B2   => 12, 0x5B3   => 13
+                    ,0x5B4   => 14, 0x5B5   => 15, 0x5B6   => 16, 0x5B7   => 17, 0x5B8   => 18
+                    ,0x5B9   => 19, 0x5BB   => 20, 0x5Bc   => 21, 0x5BD   => 22, 0x5BF   => 23
+                    ,0x5C1   => 24, 0x5C2   => 25, 0xFB1E  => 26, 0x64B   => 27, 0x64C   => 28
+                    ,0x64D   => 29, 0x64E   => 30, 0x64F   => 31, 0x650   => 32, 0x651   => 33
+                    ,0x652   => 34, 0x670   => 35, 0x711   => 36, 0xC55   => 84, 0xC56   => 91
                     ,0xE38   => 103, 0xE39   => 103, 0xE48   => 107, 0xE49   => 107, 0xE4A   => 107
                     ,0xE4B   => 107, 0xEB8   => 118, 0xEB9   => 118, 0xEC8   => 122, 0xEC9   => 122
                     ,0xECA   => 122, 0xECB   => 122, 0xF71   => 129, 0xF72   => 130, 0xF7A   => 130

Braces +75 added lines, -24 removed lines

@@ -205,7 +205,9 @@ 
             foreach ($arr as $k => $v) {
                 if (preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $v)) {
                     $conv = $this->_decode($v);
-                    if ($conv) $arr[$k] = $conv;
+                    if ($conv) {
+                        $arr[$k] = $conv;
+                    }
                 }
             }
             $input = join('.', $arr);
@@ -213,7 +215,9 @@ 
             foreach ($arr as $k => $v) {
                 if (preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $v)) {
                     $conv = $this->_decode($v);
-                    if ($conv) $arr[$k] = $conv;
+                    if ($conv) {
+                        $arr[$k] = $conv;
+                    }
                 }
             }
             $email_pref = join('.', $arr);
@@ -229,7 +233,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);
                 $return =
@@ -250,7 +256,9 @@ 
             }
         } else { // Otherwise we consider it being a pure domain name string
             $return = $this->_decode($input);
-            if (!$return) $return = $input;
+            if (!$return) {
+                $return = $input;
+            }
         }
         // 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
@@ -294,7 +302,9 @@ 
         }
 
         // No input, no output, what else did you expect?
-        if (empty($decoded)) return '';
+        if (empty($decoded)) {
+            return '';
+        }
 
         // Anchors for iteration
         $last_begin = 0;
@@ -371,7 +381,9 @@ 
         $arr = explode('.', $parsed['host']);
         foreach ($arr as $k => $v) {
             $conv = $this->encode($v, 'utf8');
-            if ($conv) $arr[$k] = $conv;
+            if ($conv) {
+                $arr[$k] = $conv;
+            }
         }
         $parsed['host'] = join('.', $arr);
         $return =
@@ -436,7 +448,9 @@ 
                 $idx += $digit * $w;
                 $t = ($k <= $bias) ? $this->_tmin :
                         (($k >= $bias + $this->_tmax) ? $this->_tmax : ($k - $bias));
-                if ($digit < $t) break;
+                if ($digit < $t) {
+                    break;
+                }
                 $w = (int) ($w * ($this->_base - $t));
             }
             $bias = $this->_adapt($idx - $old_idx, $deco_len + 1, $is_first);
@@ -445,7 +459,9 @@ 
             $idx %= ($deco_len + 1);
             if ($deco_len > 0) {
                 // Make room for the decoded char
-                for ($i = $deco_len; $i > $idx; $i--) $decoded[$i] = $decoded[($i - 1)];
+                for ($i = $deco_len; $i > $idx; $i--) {
+                    $decoded[$i] = $decoded[($i - 1)];
+                }
             }
             $decoded[$idx++] = $char;
         }
@@ -482,9 +498,15 @@ 
         }
         // Do NAMEPREP
         $decoded = $this->_nameprep($decoded);
-        if (!$decoded || !is_array($decoded)) return false; // NAMEPREP failed
+        if (!$decoded || !is_array($decoded)) {
+            return false;
+        }
+        // NAMEPREP failed
         $deco_len  = count($decoded);
-        if (!$deco_len) return false; // Empty array
+        if (!$deco_len) {
+            return false;
+        }
+        // Empty array
         $codecount = 0; // How many chars have been consumed
         $encoded = '';
         // Copy all basic code points to output
@@ -497,12 +519,17 @@ 
                 $codecount++;
             }
         }
-        if ($codecount == $deco_len) return $encoded; // All codepoints were basic ones
+        if ($codecount == $deco_len) {
+            return $encoded;
+        }
+        // All codepoints were basic ones
 
         // Start with the prefix; copy it to output
         $encoded = $this->_punycode_prefix.$encoded;
         // If we have basic code points in output, add an hyphen to the end
-        if ($codecount) $encoded .= '-';
+        if ($codecount) {
+            $encoded .= '-';
+        }
         // Now find and encode all non-basic code points
         $is_first = true;
         $cur_code = $this->_initial_n;
@@ -527,7 +554,9 @@ 
                     for ($q = $delta, $k = $this->_base; 1; $k += $this->_base) {
                         $t = ($k <= $bias) ? $this->_tmin :
                                 (($k >= $bias + $this->_tmax) ? $this->_tmax : $k - $bias);
-                        if ($q < $t) break;
+                        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));
                     }
@@ -607,7 +636,9 @@ 
         // While mapping required chars we apply the cannonical ordering
         foreach ($input as $v) {
             // Map to nothing == skip that code point
-            if (in_array($v, self::$NP['map_nothing'])) continue;
+            if (in_array($v, self::$NP['map_nothing'])) {
+                continue;
+            }
             // Try to find prohibited input
             if (in_array($v, self::$NP['prohibit']) || in_array($v, self::$NP['general_prohibited'])) {
                 $this->_error('NAMEPREP: Prohibited input U+'.sprintf('%08X', $v));
@@ -654,7 +685,9 @@ 
                 if ($out) {
                     $output[$last_starter] = $out;
                     if (count($out) != $seq_len) {
-                        for ($j = $i+1; $j < $out_len; ++$j) $output[$j-1] = $output[$j];
+                        for ($j = $i+1; $j < $out_len; ++$j) {
+                            $output[$j-1] = $output[$j];
+                        }
                         unset($output[$out_len]);
                     }
                     // Rewind the for loop by one, since there can be more possible compositions
@@ -665,7 +698,9 @@ 
                 }
             }
             // The current class is 0
-            if (!$class) $last_starter = $i;
+            if (!$class) {
+                $last_starter = $i;
+            }
             $last_class = $class;
         }
         return $output;
@@ -680,12 +715,16 @@ 
     protected function _hangul_decompose($char)
     {
         $sindex = (int) $char - $this->_sbase;
-        if ($sindex < 0 || $sindex >= $this->_scount) return array($char);
+        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;
         $T = intval($this->_tbase + $sindex % $this->_tcount);
-        if ($T != $this->_tbase) $result[] = $T;
+        if ($T != $this->_tbase) {
+            $result[] = $T;
+        }
         return $result;
     }
     /**
@@ -697,7 +736,9 @@ 
     protected function _hangul_compose($input)
     {
         $inp_len = count($input);
-        if (!$inp_len) return array();
+        if (!$inp_len) {
+            return array();
+        }
         $result = array();
         $last = (int) $input[0];
         $result[] = $last; // copy first char from input to output
@@ -757,7 +798,9 @@ 
                 if ($next != 0 && $last > $next) {
                     // Move item leftward until it fits
                     for ($j = $i + 1; $j > 0; --$j) {
-                        if ($this->_get_combining_class(intval($input[$j-1])) <= $next) break;
+                        if ($this->_get_combining_class(intval($input[$j-1])) <= $next) {
+                            break;
+                        }
                         $t = intval($input[$j]);
                         $input[$j] = intval($input[$j-1]);
                         $input[$j-1] = $t;
@@ -784,8 +827,12 @@ 
             return false;
         }
         foreach (self::$NP['replacemaps'] as $np_src => $np_target) {
-            if ($np_target[0] != $input[0]) continue;
-            if (count($np_target) != $inp_len) continue;
+            if ($np_target[0] != $input[0]) {
+                continue;
+            }
+            if (count($np_target) != $inp_len) {
+                continue;
+            }
             $hit = false;
             foreach ($input as $k2 => $v2) {
                 if ($v2 == $np_target[$k2]) {
@@ -795,7 +842,9 @@ 
                     break;
                 }
             }
-            if ($hit) return $np_src;
+            if ($hit) {
+                return $np_src;
+            }
         }
         return false;
     }
@@ -948,7 +997,9 @@ 
             return false;
         }
         // 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) {
             // Increment output position every 4 input bytes
             if (!($i % 4)) {

index.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     }
 }
 
-require_once( INJI_SYSTEM_DIR . '/init.php' );
+require_once(INJI_SYSTEM_DIR . '/init.php');
 /**
  * System error messages
  */

system/Inji/Html.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         $html = "<{$tag}";
         if ($attributes && is_array($attributes)) {
             foreach ($attributes as $key => $value) {
-                $html .=" {$key} = '";
+                $html .= " {$key} = '";
                 if (!is_array($value)) {
                     $html .= addcslashes($value, "'");
                 } else {

system/Inji/Log.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
                 echo "<tr><td>{$log['name']}</td><td" . (round(($log['end'] - $log['start']), 5) > 0.1 ? ' class ="danger"' : '') . ">" . round(($log['end'] - $log['start']), 5) . "</td></tr>";
             }
         }
-        echo '<tr><th>Summary</th><th>' . round(( microtime(true) - $this->startTime), 5) . '</th></tr>';
+        echo '<tr><th>Summary</th><th>' . round((microtime(true) - $this->startTime), 5) . '</th></tr>';
         echo '<tr><th>Memory</th><th>' . $this->convertSize(memory_get_peak_usage()) . ' of ' . ini_get('memory_limit') . '</th></tr></table></div>';
     }
 

Braces +13 added lines, -10 removed lines

@@ -79,10 +79,12 @@ 
             if (!empty($log['status'])) {
                 echo "<tr class = '{$log['status']}'><td>{$log['name']}</td><td>{$log['status']}</td></tr>";
             } else {
-                if (empty($log['end']))
-                    $log['end'] = microtime(true);
-                if (empty($log['start']))
-                    $log['start'] = microtime(true);
+                if (empty($log['end'])) {
+                                    $log['end'] = microtime(true);
+                }
+                if (empty($log['start'])) {
+                                    $log['start'] = microtime(true);
+                }
                 echo "<tr><td>{$log['name']}</td><td" . (round(($log['end'] - $log['start']), 5) > 0.1 ? ' class ="danger"' : '') . ">" . round(($log['end'] - $log['start']), 5) . "</td></tr>";
             }
         }
@@ -93,12 +95,13 @@ 
     function convertSize($size)
     {
 
-        if ($size < 1024)
-            return $size . "B";
-        elseif ($size < 1048576)
-            return round($size / 1024, 2) . "KB";
-        else
-            return round($size / 1048576, 2) . "MB";
+        if ($size < 1024) {
+                    return $size . "B";
+        } elseif ($size < 1048576) {
+                    return round($size / 1024, 2) . "KB";
+        } else {
+                    return round($size / 1048576, 2) . "MB";
+        }
     }
 
     function __destruct()

system/Inji/Model.php

Spacing +1 added lines, -1 removed lines

@@ -1035,7 +1035,7 @@
         } else {
             $cols .= '*';
         }
-        $cols .=') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : '');
+        $cols .= ') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : '');
         App::$cur->db->cols = $cols;
         if (!empty($options['group'])) {
             App::$cur->db->group($options['group']);

Doc Comments +5 added lines, -5 removed lines

@@ -357,7 +357,7 @@ 
     /**
      * Information extractor for col relations path
      * 
-     * @param string|array $info
+     * @param string $info
      * @return array
      */
     public static function parseColRecursion($info)
@@ -432,8 +432,8 @@ 
     /**
      * Generate params string for col by name
      * 
-     * @param type $colName
-     * @return boolean|string
+     * @param string $colName
+     * @return false|string
      */
     public static function genColParams($colName)
     {
@@ -573,7 +573,7 @@ 
     /**
      * return relations list
      * 
-     * @return array
+     * @return string
      */
     public static function relations()
     {
@@ -1065,7 +1065,7 @@ 
      * 
      * @param array $params
      * @param array $where
-     * @return boolean
+     * @return false|null
      */
     public static function update($params, $where = [])
     {

Braces +42 added lines, -32 removed lines

@@ -685,17 +685,21 @@ 
      */
     public static function get_list($options = [])
     {
-        if (!empty($options['where']))
-            App::$cur->db->where($options['where']);
+        if (!empty($options['where'])) {
+                    App::$cur->db->where($options['where']);
+        }
         if (!empty($options['group'])) {
             App::$cur->db->group($options['group']);
         }
-        if (!empty($options['order']))
-            App::$cur->db->order($options['order']);
-        if (!empty($options['join']))
-            App::$cur->db->join($options['join']);
-        if (!empty($options['distinct']))
-            App::$cur->db->distinct = $options['distinct'];
+        if (!empty($options['order'])) {
+                    App::$cur->db->order($options['order']);
+        }
+        if (!empty($options['join'])) {
+                    App::$cur->db->join($options['join']);
+        }
+        if (!empty($options['distinct'])) {
+                    App::$cur->db->distinct = $options['distinct'];
+        }
 
         foreach (static::$relJoins as $join) {
             App::$cur->db->join($join[0], $join[1]);
@@ -721,14 +725,14 @@ 
         }
         static::$needJoin = [];
 
-        if (!empty($options['limit']))
-            $limit = (int) $options['limit'];
-        else {
+        if (!empty($options['limit'])) {
+                    $limit = (int) $options['limit'];
+        } else {
             $limit = 0;
         }
-        if (!empty($options['start']))
-            $start = (int) $options['start'];
-        else {
+        if (!empty($options['start'])) {
+                    $start = (int) $options['start'];
+        } else {
             $start = 0;
         }
         if ($limit || $start) {
@@ -983,21 +987,23 @@ 
         if (!empty($options['where'])) {
             static::fixPrefix($options['where'], 'first');
         }
-        if (!empty($options['where']))
-            App::$cur->db->where($options['where']);
-        if (!empty($options['join']))
-            App::$cur->db->join($options['join']);
+        if (!empty($options['where'])) {
+                    App::$cur->db->where($options['where']);
+        }
+        if (!empty($options['join'])) {
+                    App::$cur->db->join($options['join']);
+        }
         if (!empty($options['order'])) {
             App::$cur->db->order($options['order']);
         }
-        if (!empty($options['limit']))
-            $limit = (int) $options['limit'];
-        else {
+        if (!empty($options['limit'])) {
+                    $limit = (int) $options['limit'];
+        } else {
             $limit = 0;
         }
-        if (!empty($options['start']))
-            $start = (int) $options['start'];
-        else {
+        if (!empty($options['start'])) {
+                    $start = (int) $options['start'];
+        } else {
             $start = 0;
         }
         if ($limit || $start) {
@@ -1075,8 +1081,9 @@ 
 
         $values = [];
         foreach ($cols as $col => $param) {
-            if (isset($params[$col]))
-                $values[$col] = $params[$col];
+            if (isset($params[$col])) {
+                            $values[$col] = $params[$col];
+            }
         }
         if (empty($values)) {
             return false;
@@ -1259,8 +1266,9 @@ 
         $values = [];
 
         foreach ($this->cols() as $col => $param) {
-            if (isset($this->_params[$col]))
-                $values[$col] = $this->_params[$col];
+            if (isset($this->_params[$col])) {
+                            $values[$col] = $this->_params[$col];
+            }
         }
         if (empty($values) && empty($options['empty'])) {
             return false;
@@ -1420,8 +1428,9 @@ 
     {
 
         foreach (static::relations() as $relName => $rel) {
-            if ($rel['col'] == $col)
-                return $relName;
+            if ($rel['col'] == $col) {
+                            return $relName;
+            }
         }
         return NULL;
     }
@@ -1577,8 +1586,9 @@ 
             App::$cur->db->where($relation['relTablePrefix'] . $this->index(), $this->pk());
             App::$cur->db->where($relation['relTablePrefix'] . $relation['model']::index(), $objectId);
             $isset = App::$cur->db->select($relation['relTable'])->fetch_assoc();
-            if ($isset)
-                return true;
+            if ($isset) {
+                            return true;
+            }
 
             App::$cur->db->insert($relation['relTable'], [
                 $relation['relTablePrefix'] . $this->index() => $this->{$this->index()},

system/Inji/Msg.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
             if (!empty($_SESSION['_INJI_MSG'])) {
                 foreach ($_SESSION['_INJI_MSG'] as $key => $msg) {
                     if ($msg['text'] == $text) {
-                        $msg['count'] ++;
+                        $msg['count']++;
                         return true;
                     }
                 }

Braces +3 added lines, -2 removed lines

@@ -52,8 +52,9 @@
      */
     static function get($clean = false)
     {
-        if (empty($_SESSION['_INJI_MSG']))
-            return [];
+        if (empty($_SESSION['_INJI_MSG'])) {
+                    return [];
+        }
         $msgs = $_SESSION['_INJI_MSG'];
         if ($clean) {
             $_SESSION['_INJI_MSG'] = [];

system/modules/Access/Access.php

Braces +6 added lines, -4 removed lines

@@ -15,8 +15,9 @@ 
         if (!$app) {
             $app = $this->app->type;
         }
-        if (!empty($this->config['access']['accessTree'][$app]['deniedUrl']))
-            return $this->config['access']['accessTree'][$app]['deniedUrl'];
+        if (!empty($this->config['access']['accessTree'][$app]['deniedUrl'])) {
+                    return $this->config['access']['accessTree'][$app]['deniedUrl'];
+        }
 
         return '/';
     }
@@ -50,8 +51,9 @@ 
             return true;
         }
 
-        if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access)))
-            return false;
+        if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access))) {
+                    return false;
+        }
 
         return true;
     }

system/modules/Callbacks/appControllers/content/index.php

Indentation +6 added lines, -6 removed lines

@@ -1,12 +1,12 @@
 <div class = 'callbacks'>
   <h1>Отзывы</h1>
   <?php
-  $callbacks = Callbacks\Callback::getList(['where' => ['view', '1'], 'order' => ['weight', 'asc']]);
-  foreach ($callbacks as $callback) {
-      echo "<h3>{$callback->name}<div class = 'time'>{$callback->date_create}</div></h3>";
-      echo "<p>" . nl2br($callback->text) . "</p>";
-  }
-  ?>
+    $callbacks = Callbacks\Callback::getList(['where' => ['view', '1'], 'order' => ['weight', 'asc']]);
+    foreach ($callbacks as $callback) {
+        echo "<h3>{$callback->name}<div class = 'time'>{$callback->date_create}</div></h3>";
+        echo "<p>" . nl2br($callback->text) . "</p>";
+    }
+    ?>
 </div>
 <h3>Можете и вы в свободной форме оставить свой отзыв</h3>
 <?php