From 8188c730b4691c512404f3a565f6537cf9f100c9 Mon Sep 17 00:00:00 2001
From: Evgeny Gryaznov <inspirer@users.sourceforge.net>
Date: Tue, 13 Oct 2009 21:02:06 +0000
Subject: [PATCH] -> 1.6.3

git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@691 c66351dc-e62f-0410-b875-e3a5c0b9693f
---
 src/messenger/pack.pl                    |  2 +-
 src/messenger/webim/VERSION              |  2 +-
 src/messenger/webim/install/whatsnew.txt |  7 +++++++
 src/messenger/webim/js/source/build.xml  |  2 +-
 src/messenger/webim/libs/common.php      |  4 ++--
 src/messenger/webim/locales/names/level1 |  1 -
 src/messenger/webim/locales/names/level2 | 20 ++++++++++++++++++++
 7 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/messenger/pack.pl b/src/messenger/pack.pl
index 9e09f7e4..ddfe2c9a 100755
--- a/src/messenger/pack.pl
+++ b/src/messenger/pack.pl
@@ -5,7 +5,7 @@
 ##################################################################
 
 $targetFolder = "deploy";
-$suffix = "162";
+$suffix = "163";
 
 ##################################################################
 # Copies tree into target folder, preprocess .phps
diff --git a/src/messenger/webim/VERSION b/src/messenger/webim/VERSION
index b063f0fb..40208a80 100644
--- a/src/messenger/webim/VERSION
+++ b/src/messenger/webim/VERSION
@@ -1 +1 @@
-Mibew/1.6.2
\ No newline at end of file
+Mibew/1.6.3
\ No newline at end of file
diff --git a/src/messenger/webim/install/whatsnew.txt b/src/messenger/webim/install/whatsnew.txt
index 5b16aaa7..e72dc60d 100644
--- a/src/messenger/webim/install/whatsnew.txt
+++ b/src/messenger/webim/install/whatsnew.txt
@@ -1,3 +1,10 @@
+  1.6.3
+  -----
+  [+] password restore functionality for agent
+  [!] button code conflicts with spam filters and mod_security
+  [!] compatibility with PHP 5.3.0
+  [!] new domain: mibew.org
+ 
   1.6.2
   -----
   [+] bi-licensed: EPL / GPL
diff --git a/src/messenger/webim/js/source/build.xml b/src/messenger/webim/js/source/build.xml
index 5a63e010..4690c653 100644
--- a/src/messenger/webim/js/source/build.xml
+++ b/src/messenger/webim/js/source/build.xml
@@ -3,7 +3,7 @@
 
 <project basedir="." default="update" name="Obfuscator">
   <property name="obfuscator.location" value="." />
-  <property name="webim.location" value="../162" />
+  <property name="webim.location" value="../163" />
 
   <target name="update" depends="build">
     <java classname="JSO" fork="true" error="${obfuscator.location}/bin/obfuscation.log">
diff --git a/src/messenger/webim/libs/common.php b/src/messenger/webim/libs/common.php
index e1d0648c..d2945950 100644
--- a/src/messenger/webim/libs/common.php
+++ b/src/messenger/webim/libs/common.php
@@ -24,8 +24,8 @@ session_start();
 require_once(dirname(__FILE__).'/converter.php');
 require_once(dirname(__FILE__).'/config.php');
 
-$version = '1.6.2';
-$jsver = "162";
+$version = '1.6.3';
+$jsver = "163";
 
 function myiconv($in_enc, $out_enc, $string) {
 	global $_utf8win1251, $_win1251utf8;
diff --git a/src/messenger/webim/locales/names/level1 b/src/messenger/webim/locales/names/level1
index beacbdc3..2a6ac745 100644
--- a/src/messenger/webim/locales/names/level1
+++ b/src/messenger/webim/locales/names/level1
@@ -26,7 +26,6 @@ chat.wait
 chat.window.chatting_with
 chat.window.close_title
 chat.window.poweredby
-chat.window.poweredreftext
 chat.window.predefined.select_answer
 chat.window.product_name
 chat.window.send_message
diff --git a/src/messenger/webim/locales/names/level2 b/src/messenger/webim/locales/names/level2
index 6ceba3f3..bfc36012 100644
--- a/src/messenger/webim/locales/names/level2
+++ b/src/messenger/webim/locales/names/level2
@@ -68,6 +68,8 @@ form.field.ban_comment
 form.field.ban_comment.description
 form.field.ban_days
 form.field.ban_days.description
+form.field.password
+form.field.password_confirm
 image.button.login
 image.button.save
 image.button.search
@@ -89,6 +91,8 @@ menu.profile.content
 menu.translate
 menu.updates
 menu.updates.content
+my_settings.error.password_match
+no_such_operator
 page.analysis.search.head_browser
 page.analysis.search.head_group
 page.analysis.search.head_host
@@ -147,6 +151,22 @@ report.byoperator.4
 report.byoperator.title
 report.no_items
 report.total
+resetpwd.changed
+resetpwd.changed.title
+resetpwd.intro
+resetpwd.login
+resetpwd.submit
+resetpwd.title
+restore.back_to_login
+restore.emailorlogin
+restore.intro
+restore.mailsubj
+restore.mailtext
+restore.pwd.message
+restore.sent
+restore.sent.title
+restore.submit
+restore.title
 right.administration
 right.main
 right.other