aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-03-28 17:49:48 -0700
committerzotlabs <mike@macgirvin.com>2017-03-28 17:49:48 -0700
commita54bb07753977c7295929fc207ce80f24cb07baf (patch)
treedcac8d0512019af7228145a39edb19a98eb0ff4f
parent323ab3dba4a925cf2519c5c9eee9b82683dc7d5d (diff)
downloadvolse-hubzilla-a54bb07753977c7295929fc207ce80f24cb07baf.tar.gz
volse-hubzilla-a54bb07753977c7295929fc207ce80f24cb07baf.tar.bz2
volse-hubzilla-a54bb07753977c7295929fc207ce80f24cb07baf.zip
fix a couple more instances where we were still calling mail() directly for site critical messages
-rwxr-xr-xboot.php54
1 files changed, 27 insertions, 27 deletions
diff --git a/boot.php b/boot.php
index 8a269fbca..e0fa2fe1a 100755
--- a/boot.php
+++ b/boot.php
@@ -2287,19 +2287,19 @@ function z_check_cert() {
*/
function cert_bad_email() {
-
- $email_tpl = get_intltext_template("cert_bad_eml.tpl");
- $email_msg = replace_macros($email_tpl, array(
- '$sitename' => App::$config['system']['sitename'],
- '$siteurl' => z_root(),
- '$error' => t('Website SSL certificate is not valid. Please correct.')
- ));
-
- $subject = email_header_encode(sprintf(t('[$Projectname] Website SSL error for %s'), App::get_hostname()));
- mail(App::$config['system']['admin_email'], $subject, $email_msg,
- 'From: Administrator' . '@' . App::get_hostname() . "\n"
- . 'Content-type: text/plain; charset=UTF-8' . "\n"
- . 'Content-transfer-encoding: 8bit' );
+ return z_mail(
+ [
+ 'toEmail' => \App::$config['system']['admin_email'],
+ 'messageSubject' => sprintf(t('[$Projectname] Website SSL error for %s'), App::get_hostname()),
+ 'textVersion' => replace_macros(get_intltext_template('cert_bad_eml.tpl'),
+ [
+ '$sitename' => App::$config['system']['sitename'],
+ '$siteurl' => z_root(),
+ '$error' => t('Website SSL certificate is not valid. Please correct.')
+ ]
+ )
+ ]
+ );
}
@@ -2410,20 +2410,20 @@ function check_cron_broken() {
return;
}
- $email_tpl = get_intltext_template("cron_bad_eml.tpl");
- $email_msg = replace_macros($email_tpl, array(
- '$sitename' => App::$config['system']['sitename'],
- '$siteurl' => z_root(),
- '$error' => t('Cron/Scheduled tasks not running.'),
- '$lastdate' => (($d)? $d : t('never'))
- ));
-
- $subject = email_header_encode(sprintf(t('[$Projectname] Cron tasks not running on %s'), App::get_hostname()));
- mail(App::$config['system']['admin_email'], $subject, $email_msg,
- 'From: Administrator' . '@' . App::get_hostname() . "\n"
- . 'Content-type: text/plain; charset=UTF-8' . "\n"
- . 'Content-transfer-encoding: 8bit' );
- return;
+ return z_mail(
+ [
+ 'toEmail' => \App::$config['system']['admin_email'],
+ 'messageSubject' => sprintf(t('[$Projectname] Cron tasks not running on %s'), App::get_hostname()),
+ 'textVersion' => replace_macros(get_intltext_template('cron_bad_eml.tpl'),
+ [
+ '$sitename' => App::$config['system']['sitename'],
+ '$siteurl' => z_root(),
+ '$error' => t('Cron/Scheduled tasks not running.'),
+ '$lastdate' => (($d)? $d : t('never'))
+ ]
+ )
+ ]
+ );
}