Rename some functions to decrease confusion with the old application name

This commit is contained in:
Fedor A. Fetisov 2013-09-14 16:30:54 +04:00
parent e94ba149df
commit 1c0b4f48c9
5 changed files with 6 additions and 6 deletions

View File

@ -113,7 +113,7 @@ if (isset($group) && !empty($group['vcemail'])) {
if($inbox_mail) { if($inbox_mail) {
$link = connect(); $link = connect();
webim_mail($inbox_mail, $email, $subject, $body, $link); mibew_mail($inbox_mail, $email, $subject, $body, $link);
mysql_close($link); mysql_close($link);
} }

View File

@ -727,7 +727,7 @@ function notify_operators($thread, $firstmessage, $link)
} }
foreach ($result as $op) { foreach ($result as $op) {
if ($op['time'] < $settings['online_timeout'] && is_valid_email($op['vcjabbername'])) { 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);
} }
} }
} }

View File

@ -31,7 +31,7 @@ function log_notification($locale, $kind, $to, $subj, $text, $refop, $link)
perform_query($query, $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; 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); @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; global $current_locale;
log_notification($current_locale, "xmpp", $toaddr, $subject, $text, null, $link); log_notification($current_locale, "xmpp", $toaddr, $subject, $text, null, $link);

View File

@ -61,7 +61,7 @@ $subject = getstring("mail.user.history.subject", true);
$body = getstring2("mail.user.history.body", array($thread['userName'],$history), true); $body = getstring2("mail.user.history.body", array($thread['userName'],$history), true);
$link = connect(); $link = connect();
webim_mail($email, $webim_mailbox, $subject, $body, $link); mibew_mail($email, $webim_mailbox, $subject, $body, $link);
mysql_close($link); mysql_close($link);
setup_logo(); setup_logo();

View File

@ -46,7 +46,7 @@ if (isset($_POST['loginoremail'])) {
perform_query($query, $link); perform_query($query, $link);
$href = get_app_location(true, false) . "/operator/resetpwd.php?id=" . $torestore['operatorid'] . "&token=$token"; $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); mysql_close($link);
$page['isdone'] = true; $page['isdone'] = true;