[xoops-svn] SF.net SVN: xoops:[9033] XoopsModules/xim

[<dj...@us...>]

Revision: 9033
          http://xoops.svn.sourceforge.net/xoops/?rev=9033&view=rev
Author:   djculex
Date:     2012-02-20 06:40:42 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------


Modified Paths:
--------------
    XoopsModules/xim/releases/1.02/modules/xim/chat.php
    XoopsModules/xim/releases/1.02/modules/xim/include/functions.php
    XoopsModules/xim/releases/1.02/modules/xim/js/chat.js
    XoopsModules/xim/trunk/modules/xim/chat.php
    XoopsModules/xim/trunk/modules/xim/include/functions.php
    XoopsModules/xim/trunk/modules/xim/js/chat.js

Modified: XoopsModules/xim/releases/1.02/modules/xim/chat.php
===================================================================
--- XoopsModules/xim/releases/1.02/modules/xim/chat.php	2012-02-20 05:15:13 UTC (rev 9032)
+++ XoopsModules/xim/releases/1.02/modules/xim/chat.php	2012-02-20 06:40:42 UTC (rev 9033)
@@ -41,7 +41,7 @@
 **/
 
 include 'header.php';
-require_once XOOPS_ROOT_PATH."/modules/xim/include/functions.php";
+include_once XOOPS_ROOT_PATH.'/modules/xim/include/functions.php';
 global $xoopsLogger;
 $xoopsLogger->activated = false;
 
@@ -73,7 +73,7 @@
             $items = $_SESSION['chatHistory'][$chat['from']];
         }
         
-        $chat['message'] = xoops_smallworld($chat['message']);	
+        $chat['message'] = xim_sanitize($chat['message']);	
 	$user = new XoopsUser($chat['from']);
 	// changed to show link to user info for user "from"
 	if ($chat['sys'] != '-1') {
@@ -236,7 +236,7 @@
 	$soundUrl = XOOPS_URL.'/modules/xim/media/0.mp3';
 	$status = $config['status'];
     
-    $messagesan = xoops_smallworld($message);
+    $messagesan = xim_sanitize($message);
     header('Content-type: application/json');
     echo '{"message":"'.$messagesan.'"}'; 
     if (!isset($_SESSION['chatHistory'][$_POST['to']])) {
@@ -249,7 +249,7 @@
     
     unset($_SESSION['tsChatBoxes'][$_POST['to']]);
     
-    $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($from)."', '".mysql_real_escape_string($to)."','".mysql_real_escape_string($message)."',NOW())";
+    $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($from)."', '".mysql_real_escape_string($to)."','".mysql_real_escape_string($message)."',NOW())";
     $query = $xoopsDB->queryF($sql);
     exit(0);
 }
@@ -280,19 +280,19 @@
 	 if ($status == '0') {
 		// User is away
 		$sysmessage = _XIM_SYSTEM_AWAY;
-		 $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())";
+		 $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())";
 		 $query = $xoopsDB->queryF($sql);
 	 }
 	 if ($status == '1') {
 		// User is busy
 		$sysmessage = _XIM_SYSTEM_BUSY;
-		 $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())";
+		 $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())";
 		 $query = $xoopsDB->queryF($sql);
 	 }
 	 if ($status == '3') {
 		// User is offline
 		$sysmessage = _XIM_SYSTEM_OFFLINE;
-		 $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())";
+		 $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())";
 		 $query = $xoopsDB->queryF($sql);
 	 }
 }

Modified: XoopsModules/xim/releases/1.02/modules/xim/include/functions.php
===================================================================
--- XoopsModules/xim/releases/1.02/modules/xim/include/functions.php	2012-02-20 05:15:13 UTC (rev 9032)
+++ XoopsModules/xim/releases/1.02/modules/xim/include/functions.php	2012-02-20 06:40:42 UTC (rev 9033)
@@ -124,15 +124,16 @@
 	return $retval;
 }
 
