XOOPS / XoopsCore25

htdocs/class/xoopslocal.php

Spacing +5 added lines, -5 removed lines

@@ -36,12 +36,12 @@ 
     public static function substr($str, $start, $length, $trimmarker = '...')
     {
         if (!XOOPS_USE_MULTIBYTES) {
-            return (strlen($str) - $start <= $length) ? substr($str, $start, $length) : substr($str, $start, $length - strlen($trimmarker)) . $trimmarker;
+            return (strlen($str) - $start <= $length) ? substr($str, $start, $length) : substr($str, $start, $length - strlen($trimmarker)).$trimmarker;
         }
         if (function_exists('mb_internal_encoding') && @mb_internal_encoding(_CHARSET)) {
             $str2 = mb_strcut($str, $start, $length - strlen($trimmarker));
 
-            return $str2 . (mb_strlen($str) != mb_strlen($str2) ? $trimmarker : '');
+            return $str2.(mb_strlen($str) != mb_strlen($str2) ? $trimmarker : '');
         }
 
         return $str;
@@ -87,7 +87,7 @@ 
         if (XOOPS_USE_MULTIBYTES && function_exists('mb_convert_encoding')) {
             $converted_text = @mb_convert_encoding($text, $to, $from);
         } elseif (function_exists('iconv')) {
-            $converted_text = @iconv($from, $to . '//TRANSLIT', $text);
+            $converted_text = @iconv($from, $to.'//TRANSLIT', $text);
         } elseif ('utf-8' === $to) {
             $converted_text = utf8_encode($text);
         }
@@ -138,9 +138,9 @@ 
             if (isset($GLOBALS['xoopsConfig']['server_TZ'])) {
                 $server_TZ = abs((int)($GLOBALS['xoopsConfig']['server_TZ'] * 3600.0));
                 $prefix    = ($GLOBALS['xoopsConfig']['server_TZ'] < 0) ? ' -' : ' +';
-                $TIME_ZONE = $prefix . date('Hi', $server_TZ);
+                $TIME_ZONE = $prefix.date('Hi', $server_TZ);
             }
-            $date = gmdate('D, d M Y H:i:s', (int)$time) . $TIME_ZONE;
+            $date = gmdate('D, d M Y H:i:s', (int)$time).$TIME_ZONE;
 
             return $date;
         }

htdocs/class/mimetypes.inc.php

Spacing +1 added lines, -1 removed lines

@@ -19,4 +19,4 @@
 
 $GLOBALS['xoopsLogger']->addDeprecated("'/class/mimetypes.inc.php' is deprecated, use '/include/mimetypes.inc.php' directly.");
 
-return include XOOPS_ROOT_PATH . '/include/mimetypes.inc.php';
+return include XOOPS_ROOT_PATH.'/include/mimetypes.inc.php';

htdocs/class/model/xoopsmodel.php

Spacing +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
  */
 defined('XOOPS_ROOT_PATH') || exit('Restricted access');
 
