From b15d39fd97caf4c55e6e9a230282baae24c584e5 Mon Sep 17 00:00:00 2001
From: Evgeny Gryaznov <inspirer@users.sourceforge.net>
Date: Wed, 4 Jun 2008 23:35:11 +0000
Subject: [PATCH] [1983764] get rid of potentially bad constructions

git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@99 c66351dc-e62f-0410-b875-e3a5c0b9693f
---
 src/webim/install/dbperform.php | 2 +-
 src/webim/install/whatsnew.txt  | 3 +++
 src/webim/libs/common.php       | 2 +-
 src/webim/operator/agent.php    | 2 +-
 src/webim/operator/login.php    | 2 +-
 src/webim/operator/logout.php   | 4 +---
 src/webim/operator/operator.php | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/webim/install/dbperform.php b/src/webim/install/dbperform.php
index 94236e46..3d57350e 100644
--- a/src/webim/install/dbperform.php
+++ b/src/webim/install/dbperform.php
@@ -91,6 +91,6 @@ if($act == "createdb") {
 }
 
 mysql_close($link);
-header("Location: ".dirname($_SERVER['PHP_SELF'])."/index.php");
+header("Location: $webimroot/install/index.php");
 exit;
 ?>
\ No newline at end of file
diff --git a/src/webim/install/whatsnew.txt b/src/webim/install/whatsnew.txt
index 2ce54509..9cc1185a 100644
--- a/src/webim/install/whatsnew.txt
+++ b/src/webim/install/whatsnew.txt
@@ -4,11 +4,14 @@
   
   [+] Number of messages from visitor in history
   [+] State "loading" (means user is still loading his window)
+  [+] Timers on peding users page are ticking now
   [!] Company logo link target is now an option in config
   [!] Mail encoding fixed (separate option)
   [!] Operator/user locale is stored in cookie
   [!] localized dates
   [!] fixed installing on DB with numeric name
+  [!] empty and double messages
+  [!] #1983764
 
   1.0.9
   -----
diff --git a/src/webim/libs/common.php b/src/webim/libs/common.php
index f9afb65d..3fd0bf19 100644
--- a/src/webim/libs/common.php
+++ b/src/webim/libs/common.php
@@ -17,7 +17,7 @@ session_start();
 require_once(dirname(__FILE__).'/converter.php');
 require_once(dirname(__FILE__).'/config.php');
 
-$version = 'v1.0.10/pre1';
+$version = 'v1.0.10';
 
 function myiconv($in_enc, $out_enc, $string) {
 	global $_utf8win1251, $_win1251utf8;
diff --git a/src/webim/operator/agent.php b/src/webim/operator/agent.php
index 4fb82857..c03bb727 100644
--- a/src/webim/operator/agent.php
+++ b/src/webim/operator/agent.php
@@ -34,7 +34,7 @@ if( !isset($_GET['token']) ) {
     take_thread($thread,$operator);
 
     $token = $thread['ltoken'];
-    header("Location: ".$_SERVER['PHP_SELF']."?thread=$threadid&token=$token");
+    header("Location: $webimroot/operator/agent.php?thread=$threadid&token=$token");
     exit;
 }
 
diff --git a/src/webim/operator/login.php b/src/webim/operator/login.php
index 97ca7fb3..a20c899a 100644
--- a/src/webim/operator/login.php
+++ b/src/webim/operator/login.php
@@ -26,7 +26,7 @@ if( isset($_POST['login']) && isset($_POST['password']) ) {
 
 		$target = isset($_SESSION['backpath']) 
 				? $_SESSION['backpath'] 
-				: dirname($_SERVER['PHP_SELF'])."/index.php";
+				: "$webimroot/operator/index.php";
 		
         login_operator($operator,$remember);
 		header("Location: $target");
diff --git a/src/webim/operator/logout.php b/src/webim/operator/logout.php
index d1d4b655..f78786c2 100644
--- a/src/webim/operator/logout.php
+++ b/src/webim/operator/logout.php
@@ -17,8 +17,6 @@ require_once('../libs/operator.php');
 
 logout_operator();
 
-$target = dirname($_SERVER['PHP_SELF'])."/login.php";
-header("Location: $target");
+header("Location: $webimroot/operator/login.php");
 exit;
-
 ?>
\ No newline at end of file
diff --git a/src/webim/operator/operator.php b/src/webim/operator/operator.php
index 14e3b673..e1418141 100644
--- a/src/webim/operator/operator.php
+++ b/src/webim/operator/operator.php
@@ -59,7 +59,7 @@ if( isset($_POST['login']) && isset($_POST['password']) ) {
 		} else {
 		    update_operator($agentId,$login,$password,$localname,$commonname);
 		}
-		header("Location: ".dirname($_SERVER['PHP_SELF'])."/operators.php");
+		header("Location: $webimroot/operator/operators.php");
 		exit;
 	} else {
 		$page['formlogin'] = topage($login);