XOOPS / XoopsCore25

htdocs/class/database/databasefactory.php

Spacing +8 added lines, -8 removed lines

@@ -46,13 +46,13 @@ 
     {
         static $instance;
         if (!isset($instance)) {
-            if (file_exists($file = XOOPS_ROOT_PATH . '/class/database/' . XOOPS_DB_TYPE . 'database.php')) {
+            if (file_exists($file = XOOPS_ROOT_PATH.'/class/database/'.XOOPS_DB_TYPE.'database.php')) {
                 require_once $file;
 
                 if (!defined('XOOPS_DB_PROXY')) {
-                    $class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseSafe';
+                    $class = 'Xoops'.ucfirst(XOOPS_DB_TYPE).'DatabaseSafe';
                 } else {
-                    $class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseProxy';
+                    $class = 'Xoops'.ucfirst(XOOPS_DB_TYPE).'DatabaseProxy';
                 }
 
                 $xoopsPreload = XoopsPreload::getInstance();
@@ -65,7 +65,7 @@ 
                     trigger_error('notrace:Unable to connect to database', E_USER_ERROR);
                 }
             } else {
-                trigger_error('notrace:Failed to load database of type: ' . XOOPS_DB_TYPE . ' in file: ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
+                trigger_error('notrace:Failed to load database of type: '.XOOPS_DB_TYPE.' in file: '.__FILE__.' at line '.__LINE__, E_USER_WARNING);
             }
         }
 
@@ -84,17 +84,17 @@ 
     {
         static $database;
         if (!isset($database)) {
-            if (file_exists($file = XOOPS_ROOT_PATH . '/class/database/' . XOOPS_DB_TYPE . 'database.php')) {
+            if (file_exists($file = XOOPS_ROOT_PATH.'/class/database/'.XOOPS_DB_TYPE.'database.php')) {
                 include_once $file;
                 if (!defined('XOOPS_DB_PROXY')) {
-                    $class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseSafe';
+                    $class = 'Xoops'.ucfirst(XOOPS_DB_TYPE).'DatabaseSafe';
                 } else {
-                    $class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseProxy';
+                    $class = 'Xoops'.ucfirst(XOOPS_DB_TYPE).'DatabaseProxy';
                 }
                 unset($database);
                 $database = new $class();
             } else {
-                trigger_error('notrace:Failed to load database of type: ' . XOOPS_DB_TYPE . ' in file: ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
+                trigger_error('notrace:Failed to load database of type: '.XOOPS_DB_TYPE.' in file: '.__FILE__.' at line '.__LINE__, E_USER_WARNING);
             }
         }
 

htdocs/class/database/database.php

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
     public function prefix($tablename = '')
     {
         if ($tablename != '') {
-            return $this->prefix . '_' . $tablename;
+            return $this->prefix.'_'.$tablename;
         } else {
             return $this->prefix;
         }

htdocs/class/database/mysqldatabase.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
  */
 defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-include_once XOOPS_ROOT_PATH . '/class/database/database.php';
+include_once XOOPS_ROOT_PATH.'/class/database/database.php';
 
 /**
  * connection to a mysql database using MySQLi extension
@@ -61,7 +61,7 @@ 
             $dbname = '';
         }
         if (XOOPS_DB_PCONNECT == 1) {
-            $this->conn = new mysqli('p:' . XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS, $dbname);
+            $this->conn = new mysqli('p:'.XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS, $dbname);
         } else {
             $this->conn = new mysqli(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS, $dbname);
         }
@@ -271,7 +271,7 @@ 
             if (empty($start)) {
                 $start = 0;
             }
-            $sql = $sql . ' LIMIT ' . (int)$start . ', ' . (int)$limit;
+            $sql = $sql.' LIMIT '.(int)$start.', '.(int)$limit;
         }
         $this->logger->startTime('query_time');
         $result = mysqli_query($this->conn, $sql);
@@ -312,7 +312,7 @@ 
     public function queryFromFile($file)
     {
         if (false !== ($fp = fopen($file, 'r'))) {
-            include_once XOOPS_ROOT_PATH . '/class/database/sqlutility.php';
+            include_once XOOPS_ROOT_PATH.'/class/database/sqlutility.php';
             $sql_queries = trim(fread($fp, filesize($file)));
             SqlUtility::splitMySqlFile($pieces, $sql_queries);
             foreach ($pieces as $query) {

htdocs/class/file/file.php

Spacing +2 added lines, -2 removed lines

@@ -371,7 +371,7 @@ 
             $this->info();
         }
         if (isset($this->info['extension'])) {
-            return basename($this->name, '.' . $this->info['extension']);
+            return basename($this->name, '.'.$this->info['extension']);
         } elseif ($this->name) {
             return $this->name;
         }
@@ -428,7 +428,7 @@ 
      */
     public function pwd()
     {
-        return $this->folder->slashTerm($this->folder->pwd()) . $this->name;
+        return $this->folder->slashTerm($this->folder->pwd()).$this->name;
     }
 
     /**

htdocs/class/file/xoopsfile.php

Spacing +6 added lines, -6 removed lines

@@ -62,10 +62,10 @@ 
         switch ($name) {
             case 'folder':
                 if (!class_exists('XoopsFolderHandler')) {
-                    if (file_exists($folder = __DIR__ . '/folder.php')) {
+                    if (file_exists($folder = __DIR__.'/folder.php')) {
                         include $folder;
                     } else {
-                        trigger_error('Require Item : ' . str_replace(XOOPS_ROOT_PATH, '', $folder) . ' In File ' . __FILE__ . ' at Line ' . __LINE__, E_USER_WARNING);
+                        trigger_error('Require Item : '.str_replace(XOOPS_ROOT_PATH, '', $folder).' In File '.__FILE__.' at Line '.__LINE__, E_USER_WARNING);
 
                         return false;
                     }
@@ -74,10 +74,10 @@ 
             case 'file':
             default:
                 if (!class_exists('XoopsFileHandler')) {
-                    if (file_exists($file = __DIR__ . '/file.php')) {
+                    if (file_exists($file = __DIR__.'/file.php')) {
                         include $file;
                     } else {
-                        trigger_error('Require File : ' . str_replace(XOOPS_ROOT_PATH, '', $file) . ' In File ' . __FILE__ . ' at Line ' . __LINE__, E_USER_WARNING);
+                        trigger_error('Require File : '.str_replace(XOOPS_ROOT_PATH, '', $file).' In File '.__FILE__.' at Line '.__LINE__, E_USER_WARNING);
 
                         return false;
                     }
@@ -101,11 +101,11 @@ 
     {
         $handler = null;
         XoopsFile::load($name);
-        $class = 'Xoops' . ucfirst($name) . 'Handler';
+        $class = 'Xoops'.ucfirst($name).'Handler';
         if (class_exists($class)) {
             $handler = new $class($path, $create, $mode);
         } else {
-            trigger_error('Class ' . $class . ' not exist in File ' . __FILE__ . ' at Line ' . __LINE__, E_USER_WARNING);
+            trigger_error('Class '.$class.' not exist in File '.__FILE__.' at Line '.__LINE__, E_USER_WARNING);
         }
 
         return $handler;

htdocs/class/file/folder.php

Indentation +11 added lines, -11 removed lines

@@ -680,10 +680,10 @@ 
             $options = array();
         }
         $options = array_merge(array(
-                                   'to'   => $to,
-                                   'from' => $this->path,
-                                   'mode' => $this->mode,
-                                   'skip' => array()), $options);
+                                    'to'   => $to,
+                                    'from' => $this->path,
+                                    'mode' => $this->mode,
+                                    'skip' => array()), $options);
 
         $fromDir = $options['from'];
         $toDir   = $options['to'];
@@ -702,9 +702,9 @@ 
             return false;
         }
         $exceptions = array_merge(array(
-                                      '.',
-                                      '..',
-                                      '.svn'), $options['skip']);
+                                        '.',
+                                        '..',
+                                        '.svn'), $options['skip']);
         $handle     = opendir($fromDir);
         if ($handle) {
             while (false !== ($item = readdir($handle))) {
@@ -761,10 +761,10 @@ 
             $options = (array)$options;
         }
         $options = array_merge(array(
-                                   'to'   => $to,
-                                   'from' => $this->path,
-                                   'mode' => $this->mode,
-                                   'skip' => array()), $options);
+                                    'to'   => $to,
+                                    'from' => $this->path,
+                                    'mode' => $this->mode,
+                                    'skip' => array()), $options);
         if ($this->copy($options)) {
             if ($this->delete($options['from'])) {
                 return $this->cd($options['to']);

Spacing +16 added lines, -16 removed lines

@@ -117,7 +117,7 @@ 
     public function __construct($path = false, $create = true, $mode = false)
     {
         if (empty($path)) {
-            $path = XOOPS_VAR_PATH . '/caches/xoops_cache';
+            $path = XOOPS_VAR_PATH.'/caches/xoops_cache';
         }
         if ($mode) {
             $this->mode = intval($mode, 8);
@@ -362,7 +362,7 @@ 
             return $path;
         }
 
-        return $path . XoopsFolderHandler::correctSlashFor($path);
+        return $path.XoopsFolderHandler::correctSlashFor($path);
     }
 
     /**
@@ -377,7 +377,7 @@ 
      */
     public function addPathElement($path, $element)
     {
-        return $this->slashTerm($path) . $element;
+        return $this->slashTerm($path).$element;
     }
 
     /**
@@ -391,7 +391,7 @@ 
     public function inXoopsPath($path = '')
     {
         $dir    = substr($this->slashTerm(XOOPS_ROOT_PATH), 0, -1);
-        $newdir = $dir . $path;
+        $newdir = $dir.$path;
 
         return $this->inPath($newdir);
     }
@@ -410,9 +410,9 @@ 
         $dir     = $this->slashTerm($path);
         $current = $this->slashTerm($this->pwd());
         if (!$reverse) {
-            $return = preg_match('/^(.*)' . preg_quote($dir, '/') . '(.*)/', $current);
+            $return = preg_match('/^(.*)'.preg_quote($dir, '/').'(.*)/', $current);
         } else {
-            $return = preg_match('/^(.*)' . preg_quote($current, '/') . '(.*)/', $dir);
+            $return = preg_match('/^(.*)'.preg_quote($current, '/').'(.*)/', $dir);
         }
         if ($return == 1) {
             return true;
@@ -492,7 +492,7 @@ 
         while (count($this->directories)) {
             $dir = array_pop($this->directories);
             $this->_tree($dir, $hidden);
-            $directories[] =  $dir;
+            $directories[] = $dir;
         }
         if ($type === null) {
             return array(
@@ -522,13 +522,13 @@ 
             while (false !== ($item = readdir($dirHandle))) {
                 $found = false;
                 if (($hidden === true && $item !== '.' && $item !== '..') || ($hidden === false && !preg_match('/^\\.(.*)$/', $item))) {
-                    $found = $path . '/' . $item;
+                    $found = $path.'/'.$item;
                 }
                 if ($found !== false) {
                     if (is_dir($found)) {
-                        $this->directories[] =  $found;
+                        $this->directories[] = $found;
                     } else {
-                        $this->files[] =  $found;
+                        $this->files[] = $found;
                     }
                 }
             }
@@ -599,8 +599,8 @@ 
                             if ($entry === '.' || $entry === '..') {
                                 continue;
                             }
-                            $add = $stack[$i] . $entry;
-                            if (is_dir($stack[$i] . $entry)) {
+                            $add = $stack[$i].$entry;
+                            if (is_dir($stack[$i].$entry)) {
                                 $add = $this->slashTerm($add);
                             }
                             $stack[] = $add;
@@ -627,9 +627,9 @@ 
     {
         $path = $this->slashTerm($path);
         if (is_dir($path) === true) {
-            $files        = glob($path . '*', GLOB_NOSORT);
-            $normal_files = glob($path . '*');
-            $hidden_files = glob($path . '\.?*');
+            $files        = glob($path.'*', GLOB_NOSORT);
+            $normal_files = glob($path.'*');
+            $hidden_files = glob($path.'\.?*');
             $files        = array_merge($normal_files, $hidden_files);
             if (is_array($files)) {
                 foreach ($files as $file) {
@@ -705,7 +705,7 @@ 
                                       '.',
                                       '..',
                                       '.svn'), $options['skip']);
-        $handle     = opendir($fromDir);
+        $handle = opendir($fromDir);
         if ($handle) {
             while (false !== ($item = readdir($handle))) {
                 if (!in_array($item, $exceptions)) {

htdocs/class/xoopscomments.php

Spacing +36 added lines, -36 removed lines

@@ -18,9 +18,9 @@ 
 
 defined('XOOPS_ROOT_PATH') || exit('Restricted access');
 
-include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
-require_once XOOPS_ROOT_PATH . '/kernel/object.php';
-include_once XOOPS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/comment.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
+require_once XOOPS_ROOT_PATH.'/kernel/object.php';
+include_once XOOPS_ROOT_PATH.'/language/'.$GLOBALS['xoopsConfig']['language'].'/comment.php';
 
 $GLOBALS['xoopsLogger']->addDeprecated("'/class/xoopscommments.php' is deprecated since XOOPS 2.5.4, please use '/kernel/comment.php' instead.");
 
@@ -80,7 +80,7 @@ 
     public function load($id)
     {
         $id  = (int)$id;
-        $sql = 'SELECT * FROM ' . $this->ctable . ' WHERE comment_id=' . $id;
+        $sql = 'SELECT * FROM '.$this->ctable.' WHERE comment_id='.$id;
         $arr = $this->db->fetchArray($this->db->query($sql));
         $this->assignVars($arr);
     }
@@ -101,7 +101,7 @@ 
         $isnew = false;
         if (empty($comment_id)) {
             $isnew      = true;
-            $comment_id = $this->db->genId($this->ctable . '_comment_id_seq');
+            $comment_id = $this->db->genId($this->ctable.'_comment_id_seq');
             $sql        = sprintf("INSERT INTO %s (comment_id, pid, item_id, date, user_id, ip, subject, comment, nohtml, nosmiley, noxcode, icon) VALUES (%u, %u, %u, %u, %u, '%s', '%s', '%s', %u, %u, %u, '%s')", $this->ctable, $comment_id, $pid, $item_id, time(), $user_id, $ip, $subject, $comment, $nohtml, $nosmiley, $noxcode, $icon);
         } else {
             $sql = sprintf("UPDATE %s SET subject = '%s', comment = '%s', nohtml = %u, nosmiley = %u, noxcode = %u, icon = '%s'  WHERE comment_id = %u", $this->ctable, $subject, $comment, $nohtml, $nosmiley, $noxcode, $icon, $comment_id);
@@ -196,13 +196,13 @@ 
             $where_query = substr($where_query, 0, -4);
         }
         if (!$asobject) {
-            $sql    = 'SELECT comment_id FROM ' . $this->ctable . "$where_query ORDER BY $orderby";
+            $sql    = 'SELECT comment_id FROM '.$this->ctable."$where_query ORDER BY $orderby";
             $result = $this->db->query($sql, $limit, $start);
             while (false !== ($myrow = $this->db->fetchArray($result))) {
                 $ret[] = $myrow['comment_id'];
             }
         } else {
-            $sql    = 'SELECT * FROM ' . $this->ctable . '' . $where_query . " ORDER BY $orderby";
+            $sql    = 'SELECT * FROM '.$this->ctable.''.$where_query." ORDER BY $orderby";
             $result = $this->db->query($sql, $limit, $start);
             while (false !== ($myrow = $this->db->fetchArray($result))) {
                 $ret[] = new XoopsComments($this->ctable, $myrow);
@@ -223,32 +223,32 @@ 
     public function printNavBar($item_id, $mode = 'flat', $order = 1)
     {
         global $xoopsConfig, $xoopsUser;
-        echo "<form method='get' action='" . $_SERVER['PHP_SELF'] . "'><table width='100%' border='0' cellspacing='1' cellpadding='2'><tr><td class='bg1' align='center'><select name='mode'><option value='nocomments'";
+        echo "<form method='get' action='".$_SERVER['PHP_SELF']."'><table width='100%' border='0' cellspacing='1' cellpadding='2'><tr><td class='bg1' align='center'><select name='mode'><option value='nocomments'";
         if ($mode === 'nocomments') {
             echo " selected";
         }
-        echo '>' . _NOCOMMENTS . "</option><option value='flat'";
+        echo '>'._NOCOMMENTS."</option><option value='flat'";
         if ($mode === 'flat') {
             echo " selected";
         }
-        echo '>' . _FLAT . "</option><option value='thread'";
+        echo '>'._FLAT."</option><option value='thread'";
         if ($mode === 'thread' || $mode == '') {
             echo " selected";
         }
-        echo '>' . _THREADED . "</option></select><select name='order'><option value='0'";
+        echo '>'._THREADED."</option></select><select name='order'><option value='0'";
         if ($order != 1) {
             echo " selected";
         }
-        echo '>' . _OLDESTFIRST . "</option><option value='1'";
+        echo '>'._OLDESTFIRST."</option><option value='1'";
         if ($order == 1) {
             echo " selected";
         }
-        echo '>' . _NEWESTFIRST . "</option></select><input type='hidden' name='item_id' value='" . (int)$item_id . "' /><input type='submit' value='" . _CM_REFRESH . "' />";
+        echo '>'._NEWESTFIRST."</option></select><input type='hidden' name='item_id' value='".(int)$item_id."' /><input type='submit' value='"._CM_REFRESH."' />";
         if ($xoopsConfig['anonpost'] == 1 || $xoopsUser) {
             if ($mode !== 'flat' || $mode !== 'nocomments' || $mode !== 'thread') {
                 $mode = 'flat';
             }
-            echo "&nbsp;<input type='button' onclick='location=\"newcomment.php?item_id=" . (int)$item_id . '&amp;order=' . (int)$order . '&amp;mode=' . $mode . "\"' value='" . _CM_POSTCOMMENT . "' />";
+            echo "&nbsp;<input type='button' onclick='location=\"newcomment.php?item_id=".(int)$item_id.'&amp;order='.(int)$order.'&amp;mode='.$mode."\"' value='"._CM_POSTCOMMENT."' />";
         }
         echo '</td></tr></table></form>';
     }
@@ -286,29 +286,29 @@ 
             $poster = 0;
         }
         if ($this->getVar('icon') != null && $this->getVar('icon') != '') {
-            $subject_image = "<a name='" . $this->getVar('comment_id') . "' id='" . $this->getVar('comment_id') . "'></a><img src='" . XOOPS_URL . '/images/subject/' . $this->getVar('icon') . "' alt='' />";
+            $subject_image = "<a name='".$this->getVar('comment_id')."' id='".$this->getVar('comment_id')."'></a><img src='".XOOPS_URL.'/images/subject/'.$this->getVar('icon')."' alt='' />";
         } else {
-            $subject_image = "<a name='" . $this->getVar('comment_id') . "' id='" . $this->getVar('comment_id') . "'></a><img src='" . XOOPS_URL . "/images/icons/no_posticon.gif' alt='' />";
+            $subject_image = "<a name='".$this->getVar('comment_id')."' id='".$this->getVar('comment_id')."'></a><img src='".XOOPS_URL."/images/icons/no_posticon.gif' alt='' />";
         }
         if ($adminview) {
-            $ip_image = "<img src='" . XOOPS_URL . "/images/icons/ip.gif' alt='" . $this->getVar('ip') . "' />";
+            $ip_image = "<img src='".XOOPS_URL."/images/icons/ip.gif' alt='".$this->getVar('ip')."' />";
         } else {
-            $ip_image = "<img src='" . XOOPS_URL . "/images/icons/ip.gif' alt='' />";
+            $ip_image = "<img src='".XOOPS_URL."/images/icons/ip.gif' alt='' />";
         }
         if ($adminview || ($xoopsUser && $this->getVar('user_id') == $xoopsUser->getVar('uid'))) {
-            $edit_image = "<a href='editcomment.php?comment_id=" . $this->getVar('comment_id') . '&amp;mode=' . $mode . '&amp;order=' . (int)$order . "'><img src='" . XOOPS_URL . "/images/icons/edit.gif' alt='" . _EDIT . "' /></a>";
+            $edit_image = "<a href='editcomment.php?comment_id=".$this->getVar('comment_id').'&amp;mode='.$mode.'&amp;order='.(int)$order."'><img src='".XOOPS_URL."/images/icons/edit.gif' alt='"._EDIT."' /></a>";
         }
         if ($xoopsConfig['anonpost'] || $xoopsUser) {
-            $reply_image = "<a href='replycomment.php?comment_id=" . $this->getVar('comment_id') . '&amp;mode=' . $mode . '&amp;order=' . (int)$order . "'><img src='" . XOOPS_URL . "/images/icons/reply.gif' alt='" . _REPLY . "' /></a>";
+            $reply_image = "<a href='replycomment.php?comment_id=".$this->getVar('comment_id').'&amp;mode='.$mode.'&amp;order='.(int)$order."'><img src='".XOOPS_URL."/images/icons/reply.gif' alt='"._REPLY."' /></a>";
         }
         if ($adminview) {
-            $delete_image = "<a href='deletecomment.php?comment_id=" . $this->getVar('comment_id') . '&amp;mode=' . $mode . '&amp;order=' . (int)$order . "'><img src='" . XOOPS_URL . "/images/icons/delete.gif' alt='" . _DELETE . "' /></a>";
+            $delete_image = "<a href='deletecomment.php?comment_id=".$this->getVar('comment_id').'&amp;mode='.$mode.'&amp;order='.(int)$order."'><img src='".XOOPS_URL."/images/icons/delete.gif' alt='"._DELETE."' /></a>";
         }
 
         if ($poster) {
             $text = $this->getVar('comment');
             if ($poster->getVar('attachsig')) {
-                $text .= '<p><br>_________________<br>' . $poster->user_sig() . '</p>';
+                $text .= '<p><br>_________________<br>'.$poster->user_sig().'</p>';
             }
             $reg_date = _CM_JOINED;
             $reg_date .= formatTimestamp($poster->getVar('user_regdate'), 's');
@@ -318,42 +318,42 @@ 
             $user_from .= $poster->getVar('user_from');
             $rank = $poster->rank();
             if ($rank['image'] != '') {
-                $rank['image'] = "<img src='" . XOOPS_UPLOAD_URL . '/' . $rank['image'] . "' alt='' />";
+                $rank['image'] = "<img src='".XOOPS_UPLOAD_URL.'/'.$rank['image']."' alt='' />";
             }
-            $avatar_image = "<img src='" . XOOPS_UPLOAD_URL . '/' . $poster->getVar('user_avatar') . "' alt='' />";
+            $avatar_image = "<img src='".XOOPS_UPLOAD_URL.'/'.$poster->getVar('user_avatar')."' alt='' />";
             $online_image = '';
             if ($poster->isOnline()) {
-                $online_image = "<span style='color:#ee0000;font-weight:bold;'>" . _CM_ONLINE . '</span>';
+                $online_image = "<span style='color:#ee0000;font-weight:bold;'>"._CM_ONLINE.'</span>';
             }
-            $profile_image = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $poster->getVar('uid') . "'><img src='" . XOOPS_URL . "/images/icons/profile.gif' alt='" . _PROFILE . "' /></a>";
+            $profile_image = "<a href='".XOOPS_URL.'/userinfo.php?uid='.$poster->getVar('uid')."'><img src='".XOOPS_URL."/images/icons/profile.gif' alt='"._PROFILE."' /></a>";
             $pm_image      = '';
             if ($xoopsUser) {
-                $pm_image = "<a href='javascript:openWithSelfMain(\"" . XOOPS_URL . '/pmlite.php?send2=1&amp;to_userid=' . $poster->getVar('uid') . "\",\"pmlite\",565,500);'><img src='" . XOOPS_URL . "/images/icons/pm.gif' alt='" . sprintf(_SENDPMTO, $poster->getVar('uname', 'E')) . "' /></a>";
+                $pm_image = "<a href='javascript:openWithSelfMain(\"".XOOPS_URL.'/pmlite.php?send2=1&amp;to_userid='.$poster->getVar('uid')."\",\"pmlite\",565,500);'><img src='".XOOPS_URL."/images/icons/pm.gif' alt='".sprintf(_SENDPMTO, $poster->getVar('uname', 'E'))."' /></a>";
             }
             $email_image = '';
             if ($poster->getVar('user_viewemail')) {
-                $email_image = "<a href='mailto:" . $poster->getVar('email', 'E') . "'><img src='" . XOOPS_URL . "/images/icons/email.gif' alt='" . sprintf(_SENDEMAILTO, $poster->getVar('uname', 'E')) . "' /></a>";
+                $email_image = "<a href='mailto:".$poster->getVar('email', 'E')."'><img src='".XOOPS_URL."/images/icons/email.gif' alt='".sprintf(_SENDEMAILTO, $poster->getVar('uname', 'E'))."' /></a>";
             }
             $posterurl = $poster->getVar('url');
             $www_image = '';
             if ($posterurl != '') {
-                $www_image = "<a href='$posterurl' rel='external'><img src='" . XOOPS_URL . "/images/icons/www.gif' alt='" . _VISITWEBSITE . "' /></a>";
+                $www_image = "<a href='$posterurl' rel='external'><img src='".XOOPS_URL."/images/icons/www.gif' alt='"._VISITWEBSITE."' /></a>";
             }
             $icq_image = '';
             if ($poster->getVar('user_icq') != '') {
-                $icq_image = "<a href='http://wwp.icq.com/scripts/search.dll?to=" . $poster->getVar('user_icq', 'E') . "'><img src='" . XOOPS_URL . "/images/icons/icq_add.gif' alt='" . _ADD . "' /></a>";
+                $icq_image = "<a href='http://wwp.icq.com/scripts/search.dll?to=".$poster->getVar('user_icq', 'E')."'><img src='".XOOPS_URL."/images/icons/icq_add.gif' alt='"._ADD."' /></a>";
             }
             $aim_image = '';
             if ($poster->getVar('user_aim') != '') {
-                $aim_image = "<a href='aim:goim?screenname=" . $poster->getVar('user_aim', 'E') . '&message=Hi+' . $poster->getVar('user_aim') . "+Are+you+there?'><img src='" . XOOPS_URL . "/images/icons/aim.gif' alt='aim' /></a>";
+                $aim_image = "<a href='aim:goim?screenname=".$poster->getVar('user_aim', 'E').'&message=Hi+'.$poster->getVar('user_aim')."+Are+you+there?'><img src='".XOOPS_URL."/images/icons/aim.gif' alt='aim' /></a>";
             }
             $yim_image = '';
             if ($poster->getVar('user_yim') != '') {
-                $yim_image = "<a href='http://edit.yahoo.com/config/send_webmesg?.target=" . $poster->getVar('user_yim', 'E') . "&.src=pg'><img src='" . XOOPS_URL . "/images/icons/yim.gif' alt='yim' /></a>";
+                $yim_image = "<a href='http://edit.yahoo.com/config/send_webmesg?.target=".$poster->getVar('user_yim', 'E')."&.src=pg'><img src='".XOOPS_URL."/images/icons/yim.gif' alt='yim' /></a>";
             }
             $msnm_image = '';
             if ($poster->getVar('user_msnm') != '') {
-                $msnm_image = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $poster->getVar('uid') . "'><img src='" . XOOPS_URL . "/images/icons/msnm.gif' alt='msnm' /></a>";
+                $msnm_image = "<a href='".XOOPS_URL.'/userinfo.php?uid='.$poster->getVar('uid')."'><img src='".XOOPS_URL."/images/icons/msnm.gif' alt='msnm' /></a>";
             }
             showThread($color_num, $subject_image, $this->getVar('subject'), $text, $post_date, $ip_image, $reply_image, $edit_image, $delete_image, $poster->getVar('uname'), $rank['title'], $rank['image'], $avatar_image, $reg_date, $posts, $user_from, $online_image, $profile_image, $pm_image, $email_image, $www_image, $icq_image, $aim_image, $yim_image, $msnm_image);
         } else {
@@ -377,7 +377,7 @@ 
      */
     public function showTreeHead($width = '100%')
     {
-        echo "<table border='0' class='outer' cellpadding='0' cellspacing='0' align='center' width='$width'><tr class='bg3' align='center'><td colspan='3'>" . _CM_REPLIES . "</td></tr><tr class='bg3' align='left'><td width='60%' class='fg2'>" . _CM_TITLE . "</td><td width='20%' class='fg2'>" . _CM_POSTER . "</td><td class='fg2'>" . _CM_POSTED . '</td></tr>';
+        echo "<table border='0' class='outer' cellpadding='0' cellspacing='0' align='center' width='$width'><tr class='bg3' align='center'><td colspan='3'>"._CM_REPLIES."</td></tr><tr class='bg3' align='left'><td width='60%' class='fg2'>"._CM_TITLE."</td><td width='20%' class='fg2'>"._CM_POSTER."</td><td class='fg2'>"._CM_POSTED.'</td></tr>';
     }
 
     /**
@@ -397,9 +397,9 @@ 
         $date   = formatTimestamp($this->getVar('date'), 'm');
         $icon   = 'icons/no_posticon.gif';
         if ($this->getVar('icon') != '') {
-            $icon = 'subject/' . $this->getVar('icon', 'E');
+            $icon = 'subject/'.$this->getVar('icon', 'E');
         }
-        echo "<tr class='$bg' align='left'><td>" . $prefix . "<img src='" . XOOPS_URL . '/images/' . $icon . "'>&nbsp;<a href='" . $_SERVER['PHP_SELF'] . '?item_id=' . $this->getVar('item_id') . '&amp;comment_id=' . $this->getVar('comment_id') . '&amp;mode=' . $mode . '&amp;order=' . $order . '#' . $this->getVar('comment_id') . "'>" . $this->getVar('subject') . "</a></td><td><a href='" . XOOPS_URL . '/userinfo.php?uid=' . $this->getVar('user_id') . "'>" . XoopsUser::getUnameFromId($this->getVar('user_id')) . '</a></td><td>' . $date . '</td></tr>';
+        echo "<tr class='$bg' align='left'><td>".$prefix."<img src='".XOOPS_URL.'/images/'.$icon."'>&nbsp;<a href='".$_SERVER['PHP_SELF'].'?item_id='.$this->getVar('item_id').'&amp;comment_id='.$this->getVar('comment_id').'&amp;mode='.$mode.'&amp;order='.$order.'#'.$this->getVar('comment_id')."'>".$this->getVar('subject')."</a></td><td><a href='".XOOPS_URL.'/userinfo.php?uid='.$this->getVar('user_id')."'>".XoopsUser::getUnameFromId($this->getVar('user_id')).'</a></td><td>'.$date.'</td></tr>';
     }
 
     /**

htdocs/class/module.textsanitizer.php

Spacing +55 added lines, -55 removed lines

@@ -39,7 +39,7 @@ 
     public function __construct(MyTextSanitizer $ts)
     {
         $this->ts         = $ts;
-        $this->image_path = XOOPS_URL . '/images/form';
+        $this->image_path = XOOPS_URL.'/images/form';
     }
 
     /**
@@ -53,21 +53,21 @@ 
         $ts   = MyTextSanitizer::getInstance();
         $path = str_replace(DIRECTORY_SEPARATOR, '/', $path);
         if (false === strpos($path, '/')) {
-            if (is_dir($ts->path_basic . '/' . $path)) {
-                $path = $ts->path_basic . '/' . $path;
+            if (is_dir($ts->path_basic.'/'.$path)) {
+                $path = $ts->path_basic.'/'.$path;
             } else {
-                if (is_dir($ts->path_plugin . '/' . $path)) {
-                    $path = $ts->path_plugin . '/' . $path;
+                if (is_dir($ts->path_plugin.'/'.$path)) {
+                    $path = $ts->path_plugin.'/'.$path;
                 }
             }
         }
         $config_default = array();
         $config_custom  = array();
-        if (file_exists($path . '/config.php')) {
-            $config_default = include $path . '/config.php';
+        if (file_exists($path.'/config.php')) {
+            $config_default = include $path.'/config.php';
         }
-        if (file_exists($path . '/config.custom.php')) {
-            $config_custom = include $path . '/config.custom.php';
+        if (file_exists($path.'/config.custom.php')) {
+            $config_custom = include $path.'/config.custom.php';
         }
 
         return self::mergeConfig($config_default, $config_custom);
@@ -172,8 +172,8 @@ 
 
     public function __construct()
     {
-        $this->path_basic  = XOOPS_ROOT_PATH . '/class/textsanitizer';
-        $this->path_plugin = XOOPS_ROOT_PATH . '/Frameworks/textsanitizer';
+        $this->path_basic  = XOOPS_ROOT_PATH.'/class/textsanitizer';
+        $this->path_plugin = XOOPS_ROOT_PATH.'/Frameworks/textsanitizer';
         $this->config      = $this->loadConfig();
     }
 
@@ -188,9 +188,9 @@ 
         if (!empty($name)) {
             return MyTextSanitizerExtension::loadConfig($name);
         }
-        $config_default = include $this->path_basic . '/config.php';
+        $config_default = include $this->path_basic.'/config.php';
         $config_custom  = array();
-        if (file_exists($file = $this->path_basic . '/config.custom.php')) {
+        if (file_exists($file = $this->path_basic.'/config.custom.php')) {
             $config_custom = include $file;
         }
 
@@ -248,7 +248,7 @@ 
         if (count($this->smileys) == 0) {
             /* @var $xoopsDB XoopsMySQLDatabase */
             $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
-            if ($getsmiles = $xoopsDB->query('SELECT * FROM ' . $xoopsDB->prefix('smiles'))) {
+            if ($getsmiles = $xoopsDB->query('SELECT * FROM '.$xoopsDB->prefix('smiles'))) {
                 while (false !== ($smiles = $xoopsDB->fetchArray($getsmiles))) {
                     $this->smileys[] = $smiles;
                 }
@@ -279,7 +279,7 @@ 
     {
         $smileys = $this->getSmileys();
         foreach ($smileys as $smile) {
-            $message = str_replace($smile['code'], '<img class="imgsmile" src="' . XOOPS_UPLOAD_URL . '/' . htmlspecialchars($smile['smile_url']) . '" alt="" />', $message);
+            $message = str_replace($smile['code'], '<img class="imgsmile" src="'.XOOPS_UPLOAD_URL.'/'.htmlspecialchars($smile['smile_url']).'" alt="" />', $message);
         }
 
         return $message;
@@ -292,7 +292,7 @@ 
      */
     public function makeClickableCallback01($match)
     {
-        return $match[1] . "<a href=\"$match[2]://$match[3]\" title=\"$match[2]://$match[3]\" rel=\"external\">$match[2]://" . $this->truncate($match[3]) . '</a>';
+        return $match[1]."<a href=\"$match[2]://$match[3]\" title=\"$match[2]://$match[3]\" rel=\"external\">$match[2]://".$this->truncate($match[3]).'</a>';
     }
 
     /**
@@ -302,7 +302,7 @@ 
      */
     public function makeClickableCallback02($match)
     {
-        return $match[1] . "<a href=\"http://www.$match[2]$match[6]\" title=\"www.$match[2]$match[6]\" rel=\"external\">" . $this->truncate('www.' . $match[2] . $match[6]) . '</a>';
+        return $match[1]."<a href=\"http://www.$match[2]$match[6]\" title=\"www.$match[2]$match[6]\" rel=\"external\">".$this->truncate('www.'.$match[2].$match[6]).'</a>';
     }
 
     /**
@@ -312,7 +312,7 @@ 
      */
     public function makeClickableCallback03($match)
     {
-        return $match[1] . "<a href=\"ftp://ftp.$match[2].$match[3]\" title=\"ftp.$match[2].$match[3]\" rel=\"external\">" . $this->truncate('ftp.' . $match[2] . $match[3]) . '</a>';
+        return $match[1]."<a href=\"ftp://ftp.$match[2].$match[3]\" title=\"ftp.$match[2].$match[3]\" rel=\"external\">".$this->truncate('ftp.'.$match[2].$match[3]).'</a>';
     }
 
     /**
@@ -322,7 +322,7 @@ 
      */
     public function makeClickableCallback04($match)
     {
-        return $match[1] . "<a href=\"mailto:$match[2]@$match[3]\" title=\"$match[2]@$match[3]\">" . $this->truncate($match[2] . '@' . $match[3]) . '</a>';
+        return $match[1]."<a href=\"mailto:$match[2]@$match[3]\" title=\"$match[2]@$match[3]\">".$this->truncate($match[2].'@'.$match[3]).'</a>';
     }
 
     /**
@@ -386,7 +386,7 @@ 
             return $text;
         }
         $len = floor($instance->config['truncate_length'] / 2);
-        $ret = substr($text, 0, $len) . ' ... ' . substr($text, 5 - $len);
+        $ret = substr($text, 0, $len).' ... '.substr($text, 5 - $len);
 
         return $ret;
     }
@@ -404,7 +404,7 @@ 
         $patterns       = array();
         $replacements   = array();
         $patterns[]     = "/\[siteurl=(['\"]?)([^\"'<>]*)\\1](.*)\[\/siteurl\]/sU";
-        $replacements[] = '<a href="' . XOOPS_URL . '/\\2" title="">\\3</a>';
+        $replacements[] = '<a href="'.XOOPS_URL.'/\\2" title="">\\3</a>';
         $patterns[]     = "/\[url=(['\"]?)(http[s]?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
         $replacements[] = '<a href="\\2" rel="external" title="">\\3</a>';
         $patterns[]     = "/\[url=(['\"]?)(ftp?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
@@ -465,7 +465,7 @@ 
     {
         //look for both open and closing tags in the correct order
         $pattern     = "/\[quote](.*)\[\/quote\]/sU";
-        $replacement = _QUOTEC . '<div class="xoopsQuote"><blockquote>\\1</blockquote></div>';
+        $replacement = _QUOTEC.'<div class="xoopsQuote"><blockquote>\\1</blockquote></div>';
 
         $text = preg_replace($pattern, $replacement, $text, -1, $count);
         //no more matches, return now
@@ -603,10 +603,10 @@ 
             // decode xcode
             if ($image != 0) {
                 // image allowed
-                $text =& $this->xoopsCodeDecode($text);
+                $text = & $this->xoopsCodeDecode($text);
             } else {
                 // image not allowed
-                $text =& $this->xoopsCodeDecode($text, 0);
+                $text = & $this->xoopsCodeDecode($text, 0);
             }
         }
         if ($br != 0) {
@@ -635,7 +635,7 @@ 
     public function &previewTarea($text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
     {
         $text = $this->stripSlashesGPC($text);
-        $text =& $this->displayTarea($text, $html, $smiley, $xcode, $image, $br);
+        $text = & $this->displayTarea($text, $html, $smiley, $xcode, $image, $br);
 
         return $text;
     }
@@ -673,8 +673,8 @@ 
             $patterns = "/\[code([^\]]*?)\](.*)\[\/code\]/sU";
             $text = preg_replace_callback(
                 $patterns,
-                function ($matches) {
-                    return '[code'. $matches[1] . ']' . base64_encode($matches[2]) . '[/code]';
+                function($matches) {
+                    return '[code'.$matches[1].']'.base64_encode($matches[2]).'[/code]';
                 },
                 $text
             );
@@ -690,7 +690,7 @@ 
      */
     public function codeConvCallback($match)
     {
-        return '<div class="xoopsCode">' . $this->executeExtension('syntaxhighlight', str_replace('\\\"', '\"', base64_decode($match[2])), $match[1]) . '</div>';
+        return '<div class="xoopsCode">'.$this->executeExtension('syntaxhighlight', str_replace('\\\"', '\"', base64_decode($match[2])), $match[1]).'</div>';
     }
 
     /**
@@ -736,14 +736,14 @@ 
      */
     public function loadExtension($name)
     {
-        if (file_exists($file = $this->path_basic . '/' . $name . '/' . $name . '.php')) {
+        if (file_exists($file = $this->path_basic.'/'.$name.'/'.$name.'.php')) {
             include_once $file;
-        } elseif (file_exists($file = $this->path_plugin . '/' . $name . '/' . $name . '.php')) {
+        } elseif (file_exists($file = $this->path_plugin.'/'.$name.'/'.$name.'.php')) {
             include_once $file;
         } else {
             return false;
         }
-        $class = 'Myts' . ucfirst($name);
+        $class = 'Myts'.ucfirst($name);
         if (!class_exists($class)) {
             trigger_error("Extension '{$name}' does not exist", E_USER_WARNING);
 
@@ -804,9 +804,9 @@ 
      */
     public function codeSanitizer($str, $image = 1)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
         $str = $this->htmlSpecialChars(str_replace('\"', '"', base64_decode($str)));
-        $str =& $this->xoopsCodeDecode($str, $image);
+        $str = & $this->xoopsCodeDecode($str, $image);
 
         return $str;
     }
@@ -822,7 +822,7 @@ 
      */
     public function sanitizeForDisplay($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
         if ($allowhtml == 0) {
             $text = $this->htmlSpecialChars($text);
         } else {
@@ -835,7 +835,7 @@ 
             $text = $this->smiley($text);
         }
         if ($bbcode == 1) {
-            $text =& $this->xoopsCodeDecode($text);
+            $text = & $this->xoopsCodeDecode($text);
         }
         $text = $this->nl2Br($text);
 
@@ -853,7 +853,7 @@ 
      */
     public function sanitizeForPreview($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
         $text = $this->oopsStripSlashesGPC($text);
         if ($allowhtml == 0) {
             $text = $this->htmlSpecialChars($text);
@@ -867,7 +867,7 @@ 
             $text = $this->smiley($text);
         }
         if ($bbcode == 1) {
-            $text =& $this->xoopsCodeDecode($text);
+            $text = & $this->xoopsCodeDecode($text);
         }
         $text = $this->nl2Br($text);
 
@@ -882,7 +882,7 @@ 
      */
     public function makeTboxData4Save($text)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
 
         // $text = $this->undoHtmlSpecialChars($text);
         return $this->addSlashes($text);
@@ -897,7 +897,7 @@ 
      */
     public function makeTboxData4Show($text, $smiley = 0)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
         $text = $this->htmlSpecialChars($text);
 
         return $text;
@@ -911,7 +911,7 @@ 
      */
     public function makeTboxData4Edit($text)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
 
         return $this->htmlSpecialChars($text);
     }
@@ -925,7 +925,7 @@ 
      */
     public function makeTboxData4Preview($text, $smiley = 0)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
         $text = $this->stripSlashesGPC($text);
         $text = $this->htmlSpecialChars($text);
 
@@ -940,7 +940,7 @@ 
      */
     public function makeTboxData4PreviewInForm($text)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
         $text = $this->stripSlashesGPC($text);
 
         return $this->htmlSpecialChars($text);
@@ -954,7 +954,7 @@ 
      */
     public function makeTareaData4Save($text)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
 
         return $this->addSlashes($text);
     }
@@ -970,8 +970,8 @@ 
      */
     public function &makeTareaData4Show(&$text, $html = 1, $smiley = 1, $xcode = 1)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
-        $text =& $this->displayTarea($text, $html, $smiley, $xcode);
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
+        $text = & $this->displayTarea($text, $html, $smiley, $xcode);
 
         return $text;
     }
@@ -984,7 +984,7 @@ 
      */
     public function makeTareaData4Edit($text)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
 
         return $this->htmlSpecialChars($text);
     }
@@ -1000,8 +1000,8 @@ 
      */
     public function &makeTareaData4Preview(&$text, $html = 1, $smiley = 1, $xcode = 1)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
-        $text =& $this->previewTarea($text, $html, $smiley, $xcode);
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
+        $text = & $this->previewTarea($text, $html, $smiley, $xcode);
 
         return $text;
     }
@@ -1014,7 +1014,7 @@ 
      */
     public function makeTareaData4PreviewInForm($text)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
         // if magic_quotes_gpc is on, do stipslashes
         $text = $this->stripSlashesGPC($text);
 
@@ -1029,7 +1029,7 @@ 
      */
     public function makeTareaData4InsideQuotes($text)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
 
         return $this->htmlSpecialChars($text);
     }
@@ -1042,7 +1042,7 @@ 
      */
     public function oopsStripSlashesGPC($text)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
 
         return $this->stripSlashesGPC($text);
     }
@@ -1055,7 +1055,7 @@ 
      */
     public function oopsStripSlashesRT($text)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
         if (get_magic_quotes_runtime()) {
             $text = stripslashes($text);
         }
@@ -1071,7 +1071,7 @@ 
      */
     public function oopsAddSlashes($text)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
 
         return $this->addSlashes($text);
     }
@@ -1084,7 +1084,7 @@ 
      */
     public function oopsHtmlSpecialChars($text)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
 
         return $this->htmlSpecialChars($text);
     }
@@ -1097,7 +1097,7 @@ 
      */
     public function oopsNl2Br($text)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.' is deprecated');
 
         return $this->nl2Br($text);
     }

htdocs/class/logger_render.php

Spacing +1 added lines, -1 removed lines

@@ -29,4 +29,4 @@
  * Load the new XoopsLogger class
  **/
 include_once $GLOBALS['xoops']->path('class/logger/render.php');
-trigger_error('Instance of ' . __FILE__ . ' file is deprecated, check in class/logger/render.php');
+trigger_error('Instance of '.__FILE__.' file is deprecated, check in class/logger/render.php');