X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fcontrollers%2Fuser.php;h=fad3ddf9ef8e5837a97eb3b29126272982de7e30;hb=a34b84478af8de577afef1b762fc6861b2fd74e7;hp=5820379117738b795d91fd26e3bbbcd4fa83bc5d;hpb=480a21049384e47afe920e73972ca336ec8e6a54;p=living-lab-site.git

diff --git a/application/controllers/user.php b/application/controllers/user.php
index 5820379..fad3ddf 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -26,7 +26,31 @@ class User extends CI_Controller {
 	
 	public function test($user_id = 1)
 	{
-		echo ($this->users_model->get_userdata('calin.burloiu') ? 'd' : 'n');
+		echo extension_loaded('gd') ? 'gd' : 'nu';
+	}
+	
+	// DEBUG
+	public function show_session()
+	{
+		if (ENVIRONMENT == 'production')
+			die();
+			
+		var_dump($this->session->all_userdata());
+	}
+	// DEBUG
+	public function destroy_session()
+	{
+		if (ENVIRONMENT == 'production')
+			die();
+			
+		$this->session->sess_destroy();
+	}
+	
+	public function ajax_get_captcha()
+	{
+		$this->load->library('captcha');
+		$captcha = $this->captcha->get_captcha();
+		echo $captcha['image'];
 	}
 
 	/**
@@ -165,6 +189,8 @@ class User extends CI_Controller {
 		$this->load->library('form_validation');
 		$this->load->helper('localization');
 		$this->load->helper('date');
+		
+		$user_id = $this->session->userdata('user_id');
 			
 		$this->form_validation->set_error_delimiters('<span class="error">',
 					'</span>');
@@ -192,23 +218,30 @@ class User extends CI_Controller {
 		}
 		else
 			$b_validation = FALSE;
-		
+
 		if (! $b_validation)
 		{
 			// Edit account data if logged in, otherwise register.
-			$user_id = $this->session->userdata('user_id');
+			// ** ACCOUNT
 			if ($user_id)
 			{
 				$userdata = $this->users_model->get_userdata(intval($user_id));
 				if (substr($userdata['username'], 0, 8) == 'autogen_')
-					$userdata['autogen_username'] = //'xxx';
+					$userdata['autogen_username'] =
 						substr($userdata['username'], 8);
 				$selected_menu = 'account';
+				$captcha = FALSE;
 			}
+			// ** REGISTER
 			else
 			{
 				$userdata = FALSE;
 				$selected_menu = 'register';
+				
+				// CAPTCHA
+				$this->load->library('captcha');
+				$captcha = $this->captcha->get_captcha();
+				$captcha = $captcha['image'];
 			}
 			
 			$params = array('title' =>
@@ -228,7 +261,7 @@ class User extends CI_Controller {
 			
 			$main_params['content'] = $this->load->view('user/register_view', 
 				array('userdata'=> $userdata, 'redirect'=> $redirect,
-					'error_upload'=> $error_upload),
+					'error_upload'=> $error_upload, 'captcha'=> $captcha),
 				TRUE);
 			$main_params['side'] = $this->load->view('side_default', NULL, TRUE);
 			$this->load->view('main', $main_params);
@@ -238,12 +271,14 @@ class User extends CI_Controller {
 		}
 		else
 		{
-			$user_id = $this->input->post('user-id');
+			// TODO: Security problem!
+			//$user_id = $this->input->post('user-id');
 			if ($this->input->post('username'))
 				$data['username'] = $this->input->post('username');
 			$data['email'] = $this->input->post('email');
 			$data['first_name'] = $this->input->post('first-name');
 			$data['last_name'] = $this->input->post('last-name');
+			$data['sex'] = intval($this->input->post('sex'));
 			$data['birth_date'] = $this->input->post('birth-date');
 			$data['country'] = $this->input->post('country');
 			$data['locality'] = $this->input->post('locality');
@@ -270,6 +305,7 @@ class User extends CI_Controller {
 						. $upload_data['file_name']. '-thumb.jpg', 120, 90);
 			}
 			
+			// TODO: To much info as session data?
 			// Update session user data.
 			$this->_update_session_userdata($data);
 			
@@ -278,7 +314,7 @@ class User extends CI_Controller {
 			{
 				$password = $this->input->post('new-password');
 				if ($password)
-					$data['password'] = $this->input->post('new-password');
+					$data['password'] = $password;
 				
 				$this->users_model->set_userdata($user_id, $data);
 				
@@ -290,6 +326,7 @@ class User extends CI_Controller {
 			{
 				$data['username'] = $this->input->post('username');
 				$data['password'] = $this->input->post('password');
+				$data['auth_src'] = 'internal';
 				
 				$this->users_model->register($data);
 				$user_id = $this->users_model->get_userdata($data['username'],
@@ -543,7 +580,10 @@ class User extends CI_Controller {
 	public function _update_session_userdata($data)
 	{
 		foreach ($data as $key=> $val)
-			$this->session->set_userdata($key, $val);
+		{
+			if ($this->session->userdata($key))
+				$this->session->set_userdata($key, $val);
+		}
 	}
 	
 	public function _is_username_unique($username)
@@ -586,12 +626,12 @@ class User extends CI_Controller {
 		return $date;
 	}
 	
-	public function _valid_old_password($old_password, $field_username)
+	public function _valid_old_password($old_password)
 	{
 		if (! $old_password)
 			return TRUE;
 		
-		$username= $this->input->post($field_username);
+		$username= $this->session->userdata('username');
 		
 		if ($this->users_model->login($username, $old_password))
 			return TRUE;
@@ -611,7 +651,7 @@ class User extends CI_Controller {
 	
 	public function _required_by_register($param)
 	{
-		$user_id = $this->input->post('user-id');
+		$user_id = $this->session->userdata('user_id');
 		
 		if (! $user_id && ! $param)
 			return FALSE;
@@ -687,6 +727,13 @@ class User extends CI_Controller {
 		return TRUE;
 	}
 	
+	public function _check_captcha($word)
+	{
+		$this->load->library('captcha');
+		
+		return $this->captcha->check_captcha($word);
+	}
+	
 	public function _internal_account($username)
 	{
 		$userdata = $this->users_model->get_userdata($username, 'auth_src');