Skip to content

Commit f03eea9

Browse files
committed
a bunch of updates switching out old admin_mail code with the new Mail class adminMail call and optmizing things here and there as i go
1 parent 2473b5e commit f03eea9

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

src/Plugin.php

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,7 @@ public static function loadProcessing(GenericEvent $event)
118118
$email = $smarty->fetch('email/admin/license_created.tpl');
119119
//$subject = $smarty->get_template_vars('subject');
120120
$subject = 'New '.$serviceTypes[$serviceInfo[$settings['PREFIX'].'_type']]['services_name'].' License Created '.$serviceInfo[$settings['PREFIX'].'_ip'];
121-
$headers = '';
122-
$headers .= 'MIME-Version: 1.0'.PHP_EOL;
123-
$headers .= 'Content-type: text/html; charset=UTF-8'.PHP_EOL;
124-
$headers .= 'From: '.TITLE.' <'.EMAIL_FROM.'>'.PHP_EOL;
125-
admin_mail($subject, $email, $headers, false, 'admin/license_created.tpl');
121+
(new MyAdmin\Mail())->adminMail($subject, $email, false, 'admin/license_created.tpl');
126122
})->setReactivate(function ($service) {
127123
$serviceTypes = run_event('get_service_types', false, self::$module);
128124
$serviceInfo = $service->getServiceInfo();
@@ -135,11 +131,7 @@ public static function loadProcessing(GenericEvent $event)
135131
$smarty->assign('service_name', $serviceTypes[$serviceInfo[$settings['PREFIX'].'_type']]['services_name']);
136132
$email = $smarty->fetch('email/admin/license_reactivated.tpl');
137133
$subject = $serviceInfo[$settings['TITLE_FIELD']].' '.$serviceTypes[$serviceInfo[$settings['PREFIX'].'_type']]['services_name'].' '.$settings['TBLNAME'].' Reactivated';
138-
$headers = '';
139-
$headers .= 'MIME-Version: 1.0'.PHP_EOL;
140-
$headers .= 'Content-type: text/html; charset=UTF-8'.PHP_EOL;
141-
$headers .= 'From: '.TITLE.' <'.EMAIL_FROM.'>'.PHP_EOL;
142-
admin_mail($subject, $email, $headers, false, 'admin/license_reactivated.tpl');
134+
(new MyAdmin\Mail())->adminMail($subject, $email, false, 'admin/license_reactivated.tpl');
143135
})->setDisable(function () {
144136
})->register();
145137
}

0 commit comments

Comments
 (0)