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

ftimme

2012-11-14 aa78fde6a92f66b84d626e114d8b54a5fb6ece0c

 interface/web/mail/mail_domain_catchall_edit.php

@@ -55,17 +55,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_mailcatchall 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_mailforward"] >= 0) {
            $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE sys_groupid = $client_group_id and type = 'catchall'");
            if($tmp["number"] >= $client["limit_mailcatchall"]) {
               $app->error($app->tform->wordbook["limit_mailcatchall_txt"]);
            }
         if(!$app->tform->checkClientLimit('limit_mailcatchall',"type = 'catchall'")) {
            $app->error($app->tform->wordbook["limit_mailcatchall_txt"]);
         }
         if(!$app->tform->checkResellerLimit('limit_mailcatchall',"type = 'catchall'")) {
            $app->error('Reseller: '.$app->tform->wordbook["limit_mailcatchall_txt"]);
         }
      }
      
@@ -78,14 +72,16 @@
      $email = $this->dataRecord["source"];
      $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 FROM mail_domain WHERE ".$app->tform->getAuthSQL('r');
      $domains = $app->db->queryAllRecords($sql);
      $domain_select = '';
      if(is_array($domains)) {
         foreach( $domains as $domain) {
            $selected = ($domain["domain"] == $email_parts[1])?'SELECTED':'';
                $domain['domain'] = $app->functions->idn_decode($domain['domain']);
            $selected = (isset($email_parts[1]) && $domain["domain"] == $email_parts[1])?'SELECTED':'';
            $domain_select .= "<option value='$domain[domain]' $selected>$domain[domain]</option>\r\n";
         }
      }
@@ -98,8 +94,8 @@
      global $app, $conf;
      
      // Check if Domain belongs to user
      $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->wordbook["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->wordbook["no_domain_perm"];
      
      // Check the client limits, if user is not the admin
      if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin
@@ -107,7 +103,7 @@
         $client_group_id = $_SESSION["s"]["user"]["default_group"];
         $client = $app->db->queryOneRecord("SELECT limit_mailcatchall 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.
         // Check if the user may add another catchall
         if($this->id == 0 && $client["limit_mailcatchall"] >= 0) {
            $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE sys_groupid = $client_group_id AND type = 'catchall'");
            if($tmp["number"] >= $client["limit_mailcatchall"]) {
@@ -118,7 +114,7 @@
      } // end if user is not admin
             
      // compose the email field
      $this->dataRecord["source"] = "@".$_POST["email_domain"];
      $this->dataRecord["source"] = "@".$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"];
      
@@ -128,6 +124,14 @@
      parent::onSubmit();
   }
   
   function onAfterInsert() {
      global $app;
		
      $domain = $app->db->queryOneRecord("SELECT sys_groupid 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_forwarding SET sys_groupid = ".$domain['sys_groupid']." WHERE forwarding_id = ".$this->id);
		
   }
	
}

$page = new page_action;