-	function xim_sanitize($text) 
-    {
-        $text = htmlspecialchars($text, ENT_QUOTES); 
-        $myts = MyTextSanitizer::getInstance();
-        $text = $myts->displayTarea($text, 1, 1, 1, 1);
-        $text = str_replace("\n\r", "\n", $text);
-        $text = str_replace("\r\n", "\n", $text);
-        $text = str_replace("\n", "<br />", $text);
-        $text = str_replace("\"", "'", $text);
-        return $text;
+	function xim_sanitize($text) {
+    $text = htmlspecialchars($text, ENT_QUOTES);
+    //$text = preg_replace('/([^\s]{10})(?=[^\s])/m', '$1<br />', $text); 
+    $myts = MyTextSanitizer::getInstance();
+    $text = $myts->displayTarea($text,1,1,1,1);
+    $text = str_replace("\n\r","\n",$text);
+    $text = str_replace("\r\n","\n",$text);
+    $text = str_replace("\n","<br />",$text);
+    $text = str_replace("\"","'",$text);
+
+    return $text;
     }
 ?>
\ No newline at end of file

Modified: XoopsModules/xim/releases/1.02/modules/xim/js/chat.js
===================================================================
--- XoopsModules/xim/releases/1.02/modules/xim/js/chat.js	2012-02-20 05:15:13 UTC (rev 9032)
+++ XoopsModules/xim/releases/1.02/modules/xim/js/chat.js	2012-02-20 06:40:42 UTC (rev 9033)
@@ -35,10 +35,11 @@
 var newMessagesUser = new Array();
 var chatBoxes = new Array();
 document.containers= new Object();
-
+xoops_im(document).ready(function(){
 	var refreshId = setInterval(function() {
 	xoops_im('#online_friends').load(xim_url+'blocks/blockupdater.php');
 	}, 5000);
+});
 
 xoops_im(document).ready(function(){
 createFooterBar();
@@ -258,6 +259,7 @@
 
 function startChatSession(){  
 	  reSetConf();
+      updateUserList();
 	  if (showFooterBar==1) {
 		setTimeout('updateUserList()',200);
 	  }

Modified: XoopsModules/xim/trunk/modules/xim/chat.php
===================================================================
--- XoopsModules/xim/trunk/modules/xim/chat.php	2012-02-20 05:15:13 UTC (rev 9032)
+++ XoopsModules/xim/trunk/modules/xim/chat.php	2012-02-20 06:40:42 UTC (rev 9033)
@@ -41,7 +41,7 @@
 **/
 
 include 'header.php';
-require_once XOOPS_ROOT_PATH."/modules/xim/include/functions.php";
+include_once XOOPS_ROOT_PATH.'/modules/xim/include/functions.php';
 global $xoopsLogger;
 $xoopsLogger->activated = false;
 
@@ -73,7 +73,7 @@
             $items = $_SESSION['chatHistory'][$chat['from']];
         }
         
-        $chat['message'] = xoops_smallworld($chat['message']);	
+        $chat['message'] = xim_sanitize($chat['message']);	
 	$user = new XoopsUser($chat['from']);
 	// changed to show link to user info for user "from"
 	if ($chat['sys'] != '-1') {
@@ -236,7 +236,7 @@
 	$soundUrl = XOOPS_URL.'/modules/xim/media/0.mp3';
 	$status = $config['status'];
     
-    $messagesan = xoops_smallworld($message);
+    $messagesan = xim_sanitize($message);
     header('Content-type: application/json');
     echo '{"message":"'.$messagesan.'"}'; 
     if (!isset($_SESSION['chatHistory'][$_POST['to']])) {
@@ -249,7 +249,7 @@
     
     unset($_SESSION['tsChatBoxes'][$_POST['to']]);
     
-    $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($from)."', '".mysql_real_escape_string($to)."','".mysql_real_escape_string($message)."',NOW())";
+    $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($from)."', '".mysql_real_escape_string($to)."','".mysql_real_escape_string($message)."',NOW())";
     $query = $xoopsDB->queryF($sql);
     exit(0);
 }
@@ -280,19 +280,19 @@
 	 if ($status == '0') {
 		// User is away
 		$sysmessage = _XIM_SYSTEM_AWAY;
-		 $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())";
+		 $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())";
 		 $query = $xoopsDB->queryF($sql);
 	 }
 	 if ($status == '1') {
 		// User is busy
 		$sysmessage = _XIM_SYSTEM_BUSY;
-		 $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())";
+		 $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())";
 		 $query = $xoopsDB->queryF($sql);
 	 }
 	 if ($status == '3') {
 		// User is offline
 		$sysmessage = _XIM_SYSTEM_OFFLINE;
-		 $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())";
+		 $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())";
 		 $query = $xoopsDB->queryF($sql);
 	 }
 }

Modified: XoopsModules/xim/trunk/modules/xim/include/functions.php
===================================================================
--- XoopsModules/xim/trunk/modules/xim/include/functions.php	2012-02-20 05:15:13 UTC (rev 9032)
+++ XoopsModules/xim/trunk/modules/xim/include/functions.php	2012-02-20 06:40:42 UTC (rev 9033)
@@ -124,16 +124,17 @@
 	return $retval;
 }
 
-	function xim_sanitize($text) 
-    {
-        $text = htmlspecialchars($text, ENT_QUOTES); 
-        $myts = MyTextSanitizer::getInstance();
-        $text = $myts->displayTarea($text, 1, 1, 1, 1);
-        $text = str_replace("\n\r", "\n", $text);
-        $text = str_replace("\r\n", "\n", $text);
-        $text = str_replace("\n", "<br />", $text);
-        $text = str_replace("\"", "'", $text);
-        return $text;
+	function xim_sanitize($text) {
+    $text = htmlspecialchars($text, ENT_QUOTES);
+    //$text = preg_replace('/([^\s]{10})(?=[^\s])/m', '$1<br />', $text); 
+    $myts = MyTextSanitizer::getInstance();
+    $text = $myts->displayTarea($text,1,1,1,1);
+    $text = str_replace("\n\r","\n",$text);
+    $text = str_replace("\r\n","\n",$text);
+    $text = str_replace("\n","<br />",$text);
+    $text = str_replace("\"","'",$text);
+
+    return $text;
     }
 
 ?>
\ No newline at end of file

Modified: XoopsModules/xim/trunk/modules/xim/js/chat.js
===================================================================
--- XoopsModules/xim/trunk/modules/xim/js/chat.js	2012-02-20 05:15:13 UTC (rev 9032)
+++ XoopsModules/xim/trunk/modules/xim/js/chat.js	2012-02-20 06:40:42 UTC (rev 9033)
@@ -35,10 +35,11 @@
 var newMessagesUser = new Array();
 var chatBoxes = new Array();
 document.containers= new Object();
-
+xoops_im(document).ready(function(){
 	var refreshId = setInterval(function() {
 	xoops_im('#online_friends').load(xim_url+'blocks/blockupdater.php');
 	}, 5000);
+});
 
 xoops_im(document).ready(function(){
 createFooterBar();
@@ -258,6 +259,7 @@
 
 function startChatSession(){  
 	  reSetConf();
+      updateUserList();
 	  if (showFooterBar==1) {
 		setTimeout('updateUserList()',200);
 	  }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.