提交: 8037be6a45736884c2ae624bde90c300242024b2 - xoopscubelegacy (git)

XOOPS Cube Legacy base repository

Commit MetaInfo

• 修訂: 8037be6a45736884c2ae624bde90c300242024b2 (tree)
• 時間: 2011-11-16 22:02:10
• 作者: nbuy <nbuy@704c...>
• Commiter: nbuy

Log Message

revise for speedup

git-svn-id: https://xoopscube.svn.sourceforge.net/svnroot/xoopscube/Package_Legacy/trunk@1050 704cf05f-ae62-4b0e-a484-234ee0250e75

Change Summary

• modified: html/kernel/block.php
• modified: html/kernel/configitem.php
• modified: html/kernel/configoption.php
• modified: html/kernel/group.php
• modified: html/kernel/groupperm.php
• modified: html/kernel/user.php

差異

--- a/html/kernel/block.php
+++ b/html/kernel/block.php
@@ -172,34 +172,23 @@ class XoopsBlock extends XoopsObject
         if ( $this->getVar('block_type', 'N') != 'C' ) {
             // get block display function
             $show_func = $this->getVar('show_func', 'N');
-            if ( !$show_func ) {
-                return $ret;
-            }
+            if ( !$show_func ) return $ret;
             // must get lang files b4 execution of the function
             if ( file_exists($path = XOOPS_ROOT_PATH.'/modules/'.($dirname = $this->getVar('dirname', 'N')).'/blocks/'.$this->getVar('func_file', 'N')) ) {
                 $root=&XCube_Root::getSingleton();
                 $root->mLanguageManager->loadBlockMessageCatalog($dirname);
 
                 require_once $path;
-                $options = explode('|', $this->getVar('options', 'N'));
                 if ( function_exists($show_func) ) {
                     // execute the function
-                    $block = $show_func($options);
-                    if ( !$block ) {
-                        return $ret;
-                    }
-                } else {
-                    return $ret;
-                }
-            } else {
-                return $ret;
-            }
+                    $block = $show_func(explode('|', $this->getVar('options', 'N')));
+                    if ( !$block ) return $ret;
+                } else return $ret;
+            } else return $ret;
         } else {
             // it is a custom block, so just return the contents
             $block['content'] = $this->getContent('S',$this->getVar('c_type', 'N'));
-            if (empty($block['content'])) {
-                return $ret;
-            }
+            if (empty($block['content'])) return $ret;
         }
         return $block;
     }
@@ -251,9 +240,9 @@ class XoopsBlock extends XoopsObject
             if (!$edit_func) {
                 return false;
             }
