zikula / core

src/lib/legacy/util/ModUtil.php

Indentation +4 added lines, -4 removed lines

@@ -377,13 +377,13 @@
         // else just delete this specific variable
         /** @var $qb \Doctrine\ORM\QueryBuilder */
         $qb = $em->createQueryBuilder()
-                 ->delete('Zikula\ExtensionsModule\Entity\ExtensionVarEntity', 'v')
-                 ->where('v.modname = :modname')
-                 ->setParameter('modname', $modname);
+                    ->delete('Zikula\ExtensionsModule\Entity\ExtensionVarEntity', 'v')
+                    ->where('v.modname = :modname')
+                    ->setParameter('modname', $modname);
 
         if (!empty($name)) {
             $qb->andWhere('v.name = :name')
-               ->setParameter('name', $name);
+                ->setParameter('name', $name);
         }
 
         $query = $qb->getQuery();

src/lib/legacy/util/DataUtil.php

Spacing +3 added lines, -3 removed lines

@@ -185,14 +185,14 @@
                 $var[$k] = self::formatForDisplay($v);
             }
         } else {
-            $var = htmlspecialchars((string) $var);
+            $var = htmlspecialchars((string)$var);
             // This search and replace finds the text 'x@y' and replaces
             // it with HTML entities, this provides protection against
             // email harvesters
             $var = preg_replace_callback(
                 '/(.)@(.)/s',
-                function ($m) {
-                    return "&#".sprintf("%03d", ord($m[1])).";@&#" .sprintf("%03d", ord($m[2])) . ";";
+                function($m) {
+                    return "&#" . sprintf("%03d", ord($m[1])) . ";@&#" . sprintf("%03d", ord($m[2])) . ";";
                 },
                 $var);
         }

src/lib/legacy/util/LogUtil.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
     {
         $session = ServiceUtil::getManager()->get('session');
         $warns = $session->getFlashBag()->peek(Zikula_Session::MESSAGE_WARNING);
-        $errs =  $session->getFlashBag()->peek(Zikula_Session::MESSAGE_ERROR);
+        $errs = $session->getFlashBag()->peek(Zikula_Session::MESSAGE_ERROR);
 
         if (!empty($errs) && $override) {
             $warns = $errs;

src/lib/legacy/util/FileUtil.php

Indentation +2 added lines, -2 removed lines

@@ -211,7 +211,7 @@ 
                         $files[$filenameToStore] = (array)self::getFiles($path, $recurse, $relativepath, $extensions, $type, $nestedData);
                     } else {
                         $files = array_merge((array)$files,
-                                              (array)self::getFiles($path, $recurse, $relativepath, $extensions, $type, $nestedData));
+                                                (array)self::getFiles($path, $recurse, $relativepath, $extensions, $type, $nestedData));
                     }
                 } elseif (!$extensions && !$regexpMatch) {
                     $files[] = $filenameToStore;
@@ -553,7 +553,7 @@ 
             fputcsv($out, $datarow, $delimiter, $enclosure);
         }
 
-         //close the out file
+            //close the out file
         fclose($out);
 
         exit;

Spacing +2 added lines, -2 removed lines

@@ -527,7 +527,7 @@ 
 
         // create random filename if none is given or else format it appropriately
         if (!isset($filename)) {
-            $filename = 'csv_'.time().'.csv';
+            $filename = 'csv_' . time() . '.csv';
         } else {
             $filename = DataUtil::formatForOS($filename);
         }
@@ -537,7 +537,7 @@ 
         ini_set('zlib.output_compression', 0);
         header('Cache-Control: no-store, no-cache');
         header('Content-type: text/csv');
-        header('Content-Disposition: attachment; filename="'.$filename.'"');
+        header('Content-Disposition: attachment; filename="' . $filename . '"');
         header('Content-Transfer-Encoding: binary');
 
         // open a file for csv writing

src/lib/legacy/util/UserUtil.php

Indentation +17 added lines, -17 removed lines

@@ -483,14 +483,14 @@ 
 
         // count of uname appearances in users table
         $qb = $em->createQueryBuilder()
-                 ->select('count(u.uid)')
-                 ->from('ZikulaUsersModule:UserEntity', 'u')
-                 ->where('u.uname = :uname')
-                 ->setParameter('uname', $uname);
+                    ->select('count(u.uid)')
+                    ->from('ZikulaUsersModule:UserEntity', 'u')
+                    ->where('u.uname = :uname')
+                    ->setParameter('uname', $uname);
 
         if ($excludeUid > 1) {
             $qb->andWhere('u.uid <> :excludeUid')
-               ->setParameter('excludeUid', $excludeUid);
+                ->setParameter('excludeUid', $excludeUid);
         }
 
         $query = $qb->getQuery();
