webinterface.git

@@ -12,7 +12,7 @@ title("Passwort ändern");

-if ($_POST['password1'] != '')

+if (isset($_POST['password1']) && $_POST['password1'] != '')

 {

   $accname = $_SESSION['mailaccount'];

   check_form_token('email_chpass');

@@ -6,7 +6,7 @@ require_once('inc/security.php');

 require_once('vmail.php');

 $section = 'email_vmail';

-require_role(ROLE_SYSTEMUSER);

+require_role(array(ROLE_SYSTEMUSER, ROLE_VMAIL_ACCOUNT));

 $account = empty_account();

 $id = (isset($_GET['id']) ? (int) $_GET['id'] : 0);

@@ -14,13 +14,26 @@ $id = (isset($_GET['id']) ? (int) $_GET['id'] : 0);

 if ($id != 0)

   $account = get_account_details($id);

+$accountlogin = false;

+if ($_SESSION['role'] == ROLE_VMAIL_ACCOUNT) {

+  $id = get_vmail_id_by_emailaddr($_SESSION['mailaccount']);

+  $account = get_account_details($id, false);

+  $accountlogin = true;

+  $accountname = filter_input_general($_SESSION['mailaccount']);

+}

+

+

 DEBUG($account);

 if ($id == 0) {

   title("E-Mail-Adresse anlegen");

 }

 else {

+  if ($accountlogin) {

+    title("Einstellungen für {$accountname}");

+  } else {

     title("E-Mail-Adresse bearbeiten");

   }

+}

 $is_autoresponder = is_array($account['autoresponder']) && $account['autoresponder']['valid_from'] != NULL;

@@ -84,7 +97,12 @@ output("<script type=\"text/javascript\">

 </script>

 ");

-$form = "

+$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 {

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

@@ -114,7 +131,7 @@ $quota_threshold = ($account['quota_threshold'] >= 0) ? $account['quota_threshol

   $form .= "<p class=\"quota_options\"><input type=\"checkbox\" id=\"quota_notify\" name=\"quota_notify\" value=\"1\" {$quota_notify} /><label for=\"quota_notify\">Benachrichtigung wenn weniger als</label> <input type=\"text\" name=\"quota_threshold\" id=\"quota_threshold\" value=\"{$quota_threshold}\" /> MB Speicherplatz zur Verfügung stehen.</p>";

   $form .= "</div>";

-

+}

@@ -41,11 +41,23 @@ Ihre E-Mail wird nicht weitergeleitet.',

 }

+function get_vmail_id_by_emailaddr($emailaddr) 

+{

+  $emailaddr = mysql_real_escape_string( $emailaddr );

+  $result = db_query("SELECT id FROM mail.v_vmail_accounts WHERE CONCAT(local, '@', domainname) = '{$emailaddr}'");

+  $entry = mysql_fetch_assoc($result);

+  return (int) $entry['id'];

+}

+

 function get_account_details($id, $checkuid = true)

 {

 	$id = (int) $id;

+  $uid_check = '';

+  DEBUG("checkuid: ".$checkuid);

+  if ($checkuid) {

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

-	$uid_check = ($checkuid ? "useraccount='{$uid}' AND " : "");

+    $uid_check = "useraccount='{$uid}' AND ";

+  }

   $result = db_query("SELECT id, local, domain, password, spamfilter, forwards, autoresponder, server, quota, COALESCE(quota_used, 0) AS quota_used, quota_threshold from mail.v_vmail_accounts WHERE {$uid_check}id={$id} LIMIT 1");

 	if (mysql_num_rows($result) == 0)

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

@@ -160,12 +172,12 @@ function get_max_mailboxquota($server, $oldquota) {

 function save_vmail_account($account)

 {

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

+  $accountlogin = ($_SESSION['role'] == ROLE_VMAIL_ACCOUNT);

   $id = $account['id'];

   if ($id != NULL)

   {

     $id = (int) $id;

-    $oldaccount = get_account_details($id);

+    $oldaccount = get_account_details($id, !$accountlogin);

     // Erzeugt einen system_error() wenn ID ungültig

   }

   // Ab hier ist $id sicher, entweder NULL oder eine gültige ID des aktuellen users

@@ -174,6 +186,16 @@ function save_vmail_account($account)

   if ($id === NULL) {

     $newaccount = true;

   }

+

+  if ($accountlogin) {

+    if ($account['domain'] != $oldaccount['domain'])

+      system_failure('Sie können die E-Mail-Adresse nicht ändern!');

+    if ($account['local'] != $oldaccount['local'])

+      system_failure('Sie können die E-Mail-Adresse nicht ändern!');

+    if ($account['quota'] != $oldaccount['quota'])

+      system_failure('Sie können Ihren eigenen Speicherplatz nicht verändern.');

+  } else {

+  

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

     if ($account['local'] == '')

     {

@@ -200,6 +222,7 @@ function save_vmail_account($account)

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

       return false;

     }

+  }

   $forwards = array();

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

@@ -214,6 +237,10 @@ function save_vmail_account($account)

     }

   }

+  if ($accountlogin) {

+    $password = NULL; 

+    $set_password = false;

+  } else {

     $password='NULL';

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

     {

@@ -229,6 +256,7 @@ function save_vmail_account($account)

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

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

       $set_password=true;

+  }  

   $spam = 'NULL';

   switch ($account['spamfilter'])

@@ -244,6 +272,7 @@ function save_vmail_account($account)

       break;

   }

+  if (!$accountlogin) {

     $free = config('vmail_basequota');

     if ($newaccount) {

       // Neues Postfach

@@ -259,6 +288,7 @@ function save_vmail_account($account)

     }

     $account['quota'] = $newquota;

+  }  

   if ($account['quota_threshold'] == -1) {

     $account['quota_threshold'] = 'NULL';

@@ -361,12 +391,15 @@ Wussten Sie schon, dass Sie auf mehrere Arten Ihre E-Mails abrufen können?

   }

   // Update Mail-Quota-Cache

+  if ($_SESSION['role'] == ROLE_SYSTEMUSER) {

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

     $result = db_query("SELECT useraccount, server, SUM(quota-(SELECT value FROM misc.config WHERE `key`='vmail_basequota')) AS quota, SUM(GREATEST(quota_used-(SELECT value FROM misc.config WHERE `key`='vmail_basequota'), 0)) AS used FROM mail.v_vmail_accounts WHERE useraccount=".$uid." GROUP BY useraccount, server");

     while ($line = mysql_fetch_assoc($result)) {

       if ($line['quota'] !== NULL) {

         db_query("REPLACE INTO mail.vmailquota (uid, server, quota, used) VALUES ('{$line['useraccount']}', '{$line['server']}', '{$line['quota']}', '{$line['used']}')");

       }

     }

+  }

   return true;

 }

@@ -8,6 +8,10 @@ require_once('include/hasaccount.php');

 if ($role & ROLE_SYSTEMUSER) {

   $menu["email_vmail"] = array("label" => "E-Mail", "file" => "vmail", "weight" => 3);

 }

+if ($role & ROLE_VMAIL_ACCOUNT)

+{

+  $menu['email_edit'] = array("label" => "Einstellungen", "file" => "edit", "weight" => 10);

+}

 if ($role & (ROLE_VMAIL_ACCOUNT | ROLE_MAILACCOUNT))

 {

   $menu['email_chpass'] = array("label" => "Passwort ändern", "file" => "chpass", "weight" => 15);

@@ -4,7 +4,7 @@ require_once('session/start.php');

 require_once('vmail.php');

-require_role(ROLE_SYSTEMUSER);

+require_role(array(ROLE_SYSTEMUSER, ROLE_VMAIL_ACCOUNT));

 require_once("inc/debug.php");

 global $debugmode;

@@ -13,6 +13,14 @@ global $debugmode;

 if ($_GET['action'] == 'edit')

 {

   check_form_token('vmail_edit_mailbox');

+  $accountlogin = ($_SESSION['role'] == ROLE_VMAIL_ACCOUNT);

+

+  if ($accountlogin) {

+    $id = get_vmail_id_by_emailaddr($_SESSION['mailaccount']);

+    $account = get_account_details($id, false);

+    // Leere das, sonst werden die vervielfacht

+    $account['forwards'] = array();

+  } else {

     $id = (int) $_GET['id'];

     $account = empty_account();

@@ -21,7 +29,6 @@ if ($_GET['action'] == 'edit')

       $account['id'] = $id;

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

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

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

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

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

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

@@ -41,6 +48,8 @@ if ($_GET['action'] == 'edit')

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

     }

+  }

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

   $ar = empty_autoresponder_config();

@@ -113,8 +122,12 @@ if ($_GET['action'] == 'edit')

   save_vmail_account($account);

   if (! ($debugmode || we_have_an_error()))

+    if ($accountlogin) {

+      header('Location: ../index/index');

+    } else {

       header('Location: vmail');

     }

+}

 elseif ($_GET['action'] == 'delete')

 {

   $title = "E-mail-Adresse löschen";

@@ -0,0 +1,70 @@

+<?php

+

+require_once('inc/base.php');

+require_once('inc/icons.php');

+require_once('inc/security.php');

+require_role(ROLE_VMAIL_ACCOUNT);

+

+require_once('include/vmail.php');

+

+$id = get_vmail_id_by_emailaddr($_SESSION['mailaccount']);

+$acc = get_account_details($id, false);

+$actions = array();

+DEBUG($acc);

+

+$content = '<h3>Aktueller Speicherplatzverbrauch</h3>';

+

+$percent = round(( $acc["quota_used"] / $acc["quota"] ) * 100 );

+$color = ( $percent > 95 ? 'red' : ($percent > 75 ? "yellow" : "green" ));

+$width = 2 * min($percent, 100);

+$content .= "<div><div style=\"margin: 2px 0; padding: 0; width: 200px; border: 1px solid black;\"><div style=\"font-size: 1px; background-color: {$color}; height: 10px; width: {$width}px; margin: 0; padding: 0;\">&#160;</div></div> {$acc['quota_used']} MB von {$acc['quota']} MB belegt</div>";

+

+$content .= '<h3>Einstellungen</h3>

+<p>Eingehende E-Mails für Ihre Adresse werden wie folgt verarbeitet:</p>';

+

+$spam = 'ohne Spamfilter';

+switch ($acc['spamfilter'])

+{

+  case 'folder':  $spam = 'Spam in Unterordner';

+    break;

+	case 'tag':	$spam = 'Spam markieren';

+		break;

+	case 'delete':	$spam = 'Spam nicht zustellen';

+  	break;

+}

+$content .= '<p>'.other_icon('go.png')." Ablegen in Ihrer Mailbox ({$spam})</p>";

+

+

+if ($acc['autoresponder']) {

+  $now = date( 'Y-m-d H:i:s' );

+  $valid_from = $acc['autoresponder']['valid_from'];

+  $valid_until = $acc['autoresponder']['valid_until'];

+  if ($valid_from == NULL) {

+    // Autoresponder abgeschaltet

+    //$content .= '<p>'.other_icon('go.png')." Es wird keine automatische Antwort versendet</p>"; 

+  } elseif ($valid_from > $now) {

+    $content .= '<p>'.other_icon('go.png')." Es wird ab dem {$valid_from} eine automatische Antwort versendet</p>"; 

+  } elseif ($valid_until == NULL) {

+    $content .= '<p>'.other_icon('go.png')." Es wird eine automatische Antwort versendet</p>"; 

+  } elseif ($valid_until > $now) {

+    $content .= '<p>'.other_icon('go.png')." Es wird eine automatische Antwort versendet, jedoch nicht mehr ab dem {$valid_until}</p>"; 

+  } elseif ($valid_until < $now) {

+    $content .= '<p>'.other_icon('go.png')." Es wird seit dem {$valid_until} keine automatische Antwort mehr versendet</p>"; 

+  }

+}

+

+foreach ($acc['forwards'] AS $fwd)

+{

+ 	$spam = 'ohne Spamfilter';

+  switch ($fwd['spamfilter'])

+	{

+	  case 'tag':	$spam = 'Spam markieren';

+			break;

+		case 'delete':	$spam = 'Spam nicht zustellen';

+			break;

+	}

+	$fwd['destination'] = filter_input_general($fwd['destination']);

+  $content .= '<p>'.other_icon('go.png')." Weiterleitung an <strong>{$fwd['destination']}</strong> ({$spam})</p>"; 

+}

+

+?>

@@ -60,6 +60,10 @@ if (have_module('email') && ($_SESSION['role'] & ROLE_MAILACCOUNT || $_SESSION['

   output("<div class=\"block\">".internal_link("../email/chpass", "<img src=\"{$prefix}images/pwchange.png\" alt=\"\" /> Passwort ändern ")."</div>");

 }

+if (have_module('email') && ($_SESSION['role'] & ROLE_VMAIL_ACCOUNT)) {

+  output("<div class=\"block\">".internal_link("../email/edit", "<img src=\"{$prefix}images/cog.png\" alt=\"\" /> E-Mail-Einstellungen ")."</div>");

+}

+

 if ($_SESSION['role'] & ROLE_CUSTOMER || $_SESSION['role'] & ROLE_SYSTEMUSER) {

   output("<div class=\"block\">".internal_link("chpass", "<img src=\"{$prefix}images/pwchange.png\" alt=\"\" /> Passwort ändern ")."</div>");

 }

@@ -93,4 +97,10 @@ if (have_module('jabber') && $_SESSION['role'] & ROLE_CUSTOMER) {

 output("</div>");

+if (have_module('email') && $_SESSION['role'] & ROLE_VMAIL_ACCOUNT) {

+  include('modules/email/vmailoverview.php');

+  output("<div class=\"vmailoverview\">".$content."</div>");

+}

+

+

 ?>

@@ -228,12 +228,16 @@ div.content {

 }

 /*        overflow: hidden; */

-div.overview {

+div.vmailoverview {

+}

+

+.overview {

   margin: 2em;

+  overflow: auto;

+  width: 100%;

   max-width: 50em;

 }

-

-div.overview div.block {

+.overview div.block {

   float: left;

   margin: 1em;

   padding: 1em;

@@ -244,7 +248,7 @@ div.overview div.block {

   background-color: #eee;

 }

-div.overview div.block img {

+.overview div.block img {

   display: block;

   margin: 0 auto;

   margin-bottom: 1em;

@@ -252,7 +256,7 @@ div.overview div.block img {

 }

 /*

-div.overview div.block a {

+.overview div.block a {

   color: #000;

 }

 */