-include_once XOOPS_ROOT_PATH . '/kernel/object.php';
+include_once XOOPS_ROOT_PATH.'/kernel/object.php';
 
 /**
  * Factory for object handlers
@@ -72,15 +72,15 @@ 
     {
         static $handlers;
         if (!isset($handlers[$name])) {
-            if (file_exists($file = __DIR__ . '/' . $name . '.php')) {
+            if (file_exists($file = __DIR__.'/'.$name.'.php')) {
                 include_once $file;
-                $className = 'XoopsModel' . ucfirst($name);
+                $className = 'XoopsModel'.ucfirst($name);
                 $handler   = new $className();
             } elseif (xoops_load('model', 'framework')) {
                 $handler = XoopsModel::loadHandler($name);
             }
             if (!is_object($handler)) {
-                trigger_error('Handler not found in file ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
+                trigger_error('Handler not found in file '.__FILE__.' at line '.__LINE__, E_USER_WARNING);
 
                 return null;
             }
@@ -136,7 +136,7 @@ 
     public function setHandler($handler)
     {
         if (is_object($handler) && is_a($handler, 'XoopsPersistableObjectHandler')) {
-            $this->handler =& $handler;
+            $this->handler = & $handler;
 
             return true;
         }

htdocs/class/model/read.php

Spacing +10 added lines, -10 removed lines

@@ -42,7 +42,7 @@ 
             if (!in_array($this->handler->keyName, $fields)) {
                 $fields[] = $this->handler->keyName;
             }
-            $select = '`' . implode('`, `', $fields) . '`';
+            $select = '`'.implode('`, `', $fields).'`';
         } else {
             $select = '*';
         }
@@ -50,12 +50,12 @@ 
         $start = null;
         $sql   = "SELECT {$select} FROM `{$this->handler->table}`";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($groupby = $criteria->getGroupby()) {
                 $sql .= $groupby;
             }
             if ($sort = $criteria->getSort()) {
-                $sql .= " ORDER BY {$sort} " . $criteria->getOrder();
+                $sql .= " ORDER BY {$sort} ".$criteria->getOrder();
                 $orderSet = true;
             }
             $limit = $criteria->getLimit();
@@ -105,7 +105,7 @@ 
      */
     public function &getObjects(CriteriaElement $criteria = null, $id_as_key = false, $as_object = true)
     {
-        $objects =& $this->getAll($criteria, null, $as_object, $id_as_key);
+        $objects = & $this->getAll($criteria, null, $as_object, $id_as_key);
 
         return $objects;
     }
@@ -131,9 +131,9 @@ 
         }
         $sql .= " FROM `{$this->handler->table}`";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($sort = $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $sort . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$sort.' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -164,7 +164,7 @@ 
         $sql   = "SELECT `{$this->handler->keyName}` FROM `{$this->handler->table}`";
         $limit = $start = null;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         }
@@ -192,7 +192,7 @@ 
      */
     public function &getByLimit($limit = 0, $start = 0, CriteriaElement $criteria = null, $fields = null, $asObject = true)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated, please use getAll instead.');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.'() is deprecated, please use getAll instead.');
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
             $criteria->setLimit($limit);
             $criteria->setStart($start);
@@ -216,7 +216,7 @@ 
      */
     public function convertResultSet($result, $id_as_key = false, $as_object = true)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated.');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.'() is deprecated.');
         $ret = array();
         while (false !== ($myrow = $this->handler->db->fetchArray($result))) {
             $obj = $this->handler->create(false);
@@ -234,7 +234,7 @@ 
                 }
             } else {
                 if ($as_object) {
-                    $ret[$myrow[$this->handler->keyName]] =& $obj;
+                    $ret[$myrow[$this->handler->keyName]] = & $obj;
                 } else {
                     $row  = array();
                     $vars = $obj->getVars();

htdocs/class/model/stats.php

Spacing +3 added lines, -3 removed lines

@@ -40,12 +40,12 @@ 
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
             if ($criteria->groupby != '') {
                 $groupby = true;
-                $field   = $criteria->groupby . ', ';
+                $field   = $criteria->groupby.', ';
             }
         }
         $sql = "SELECT {$field} COUNT(*) FROM `{$this->handler->table}`";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             $sql .= $criteria->getGroupby();
         }
         $result = $this->handler->db->query($sql);
@@ -87,7 +87,7 @@ 
                 $groupby_key = $groupby;
             }
         }
-        $sql = "SELECT {$groupby_key}, COUNT(*) AS count" . " FROM `{$this->handler->table}`" . " {$sql_where}" . " GROUP BY {$groupby_key}";
+        $sql = "SELECT {$groupby_key}, COUNT(*) AS count"." FROM `{$this->handler->table}`"." {$sql_where}"." GROUP BY {$groupby_key}";
         if (!$result = $this->handler->db->query($sql, $limit, $start)) {
             return $ret;
         }

