From c053bfe28358a6786bbe37943e2dd94c286689bd Mon Sep 17 00:00:00 2001
From: Evgeny Gryaznov <egryaznov@gmail.com>
Date: Thu, 7 Apr 2011 00:52:03 +0200
Subject: [PATCH] removed .iml; modern tabs on group settings pages;
 beautifying code

---
 src/messenger/messenger.iml                  | 10 ----------
 src/messenger/webim/js/source/common.js      |  2 +-
 src/messenger/webim/libs/chat.php            |  8 ++++----
 src/messenger/webim/libs/groups.php          |  5 +++--
 src/messenger/webim/view/agent.php           |  1 +
 src/messenger/webim/view/avatar.php          |  1 +
 src/messenger/webim/view/features.php        |  1 +
 src/messenger/webim/view/getcode_image.php   |  1 +
 src/messenger/webim/view/getcode_text.php    |  1 +
 src/messenger/webim/view/group.php           | 12 +++---------
 src/messenger/webim/view/groupmembers.php    | 12 +++---------
 src/messenger/webim/view/operator_groups.php |  1 +
 src/messenger/webim/view/performance.php     |  1 +
 src/messenger/webim/view/permissions.php     |  1 +
 src/messenger/webim/view/settings.php        |  1 +
 src/messenger/webim/view/themes.php          |  1 +
 16 files changed, 24 insertions(+), 35 deletions(-)
 delete mode 100644 src/messenger/messenger.iml

diff --git a/src/messenger/messenger.iml b/src/messenger/messenger.iml
deleted file mode 100644
index ef582b1a..00000000
--- a/src/messenger/messenger.iml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
diff --git a/src/messenger/webim/js/source/common.js b/src/messenger/webim/js/source/common.js
index c8e30312..d3c571e1 100755
--- a/src/messenger/webim/js/source/common.js
+++ b/src/messenger/webim/js/source/common.js
@@ -15,7 +15,7 @@
 
 //- localized
 
-//- onComplete
+//- onComplete, showonline
 //- threadParams, servl, frequency, user, threadid, token, cssfile
 //- updaterOptions, url, company, agentservl, noclients, wroot, havemenu, showpopup, ignorectrl, istatus
 
diff --git a/src/messenger/webim/libs/chat.php b/src/messenger/webim/libs/chat.php
index 8944e47a..6b458afe 100644
--- a/src/messenger/webim/libs/chat.php
+++ b/src/messenger/webim/libs/chat.php
@@ -396,7 +396,7 @@ function load_canned_messages($locale, $groupid)
 	global $mysqlprefix;
 	$link = connect();
 	$result = select_multi_assoc(
-		"select vcvalue from ${mysqlprefix}chatresponses where locale = '" . $locale . "' " .
+		"select vcvalue from ${mysqlprefix}chatresponses where locale = '$locale' " .
 		"AND (groupid is NULL OR groupid = 0) order by vcvalue", $link);
 	if (count($result) == 0) {
 		foreach (explode("\n", getstring_('chat.predefined_answers', $locale)) as $answer) {
@@ -405,7 +405,7 @@ function load_canned_messages($locale, $groupid)
 	}
 	if ($groupid) {
 		$result2 = select_multi_assoc(
-			"select vcvalue from ${mysqlprefix}chatresponses where locale = '" . $locale . "' " .
+			"select vcvalue from ${mysqlprefix}chatresponses where locale = '$locale' " .
 			"AND groupid = $groupid order by vcvalue", $link);
 		foreach ($result as $r) {
 			$result2[] = $r;
@@ -469,7 +469,7 @@ function update_thread_access($threadid, $params, $link)
 	}
 	perform_query(
 		"update ${mysqlprefix}chatthread set $clause " .
-		"where threadid = " . $threadid, $link);
+		"where threadid = $threadid", $link);
 }
 
 function ping_thread($thread, $isuser, $istyping)
@@ -517,7 +517,7 @@ function commit_thread($threadid, $params, $link)
 	foreach ($params as $k => $v) {
 		$query .= ", " . $k . "=" . $v;
 	}
-	$query .= " where threadid = " . $threadid;
+	$query .= " where threadid = $threadid";
 
 	perform_query($query, $link);
 }
