zikula / core

src/system/BlocksModule/Api/AdminApi.php

Indentation +5 added lines, -5 removed lines

@@ -411,11 +411,11 @@
 
         // delete placements of the position to be deleted
         $query = $this->entityManager->createQueryBuilder()
-                                     ->delete()
-                                     ->from('ZikulaBlocksModule:BlockPlacementEntity', 'p')
-                                     ->where('p.pid = :pid')
-                                     ->setParameter('pid', $position['pid'])
-                                     ->getQuery();
+                                        ->delete()
+                                        ->from('ZikulaBlocksModule:BlockPlacementEntity', 'p')
+                                        ->where('p.pid = :pid')
+                                        ->setParameter('pid', $position['pid'])
+                                        ->getQuery();
 
         $query->getResult();
 

src/system/BlocksModule/Twig/Extension/BlocksExtension.php

Braces +2 added lines, -1 removed lines

@@ -153,7 +153,8 @@
             $blockProperties['title'] = $block->getTitle();
             $blockProperties['position'] = $positionName;
             $content = $blockInstance->display($blockProperties);
-        } elseif ($blockInstance instanceof \Zikula_Controller_AbstractBlock) { // @todo remove at Core-2.0
+        } elseif ($blockInstance instanceof \Zikula_Controller_AbstractBlock) {
+// @todo remove at Core-2.0
             if (!\ModUtil::available($block->getModule()->getName())) {
                 return '';
             }

src/system/BlocksModule/Block/PendingContentBlock.php

Braces +2 added lines, -1 removed lines

@@ -36,7 +36,8 @@
             /** @var \Zikula\Common\Collection\Container $collection */
             $module = $collection->getName();
             foreach ($collection as $item) {
-                if ($item instanceof \Zikula_Provider_AggregateItem) { // @todo remove at Core-2.0
+                if ($item instanceof \Zikula_Provider_AggregateItem) {
+// @todo remove at Core-2.0
                     $link = \ModUtil::url($module, $item->getController(), $item->getMethod(), $item->getArgs());
                 } elseif ($item instanceof PendingContentCollectible) {
                     $link = $this->get('router')->generate($item->getRoute(), $item->getArgs());

src/system/ExtensionsModule/Helper/BundleSyncHelper.php

Spacing +2 added lines, -2 removed lines

@@ -184,14 +184,14 @@
             // Work out if admin-capable
             // @deprecated - author must declare in Core 2.0
             // e.g. "capabilities": {"admin": {"route": "zikulafoobundle_admin_index"} }
-            if (empty($bundleVersionArray['capabilities']['admin']) && file_exists($bundle->getPath().'/Controller/AdminController.php')) {
+            if (empty($bundleVersionArray['capabilities']['admin']) && file_exists($bundle->getPath() . '/Controller/AdminController.php')) {
                 $bundleVersionArray['capabilities']['admin'] = ['url' => \ModUtil::url($bundle->getName(), 'admin', 'index')];
             }
 
             // Work out if user-capable
             // @deprecated - author must declare in Core 2.0
             // e.g. "capabilities": {"user": {"route": "zikulafoobundle_user_index"} }
-            if (empty($bundleVersionArray['capabilities']['user']) && file_exists($bundle->getPath().'/Controller/UserController.php')) {
+            if (empty($bundleVersionArray['capabilities']['user']) && file_exists($bundle->getPath() . '/Controller/UserController.php')) {
                 $bundleVersionArray['capabilities']['user'] = ['url' => \ModUtil::url($bundle->getName(), 'user', 'index')];
             }
             $bundleVersionArray['capabilities'] = serialize($bundleVersionArray['capabilities']);

src/system/ExtensionsModule/Helper/ExtensionHelper.php

Braces +2 added lines, -1 removed lines

@@ -277,7 +277,8 @@
     {
         $className = $bundle->getInstallerClass();
         $reflectionInstaller = new \ReflectionClass($className);
-        if ($reflectionInstaller->isSubclassOf('Zikula_AbstractInstaller')) { // @deprecated remove at Core-2.0
+        if ($reflectionInstaller->isSubclassOf('Zikula_AbstractInstaller')) {
+// @deprecated remove at Core-2.0
             return $reflectionInstaller->newInstanceArgs([$this->container, $bundle]);
         } elseif (!$reflectionInstaller->isSubclassOf('\Zikula\Core\ExtensionInstallerInterface')) {
             throw new \RuntimeException($this->translator->__f("%s must implement ExtensionInstallerInterface", ['%s' => $className]));

src/system/SecurityCenterModule/SecurityCenterModuleInstaller.php

Spacing +8 added lines, -8 removed lines

@@ -56,7 +56,7 @@ 
         $this->setSystemVar('sessionstoretofile', Constant::SESSION_STORAGE_FILE);
         $this->setSystemVar('sessionsavepath', '');
         $this->setSystemVar('gc_probability', 100);
-        $this->setSystemVar('sessioncsrftokenonetime', 1);  // 1 means use same token for entire session
+        $this->setSystemVar('sessioncsrftokenonetime', 1); // 1 means use same token for entire session
         $this->setSystemVar('anonymoussessions', 1); // @deprecated
         $this->setSystemVar('sessionrandregenerate', 1);
         $this->setSystemVar('sessionregenerate', 1);
@@ -79,13 +79,13 @@ 
         $this->setSystemVar('useids', 0);
         $this->setSystemVar('idsmail', 0);
         $this->setSystemVar('idsrulepath', 'system/SecurityCenterModule/Resources/config/phpids_zikula_default.xml');
-        $this->setSystemVar('idssoftblock', 1);                // do not block requests, but warn for debugging
-        $this->setSystemVar('idsfilter', 'xml');               // filter type
-        $this->setSystemVar('idsimpactthresholdone', 1);       // db logging
-        $this->setSystemVar('idsimpactthresholdtwo', 10);      // mail admin
-        $this->setSystemVar('idsimpactthresholdthree', 25);    // block request
-        $this->setSystemVar('idsimpactthresholdfour', 75);     // kick user, destroy session
-        $this->setSystemVar('idsimpactmode', 1);               // per request per default
+        $this->setSystemVar('idssoftblock', 1); // do not block requests, but warn for debugging
+        $this->setSystemVar('idsfilter', 'xml'); // filter type
+        $this->setSystemVar('idsimpactthresholdone', 1); // db logging
+        $this->setSystemVar('idsimpactthresholdtwo', 10); // mail admin
+        $this->setSystemVar('idsimpactthresholdthree', 25); // block request
+        $this->setSystemVar('idsimpactthresholdfour', 75); // kick user, destroy session
+        $this->setSystemVar('idsimpactmode', 1); // per request per default
         $this->setSystemVar('idshtmlfields', ['POST.__wysiwyg']);
         $this->setSystemVar('idsjsonfields', ['POST.__jsondata']);
         $this->setSystemVar('idsexceptions', [

src/system/ThemeModule/Controller/AdminController.php

Spacing +10 added lines, -10 removed lines

@@ -79,15 +79,15 @@ 
         $theme = ThemeUtil::getTheme($themeinfo['name']);
         $ostemp = CacheUtil::getLocalDir();
         if ($theme) {
-            $themePath = $theme->getRelativePath().'/Resources/config';
-            $zpath  = $ostemp.'/Theme_Config/'.DataUtil::formatForOS($themeinfo['directory']);
+            $themePath = $theme->getRelativePath() . '/Resources/config';
+            $zpath  = $ostemp . '/Theme_Config/' . DataUtil::formatForOS($themeinfo['directory']);
             $tpath  = $themePath;
         } else {
-            $zpath  = $ostemp.'/Theme_Config/'.DataUtil::formatForOS($themeinfo['directory']);
-            $tpath  = 'themes/'.DataUtil::formatForOS($themeinfo['directory']).'/templates/config';
+            $zpath  = $ostemp . '/Theme_Config/' . DataUtil::formatForOS($themeinfo['directory']);
+            $tpath  = 'themes/' . DataUtil::formatForOS($themeinfo['directory']) . '/templates/config';
         }
         // check if we can edit the theme and, if not, create the running config
-        if (!is_writable($tpath.'/pageconfigurations.ini')) {
+        if (!is_writable($tpath . '/pageconfigurations.ini')) {
             if (!file_exists($zpath) || is_writable($zpath)) {
                 ModUtil::apiFunc('ZikulaThemeModule', 'admin', 'createrunningconfig', ['themename' => $themeinfo['name']]);
 
@@ -767,7 +767,7 @@ 
         $newfilters = [];
         foreach ($filters as $filter) {
             foreach ($legacyView->plugins_dir as $plugindir) {
-                if (file_exists($plugindir .'/'. $ostype .'.'. DataUtil::formatForOS($filter) .'.php')) {
+                if (file_exists($plugindir . '/' . $ostype . '.' . DataUtil::formatForOS($filter) . '.php')) {
                     $newfilters[] = $filter;
                     break;
                 }
@@ -1304,9 +1304,9 @@ 
                 $themedir = $themearr['directory'];
                 $res = $theme->clear_cache(null, $cacheid, null, null, $themedir);
                 if ($res) {
-                    $this->addFlash('status', $this->__('Done! Deleted theme engine cached templates.').' '.$cacheid.', '.$themedir);
+                    $this->addFlash('status', $this->__('Done! Deleted theme engine cached templates.') . ' ' . $cacheid . ', ' . $themedir);
                 } else {
-                    $this->addFlash('error', $this->__('Error! Failed to clear theme engine cached templates.').' '.$cacheid.', '.$themedir);
+                    $this->addFlash('error', $this->__('Error! Failed to clear theme engine cached templates.') . ' ' . $cacheid . ', ' . $themedir);
                 }
             }
         } else {
@@ -1504,8 +1504,8 @@ 
      */
     private function checkIfMainThemeFileExists($themeinfo)
     {
-        $mainThemeFile = 'themes/' . DataUtil::formatForOS($themeinfo['directory']). '/' . $themeinfo['name'] . '.php';
-        $mainThemeFileLegacy = 'themes/'.DataUtil::formatForOS($themeinfo['directory']).'/version.php';
+        $mainThemeFile = 'themes/' . DataUtil::formatForOS($themeinfo['directory']) . '/' . $themeinfo['name'] . '.php';
+        $mainThemeFileLegacy = 'themes/' . DataUtil::formatForOS($themeinfo['directory']) . '/version.php';
         if (!file_exists($mainThemeFile) && !file_exists($mainThemeFileLegacy)) {
             throw new \InvalidArgumentException($this->__('Main theme file not found!'));
         }

src/system/ThemeModule/Controller/ThemeController.php

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
 
         $form = $this->createFormBuilder(['themeName' => $themeName, 'resetuserselected' => true])
             ->add('themeName', 'Symfony\Component\Form\Extension\Core\Type\HiddenType')
-            ->add('resetuserselected', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', [ // @todo remove at Core-2.0
+            ->add('resetuserselected', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', [// @todo remove at Core-2.0
                 'label' => $this->__('Override users\' theme settings'),
                 'required' => false,
             ])

src/system/ThemeModule/Controller/UserController.php

Spacing +2 added lines, -2 removed lines

@@ -73,9 +73,9 @@
         $currentthemepic = null;
         foreach ($allthemes as $key => $themeinfo) {
             $themename = $themeinfo['name'];
-            if (file_exists($themepic = 'themes/'.DataUtil::formatForOS($themeinfo['directory']).'/Resources/public/images/preview_medium.png')) {
+            if (file_exists($themepic = 'themes/' . DataUtil::formatForOS($themeinfo['directory']) . '/Resources/public/images/preview_medium.png')) {
                 $themeinfo['previewImage'] = $themepic;
-                $themeinfo['largeImage'] = 'themes/'.DataUtil::formatForOS($themeinfo['directory']).'/Resources/public/images/preview_large.png';
+                $themeinfo['largeImage'] = 'themes/' . DataUtil::formatForOS($themeinfo['directory']) . '/Resources/public/images/preview_large.png';
             } else {
                 $themeinfo['previewImage'] = 'system/ThemeModule/Resources/public/images/preview_medium.png';
                 $themeinfo['largeImage'] = 'system/ThemeModule/Resources/public/images/preview_large.png';