zikula / core

src/lib/legacy/Zikula/View.php

Indentation +24 added lines, -24 removed lines

@@ -287,10 +287,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';
@@ -316,18 +316,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";
@@ -341,9 +341,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) {
@@ -1003,10 +1003,10 @@ 
 
                 if (is_dir($path)) {
                     // search recusively
-                   $this->rmtpl($path, $template, $expire);
+                    $this->rmtpl($path, $template, $expire);
                 } elseif (strpos($entry, $filebase) === 0) {
                     // delete the files that matches the template base filename
-                   $this->_unlink($path, $expire);
+                    $this->_unlink($path, $expire);
                 }
             }
         }
@@ -1037,13 +1037,13 @@ 
 
                 if (is_dir($path)) {
                     // remove recursively
-                   $this->rmdir($path, $expire, true);
+                    $this->rmdir($path, $expire, true);
                 } elseif ($expire !== false) {
                     // check expiration time of cached templates
-                   $this->_unlink($path, $expire);
+                    $this->_unlink($path, $expire);
                 } else {
                     // delete compiled templates directly
-                   unlink($path);
+                    unlink($path);
                 }
             }
         }

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');
                 }
             }
         }

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

Indentation +18 added lines, -18 removed lines

@@ -173,16 +173,16 @@ 
         return $workflow->executeAction($actionID, $obj, $stateID);
     }
 
