From 835eaabf06d249c88016946d2485562b7cdfc2c3 Mon Sep 17 00:00:00 2001 From: Evgeny Gryaznov Date: Mon, 29 Sep 2008 16:47:06 +0000 Subject: [PATCH] minor: spaces, comments git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@110 c66351dc-e62f-0410-b875-e3a5c0b9693f --- src/messenger/webim/INSTALL.txt | 9 +++++---- src/messenger/webim/INSTALL_RUS.txt | 7 ++++--- src/messenger/webim/client.php | 4 +--- src/messenger/webim/index.php | 19 ++++++++++++++++++- src/messenger/webim/mail.php | 2 +- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/messenger/webim/INSTALL.txt b/src/messenger/webim/INSTALL.txt index e36e4414..4820e897 100644 --- a/src/messenger/webim/INSTALL.txt +++ b/src/messenger/webim/INSTALL.txt @@ -1,10 +1,11 @@ -Web Instant Messenger 1.0.10 +Web Instant Messenger Copyright (c) 2005-2008 Web Messenger Creators Community. -This program and the accompanying materials are made available under -the terms of the License which accompanies this distribution, -and is available at http://webim.ru/license.html +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 +http://www.eclipse.org/legal/epl-v10.html REQUIREMENTS diff --git a/src/messenger/webim/INSTALL_RUS.txt b/src/messenger/webim/INSTALL_RUS.txt index 69e393f1..1563e929 100644 --- a/src/messenger/webim/INSTALL_RUS.txt +++ b/src/messenger/webim/INSTALL_RUS.txt @@ -1,9 +1,10 @@ -Web Instant Messenger 1.0.10 +Web Instant Messenger Copyright (c) 2005-2008 сообщество разработчиков Web Messenger. -Данное программное обеспечение и сопутствующие материалы подпадают под -условия лицензии доступной по адресу http://webim.ru/license.html +Все права защищены. Данное программное обеспечение и сопутствующие материалы +подпадают под условия Eclipse Public License v1.0, доступной по адресу +http://www.eclipse.org/legal/epl-v10.html СИСТЕМНЫЕ ТРЕБОВАНИЯ diff --git a/src/messenger/webim/client.php b/src/messenger/webim/client.php index 8e801f6d..9003c2a0 100644 --- a/src/messenger/webim/client.php +++ b/src/messenger/webim/client.php @@ -29,7 +29,7 @@ if( !isset($_GET['token']) || !isset($_GET['thread']) ) { require('view/chat_leavemsg.php'); exit; } - + $referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : ""; $extAddr = $_SERVER['REMOTE_ADDR']; $remoteHost = isset($_SERVER['REMOTE_HOST']) ? $_SERVER['REMOTE_HOST'] : $extAddr; @@ -57,8 +57,6 @@ if( !$thread || !isset($thread['ltoken']) || $token != $thread['ltoken'] ) { die("wrong thread"); } -//$level = "simple"; - setup_chatview_for_user($thread, $level); start_html_output(); diff --git a/src/messenger/webim/index.php b/src/messenger/webim/index.php index 8d22b8ee..3798eed3 100644 --- a/src/messenger/webim/index.php +++ b/src/messenger/webim/index.php @@ -1 +1,18 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/messenger/webim/mail.php b/src/messenger/webim/mail.php index f883e297..48b35054 100644 --- a/src/messenger/webim/mail.php +++ b/src/messenger/webim/mail.php @@ -53,7 +53,7 @@ foreach( $output as $msg ) { } $subject = getstring("mail.user.history.subject"); -$body = getstring2("mail.user.history.body", array($thread['userName'],$history) ); +$body = getstring2("mail.user.history.body", array($thread['userName'],$history) ); webim_mail($email, $webim_from_email, $subject, $body);