webinterface.git

@@ -472,6 +472,6 @@ function handle_exception($e)

         print_r(serialize($_SERVER));

     } else {

         $msg = "Exception caught:\n" . $e->getMessage() . "\n" . serialize($_POST) . "\n" . serialize($_SERVER);

-        mail(config("adminmail"), "Exception on configinterface", $msg);

+        send_mail(config("adminmail"), "Exception on configinterface", $msg);

     }

 }

@@ -287,8 +287,8 @@ Köchersberg 32, 71540 Murrhardt

 https://schokokeks.org

 ';

-    # send welcome message

-    mail($email, '=?UTF-8?Q?Best=C3=A4tigung_Ihrer_E-Mail-Adresse?=', $message, "X-schokokeks-org-message: verify\nFrom: " . config('company_name') . ' <' . config('adminmail') . ">\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\n");

+    // send welcome message

+    send_mail($email, 'Bestätigung Ihrer E-Mail-Adresse', $message, "verify");

 }

 function update_pending($contactid)

@@ -419,10 +419,10 @@ Wussten Sie schon, dass Sie auf mehrere Arten Ihre E-Mails abrufen können?

   (Achten Sie bitte darauf, dass die Verschlüsselung mit SSL oder TLS 

   aktiviert ist.)

 ';

-        # send welcome message

-        mail($emailaddr, 'Ihr neues Postfach ist bereit', $message, "X-schokokeks-org-message: welcome\nFrom: " . config('company_name') . ' <' . config('adminmail') . ">\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\n");

-        # notify the vmail subsystem of this new account

-        #mail('vmail@'.config('vmail_server'), 'command', "user={$account['local']}\nhost={$domainname}", "X-schokokeks-org-message: command");

+        // send welcome message

+        send_mail($emailaddr, 'Ihr neues Postfach ist bereit', $message, "welcome");

+        // notify the vmail subsystem of this new account

+        //mail('vmail@'.config('vmail_server'), 'command', "user={$account['local']}\nhost={$domainname}", "X-schokokeks-org-message: command");

     }

     // Clean up obsolete quota

@@ -358,7 +358,7 @@ function make_webapp_vhost($id, $webapp)

     $webapp_name = $result->fetch(PDO::FETCH_OBJ)->displayname;

     logger(LOG_INFO, 'modules/vhosts/include/vhosts', 'vhosts', 'Setting up webapp ' . $webapp_name . ' on vhost #' . $id);

     db_query("REPLACE INTO vhosts.webapps (vhost, webapp) VALUES (?, ?)", [$id, $webapp]);

-    mail('webapps-setup@schokokeks.org', 'setup', 'setup');

+    send_mail('webapps-setup@schokokeks.org', 'setup', 'setup');

 }