webinterface.git

@@ -11,15 +11,13 @@ $accounts = get_vmail_accounts();

 output('<h3>E-Mail-Accounts</h3>

 <p>Folgende E-Mail-Konten sind eingerichtet:</p>

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

-<tr><th>Adresse</th><th>Aktion</th><th>...</th><th>&#160;</th></tr>

+<tr><th>Adresse</th><th>...</th><th>&#160;</th></tr>

 ');

         foreach ($accounts as $account)

         {

-	    $action = ($account['type'] == 'mailbox' ? 'Speichern in Postfach' : 'Weiterleiten an '.filter_input_general($account['data']));

             output('<tr>

             <td>'.internal_link('edit.php', $account['local'].'@'.$account['domain'], 'id='.$account['id']).'</td>

-            <td>'.$action.'</td>

             <td><a href="save.php?action=delete&amp;id='.$account['id'].'">löschen</a></td></tr>');

         }

         output('</table>

@@ -25,12 +25,13 @@ else {

 }

-$is_forward = ($account['type'] == 'forward');

-$is_mailbox = ( ! $is_forward);

+$is_forward = (count($account['forwards']) > 0);

+$is_mailbox = ($account['password'] != NULL  ||  $id == 0);

+$numforwards = max(count($account['forwards']), 1);

 output("<script type=\"text/javascript\">

-  var numForwards = 1;

+  var numForwards = {$numforwards};

   function moreForward()

   {

@@ -117,12 +118,12 @@ $form .= "<p style=\"margin-left: 2em;\" id=\"virusfilter_options\">

 */

 $password_message = '';

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

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

   $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>';

 $form .= "

-    <p><input type=\"checkbox\" id=\"mailbox\" name=\"type\" value=\"mailbox\" ".($is_mailbox ? 'checked="checked" ' : '')." /><label for=\"mailbox\">&#160;In Mailbox speichern</label></p>

+    <p><input type=\"checkbox\" id=\"mailbox\" name=\"mailbox\" value=\"yes\" ".($is_mailbox ? 'checked="checked" ' : '')." /><label for=\"mailbox\">&#160;In Mailbox speichern</label></p>

     <p style=\"margin-left: 2em;\" id=\"mailbox_options\">Passwort für Abruf:&#160;<input type=\"password\" id=\"password\" name=\"password\" value=\"\" />{$password_message}</p>";

@@ -136,24 +137,38 @@ $form .= "

 </p>

   ";

-$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>";

+$form .= "<p><input type=\"checkbox\" id=\"forward\" name=\"forward\" value=\"yes\" ".($is_forward ? 'checked="checked" ' : '')." /><label for=\"forward\">&#160;Weiterleitung an andere E-Mail-Adressen</label></p>";

 $form .= "<table style=\"margin-left: 2em;\" id=\"forward_table\">

 <tr><th>Ziel-Adresse</th><th>Unerwünschte E-Mails</th></tr>

 ";

+if ($is_forward)

+{

+  for ($i = 0 ; $i < $numforwards ; $i++)

+  {

+  $num = $i+1;

+  $form .= "

+<tr>

+  <td><input type=\"text\" id=\"forward_to_{$num}\" name=\"forward_to_{$num}\" value=\"{$account['forwards'][$i]['destination']}\" /></td>

+  <td>

+  ".html_select('spamfilter_action_'.$num, array("none" => 'kein Filter', "tag" => 'markieren und zustellen', "delete" => 'löschen'), $account['forwards'][$i]['spamfilter'])."

+  </td>

+</tr>

+";

+  }

+}

+else

+{

   $form .= "

 <tr>

   <td><input type=\"text\" id=\"forward_to_1\" name=\"forward_to_1\" value=\"\" /></td>

   <td>

-  <select id=\"spamfilter_action_1\" name=\"spamfilter_action_1\">

-    <option value=\"none\">kein Filter</option>

-    <option value=\"tag\">markieren und zustellen</option>

-    <option value=\"delete\">löschen</option>

-  </select>

+  ".html_select('spamfilter_action_1', array("none" => 'kein Filter', "tag" => 'markieren und zustellen', "delete" => 'löschen'), "none")."

   </td>

 </tr>

   ";

+}

 $form .= '</table>

   <p style="margin-left: 2em;">[ <a href="#" onclick="moreForward();">mehr Empfänger</a> ]</p>

@@ -13,7 +13,7 @@ function empty_account()

 		'password' => NULL,

 		'spamfilter' => 'folder',

 		'spamexpire' => 7,

-		'forwards' => array();

+		'forwards' => array()

 		);

 	return $account;

@@ -23,11 +23,23 @@ function get_account_details($id)

 {

 	$id = (int) $id;

 	$uid = (int) $_SESSION['userinfo']['uid'];

-	$result = db_query("SELECT id, local, domainid as domain, type, data, spamfilter, virusfilter from mail.v_virtual_mail WHERE useraccount='{$uid}' AND id={$id} LIMIT 1");

+	$result = db_query("SELECT id, local, domain, password, spamfilter, forwards from mail.v_vmail_accounts WHERE useraccount='{$uid}' AND id={$id} LIMIT 1");

 	if (mysql_num_rows($result) == 0)

 		system_failure('Ungültige ID oder kein eigener Account');

-	return mysql_fetch_assoc($result);;

-	

+	$acc = empty_account();

+	$res = mysql_fetch_assoc($result);

+	foreach ($res AS $key => $value) {

+	  if ($key == 'forwards')

+	    continue;

+	  $acc[$key] = $value;

+	}

+	if ($acc['forwards'] > 0) {

+	  $result = db_query("SELECT id, spamfilter, destination FROM mail.vmail_forward WHERE account={$acc['id']};");

+	  while ($item = mysql_fetch_assoc($result)){

+	    array_push($acc['forwards'], array("id" => $item['id'], 'spamfilter' => $item['spamfilter'], 'destination' => $item['destination']));

+	  }

+	}

+	return $acc;

 }

 function get_vmail_accounts()

@@ -124,50 +136,40 @@ function save_vmail_account($account)

     input_error('Bitte wählen Sie eine Ihrer Domains aus!');

     return false;

   }

-  $type = NULL;

-  switch ($account['type'])

+  

+  $forwards = array();

+  if (count($account['forwards']) > 0) 

   {

-    case 'forward':

-                     $forward_to = preg_split("/[\s,]+/", $account['data']);

-		     foreach ($forward_to as $addr)

+    for ($i=0;$i < count($account['forwards']); $i++)

     {

-                       $addr = filter_input_general($addr);

-                       if (! check_emailaddr($addr))

-                         system_failure('Das Weiterleitungs-Ziel »'.$addr.'« ist keine E-Mail-Adresse!');

+      if ($account['forwards'][$i]['spamfilter'] != 'tag' && $account['forwards'][$i]['spamfilter'] != 'delete')

+        $account['forwards'][$i]['spamfilter'] = '';

+      $account['forwards'][$i]['destination'] = filter_input_general($account['forwards'][$i]['destination']);

+      if (! check_emailaddr($account['forwards'][$i]['destination']))

+        system_failure('Das Weiterleitungs-Ziel »'.$account['forwards'][$i]['destination'].'« ist keine E-Mail-Adresse!');

     }

-		     $account['data'] = implode(' ', $forward_to);

-		     $type = 'forward';

-                     break;

-    case 'mailbox':

-                     $account['data'] = stripslashes($account['data']);

-                     if ($account['data'] != '')

+  }

+    

+  $password='NULL';

+  if ($account['password'] != '')

   {

-                       $crack = strong_password($account['data']);

+    $account['password'] = stripslashes($account['password']);

+    $crack = strong_password($account['password']);

     if ($crack !== true)

     {

       input_error('Ihr Passwort ist zu einfach. bitte wählen Sie ein sicheres Passwort!'."\nDie Fehlermeldung lautet: »{$crack}«");

       return false;

     }

-                       $account['data'] = encrypt_mail_password($account['data']);

-                     }

-                     $type = 'mailbox';

-                     break;

-  }

-  if ($type == NULL)

-  {

-    input_error('Problem mit der »type«-Variable!');

-    return false;

+    $password = "'".encrypt_mail_password($account['password'])."'";

   }

+  $set_password = ($id == NULL || $password != 'NULL');

+  if ($account['password'] === NULL)

+    $set_password=true;

   $spam = 'NULL';

   switch ($account['spamfilter'])

   {

     case 'folder':

-      if ($type == 'forward')

-      {

-        input_error('Sie können nicht in einen IMAP-Unterordner zustellen lassen, wenn Sie gar kein IMAP-Konto anlegen!');

-	return false;

-      }

       $spam = "'folder'";

       break;

     case 'tag':

@@ -178,48 +180,43 @@ function save_vmail_account($account)

       break;

   }

-  $virus = 'NULL';

-  switch ($account['virusfilter'])

-  {

-    case 'folder':

-      if ($type == 'forward')

-      {

-        input_error('Sie können nicht in einen IMAP-Unterordner zustellen lassen, wenn Sie gar kein IMAP-Konto anlegen!');

-	return false;

-      }

-      $virus = "'folder'";

-      break;

-    case 'tag':

-      $virus = "'tag'";

-      break;

-    case 'delete':

-      $virus = "'delete'";

-      break;

-  }

-

   $account['local'] = mysql_real_escape_string($account['local']);

-  $account['data'] = mysql_real_escape_string($account['data']);

+  $account['password'] = mysql_real_escape_string($account['password']);

   $account['spamexpire'] = (int) $account['spamexpire'];

-  $account['virusexpire'] = (int) $account['virusexpire'];

   $query = '';

   if ($id == NULL)

   {

-    $query = "INSERT INTO mail.virtual_mail (local, domain, type, data, spamfilter, virusfilter, spamexpire, virusexpire) VALUES ";

-    $query .= "('{$account['local']}', {$account['domain']}, '{$type}', '{$account['data']}', {$spam}, {$virus}, {$account['spamexpire']}, {$account['virusexpire']});";

+    $query = "INSERT INTO mail.vmail_accounts (local, domain, spamfilter, spamexpire, password) VALUES ";

+    $query .= "('{$account['local']}', {$account['domain']}, {$spam}, {$account['spamexpire']}, {$account['password']});";

   }

   else

   {

-    $password = ", data='{$account['data']}'";

-    if ($account['data'] == '')

+    if ($set_password)

+      $password=", password={$password}";

+    else

       $password='';

-    $query = "UPDATE mail.virtual_mail SET local='{$account['local']}', domain={$account['domain']}, type='{$type}'{$password}, ";

-    $query .= "spamfilter={$spam}, virusfilter={$virus}, spamexpire={$account['spamexpire']}, virusexpire={$account['virusexpire']} ";

+    $query = "UPDATE mail.vmail_accounts SET local='{$account['local']}', domain={$account['domain']}{$password}, ";

+    $query .= "spamfilter={$spam}, spamexpire={$account['spamexpire']} ";

     $query .= "WHERE id={$id} LIMIT 1;";

   }

   db_query($query); 

-

-  if ($type == 'mailbox')

+  db_query("DELETE FROM mail.vmail_forward WHERE account={$id}");

+  if (count($account['forwards']) > 0)

+  {

+    $forward_query = "INSERT INTO mail.vmail_forward (account,spamfilter,destination) VALUES ";

+    $first = true;

+    for ($i=0;$i < count($account['forwards']); $i++)

+    { 

+      if ($first)

+        $first = false;

+      else

+        $forward_query .= ', ';

+      $forward_query .= "({$id}, ".maybe_null($account['forwards'][$i]['spamfilter']).", '{$account['forwards'][$i]['destination']}')";

+    }

+    db_query($forward_query);

+  }

+  if ($account['password'] != 'NULL')

   {

     # notify the vmail subsystem of this new account

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

@@ -231,7 +228,7 @@ function save_vmail_account($account)

 function delete_account($id)

 {

   $account = get_account_details($id);

-  db_query("DELETE FROM mail.virtual_mail WHERE id={$account['id']};");

+  db_query("DELETE FROM mail.vmail_accounts WHERE id={$account['id']};");

 }

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

     $account['id'] = $id;

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

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

-  $account['type'] = $_POST['type'];

-  if ($_POST['type'] == 'mailbox')

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

-  else

-    $account['data'] = $_POST['forward_to'];

   $account['spamfilter'] = $_POST['spamfilter_action'];

-  if ($_POST['spamfilter'] != '1')

-    $account['spamfilter'] = NULL;

-  $account['virusfilter'] = $_POST['virusfilter_action'];

-  if ($_POST['virusfilter'] != '1')

-    $account['virusfilter'] = NULL;

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

+  if ($_POST['mailbox'] != 'yes')

+    $account['password'] = NULL;

+

+  if ($_POST['forward'] == 'yes')

+  {

+    $num = 1;

+    while (true)

+    {

+      if (! isset($_POST['forward_to_'.$num]))

+        break;

+      $fwd = array("spamfilter" => $_POST['spamfilter_action_'.$num], "destination" => $_POST['forward_to_'.$num]);

+      array_push($account['forwards'], $fwd);

+      $num++;

+    }

+  }

   DEBUG($account);