-            if (file_exists($path = XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname', 'N').'/blocks/'.$this->getVar('func_file', 'N'))) {
+            if (file_exists($path = XOOPS_ROOT_PATH.'/modules/'.($dirname=$this->getVar('dirname', 'N')).'/blocks/'.$this->getVar('func_file', 'N'))) {
 				$root =& XCube_Root::getSingleton();
-				$root->mLanguageManager->loadBlockMessageCatalog($this->getVar('dirname'));
+				$root->mLanguageManager->loadBlockMessageCatalog($dirname);
 				
                 include_once $path;
                 $options = explode('|', $this->getVar('options', 'N'));

--- a/html/kernel/configitem.php
+++ b/html/kernel/configitem.php
@@ -144,7 +144,7 @@ class XoopsConfigItem extends XoopsObject
      */
     function &getConfValueForOutput()
     {
-        switch ($this->getVar('conf_valuetype', 'N')) {
+        switch ($this->getVar('conf_valuetype')) {
         case 'int':
             $ret = (int)$this->getVar('conf_value', 'N');
             return $ret;
@@ -343,11 +343,12 @@ class XoopsConfigItemHandler extends XoopsObjectHandler
         $ret = false;
         $id = (int)$id;
         if ($id > 0) {
-            $sql = 'SELECT * FROM '.$this->db->prefix('config').' WHERE conf_id='.$id;
-            if ($result = $this->db->query($sql)) {
-                $numrows = $this->db->getRowsNum($result);
+			$db = &$this->db;
+            $sql = 'SELECT * FROM '.$db->prefix('config').' WHERE conf_id='.$id;
+            if ($result = $db->query($sql)) {
+                $numrows = $db->getRowsNum($result);
                 if ($numrows == 1) {
-                    $myrow = $this->db->fetchArray($result);
+                    $myrow = $db->fetchArray($result);
                         $config =new XoopsConfigItem();
                     $config->assignVars($myrow);
                         $ret =& $config;
@@ -377,17 +378,18 @@ class XoopsConfigItemHandler extends XoopsObjectHandler
         foreach ($config->cleanVars as $k => $v) {
             ${$k} = $v;
         }
+		$db = &$this->db;
         if ($config->isNew()) {
-            $conf_id = $this->db->genId('config_conf_id_seq');
-            $sql = sprintf("INSERT INTO %s (conf_id, conf_modid, conf_catid, conf_name, conf_title, conf_value, conf_desc, conf_formtype, conf_valuetype, conf_order) VALUES (%u, %u, %u, %s, %s, %s, %s, %s, %s, %u)", $this->db->prefix('config'), $conf_id, $conf_modid, $conf_catid, $this->db->quoteString($conf_name), $this->db->quoteString($conf_title), $this->db->quoteString($conf_value), $this->db->quoteString($conf_desc), $this->db->quoteString($conf_formtype), $this->db->quoteString($conf_valuetype), $conf_order);
+            $conf_id = $db->genId('config_conf_id_seq');
+            $sql = sprintf('INSERT INTO %s (conf_id, conf_modid, conf_catid, conf_name, conf_title, conf_value, conf_desc, conf_formtype, conf_valuetype, conf_order) VALUES (%u, %u, %u, %s, %s, %s, %s, %s, %s, %u)', $db->prefix('config'), $conf_id, $conf_modid, $conf_catid, $db->quoteString($conf_name), $db->quoteString($conf_title), $db->quoteString($conf_value), $db->quoteString($conf_desc), $db->quoteString($conf_formtype), $db->quoteString($conf_valuetype), $conf_order);
         } else {
-            $sql = sprintf("UPDATE %s SET conf_modid = %u, conf_catid = %u, conf_name = %s, conf_title = %s, conf_value = %s, conf_desc = %s, conf_formtype = %s, conf_valuetype = %s, conf_order = %u WHERE conf_id = %u", $this->db->prefix('config'), $conf_modid, $conf_catid, $this->db->quoteString($conf_name), $this->db->quoteString($conf_title), $this->db->quoteString($conf_value), $this->db->quoteString($conf_desc), $this->db->quoteString($conf_formtype), $this->db->quoteString($conf_valuetype), $conf_order, $conf_id);
+            $sql = sprintf('UPDATE %s SET conf_modid = %u, conf_catid = %u, conf_name = %s, conf_title = %s, conf_value = %s, conf_desc = %s, conf_formtype = %s, conf_valuetype = %s, conf_order = %u WHERE conf_id = %u', $db->prefix('config'), $conf_modid, $conf_catid, $db->quoteString($conf_name), $db->quoteString($conf_title), $db->quoteString($conf_value), $db->quoteString($conf_desc), $db->quoteString($conf_formtype), $db->quoteString($conf_valuetype), $conf_order, $conf_id);
         }
-        if (!$result = $this->db->query($sql)) {
+        if (!$result = $db->query($sql)) {
             return false;
         }
         if (empty($conf_id)) {
-            $conf_id = $this->db->getInsertId();
+            $conf_id = $db->getInsertId();
         }
         $config->assignVar('conf_id', $conf_id);
         return true;
@@ -404,7 +406,7 @@ class XoopsConfigItemHandler extends XoopsObjectHandler
         if (strtolower(get_class($config)) != 'xoopsconfigitem') {
             return false;
         }
-        $sql = sprintf("DELETE FROM %s WHERE conf_id = %u", $this->db->prefix('config'), $config->getVar('conf_id'));
+        $sql = sprintf('DELETE FROM %s WHERE conf_id = %u', $this->db->prefix('config'), $config->getVar('conf_id'));
         if (!$result = $this->db->query($sql)) {
             return false;
         }
@@ -456,15 +458,16 @@ class XoopsConfigItemHandler extends XoopsObjectHandler
     function getCount($criteria = null)
     {
         $limit = $start = 0;
-        $sql = 'SELECT * FROM '.$this->db->prefix('config');
+		$db = &$this->db;
+        $sql = 'SELECT * FROM '.$db->prefix('config');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             $sql .= ' '.$criteria->renderWhere();
         }
-        $result =& $this->db->query($sql);
+        $result = $db->query($sql);
         if (!$result) {
             return false;
         }
-        list($count) = $this->db->fetchRow($result);
+        list($count) = $db->fetchRow($result);
         return $count;
     }
 }

--- a/html/kernel/configoption.php
+++ b/html/kernel/configoption.php
@@ -180,9 +180,9 @@ class XoopsConfigOptionHandler extends XoopsObjectHandler
         }
         if ($confoption->isNew()) {
             $confop_id = $this->db->genId('configoption_confop_id_seq');
-            $sql = sprintf("INSERT INTO %s (confop_id, confop_name, confop_value, conf_id) VALUES (%u, %s, %s, %u)", $this->db->prefix('configoption'), $confop_id, $this->db->quoteString($confop_name), $this->db->quoteString($confop_value), $conf_id);
+            $sql = sprintf('INSERT INTO %s (confop_id, confop_name, confop_value, conf_id) VALUES (%u, %s, %s, %u)', $this->db->prefix('configoption'), $confop_id, $this->db->quoteString($confop_name), $this->db->quoteString($confop_value), $conf_id);
         } else {
-            $sql = sprintf("UPDATE %s SET confop_name = %s, confop_value = %s WHERE confop_id = %u", $this->db->prefix('configoption'), $this->db->quoteString($confop_name), $this->db->quoteString($confop_value), $confop_id);
+            $sql = sprintf('UPDATE %s SET confop_name = %s, confop_value = %s WHERE confop_id = %u', $this->db->prefix('configoption'), $this->db->quoteString($confop_name), $this->db->quoteString($confop_value), $confop_id);
         }
         if (!$result = $this->db->query($sql)) {
             return false;
@@ -205,7 +205,7 @@ class XoopsConfigOptionHandler extends XoopsObjectHandler
         if (strtolower(get_class($confoption)) != 'xoopsconfigoption') {
             return false;
         }
-        $sql = sprintf("DELETE FROM %s WHERE confop_id = %u", $this->db->prefix('configoption'), $confoption->getVar('confop_id'));
+        $sql = sprintf('DELETE FROM %s WHERE confop_id = %u', $this->db->prefix('configoption'), $confoption->getVar('confop_id', 'n'));
         if (!$result = $this->db->query($sql)) {
             return false;
         }

--- a/html/kernel/group.php
+++ b/html/kernel/group.php
@@ -104,12 +104,13 @@ class XoopsGroupHandler extends XoopsObjectHandler
     {
         $ret = false;
         if ((int)$id > 0) {
-            $sql = 'SELECT * FROM '.$this->db->prefix('groups').' WHERE groupid='.$id;
-            if ($result = $this->db->query($sql)) {
-                $numrows = $this->db->getRowsNum($result);
+            $db = &$this->db;
+            $sql = 'SELECT * FROM '.$db->prefix('groups').' WHERE groupid='.$id;
+            if ($result = $db->query($sql)) {
+                $numrows = $db->getRowsNum($result);
                 if ($numrows == 1) {
                     $group = new XoopsGroup();
-                    $group->assignVars($this->db->fetchArray($result));
+                    $group->assignVars($db->fetchArray($result));
                         $ret =& $group;
                 }
             }
@@ -137,18 +138,15 @@ class XoopsGroupHandler extends XoopsObjectHandler
         foreach ($group->cleanVars as $k => $v) {
             ${$k} = $v;
         }
+        $db = &$this->db;
         if ($group->isNew()) {
-            $groupid = $this->db->genId('group_groupid_seq');
-            $sql = sprintf("INSERT INTO %s (groupid, name, description, group_type) VALUES (%u, %s, %s, %s)", $this->db->prefix('groups'), $groupid, $this->db->quoteString($name), $this->db->quoteString($description), $this->db->quoteString($group_type));
+            $groupid = $db->genId('group_groupid_seq');
+            $sql = sprintf('INSERT INTO %s (groupid, name, description, group_type) VALUES (%u, %s, %s, %s)', $db->prefix('groups'), $groupid, $db->quoteString($name), $db->quoteString($description), $db->quoteString($group_type));
         } else {
-            $sql = sprintf("UPDATE %s SET name = %s, description = %s, group_type = %s WHERE groupid = %u", $this->db->prefix('groups'), $this->db->quoteString($name), $this->db->quoteString($description), $this->db->quoteString($group_type), $groupid);
-        }
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        if (empty($groupid)) {
-            $groupid = $this->db->getInsertId();
+            $sql = sprintf("UPDATE %s SET name = %s, description = %s, group_type = %s WHERE groupid = %u", $db->prefix('groups'), $db->quoteString($name), $db->quoteString($description), $db->quoteString($group_type), $groupid);
         }
+        if (!$result = $db->query($sql)) return false;
+        if (empty($groupid)) $groupid = $db->getInsertId();
         $group->assignVar('groupid', $groupid);
         return true;
     }
@@ -161,10 +159,8 @@ class XoopsGroupHandler extends XoopsObjectHandler
      */
     function delete(&$group)
     {
-        if (strtolower(get_class($group)) != 'xoopsgroup') {
-            return false;
-        }
-        $sql = sprintf("DELETE FROM %s WHERE groupid = %u", $this->db->prefix('groups'), $group->getVar('groupid'));
+        if (strtolower(get_class($group)) != 'xoopsgroup') return false;
+        $sql = sprintf('DELETE FROM %s WHERE groupid = %u', $this->db->prefix('groups'), $group->getVar('groupid'));
         if (!$result = $this->db->query($sql)) {
             return false;
         }
@@ -182,17 +178,18 @@ class XoopsGroupHandler extends XoopsObjectHandler
     {
         $ret = array();
         $limit = $start = 0;
-        $sql = 'SELECT * FROM '.$this->db->prefix('groups');
+        $db = &$this->db;
+        $sql = 'SELECT * FROM '.$db->prefix('groups');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             $sql .= ' '.$criteria->renderWhere();
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         }
-        $result = $this->db->query($sql, $limit, $start);
+        $result = $db->query($sql, $limit, $start);
         if (!$result) {
             return $ret;
         }
-        while ($myrow = $this->db->fetchArray($result)) {
+        while ($myrow = $db->fetchArray($result)) {
             $group =new XoopsGroup();
             $group->assignVars($myrow);
 			if (!$id_as_key) {
@@ -265,12 +262,13 @@ class XoopsMembershipHandler extends XoopsObjectHandler
     {
         $ret = false;
         if ((int)$id > 0) {
-            $sql = 'SELECT * FROM '.$this->db->prefix('groups_users_link').' WHERE linkid='.$id;
-            if ($result = $this->db->query($sql)) {
-                $numrows = $this->db->getRowsNum($result);
+            $db = &$this->db;
+            $sql = 'SELECT * FROM '.$db->prefix('groups_users_link').' WHERE linkid='.$id;
+            if ($result = $db->query($sql)) {
+                $numrows = $db->getRowsNum($result);
                 if ($numrows == 1) {
                         $mship =new XoopsMembership();
-                    $mship->assignVars($this->db->fetchArray($result));
+                    $mship->assignVars($db->fetchArray($result));
                         $ret =& $mship;
                 }
             }
@@ -298,18 +296,15 @@ class XoopsMembershipHandler extends XoopsObjectHandler
         foreach ($mship->cleanVars as $k => $v) {
             ${$k} = $v;
         }
+        $db = &$this->db;
         if ($mship->isNew()) {
-            $linkid = $this->db->genId('groups_users_link_linkid_seq');
-            $sql = sprintf("INSERT INTO %s (linkid, groupid, uid) VALUES (%u, %u, %u)", $this->db->prefix('groups_users_link'), $linkid, $groupid, $uid);
+            $linkid = $db->genId('groups_users_link_linkid_seq');
+            $sql = sprintf("INSERT INTO %s (linkid, groupid, uid) VALUES (%u, %u, %u)", $db->prefix('groups_users_link'), $linkid, $groupid, $uid);
         } else {
-            $sql = sprintf("UPDATE %s SET groupid = %u, uid = %u WHERE linkid = %u", $this->db->prefix('groups_users_link'), $groupid, $uid, $linkid);
-        }
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        if (empty($linkid)) {
-            $linkid = $this->db->getInsertId();
+            $sql = sprintf("UPDATE %s SET groupid = %u, uid = %u WHERE linkid = %u", $db->prefix('groups_users_link'), $groupid, $uid, $linkid);
         }
+        if (!$result = $db->query($sql)) return false;
+        if (empty($linkid)) $linkid = $this->db->getInsertId();
         $mship->assignVar('linkid', $linkid);
         return true;
     }
@@ -325,10 +320,8 @@ class XoopsMembershipHandler extends XoopsObjectHandler
         if (strtolower(get_class($mship)) != 'xoopsmembership') {
             return false;
         }
-        $sql = sprintf("DELETE FROM %s WHERE linkid = %u", $this->db->prefix('groups_users_link'), $groupm->getVar('linkid'));
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
+        $sql = sprintf('DELETE FROM %s WHERE linkid = %u', $this->db->prefix('groups_users_link'), $groupm->getVar('linkid'));
+        if (!$result = $this->db->query($sql)) return false;
         return true;
     }
 
@@ -343,17 +336,18 @@ class XoopsMembershipHandler extends XoopsObjectHandler
     {
         $ret = array();
         $limit = $start = 0;
-        $sql = 'SELECT * FROM '.$this->db->prefix('groups_users_link');
+        $db = &$this->db;
+        $sql = 'SELECT * FROM '.$db->prefix('groups_users_link');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             $sql .= ' '.$criteria->renderWhere();
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         }
-        $result = $this->db->query($sql, $limit, $start);
+        $result = $db->query($sql, $limit, $start);
         if (!$result) {
             return $ret;
         }
-        while ($myrow = $this->db->fetchArray($result)) {
+        while ($myrow = $db->fetchArray($result)) {
             $mship = new XoopsMembership();
             $mship->assignVars($myrow);
 			if (!$id_as_key) {
@@ -374,15 +368,16 @@ class XoopsMembershipHandler extends XoopsObjectHandler
      */
     function getCount($criteria = null)
     {
-        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('groups_users_link');
+        $db = &$this->db;
+        $sql = 'SELECT COUNT(*) FROM '.$db->prefix('groups_users_link');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             $sql .= ' '.$criteria->renderWhere();
         }
-        $result = $this->db->query($sql);
+        $result = $db->query($sql);
         if (!$result) {
             return 0;
         }
-        list($count) = $this->db->fetchRow($result);
+        list($count) = $db->fetchRow($result);
         return $count;
     }
 
@@ -398,9 +393,7 @@ class XoopsMembershipHandler extends XoopsObjectHandler
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             $sql .= ' '.$criteria->renderWhere();
         }
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
+        if (!$result = $this->db->query($sql)) return false;
         return true;
     }
 
@@ -415,13 +408,12 @@ class XoopsMembershipHandler extends XoopsObjectHandler
     function &getGroupsByUser($uid)
     {
         $ret = array();
-        $sql = 'SELECT groupid FROM '.$this->db->prefix('groups_users_link').' WHERE uid='.(int)$uid;
-        $result = $this->db->query($sql);
-        if (!$result) {
-            return $ret;
-        }
-        while ($myrow = $this->db->fetchArray($result)) {
-            $ret[] = $myrow['groupid'];
+        $db = &$this->db;
+        $sql = 'SELECT groupid FROM '.$db->prefix('groups_users_link').' WHERE uid='.(int)$uid;
+        $result = $db->query($sql);
+        if (!$result) return $ret;
+        while (list($groupid) = $db->fetchRow($result)) {
+            $ret[] = $groupid;
         }
         return $ret;
     }
@@ -439,14 +431,13 @@ class XoopsMembershipHandler extends XoopsObjectHandler
     function &getUsersByGroup($groupid, $limit=0, $start=0)
     {
         $ret = array();
-        $sql = 'SELECT uid FROM ' . $this->db->prefix('groups_users_link') . ' WHERE groupid='.(int)$groupid;
+        $db = &$this->db;
+        $sql = 'SELECT uid FROM ' . $db->prefix('groups_users_link') . ' WHERE groupid='.(int)$groupid;
 
-        $result = $this->db->query($sql, $limit, $start);
-        if (!$result) {
-            return $ret;
-        }
-        while ($myrow = $this->db->fetchArray($result)) {
-            $ret[] = $myrow['uid'];
+        $result = $db->query($sql, $limit, $start);
+        if (!$result) return $ret;
+        while (list($uid) = $db->fetchRow($result)) {
+            $ret[] = $uid;
         }
         return $ret;
     }
@@ -459,8 +450,9 @@ class XoopsMembershipHandler extends XoopsObjectHandler
         $ret = array();
 
         $groupid = (int)$groupid;
-        $usersTable = $this->db->prefix('users');
-        $linkTable = $this->db->prefix('groups_users_link');
+        $db = &$this->db;
+        $usersTable = $db->prefix('users');
+        $linkTable = $db->prefix('groups_users_link');
 
         $sql = "SELECT u.uid FROM ${usersTable} u LEFT JOIN ${linkTable} g ON u.uid=g.uid," .
                 "${usersTable} u2 LEFT JOIN ${linkTable} g2 ON u2.uid=g2.uid AND g2.groupid=${groupid} " .
@@ -468,12 +460,10 @@ class XoopsMembershipHandler extends XoopsObjectHandler
                 "AND (g2.groupid = ${groupid} OR g2.groupid IS NULL) " .
                 "AND u.uid = u2.uid AND g2.uid IS NULL GROUP BY u.uid";
 
-        $result = $this->db->query($sql, $limit, $start);
-        if (!$result) {
-            return $ret;
-        }
-        while ($myrow = $this->db->fetchArray($result)) {
-            $ret[] = $myrow['uid'];
+        $result = $db->query($sql, $limit, $start);
+        if (!$result) return $ret;
+        while (list($uid) = $db->fetchRow($result)) {
+            $ret[] = $uid;
         }
         return $ret;
     }

--- a/html/kernel/groupperm.php
+++ b/html/kernel/groupperm.php
@@ -165,12 +165,13 @@ class XoopsGroupPermHandler extends XoopsObjectHandler
     {
         $ret = false;
         if ((int)$id > 0) {
-            $sql = sprintf("SELECT * FROM %s WHERE gperm_id = %u", $this->db->prefix('group_permission'), $id);
-            if ($result = $this->db->query($sql)) {
-                $numrows = $this->db->getRowsNum($result);
+            $db = &$this->db;
+            $sql = sprintf('SELECT * FROM %s WHERE gperm_id = %u', $db->prefix('group_permission'), $id);
+            if ($result = $db->query($sql)) {
+                $numrows = $db->getRowsNum($result);
                 if ( $numrows == 1 ) {
                         $perm =new XoopsGroupPerm();
-                    $perm->assignVars($this->db->fetchArray($result));
+                    $perm->assignVars($db->fetchArray($result));
                         $ret =& $perm;
                 }
             }
@@ -200,18 +201,15 @@ class XoopsGroupPermHandler extends XoopsObjectHandler
         foreach ($perm->cleanVars as $k => $v) {
             ${$k} = $v;
         }
+        $db = &$this->db;
         if ($perm->isNew()) {
-            $gperm_id = $this->db->genId('group_permission_gperm_id_seq');
-            $sql = sprintf("INSERT INTO %s (gperm_id, gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (%u, %u, %u, %u, %s)", $this->db->prefix('group_permission'), $gperm_id, $gperm_groupid, $gperm_itemid, $gperm_modid, $this->db->quoteString($gperm_name));
+            $gperm_id = $db->genId('group_permission_gperm_id_seq');
+            $sql = sprintf('INSERT INTO %s (gperm_id, gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (%u, %u, %u, %u, %s)', $db->prefix('group_permission'), $gperm_id, $gperm_groupid, $gperm_itemid, $gperm_modid, $db->quoteString($gperm_name));
         } else {
-            $sql = sprintf("UPDATE %s SET gperm_groupid = %u, gperm_itemid = %u, gperm_modid = %u WHERE gperm_id = %u", $this->db->prefix('group_permission'), $gperm_groupid, $gperm_itemid, $gperm_modid, $gperm_id);
-        }
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        if (empty($gperm_id)) {
-            $gperm_id = $this->db->getInsertId();
+            $sql = sprintf('UPDATE %s SET gperm_groupid = %u, gperm_itemid = %u, gperm_modid = %u WHERE gperm_id = %u', $db->prefix('group_permission'), $gperm_groupid, $gperm_itemid, $gperm_modid, $gperm_id);
         }
+        if (!$result = $db->query($sql)) return false;
+        if (empty($gperm_id)) $gperm_id = $this->db->getInsertId();
         $perm->assignVar('gperm_id', $gperm_id);
         return true;
     }
@@ -247,17 +245,18 @@ class XoopsGroupPermHandler extends XoopsObjectHandler
     {
         $ret = array();
         $limit = $start = 0;
-        $sql = 'SELECT * FROM '.$this->db->prefix('group_permission');
+        $db = &$this->db;
+        $sql = 'SELECT * FROM '.$db->prefix('group_permission');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             $sql .= ' '.$criteria->renderWhere();
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         }
-        $result = $this->db->query($sql, $limit, $start);
+        $result = $db->query($sql, $limit, $start);
         if (!$result) {
             return $ret;
         }
-        while ($myrow = $this->db->fetchArray($result)) {
+        while ($myrow = $db->fetchArray($result)) {
             $perm =new XoopsGroupPerm();
             $perm->assignVars($myrow);
             if (!$id_as_key) {
@@ -279,15 +278,16 @@ class XoopsGroupPermHandler extends XoopsObjectHandler
      */
     function getCount($criteria = null)
     {
-        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('group_permission');
+        $db = &$this->db;
+        $sql = 'SELECT COUNT(*) FROM '.$db->prefix('group_permission');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             $sql .= ' '.$criteria->renderWhere();
         }
-        $result = $this->db->query($sql);
+        $result = $db->query($sql);
         if (!$result) {
             return 0;
         }
-        list($count) = $this->db->fetchRow($result);
+        list($count) = $db->fetchRow($result);
         return $count;
     }
 

--- a/html/kernel/user.php
+++ b/html/kernel/user.php
@@ -151,11 +151,10 @@ class XoopsUser extends XoopsObject
             $member_handler =& xoops_gethandler('member');
             $user =& $member_handler->getUser($userid);
             if (is_object($user)) {
-                $ts =& MyTextSanitizer::getInstance();
                 if ( $usereal ) { 
-					return $ts->htmlSpecialChars($user->getVar('name'));
+					return $user->getVar('name');
             	} else {
-					return $ts->htmlSpecialChars($user->getVar('uname'));
+					return $user->getVar('uname');
 				}
             }
         }
@@ -270,7 +269,7 @@ class XoopsUser extends XoopsObject
     {
         if (!isset($this->_isOnline)) {
             $onlinehandler =& xoops_gethandler('online');
-            $this->_isOnline = ($onlinehandler->getCount(new Criteria('online_uid', $this->getVar('uid'))) > 0) ? true : false;
+            $this->_isOnline = ($onlinehandler->getCount(new Criteria('online_uid', $this->getVar('uid', 'N'))) > 0) ? true : false;
         }
         return $this->_isOnline;
     }
@@ -288,7 +287,7 @@ class XoopsUser extends XoopsObject
      */
     function uid()
     {
-        return $this->getVar("uid");
+        return $this->getVar('uid');
     }
     
     /**