diff --git a/actions-sms.php b/actions-sms.php index 90f58bf..6d68be1 100644 --- a/actions-sms.php +++ b/actions-sms.php @@ -1032,7 +1032,7 @@ function checkUserPrivileges($number) { global $db, $sms, $smsSender, $user; $userId=$user->findUserIdByNumber($number); - $privileges=getPrivileges($userId); + $privileges=$user->findPrivileges($userId); if ($privileges==0) { $smsSender->send($number,_('Sorry, this command is only available for the privileged users.')); diff --git a/actions-web.php b/actions-web.php index 5943575..eec4ff0 100644 --- a/actions-web.php +++ b/actions-web.php @@ -712,7 +712,7 @@ function resetpassword($number) _('Your password has been reset successfully.') . "\n\n" . _('Your new password is:') . "\n" . $password; - $mailer->send($email, $subject, $message); + $mailer->sendMail($email, $subject, $message); response(_('Your password has been reset successfully.') . ' ' . _('Check your email.')); } diff --git a/common.php b/common.php index c1c4dd3..a6c1f8a 100644 --- a/common.php +++ b/common.php @@ -162,13 +162,13 @@ function notifyAdmins($message, $notificationtype = 0) while ($row = $result->fetch_assoc()) { if ($notificationtype == 0) { $smsSender->send($row['number'], $message); - $mailer->send($watches['email'], $systemname . ' ' . _('notification'), $message); + $mailer->sendMail($watches['email'], $systemname . ' ' . _('notification'), $message); } else { - $mailer->send($row['mail'], $systemname . ' ' . _('notification'), $message); + $mailer->sendMail($row['mail'], $systemname . ' ' . _('notification'), $message); } }//copy to Trello board -- might be added as a person instead if ($notificationtype == 0) { - $mailer->send('cyklokoalicia1+q31wfjphbgkuelf19hlb@boards.trello.com', $message, $message); + $mailer->sendMail('cyklokoalicia1+q31wfjphbgkuelf19hlb@boards.trello.com', $message, $message); } } @@ -195,7 +195,7 @@ function sendConfirmationEmail($emailto) _('you have been registered into community bike share system') . ' ' . $systemname . ".\n\n" . _('System rules are available here:') . "\n" . $systemrules . "\n\n" . _('By clicking the following link you agree to the System rules:') . "\n" . $systemURL . 'agree.php?key=' . $userKey; - $mailer->send($emailto, $subject, $message); + $mailer->sendMail($emailto, $subject, $message); } function confirmUser($userKey)