diff --git a/src/messenger/webim/libs/groups.php b/src/messenger/webim/libs/groups.php
index 52d3a4e0..e5eaf5eb 100644
--- a/src/messenger/webim/libs/groups.php
+++ b/src/messenger/webim/libs/groups.php
@@ -42,9 +42,10 @@ function setup_group_settings_tabs($gid, $active)
 {
 	global $page, $webimroot, $settings;
 	if ($gid) {
+		$page['tabselected'] = $active;
 		$page['tabs'] = array(
-			getlocal("page_group.tab.main") => $active != 0 ? "$webimroot/operator/group.php?gid=$gid" : "",
-			getlocal("page_group.tab.members") => $active != 1 ? "$webimroot/operator/groupmembers.php?gid=$gid" : "",
+			array('title' => getlocal("page_group.tab.main"), 'link' => "$webimroot/operator/group.php?gid=$gid"),
+			array('title' => getlocal("page_group.tab.members"), 'link' => "$webimroot/operator/groupmembers.php?gid=$gid"),
 		);
 	} else {
 		$page['tabs'] = array();
diff --git a/src/messenger/webim/view/agent.php b/src/messenger/webim/view/agent.php
index 797dc9b3..10534d6f 100644
--- a/src/messenger/webim/view/agent.php
+++ b/src/messenger/webim/view/agent.php
@@ -21,6 +21,7 @@
 
 require_once("inc_menu.php");
 require_once("inc_tabbar.php");
+
 $page['title'] = getlocal("page_agent.title");
 $page['menuid'] = $page['opid'] == $page['currentopid'] ? "profile" : "operators";
 
diff --git a/src/messenger/webim/view/avatar.php b/src/messenger/webim/view/avatar.php
index 73127b3a..cf584b92 100644
--- a/src/messenger/webim/view/avatar.php
+++ b/src/messenger/webim/view/avatar.php
@@ -21,6 +21,7 @@
 
 require_once("inc_menu.php");
 require_once("inc_tabbar.php");
+
 $page['title'] = getlocal("page_avatar.title");
 $page['menuid'] = $page['opid'] == $page['currentopid'] ? "profile" : "operators";
 
diff --git a/src/messenger/webim/view/features.php b/src/messenger/webim/view/features.php
index e966411f..62b4c535 100644
--- a/src/messenger/webim/view/features.php
+++ b/src/messenger/webim/view/features.php
@@ -21,6 +21,7 @@
 
 require_once("inc_menu.php");
 require_once("inc_tabbar.php");
+
 $page['title'] = getlocal("settings.title");
 $page['menuid'] = "settings";
 
diff --git a/src/messenger/webim/view/getcode_image.php b/src/messenger/webim/view/getcode_image.php
index a422052f..b27e298b 100644
--- a/src/messenger/webim/view/getcode_image.php
+++ b/src/messenger/webim/view/getcode_image.php
@@ -21,6 +21,7 @@
 
 require_once("inc_menu.php");
 require_once("inc_tabbar.php");
+
 $page['title'] = getlocal("page.gen_button.title");
 $page['menuid'] = "getcode";
 
diff --git a/src/messenger/webim/view/getcode_text.php b/src/messenger/webim/view/getcode_text.php
index 6f85977e..c6f45581 100644
--- a/src/messenger/webim/view/getcode_text.php
+++ b/src/messenger/webim/view/getcode_text.php
@@ -21,6 +21,7 @@
 
 require_once("inc_menu.php");
 require_once("inc_tabbar.php");
+
 $page['title'] = getlocal("page.gen_button.title");
 $page['menuid'] = "getcode";
 
diff --git a/src/messenger/webim/view/group.php b/src/messenger/webim/view/group.php
index a4a5f871..bc9ba628 100644
--- a/src/messenger/webim/view/group.php
+++ b/src/messenger/webim/view/group.php
@@ -20,6 +20,8 @@
  */
 
 require_once("inc_menu.php");
+require_once("inc_tabbar.php");
+
 $page['title'] = getlocal("page.group.title");
 $page['menuid'] = "groups";
 
@@ -44,15 +46,7 @@ require_once('inc_errors.php');
 <form name="groupForm" method="post" action="<?php echo $webimroot ?>/operator/group.php">
 <input type="hidden" name="gid" value="<?php echo $page['grid'] ?>"/>
 	<div>
-<?php if($page['tabs']) { ?>
-	<ul class="tabs">
-
-<?php foreach($page['tabs'] as $k => $v) { if($v) { ?>
-	<li><a href="<?php echo $v ?>"><?php echo $k ?></a></li>
-<?php } else { ?>
-	<li class="active"><a href="#"><?php echo $k ?></a></li><?php }} ?>
-	</ul>
-<?php } ?>
+<?php print_tabbar(); ?>
 	<div class="mform"><div class="formtop"><div class="formtopi"></div></div><div class="forminner">
 
 	<div class="fieldForm">
diff --git a/src/messenger/webim/view/groupmembers.php b/src/messenger/webim/view/groupmembers.php
index 704b177b..3469bba3 100644
--- a/src/messenger/webim/view/groupmembers.php
+++ b/src/messenger/webim/view/groupmembers.php
@@ -20,6 +20,8 @@
  */
 
 require_once("inc_menu.php");
+require_once("inc_tabbar.php");
+
 $page['title'] = getlocal("page.groupmembers.title");
 $page['menuid'] = "groups";
 
@@ -39,15 +41,7 @@ require_once('inc_errors.php');
 <form name="membersForm" method="post" action="<?php echo $webimroot ?>/operator/groupmembers.php">
 <input type="hidden" name="gid" value="<?php echo $page['groupid'] ?>"/>
 	<div>
-<?php if($page['tabs']) { ?>
-	<ul class="tabs">
-
-<?php foreach($page['tabs'] as $k => $v) { if($v) { ?>
-	<li><a href="<?php echo $v ?>"><?php echo $k ?></a></li>
-<?php } else { ?>
-	<li class="active"><a href="#"><?php echo $k ?></a></li><?php }} ?>
-	</ul>
-<?php } ?>
+<?php print_tabbar(); ?>
 	<div class="mform"><div class="formtop"><div class="formtopi"></div></div><div class="forminner">
 
 	<p>
diff --git a/src/messenger/webim/view/operator_groups.php b/src/messenger/webim/view/operator_groups.php
index 4d598b89..736398ad 100644
--- a/src/messenger/webim/view/operator_groups.php
+++ b/src/messenger/webim/view/operator_groups.php
@@ -21,6 +21,7 @@
 
 require_once("inc_menu.php");
 require_once("inc_tabbar.php");
+
 $page['title'] = getlocal("operator.groups.title");
 $page['menuid'] = $page['opid'] == $page['currentopid'] ? "profile" : "operators";
 
diff --git a/src/messenger/webim/view/performance.php b/src/messenger/webim/view/performance.php
index 22f47bd0..51f2a32e 100644
--- a/src/messenger/webim/view/performance.php
+++ b/src/messenger/webim/view/performance.php
@@ -21,6 +21,7 @@
 
 require_once("inc_menu.php");
 require_once("inc_tabbar.php");
+
 $page['title'] = getlocal("settings.title");
 $page['menuid'] = "settings";
 
diff --git a/src/messenger/webim/view/permissions.php b/src/messenger/webim/view/permissions.php
index bbc1532a..7c47ecc7 100644
--- a/src/messenger/webim/view/permissions.php
+++ b/src/messenger/webim/view/permissions.php
@@ -21,6 +21,7 @@
 
 require_once("inc_menu.php");
 require_once("inc_tabbar.php");
+
 $page['title'] = getlocal("permissions.title");
 $page['menuid'] = $page['opid'] == $page['currentopid'] ? "profile" : "operators";
 
diff --git a/src/messenger/webim/view/settings.php b/src/messenger/webim/view/settings.php
index 0aa22a9b..06611de0 100644
--- a/src/messenger/webim/view/settings.php
+++ b/src/messenger/webim/view/settings.php
@@ -21,6 +21,7 @@
 
 require_once("inc_menu.php");
 require_once("inc_tabbar.php");
+
 $page['title'] = getlocal("settings.title");
 $page['menuid'] = "settings";
 
diff --git a/src/messenger/webim/view/themes.php b/src/messenger/webim/view/themes.php
index 5e0484b4..de527798 100644
--- a/src/messenger/webim/view/themes.php
+++ b/src/messenger/webim/view/themes.php
@@ -21,6 +21,7 @@
 
 require_once("inc_menu.php");
 require_once("inc_tabbar.php");
+
 $page['title'] = getlocal("page.preview.title");
 $page['menuid'] = "settings";