kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[fix] renaming update_certs, fixing deprecated usage of

This commit is contained in:
Benjamin Sonntag 2018-06-23 16:54:54 +02:00
parent 758f48ddc4
commit 719e1539b0
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bureau/class/m_err.php
View File

@ -149,7 +149,11 @@ class m_err {
function deprecated(){ function deprecated(){
global $msg; global $msg;
$trace = debug_backtrace(); $trace = debug_backtrace();
$caller = $trace[2]; if (isset($trace[2])) {
$caller = $trace[2];
} else {
$caller = "UNKNOWN CALLER";
}
$msg->raise("info", "err", "Deprecation warning: The old messaging class is still used by ".json_encode($caller)); $msg->raise("info", "err", "Deprecation warning: The old messaging class is still used by ".json_encode($caller));
} }

10
src/mail_add.php
View File

@ -109,7 +109,7 @@ print "cuid: $cuid\n";
* from scratch * from scratch
*/ */
if (!($mail_id = $mail->create($domain_id, $user))) { if (!($mail_id = $mail->create($domain_id, $user))) {
error_log('failed to create: ' . $err->errstr()); error_log('failed to create: ' . $msg->msg_str());
exit(4); exit(4);
} }
@ -120,8 +120,8 @@ if (!($mail_id = $mail->create($domain_id, $user))) {
* no idea why this is a different function. * no idea why this is a different function.
*/ */
if (!$mail->set_passwd($mail_id,$password)) { if (!$mail->set_passwd($mail_id,$password)) {
error_log("failed to set password on mail $mail_id: " . $err->errstr()); error_log("failed to set password on mail $mail_id: " . $msg->msg_str());
exit(5); exit(5);
} }
/* function set_details($mail_id, $islocal, $quotamb, /* function set_details($mail_id, $islocal, $quotamb,
@ -132,8 +132,8 @@ if (!$mail->set_passwd($mail_id,$password)) {
* if we have no aliases, it's a mailbox. deal with it. * if we have no aliases, it's a mailbox. deal with it.
*/ */
if (!$mail->set_details($mail_id, !count($recipients), $quota, join("\n", $recipients))) { if (!$mail->set_details($mail_id, !count($recipients), $quota, join("\n", $recipients))) {
error_log('failed to set details: ' . $err->errstr()); error_log('failed to set details: ' . $msg->msg_str());
exit(6); exit(6);
} }
// maybe we need to call the hooks? i don't know! // maybe we need to call the hooks? i don't know!

0
src/update_cert.sh → src/update_certs.sh
View File