tabs in settings: General, Optional Services; "Changes saved" panel; fix title messages order

git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@250 c66351dc-e62f-0410-b875-e3a5c0b9693f

src/messenger/webim/install/view_index.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("install.title") ?>
+	<?php echo getlocal("install.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">

src/messenger/webim/install/view_installerr.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("install.err.title") ?>
+	<?php echo getlocal("install.err.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">

src/messenger/webim/libs/settings.php

@@ -0,0 +1,37 @@
+<?php
+/*
+ * This file is part of Web Instant Messenger project.
+ *
+ * Copyright (c) 2005-2008 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Evgeny Gryaznov - initial API and implementation
+ */
+
+function update_settings() {
+	global $settings, $settings_in_db;
+	$link = connect();
+	foreach ($settings as $key => $value) {
+		if(!isset($settings_in_db[$key])) {
+			perform_query("insert into chatconfig (vckey) values ('$key')",$link);
+		}
+        $query = sprintf("update chatconfig set vcvalue='%s' where vckey='$key'", mysql_real_escape_string($value));
+		perform_query($query,$link);
+	}
+
+	mysql_close($link);
+}
+
+function setup_settings_tabs($active) {
+	global $page, $webimroot;
+	$page['tabs'] = array(
+		getlocal("page_settings.tab.main") => $active != 0 ? "$webimroot/operator/settings.php" : "",
+		getlocal("page_settings.tab.features") => $active != 1 ? "$webimroot/operator/features.php" : "",
+	);
+}
+
+?>

src/messenger/webim/locales/en/properties

@@ -88,6 +88,7 @@ errors.prefix=<li class="error">
 errors.required=Please fill "{0}".  
 errors.suffix=</li>
 errors.wrong_field=Please fill "{0}" correctly.  
+features.saved=Features activated
 form.field.address.description=Ex: 12.23.45.123 or todo.com
 form.field.address=Visitor's Address
 form.field.agent_commonname.description=This name will be seen by your visitors.
@@ -245,6 +246,8 @@ page_login.remember=Remember
 page_login.title=Login
 page_search.intro=Search for chat history of a specified user or a specified phrase in a message.
 page_settings.intro=Specify options affecting chat window and common system behavior
+page_settings.tab.features=Optional Services
+page_settings.tab.main=General
 pending.table.ban=Ban the visitor
 pending.table.head.contactid=Visitor's address
 pending.table.head.etc=Misc
@@ -279,6 +282,7 @@ settings.host=URL of your website
 settings.logo.description=Enter http address of your company logo
 settings.logo=Your company logo
 settings.no.title=Please enter your company title
+settings.saved=Changes saved
 settings.title=Messenger settings
 settings.usercanchangename.description=Turn off to hide edit box from chat window
 settings.usercanchangename=Allows users to change their names

src/messenger/webim/locales/ru/properties

@@ -88,6 +88,7 @@ errors.prefix=<li class="error">
 errors.required=Заполните поле "{0}".  
 errors.suffix=</li>
 errors.wrong_field=Неправильно заполнено поле "{0}"
+features.saved=Íàáîð ñåðâèñîâ èçìåíåí
 form.field.address.description=Например: 12.23.45.123 или relay.info.ru
 form.field.address=Адрес посетителя
 form.field.agent_commonname.description=Под этим именем Вас увидят ваши посетители из других стран.
@@ -245,6 +246,8 @@ page_login.remember=
 page_login.title=Вход в систему
 page_search.intro=На данной странице можно осуществить поиск диалогов по имени пользователя или фразе, встречающейся в сообщении.
 page_settings.intro=Здесь вы можете задать опции влияющие на отображение чат окна и общее поведение системы 
+page_settings.tab.features=Äîïîëíèòåëüíûå ñåðâèñû
+page_settings.tab.main=Îáùåå
 pending.table.ban=Пометить посетителя как нежелательного
 pending.table.head.contactid=Адрес посетителя
 pending.table.head.etc=Разное
@@ -272,13 +275,14 @@ settings.enableban.description=
 settings.enableban=Включить функцию "Нежелательные посетители"
 settings.geolink.description=На любом IP адресе можно будет открыть небольшое окно с геоинформацией. Можно использовать {ip}.
 settings.geolink=Ссылка на внешний geolocation сервис
-settings.geolinkparams.description=Ðàçìåð îêíà è íàëè÷èå òóëáàðîâ 
+settings.geolinkparams.description=Ðàçìåð îêíà è íàëè÷èå òóëáàðîâ
 settings.geolinkparams=Опции для окна с геоинформацией
 settings.host.description=Будет открываться по нажатию на логотип или название компании в чат окне
 settings.host=Ссылка на ваш веб сайт
 settings.logo.description=Введите ссылку на логотип компании
 settings.logo=Лого компании
 settings.no.title=Введите имя Вашей компании
+settings.saved=Èçìåíåíèÿ ñîõðàíåíû
 settings.title=Настройки мессенджера
 settings.usercanchangename.description=Возможность убрать поле смены имени из чат окна
 settings.usercanchangename=Разрешить посетителям менять имена

src/messenger/webim/operator/features.php

@@ -0,0 +1,52 @@
+<?php
+/*
+ * This file is part of Web Instant Messenger project.
+ *
+ * Copyright (c) 2005-2008 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Evgeny Gryaznov - initial API and implementation
+ */
+
+require_once('../libs/common.php');
+require_once('../libs/operator.php');
+require_once('../libs/settings.php');
+
+$operator = check_login();
+
+$page = array('agentId' => '');
+$errors = array();
+
+$options = array('enableban', 'usercanchangename');
+
+loadsettings();
+$params = array();
+foreach($options as $opt) {
+	$params[$opt] = $settings[$opt];
+}
+
+if (isset($_POST['sent'])) {
+    $params['enableban'] = verifyparam("enableban","/^on$/", "") == "on" ? "1" : "0";
+    $params['usercanchangename'] = verifyparam("usercanchangename", "/^on$/", "") == "on" ? "1" : "0";
+
+	foreach($options as $opt) {
+		$settings[$opt] = $params[$opt];
+	}
+    update_settings();
+    header("Location: $webimroot/operator/features.php?stored");
+    exit;
+}
+
+$page['operator']  = topage(get_operator_name($operator));
+$page['formenableban'] = $params['enableban'] == "1";
+$page['formusercanchangename'] = $params['usercanchangename'] == "1";
+$page['stored'] = isset($_GET['stored']);
+
+setup_settings_tabs(1);
+start_html_output();
+require('../view/features.php');
+?>

src/messenger/webim/operator/settings.php

@@ -14,23 +14,10 @@
 
 require_once('../libs/common.php');
 require_once('../libs/operator.php');
+require_once('../libs/settings.php');
 
 $operator = check_login();
 
-function update_settings() {
-	global $settings, $settings_in_db;
-	$link = connect();
-	foreach ($settings as $key => $value) {
-		if(!isset($settings_in_db[$key])) {
-			perform_query("insert into chatconfig (vckey) values ('$key')",$link);
-		}
-        $query = sprintf("update chatconfig set vcvalue='%s' where vckey='$key'", mysql_real_escape_string($value));
-		perform_query($query,$link);
-	}
-
-	mysql_close($link);
-}
-
 $page = array('agentId' => '');
 $errors = array();
 
@@ -46,7 +33,7 @@ if($handle = opendir($stylesfolder)) {
 }
 
 $options = array(
-		'email', 'title', 'logo', 'hosturl', 'enableban', 'usernamepattern', 'usercanchangename',
+		'email', 'title', 'logo', 'hosturl', 'usernamepattern',
 		'chatstyle', 'chattitle', 'geolink', 'geolinkparams');
 
 loadsettings();
@@ -60,9 +47,7 @@ if (isset($_POST['email']) && isset($_POST['title']) && isset($_POST['logo'])) {
     $params['title'] = getparam('title');
     $params['logo']  = getparam('logo');
     $params['hosturl'] = getparam('hosturl');
-    $params['enableban'] = verifyparam("enableban","/^on$/", "") == "on" ? "1" : "0";
     $params['usernamepattern'] = getparam('usernamepattern');
-    $params['usercanchangename'] = verifyparam("usercanchangename", "/^on$/", "") == "on" ? "1" : "0";
     $params['chattitle'] = getparam('chattitle');
     $params['geolink'] = getparam('geolink');
 	$params['geolinkparams'] = getparam('geolinkparams');
@@ -89,7 +74,7 @@ if (isset($_POST['email']) && isset($_POST['title']) && isset($_POST['logo'])) {
 			$settings[$opt] = $params[$opt];
 		}
     	update_settings();
-        header("Location: $webimroot/operator/index.php");
+        header("Location: $webimroot/operator/settings.php?stored");
         exit;
     }
 }
@@ -101,13 +86,13 @@ $page['formlogo']  = topage($params['logo']);
 $page['formhosturl']  = topage($params['hosturl']);
 $page['formgeolink'] = topage($params['geolink']);
 $page['formgeolinkparams'] = topage($params['geolinkparams']);
-$page['formenableban'] = $params['enableban'] == "1";
 $page['formusernamepattern'] = topage($params['usernamepattern']);
-$page['formusercanchangename'] = $params['usercanchangename'] == "1";
 $page['formchatstyle'] = $params['chatstyle'];
 $page['formchattitle'] = topage($params['chattitle']);
 $page['availableStyles'] = $stylelist;
+$page['stored'] = isset($_GET['stored']);
 
+setup_settings_tabs(0);
 start_html_output();
 require('../view/settings.php');
 ?>

src/messenger/webim/styles.css

@@ -334,4 +334,13 @@ input.submit {
 
 .firstmessage a:hover {
 	color: #8a6a6a;
-}
+}
+
+#formmessage {
+	border: 1px solid #4C96D4;
+	background-color: #E7F1F9;
+	padding: 8px 11px;
+	font-size: 11px; font-weight:bold;
+	width : 400px;
+	margin: 5px 2px;
+}

