- Added function for IPv6 prefixes in multiserver mirror setups to nginx pl...

ftimme

2012-11-14 aa78fde6a92f66b84d626e114d8b54a5fb6ece0c

 interface/web/mail/mail_user_edit.php

@@ -73,7 +73,8 @@
      $email = $this->dataRecord["email"];
      $email_parts = explode("@",$email);
      $app->tpl->setVar("email_local_part",$email_parts[0]);
		
      $email_parts[1] = $app->functions->idn_decode($email_parts[1]);
        
      // Getting Domains of the user
      // $sql = "SELECT domain, server_id FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain';
      $sql = "SELECT domain, server_id FROM mail_domain WHERE domain NOT IN (SELECT SUBSTR(source,2) FROM mail_forwarding WHERE type = 'aliasdomain') AND ".$app->tform->getAuthSQL('r')." ORDER BY domain";
@@ -81,6 +82,7 @@
      $domain_select = '';
      if(is_array($domains)) {
         foreach( $domains as $domain) {
                $domain['domain'] = $app->functions->idn_decode($domain['domain']);
            $selected = ($domain["domain"] == @$email_parts[1])?'SELECTED':'';
            $domain_select .= "<option value='$domain[domain]' $selected>$domain[domain]</option>\r\n";
         }
@@ -131,8 +133,8 @@
      
      //* Check if Domain belongs to user
      if(isset($_POST["email_domain"])) {
         $domain = $app->db->queryOneRecord("SELECT server_id, domain FROM mail_domain WHERE domain = '".$app->db->quote($_POST["email_domain"])."' AND ".$app->tform->getAuthSQL('r'));
         if($domain["domain"] != $_POST["email_domain"]) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
         $domain = $app->db->queryOneRecord("SELECT server_id, domain FROM mail_domain WHERE domain = '".$app->db->quote($app->functions->idn_encode($_POST["email_domain"]))."' AND ".$app->tform->getAuthSQL('r'));
         if($domain["domain"] != $app->functions->idn_encode($_POST["email_domain"])) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
      }
      
      
@@ -159,9 +161,9 @@
         
         // Check the quota and adjust
         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 ".$app->tform->getAuthSQL('u'));
            $tmp = $app->db->queryOneRecord("SELECT sum(quota) as mailquota FROM mail_user WHERE mailuser_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
            $mailquota = $tmp["mailquota"] / 1024 / 1024;
            $new_mailbox_quota = intval($this->dataRecord["quota"]);
            $new_mailbox_quota = $app->functions->intval($this->dataRecord["quota"]);
            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>";
@@ -179,7 +181,7 @@
      
      //* compose the email field
      if(isset($_POST["email_local_part"]) && isset($_POST["email_domain"])) {
         $this->dataRecord["email"] = strtolower($_POST["email_local_part"]."@".$_POST["email_domain"]);
         $this->dataRecord["email"] = strtolower($_POST["email_local_part"]."@".$app->functions->idn_encode($_POST["email_domain"]));
      
         // Set the server id of the mailbox = server ID of mail domain.
         $this->dataRecord["server_id"] = $domain["server_id"];
@@ -207,7 +209,7 @@
      
    $sys_config = $app->getconf->get_global_config('mail');
    if($sys_config["enable_custom_login"] == "y") {
        if(!isset($_POST["login"])) $this->dataRecord["login"] = $this->dataRecord["email"];
        if(!isset($_POST["login"]) || $_POST["login"] == '') $this->dataRecord["login"] = $this->dataRecord["email"];
        elseif(strpos($_POST["login"], '@') !== false && $_POST["login"] != $this->dataRecord["email"]) $app->tform->errorMessage .= $app->tform->lng("error_login_email_txt")."<br>";
      } else {
        $this->dataRecord["login"] = isset($this->dataRecord["email"]) ? $this->dataRecord["email"] : '';
@@ -225,11 +227,11 @@
      global $app, $conf;
      
      // Set the domain owner as mailbox owner
      $domain = $app->db->queryOneRecord("SELECT sys_groupid, server_id FROM mail_domain WHERE domain = '".$app->db->quote($_POST["email_domain"])."' AND ".$app->tform->getAuthSQL('r'));
      $domain = $app->db->queryOneRecord("SELECT sys_groupid, server_id FROM mail_domain WHERE domain = '".$app->db->quote($app->functions->idn_encode($_POST["email_domain"]))."' AND ".$app->tform->getAuthSQL('r'));
      $app->db->query("UPDATE mail_user SET sys_groupid = ".$domain["sys_groupid"]." WHERE mailuser_id = ".$this->id);
      
      // Spamfilter policy
      $policy_id = intval($this->dataRecord["policy"]);
      $policy_id = $app->functions->intval($this->dataRecord["policy"]);
      if($policy_id > 0) {
         $tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '".$app->db->quote($this->dataRecord["email"])."'");
         if($tmp_user["id"] > 0) {
@@ -261,11 +263,11 @@
      
      // Set the domain owner as mailbox owner
      if(isset($_POST["email_domain"])) {
         $domain = $app->db->queryOneRecord("SELECT sys_groupid, server_id FROM mail_domain WHERE domain = '".$app->db->quote($_POST["email_domain"])."' AND ".$app->tform->getAuthSQL('r'));
         $domain = $app->db->queryOneRecord("SELECT sys_groupid, server_id FROM mail_domain WHERE domain = '".$app->db->quote($app->functions->idn_encode($_POST["email_domain"]))."' AND ".$app->tform->getAuthSQL('r'));
         $app->db->query("UPDATE mail_user SET sys_groupid = ".$domain["sys_groupid"]." WHERE mailuser_id = ".$this->id);
      
         // Spamfilter policy
         $policy_id = intval($this->dataRecord["policy"]);
         $policy_id = $app->functions->intval($this->dataRecord["policy"]);
         $tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '".$app->db->quote($this->dataRecord["email"])."'");
         if($policy_id > 0) {
            if($tmp_user["id"] > 0) {