diff --git a/src/messenger/webim/leavemessage.php b/src/messenger/webim/leavemessage.php index 379172da..67dd8172 100644 --- a/src/messenger/webim/leavemessage.php +++ b/src/messenger/webim/leavemessage.php @@ -113,7 +113,7 @@ if (isset($group) && !empty($group['vcemail'])) { if($inbox_mail) { $link = connect(); - webim_mail($inbox_mail, $email, $subject, $body, $link); + mibew_mail($inbox_mail, $email, $subject, $body, $link); mysql_close($link); } diff --git a/src/messenger/webim/libs/chat.php b/src/messenger/webim/libs/chat.php index 70004a3e..5665a0f3 100644 --- a/src/messenger/webim/libs/chat.php +++ b/src/messenger/webim/libs/chat.php @@ -727,7 +727,7 @@ function notify_operators($thread, $firstmessage, $link) } foreach ($result as $op) { if ($op['time'] < $settings['online_timeout'] && is_valid_email($op['vcjabbername'])) { - webim_xmpp($op['vcjabbername'], getstring2("notify.new.subject", array($thread['userName']), true), $text, $link); + mibew_xmpp($op['vcjabbername'], getstring2("notify.new.subject", array($thread['userName']), true), $text, $link); } } } diff --git a/src/messenger/webim/libs/notify.php b/src/messenger/webim/libs/notify.php index e404b5b8..b4103173 100644 --- a/src/messenger/webim/libs/notify.php +++ b/src/messenger/webim/libs/notify.php @@ -31,7 +31,7 @@ function log_notification($locale, $kind, $to, $subj, $text, $refop, $link) perform_query($query, $link); } -function webim_mail($toaddr, $reply_to, $subject, $body, $link) +function mibew_mail($toaddr, $reply_to, $subject, $body, $link) { global $webim_encoding, $webim_mailbox, $mail_encoding, $current_locale; @@ -48,7 +48,7 @@ function webim_mail($toaddr, $reply_to, $subject, $body, $link) @mail($toaddr, $real_subject, wordwrap(myiconv($webim_encoding, $mail_encoding, $body), 70), $headers); } -function webim_xmpp($toaddr, $subject, $text, $link) +function mibew_xmpp($toaddr, $subject, $text, $link) { global $current_locale; log_notification($current_locale, "xmpp", $toaddr, $subject, $text, null, $link); diff --git a/src/messenger/webim/mail.php b/src/messenger/webim/mail.php index 5a1d5e2d..b832830d 100644 --- a/src/messenger/webim/mail.php +++ b/src/messenger/webim/mail.php @@ -61,7 +61,7 @@ $subject = getstring("mail.user.history.subject", true); $body = getstring2("mail.user.history.body", array($thread['userName'],$history), true); $link = connect(); -webim_mail($email, $webim_mailbox, $subject, $body, $link); +mibew_mail($email, $webim_mailbox, $subject, $body, $link); mysql_close($link); setup_logo(); diff --git a/src/messenger/webim/operator/restore.php b/src/messenger/webim/operator/restore.php index a4ebbf6e..f95e9769 100644 --- a/src/messenger/webim/operator/restore.php +++ b/src/messenger/webim/operator/restore.php @@ -46,7 +46,7 @@ if (isset($_POST['loginoremail'])) { perform_query($query, $link); $href = get_app_location(true, false) . "/operator/resetpwd.php?id=" . $torestore['operatorid'] . "&token=$token"; - webim_mail($email, $email, getstring("restore.mailsubj"), getstring2("restore.mailtext", array(get_operator_name($torestore), $href)), $link); + mibew_mail($email, $email, getstring("restore.mailsubj"), getstring2("restore.mailtext", array(get_operator_name($torestore), $href)), $link); mysql_close($link); $page['isdone'] = true;