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

diff --git a/application/controllers/user.php b/application/controllers/user.php
index 397699b..5820379 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -196,9 +196,13 @@ class User extends CI_Controller {
 		if (! $b_validation)
 		{
 			// Edit account data if logged in, otherwise register.
-			if ($user_id = $this->session->userdata('user_id'))
+			$user_id = $this->session->userdata('user_id');
+			if ($user_id)
 			{
 				$userdata = $this->users_model->get_userdata(intval($user_id));
+				if (substr($userdata['username'], 0, 8) == 'autogen_')
+					$userdata['autogen_username'] = //'xxx';
+						substr($userdata['username'], 8);
 				$selected_menu = 'account';
 			}
 			else
@@ -235,6 +239,8 @@ class User extends CI_Controller {
 		else
 		{
 			$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');
@@ -540,6 +546,14 @@ class User extends CI_Controller {
 			$this->session->set_userdata($key, $val);
 	}
 	
+	public function _is_username_unique($username)
+	{
+		if ($this->users_model->get_userdata($username))
+			return FALSE;
+		
+		return TRUE;
+	}
+	
 	public function _valid_username($username)
 	{
 		return (preg_match('/^[a-z0-9\._]+$/', $username) === 1);