zikula / core

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);
     }
 
     /**

Braces +34 added lines, -17 removed lines

@@ -49,7 +49,8 @@ 
  * @copyright 2004-2014 phlyLabs Berlin, http://phlylabs.de
  * @version 0.9.0 2014-12-12
  */
-class idna_convert {
+class idna_convert
+{
 
     private $version = '0.9.0';
     protected $sub_version = 'main';
@@ -197,7 +198,8 @@ 
 
         // Negotiate input and try to determine, whether it is a plain string,
         // an email address or something like a complete URL
-        if (strpos($input, '@')) { // Maybe it is an email address
+        if (strpos($input, '@')) {
+// Maybe it is an email address
             // No no in strict mode
             if ($this->_strict_mode) {
                 $this->_error('Only simple domain name parts can be handled in strict mode');
@@ -225,7 +227,8 @@ 
             }
             $email_pref = join('.', $arr);
             $return = $email_pref . '@' . $input;
-        } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
+        } elseif (preg_match('![:\./]!', $input)) {
+// Or a complete domain name (with or without paths / parameters)
             // No no in strict mode
             if ($this->_strict_mode) {
                 $this->_error('Only simple domain name parts can be handled in strict mode');
@@ -248,7 +251,8 @@ 
                         (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
+            } else {
+// parse_url seems to have failed, try without it
                 $arr = explode('.', $input);
                 foreach ($arr as $k => $v) {
                     $conv = $this->_decode($v);
@@ -256,7 +260,8 @@ 
                 }
                 $return = join('.', $arr);
             }
-        } else { // Otherwise we consider it being a pure domain name string
+        } else {
+// Otherwise we consider it being a pure domain name string
             $return = $this->_decode($input);
             if (!$return) {
                 $return = $input;
@@ -865,7 +870,8 @@ 
         $test = 'none';
         for ($k = 0; $k < $inp_len; ++$k) {
             $v = ord($input{$k}); // Extract byte from input string
-            if ($v < 128) { // We found an ASCII char - put into stirng as is
+            if ($v < 128) {
+// We found an ASCII char - put into stirng as is
                 $output[$out_len] = $v;
                 ++$out_len;
                 if ('add' == $mode) {
@@ -874,23 +880,29 @@ 
                 }
                 continue;
             }
-            if ('next' == $mode) { // Try to find the next start byte; determine the width of the Unicode char
+            if ('next' == $mode) {
+// Try to find the next start byte; determine the width of the Unicode char
                 $start_byte = $v;
                 $mode = 'add';
                 $test = 'range';
-                if ($v >> 5 == 6) { // &110xxxxx 10xxxxx
+                if ($v >> 5 == 6) {
+// &110xxxxx 10xxxxx
                     $next_byte = 0; // Tells, how many times subsequent bitmasks must rotate 6bits to the left
                     $v = ($v - 192) << 6;
-                } elseif ($v >> 4 == 14) { // &1110xxxx 10xxxxxx 10xxxxxx
+                } elseif ($v >> 4 == 14) {
+// &1110xxxx 10xxxxxx 10xxxxxx
                     $next_byte = 1;
                     $v = ($v - 224) << 12;
-                } elseif ($v >> 3 == 30) { // &11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                } elseif ($v >> 3 == 30) {
+// &11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
                     $next_byte = 2;
                     $v = ($v - 240) << 18;
-                } elseif ($v >> 2 == 62) { // &111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+                } elseif ($v >> 2 == 62) {
+// &111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
                     $next_byte = 3;
                     $v = ($v - 248) << 24;
-                } elseif ($v >> 1 == 126) { // &1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+                } elseif ($v >> 1 == 126) {
+// &1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
                     $next_byte = 4;
                     $v = ($v - 252) << 30;
                 } else {
@@ -911,7 +923,8 @@ 
                         return false;
                     }
                 }
-                if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
+                if ($v >> 6 == 2) {
+// Bit mask must be 10xxxxxx
                     $v = ($v - 128) << ($next_byte * 6);
                     $output[($out_len - 1)] += $v;
                     --$next_byte;
@@ -937,13 +950,17 @@ 
     {
         $output = '';
         foreach ($input as $k => $v) {
-            if ($v < 128) { // 7bit are transferred literally
+            if ($v < 128) {
+// 7bit are transferred literally
                 $output .= chr($v);
-            } elseif ($v < (1 << 11)) { // 2 bytes
+            } elseif ($v < (1 << 11)) {
+// 2 bytes
                 $output .= chr(192 + ($v >> 6)) . chr(128 + ($v & 63));
-            } elseif ($v < (1 << 16)) { // 3 bytes
+            } elseif ($v < (1 << 16)) {
+// 3 bytes
                 $output .= chr(224 + ($v >> 12)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
-            } elseif ($v < (1 << 21)) { // 4 bytes
+            } 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));
             } else {
                 $this->_error('Conversion from UCS-4 to UTF-8 failed: malformed input at byte ' . $k);

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";
     }
 }
 ?>

src/lib/legacy/Zikula/AbstractVersion.php

Spacing +1 added lines, -1 removed lines

@@ -206,7 +206,7 @@
             $p = explode($separator, get_class($this));
             $this->name = $p[0];
             $this->directory = $this->name; // legacy handling
-            $this->baseDir = $this->libBaseDir = realpath(dirname($this->reflection->getFileName()).'/../..');
+            $this->baseDir = $this->libBaseDir = realpath(dirname($this->reflection->getFileName()) . '/../..');
             if (realpath($this->baseDir . '/lib/' . $this->name)) {
                 $this->libBaseDir = realpath($this->baseDir . '/lib/' . $this->name);
             }

src/lib/legacy/Zikula/View.php

Spacing +8 added lines, -8 removed lines

@@ -644,7 +644,7 @@ 
             $ostemplate = DataUtil::formatForOS($template);
             try {
                 $bundle = $this->getContainer()->get('kernel')->getBundle($module);
-                $bundlePath = $relativepath = $bundle->getRelativePath().'/Resources/views';
+                $bundlePath = $relativepath = $bundle->getRelativePath() . '/Resources/views';
             } catch (\InvalidArgumentException $e) {
             }
 
@@ -741,7 +741,7 @@ 
         $core['language'] = $this->language;
 
         // add userdata
-        $core['user']   = UserUtil::getVars(SessionUtil::getVar('uid'));
+        $core['user'] = UserUtil::getVars(SessionUtil::getVar('uid'));
 
         if (System::isLegacyMode()) {
             // add modvars of current modules
@@ -859,7 +859,7 @@ 
             $this->_filter_auto_id($compile_id);
         }
 
-        $auto_id = $cache_id . (!empty($compile_id) ? '/'.$compile_id : '');
+        $auto_id = $cache_id . (!empty($compile_id) ? '/' . $compile_id : '');
 
         $auto_id = trim($auto_id, '/');
 
@@ -944,7 +944,7 @@ 
             if (empty($themedir)) {
                 $themedir = $this->themeinfo['directory'];
             }
-            $path .= '--t_'.$themedir.'-l_' . $this->language;
+            $path .= '--t_' . $themedir . '-l_' . $this->language;
 
             // if we are not compiling, end with a suffix
             if (!$tocompile) {
@@ -1117,7 +1117,7 @@ 
             $moduledir = $this->modinfo['directory'];
         }
 
-        return $this->clear_folder($this->cache_dir .'/'. $moduledir);
+        return $this->clear_folder($this->cache_dir . '/' . $moduledir);
     }
 
     /**
@@ -2950,7 +2950,7 @@ 
                     if ($this->cache_modified_check) {
                         $_server_vars = ($this->request_use_auto_globals) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
                         $_last_modified_date = @substr($_server_vars['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_server_vars['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
-                        $_gmt_mtime = gmdate('D, d M Y H:i:s', $this->_cache_info['timestamp']).' GMT';
+                        $_gmt_mtime = gmdate('D, d M Y H:i:s', $this->_cache_info['timestamp']) . ' GMT';
                         if (@count($this->_cache_info['insert_tags']) == 0
                             && !$this->_cache_serials
                             && $_gmt_mtime == $_last_modified_date) {
@@ -2960,7 +2960,7 @@ 
                                 header('HTTP/1.1 304 Not Modified');
                             }
                         } else {
-                            header('Last-Modified: '.$_gmt_mtime);
+                            header('Last-Modified: ' . $_gmt_mtime);
                             echo $_smarty_results;
                         }
                     } else {
@@ -2981,7 +2981,7 @@ 
             } else {
                 $this->_cache_info['template'][$resource_name] = true;
                 if ($this->cache_modified_check && $display) {
-                    header('Last-Modified: '.gmdate('D, d M Y H:i:s', time()).' GMT');
+                    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
                 }
             }
         }

Indentation +19 added lines, -19 removed lines

@@ -289,10 +289,10 @@ 
         // during {include file='my_template.tpl'} this enables us to store selected module
         // templates in the theme while others can be kept in the module itself.
         $this->register_resource('z', ['Zikula_View_Resource',
-                                       'z_get_template',
-                                       'z_get_timestamp',
-                                       'z_get_secure',
-                                       'z_get_trusted']);
+                                        'z_get_template',
+                                        'z_get_timestamp',
+                                        'z_get_secure',
+                                        'z_get_trusted']);
 
         // set 'z' as default resource type
         $this->default_resource_type = 'z';
@@ -318,18 +318,18 @@ 
 
         // assign some useful settings
         $this->assign('homepage', $this->homepage)
-             ->assign('modinfo', $this->modinfo)
-             ->assign('module', $moduleName)
-             ->assign('toplevelmodule', $this->toplevelmodule)
-             ->assign('type', $this->type)
-             ->assign('func', $this->func)
-             ->assign('lang', $this->language)
-             ->assign('themeinfo', $this->themeinfo)
-             ->assign('themepath', isset($themeBundle) ? $themeBundle->getRelativePath() : $this->baseurl . 'themes/' . $theme)
-             ->assign('baseurl', $this->baseurl)
-             ->assign('baseuri', $this->baseuri)
-             ->assign('moduleBundle', ModUtil::getModule($moduleName)) // is NULL for pre-1.4.0-type modules
-             ->assign('themeBundle', $themeBundle);
+                ->assign('modinfo', $this->modinfo)
+                ->assign('module', $moduleName)
+                ->assign('toplevelmodule', $this->toplevelmodule)
+                ->assign('type', $this->type)
+                ->assign('func', $this->func)
+                ->assign('lang', $this->language)
+                ->assign('themeinfo', $this->themeinfo)
+                ->assign('themepath', isset($themeBundle) ? $themeBundle->getRelativePath() : $this->baseurl . 'themes/' . $theme)
+                ->assign('baseurl', $this->baseurl)
+                ->assign('baseuri', $this->baseuri)
+                ->assign('moduleBundle', ModUtil::getModule($moduleName)) // is NULL for pre-1.4.0-type modules
+                ->assign('themeBundle', $themeBundle);
 
         if (isset($themeBundle)) {
             $stylePath = $themeBundle->getRelativePath() . "/Resources/public/css";
@@ -343,9 +343,9 @@ 
             $imageLangPath = $this->baseurl . "themes/$theme/images/" . $this->language;
         }
         $this->assign('stylepath', $stylePath)
-             ->assign('scriptpath', $javascriptPath)
-             ->assign('imagepath', $imagePath)
-             ->assign('imagelangpath', $imageLangPath);
+                ->assign('scriptpath', $javascriptPath)
+                ->assign('imagepath', $imagePath)
+                ->assign('imagelangpath', $imageLangPath);
 
         // for {gt} template plugin to detect gettext domain
         if ($this->modinfo['type'] == ModUtil::TYPE_MODULE) {

src/lib/legacy/Zikula/Workflow.php

Indentation +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
 
         if (isset($debug)) {
             $qb->set('w.debug', ':newDebug')
-               ->setParameter('newDebug', $debug);
+                ->setParameter('newDebug', $debug);
         }
 
         $query = $qb->where('w.id = :id')

src/lib/legacy/Zikula/Workflow/Parser.php

Spacing +7 added lines, -7 removed lines

@@ -182,7 +182,7 @@ 
                     $this->workflow['workflow'] = [];
                 } else {
                     $state = 'error';
-                    $this->workflow['errorMessage'] = $this->unexpectedXMLError($name, "$state ". __LINE__);
+                    $this->workflow['errorMessage'] = $this->unexpectedXMLError($name, "$state " . __LINE__);
                 }
                 break;
 
@@ -201,7 +201,7 @@ 
                         $this->workflow['actions'] = [];
                         break;
                     default:
-                        $this->workflow['errorMessage'] = $this->unexpectedXMLError($name, "$state ". __LINE__);
+                        $this->workflow['errorMessage'] = $this->unexpectedXMLError($name, "$state " . __LINE__);
                         $state = 'error';
                         break;
                 }
@@ -212,7 +212,7 @@ 
                     $this->workflow['stateValue'] = ['id' => trim($attribs['ID'])];
                     $state = 'state';
                 } else {
-                    $this->workflow['errorMessage'] = $this->unexpectedXMLError($name, "$state ". __LINE__);
+                    $this->workflow['errorMessage'] = $this->unexpectedXMLError($name, "$state " . __LINE__);
                     $state = 'error';
                 }
                 break;
@@ -221,7 +221,7 @@ 
                 if ($name == 'TITLE' || $name == 'DESCRIPTION') {
                     $this->workflow['value'] = '';
                 } else {
-                    $this->workflow['errorMessage'] = $this->unexpectedXMLError($name, "$state ". __LINE__);
+                    $this->workflow['errorMessage'] = $this->unexpectedXMLError($name, "$state " . __LINE__);
                     $state = 'error';
                 }
                 break;
@@ -236,7 +236,7 @@ 
                     ];
                     $state = 'action';
                 } else {
-                    $this->workflow['errorMessage'] = $this->unexpectedXMLError($name, "$state ". __LINE__);
+                    $this->workflow['errorMessage'] = $this->unexpectedXMLError($name, "$state " . __LINE__);
                     $state = 'error';
                 }
                 break;
@@ -259,7 +259,7 @@ 
                         $this->workflow['actionParameter'] = $attribs;
                         break;
                     default:
-                        $this->workflow['errorMessage'] = $this->unexpectedXMLError($name, "$state ". __LINE__);
+                        $this->workflow['errorMessage'] = $this->unexpectedXMLError($name, "$state " . __LINE__);
                         $state = 'error';
                         break;
                 }
@@ -269,7 +269,7 @@ 
                 if ($name == '') {
                     $state = '';
                 } else {
-                    $this->workflow['errorMessage'] = $this->unexpectedXMLError($name, "$state ". __LINE__);
+                    $this->workflow['errorMessage'] = $this->unexpectedXMLError($name, "$state " . __LINE__);
                     $state = 'error';
                 }
                 break;

src/lib/legacy/Zikula/Workflow/Util.php

Spacing +1 added lines, -1 removed lines

@@ -388,7 +388,7 @@
             $workflow = $query->getArrayResult();
             if ($workflow) {
                 $workflow = $workflow[0];
-                $renameKey = function (&$array, $old, $new) {
+                $renameKey = function(&$array, $old, $new) {
                     $array[$new] = $array[$old];
                     unset($array[$old]);
                 };

Indentation +4 added lines, -4 removed lines

@@ -197,10 +197,10 @@
 
         //create the dql query.
         $query = $entityManager->createQueryBuilder()
-             ->delete('Zikula\Core\Doctrine\Entity\WorkflowEntity', 'w')
-             ->where('w.module = :module')
-             ->setParameter('module', $theModule)
-             ->getQuery();
+                ->delete('Zikula\Core\Doctrine\Entity\WorkflowEntity', 'w')
+                ->where('w.module = :module')
+                ->setParameter('module', $theModule)
+                ->getQuery();
 
         $result = $query->execute();
 

src/lib/legacy/Zikula/Routing/UrlRoute.php

Spacing +1 added lines, -1 removed lines

@@ -305,7 +305,7 @@
                 if (!isset($this->requirements[$token[1]])) {
                     $this->requirements[$token[1]] = '[^/\.\-]+';
                 }
-                $regex .= '(?P<'.$token[1].'>'.$this->requirements[$token[1]].')';
+                $regex .= '(?P<' . $token[1] . '>' . $this->requirements[$token[1]] . ')';
             } elseif ($token[0] == 'text' || $token[0] == 'separator') {
                 if ($token[1] == '*') {
                     if ($this->tokens[$i - 1] && $this->tokens[$i - 1][0] == 'separator') {