webinterface.git

@@ -146,10 +146,21 @@ $form = '';

 if ($accountlogin) {

   $form.= "<p class=\"spamfilter_options\">Unerwünschte E-Mails (Spam, Viren) in diesem Postfach ".html_select('spamfilter_action', array("none" => 'nicht filtern', "folder" => 'in Unterordner »Spam« ablegen', "tag" => 'markieren und zustellen', "delete" => 'nicht zustellen (löschen)'), $account['spamfilter'])."</p>";

+} else {

+  if ($is_mailbox) {

+    $domainlist = get_vmail_domains();

+    $domain = NULL;

+    foreach ($domainlist as $dom) {

+      if ($dom->id == $account['domain']) {

+        $domain = $dom->domainname;

+      }

+    }

+    $form .= "

+    <p><strong style=\"font-size: 1.5em;\">{$account['local']}@{$domain}</strong></p>";

   } else {

     $form .= "

     <p><strong>E-Mail-Adresse:</strong>&#160;<input type=\"text\" name=\"local\" id=\"local\" size=\"10\" value=\"{$account['local']}\" /><strong style=\"font-size: 1.5em;\">&#160;@&#160;</strong>".domainselect($account['domain'])."</p>";

-

+  }

   $password_message = '';

   $password_value = '';

   if ($is_mailbox and ($account['password'] != ''))

@@ -42,10 +42,21 @@ if ($_GET['action'] == 'edit')

     $account = empty_account();

     $account['id'] = NULL;

-    if ($id)

+    if ($id) {

       $account['id'] = $id;

+  

+      $oldaccount = get_account_details($id);

+      if ($oldaccount['password'] != NULL ) { // Account war vorher eine Mailbox

+        $account['local'] = $oldaccount['local'];

+        $account['domain'] = $oldaccount['domain'];

+      } else {

         $account['local'] = $_POST['local'];

         $account['domain'] = (int) $_POST['domain'];

+      }

+    } else {

+      $account['local'] = $_POST['local'];

+      $account['domain'] = (int) $_POST['domain'];

+    }

     $account['password'] = $_POST['password'];

     if (($account['password'] == '') && ($_POST['mailbox'] == 'yes'))

       system_failure("Sie haben ein leeres Passwort eingegeben!");