-     /**
-      * Delete workflows for module (used module uninstall time).
-      *
-      * @param string $module Module name
-      *
-      * @return boolean
-      */
-     public static function deleteWorkflowsForModule($module)
-     {
-         $theModule = isset($module) ? $module : ModUtil::getName();
+        /**
+         * Delete workflows for module (used module uninstall time).
+         *
+         * @param string $module Module name
+         *
+         * @return boolean
+         */
+        public static function deleteWorkflowsForModule($module)
+        {
+            $theModule = isset($module) ? $module : ModUtil::getName();
 
         //This is a static function, so we have to use ServiceUtil to get the entity manager
         $entityManager = ServiceUtil::getManager()->get('doctrine.orm.default_entity_manager');
@@ -194,10 +194,10 @@ 
             ->setParameter('module', $theModule)
             ->getQuery();
 
-         $result = $query->execute();
+            $result = $query->execute();
 
-         return $result;
-     }
+            return $result;
+        }
 
     /**
      * Delete a workflow and associated data.
@@ -408,11 +408,11 @@ 
         }
 
         // attach workflow to object
-         if ($obj instanceof Doctrine_Record) {
-             $obj->mapValue('__WORKFLOW__', $workflow);
-         } else {
-             $obj['__WORKFLOW__'] = $workflow;
-         }
+            if ($obj instanceof Doctrine_Record) {
+                $obj->mapValue('__WORKFLOW__', $workflow);
+            } else {
+                $obj['__WORKFLOW__'] = $workflow;
+            }
 
         return true;
     }

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]);
                 };

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') {

src/lib/legacy/Zikula/AbstractBase.php

Spacing +2 added lines, -2 removed lines

@@ -129,7 +129,7 @@ 
         $this->setContainer($serviceManager);
         $this->dispatcher = $this->getContainer()->get('event_dispatcher');
         $this->eventManager = $this->dispatcher;
-        $this->request =  $this->container->get('request');
+        $this->request = $this->container->get('request');
         $this->entityManager = $this->getContainer()->get('doctrine.orm.default_entity_manager');
         $this->_configureBase($bundle);
         $this->initialize();
@@ -161,7 +161,7 @@ 
                 $this->libBaseDir = realpath("{$this->baseDir}/lib/" . $this->name);
             }
             if ($baseDir == 'modules') {
-                $this->domain = strtolower('module_'.$this->name);
+                $this->domain = strtolower('module_' . $this->name);
             }
         }
     }

src/lib/legacy/Zikula/KernelClassLoader.php

Spacing +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
         // namespace 'Foo', class Foo\BadFoo\Class should match and become Foo/BadFoo/Class.php
         // namespace 'Bar', separator '_', class Bar should match and become Bar.php
         // namespace 'Bar', separator '_', class Bar_Exception should match and become Bar\Exception.php
-        if (strpos($class, $namespace.$array['separator']) === 0 || $class == $namespace || empty($namespace)) {
+        if (strpos($class, $namespace . $array['separator']) === 0 || $class == $namespace || empty($namespace)) {
             // replace namespace separator with \DIRECTORY_SEPARATOR
             $file = str_replace($array['separator'], DIRECTORY_SEPARATOR, $class);
 

src/lib/legacy/Zikula/Tree.php

Spacing +14 added lines, -14 removed lines

@@ -175,7 +175,7 @@ 
         $tree = $this->_toHTML($this->tree, 1, $this->config['id'], true);
 
         if ($this->config['withWraper']) {
-            $wraperClass = !empty($this->config['wraperClass']) ? 'class="'.$this->config['wraperClass'].'"' : '';
+            $wraperClass = !empty($this->config['wraperClass']) ? 'class="' . $this->config['wraperClass'] . '"' : '';
             $this->html = "\n<div {$wraperClass}>\n{$tree}</div>";
         } else {
             $this->html = $tree;
@@ -198,7 +198,7 @@ 
         $tree = $this->_toHTML($this->tree, 1, $this->config['id'], true);
 
         if ($this->config['withWraper']) {
-            $wraperClass = !empty($this->config['wraperClass']) ? 'class="'.$this->config['wraperClass'].'"' : '';
+            $wraperClass = !empty($this->config['wraperClass']) ? 'class="' . $this->config['wraperClass'] . '"' : '';
             $this->html = "\n<div {$wraperClass}>\n{$tree}</div>";
         } else {
             $this->html = $tree;
@@ -217,7 +217,7 @@ 
     public function getConfigForScript($encode = true)
     {
         $jsConfig = $this->config;
-        $omitKeys = ['objid', 'nestedSet', 'customJSClass'. 'cssFile'];
+        $omitKeys = ['objid', 'nestedSet', 'customJSClass' . 'cssFile'];
         foreach ($omitKeys as $key) {
             unset($jsConfig[$key]);
         }
@@ -366,8 +366,8 @@ 
             $html = $liHtml;
         } else {
             $indent  = str_repeat(' ', $indentLevel * 4);
-            $ulID    = !empty($treeId) ? ' id="'.$treeId.'"' : '';
-            $ulClass = !empty($this->config['treeClass']) ? ' class="'.$this->config['treeClass'].'"' : '';
+            $ulID    = !empty($treeId) ? ' id="' . $treeId . '"' : '';
+            $ulClass = !empty($this->config['treeClass']) ? ' class="' . $this->config['treeClass'] . '"' : '';
             $html    = "{$indent}<ul{$ulID}{$ulClass}>\n{$liHtml}\n{$indent}</ul>\n";
         }
 
@@ -391,18 +391,18 @@ 
         $item   = $tab['item'];
         $indent = str_repeat(' ', ($indentLevel + 1) * 4);
 
-        $toggle = $indent.'<img class="'.$this->config['toggler'].'" alt="" src="'.$this->config['imagesDir'].$this->config['minus'].'" />';
+        $toggle = $indent . '<img class="' . $this->config['toggler'] . '" alt="" src="' . $this->config['imagesDir'] . $this->config['minus'] . '" />';
 
         $iconImage = !empty($item['icon']) ? $item['icon'] : (!empty($tab['nodes']) ? $this->config['parentOpen'] : $this->config['item']);
-        $icon      = $indent.'<img class="'.$this->config['icon'].'" alt="" src="'.$this->config['imagesDir'].$iconImage.'" />';
+        $icon      = $indent . '<img class="' . $this->config['icon'] . '" alt="" src="' . $this->config['imagesDir'] . $iconImage . '" />';
 
-        $linkClass = $item['active'] == 1 ? $item['class'] : $this->config['nodeUnactive'].' '.$item['class'];
-        $linkClass = !empty($linkClass) ? ' class="'.$linkClass.'"' : '';
-        $linkHref  = 'href="'.DataUtil::formatForDisplay($item['href']).'"';
-        $linkTitle = !empty($item['title']) ? ' title="'.$item['title'].'"' : '';
-        $link      = $indent."<a {$linkHref}{$linkClass}{$linkTitle}>{$item['name']}</a>";
+        $linkClass = $item['active'] == 1 ? $item['class'] : $this->config['nodeUnactive'] . ' ' . $item['class'];
+        $linkClass = !empty($linkClass) ? ' class="' . $linkClass . '"' : '';
+        $linkHref  = 'href="' . DataUtil::formatForDisplay($item['href']) . '"';
+        $linkTitle = !empty($item['title']) ? ' title="' . $item['title'] . '"' : '';
+        $link      = $indent . "<a {$linkHref}{$linkClass}{$linkTitle}>{$item['name']}</a>";
 
-        $liId    = !empty($this->config['nodePrefix']) ? ' id="'.$this->config['nodePrefix'].$id.'"' : '';
+        $liId    = !empty($this->config['nodePrefix']) ? ' id="' . $this->config['nodePrefix'] . $id . '"' : '';
         $liClass = [];
         $liClass[] = $size == 1 ? $this->config['nodeSingle'] : '';
         $liClass[] = ($i == 1 && $size > 1) ? $this->config['nodeFirst'] : '';
@@ -410,7 +410,7 @@ 
         $liClass[] = !empty($tab['nodes']) ? $this->config['nodeParent'] : $this->config['nodeLeaf'];
         $liClass[] = isset($item['class']) ? $item['class'] : '';
         $liClass = trim(implode(' ', array_filter($liClass)));
-        $liClass = ' class="'.$liClass.'"';
+        $liClass = ' class="' . $liClass . '"';
 
         $indent = str_repeat(' ', $indentLevel * 4);
 

src/lib/legacy/Zikula/View/Plugin.php

Spacing +3 added lines, -5 removed lines

@@ -44,8 +44,7 @@ 
         } else {
             $base = ModUtil::getBaseDir($this->modinfo['name']);
             $path = is_dir("$base/{$this->modinfo['directory']}/plugins/{$pluginName}/templates/plugins") ?
-            "$base/{$this->modinfo['directory']}/plugins/{$pluginName}/templates/plugins" :
-            "$base/{$this->modinfo['directory']}/plugins/{$pluginName}/Resources/views/plugins";
+            "$base/{$this->modinfo['directory']}/plugins/{$pluginName}/templates/plugins" : "$base/{$this->modinfo['directory']}/plugins/{$pluginName}/Resources/views/plugins";
         }
 
         $this->addPluginDir($path);
@@ -136,8 +135,7 @@ 
                 break;
             case ModUtil::TYPE_MODULE:
                 $pluginsDir = is_dir("modules/{$modinfo['directory']}/plugins/$plugin/templates/plugins") ?
-                "modules/{$modinfo['directory']}/plugins/$plugin/templates/plugins" :
-                "modules/{$modinfo['directory']}/plugins/$plugin/Resources/views/plugins";
+                "modules/{$modinfo['directory']}/plugins/$plugin/templates/plugins" : "modules/{$modinfo['directory']}/plugins/$plugin/Resources/views/plugins";
                 break;
             case ModUtil::TYPE_CORE:
                 $pluginsDir = is_dir("plugins/$plugin/templates/plugins") ?
@@ -178,7 +176,7 @@ 
             $search_path = [];
             try {
                 $bundle = $this->getContainer()->get('kernel')->getBundle($module);
-                $bundlePath = $relativepath = $bundle->getRelalativePath().'/Resources/views';
+                $bundlePath = $relativepath = $bundle->getRelalativePath() . '/Resources/views';
                 $search_path[] = $bundlePath;
             } catch (\InvalidArgumentException $e) {
             }