From 7fe908c50c8dbc5cc05f571dbe11d66141caacd4 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Thu, 14 Nov 2013 09:01:22 -0500 Subject: [PATCH] Cleaning up code to match coding guidelines --- interface/lib/classes/validate_client.inc.php | 72 ++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/interface/lib/classes/validate_client.inc.php b/interface/lib/classes/validate_client.inc.php index 36370ab..6bd0015 100644 --- a/interface/lib/classes/validate_client.inc.php +++ b/interface/lib/classes/validate_client.inc.php @@ -29,60 +29,60 @@ */ class validate_client { - + /* Validator function to check if a username is unique. */ function username_unique($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; } - + 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($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 != ".$client_id); + $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($app->tform->wordbook[$errmsg])) { - return $app->tform->wordbook[$errmsg]."<br>\r\n"; + $errmsg = $validator['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 != ".$client_id); + if($num_rec["number"] > 0) { + $errmsg = $validator['errmsg']; + if(isset($app->tform->wordbook[$errmsg])) { + return $app->tform->wordbook[$errmsg]."<br>\r\n"; } else { return $errmsg."<br>\r\n"; } } } } - + 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'] == '' ) && - $global_config['client_username_web_check_disabled'] == 'n') { + + 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'] == '' ) && + $global_config['client_username_web_check_disabled'] == 'n') { $errmsg = $validator['errmsg']; if(isset($app->tform->wordbook[$errmsg])) { return $app->tform->wordbook[$errmsg]."<br>\r\n"; @@ -90,13 +90,13 @@ return $errmsg."<br>\r\n"; } } - - - - + + + + } - - - - -} \ No newline at end of file + + + + +} -- Gitblit v1.9.1