Browse code

Neues VMail-Interface (funktionalität broken)

git-svn-id: https://svn.schokokeks.org/repos/tools/webinterface/trunk@913 87cf0b9e-d624-0410-a070-f6ee81989793

bernd authored on31/01/2008 09:39:20
Showing2 changed files
... ...
@@ -28,6 +28,41 @@ else {
28 28
 $is_forward = ($account['type'] == 'forward');
29 29
 $is_mailbox = ( ! $is_forward);
30 30
 
31
+output("<script type=\"text/javascript\">
32
+  
33
+  var numForwards = 1;
34
+
35
+  function moreForward()
36
+  {
37
+    numForwards += 1;
38
+
39
+    TR = document.createElement('tr');
40
+    TD1 = document.createElement('td');
41
+    TD2 = document.createElement('td');
42
+
43
+    INPUT = document.createElement('input');
44
+    INPUT.type = 'text';
45
+    INPUT.name = 'forward_to_' + numForwards;
46
+    INPUT.value = '';
47
+
48
+    SELECT = document.createElement('select');
49
+    SELECT.name = 'spamfilter_action_' + numForwards;
50
+
51
+    SELECT.options[0] = new Option('kein Filter', 'none', 1);
52
+    SELECT.options[1] = new Option('markieren und zustellen', 'tag', 0);
53
+    SELECT.options[2] = new Option('nicht zustellen', 'delete', 0);
54
+
55
+    TD1.appendChild(INPUT);
56
+    TD2.appendChild(SELECT);
57
+
58
+    TR.appendChild(TD1);
59
+    TR.appendChild(TD2);
60
+
61
+    table = document.getElementById('forward_table');
62
+    table.appendChild(TR);
63
+  }
64
+</script>
65
+");
31 66
 /*
32 67
 output("<script type=\"text/javascript\">
33 68
   
... ...
@@ -69,16 +104,6 @@ output("<script type=\"text/javascript\">
69 104
 $form = "
70 105
     <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['domainid'])."</p>";
71 106
 
72
-$form .= "<p><input type=\"checkbox\" id=\"spamfilter\" name=\"spamfilter\" value=\"1\" ".($account['spamfilter'] != NULL ? 'checked="checked" ' : '')." /><label for=\"spamfilter\">&#160;Spam- und Viren-Filter</label></p>";
73
-
74
-$form .= "<p style=\"margin-left: 2em;\" id=\"spamfilter_options\">
75
-  <em>Was soll mit E-Mails geschehen, die als Spam bzw. Virus eingestuft wurden?</em><br />
76
-  <input type=\"radio\" id=\"spamfilter_folder\" name=\"spamfilter_action\" value=\"folder\" ".($account['spamfilter'] == 'folder' ? 'checked="checked" ' : '')."/><label for=\"spamfilter_folder\">&#160;In IMAP-Unterordner »Spam« ablegen</label><br />
77
-  <input type=\"radio\" id=\"spamfilter_tag\" name=\"spamfilter_action\" value=\"tag\" ".($account['spamfilter'] == 'tag' ? 'checked="checked" ' : '')."/><label for=\"spamfilter_tag\">&#160;Markieren und ganz normal zustellen</label><br />
78
-<input type=\"radio\" id=\"spamfilter_delete\" name=\"spamfilter_action\" value=\"delete\" ".($account['spamfilter'] == 'delete' ? 'checked="checked" ' : '')."/><label for=\"spamfilter_delete\">&#160;Löschen</label>
79
-  </p>
80
-  ";
81
-
82 107
 /*  
83 108
 $form .= "<p><input type=\"checkbox\" id=\"virusfilter\" name=\"virusfilter\" value=\"1\" ".($account['virusfilter'] != NULL ? 'checked="checked" ' : '')." /><label for=\"virusfilter\">&#160;Viren-Scanner</label></p>";
84 109
 
... ...
@@ -96,13 +121,42 @@ if ($is_mailbox and ($account['data'] != ''))
96 121
   $password_message = '<span style="font-size: 80%"><br /><em>Sie haben bereits ein Passwort gesetzt. Wenn Sie dieses Feld leer lassen, wird das bisherige Passwort beibehalten.</em></span>';
97 122
   
98 123
 
99
-$form .= "<p>
100
-    <input type=\"radio\" id=\"forward\" name=\"type\" value=\"forward\" ".($is_forward ? 'checked="checked" ' : '')." /><label for=\"forward\">&#160;Weiterleitung an andere E-Mail-Adresse</label></p>
101
-    <p style=\"margin-left: 2em;\" id=\"forward_options\">Weiterleitung an:<br /><textarea id=\"forward_to\" name=\"forward_to\" rows=\"3\">".($is_forward ? str_replace(' ', "\n", $account['data']) : '')."</textarea><br />Sie können mehrere Adressen eingeben, geben Sie dann bitte eine Adresse pro Zeile ein.</p>
102
-    <p><input type=\"radio\" id=\"mailbox\" name=\"type\" value=\"mailbox\" ".($is_mailbox ? 'checked="checked" ' : '')." /><label for=\"mailbox\">&#160;In Mailbox speichern</label></p>
124
+$form .= "
125
+    <p><input type=\"checkbox\" id=\"mailbox\" name=\"type\" value=\"mailbox\" ".($is_mailbox ? 'checked="checked" ' : '')." /><label for=\"mailbox\">&#160;In Mailbox speichern</label></p>
103 126
     <p style=\"margin-left: 2em;\" id=\"mailbox_options\">Passwort für Abruf:&#160;<input type=\"password\" id=\"password\" name=\"password\" value=\"\" />{$password_message}</p>";
127
+
128
+
129
+$form .= "
130
+<p style=\"margin-left: 2em;\" class=\"spamfilter_options\">
131
+  <em>Wählen Sie, was mit unerwünschten E-Mails (Spam, Viren) passieren soll</em><br />
132
+  <input type=\"radio\" id=\"spamfilter_none\" name=\"spamfilter_action\" value=\"none\" ".($account['spamfilter'] == NULL ? 'checked="checked" ' : '')."/><label for=\"spamfilter_none\">&#160;Keine Überprüfung durchführen (alle E-Mails zustellen)</label><br />
133
+  <input type=\"radio\" id=\"spamfilter_folder\" name=\"spamfilter_action\" value=\"folder\" ".($account['spamfilter'] == 'folder' ? 'checked="checked" ' : '')."/><label for=\"spamfilter_folder\">&#160;In IMAP-Unterordner »Spam« ablegen</label><br />
134
+  <input type=\"radio\" id=\"spamfilter_tag\" name=\"spamfilter_action\" value=\"tag\" ".($account['spamfilter'] == 'tag' ? 'checked="checked" ' : '')."/><label for=\"spamfilter_tag\">&#160;Markieren und ganz normal zustellen</label><br />
135
+  <input type=\"radio\" id=\"spamfilter_delete\" name=\"spamfilter_action\" value=\"delete\" ".($account['spamfilter'] == 'delete' ? 'checked="checked" ' : '')."/><label for=\"spamfilter_delete\">&#160;Nicht zustellen (Löschen)</label>
136
+</p>
137
+  ";
138
+
139
+$form .= "<p><input type=\"checkbox\" id=\"forward\" name=\"type\" value=\"forward\" ".($is_forward ? 'checked="checked" ' : '')." /><label for=\"forward\">&#160;Weiterleitung an andere E-Mail-Adressen</label></p>";
140
+
141
+$form .= "<table style=\"margin-left: 2em;\" id=\"forward_table\">
142
+<tr><th>Ziel-Adresse</th><th>Unerwünschte E-Mails</th></tr>
143
+";
144
+
145
+$form .= "
146
+<tr>
147
+  <td><input type=\"text\" id=\"forward_to_1\" name=\"forward_to_1\" value=\"\" /></td>
148
+  <td>
149
+  <select id=\"spamfilter_action_1\" name=\"spamfilter_action_1\">
150
+    <option value=\"none\">kein Filter</option>
151
+    <option value=\"tag\">markieren und zustellen</option>
152
+    <option value=\"delete\">löschen</option>
153
+  </select>
154
+  </td>
155
+</tr>
156
+  ";
104 157
     
105
-$form .= '
158
+$form .= '</table>
159
+  <p style="margin-left: 2em;">[ <a href="#" onclick="moreForward();">mehr Empfänger</a> ]</p>
106 160
   <p><input type="submit" value="Speichern" />&#160;&#160;&#160;&#160;'.internal_link('accounts.php', 'Abbrechen').'</p>';
107 161
 
108 162
 output(html_form('vmail_edit_mailbox', 'save.php', 'action=edit'.($id != 0 ? '&id='.$id : ''), $form));
... ...
@@ -10,12 +10,10 @@ function empty_account()
10 10
 		'id' => NULL,
11 11
 		'local' => '',
12 12
 		'domain' => NULL,
13
-		'type' => 'mailbox',
14
-		'data' => NULL,
13
+		'password' => NULL,
15 14
 		'spamfilter' => 'folder',
16
-		'virusfilter' => NULL,
17 15
 		'spamexpire' => 7,
18
-		'virusexpire' => 7
16
+		'forwards' => array();
19 17
 		);
20 18
 	return $account;
21 19