htdocs/class/model/write.php

Spacing +16 added lines, -16 removed lines

@@ -179,7 +179,7 @@ 
                         continue 2;
                     }
                     if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
-                        $cleanv = XOOPS_PROT . $cleanv;
+                        $cleanv = XOOPS_PROT.$cleanv;
                     }
                     if (!$v['not_gpc']) {
                         $cleanv = $ts->stripSlashesGPC($cleanv);
@@ -193,7 +193,7 @@ 
                         continue 2;
                     }
                     if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
-                        $cleanv = XOOPS_PROT . $cleanv;
+                        $cleanv = XOOPS_PROT.$cleanv;
                     }
                     if (!$v['not_gpc']) {
                         $cleanv = $ts->stripSlashesGPC($cleanv);
@@ -231,7 +231,7 @@ 
                         $cleanv[$key] = str_replace('\\"', '"', addslashes($cleanv[$key]));
                     }
                     // TODO: Not encoding safe, should try base64_encode -- phppp
-                    $cleanv = "'" . serialize(array_walk($cleanv, 'xoops_aw_encode')) . "'";
+                    $cleanv = "'".serialize(array_walk($cleanv, 'xoops_aw_encode'))."'";
                     break;
 
                 case XOBJ_DTYPE_ARRAY:
@@ -273,25 +273,25 @@ 
     public function insert(&$object, $force = true)
     {
         if (!$object->isDirty()) {
-            trigger_error("Data entry is not inserted - the object '" . get_class($object) . "' is not dirty", E_USER_NOTICE);
+            trigger_error("Data entry is not inserted - the object '".get_class($object)."' is not dirty", E_USER_NOTICE);
 
             return $object->getVar($this->handler->keyName);
         }
         if (!$this->cleanVars($object)) {
-            trigger_error("Insert failed in method 'cleanVars' of object '" . get_class($object) . "'", E_USER_WARNING);
+            trigger_error("Insert failed in method 'cleanVars' of object '".get_class($object)."'", E_USER_WARNING);
 
             return $object->getVar($this->handler->keyName);
         }
         $queryFunc = empty($force) ? 'query' : 'queryF';
 
         if ($object->isNew()) {
-            $sql = 'INSERT INTO `' . $this->handler->table . '`';
+            $sql = 'INSERT INTO `'.$this->handler->table.'`';
             if (!empty($object->cleanVars)) {
                 $keys = array_keys($object->cleanVars);
                 $vals = array_values($object->cleanVars);
-                $sql .= ' (`' . implode('`, `', $keys) . '`) VALUES (' . implode(',', $vals) . ')';
+                $sql .= ' (`'.implode('`, `', $keys).'`) VALUES ('.implode(',', $vals).')';
             } else {
-                trigger_error("Data entry is not inserted - no variable is changed in object of '" . get_class($object) . "'", E_USER_NOTICE);
+                trigger_error("Data entry is not inserted - no variable is changed in object of '".get_class($object)."'", E_USER_NOTICE);
 
                 return $object->getVar($this->handler->keyName);
             }
@@ -306,7 +306,7 @@ 
             foreach ($object->cleanVars as $k => $v) {
                 $keys[] = " `{$k}` = {$v}";
             }
-            $sql = 'UPDATE `' . $this->handler->table . '` SET ' . implode(',', $keys) . ' WHERE `' . $this->handler->keyName . '` = ' . $this->handler->db->quote($object->getVar($this->handler->keyName));
+            $sql = 'UPDATE `'.$this->handler->table.'` SET '.implode(',', $keys).' WHERE `'.$this->handler->keyName.'` = '.$this->handler->db->quote($object->getVar($this->handler->keyName));
             if (!$result = $this->handler->db->{$queryFunc}($sql)) {
                 return false;
             }
@@ -328,13 +328,13 @@ 
             $clause = array();
             $thishandlerkeyNameCount = count($this->handler->keyName);
             for ($i = 0; $i < $thishandlerkeyNameCount; ++$i) {
-                $clause[] = '`' . $this->handler->keyName[$i] . '` = ' . $this->handler->db->quote($object->getVar($this->handler->keyName[$i]));
+                $clause[] = '`'.$this->handler->keyName[$i].'` = '.$this->handler->db->quote($object->getVar($this->handler->keyName[$i]));
             }
             $whereclause = implode(' AND ', $clause);
         } else {
-            $whereclause = '`' . $this->handler->keyName . '` = ' . $this->handler->db->quote($object->getVar($this->handler->keyName));
+            $whereclause = '`'.$this->handler->keyName.'` = '.$this->handler->db->quote($object->getVar($this->handler->keyName));
         }
-        $sql       = 'DELETE FROM `' . $this->handler->table . '` WHERE ' . $whereclause;
+        $sql       = 'DELETE FROM `'.$this->handler->table.'` WHERE '.$whereclause;
         $queryFunc = empty($force) ? 'query' : 'queryF';
         $result    = $this->handler->db->{$queryFunc}($sql);
 
@@ -362,10 +362,10 @@ 
             return $num;
         }
         $queryFunc = empty($force) ? 'query' : 'queryF';
