From e03a40d160682d73874c997463139575b88b4d23 Mon Sep 17 00:00:00 2001 From: Evgeny Gryaznov Date: Tue, 13 Jan 2009 21:57:49 +0000 Subject: [PATCH] [1.5.1] update from branch git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@314 c66351dc-e62f-0410-b875-e3a5c0b9693f --- src/messenger/webim/INSTALL.txt | 18 +++++++++--------- src/messenger/webim/INSTALL_RUS.txt | 2 +- src/messenger/webim/button.php | 4 ++-- src/messenger/webim/client.php | 2 +- src/messenger/webim/index.php | 2 +- src/messenger/webim/leavemessage.php | 2 +- src/messenger/webim/mail.php | 2 +- src/messenger/webim/thread.php | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/messenger/webim/INSTALL.txt b/src/messenger/webim/INSTALL.txt index 910752d4..2945b0c7 100644 --- a/src/messenger/webim/INSTALL.txt +++ b/src/messenger/webim/INSTALL.txt @@ -1,6 +1,6 @@ Open Web Messenger -Copyright (c) 2005-2008 Web Messenger Creators Community. +Copyright (c) 2005-2009 Web Messenger Creators Community. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 @@ -36,11 +36,11 @@ The owner should have all rights on the folder /webim/images/avatar UPDATE - 1. Backup your /webim/libs/config.php - 2. Backup your /webim/images/avatar folder. - 3. Delete the items in the webim folder on the server. - 4. Upload all the files contained in the downloaded archive (retaining the directory structure) into webim folder. - 5. Re-edit the MySQL database settings you config.php - 6. Visit http:///webim/install/ and follow the instructions to update database (if needed). - 7. Remove /webim/install/ directory from your server - 8. Restore contents of /webim/images/avatar folder. \ No newline at end of file +1. Backup your /webim/libs/config.php +2. Backup your /webim/images/avatar folder. +3. Delete the items in the webim folder on the server. +4. Upload all the files contained in the downloaded archive (retaining the directory structure) into webim folder. +5. Re-edit the MySQL database settings you config.php +6. Visit http:///webim/install/ and follow the instructions to update database (if needed). +7. Remove /webim/install/ directory from your server +8. Restore contents of /webim/images/avatar folder. \ No newline at end of file diff --git a/src/messenger/webim/INSTALL_RUS.txt b/src/messenger/webim/INSTALL_RUS.txt index ab3b1e54..63d72608 100644 --- a/src/messenger/webim/INSTALL_RUS.txt +++ b/src/messenger/webim/INSTALL_RUS.txt @@ -1,6 +1,6 @@ Open Web Messenger -Copyright (c) 2005-2008 сообщество разработчиков Web Messenger. +Copyright (c) 2005-2009 сообщество разработчиков Web Messenger. Все права защищены. Данное программное обеспечение и сопутствующие материалы подпадают под условия Eclipse Public License v1.0, доступной по адресу diff --git a/src/messenger/webim/button.php b/src/messenger/webim/button.php index 6770b2e1..8847c044 100644 --- a/src/messenger/webim/button.php +++ b/src/messenger/webim/button.php @@ -2,7 +2,7 @@ /* * This file is part of Web Instant Messenger project. * - * Copyright (c) 2005-2008 Web Messenger Community + * Copyright (c) 2005-2009 Web Messenger Community * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,7 +17,7 @@ require_once('libs/operator.php'); $image = verifyparam("image","/^\w+$/", "webim"); $lang = verifyparam(isset($_GET['language']) ? "language" : "lang", "/^[\w-]{2,5}$/", ""); -if(!$lang || !in_array($lang,$available_locales)) { +if(!$lang || !locale_exists($lang)) { $lang = $current_locale; } diff --git a/src/messenger/webim/client.php b/src/messenger/webim/client.php index 585f0be4..7f7b7ae2 100644 --- a/src/messenger/webim/client.php +++ b/src/messenger/webim/client.php @@ -2,7 +2,7 @@ /* * This file is part of Web Instant Messenger project. * - * Copyright (c) 2005-2008 Web Messenger Community + * Copyright (c) 2005-2009 Web Messenger Community * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/src/messenger/webim/index.php b/src/messenger/webim/index.php index 62a87c42..ecb49f9e 100644 --- a/src/messenger/webim/index.php +++ b/src/messenger/webim/index.php @@ -2,7 +2,7 @@ /* * This file is part of Web Instant Messenger project. * - * Copyright (c) 2005-2008 Web Messenger Community + * Copyright (c) 2005-2009 Web Messenger Community * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/src/messenger/webim/leavemessage.php b/src/messenger/webim/leavemessage.php index 50ac27e7..790f17e0 100644 --- a/src/messenger/webim/leavemessage.php +++ b/src/messenger/webim/leavemessage.php @@ -2,7 +2,7 @@ /* * This file is part of Web Instant Messenger project. * - * Copyright (c) 2005-2008 Web Messenger Community + * Copyright (c) 2005-2009 Web Messenger Community * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/src/messenger/webim/mail.php b/src/messenger/webim/mail.php index 3eacfbdb..bddcc6ac 100644 --- a/src/messenger/webim/mail.php +++ b/src/messenger/webim/mail.php @@ -2,7 +2,7 @@ /* * This file is part of Web Instant Messenger project. * - * Copyright (c) 2005-2008 Web Messenger Community + * Copyright (c) 2005-2009 Web Messenger Community * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/src/messenger/webim/thread.php b/src/messenger/webim/thread.php index 0705ebbe..16c364c9 100644 --- a/src/messenger/webim/thread.php +++ b/src/messenger/webim/thread.php @@ -2,7 +2,7 @@ /* * This file is part of Web Instant Messenger project. * - * Copyright (c) 2005-2008 Web Messenger Community + * Copyright (c) 2005-2009 Web Messenger Community * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at