zikula / core

src/lib/legacy/viewplugins/function.img.php

Spacing +4 added lines, -4 removed lines

@@ -109,7 +109,7 @@ 
     }
 
     // language
-    $lang =  ZLanguage::transformFS(ZLanguage::getLanguageCode());
+    $lang = ZLanguage::transformFS(ZLanguage::getLanguageCode());
 
     if ($sysplugin) {
         $osplugdir    = DataUtil::formatForOS($sysplugin);
@@ -139,7 +139,7 @@ 
             // theme directory
             $ostheme       = DataUtil::formatForOS(UserUtil::getTheme());
             $theme = ThemeUtil::getTheme($ostheme);
-            $themePath = null === $theme ? '' : $theme->getRelativePath().'/Resources/public/images';
+            $themePath = null === $theme ? '' : $theme->getRelativePath() . '/Resources/public/images';
             $themepath     = $themePath;
             $corethemepath = "themes/$ostheme/images";
 
@@ -153,7 +153,7 @@ 
                 $themepathOld     = "themes/$ostheme/templates/modules/$osmodname/images";
 
                 $module = ModUtil::getModule($modinfo['name']);
-                $moduleBasePath  = null === $module ? '' : $module->getRelativePath().'/Resources/public/images';
+                $moduleBasePath  = null === $module ? '' : $module->getRelativePath() . '/Resources/public/images';
                 $modlangpath     = "$moduleBasePath/$lang";
                 $modpath         = $moduleBasePath;
                 $modlangpathOld  = "$moduleDir/$osmoddir/images/$lang";
@@ -247,7 +247,7 @@ 
 
     $imgtag = '<img ';
     foreach ($params as $key => $value) {
-        $imgtag .= $key . '="' .$value  . '" ';
+        $imgtag .= $key . '="' . $value . '" ';
     }
     $imgtag .= '/>';
 

src/lib/legacy/viewplugins/function.pagerabc.php

Spacing +9 added lines, -9 removed lines

@@ -111,7 +111,7 @@ 
         // predefined abc
         if (strtolower($params['skin']) == 'hu') {
             // Hungarian
-            $pager['names']  = $pager['values'] = ['A', '?', 'B', 'C', 'D', 'E', '?', 'F', 'G', 'H', 'I', '?', 'J', 'K', 'L', 'M', 'N', 'O', '?', '?', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', '?', '?', 'U', 'V', 'W', 'X', 'Y', 'Z'];
+            $pager['names'] = $pager['values'] = ['A', '?', 'B', 'C', 'D', 'E', '?', 'F', 'G', 'H', 'I', '?', 'J', 'K', 'L', 'M', 'N', 'O', '?', '?', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', '?', '?', 'U', 'V', 'W', 'X', 'Y', 'Z'];
             //$params['names']  = ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U'    ,'V','W','X','Y','Z'];
             //$params['values'] = ['A,?','B','C','D','E,?','F','G','H','I,?','J','K','L','M','N','O,?,?,O','P','Q','R','S','T','U,?,?,U','V','W','X','Y','Z'];
         } else {
@@ -141,7 +141,7 @@ 
         unset($params['route']);
     }
 
-    $pagerUrl = function ($pager) use ($view) {
+    $pagerUrl = function($pager) use ($view) {
         if (!isset($pager['route'])) {
             return ModUtil::url($pager['module'], $pager['type'], $pager['func'], $pager['args']);
         }
@@ -201,24 +201,24 @@ 
     unset($pager['args'][$pager['posvar']]);
 
     // begin to fill the output
-    $output = '<ul class="'.$params['class'].'">'."\n";
+    $output = '<ul class="' . $params['class'] . '">' . "\n";
 
     $style = '';
     if ($params['printempty']) {
         $active = '';
         if (!empty($params['class_numon'])) {
             if (!isset($allVars[$pager['posvar']])) {
-                $style = ' class="'.$params['class_numon'].'"';
+                $style = ' class="' . $params['class_numon'] . '"';
                 $active = 'class="active"';
             } elseif (!empty($params['class_num'])) {
-                $style = ' class="'.$params['class_num'].'"';
+                $style = ' class="' . $params['class_num'] . '"';
             } else {
                 $style = '';
             }
         }
         $vars[$pager['posvar']] = '';
         $urltemp = DataUtil::formatForDisplay($pagerUrl($pager));
-        $output .= '<li '.$active.'><a '.$style.' href="'.$urltemp.'"> -'."\n</a></li>";
+        $output .= '<li ' . $active . '><a ' . $style . ' href="' . $urltemp . '"> -' . "\n</a></li>";
     }
 
     $style = '';
@@ -226,17 +226,17 @@ 
         $active = '';
         if (!empty($params['class_numon'])) {
             if (isset($allVars[$pager['posvar']]) && $allVars[$pager['posvar']] == $pager['values'][$i]) {
-                $style = ' class="'.$params['class_numon'].'"';
+                $style = ' class="' . $params['class_numon'] . '"';
                 $active = 'class="active"';
             } elseif (!empty($params['class_num'])) {
-                $style = ' class="'.$params['class_num'].'"';
+                $style = ' class="' . $params['class_num'] . '"';
             } else {
                 $style = '';
             }
         }
         $pager['args'][$pager['posvar']] = $pager['values'][$i];
         $urltemp = DataUtil::formatForDisplay($pagerUrl($pager));
-        $output .= '<li '.$active.'><a '.$style.' href="'.$urltemp.'">'.$pager['names'][$i]."</a></li>\n";
+        $output .= '<li ' . $active . '><a ' . $style . ' href="' . $urltemp . '">' . $pager['names'][$i] . "</a></li>\n";
     }
     $output .= "</ul>\n";
 

src/lib/legacy/viewplugins/insert.getstatusmsg.php

Spacing +9 added lines, -9 removed lines

@@ -78,15 +78,15 @@ 
             $params['tag'] = 'div';
         }
 
-        $result .= '<'.$params['tag'].' class="'.$class.'"';
+        $result .= '<' . $params['tag'] . ' class="' . $class . '"';
 
         if (!is_null($params['style'])) {
-            $result .= ' style="'.$params['style'].'"';
+            $result .= ' style="' . $params['style'] . '"';
         }
 
         $result .= '>';
         $result .= implode('<hr />', $messages);
-        $result .= '</'.$params['tag'].'>';
+        $result .= '</' . $params['tag'] . '>';
     }
     /**
      * Get warning messages.
@@ -108,15 +108,15 @@ 
             $params['tag'] = 'div';
         }
 
-        $result .= '<'.$params['tag'].' class="'.$class.'"';
+        $result .= '<' . $params['tag'] . ' class="' . $class . '"';
 
         if ($params['style']) {
-            $result .= ' style="'.$params['style'].'"';
+            $result .= ' style="' . $params['style'] . '"';
         }
 
         $result .= '>';
         $result .= implode('<hr />', $messages);
-        $result .= '</'.$params['tag'].'>';
+        $result .= '</' . $params['tag'] . '>';
     }
 
     /**
@@ -139,15 +139,15 @@ 
             $params['tag'] = 'div';
         }
 
-        $result .= '<'.$params['tag'].' class="'.$class.'"';
+        $result .= '<' . $params['tag'] . ' class="' . $class . '"';
 
         if ($params['style']) {
-            $result .= ' style="'.$params['style'].'"';
+            $result .= ' style="' . $params['style'] . '"';
         }
 
         $result .= '>';
         $result .= implode('<hr />', $messages);
-        $result .= '</'.$params['tag'].'>';
+        $result .= '</' . $params['tag'] . '>';
     }
 
     if (empty($total_messages)) {

src/lib/legacy/viewplugins/function.useravatar.php

Spacing +5 added lines, -5 removed lines

@@ -73,12 +73,12 @@ 
 
         $avatarURL = 'http://www.gravatar.com/avatar.php?gravatar_id=' . md5($email);
         if (isset($params['rating']) && !empty($params['rating'])) {
-            $avatarURL .= "&rating=".$params['rating'];
+            $avatarURL .= "&rating=" . $params['rating'];
         }
         if (isset($params['size']) && !empty($params['size'])) {
-            $avatarURL .= "&size=".$params['size'];
+            $avatarURL .= "&size=" . $params['size'];
         }
-        $avatarURL .= "&default=".urlencode(System::getBaseUrl() . $avatarpath . '/' . $gravatarimage);
+        $avatarURL .= "&default=" . urlencode(System::getBaseUrl() . $avatarpath . '/' . $gravatarimage);
     } else {
         // e.g. blank.gif or empty avatars
         return false;
@@ -91,10 +91,10 @@ 
 
     $html = '<img ' . $classString . ' src="' . DataUtil::formatForDisplay($avatarURL) . '" title="' . DataUtil::formatForDisplay($uname) . '" alt="' . DataUtil::formatForDisplay($uname) . '"';
     if (isset($params['width'])) {
-        $html .= ' width="'.$params['width'].'"';
+        $html .= ' width="' . $params['width'] . '"';
     }
     if (isset($params['height'])) {
-        $html .= ' height="'.$params['height'].'"';
+        $html .= ' height="' . $params['height'] . '"';
     }
     $html .= ' />';
 

src/lib/legacy/dbobject/DBUtil.php

Spacing +9 added lines, -9 removed lines

@@ -317,7 +317,7 @@ 
                     list(, $tab) = explode(' ', $sql);
                 }
                 if (strpos($sql, 'delete') === 0) {
-                    list(, , $tab) = explode(' ', $sql);
+                    list(,, $tab) = explode(' ', $sql);
                 }
                 if ($tab && strpos($tab, 'session_info') === false) {
                     self::flushCache($tab);
@@ -796,7 +796,7 @@ 
                         }
                         $vArray[] = self::_formatForStore($str);
                     } else {
-                        $vArray[] =  self::_typesafeQuotedValue($table, $key, $object[$key]);
+                        $vArray[] = self::_typesafeQuotedValue($table, $key, $object[$key]);
                     }
                 }
             } else {
@@ -2093,7 +2093,7 @@ 
 
             // process the where depending of the operator
             if ($op == 'AND') {
-                $where[] = "obj_id IN (SELECT {$prefix}obj_id FROM $catmapobjtbl table$n WHERE {$prefix}reg_id = '".DataUtil::formatForStore($propids[$property])."' AND $wherecat)";
+                $where[] = "obj_id IN (SELECT {$prefix}obj_id FROM $catmapobjtbl table$n WHERE {$prefix}reg_id = '" . DataUtil::formatForStore($propids[$property]) . "' AND $wherecat)";
             } else {
                 $where[] = "(reg_id='" . DataUtil::formatForStore($propids[$property]) . "' AND $wherecat)";
             }
@@ -2424,7 +2424,7 @@ 
     {
         @trigger_error('DBUtil is deprecated. please use Doctrine 2 instead.', E_USER_DEPRECATED);
 
-        $key = $column . $where. serialize($categoryFilter) . $subquery;
+        $key = $column . $where . serialize($categoryFilter) . $subquery;
         $sum = self::getCache($table, $key);
         if ($sum !== false) {
             return $sum;
@@ -2475,7 +2475,7 @@ 
     {
         @trigger_error('DBUtil is deprecated. please use Doctrine 2 instead.', E_USER_DEPRECATED);
 
-        $key = $column . $where. (int)$distinct . serialize($categoryFilter) . $subquery;
+        $key = $column . $where . (int)$distinct . serialize($categoryFilter) . $subquery;
         $sum = self::getCache($table, $key);
         if ($sum !== false) {
             return $sum;
@@ -2638,7 +2638,7 @@ 
         $tables = self::getTables();
         $tableName = $tables[$table];
         $columns = $tables["{$table}_column"];
-        $fieldName = isset($columns[$field]) ? 'tbl.'.$columns[$field] : $field;
+        $fieldName = isset($columns[$field]) ? 'tbl.' . $columns[$field] : $field;
 
         $sqlJoinArray = self::_processJoinArray($table, $joinInfo);
         $sqlJoin = $sqlJoinArray[0];
@@ -2905,7 +2905,7 @@ 
         //$dst = ($distinct ? 'DISTINCT' : '');
         $sqlStart = "SELECT COUNT(*) ";
         $sqlFrom = "FROM $tableName AS tbl ";
-        $sqlGroupBy = (empty($sqlJoinArray[3])) ? '' : 'GROUP BY '.implode(', ', $sqlJoinArray[3]);
+        $sqlGroupBy = (empty($sqlJoinArray[3])) ? '' : 'GROUP BY ' . implode(', ', $sqlJoinArray[3]);
 
         $sql = "$sqlStart $sqlJoinFieldList $sqlFrom $sqlJoin $where $sqlGroupBy";
         $res = self::executeSQL($sql);
@@ -3194,9 +3194,9 @@ 
             // we have a {$tablename}_column_def array as defined in tables.php. This is a real array, not a string.
             // The format is like "C(24) NOTNULL DEFAULT ''" which means we have to prepend the field name now
             $typemap = [
-                'B' => 'blob',    // NOTE: not supported in Doctrine 2
+                'B' => 'blob', // NOTE: not supported in Doctrine 2
                 'C' => 'string',
-                'C2' => 'blob',   // NOTE: not supported in Doctrine 2
+                'C2' => 'blob', // NOTE: not supported in Doctrine 2
                 'D' => 'date',
                 'F' => 'float',
                 'I' => 'integer',

Upper-Lower-Casing +9 added lines, -9 removed lines

@@ -872,7 +872,7 @@ 
         $tables = self::getTables();
         $tableName = $tables[$table];
 
-        $sql = "UPDATE $tableName SET ";
+        $sql = "update $tableName SET ";
 
         // set standard architecture fields
         ObjectUtil::setStandardFieldsOnObjectUpdate($object, $force);
@@ -1179,7 +1179,7 @@ 
             if (!$object[$idfield]) {
                 throw new Exception(__('Object does not have an ID'));
             }
-            $sql .= "WHERE $fieldName = " . self::_typesafeQuotedValue($table, $idfield, $object[$idfield]);
+            $sql .= "where $fieldName = " . self::_typesafeQuotedValue($table, $idfield, $object[$idfield]);
         } else {
             $sql .= self::_checkWhereClause($where);
             $object['__fake_field__'] = 'Fake entry to mark deleteWhere() return as valid object';
@@ -1905,7 +1905,7 @@ 
             $orderby = self::_checkOrderByField($table, $field); // "ORDER BY $columns[$field]";
         }
 
-        $sql = "SELECT $dSql $assoc FROM $tableName AS tbl $where $orderby";
+        $sql = "select $dSql $assoc FROM $tableName AS tbl $where $orderby";
 
         $res = self::executeSQL($sql, $limitOffset, $limitNumRows, $exitOnError);
         if ($res === false) {
@@ -1965,7 +1965,7 @@ 
         $columns = $tables["{$table}_column"];
         $field = isset($columns[$field]) ? $columns[$field] : $field;
 
-        $sql = "SELECT $option($field) FROM $tableName AS tbl";
+        $sql = "select $option($field) FROM $tableName AS tbl";
         $where = self::_checkWhereClause($where);
 
         $sql .= ' ' . $where;
@@ -2007,7 +2007,7 @@ 
             $assocKey = isset($tables["{$table}_primary_key_column"]) ? $tables["{$table}_primary_key_column"] : 'id';
         }
 
-        $sql = "SELECT $assocKey AS $assocKey, $option($fieldName) AS $option FROM $tableName AS tbl";
+        $sql = "select $assocKey AS $assocKey, $option($fieldName) AS $option FROM $tableName AS tbl";
         $where = self::_checkWhereClause($where);
 
         $sql .= ' ' . $where;
@@ -2648,8 +2648,8 @@ 
         $orderby = self::_checkOrderByClause($orderby, $table);
 
         $dSql = ($distinct ? "DISTINCT($fieldName)" : "$fieldName");
-        $sqlStart = "SELECT $dSql ";
-        $sqlFrom = "FROM $tableName AS tbl ";
+        $sqlStart = "select $dSql ";
+        $sqlFrom = "from $tableName AS tbl ";
 
         $sql = "$sqlStart $sqlJoinFieldList $sqlFrom $sqlJoin $where $orderby";
 
@@ -2759,7 +2759,7 @@ 
         $disableJoins = System::getVar('disableJoinss');
 
         $sqlStart  = "SELECT " . ($distinct ? 'DISTINCT ' : '') . self::_getAllColumnsQualified($table, 'tbl', $columnArray);
-        $sqlFrom   = "FROM $tableName AS tbl ";
+        $sqlFrom   = "from $tableName AS tbl ";
 
         if ($useJoins && !$disableJoins) {
             $sqlJoinArray     = self::_processJoinArray($table, $joinInfo, $columnArray);
@@ -2904,7 +2904,7 @@ 
         $where = self::_checkWhereClause($where);
         //$dst = ($distinct ? 'DISTINCT' : '');
         $sqlStart = "SELECT COUNT(*) ";
-        $sqlFrom = "FROM $tableName AS tbl ";
+        $sqlFrom = "from $tableName AS tbl ";
         $sqlGroupBy = (empty($sqlJoinArray[3])) ? '' : 'GROUP BY '.implode(', ', $sqlJoinArray[3]);
 
         $sql = "$sqlStart $sqlJoinFieldList $sqlFrom $sqlJoin $where $sqlGroupBy";

src/lib/legacy/dbobject/ObjectUtil.php

Upper-Lower-Casing +8 added lines, -8 removed lines

@@ -391,12 +391,12 @@ 
         }
 
         if ($direction == 'up') {
-            $sql = "SELECT $column[$idcolumn], $column[$field]
+            $sql = "select $column[$idcolumn], $column[$field]
                     FROM $table
                     WHERE $column[$field] < '" . DataUtil::formatForStore($seq) . "' $where2
                     ORDER BY $column[$field] DESC LIMIT 0,1";
         } elseif ($direction == 'down') {
-            $sql = "SELECT $column[$idcolumn], $column[$field]
+            $sql = "select $column[$idcolumn], $column[$field]
                     FROM $table
                     WHERE $column[$field] > '" . DataUtil::formatForStore($seq) . "' $where2
                     ORDER BY $column[$field] ASC LIMIT 0,1";
@@ -413,9 +413,9 @@ 
         list($altid, $altseq) = $res->fields;
 
         // Swap sequence numbers
-        $sql = "UPDATE $table SET $column[$field]='" . DataUtil::formatForStore($seq) . "' WHERE $column[$idcolumn]='" . DataUtil::formatForStore($altid) . "'";
+        $sql = "update $table SET $column[$field]='" . DataUtil::formatForStore($seq) . "' WHERE $column[$idcolumn]='" . DataUtil::formatForStore($altid) . "'";
         $upd1 = DBUtil::executeSQL($sql);
-        $sql = "UPDATE $table SET $column[$field]='" . DataUtil::formatForStore($altseq) . "' WHERE $column[$idcolumn]='" . DataUtil::formatForStore($obj[$idcolumn]) . "'";
+        $sql = "update $table SET $column[$field]='" . DataUtil::formatForStore($altseq) . "' WHERE $column[$idcolumn]='" . DataUtil::formatForStore($obj[$idcolumn]) . "'";
         $upd2 = DBUtil::executeSQL($sql);
 
         DBUtil::flushCache($tablename);
@@ -453,7 +453,7 @@ 
         $table = $dbtables['objectdata_attributes'];
         $column = $dbtables['objectdata_attributes_column'];
 
-        $where = "WHERE $column[object_id]= '" . DataUtil::formatForStore($obj[$idcolumn]) . "' AND
+        $where = "where $column[object_id]= '" . DataUtil::formatForStore($obj[$idcolumn]) . "' AND
                         $column[object_type]='" . DataUtil::formatForStore($type) . "'";
 
         return DBUtil::selectObjectArray('objectdata_attributes', $where);
@@ -772,7 +772,7 @@ 
         $column = $dbtables['objectdata_attributes_column'];
 
         $sql = "DELETE FROM $table WHERE $column[object_type] = '" . DataUtil::formatForStore($type) . "' ";
-        $sql .= "AND $column[attribute_name] = '" . DataUtil::formatForStore($attributeName) . "' ";
+        $sql .= "and $column[attribute_name] = '" . DataUtil::formatForStore($attributeName) . "' ";
         $res = DBUtil::executeSQL($sql);
 
         DBUtil::flushCache('objectdata_attributes');
@@ -940,7 +940,7 @@ 
             $meta_column = $dbtables['objectdata_meta_column'];
 
             $meta = $obj['__META__'];
-            $where = "WHERE $meta_column[module]='" . DataUtil::formatForStore($meta['module']) . "'
+            $where = "where $meta_column[module]='" . DataUtil::formatForStore($meta['module']) . "'
                         AND $meta_column[table]='" . DataUtil::formatForStore($meta['table']) . "'
                         AND $meta_column[idcolumn]='" . DataUtil::formatForStore($meta['idcolumn']) . "'
                         AND $meta_column[obj_id]='" . DataUtil::formatForStore($meta['obj_id']) . "'";
@@ -974,7 +974,7 @@ 
             $dbtables = DBUtil::getTables();
             $meta_column = $dbtables['objectdata_meta_column'];
 
-            $where = "WHERE $meta_column[module]='" . DataUtil::formatForStore($meta['module']) . "'
+            $where = "where $meta_column[module]='" . DataUtil::formatForStore($meta['module']) . "'
                         AND $meta_column[table]='" . DataUtil::formatForStore($meta['table']) . "'
                         AND $meta_column[idcolumn]='" . DataUtil::formatForStore($meta['idcolumn']) . "'
                         AND $meta_column[obj_id]='" . DataUtil::formatForStore($meta['obj_id']) . "'";

src/lib/legacy/util/FilterUtil/AbstractBase.php

Spacing +1 added lines, -1 removed lines

@@ -84,6 +84,6 @@
      */
     protected function addCommon(&$config)
     {
-        $config['config']  = $this->getConfig();
+        $config['config'] = $this->getConfig();
     }
 }

src/lib/legacy/util/FilterUtil/Config.php

Spacing +2 added lines, -2 removed lines

@@ -259,7 +259,7 @@ 
                 return false;
             }
 
-            $this->_column  = $tables[$table . '_column'];
+            $this->_column = $tables[$table . '_column'];
         }
 
         return true;
@@ -608,7 +608,7 @@ 
     {
         $this->_column = [];
 
-        $aliasMap  = $this->_doctrineQuery->getTableAliasMap();
+        $aliasMap = $this->_doctrineQuery->getTableAliasMap();
 
         $aliases = [];
         foreach ($tables as $alias => $table) {

src/lib/legacy/util/FilterUtil/Filter/Default.php

Spacing +2 added lines, -2 removed lines

@@ -250,7 +250,7 @@ 
 
             case 'search':
                 $where = "$column LIKE ?";
-                $params[] = '%'.$value.'%';
+                $params[] = '%' . $value . '%';
                 break;
 
             case 'like':
@@ -260,7 +260,7 @@ 
 
             case 'likefirst':
                 $where = "$column LIKE ?";
-                $params[] = $value."%";
+                $params[] = $value . "%";
                 break;
 
             case 'null':