-        $sql       = 'DELETE FROM ' . $this->handler->table;
+        $sql       = 'DELETE FROM '.$this->handler->table;
         if (!empty($criteria)) {
             if (is_subclass_of($criteria, 'CriteriaElement')) {
-                $sql .= ' ' . $criteria->renderWhere();
+                $sql .= ' '.$criteria->renderWhere();
             } else {
                 return false;
             }
@@ -396,9 +396,9 @@ 
         } else {
             $set_clause .= $this->handler->db->quote($fieldvalue);
         }
-        $sql = 'UPDATE `' . $this->handler->table . '` SET ' . $set_clause;
+        $sql = 'UPDATE `'.$this->handler->table.'` SET '.$set_clause;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $queryFunc = empty($force) ? 'query' : 'queryF';
         $result    = $this->handler->db->{$queryFunc}($sql);

htdocs/class/model/sync.php

Spacing +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
         }
 
         if (empty($this->handler->field_object) || empty($this->handler->table_link) || empty($this->handler->field_link)) {
-            trigger_error("The link information is not set for '" . get_class($this->handler) . "' yet.", E_USER_WARNING);
+            trigger_error("The link information is not set for '".get_class($this->handler)."' yet.", E_USER_WARNING);
 
             return null;
         }
@@ -67,10 +67,10 @@ 
          * for MySQL 4.1+
          */
         if (version_compare(mysqli_get_server_info($this->handler->db->conn), '4.1.0', 'ge')) {
-            $sql = "DELETE FROM `{$this->handler->table}`" . " WHERE (`{$this->handler->field_object}` NOT IN ( SELECT DISTINCT `{$this->handler->field_link}` FROM `{$this->handler->table_link}`) )";
+            $sql = "DELETE FROM `{$this->handler->table}`"." WHERE (`{$this->handler->field_object}` NOT IN ( SELECT DISTINCT `{$this->handler->field_link}` FROM `{$this->handler->table_link}`) )";
         } else {
             // for 4.0+
-            $sql = "DELETE `{$this->handler->table}` FROM `{$this->handler->table}`" . " LEFT JOIN `{$this->handler->table_link}` AS aa ON `{$this->handler->table}`.`{$this->handler->field_object}` = aa.`{$this->handler->field_link}`" . " WHERE (aa.`{$this->handler->field_link}` IS NULL)";
+            $sql = "DELETE `{$this->handler->table}` FROM `{$this->handler->table}`"." LEFT JOIN `{$this->handler->table_link}` AS aa ON `{$this->handler->table}`.`{$this->handler->field_object}` = aa.`{$this->handler->field_link}`"." WHERE (aa.`{$this->handler->field_link}` IS NULL)";
         }
         if (!$result = $this->handler->db->queryF($sql)) {
             return false;

htdocs/class/model/joint.php

Spacing +14 added lines, -14 removed lines

@@ -80,8 +80,8 @@ 
         }
 
         if (is_array($fields) && count($fields)) {
-            if (!in_array('o.' . $this->handler->keyName, $fields)) {
-                $fields[] = 'o.' . $this->handler->keyName;
+            if (!in_array('o.'.$this->handler->keyName, $fields)) {
+                $fields[] = 'o.'.$this->handler->keyName;
             }
             $select = implode(',', $fields);
         } else {
@@ -90,11 +90,11 @@ 
         $limit = null;
         $start = null;
         // $field_object = empty($field_object) ? $field_link : $field_object;
-        $sql = " SELECT {$select}" . " FROM {$this->handler->table} AS o" . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
+        $sql = " SELECT {$select}"." FROM {$this->handler->table} AS o"." LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($sort = $criteria->getSort()) {
-                $sql .= " ORDER BY {$sort} " . $criteria->getOrder();
+                $sql .= " ORDER BY {$sort} ".$criteria->getOrder();
                 $orderSet = true;
             }
             $limit = $criteria->getLimit();
@@ -136,9 +136,9 @@ 
             return null;
         }
 