@@ -519,14 +519,14 @@ 
 
         // count of email appearances in users table
         $qb = $em->createQueryBuilder()
-                 ->select('count(u.uid)')
-                 ->from('ZikulaUsersModule:UserEntity', 'u')
-                 ->where('u.email = :email')
-                 ->setParameter('email', $emailAddress);
+                    ->select('count(u.uid)')
+                    ->from('ZikulaUsersModule:UserEntity', 'u')
+                    ->where('u.email = :email')
+                    ->setParameter('email', $emailAddress);
 
         if ($excludeUid > 1) {
             $qb->andWhere('u.uid <> :excludeUid')
-               ->setParameter('excludeUid', $excludeUid);
+                ->setParameter('excludeUid', $excludeUid);
         }
 
         $query = $qb->getQuery();
@@ -535,16 +535,16 @@ 
 
         // count of email appearances in users verification table
         $qb = $em->createQueryBuilder()
-                 ->select('count(v.uid)')
-                 ->from('ZikulaZAuthModule:UserVerificationEntity', 'v')
-                 ->where('v.newemail = :email')
-                 ->andWhere('v.changetype = :chgtype')
-                 ->setParameter('email', $emailAddress)
-                 ->setParameter('chgtype', ZAuthConstant::VERIFYCHGTYPE_EMAIL);
+                    ->select('count(v.uid)')
+                    ->from('ZikulaZAuthModule:UserVerificationEntity', 'v')
+                    ->where('v.newemail = :email')
+                    ->andWhere('v.changetype = :chgtype')
+                    ->setParameter('email', $emailAddress)
+                    ->setParameter('chgtype', ZAuthConstant::VERIFYCHGTYPE_EMAIL);
 
         if ($excludeUid > 1) {
             $qb->andWhere('v.uid <> :excludeUid')
-               ->setParameter('excludeUid', $excludeUid);
+                ->setParameter('excludeUid', $excludeUid);
         }
 
         $query = $qb->getQuery();

Spacing +3 added lines, -3 removed lines

