Merge branch v1.6.x into master

src/messenger/webim/install/dbinfo.php

@@ -188,7 +188,7 @@ function create_table($id, $link)
 	mysql_query($query, $link) or show_install_err(' Query failed: ' . mysql_error($link));
 
 	if ($id == "${mysqlprefix}chatoperator") {
-		create_operator_("admin", "", "", "", "Administrator", "Administrator", 0, $link);
+		create_operator_("admin", "", "", "", "Administrator", "Administrator", 0, "", $link);
 	} else if ($id == "${mysqlprefix}chatrevision") {
 		perform_query("INSERT INTO ${mysqlprefix}chatrevision VALUES (1)", $link);
 	}
@@ -230,4 +230,4 @@ function get_columns($tablename, $link)
 	}
 }
 
-?>
+?>

src/messenger/webim/js/source/common.js

@@ -1,7 +1,7 @@
 /**
  * @preserve This file is part of Mibew Messenger project.
  * http://mibew.org
- * 
+ *
  * Copyright (c) 2005-2011 Mibew Messenger Community
  * License: http://mibew.org/license.php
  */

src/messenger/webim/libs/chat.php

@@ -765,4 +765,4 @@ function get_remote_host()
 	return isset($_SERVER['REMOTE_HOST']) ? $_SERVER['REMOTE_HOST'] : $extAddr;
 }
 
-?>
+?>

src/messenger/webim/libs/getcode.php

@@ -1,12 +1,12 @@
 <?php
 /*
  * This file is part of Mibew Messenger project.
- * 
+ *
  * Copyright (c) 2005-2011 Mibew Messenger Community
  * All rights reserved. The contents of this file are subject to 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
- * 
+ *
  * Alternatively, the contents of this file may be used under the terms of
  * the GNU General Public License Version 2 or later (the "GPL"), in which case
  * the provisions of the GPL are applicable instead of those above. If you wish
@@ -14,7 +14,7 @@
  * not to allow others to use your version of this file under the terms of the
  * EPL, indicate your decision by deleting the provisions above and replace them
  * with the notice and other provisions required by the GPL.
- * 
+ *
  * Contributors:
  *    Evgeny Gryaznov - initial API and implementation
  */

src/messenger/webim/libs/groups.php

@@ -67,4 +67,4 @@ function get_operator_groupslist($operatorid, $link)
 	}
 }
 
-?>
+?>

src/messenger/webim/libs/notify.php

@@ -58,4 +58,4 @@ function webim_xmpp($toaddr, $subject, $text, $link)
 	log_notification($current_locale, "xmpp", $toaddr, $subject, $text, null, $link);
 }
 
-?>
+?>

src/messenger/webim/libs/operator.php

@@ -131,7 +131,7 @@ function update_operator_avatar($operatorid, $avatar)
 	mysql_close($link);
 }
 
-function create_operator_($login, $email, $jabber, $password, $localename, $commonname, $notify, $link)
+function create_operator_($login, $email, $jabber, $password, $localename, $commonname, $notify, $avatar, $link)
 {
 	global $mysqlprefix;
 	$query = sprintf(
@@ -140,7 +140,7 @@ function create_operator_($login, $email, $jabber, $password, $localename, $comm
 		md5($password),
 		mysql_real_escape_string($localename),
 		mysql_real_escape_string($commonname),
-		'' /* no avatar */,
+		mysql_real_escape_string($avatar),
 		mysql_real_escape_string($email),
 		mysql_real_escape_string($jabber),
 		$notify);
@@ -151,10 +151,10 @@ function create_operator_($login, $email, $jabber, $password, $localename, $comm
 	return select_one_row("select * from ${mysqlprefix}chatoperator where operatorid = $id", $link);
 }
 
-function create_operator($login, $email, $jabber, $password, $localename, $commonname, $notify)
+function create_operator($login, $email, $jabber, $password, $localename, $commonname, $notify, $avatar)
 {
 	$link = connect();
-	$newop = create_operator_($login, $email, $jabber, $password, $localename, $commonname, $notify, $link);
+	$newop = create_operator_($login, $email, $jabber, $password, $localename, $commonname, $notify, $avatar, $link);
 	mysql_close($link);
 	return $newop;
 }

src/messenger/webim/operator/operator.php

@@ -86,7 +86,7 @@ if (isset($_POST['login']) && isset($_POST['password'])) {
 
 	if (count($errors) == 0) {
 		if (!$opId) {
-			$newop = create_operator($login, $email, $jabber, $password, $localname, $commonname, $jabbernotify ? 1 : 0);
+			$newop = create_operator($login, $email, $jabber, $password, $localname, $commonname, $jabbernotify ? 1 : 0, "");
 			header("Location: $webimroot/operator/avatar.php?op=" . $newop['operatorid']);
 			exit;
 		} else {
@@ -147,4 +147,4 @@ prepare_menu($operator);
 setup_operator_settings_tabs($opId, 0);
 start_html_output();
 require('../view/agent.php');
-?>
+?>