webinterface.git

@@ -57,15 +57,15 @@ if (isset($_POST['password1']) && $_POST['password1'] != '') {

 output('<p>Hier können Sie Ihr Passwort ändern.</p>

 ' . html_form('email_chpass', 'chpass', '', '<table>

   <tr>

-    <td>bisheriges Passwort:</td>  <td><input type="password" name="old_password" value="" /></td>

+    <td>bisheriges Passwort:</td>  <td><input type="password" name="old_password" value=""></td>

   </tr>

   <tr>

-    <td>neues Passwort:</td>       <td><input type="password" name="password1" value="" autocomplete="new-password" /></td>

+    <td>neues Passwort:</td>       <td><input type="password" name="password1" value="" autocomplete="new-password"></td>

   </tr>

   <tr>

-    <td>Bestätigung:<br /><span style="font-size: 80%;">(nochmal neues Passwort)</span></td>

-                                   <td><input type="password" name="password2" value="" autocomplete="new-password" /></td>

+    <td>Bestätigung:<br><span style="font-size: 80%;">(nochmal neues Passwort)</span></td>

+                                   <td><input type="password" name="password2" value="" autocomplete="new-password"></td>

   </tr>

 </table>

-<p><input type="submit" value="Speichern" /></p>

+<p><input type="submit" value="Speichern"></p>

 '));

@@ -91,25 +91,25 @@ if (isset($_GET['action']) && $_GET['action'] == 'save') {

   <tr><th>Einstellung:</th><th>Wert:</th><th>&#160;</th></tr>

   <tr>

     <td>Benutzername:</td>

-    <td><input type="text" id="user" name="user" />@<select name="domain" size="1">

+    <td><input type="text" id="user" name="user">@<select name="domain" size="1">

     <option value="' . config('masterdomain') . '">' . config('masterdomain') . '</option>

   ' . $options . '

     </select></td>

   </tr>

   <tr>

     <td>Mailbox:</td>

-    <td><input type="text" id="mailbox" name="mailbox" value="' . $user['homedir'] . '/" /></td>

+    <td><input type="text" id="mailbox" name="mailbox" value="' . $user['homedir'] . '/"></td>

   </tr>

   <tr>

     <td>Passwort:</td>

-    <td><input type="password" id="password" name="password" value="" /></td>

+    <td><input type="password" id="password" name="password" value="" autocomplete="new-password"></td>

   </tr>

   <tr>

     <td>Account sofort aktivieren:</td>

-    <td><input type="checkbox" id="enabled" name="enabled" value="true" /></td>

+    <td><input type="checkbox" id="enabled" name="enabled" value="true"></td>

   </tr>

   </table>

-  <p><input type="submit" name="create" value="Anlegen" /></p>

+  <p><input type="submit" name="create" value="Anlegen"></p>

   '));

 } elseif (isset($_GET['action']) && $_GET['action'] == 'delete' && $_GET['account'] != '') {

     $sure = user_is_sure();

@@ -154,8 +154,8 @@ if (isset($_GET['action']) && $_GET['action'] == 'save') {

     $form = '

   <table style="margin-bottom: 1em;">

   <tr><th>Einstellung:</th><th>alter Wert:</th><th>neuer Wert:</th><th>&#160;</th></tr>

-  <tr><td>Benutzername:</td><td><input type="text" id="old_account" name="old_account" value="' . $account['account'] . '" readonly="readonly" style="background-color: #C0C0C0;" /></td>

-          <td><input type="text" id="user" name="user" value="' . $username . '" />@<select name="domain" id="domain" size="1">

+  <tr><td>Benutzername:</td><td><input type="text" id="old_account" name="old_account" value="' . $account['account'] . '" readonly="readonly" style="background-color: #C0C0C0;"></td>

+          <td><input type="text" id="user" name="user" value="' . $username . '">@<select name="domain" id="domain" size="1">

     <option value="' . config('masterdomain') . '">' . config('masterdomain') . '</option>

     ';

     $domains = get_domain_list($user['customerno'], $user['uid']);

@@ -171,19 +171,19 @@ if (isset($_GET['action']) && $_GET['action'] == 'save') {

     }

     $form .= '</select></td>

-          <td><input type="button" onclick="document.getElementById(\'user\').value = \'' . $username . '\' ; document.getElementById(\'domain\').value = \'' . $domain . '\'" value="Zeile zurücksetzen" /></td></tr>

-  <tr><td>Mailbox:</td><td><input type="text" id="old_mailbox" name="old_mailbox" value="' . $account['mailbox'] . '" readonly="readonly" style="background-color: #C0C0C0;" /></td>

-          <td><input type="text" id="mailbox" name="mailbox" value="' . $account['mailbox'] . '" /></td>

-          <td><input type="button" onclick="document.getElementById(\'mailbox\').value = document.getElementById(\'old_mailbox\').value" value="Zeile zurücksetzen" /></td></tr>

+          <td><input type="button" onclick="document.getElementById(\'user\').value = \'' . $username . '\' ; document.getElementById(\'domain\').value = \'' . $domain . '\'" value="Zeile zurücksetzen"></td></tr>

+  <tr><td>Mailbox:</td><td><input type="text" id="old_mailbox" name="old_mailbox" value="' . $account['mailbox'] . '" readonly="readonly" style="background-color: #C0C0C0;"></td>

+          <td><input type="text" id="mailbox" name="mailbox" value="' . $account['mailbox'] . '"></td>

+          <td><input type="button" onclick="document.getElementById(\'mailbox\').value = document.getElementById(\'old_mailbox\').value" value="Zeile zurücksetzen"></td></tr>

   <tr><td>Passwort:</td><td><i>nicht angezeigt</i></td>

-          <td><input type="password" id="password" name="password" value="" /></td>

-          <td><input type="button" onclick="document.getElementById(\'password\').value = \'\'" value="Zeile zurücksetzen" /></td></tr>

+          <td><input type="password" id="password" name="password" value=""></td>

+          <td><input type="button" onclick="document.getElementById(\'password\').value = \'\'" value="Zeile zurücksetzen"></td></tr>

   <tr><td>Konto aktiv:</td>

     <td>&#160;</td>

-    <td><input type="checkbox" id="enabled" name="enabled" value="true"' . $enabled . ' /></td>

+    <td><input type="checkbox" id="enabled" name="enabled" value="true"' . $enabled . '></td>

     <td>&#160;</td></tr>

   </table>

-  <p><input type="submit" value="Änderungen speichern" /><br />

+  <p><input type="submit" value="Änderungen speichern"><br>

   Hinweis: Das Passwort wird nur geändert, wenn Sie auf dieser Seite eines eingeben. Geben Sie keines an, wird das bisherige beibehalten!</p>

   ';

     output(html_form('email_imap_edit', 'imap', 'action=save&id=' . $_GET['edit'], $form));

@@ -18,7 +18,10 @@ require_once('inc/base.php');

 $section = 'email_vmail';

 title("Einstellungen zum E-Mail-Abruf");

+$servername = "zucker.schokokeks.org";

+if (isset($_REQUEST['server'])) {

     $servername = filter_input_hostname($_REQUEST['server']);

+}

 $type = 'vmail';

 if (isset($_REQUEST['type']) && $_REQUEST['type'] == 'manual') {

     $type = 'manual';

@@ -67,15 +70,17 @@ output('<h3>Abruf mit einem E-Mail-Programm</h3>

 <dt>Passwort</dt><dd><em>Ihr E-Mail-Passwort</em></dd>

 </dl>

 </div>

-<br style="clear: left;" />

+<br style="clear: left;">

 <h3>SMTP</h3>

 <p>Zum Verschicken von E-Mails muss sich Ihr E-Mail-Programm auch per SMTP anmelden. Benutzen Sie dafür bitte die folgenden Daten:</p>

+<dl>

 <dt>Protokoll</dt><dd>SMTP</dd>

 <dt>Servername</dt><dd>' . $servername . '</dd>

 <dt>Port</dt><dd>465</dd>

 <dt>Verschlüsselung</dt><dd>SSL / TLS</dd>

 <dt>Benutzername</dt><dd><em>' . ($type == 'manual' ? 'Ihr Account-Name' : 'Ihre E-Mail-Adresse') . '</em></dd>

 <dt>Passwort</dt><dd><em>Ihr E-Mail-Passwort</em></dd>

-<br />

+</dl>

+<br>

 ');

@@ -43,7 +43,7 @@ output('<p>Mit dieser Funktion können Sie eine E-Mail-Adresse stilllegen (so we

 $form = "<h4>Text der Fehlermeldung</h4>" .

   "<p><textarea cols=\"80\" rows=\"10\" name=\"smtpreply\" id=\"smtpreply\">" . filter_output_html($account['smtpreply']) . "</textarea></p>";

-$form .= '<p><input id="submit" type="submit" value="Speichern" />&#160;&#160;&#160;&#160;';

+$form .= '<p><input id="submit" type="submit" value="Speichern">&#160;&#160;&#160;&#160;';

 if ($suspended) {

     $form .= internal_link('vmail', 'Abbrechen') . '</p>';

 } else {