-        $sql = " SELECT COUNT(DISTINCT o.{$this->handler->keyName}) AS count" . " FROM {$this->handler->table} AS o" . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
+        $sql = " SELECT COUNT(DISTINCT o.{$this->handler->keyName}) AS count"." FROM {$this->handler->table} AS o"." LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$result = $this->handler->db->query($sql)) {
             return false;
@@ -159,9 +159,9 @@ 
         if (!$this->validateLinks()) {
             return null;
         }
-        $sql = " SELECT l.{$this->handler->field_link}, COUNT(*)" . " FROM {$this->handler->table} AS o" . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
+        $sql = " SELECT l.{$this->handler->field_link}, COUNT(*)"." FROM {$this->handler->table} AS o"." LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $sql .= " GROUP BY l.{$this->handler->field_link}";
         if (!$result = $this->handler->db->query($sql)) {
@@ -189,11 +189,11 @@ 
         }
         $set = array();
         foreach ($data as $key => $val) {
-            $set[] = "o.{$key}=" . $this->handler->db->quoteString($val);
+            $set[] = "o.{$key}=".$this->handler->db->quoteString($val);
         }
-        $sql = " UPDATE {$this->handler->table} AS o" . ' SET ' . implode(', ', $set) . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
+        $sql = " UPDATE {$this->handler->table} AS o".' SET '.implode(', ', $set)." LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
 
         return $this->handler->db->query($sql);
@@ -210,9 +210,9 @@ 
         if (!$this->validateLinks()) {
             return null;
         }
-        $sql = "DELETE FROM {$this->handler->table} AS o " . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
+        $sql = "DELETE FROM {$this->handler->table} AS o "." LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
 
         return $this->handler->db->query($sql);

htdocs/class/downloader.php

Spacing +3 added lines, -3 removed lines

@@ -55,14 +55,14 @@
         if (function_exists('mb_http_output')) {
             mb_http_output('pass');
         }
-        header('Content-Type: ' . $this->mimetype);
+        header('Content-Type: '.$this->mimetype);
         if (preg_match("/MSIE (\d\.\d{1,2})/", $_SERVER['HTTP_USER_AGENT'])) {
-            header('Content-Disposition: attachment; filename="' . $filename . '"');
+            header('Content-Disposition: attachment; filename="'.$filename.'"');
             header('Expires: 0');
             header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
             header('Pragma: public');
         } else {
-            header('Content-Disposition: attachment; filename="' . $filename . '"');
+            header('Content-Disposition: attachment; filename="'.$filename.'"');
             header('Expires: 0');
             header('Pragma: no-cache');
         }