Mibew/i18n
1
0
Fork 0
mirror of https://github.com/Mibew/i18n.git synced 2025-01-23 05:40:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch v1.6.x into master

Browse Source
This commit is contained in:
Evgeny Gryaznov 2012-03-12 01:05:44 +01:00
commit 035479f7a2
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/messenger/webim/install/dbinfo.php
View File

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

8
src/messenger/webim/libs/operator.php
View File

@ -131,7 +131,7 @@ function update_operator_avatar($operatorid, $avatar)
mysql_close($link); 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; global $mysqlprefix;
$query = sprintf( $query = sprintf(
@ -140,7 +140,7 @@ function create_operator_($login, $email, $jabber, $password, $localename, $comm
md5($password), md5($password),
mysql_real_escape_string($localename), mysql_real_escape_string($localename),
mysql_real_escape_string($commonname), mysql_real_escape_string($commonname),
'' /* no avatar */, mysql_real_escape_string($avatar),
mysql_real_escape_string($email), mysql_real_escape_string($email),
mysql_real_escape_string($jabber), mysql_real_escape_string($jabber),
$notify); $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); 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(); $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); mysql_close($link);
return $newop; return $newop;
} }

0
src/messenger/webim/locales/ar/properties Executable file → Normal file
View File

2
src/messenger/webim/operator/operator.php
View File

@ -86,7 +86,7 @@ if (isset($_POST['login']) && isset($_POST['password'])) {
if (count($errors) == 0) { if (count($errors) == 0) {
if (!$opId) { 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']); header("Location: $webimroot/operator/avatar.php?op=" . $newop['operatorid']);
exit; exit;
} else { } else {