Fixed: - log parsing did not recognize lines with multiple recipients - s...

mcramer

2012-11-01 9cb77e00c93ad86c95e23b9377bcf2f92da9c75a

 interface/lib/classes/validate_client.inc.php

@@ -36,18 +36,24 @@
   function username_unique($field_name, $field_value, $validator) {
      global $app;
      
      if($app->tform->action == 'NEW') {
      if(isset($app->remoting_lib->primary_id)) {
         $client_id = $app->remoting_lib->primary_id;
      } else {
         $client_id = $app->tform->primary_id;
      }
		
      if($client_id == 0) {
           $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM sys_user WHERE username = '".$app->db->quote($field_value)."'");
               if($num_rec["number"] > 0) {
                   $errmsg = $validator['errmsg'];
               if(isset($this->wordbook[$errmsg])) {
               if(isset($app->tform->wordbook[$errmsg])) {
                       return $app->tform->wordbook[$errmsg]."<br>\r\n";
               } else {
                  return $errmsg."<br>\r\n";
               }
                }
        } else {
           $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM sys_user WHERE username = '".$app->db->quote($field_value)."' AND client_id != ".$app->tform->primary_id);
           $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM sys_user WHERE username = '".$app->db->quote($field_value)."' AND client_id != ".$client_id);
         if($num_rec["number"] > 0) {
               $errmsg = $validator['errmsg'];
                if(isset($app->tform->wordbook[$errmsg])) {
@@ -59,6 +65,36 @@
      }
   }
   
   function username_collision($field_name, $field_value, $validator) {
      global $app;
		
      if(isset($app->remoting_lib->primary_id)) {
         $client_id = $app->remoting_lib->primary_id;
      } else {
         $client_id = $app->tform->primary_id;
      }
		
      $app->uses('getconf');
      $global_config = $app->getconf->get_global_config('sites');
		
      if((trim($field_value) == 'web' || preg_match('/^web[0-9]/',$field_value)) && 
        ($global_config['ftpuser_prefix'] == '[CLIENTNAME]' || 
         $global_config['ftpuser_prefix'] == '' ||
         $global_config['shelluser_prefix'] == '[CLIENTNAME]' ||
         $global_config['shelluser_prefix'] == '' )) {
         $errmsg = $validator['errmsg'];
         if(isset($app->tform->wordbook[$errmsg])) {
            return $app->tform->wordbook[$errmsg]."<br>\r\n";
         } else {
            return $errmsg."<br>\r\n";
         }
      }
		
		
		
		
   }