Implemented: FS#757 - Add "custom" option to transports

tbrehm

2009-10-28 66c3bc24f069a2854bdf1eeebb6dcb51f6ef0afb

 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();
   }
@@ -148,11 +142,11 @@
         }
         
         // Check the quota and adjust
         if($client["limit_mailquota"] >= 0) {
         if(isset($_POST["quota"]) && $client["limit_mailquota"] >= 0) {
            $tmp = $app->db->queryOneRecord("SELECT sum(quota) as mailquota FROM mail_user WHERE mailuser_id != ".intval($this->id)." AND sys_groupid = $client_group_id");
            $mailquota = $tmp["mailquota"] / 1024 / 1024;
            $new_mailbox_quota = intval($this->dataRecord["quota"]);
            if($mailquota + $new_mailbox_quota > $client["limit_mailquota"]) {
            if(($mailquota + $new_mailbox_quota > $client["limit_mailquota"]) || ($new_mailbox_quota == 0 && $client["limit_mailquota"] != -1)) {
               $max_free_quota = $client["limit_mailquota"] - $mailquota;
               $app->tform->errorMessage .= $app->tform->lng("limit_mailquota_txt").": ".$max_free_quota."<br>";
               // Set the quota field to the max free space
@@ -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,20 +169,20 @@
         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');
         $mail_config = $app->getconf->get_server_config($domain["server_id"],'mail');
         $maildir = str_replace("[domain]",$domain["domain"],$mail_config["maildir_path"]);
         $maildir = str_replace("[localpart]",$_POST["email_local_part"],$maildir);
         $maildir = str_replace("[localpart]",strtolower($_POST["email_local_part"]),$maildir);
         $this->dataRecord["maildir"] = $maildir;
         $this->dataRecord["homedir"] = $mail_config["homedir_path"];
         $this->dataRecord["uid"] = $mail_config["mailuser_uid"];
         $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);
         
@@ -238,7 +232,7 @@
         } else {
            // We create a new record
            $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `priority`, `policy_id`, `email`, `fullname`, `local`) 
                    VALUES (".$_SESSION["s"]["user"]["userid"].", ".$domain["sys_groupid"].", 'riud', 'riud', '', ".$domain["server_id"].", 1, ".$policy_id.", '".mysql_real_escape_string($this->dataRecord["email"])."', '".mysql_real_escape_string($this->dataRecord["email"])."', 'Y')";
                    VALUES (".$_SESSION["s"]["user"]["userid"].", ".$domain["sys_groupid"].", 'riud', 'riud', '', ".$domain["server_id"].", 10, ".$policy_id.", '".mysql_real_escape_string($this->dataRecord["email"])."', '".mysql_real_escape_string($this->dataRecord["email"])."', 'Y')";
            $app->db->datalogInsert('spamfilter_users', $insert_data, 'id');
         }
      }  // endif spamfilter policy
@@ -263,7 +257,7 @@
            } else {
               // We create a new record
               $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `priority`, `policy_id`, `email`, `fullname`, `local`) 
                       VALUES (".$_SESSION["s"]["user"]["userid"].", ".$domain["sys_groupid"].", 'riud', 'riud', '', ".$domain["server_id"].", 1, ".$policy_id.", '".mysql_real_escape_string($this->dataRecord["email"])."', '".mysql_real_escape_string($this->dataRecord["email"])."', 'Y')";
                       VALUES (".$_SESSION["s"]["user"]["userid"].", ".$domain["sys_groupid"].", 'riud', 'riud', '', ".$domain["server_id"].", 10, ".$policy_id.", '".mysql_real_escape_string($this->dataRecord["email"])."', '".mysql_real_escape_string($this->dataRecord["email"])."', 'Y')";
               $app->db->datalogInsert('spamfilter_users', $insert_data, 'id');
            }
         }else {