Fixed a problem with maildir quota.

tbrehm

2009-09-04 4bf11863ef7f29b45f02a0fa90d4ec75f19b722f

 interface/web/mail/mail_user_edit.php

@@ -56,17 +56,11 @@
      
      // we will check only users, not admins
      if($_SESSION["s"]["user"]["typ"] == 'user') {
			
         // Get the limits of the client
         $client_group_id = $_SESSION["s"]["user"]["default_group"];
         $client = $app->db->queryOneRecord("SELECT limit_mailbox FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
			
         // Check if the user may add another mailbox.
         if($client["limit_mailbox"] >= 0) {
            $tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE sys_groupid = $client_group_id");
            if($tmp["number"] >= $client["limit_mailbox"]) {
               $app->error($app->tform->wordbook["limit_mailbox_txt"]);
            }
         if(!$app->tform->checkClientLimit('limit_mailbox')) {
            $app->error($app->tform->wordbook["limit_mailbox_txt"]);
         }
         if(!$app->tform->checkResellerLimit('limit_mailbox')) {
            $app->error('Reseller: '.$app->tform->wordbook["limit_mailbox_txt"]);
         }
      }
      
@@ -81,7 +75,7 @@
      $app->tpl->setVar("email_local_part",$email_parts[0]);
      
      // Getting Domains of the user
      $sql = "SELECT domain FROM mail_domain WHERE ".$app->tform->getAuthSQL('r');
      $sql = "SELECT domain FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain';
      $domains = $app->db->queryAllRecords($sql);
      $domain_select = '';
      if(is_array($domains)) {
@@ -111,7 +105,7 @@
      unset($tmp_user);
      
      // Convert quota from Bytes to MB
      $app->tpl->setVar("quota",$this->dataRecord["quota"] / 1024 / 1024);
      if($this->dataRecord["quota"] != -1) $app->tpl->setVar("quota",$this->dataRecord["quota"] / 1024 / 1024);
      
      parent::onShowEnd();
   }
@@ -166,7 +160,7 @@

      //* compose the email field
      if(isset($_POST["email_local_part"]) && isset($_POST["email_domain"])) {
         $this->dataRecord["email"] = $_POST["email_local_part"]."@".$_POST["email_domain"];
         $this->dataRecord["email"] = strtolower($_POST["email_local_part"]."@".$_POST["email_domain"]);
      
         // Set the server id of the mailbox = server ID of mail domain.
         $this->dataRecord["server_id"] = $domain["server_id"];
@@ -175,7 +169,7 @@
         unset($this->dataRecord["email_domain"]);
      
         // Convert quota from MB to Bytes
         $this->dataRecord["quota"] = $this->dataRecord["quota"] * 1024 * 1024;
         if($this->dataRecord["quota"] != -1) $this->dataRecord["quota"] = $this->dataRecord["quota"] * 1024 * 1024;
      
         // setting Maildir, Homedir, UID and GID
         $app->uses('getconf');
@@ -188,7 +182,7 @@
         $this->dataRecord["gid"] = $mail_config["mailuser_gid"];
         
         //* Check if there is no alias or forward with this address
         $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE source = '".$app->db->quote($this->dataRecord["email"])."'");
         $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE active = 'y' AND source = '".$app->db->quote($this->dataRecord["email"])."'");
         if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("duplicate_alias_or_forward_txt")."<br>";
         unset($tmp);