- Added (clickable) placeholders to client messaging function. - Added chec...

ftimme

2012-05-30 2cb1563f63386b35a69e460051aa9b4a2851d104

 interface/web/mail/mail_forward_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_mailforward 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 = 'forward'");
            if($tmp["number"] >= $client["limit_mailforward"]) {
               $app->error($app->tform->wordbook["limit_mailforward_txt"]);
            }
         if(!$app->tform->checkClientLimit('limit_mailforward',"type = 'forward'")) {
            $app->error($app->tform->wordbook["limit_mailforward_txt"]);
         }
         if(!$app->tform->checkResellerLimit('limit_mailforward',"type = 'forward'")) {
            $app->error('Reseller: '.$app->tform->wordbook["limit_mailforward_txt"]);
         }
      }
      
@@ -80,7 +74,8 @@
      $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';
      $sql = "SELECT domain 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";
      $domains = $app->db->queryAllRecords($sql);
      $domain_select = '';
      foreach( $domains as $domain) {
@@ -123,8 +118,8 @@
      unset($this->dataRecord["email_local_part"]);
      unset($this->dataRecord["email_domain"]);
      
      //* Check if there is no mailbox with this address
      $tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE email = '".$app->db->quote($this->dataRecord["source"])."'");
      //* Check if there is no active mailbox with this address
      $tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE postfix = 'y' AND email = '".$app->db->quote($this->dataRecord["source"])."'");
      if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("duplicate_mailbox_txt")."<br>";
      unset($tmp);