src/messenger/webim/view/agent.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("page_agent.title") ?>
+	<?php echo getlocal("page_agent.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">
@@ -74,7 +74,7 @@
 <?php if($page['tabs']) { ?>
 <tr><td align="right" style="padding-right:16px;"><table cellspacing="0" cellpadding="0" border="0"><tr><?php foreach($page['tabs'] as $k => $v) { if($v) { ?><td class="textform" style="padding: 2px 9px 3px 9px;"><a href="<?php echo $v ?>"><?php echo $k ?></a></td><?php } else { ?><td class="textform" background="<?php echo $webimroot ?>/images/loginbg.gif" style="border-left:1px solid #bbbbbb;border-top:1px solid #bbbbbb;border-right:1px solid #bbbbbb;padding: 2px 9px 3px 9px;"><?php echo $k ?></td><?php }} ?></tr></table></td></tr>
 <?php } ?>
-<tr><td background='<?php echo $webimroot ?>/images/loginbg.gif'><table cellspacing='0' cellpadding='0' border='0'><tr><td><img src='<?php echo $webimroot ?>/images/logincrnlt.gif' width='16' height='16' border='0' alt=''></td><td></td><td><img src='<?php echo $webimroot ?>/images/logincrnrt.gif' width='16' height='16' border='0' alt=''></td></tr><tr><td></td><td align='center'><table border='0' cellspacing='0' cellpadding='0'>
+<tr><td background='<?php echo $webimroot ?>/images/loginbg.gif'><table cellspacing='0' cellpadding='0' border='0'><tr><td><img src='<?php echo $webimroot ?>/images/logincrnlt.gif' width='16' height='16' border='0' alt=''></td><td></td><td><img src='<?php echo $webimroot ?>/images/logincrnrt.gif' width='16' height='16' border='0' alt=''></td></tr><tr><td></td><td align='center'><table border='0' cellspacing='0' cellpadding='0' width="700">
 		<tr><td class='formauth'><?php echo getlocal('form.field.login') ?><b><font class='red'>*</font></b></td><td width='10'><img width='10' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'></td><td></td></tr><tr><td height='2' colspan='3'></td></tr><tr><td>
 			<input type="text" name="login" size="40" value="<?php echo form_value('login') ?>" class="formauth"/>
 		</td><td></td><td class='formauth'><span class='formdescr'> &mdash; <?php echo getlocal('form.field.login.description') ?></span></td></tr><tr><td colspan='3' height='10'></td></tr>

src/messenger/webim/view/agents.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("page_agents.title") ?>
+	<?php echo getlocal("page_agents.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">

src/messenger/webim/view/avatar.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("page_avatar.title") ?>
+	<?php echo getlocal("page_avatar.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">
@@ -70,7 +70,7 @@
 <?php if($page['tabs']) { ?>
 <tr><td align="right" style="padding-right:16px;"><table cellspacing="0" cellpadding="0" border="0"><tr><?php foreach($page['tabs'] as $k => $v) { if($v) { ?><td class="textform" style="padding: 2px 9px 3px 9px;"><a href="<?php echo $v ?>"><?php echo $k ?></a></td><?php } else { ?><td class="textform" background="<?php echo $webimroot ?>/images/loginbg.gif" style="border-left:1px solid #bbbbbb;border-top:1px solid #bbbbbb;border-right:1px solid #bbbbbb;padding: 2px 9px 3px 9px;"><?php echo $k ?></td><?php }} ?></tr></table></td></tr>
 <?php } ?>
-<tr><td background='<?php echo $webimroot ?>/images/loginbg.gif'><table cellspacing='0' cellpadding='0' border='0'><tr><td><img src='<?php echo $webimroot ?>/images/logincrnlt.gif' width='16' height='16' border='0' alt=''></td><td></td><td><img src='<?php echo $webimroot ?>/images/logincrnrt.gif' width='16' height='16' border='0' alt=''></td></tr><tr><td></td><td align='center'><table border='0' cellspacing='0' cellpadding='0'>
+<tr><td background='<?php echo $webimroot ?>/images/loginbg.gif'><table cellspacing='0' cellpadding='0' border='0'><tr><td><img src='<?php echo $webimroot ?>/images/logincrnlt.gif' width='16' height='16' border='0' alt=''></td><td></td><td><img src='<?php echo $webimroot ?>/images/logincrnrt.gif' width='16' height='16' border='0' alt=''></td></tr><tr><td></td><td align='center'><table border='0' cellspacing='0' cellpadding='0' width="700">
 		<tr>
 			<td class="formauth" colspan="3">
 				<b><?php echo $page['currentop'] ?></b>

src/messenger/webim/view/ban.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("page_ban.title") ?>
+	<?php echo getlocal("page_ban.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">

src/messenger/webim/view/blocked_visitors.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("page_bans.title") ?>
+	<?php echo getlocal("page_bans.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">

src/messenger/webim/view/features.php

@@ -0,0 +1,101 @@
+<?php
+/*
+ * This file is part of Web Instant Messenger project.
+ *
+ * Copyright (c) 2005-2008 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Evgeny Gryaznov - initial API and implementation
+ */
+?>
+<html>
+<head>
+
+
+
+<link rel="stylesheet" type="text/css" media="all" href="<?php echo $webimroot ?>/styles.css" />
+
+
+<link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
+<title>
+	<?php echo getlocal("settings.title") ?> - <?php echo getlocal("app.title") ?>
+</title>
+
+<meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">
+<meta http-equiv="description" content="<?php echo getlocal("page.main_layout.meta_description") ?>">
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000" link="#2971C1" vlink="#2971C1" alink="#2971C1">
+
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+<tr>
+<td valign="top" class="text">
+
+ <table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td align="left" valign="top">
+		<h1><?php echo getlocal("settings.title") ?></h1>
+ </td><td align="right" class="text" valign="top"><table cellspacing="0" cellpadding="0" border="0"><tr><td class="textform"><?php echo getlocal2("menu.operator",array($page['operator'])) ?></td><td class="textform"><img src='<?php echo $webimroot ?>/images/topdiv.gif' width="25" height="15" border="0" alt="|" /></td><td class="textform"><a href="<?php echo $webimroot ?>/operator/index.php" title="<?php echo getlocal("menu.main") ?>"><?php echo getlocal("menu.main") ?></a></td></tr></table></td></tr></table>
+
+
+	<?php echo getlocal("page_settings.intro") ?>
+<br />
+<br />
+<?php if( isset($errors) && count($errors) > 0 ) { ?>
+		<table cellspacing="0" cellpadding="0" border="0">
+		<tr>
+	    <td valign="top"><img src='<?php echo $webimroot ?>/images/icon_err.gif' width="40" height="40" border="0" alt="" /></td>
+	    <td width="10"></td>
+	    <td class="text">
+		    <?php	if( isset($errors) && count($errors) > 0 ) {
+		print getlocal("errors.header");
+		foreach( $errors as $e ) {
+			print getlocal("errors.prefix");
+			print $e;
+			print getlocal("errors.suffix");
+		}
+		print getlocal("errors.footer");
+	} ?>
+
+		</td>
+		</tr>
+		</table>
+	<?php } ?>
+<?php if( $page['stored'] ) { ?>
+<div id="formmessage"><?php echo getlocal("features.saved") ?></div>
+<?php } ?>
+
+<form name="features" method="post" action="<?php echo $webimroot ?>/operator/features.php">
+<input type="hidden" name="sent" value="true"/>
+	<table cellspacing='0' cellpadding='0' border='0'>
+<?php if($page['tabs']) { ?>
+<tr><td align="right" style="padding-right:16px;"><table cellspacing="0" cellpadding="0" border="0"><tr><?php foreach($page['tabs'] as $k => $v) { if($v) { ?><td class="textform" style="padding: 2px 9px 3px 9px;"><a href="<?php echo $v ?>"><?php echo $k ?></a></td><?php } else { ?><td class="textform" background="<?php echo $webimroot ?>/images/loginbg.gif" style="border-left:1px solid #bbbbbb;border-top:1px solid #bbbbbb;border-right:1px solid #bbbbbb;padding: 2px 9px 3px 9px;"><?php echo $k ?></td><?php }} ?></tr></table></td></tr>
+<?php } ?>
+<tr><td background='<?php echo $webimroot ?>/images/loginbg.gif'><table cellspacing='0' cellpadding='0' border='0'><tr><td><img src='<?php echo $webimroot ?>/images/logincrnlt.gif' width='16' height='16' border='0' alt=''></td><td></td><td><img src='<?php echo $webimroot ?>/images/logincrnrt.gif' width='16' height='16' border='0' alt=''></td></tr><tr><td></td><td align='center'><table border='0' cellspacing='0' cellpadding='0' width="700">
+		<tr><td class='formauth'><?php echo getlocal('settings.usercanchangename') ?></td><td width='10'><img width='10' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'></td><td></td></tr><tr><td height='2' colspan='3'></td></tr><tr><td>
+			<input type="checkbox" name="usercanchangename" value="on"<?php echo form_value_cb('usercanchangename') ? " checked=\"checked\"" : "" ?>/>
+		</td><td></td><td class='formauth'><span class='formdescr'> &mdash; <?php echo getlocal('settings.usercanchangename.description') ?></span></td></tr><tr><td colspan='3' height='10'></td></tr>
+
+		<tr><td class='formauth'><?php echo getlocal('settings.enableban') ?></td><td width='10'><img width='10' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'></td><td></td></tr><tr><td height='2' colspan='3'></td></tr><tr><td>
+			<input type="checkbox" name="enableban" value="on"<?php echo form_value_cb('enableban') ? " checked=\"checked\"" : "" ?>/>
+		</td><td></td><td class='formauth'><span class='formdescr'> &mdash; <?php echo getlocal('settings.enableban.description') ?></span></td></tr><tr><td colspan='3' height='10'></td></tr>
+
+		<tr><td colspan='3' height='20'></td></tr><tr><td colspan='3' background='<?php echo $webimroot ?>/images/formline.gif'><img src='<?php echo $webimroot ?>/images/formline.gif' width='1' height='2' border='0' alt=''></td></tr><tr><td colspan='3' height='10'></td></tr>
+		<tr>
+			<td class="formauth" colspan="3">
+				<input type="image" name="" src='<?php echo $webimroot.getlocal("image.button.save") ?>' border="0" alt='<?php echo getlocal("button.save") ?>'/>
+			</td>
+		</tr>
+
+	</table></td><td></td></tr><tr><td><img src='<?php echo $webimroot ?>/images/logincrnlb.gif' width='16' height='16' border='0' alt=''></td><td></td><td><img src='<?php echo $webimroot ?>/images/logincrnrb.gif' width='16' height='16' border='0' alt=''></td></tr></table></td></tr></table>
+</form>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+

src/messenger/webim/view/gen_button.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("page.gen_button.title") ?>
+	<?php echo getlocal("page.gen_button.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">

src/messenger/webim/view/login.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("page_login.title") ?>
+	<?php echo getlocal("page_login.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">

src/messenger/webim/view/menu.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("topMenu.admin") ?>
+	<?php echo getlocal("topMenu.admin") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">

src/messenger/webim/view/pending_users.php

@@ -34,7 +34,7 @@ var updaterOptions = {
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("clients.title") ?>
+	<?php echo getlocal("clients.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">

src/messenger/webim/view/permissions.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("permissions.title") ?>
+	<?php echo getlocal("permissions.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">
@@ -70,7 +70,7 @@
 <?php if($page['tabs']) { ?>
 <tr><td align="right" style="padding-right:16px;"><table cellspacing="0" cellpadding="0" border="0"><tr><?php foreach($page['tabs'] as $k => $v) { if($v) { ?><td class="textform" style="padding: 2px 9px 3px 9px;"><a href="<?php echo $v ?>"><?php echo $k ?></a></td><?php } else { ?><td class="textform" background="<?php echo $webimroot ?>/images/loginbg.gif" style="border-left:1px solid #bbbbbb;border-top:1px solid #bbbbbb;border-right:1px solid #bbbbbb;padding: 2px 9px 3px 9px;"><?php echo $k ?></td><?php }} ?></tr></table></td></tr>
 <?php } ?>
-<tr><td background='<?php echo $webimroot ?>/images/loginbg.gif'><table cellspacing='0' cellpadding='0' border='0'><tr><td><img src='<?php echo $webimroot ?>/images/logincrnlt.gif' width='16' height='16' border='0' alt=''></td><td></td><td><img src='<?php echo $webimroot ?>/images/logincrnrt.gif' width='16' height='16' border='0' alt=''></td></tr><tr><td></td><td align='center'><table border='0' cellspacing='0' cellpadding='0'>
+<tr><td background='<?php echo $webimroot ?>/images/loginbg.gif'><table cellspacing='0' cellpadding='0' border='0'><tr><td><img src='<?php echo $webimroot ?>/images/logincrnlt.gif' width='16' height='16' border='0' alt=''></td><td></td><td><img src='<?php echo $webimroot ?>/images/logincrnrt.gif' width='16' height='16' border='0' alt=''></td></tr><tr><td></td><td align='center'><table border='0' cellspacing='0' cellpadding='0' width="700">
 		<tr>
 			<td class="formauth" colspan="3">
 				<b><?php echo $page['currentop'] ?></b>

src/messenger/webim/view/preview.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("page.preview.title") ?>
+	<?php echo getlocal("page.preview.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">

src/messenger/webim/view/settings.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("settings.title") ?>
+	<?php echo getlocal("settings.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">
@@ -63,9 +63,16 @@
 		</tr>
 		</table>
 	<?php } ?>
+<?php if( $page['stored'] ) { ?>
+<div id="formmessage"><?php echo getlocal("settings.saved") ?></div>
+<?php } ?>
 
 <form name="settings" method="post" action="<?php echo $webimroot ?>/operator/settings.php">
-	<table cellspacing='0' cellpadding='0' border='0'><tr><td background='<?php echo $webimroot ?>/images/loginbg.gif'><table cellspacing='0' cellpadding='0' border='0'><tr><td><img src='<?php echo $webimroot ?>/images/logincrnlt.gif' width='16' height='16' border='0' alt=''></td><td></td><td><img src='<?php echo $webimroot ?>/images/logincrnrt.gif' width='16' height='16' border='0' alt=''></td></tr><tr><td></td><td align='center'><table border='0' cellspacing='0' cellpadding='0'>
+	<table cellspacing='0' cellpadding='0' border='0'>
+<?php if($page['tabs']) { ?>
+<tr><td align="right" style="padding-right:16px;"><table cellspacing="0" cellpadding="0" border="0"><tr><?php foreach($page['tabs'] as $k => $v) { if($v) { ?><td class="textform" style="padding: 2px 9px 3px 9px;"><a href="<?php echo $v ?>"><?php echo $k ?></a></td><?php } else { ?><td class="textform" background="<?php echo $webimroot ?>/images/loginbg.gif" style="border-left:1px solid #bbbbbb;border-top:1px solid #bbbbbb;border-right:1px solid #bbbbbb;padding: 2px 9px 3px 9px;"><?php echo $k ?></td><?php }} ?></tr></table></td></tr>
+<?php } ?>
+<tr><td background='<?php echo $webimroot ?>/images/loginbg.gif'><table cellspacing='0' cellpadding='0' border='0'><tr><td><img src='<?php echo $webimroot ?>/images/logincrnlt.gif' width='16' height='16' border='0' alt=''></td><td></td><td><img src='<?php echo $webimroot ?>/images/logincrnrt.gif' width='16' height='16' border='0' alt=''></td></tr><tr><td></td><td align='center'><table border='0' cellspacing='0' cellpadding='0' width="700">
 		<tr><td class='formauth'><?php echo getlocal('settings.email') ?></td><td width='10'><img width='10' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'></td><td></td></tr><tr><td height='2' colspan='3'></td></tr><tr><td>
 			<input type="text" name="email" size="40" value="<?php echo form_value('email') ?>" class="formauth"/>
 		</td><td></td><td class='formauth'><span class='formdescr'> &mdash; <?php echo getlocal('settings.email.description') ?></span></td></tr><tr><td colspan='3' height='10'></td></tr>
@@ -102,18 +109,10 @@
 			<select name="chatstyle" ><?php foreach($page['availableStyles'] as $k) { echo "<option value=\"".$k."\"".($k == form_value("chatstyle") ? " selected=\"selected\"" : "").">".$k."</option>"; } ?></select>
 		</td><td></td><td class='formauth'><span class='formdescr'> &mdash; <?php echo getlocal('settings.chatstyle.description') ?></span></td></tr><tr><td colspan='3' height='10'></td></tr>
 
-		<tr><td class='formauth'><?php echo getlocal('settings.usercanchangename') ?></td><td width='10'><img width='10' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'></td><td></td></tr><tr><td height='2' colspan='3'></td></tr><tr><td>
-			<input type="checkbox" name="usercanchangename" value="on"<?php echo form_value_cb('usercanchangename') ? " checked=\"checked\"" : "" ?>/>
-		</td><td></td><td class='formauth'><span class='formdescr'> &mdash; <?php echo getlocal('settings.usercanchangename.description') ?></span></td></tr><tr><td colspan='3' height='10'></td></tr>
-
-		<tr><td class='formauth'><?php echo getlocal('settings.enableban') ?></td><td width='10'><img width='10' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'></td><td></td></tr><tr><td height='2' colspan='3'></td></tr><tr><td>
-			<input type="checkbox" name="enableban" value="on"<?php echo form_value_cb('enableban') ? " checked=\"checked\"" : "" ?>/>
-		</td><td></td><td class='formauth'><span class='formdescr'> &mdash; <?php echo getlocal('settings.enableban.description') ?></span></td></tr><tr><td colspan='3' height='10'></td></tr>
-
 		<tr><td colspan='3' height='20'></td></tr><tr><td colspan='3' background='<?php echo $webimroot ?>/images/formline.gif'><img src='<?php echo $webimroot ?>/images/formline.gif' width='1' height='2' border='0' alt=''></td></tr><tr><td colspan='3' height='10'></td></tr>
 		<tr>
 			<td class="formauth" colspan="3">
-			        <input type="image" name="" src='<?php echo $webimroot.getlocal("image.button.save") ?>' border="0" alt='<?php echo getlocal("button.save") ?>'/>
+				<input type="image" name="" src='<?php echo $webimroot.getlocal("image.button.save") ?>' border="0" alt='<?php echo getlocal("button.save") ?>'/>
 			</td>
 		</tr>
 

src/messenger/webim/view/thread_log.php

@@ -23,7 +23,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("thread.chat_log") ?>
+	<?php echo getlocal("thread.chat_log") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">

src/messenger/webim/view/thread_search.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("page_analysis.search.title") ?>
+	<?php echo getlocal("page_analysis.search.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">

src/messenger/webim/view/translate.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("page.translate.title") ?>
+	<?php echo getlocal("page.translate.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">

src/messenger/webim/view/translatelist.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("page.translate.title") ?>
+	<?php echo getlocal("page.translate.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">

src/messenger/webim/view/userhistory.php

@@ -22,7 +22,7 @@
 
 <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
 <title>
-	<?php echo getlocal("app.title") ?>	- <?php echo getlocal("page.analysis.userhistory.title") ?>
+	<?php echo getlocal("page.analysis.userhistory.title") ?> - <?php echo getlocal("app.title") ?>
 </title>
 
 <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">