[1.5.1] update from branch

git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@314 c66351dc-e62f-0410-b875-e3a5c0b9693f
This commit is contained in:
Evgeny Gryaznov 2009-01-13 21:57:49 +00:00
parent ad865cb2e4
commit e03a40d160
8 changed files with 17 additions and 17 deletions

View File

@ -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://<yourdomain>/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.
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://<yourdomain>/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.

View File

@ -1,6 +1,6 @@
Open Web Messenger
Copyright (c) 2005-2008 сообщество разработчиков Web Messenger.
Copyright (c) 2005-2009 сообщество разработчиков Web Messenger.
Все права защищены. Данное программное обеспечение и сопутствующие материалы
подпадают под условия Eclipse Public License v1.0, доступной по адресу

View File

@ -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;
}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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