update from myTextSanitizer to icms_core_TextSanitizer

Author: fiammybe

class/art/functions.user.php

@@ -26,7 +26,7 @@
 function mod_getIP($asString = false)
 {
     // Gets the proxy ip sent by the user
-    /*$proxy_ip     = '';
+    $proxy_ip     = '';
     if (!empty($_SERVER["HTTP_X_FORWARDED_FOR"])) {
         $proxy_ip = $_SERVER["HTTP_X_FORWARDED_FOR"];
     } else if (!empty($_SERVER["HTTP_X_FORWARDED"])) {
@@ -44,26 +44,26 @@ function mod_getIP($asString = false)
     }
 
     if (!empty($proxy_ip) &&
-        $is_ip = (ereg('^([0-9]{1,3}\.){3,3}[0-9]{1,3}', $proxy_ip, $regs) &&
-            count($regs) > 0)
+        $is_ip = ereg('^([0-9]{1,3}\.){3,3}[0-9]{1,3}', $proxy_ip, $regs) &&
+        count($regs) > 0
   	) {
       	$the_IP = $regs[0];
   	}else{
       	$the_IP = $_SERVER['REMOTE_ADDR'];	      	
   	}
 
   	$the_IP = ($asString) ? $the_IP : ip2long($the_IP);
-
-  	*/
-  	return '0.0.0.0';
+  	
+  	//return $the_IP;
+	return ip2long('1.1.1.1');
 }
 
 function &mod_getUnameFromIds( $uid, $usereal = false, $linked = false )
 {
 	if (!is_array($uid))  $uid = array($uid);
 	$userid = array_map("intval", array_filter($uid));
 
-	$myts = MyTextSanitizer::getInstance();
+	$myts = icms_core_Textsanitizer::getInstance();
 	$users = array();
 	if (count($userid) > 0) {
         $sql = 'SELECT uid, uname, name FROM ' . $GLOBALS['xoopsDB']->prefix('users'). ' WHERE level>0 AND uid IN('.implode(",", array_unique($userid)).')';
@@ -91,8 +91,8 @@ function &mod_getUnameFromIds( $uid, $usereal = false, $linked = false )
 
 function mod_getUnameFromId( $userid, $usereal = 0, $linked = false)
 {
-	$myts = MyTextSanitizer::getInstance();
-	$userid = (int)$userid;
+	$myts = icms_core_Textsanitizer::getInstance();
+	$userid = intval($userid);
 	if ($userid > 0) {
         $member_handler = icms::handler('icms_member');
         $user = $member_handler->getUser($userid);
@@ -114,3 +114,4 @@ function mod_getUnameFromId( $userid, $usereal = 0, $linked = false)
 }
 
 endif;
+?>

class/art/object.persistable.php

@@ -38,8 +38,8 @@ function __construct($table = null) {
     */
     function getVar($key, $format = 's')
     {
-		defined("MYTEXTSANITIZER_EXTENDED") || include_once ICMS_ROOT_PATH."/class/module.textsanitizer.php";
-		$ts = MyTextSanitizer::getInstance();
+		//defined("MYTEXTSANITIZER_EXTENDED") || include_once ICMS_ROOT_PATH."/class/module.textsanitizer.php";
+		$ts = icms_core_Textsanitizer::getInstance();
 		$ret = null;
 		if ( !isset($this->vars[$key]) ) return $ret ;
 		$ret = $this->vars[$key]['value'];
@@ -372,13 +372,14 @@ function &getAll($criteria = null, $tags = null, $asObject = true)
      */
     function mysql_server_version($conn = null)
     {
-        /*if (!is_null($conn)) {
-            return mysql_get_server_info($conn);
-        } else {
-            return mysql_get_server_info();
-        }*/
-        return "6.0.0";
-
+	    /*
+	    if (!is_null($conn)) {
+		    return mysql_get_server_info($conn);
+	    } else {
+		    return mysql_get_server_info();
+	    }
+	    */
+	    return "6.0.0";
     }
 
     /**

class/art/object.render.php

@@ -149,7 +149,7 @@ function getList($criteria = null, $limit = 0, $start = 0)
             return $ret;
         }
 
-        $myts = MyTextSanitizer::getInstance();
+        $myts = icms_core_Textsanitizer::getInstance();
         while ($myrow = icms::$xoopsDB->fetchArray($result)) {
             //identifiers should be textboxes, so sanitize them like that
             $ret[$myrow[$this->_handler->keyName]] = empty($this->_handler->identifierName) ? 1 : icms_core_DataFilter::htmlSpecialchars($myrow[$this->_handler->identifierName]);

class/art/object.write.php

@@ -40,7 +40,7 @@ function &cleanVars(&$object)
     {
 	    $object->cleanVars();
 	    $changedVars = array();
-        $ts = MyTextSanitizer::getInstance();
+        $ts = icms_core_Textsanitizer::getInstance();
         foreach ($object->vars as $k => $v) {
 	        if(!$v["changed"]) continue;
             $cleanv = $object->cleanVars[$k];