Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9104] XoopsModules/xim
|
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.
|
