Menu
▾
▴
xoops-svn
|
From: <dj...@us...> - 2012-02-13 03:32:58
|
Revision: 8947
http://xoops.svn.sourceforge.net/xoops/?rev=8947&view=rev
Author: djculex
Date: 2012-02-13 03:32:51 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
- Bugfix: Json returns empty array if users online = 0
Modified Paths:
--------------
XoopsModules/xim/releases/1.02/modules/xim/ajax_userlist.php
XoopsModules/xim/trunk/modules/xim/ajax_userlist.php
Modified: XoopsModules/xim/releases/1.02/modules/xim/ajax_userlist.php
===================================================================
--- XoopsModules/xim/releases/1.02/modules/xim/ajax_userlist.php 2012-02-13 02:12:36 UTC (rev 8946)
+++ XoopsModules/xim/releases/1.02/modules/xim/ajax_userlist.php 2012-02-13 03:32:51 UTC (rev 8947)
@@ -38,8 +38,8 @@
if (is_object($xoopsUser)) {
$uid = $xoopsUser->getVar('uid');
$uname = $xoopsUser->getVar('uname');
- $_SESSION['username'] = $uname;
- xim_setPersonalConfig (); // Function to create/check personal config (culex)
+ $_SESSION['username'] = $uname;
+ xim_setPersonalConfig (); // Function to create/check personal config (culex)
} else {
$uid = 0;
$uname = '';
@@ -54,41 +54,44 @@
$userlist='';
if (false != $onlines) {
$total = count($onlines);
- $count = 0;
+ $count = 0;
for ($i = 0; $i < $total; $i++) {
- if (($onlines[$i]['online_uid'] > 0) && ($onlines[$i]['online_uid']!=$uid)) {
- $count++;
- $user = new XoopsUser($onlines[$i]['online_uid']);
- $avatar =$user->user_avatar();
- if ($avatar!='blank.gif') {
- $avatarURL = XOOPS_URL."/uploads/".$avatar;
- } else {
- $avatarURL = XOOPS_URL."/modules/xim/images/default_avatar.png";
- }
-
- // testing if avatar really exists physically on server
- if (file_exists("../../uploads/".$avatar)) {
- } else {
- $avatarURL = XOOPS_URL."/modules/xim/images/default_avatar.png";
- }
-
-
- $config = im_Getconfig($onlines[$i]['online_uname']);
- $status = $config['status'];
- $userid=$onlines[$i]['online_uid'];
- $username = $onlines[$i]['online_uname'];
- if ($status == 3) {$count = $count -1;}
- if ($status!=3){
- $userlist .= <<<EOD
-{"id":"$userid","n":"$username","a":"$avatarURL","status":$status},
-EOD;
- }
- }
+ if (($onlines[$i]['online_uid'] > 0) && ($onlines[$i]['online_uid']!=$uid)) {
+ $count++;
+ $user = new XoopsUser($onlines[$i]['online_uid']);
+ $avatar =$user->user_avatar();
+ if ($avatar!='blank.gif') {
+ $avatarURL = XOOPS_URL."/uploads/".$avatar;
+ } else {
+ $avatarURL = XOOPS_URL."/modules/xim/images/default_avatar.png";
+ }
+
+ // testing if avatar really exists physically on server
+ if (file_exists("../../uploads/".$avatar)) {
+ } else {
+ $avatarURL = XOOPS_URL."/modules/xim/images/default_avatar.png";
+ }
+
+
+ $config = im_Getconfig($onlines[$i]['online_uname']);
+ $status = $config['status'];
+ $userid=$onlines[$i]['online_uid'];
+ $username = $onlines[$i]['online_uname'];
+ if ($status == 3) {
+ $count = $count - 1;
+ }
+ if ($status != 3) {
+ $userlist .= '{"id":"'.$userid.'","n":"'.$username.'","a":"'.$avatarURL.'","status":'.$status.'},';
+ }
+ }
}
-$userlist = substr($userlist, 0, -1);
- }
- header('Content-type: application/json');
- echo "{\"total\":$count, \"users\":[$userlist]}";
+ $userlist = substr($userlist, 0, -1);
+ header('Content-type: application/json');
+ echo "{\"total\":$count, \"users\":[$userlist]}";
+ } else {
+ header('Content-type: application/json');
+ echo "{\"total\":\"0\", \"users\":\"\"}";
+ }
?>
\ No newline at end of file
Modified: XoopsModules/xim/trunk/modules/xim/ajax_userlist.php
===================================================================
--- XoopsModules/xim/trunk/modules/xim/ajax_userlist.php 2012-02-13 02:12:36 UTC (rev 8946)
+++ XoopsModules/xim/trunk/modules/xim/ajax_userlist.php 2012-02-13 03:32:51 UTC (rev 8947)
@@ -38,8 +38,8 @@
if (is_object($xoopsUser)) {
$uid = $xoopsUser->getVar('uid');
$uname = $xoopsUser->getVar('uname');
- $_SESSION['username'] = $uname;
- xim_setPersonalConfig (); // Function to create/check personal config (culex)
+ $_SESSION['username'] = $uname;
+ xim_setPersonalConfig (); // Function to create/check personal config (culex)
} else {
$uid = 0;
$uname = '';
@@ -54,41 +54,44 @@
$userlist='';
if (false != $onlines) {
$total = count($onlines);
- $count = 0;
+ $count = 0;
for ($i = 0; $i < $total; $i++) {
- if (($onlines[$i]['online_uid'] > 0) && ($onlines[$i]['online_uid']!=$uid)) {
- $count++;
- $user = new XoopsUser($onlines[$i]['online_uid']);
- $avatar =$user->user_avatar();
- if ($avatar!='blank.gif') {
- $avatarURL = XOOPS_URL."/uploads/".$avatar;
- } else {
- $avatarURL = XOOPS_URL."/modules/xim/images/default_avatar.png";
- }
-
- // testing if avatar really exists physically on server
- if (file_exists("../../uploads/".$avatar)) {
- } else {
- $avatarURL = XOOPS_URL."/modules/xim/images/default_avatar.png";
- }
-
-
- $config = im_Getconfig($onlines[$i]['online_uname']);
- $status = $config['status'];
- $userid=$onlines[$i]['online_uid'];
- $username = $onlines[$i]['online_uname'];
- if ($status == 3) {$count = $count -1;}
- if ($status!=3){
- $userlist .= <<<EOD
-{"id":"$userid","n":"$username","a":"$avatarURL","status":$status},
-EOD;
- }
- }
+ if (($onlines[$i]['online_uid'] > 0) && ($onlines[$i]['online_uid']!=$uid)) {
+ $count++;
+ $user = new XoopsUser($onlines[$i]['online_uid']);
+ $avatar =$user->user_avatar();
+ if ($avatar!='blank.gif') {
+ $avatarURL = XOOPS_URL."/uploads/".$avatar;
+ } else {
+ $avatarURL = XOOPS_URL."/modules/xim/images/default_avatar.png";
+ }
+
+ // testing if avatar really exists physically on server
+ if (file_exists("../../uploads/".$avatar)) {
+ } else {
+ $avatarURL = XOOPS_URL."/modules/xim/images/default_avatar.png";
+ }
+
+
+ $config = im_Getconfig($onlines[$i]['online_uname']);
+ $status = $config['status'];
+ $userid=$onlines[$i]['online_uid'];
+ $username = $onlines[$i]['online_uname'];
+ if ($status == 3) {
+ $count = $count - 1;
+ }
+ if ($status != 3) {
+ $userlist .= '{"id":"'.$userid.'","n":"'.$username.'","a":"'.$avatarURL.'","status":'.$status.'},';
+ }
+ }
}
-$userlist = substr($userlist, 0, -1);
- }
- header('Content-type: application/json');
- echo "{\"total\":$count, \"users\":[$userlist]}";
+ $userlist = substr($userlist, 0, -1);
+ header('Content-type: application/json');
+ echo "{\"total\":$count, \"users\":[$userlist]}";
+ } else {
+ header('Content-type: application/json');
+ echo "{\"total\":\"0\", \"users\":\"\"}";
+ }
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-13 03:45:55
|
Revision: 8948
http://xoops.svn.sourceforge.net/xoops/?rev=8948&view=rev
Author: djculex
Date: 2012-02-13 03:45:49 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
function sanitize missing in functions.php ??
Modified Paths:
--------------
XoopsModules/xim/releases/1.02/modules/xim/include/functions.php
XoopsModules/xim/trunk/modules/xim/include/functions.php
Modified: XoopsModules/xim/releases/1.02/modules/xim/include/functions.php
===================================================================
--- XoopsModules/xim/releases/1.02/modules/xim/include/functions.php 2012-02-13 03:32:51 UTC (rev 8947)
+++ XoopsModules/xim/releases/1.02/modules/xim/include/functions.php 2012-02-13 03:45:49 UTC (rev 8948)
@@ -124,4 +124,15 @@
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;
+ }
?>
\ No newline at end of file
Modified: XoopsModules/xim/trunk/modules/xim/include/functions.php
===================================================================
--- XoopsModules/xim/trunk/modules/xim/include/functions.php 2012-02-13 03:32:51 UTC (rev 8947)
+++ XoopsModules/xim/trunk/modules/xim/include/functions.php 2012-02-13 03:45:49 UTC (rev 8948)
@@ -124,4 +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;
+ }
+
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-16 12:22:21
|
Revision: 9001
http://xoops.svn.sourceforge.net/xoops/?rev=9001&view=rev
Author: djculex
Date: 2012-02-16 12:22:10 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
missing ; in line 45
Modified Paths:
--------------
XoopsModules/xim/releases/1.02/modules/xim/chat.php
XoopsModules/xim/trunk/modules/xim/chat.php
Modified: XoopsModules/xim/releases/1.02/modules/xim/chat.php
===================================================================
--- XoopsModules/xim/releases/1.02/modules/xim/chat.php 2012-02-15 15:41:59 UTC (rev 9000)
+++ XoopsModules/xim/releases/1.02/modules/xim/chat.php 2012-02-16 12:22:10 UTC (rev 9001)
@@ -41,7 +41,7 @@
**/
include 'header.php';
-require_once XOOPS_ROOT_PATH."/modules/xim/include/functions.php"
+require_once XOOPS_ROOT_PATH."/modules/xim/include/functions.php";
global $xoopsLogger;
$xoopsLogger->activated = false;
Modified: XoopsModules/xim/trunk/modules/xim/chat.php
===================================================================
--- XoopsModules/xim/trunk/modules/xim/chat.php 2012-02-15 15:41:59 UTC (rev 9000)
+++ XoopsModules/xim/trunk/modules/xim/chat.php 2012-02-16 12:22:10 UTC (rev 9001)
@@ -41,7 +41,7 @@
**/
include 'header.php';
-require_once XOOPS_ROOT_PATH."/modules/xim/include/functions.php"
+require_once XOOPS_ROOT_PATH."/modules/xim/include/functions.php";
global $xoopsLogger;
$xoopsLogger->activated = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-20 06:40:51
|
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.
|
|
From: <dj...@us...> - 2012-02-25 17:17:06
|
Revision: 9059
http://xoops.svn.sourceforge.net/xoops/?rev=9059&view=rev
Author: djculex
Date: 2012-02-25 17:16:59 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
- General check
- Including new doUpdate function using socket, fileC
- Moving reset configs to after footerbar is created
- Setting random number to end of ajaxfiles to prevent caching
Modified Paths:
--------------
XoopsModules/xim/releases/1.02/modules/xim/chat.php
XoopsModules/xim/releases/1.02/modules/xim/class/adminclass.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/class/adminclass.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-25 04:13:53 UTC (rev 9058)
+++ XoopsModules/xim/releases/1.02/modules/xim/chat.php 2012-02-25 17:16:59 UTC (rev 9059)
@@ -41,7 +41,7 @@
**/
include 'header.php';
-include_once XOOPS_ROOT_PATH.'/modules/xim/include/functions.php';
+require_once XOOPS_ROOT_PATH."/modules/xim/include/functions.php";
global $xoopsLogger;
$xoopsLogger->activated = false;
@@ -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/class/adminclass.php
===================================================================
--- XoopsModules/xim/releases/1.02/modules/xim/class/adminclass.php 2012-02-25 04:13:53 UTC (rev 9058)
+++ XoopsModules/xim/releases/1.02/modules/xim/class/adminclass.php 2012-02-25 17:16:59 UTC (rev 9059)
@@ -234,24 +234,27 @@
// Variable $version = current xim version number
// return csv file with (version, description, status, downloadUrl)
-function doCheckUpdate () {
- $version = $this->ModuleInstallVersion ();
- $critical = FALSE;
- $update = FALSE;
- $rt = '';
+function doCheckUpdate ()
+{
+ $version = $this->ModuleInstallVersion ();
+ $critical = false;
+ $update = false;
+ $rt = '';
$url = "http://www.culex.dk/updates/xim_version.csv";
- $fileC = file_get_contents($url);
- $read = explode(";", $fileC);
+ $fileC = $this->fetchURL($url, array('fopen', 'curl', 'socket'));
+ $read = explode(";", $fileC);
$upd_img = '../images/upd_ok.png';
- if ($read[0] > $version && $read[2] == "1") {
- $critical = TRUE;
+
+ if ($read[0] > $version && $read[2] == "1") {
+ $critical = true;
$upd_img = '../images/upd_critical.png';
}
if ($read[0] > $version && $read[2] != "1") {
- $update = TRUE;
+ $update = true;
$upd_img = '../images/upd_normal.png';
}
+
if ($critical) {
$rt = "<div class='xim_update'><span class='xim_update_header'><img class='xim_upd_img' src='".$upd_img."' />"._AM_XIM_UPDATE_CRITICAL_UPD."</span></div></p>";
$rt .="<textarea class='xim_update_changelog'>".$read[1]."</textarea><br /><br />";
@@ -265,6 +268,91 @@
}
return $rt;
}
+
+/**
+ * Fetch content of comma separated text file
+ * will attempt to use the fopen method first, then curl, then socket
+ * @param string $url
+ * @param array $methods
+ * @returns string
+ */
+function fetchURL($url, $methods = array('fopen', 'curl', 'socket'))
+{
+ /**
+ * December 21st 2010, Mathew Tinsley (ti...@ti...)
+ * http://tinsology.net
+ *
+ * To the extent possible under law, Mathew Tinsley has waived all copyright and related or
+ * neighboring rights to this work. There's absolutely no warranty.
+ */
+ if (gettype($methods) == 'string') {
+ $methods = array($methods);
+ } elseif (!is_array($methods)) {
+ return false;
+ }
+ foreach ($methods as $method) {
+ switch ($method) {
+ case 'fopen':
+ //uses file_get_contents in place of fopen
+ //allow_url_fopen must still be enabled
+ if (ini_get('allow_url_fopen')) {
+ $contents = file_get_contents($url);
+ if ($contents !== false) {
+ return $contents;
+ }
+ }
+ break;
+ case 'curl':
+ if (function_exists('curl_init')) {
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_URL, $url);
+ curl_setopt($ch, CURLOPT_HEADER, 0);
+ // return the value instead of printing the response to browser
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ $result = curl_exec($ch);
+ curl_close($ch);
+ //return curl_exec($ch);
+ return $result;
+ }
+ break;
+ case 'socket':
+ //make sure the url contains a protocol, otherwise $parts['host'] won't be set
+ if (strpos($url, 'http://') !== 0 && strpos($url, 'https://') !== 0) {
+ $url = 'http://' . $url;
+ }
+ $parts = parse_url($url);
+ if ($parts['scheme'] == 'https') {
+ $target = 'ssl://' . $parts['host'];
+ $port = isset($parts['port']) ? $parts['port'] : 443;
+ } else {
+ $target = $parts['host'];
+ $port = isset($parts['port']) ? $parts['port'] : 80;
+ }
+ $page = isset($parts['path']) ? $parts['path'] : '';
+ $page .= isset($parts['query']) ? '?' . $parts['query'] : '';
+ $page .= isset($parts['fragment']) ? '#' . $parts['fragment'] : '';
+ $page = ($page == '') ? '/' : $page;
+ if ($fp = fsockopen($target, $port, $errno, $errstr, 15)) {
+ $headers = "GET $page HTTP/1.1\r\n";
+ $headers .= "Host: {$parts['host']}\r\n";
+ $headers .= "Connection: Close\r\n\r\n";
+ if (fwrite($fp, $headers)) {
+ $resp = '';
+ //while not eof and an error does not occur when calling fgets
+ while (!feof($fp) && ($curr = fgets($fp, 128)) !== false) {
+ $resp .= $curr;
+ }
+ if (isset($curr) && $curr !== false) {
+ return substr(strstr($resp, "\r\n\r\n"), 3);
+ }
+ }
+ fclose($fp);
+ }
+ break;
+ }
+ }
+ return false;
+}
// flatten multidimentional arrays to one dimentional
function flatten($array) {
Modified: XoopsModules/xim/releases/1.02/modules/xim/include/functions.php
===================================================================
--- XoopsModules/xim/releases/1.02/modules/xim/include/functions.php 2012-02-25 04:13:53 UTC (rev 9058)
+++ XoopsModules/xim/releases/1.02/modules/xim/include/functions.php 2012-02-25 17:16:59 UTC (rev 9059)
@@ -124,16 +124,16 @@
return $retval;
}
- 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);
+ 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;
+ }
- 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-25 04:13:53 UTC (rev 9058)
+++ XoopsModules/xim/releases/1.02/modules/xim/js/chat.js 2012-02-25 17:16:59 UTC (rev 9059)
@@ -42,7 +42,6 @@
});
xoops_im(document).ready(function(){
-createFooterBar();
// if exists zetagenesis toolbar do hide it to not overlap 2 toolbars
xoops_im('#xo-footerstatic').hide();
originalTitle = document.title;
@@ -258,8 +257,7 @@
}
function startChatSession(){
- reSetConf();
- updateUserList();
+ createFooterBar();
if (showFooterBar==1) {
setTimeout('updateUserList()',200);
}
@@ -294,6 +292,7 @@
xoops_im("#MBchatbox_"+chatboxID+" .mbcontainercontent").scrollTop(xoops_im("#MBchatbox_"+chatboxID+" .mbcontainercontent")[0].scrollHeight);
setTimeout('xoops_im("#MBchatbox_"+chatboxID+" .mbcontainercontent").scrollTop(xoops_im("#MBchatbox_"+chatboxID+" .mbcontainercontent")[0].scrollHeight);', 100); // yet another strange ie bug
}
+ reSetConf();
setTimeout('chatHeartbeat();',chatHeartbeatTime);
}});
@@ -521,8 +520,9 @@
// Function to reset sound & Status select:Selected in forms after send and in pagerefresh
function reSetConf() {
var data;
+ var xim_RandNumGenerate = Math.floor(Math.random()*101);
xoops_im.ajax({
- url: xim_url+"getmystats.php",
+ url: xim_url+"getmystats.php?chk="+xim_RandNumGenerate,
cache: false,
dataType: "json",
success: function(data) {
@@ -530,7 +530,7 @@
xoops_im("select[name=status] option[value="+data.uss+"]").attr("selected", true);
xoops_im("select[name=soundf] option[value="+data.uso+"]").attr("selected", true);
xoops_im("select[name=statusf] option[value="+data.uss+"]").attr("selected", true);
- }
- });
+ }
+ });
return;
}
Modified: XoopsModules/xim/trunk/modules/xim/chat.php
===================================================================
--- XoopsModules/xim/trunk/modules/xim/chat.php 2012-02-25 04:13:53 UTC (rev 9058)
+++ XoopsModules/xim/trunk/modules/xim/chat.php 2012-02-25 17:16:59 UTC (rev 9059)
@@ -41,7 +41,7 @@
**/
include 'header.php';
-include_once XOOPS_ROOT_PATH.'/modules/xim/include/functions.php';
+require_once XOOPS_ROOT_PATH."/modules/xim/include/functions.php";
global $xoopsLogger;
$xoopsLogger->activated = false;
@@ -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/class/adminclass.php
===================================================================
--- XoopsModules/xim/trunk/modules/xim/class/adminclass.php 2012-02-25 04:13:53 UTC (rev 9058)
+++ XoopsModules/xim/trunk/modules/xim/class/adminclass.php 2012-02-25 17:16:59 UTC (rev 9059)
@@ -234,24 +234,27 @@
// Variable $version = current xim version number
// return csv file with (version, description, status, downloadUrl)
-function doCheckUpdate () {
- $version = $this->ModuleInstallVersion ();
- $critical = FALSE;
- $update = FALSE;
- $rt = '';
+function doCheckUpdate ()
+{
+ $version = $this->ModuleInstallVersion ();
+ $critical = false;
+ $update = false;
+ $rt = '';
$url = "http://www.culex.dk/updates/xim_version.csv";
- $fileC = file_get_contents($url);
- $read = explode(";", $fileC);
+ $fileC = $this->fetchURL($url, array('fopen', 'curl', 'socket'));
+ $read = explode(";", $fileC);
$upd_img = '../images/upd_ok.png';
- if ($read[0] > $version && $read[2] == "1") {
- $critical = TRUE;
+
+ if ($read[0] > $version && $read[2] == "1") {
+ $critical = true;
$upd_img = '../images/upd_critical.png';
}
if ($read[0] > $version && $read[2] != "1") {
- $update = TRUE;
+ $update = true;
$upd_img = '../images/upd_normal.png';
}
+
if ($critical) {
$rt = "<div class='xim_update'><span class='xim_update_header'><img class='xim_upd_img' src='".$upd_img."' />"._AM_XIM_UPDATE_CRITICAL_UPD."</span></div></p>";
$rt .="<textarea class='xim_update_changelog'>".$read[1]."</textarea><br /><br />";
@@ -265,6 +268,91 @@
}
return $rt;
}
+
+/**
+ * Fetch content of comma separated text file
+ * will attempt to use the fopen method first, then curl, then socket
+ * @param string $url
+ * @param array $methods
+ * @returns string
+ */
+function fetchURL($url, $methods = array('fopen', 'curl', 'socket'))
+{
+ /**
+ * December 21st 2010, Mathew Tinsley (ti...@ti...)
+ * http://tinsology.net
+ *
+ * To the extent possible under law, Mathew Tinsley has waived all copyright and related or
+ * neighboring rights to this work. There's absolutely no warranty.
+ */
+ if (gettype($methods) == 'string') {
+ $methods = array($methods);
+ } elseif (!is_array($methods)) {
+ return false;
+ }
+ foreach ($methods as $method) {
+ switch ($method) {
+ case 'fopen':
+ //uses file_get_contents in place of fopen
+ //allow_url_fopen must still be enabled
+ if (ini_get('allow_url_fopen')) {
+ $contents = file_get_contents($url);
+ if ($contents !== false) {
+ return $contents;
+ }
+ }
+ break;
+ case 'curl':
+ if (function_exists('curl_init')) {
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_URL, $url);
+ curl_setopt($ch, CURLOPT_HEADER, 0);
+ // return the value instead of printing the response to browser
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ $result = curl_exec($ch);
+ curl_close($ch);
+ //return curl_exec($ch);
+ return $result;
+ }
+ break;
+ case 'socket':
+ //make sure the url contains a protocol, otherwise $parts['host'] won't be set
+ if (strpos($url, 'http://') !== 0 && strpos($url, 'https://') !== 0) {
+ $url = 'http://' . $url;
+ }
+ $parts = parse_url($url);
+ if ($parts['scheme'] == 'https') {
+ $target = 'ssl://' . $parts['host'];
+ $port = isset($parts['port']) ? $parts['port'] : 443;
+ } else {
+ $target = $parts['host'];
+ $port = isset($parts['port']) ? $parts['port'] : 80;
+ }
+ $page = isset($parts['path']) ? $parts['path'] : '';
+ $page .= isset($parts['query']) ? '?' . $parts['query'] : '';
+ $page .= isset($parts['fragment']) ? '#' . $parts['fragment'] : '';
+ $page = ($page == '') ? '/' : $page;
+ if ($fp = fsockopen($target, $port, $errno, $errstr, 15)) {
+ $headers = "GET $page HTTP/1.1\r\n";
+ $headers .= "Host: {$parts['host']}\r\n";
+ $headers .= "Connection: Close\r\n\r\n";
+ if (fwrite($fp, $headers)) {
+ $resp = '';
+ //while not eof and an error does not occur when calling fgets
+ while (!feof($fp) && ($curr = fgets($fp, 128)) !== false) {
+ $resp .= $curr;
+ }
+ if (isset($curr) && $curr !== false) {
+ return substr(strstr($resp, "\r\n\r\n"), 3);
+ }
+ }
+ fclose($fp);
+ }
+ break;
+ }
+ }
+ return false;
+}
// flatten multidimentional arrays to one dimentional
function flatten($array) {
Modified: XoopsModules/xim/trunk/modules/xim/include/functions.php
===================================================================
--- XoopsModules/xim/trunk/modules/xim/include/functions.php 2012-02-25 04:13:53 UTC (rev 9058)
+++ XoopsModules/xim/trunk/modules/xim/include/functions.php 2012-02-25 17:16:59 UTC (rev 9059)
@@ -124,17 +124,16 @@
return $retval;
}
- 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;
+ 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;
}
?>
\ 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-25 04:13:53 UTC (rev 9058)
+++ XoopsModules/xim/trunk/modules/xim/js/chat.js 2012-02-25 17:16:59 UTC (rev 9059)
@@ -42,7 +42,6 @@
});
xoops_im(document).ready(function(){
-createFooterBar();
// if exists zetagenesis toolbar do hide it to not overlap 2 toolbars
xoops_im('#xo-footerstatic').hide();
originalTitle = document.title;
@@ -258,8 +257,7 @@
}
function startChatSession(){
- reSetConf();
- updateUserList();
+ createFooterBar();
if (showFooterBar==1) {
setTimeout('updateUserList()',200);
}
@@ -294,6 +292,7 @@
xoops_im("#MBchatbox_"+chatboxID+" .mbcontainercontent").scrollTop(xoops_im("#MBchatbox_"+chatboxID+" .mbcontainercontent")[0].scrollHeight);
setTimeout('xoops_im("#MBchatbox_"+chatboxID+" .mbcontainercontent").scrollTop(xoops_im("#MBchatbox_"+chatboxID+" .mbcontainercontent")[0].scrollHeight);', 100); // yet another strange ie bug
}
+ reSetConf();
setTimeout('chatHeartbeat();',chatHeartbeatTime);
}});
@@ -521,8 +520,9 @@
// Function to reset sound & Status select:Selected in forms after send and in pagerefresh
function reSetConf() {
var data;
+ var xim_RandNumGenerate = Math.floor(Math.random()*101);
xoops_im.ajax({
- url: xim_url+"getmystats.php",
+ url: xim_url+"getmystats.php?chk="+xim_RandNumGenerate,
cache: false,
dataType: "json",
success: function(data) {
@@ -530,7 +530,7 @@
xoops_im("select[name=status] option[value="+data.uss+"]").attr("selected", true);
xoops_im("select[name=soundf] option[value="+data.uso+"]").attr("selected", true);
xoops_im("select[name=statusf] option[value="+data.uss+"]").attr("selected", true);
- }
- });
+ }
+ });
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-03-07 03:58:23
|
Revision: 9104
http://xoops.svn.sourceforge.net/xoops/?rev=9104&view=rev
Author: djculex
Date: 2012-03-07 03:58:13 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
- Bugfix: function in preloads to define xoops_path to eighter http://www.domain or http://domain
- Bugfix: No output from footer unless defined to show
Modified Paths:
--------------
XoopsModules/xim/releases/1.02/modules/xim/class/adminclass.php
XoopsModules/xim/releases/1.02/modules/xim/include/functions.php
XoopsModules/xim/releases/1.02/modules/xim/js/chat.js
XoopsModules/xim/releases/1.02/modules/xim/preloads/core.php
XoopsModules/xim/trunk/modules/xim/class/adminclass.php
XoopsModules/xim/trunk/modules/xim/include/functions.php
XoopsModules/xim/trunk/modules/xim/js/chat.js
XoopsModules/xim/trunk/modules/xim/preloads/core.php
Modified: XoopsModules/xim/releases/1.02/modules/xim/class/adminclass.php
===================================================================
--- XoopsModules/xim/releases/1.02/modules/xim/class/adminclass.php 2012-03-07 03:53:13 UTC (rev 9103)
+++ XoopsModules/xim/releases/1.02/modules/xim/class/adminclass.php 2012-03-07 03:58:13 UTC (rev 9104)
@@ -236,6 +236,7 @@
function doCheckUpdate ()
{
+ global $pathIcon16;
$version = $this->ModuleInstallVersion ();
$critical = false;
$update = false;
Modified: XoopsModules/xim/releases/1.02/modules/xim/include/functions.php
===================================================================
--- XoopsModules/xim/releases/1.02/modules/xim/include/functions.php 2012-03-07 03:53:13 UTC (rev 9103)
+++ XoopsModules/xim/releases/1.02/modules/xim/include/functions.php 2012-03-07 03:58:13 UTC (rev 9104)
@@ -135,5 +135,18 @@
$text = str_replace("\"", "'", $text);
return $text;
}
-
+
+ /**
+ * @Get url of smallworld
+ * @returns string
+ */
+ function xim_getHostRequest()
+ {
+ $protocol = strpos(strtolower($_SERVER['SERVER_PROTOCOL']),'https') === FALSE ? 'http' : 'https';
+ $host = $_SERVER['HTTP_HOST'];
+ $script = $_SERVER['SCRIPT_NAME'];
+ $params = $_SERVER['QUERY_STRING'];
+ $currentUrl = $protocol . '://' . $host;
+ return $currentUrl;
+ }
?>
\ 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-03-07 03:53:13 UTC (rev 9103)
+++ XoopsModules/xim/releases/1.02/modules/xim/js/chat.js 2012-03-07 03:58:13 UTC (rev 9104)
@@ -35,11 +35,10 @@
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(){
// if exists zetagenesis toolbar do hide it to not overlap 2 toolbars
@@ -257,7 +256,9 @@
}
function startChatSession(){
+ if (showFooterBar !== 0) {
createFooterBar();
+ }
if (showFooterBar==1) {
setTimeout('updateUserList()',200);
}
Modified: XoopsModules/xim/releases/1.02/modules/xim/preloads/core.php
===================================================================
--- XoopsModules/xim/releases/1.02/modules/xim/preloads/core.php 2012-03-07 03:53:13 UTC (rev 9103)
+++ XoopsModules/xim/releases/1.02/modules/xim/preloads/core.php 2012-03-07 03:58:13 UTC (rev 9104)
@@ -22,7 +22,7 @@
* @author Culex - homepage.: http://culex.dk & email.: cu...@cu...
**/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
+include_once(XOOPS_ROOT_PATH."/modules/xim/include/functions.php");
class XimCorePreload extends XoopsPreloadItem{
function eventCoreHeaderAddmeta(){
@@ -79,7 +79,12 @@
$xoTheme->addScript(XOOPS_URL.'/modules/xim/js/jquery.metadata.js');
- $xoops_url= XOOPS_URL;
+ // Check if request url is with www or without
+ $urltest = xim_getHostRequest();
+ $xoops_url = XOOPS_URL;
+ if (!strstr($urltest, 'www.')) {
+ $xoops_url = str_replace( 'www.', '', $xoops_url );
+ }
$script= <<<SCRIPT
var xoops_url="$xoops_url";
var xim_url="$xoops_url/modules/xim/";
Modified: XoopsModules/xim/trunk/modules/xim/class/adminclass.php
===================================================================
--- XoopsModules/xim/trunk/modules/xim/class/adminclass.php 2012-03-07 03:53:13 UTC (rev 9103)
+++ XoopsModules/xim/trunk/modules/xim/class/adminclass.php 2012-03-07 03:58:13 UTC (rev 9104)
@@ -236,6 +236,7 @@
function doCheckUpdate ()
{
+ global $pathIcon16;
$version = $this->ModuleInstallVersion ();
$critical = false;
$update = false;
Modified: XoopsModules/xim/trunk/modules/xim/include/functions.php
===================================================================
--- XoopsModules/xim/trunk/modules/xim/include/functions.php 2012-03-07 03:53:13 UTC (rev 9103)
+++ XoopsModules/xim/trunk/modules/xim/include/functions.php 2012-03-07 03:58:13 UTC (rev 9104)
@@ -135,5 +135,18 @@
$text = str_replace("\"", "'", $text);
return $text;
}
-
+
+ /**
+ * @Get url of smallworld
+ * @returns string
+ */
+ function xim_getHostRequest()
+ {
+ $protocol = strpos(strtolower($_SERVER['SERVER_PROTOCOL']),'https') === FALSE ? 'http' : 'https';
+ $host = $_SERVER['HTTP_HOST'];
+ $script = $_SERVER['SCRIPT_NAME'];
+ $params = $_SERVER['QUERY_STRING'];
+ $currentUrl = $protocol . '://' . $host;
+ return $currentUrl;
+ }
?>
\ No newline at end of file
Modified: XoopsModules/xim/trunk/modules/xim/js/chat.js
===================================================================
--- XoopsModules/xim/trunk/modules/xim/js/chat.js 2012-03-07 03:53:13 UTC (rev 9103)
+++ XoopsModules/xim/trunk/modules/xim/js/chat.js 2012-03-07 03:58:13 UTC (rev 9104)
@@ -35,11 +35,10 @@
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(){
// if exists zetagenesis toolbar do hide it to not overlap 2 toolbars
@@ -257,7 +256,9 @@
}
function startChatSession(){
+ if (showFooterBar !== 0) {
createFooterBar();
+ }
if (showFooterBar==1) {
setTimeout('updateUserList()',200);
}
Modified: XoopsModules/xim/trunk/modules/xim/preloads/core.php
===================================================================
--- XoopsModules/xim/trunk/modules/xim/preloads/core.php 2012-03-07 03:53:13 UTC (rev 9103)
+++ XoopsModules/xim/trunk/modules/xim/preloads/core.php 2012-03-07 03:58:13 UTC (rev 9104)
@@ -22,7 +22,7 @@
* @author Culex - homepage.: http://culex.dk & email.: cu...@cu...
**/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
+include_once(XOOPS_ROOT_PATH."/modules/xim/include/functions.php");
class XimCorePreload extends XoopsPreloadItem{
function eventCoreHeaderAddmeta(){
@@ -79,7 +79,12 @@
$xoTheme->addScript(XOOPS_URL.'/modules/xim/js/jquery.metadata.js');
- $xoops_url= XOOPS_URL;
+ // Check if request url is with www or without
+ $urltest = xim_getHostRequest();
+ $xoops_url = XOOPS_URL;
+ if (!strstr($urltest, 'www.')) {
+ $xoops_url = str_replace( 'www.', '', $xoops_url );
+ }
$script= <<<SCRIPT
var xoops_url="$xoops_url";
var xim_url="$xoops_url/modules/xim/";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X