@@ -249,7 +249,7 @@ 
     {
         $str = self::getGroupListForUser($uid, '_');
 
-        return $str == '-1' ? 'guest' : 'groups_'.$str;
+        return $str == '-1' ? 'guest' : 'groups_' . $str;
     }
 
     /**
@@ -266,7 +266,7 @@ 
     {
         $uid = $uid ? (int)$uid : self::getVar('uid');
 
-        return !$uid ? 'guest' : 'uid_'.$uid;
+        return !$uid ? 'guest' : 'uid_' . $uid;
     }
 
     /**
@@ -1482,7 +1482,7 @@ 
         if (!empty($sortbyfield)) {
             $sortFragments = [];
 
-            $sortFragments[] = 'u.'. $sortbyfield . ' ' . DataUtil::formatForStore($sortorder);
+            $sortFragments[] = 'u.' . $sortbyfield . ' ' . DataUtil::formatForStore($sortorder);
 
             if ($sortbyfield != 'uname') {
                 $sortFragments[] = 'u.uname ASC';

src/lib/legacy/util/ZLoader.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
     {
         $separator = $separator === '\\' ? '' : $separator;
 
-        self::$autoloader->add($namespace.$separator, $paths);
+        self::$autoloader->add($namespace . $separator, $paths);
     }
 
     public static function addPrefix($prefix, $paths)
@@ -125,7 +125,7 @@ 
         if (strpos($class, '_')) {
             $array = explode('_', $class);
             $prefix = (isset($map[$array[0]]) ? $map[$array[0]] . '/' : '');
-            $path = __DIR__.'/../'.$prefix . str_replace('_', '/', $class) . '.php';
+            $path = __DIR__ . '/../' . $prefix . str_replace('_', '/', $class) . '.php';
             if (file_exists($path)) {
                 return include $path;
             }

src/lib/legacy/util/BlockUtil.php

Spacing +26 added lines, -26 removed lines

@@ -72,14 +72,14 @@ 
                     foreach ($arguments as $argument) {
                         $args = explode('=', $argument);
                         if (!in_array($args[0], $filtervars)) {
-                            $customargs[] = DataUtil::formatForOS(strip_tags($args[0])).'='.DataUtil::formatForOS(
+                            $customargs[] = DataUtil::formatForOS(strip_tags($args[0])) . '=' . DataUtil::formatForOS(
                                     strip_tags($args[1])
                                 );
                         }
                     }
                 } else {
                     if (!in_array($var, $filtervars)) {
-                        $customargs[] = DataUtil::formatForOS(strip_tags($var)).'='.DataUtil::formatForOS(
+                        $customargs[] = DataUtil::formatForOS(strip_tags($var)) . '=' . DataUtil::formatForOS(
                                 strip_tags($value)
                             );
                     }
@@ -144,9 +144,9 @@ 
             $modinfo = ModUtil::getInfo($blockinfo['mid']);
             $blockOutput = self::show($modinfo['name'], $blockinfo['bkey'], $blockinfo, $blockplacement->getBlock());
             // wrap block if theme requires it.
-            $blockWrapper = (bool) Zikula_View_Theme::getInstance()->themeconfig['blockwrapper'];
+            $blockWrapper = (bool)Zikula_View_Theme::getInstance()->themeconfig['blockwrapper'];
             if ($blockWrapper) {
-                $blockOutput = '<div class="z-block '. 'z-blockposition-'.DataUtil::formatForDisplay($blockinfo['position']).' z-bkey-' . DataUtil::formatForDisplay(strtolower($blockinfo['bkey'])) . ' z-bid-' . DataUtil::formatForDisplay($blockinfo['bid']) . '">' . "\n" . $blockOutput . "</div>\n";
+                $blockOutput = '<div class="z-block ' . 'z-blockposition-' . DataUtil::formatForDisplay($blockinfo['position']) . ' z-bkey-' . DataUtil::formatForDisplay(strtolower($blockinfo['bkey'])) . ' z-bid-' . DataUtil::formatForDisplay($blockinfo['bid']) . '">' . "\n" . $blockOutput . "</div>\n";
             }
             if ($echo) {
                 echo $blockOutput;
@@ -190,7 +190,7 @@ 
             $instanceArgs = $blockinfo;
         }
         if (is_callable($displayfunc)) {
-            $content =  call_user_func($displayfunc, $instanceArgs);
+            $content = call_user_func($displayfunc, $instanceArgs);
         }
         if ($blockInstance instanceof BlockHandlerInterface) {
             // FC blocks require wrapping the content in the theme
@@ -228,19 +228,19 @@ 
             }
             // check for collapsable menus being enabled, and setup the collapsable menu image.
             if (!isset($upb)) {
-                if (file_exists('themes/'.$themedir.'/images/upb.png')) {
-                    $upb = '<img src="themes/'.$themedir.'/images/upb.png" alt="-" />';
-                } elseif (file_exists('themes/'.$themedir.'/images/14_layer_raiselayer.png')) {
-                    $upb = '<img src="themes/'.$themedir.'/images/14_layer_raiselayer.png" alt="-" />';
+                if (file_exists('themes/' . $themedir . '/images/upb.png')) {
+                    $upb = '<img src="themes/' . $themedir . '/images/upb.png" alt="-" />';
+                } elseif (file_exists('themes/' . $themedir . '/images/14_layer_raiselayer.png')) {
+                    $upb = '<img src="themes/' . $themedir . '/images/14_layer_raiselayer.png" alt="-" />';
                 } else {
                     $upb = '<img src="images/icons/extrasmall/14_layer_raiselayer.png" alt="-" />';
                 }
             }
             if (!isset($downb)) {
-                if (file_exists('themes/'.$themedir.'/images/downb.png')) {
-                    $downb = '<img src="themes/'.$themedir.'/images/downb.png" alt="+" />';
-                } elseif (file_exists('themes/'.$themedir.'/images/14_layer_lowerlayer.png')) {
-                    $downb = '<img src="themes/'.$themedir.'/images/14_layer_lowerlayer.png" alt="+" />';
+                if (file_exists('themes/' . $themedir . '/images/downb.png')) {
+                    $downb = '<img src="themes/' . $themedir . '/images/downb.png" alt="+" />';
+                } elseif (file_exists('themes/' . $themedir . '/images/14_layer_lowerlayer.png')) {
+                    $downb = '<img src="themes/' . $themedir . '/images/14_layer_lowerlayer.png" alt="+" />';
                 } else {
                     $downb = '<img src="images/icons/extrasmall/14_layer_lowerlayer.png" alt="+" />';
                 }
@@ -248,16 +248,16 @@ 
             $checkUserBlock = self::checkUserBlock($blockinfo);
             if ($checkUserBlock) {
                 if (!empty($blockinfo['title'])) {
-                    $blockinfo['minbox'] = '<a href="'.DataUtil::formatForDisplay(
+                    $blockinfo['minbox'] = '<a href="' . DataUtil::formatForDisplay(
                             ModUtil::url('ZikulaBlocksModule', 'user', 'changestatus', ['bid' => $blockinfo['bid']])
-                        ).'">'.$upb.'</a>';
+                        ) . '">' . $upb . '</a>';
                 }
             } else {
                 $blockinfo['content'] = '';
                 if (!empty($blockinfo['title'])) {
-                    $blockinfo['minbox'] = '<a href="'.DataUtil::formatForDisplay(
+                    $blockinfo['minbox'] = '<a href="' . DataUtil::formatForDisplay(
                             ModUtil::url('ZikulaBlocksModule', 'user', 'changestatus', ['bid' => $blockinfo['bid']])
-                        ).'">'.$downb.'</a>';
+                        ) . '">' . $downb . '</a>';
                 }
             }
             // end collapseable menu config
@@ -291,7 +291,7 @@ 
         if ($modinfo['state'] != \ModUtil::STATE_ACTIVE) {
             return false;
         }
-        $serviceId = strtolower('block.'.$modinfo['name'].'_'.'Block_'.$block);
+        $serviceId = strtolower('block.' . $modinfo['name'] . '_' . 'Block_' . $block);
         if ($sm->has($serviceId)) {
             return $sm->get($serviceId);
         }
@@ -301,7 +301,7 @@ 
         $basedir = ($modinfo['type'] == ModUtil::TYPE_SYSTEM) ? 'system' : 'modules';
         $moddir = DataUtil::formatForOS($modinfo['directory']);
         $blockdir = "$basedir/$moddir/lib/$moddir/Block";
-        $ooblock = "$blockdir/".ucwords($block).'.php';
+        $ooblock = "$blockdir/" . ucwords($block) . '.php';
         ModUtil::load($modname);
         // get the block info
         $kernel = $sm->get('kernel');
@@ -309,14 +309,14 @@ 
         try {
             /** @var $module \Zikula\Core\AbstractModule */
             $module = $kernel->getModule($modinfo['name']);
