changed auth

Stompfrog · Jan 29, 2012 · 76fb6d0 · 76fb6d0
1 parent a1fba1f
commit 76fb6d0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/application/config/config.php b/application/config/config.php
@@ -14,7 +14,7 @@
 | path to your installation.
 |
 */
-$config['base_url']	= 'http://localhost/github/Rabbit/';
+$config['base_url']	= 'http://project-rabbit/';
 //added these to config so we can change them system wide if we want to move them somewhere else
 $config['image_path'] = 'img/';
 $config['thumb_path'] = 'img/thumbs/';

diff --git a/application/controllers/auth.php b/application/controllers/auth.php
@@ -484,7 +484,7 @@ function update_profile()
 
 			$this->form_validation->set_rules('first_name', 'first_name', 'trim|required|xss_clean');
 			$this->form_validation->set_rules('about_me', 'about_me', 'trim|required|xss_clean');			
-			$this->form_validation->set_rules('country', 'country', 'trim|xss_clean');
+			$this->form_validation->set_rules('sex', 'sex', 'trim|xss_clean');
 			$this->form_validation->set_rules('website', 'website', 'trim|xss_clean');
 			$this->form_validation->set_rules('last_name', 'last_name', 'trim|xss_clean');
 			$this->form_validation->set_error_delimiters('<span class="help-inline">', '</span>');
@@ -500,7 +500,7 @@ function update_profile()
 					'first_name' => $this->form_validation->set_value('first_name'),		
 					'last_name' => $this->form_validation->set_value('last_name'),
 					'about_me' => $this->form_validation->set_value('about_me'),
-					'country' => $this->form_validation->set_value('country'),
+					'sex' => $this->form_validation->set_value('sex'),
 					'website' => $this->form_validation->set_value('website'));
 
 				if($this->profiles_model->update_profile($user_id, $updated_values))

diff --git a/application/models/artists_model.php b/application/models/artists_model.php
@@ -21,6 +21,12 @@ function __construct()
 	*/
 	function get_user($user_id)
 	{
+
+		if(!is_numeric ($user_id))
+		{
+			//the username would have been used instead
+		}
+
 		$properties = array();
 
 		$query = $this->db->query("SELECT users.username, users.created, users.modified, users.last_login, users.id, user_profiles.website, user_profiles.first_name, user_profiles.last_name, user_profiles.avatar_filename, user_profiles.status, user_profiles.sex, user_profiles.about_me, user_profiles.lat, user_profiles.lon FROM users JOIN user_profiles ON users.id = user_profiles.user_id WHERE users.id = " . (int) $user_id);