webinterface.git

@@ -90,6 +90,15 @@ $form .= "

 $form.= "<p style=\"margin-left: 2em;\" 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>";

+$quota = 256;

+if ($is_mailbox and $account['quota']) {

+  $quota = $account['quota'];

+}

+

+$form .= "<p style=\"margin-left: 2em;\" class=\"quota_options\">Größe des Postfachs: <input type=\"text\" id=\"quota\" name=\"quota\" value=\"{$quota}\" /> MB<br /><span style=\"font-size: 80%\"><em>Hinweis: Die Differenz zwischen dem hier gesetzten Wert und dem Sockelbetrag von ".config('vmail_basequota')." MB wird vom Speicherplatz Ihres Benutzer-Kontos angezogen.</em></span></p>";

+

+

+

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

@@ -15,6 +15,7 @@ function empty_account()

 		'password' => NULL,

 		'spamfilter' => 'folder',

 		'spamexpire' => 7,

+                'quota' => 256,

 		'forwards' => array()

 		);

 	return $account;

@@ -197,6 +198,8 @@ function save_vmail_account($account)

       break;

   }

+  $account['quota'] = max((int) config('vmail_basequota'), (int) $account['quota']);

+

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

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

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

@@ -204,8 +207,8 @@ function save_vmail_account($account)

   $query = '';

   if ($id == NULL)

   {

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

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

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

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

   }

   else

   {

@@ -214,7 +217,7 @@ function save_vmail_account($account)

     else

       $password='';

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

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

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

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

   }

   db_query($query); 

@@ -237,11 +240,20 @@ function save_vmail_account($account)

     }

     db_query($forward_query);

   }

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

+  if ($password != 'NULL')

   {

     # notify the vmail subsystem of this new account

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

   }

+

+  // Update Mail-Quota-Cache

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

 }

@@ -32,6 +32,9 @@ if ($_GET['action'] == 'edit')

     $account['password'] = NULL;

     $account['spamfilter'] = 'none';

   }

+  if (isset($_POST['quota'])) {

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

+  }

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

   {

@@ -26,11 +26,23 @@ else

     $quota = array();

     foreach ($usedquota as $q)

     {

-      $percent = round(( $q["used"] / $q["quota"] ) * 100 );

+      $mailbar = '';

+      $mailstring = '';

+      $mailpercent = round(( $q['mailquota'] / $q["systemquota"]) * 100);

+      $mailwidth = 2 * min($mailpercent, 100);

+

+      if ($q["mailquota"] > 0) {

+	$mailstring = "<br />(davon {$q["mailquota"]} MB für Postfächer reserviert)";

+        $mailbar = "<div style=\"font-size: 1px; background-color: blue; height: 10px; width: {$mailwidth}px; margin: 0; padding: 0; float: left;\">&#160;</div>";

+      }  

+

+      $percent = round(( ($q["systemquota_used"]+$q["mailquota"]) / $q["systemquota"] ) * 100 );

       $color = ( $percent > 99 ? 'red' : ($percent > 80 ? "yellow" : "green" ));

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

-      $quota[] = "<p>Server <strong>{$q['server']}</strong><br />{$percent}%: {$q['used']} MB von {$q['quota']} MB belegt.</p> 

-        <div style=\"margin: 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>";

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

+     

+      $used_space = $q['systemquota_used'] + $q['mailquota'];

+      $quota[] = "<p>Server <strong>{$q['server']}</strong><br />{$percent}%: {$used_space} MB von {$q['systemquota']} MB belegt{$mailstring}.</p> 

+        <div style=\"margin: 0; padding: 0; width: 200px; border: 1px solid black;\">{$mailbar}<div style=\"font-size: 1px; background-color: {$color}; height: 10px; width: {$width}px; margin: 0; margin-left: {$mailwidth}px; padding: 0;\">&#160;</div></div>";

     }

     $realname = $acc['name'] ? $acc['name'] : $_SESSION['customerinfo']['name'];

@@ -73,7 +73,7 @@ function get_account_details($uid, $customerno=0)

 function get_used_quota($uid)

 {

   $uid = (int) $uid;

-  $result = db_query("SELECT s.hostname AS server, used, COALESCE(us.quota, u.quota) AS quota FROM system.usedquota AS uq LEFT JOIN system.useraccounts AS u USING (uid) LEFT JOIN system.servers AS s ON (s.id=uq.server) LEFT JOIN system.user_server AS us ON (us.uid=uq.uid AND us.server=uq.server) WHERE uq.uid='{$uid}'");

+  $result = db_query("SELECT s.hostname AS server, systemquota, systemquota_used, mailquota, mailquota_used FROM system.v_quota AS q LEFT JOIN system.servers AS s ON (s.id=q.server) WHERE uid='{$uid}'");

   $ret = array();

   while ($line = mysql_fetch_assoc($result))

     $ret[] = $line;