-            $className = $module->getNamespace().'\\Block\\'.ucwords($block);
-            $className = preg_match('/.*Block$/', $className) ? $className : $className.'Block';
+            $className = $module->getNamespace() . '\\Block\\' . ucwords($block);
+            $className = preg_match('/.*Block$/', $className) ? $className : $className . 'Block';
         } catch (\InvalidArgumentException $e) {
         }
         if (!isset($className)) {
-            $className = ucwords($modinfo['name']).'\\'.'Block\\'.ucwords($block);
-            $className = preg_match('/.*Block$/', $className) ? $className : $className.'Block';
-            $classNameOld = ucwords($modinfo['name']).'_'.'Block_'.ucwords($block);
+            $className = ucwords($modinfo['name']) . '\\' . 'Block\\' . ucwords($block);
+            $className = preg_match('/.*Block$/', $className) ? $className : $className . 'Block';
+            $classNameOld = ucwords($modinfo['name']) . '_' . 'Block_' . ucwords($block);
             $className = class_exists($className) ? $className : $classNameOld;
         }
         $blockInstance = \ServiceUtil::get('zikula_blocks_module.api.block_factory')->getInstance($className, $module);
@@ -405,14 +405,14 @@ 
             $item = $entityManager->getRepository('ZikulaBlocksModule:UserBlockEntity')->findOneBy(['uid' => $uid, 'bid' => $blockinfo['bid']]);
             if (!$item) {
                 $item = new \Zikula\BlocksModule\Entity\UserBlockEntity();
-                $item['uid'] = (int) $uid;
+                $item['uid'] = (int)$uid;
                 $item['bid'] = $blockinfo['bid'];
                 $item['active'] = $blockinfo['defaultstate'];
                 $entityManager->persist($item);
                 $entityManager->flush();
             }
 
-            return (bool) $item['active'];
+            return (bool)$item['active'];
         }
 
         return false;

src/lib/legacy/util/EventUtil.php

Spacing +1 added lines, -1 removed lines

@@ -336,7 +336,7 @@
                             if (is_callable($handler['callable'])) {
                                 self::attach($handler['eventname'], $handler['callable'], $handler['weight']);
                             } else {
-                                LogUtil::log(sprintf("Event handler was not attached for event '%s' because method '%s' is not callable", $handler['eventname'], $handler['callable'][0].'::'.$handler['callable'][1]), \Monolog\Logger::ERROR);
+                                LogUtil::log(sprintf("Event handler was not attached for event '%s' because method '%s' is not callable", $handler['eventname'], $handler['callable'][0] . '::' . $handler['callable'][1]), \Monolog\Logger::ERROR);
                             }
                         }
                     } catch (InvalidArgumentException $e) {

src/lib/legacy/util/StringUtil.php

Spacing +2 added lines, -2 removed lines

@@ -182,14 +182,14 @@
             }
 
             // Get context on the left
-            $startPos = (int) max(0, $startPos - floor($contextSize / 2));
+            $startPos = (int)max(0, $startPos - floor($contextSize / 2));
             // Get the first word of section in full length
             while ($startPos > 0 && $text[$startPos] != ' ') {
                 --$startPos;
             }
 
             // Get context on the right
-            $endPos = (int) min($textLen, $startPos + $contextSize);
+            $endPos = (int)min($textLen, $startPos + $contextSize);
             // Get the last word of section in full length
             while ($endPos < (mb_strlen($text)) && $text[$endPos] != ' ') {
                 ++$endPos;