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

ftimme

2012-05-30 2cb1563f63386b35a69e460051aa9b4a2851d104

 interface/web/mail/mail_transport_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_mailrouting 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 transport.
         if($client["limit_mailrouting"] >= 0) {
            $tmp = $app->db->queryOneRecord("SELECT count(transport_id) as number FROM mail_transport WHERE sys_groupid = $client_group_id");
            if($tmp["number"] >= $client["limit_mailrouting"]) {
               $app->error($app->tform->wordbook["limit_mailrouting_txt"]);
            }
         if(!$app->tform->checkClientLimit('limit_mailrouting')) {
            $app->error($app->tform->wordbook["limit_mailrouting_txt"]);
         }
         if(!$app->tform->checkResellerLimit('limit_mailrouting')) {
            $app->error('Reseller: '.$app->tform->wordbook["limit_mailrouting_txt"]);
         }
      }
      
@@ -77,15 +71,21 @@
      global $app, $conf;
      
      $tmp_parts = explode(":",$this->dataRecord["transport"]);
      if(empty($this->id) && empty($tmp_parts[0])) {
         $rec["type"] = 'smtp';
      if(!empty($this->id) && !stristr($this->dataRecord["transport"],':')) {
         $rec["type"] = 'custom';
      } else {
         $rec["type"] = $tmp_parts[0];
         if(empty($this->id) && empty($tmp_parts[0])) {
            $rec["type"] = 'smtp';
         } else {
            $rec["type"] = $tmp_parts[0];
         }
      }
      if(@$tmp_parts[2] != '') {
      if(!empty($tmp_parts[2])) {
         $dest = @$tmp_parts[1].':'.@$tmp_parts[2];
      } else {
      } elseif(!empty($tmp_parts[1])) {
         $dest = $tmp_parts[1];
      } else {
         $dest = $this->dataRecord["transport"];
      }
      if(@substr($dest,0,1) == '[') {
         $rec["mx"] = 'checked="CHECKED"';
@@ -95,7 +95,7 @@
         $rec["destination"] = @$dest;
      }
      
      $types = array('smtp' => 'smtp','uucp' => 'uucp','slow' => 'slow', 'error' => 'error', '' => 'null');
      $types = array('smtp' => 'smtp','uucp' => 'uucp','slow' => 'slow', 'error' => 'error', 'custom' => 'custom','' => 'null');
      $type_select = '';
      if(is_array($types)) {
         foreach( $types as $key => $val) {
@@ -157,7 +157,13 @@
      } else {
         $transport = $this->dataRecord["destination"];
      }
      $this->dataRecord["transport"] = $this->dataRecord["type"].':'.$transport;
		
      if($this->dataRecord["type"] == 'custom') {
         $this->dataRecord["transport"] = $transport;
      } else {
         $this->dataRecord["transport"] = $this->dataRecord["type"].':'.$transport;
      }
		
      unset($this->dataRecord["type"]);
      unset($this->dataRecord["mx"]);
      unset($this->dataRecord["destination"]);