X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fcontrollers%2Fuser.php;h=169d5d2bf29abac077adf06a6324e0e453a08753;hb=refs%2Fheads%2Fmaster;hp=8c43cce8dbff73e5b90c6bf7a14a0c5796b8abc6;hpb=355535fa933c0fc2c1d63f0d4df3b1fc6e60d05c;p=living-lab-site.git diff --git a/application/controllers/user.php b/application/controllers/user.php index 8c43cce..169d5d2 100644 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -23,6 +23,35 @@ class User extends CI_Controller { public function index() { } + + public function test($user_id = 1) + { +// 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']; + } /** * Login a user and then redirect it to the last page which must be encoded @@ -34,11 +63,22 @@ class User extends CI_Controller { public function login($redirect = '') { $this->load->library('form_validation'); - $this->form_validation->set_error_delimiters('', ''); + + // Normal or OpenID login? + if ($this->input->post('openid') !== FALSE) + $b_openid = TRUE; + else + $b_openid = FALSE; + // Validate the correct form. + $res_form_validation = FALSE; + if (!$b_openid) + $res_form_validation = $this->form_validation->run('login'); + else + $res_form_validation = $this->form_validation->run('login_openid'); - if ($this->form_validation->run('signin') === FALSE) + if ($res_form_validation === FALSE) { $params = array( 'title' => $this->lang->line('ui_nav_menu_login') @@ -64,6 +104,14 @@ class User extends CI_Controller { } else { + if ($b_openid) + { + $this->users_model->openid_begin_login( + $this->input->post('openid')); + return; + } + + // Without OpenID if (! $this->activated_account) header('Location: ' . site_url("user/activate/{$this->user_id}")); @@ -82,6 +130,43 @@ class User extends CI_Controller { } } + public function check_openid_login() + { + $user = $this->users_model->openid_complete_login(); + + // Authentication failed. + if ($user == Auth_OpenID_CANCEL) + { + $this->load->helper('message'); + show_error_msg_page($this, $this->lang->line('openid_cancel')); + return; + } + else if ($user == Auth_OpenID_FAILURE) + { + $this->load->helper('message'); + show_error_msg_page($this, $this->lang->line('openid_failure')); + return; + } + + // Authentication successful: set session with user data. + $this->session->set_userdata(array( + 'user_id'=> $user['id'], + 'username'=> $user['username'], + 'auth_src'=> $user['auth_src'], + 'time_zone'=> $user['time_zone'] + )); + + if ($user['import']) + header('Location: '. site_url('user/account')); + else + header('Location: '. site_url()); + } + + public function openid_policy() + { + $this->load->view('openid_policy_view'); + } + /** * Logout user and then redirect it to the last page which must be encoded * in $redirect. @@ -94,6 +179,7 @@ class User extends CI_Controller { $this->session->unset_userdata('user_id'); $this->session->unset_userdata('username'); $this->session->unset_userdata('auth_src'); + $this->session->unset_userdata('roles'); $this->session->unset_userdata('time_zone'); header('Location: '. site_url(urldecode_segments($redirect))); @@ -104,22 +190,59 @@ 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('', ''); - - if ($this->form_validation->run('register') === FALSE) + $error_upload = ''; + + if ($this->form_validation->run('register')) + { + $b_validation = TRUE; + + if ($_FILES['picture']['tmp_name']) + { + // Upload library + $config_upload['upload_path'] = './data/user_pictures'; + $config_upload['file_name'] = + str_replace('.', '-', $this->input->post('username')) .'-'; + $config_upload['allowed_types'] = 'gif|jpg|png'; + $config_upload['max_size'] = '10240'; + $this->load->library('upload', $config_upload); + + $b_validation = $this->upload->do_upload('picture'); + $error_upload = + $this->upload->display_errors('', + ''); + } + } + else + $b_validation = FALSE; + + if (! $b_validation) { // Edit account data if logged in, otherwise register. - if ($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'] = + 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' => @@ -138,7 +261,8 @@ class User extends CI_Controller { array('selected_menu' => $selected_menu)); $main_params['content'] = $this->load->view('user/register_view', - array('userdata'=> $userdata, 'redirect'=> $redirect), + array('userdata'=> $userdata, 'redirect'=> $redirect, + 'error_upload'=> $error_upload, 'captcha'=> $captcha), TRUE); $main_params['side'] = $this->load->view('side_default', NULL, TRUE); $this->load->view('main', $main_params); @@ -148,16 +272,41 @@ 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'); $data['ui_lang'] = $this->input->post('ui-lang'); $data['time_zone'] = $this->input->post('time-zone'); + // Handle picture if one was uploaded. + if ($_FILES['picture']['tmp_name']) + { + $upload_data = $this->upload->data(); + $this->load->library('image'); + $this->image->load($upload_data['full_path']); + // Resize original to a maximum size. + if ($this->image->get_width() * $this->image->get_height() + > 640*480) + { + $this->image->save_thumbnail( + $upload_data['full_path'], + 640, 480, IMAGETYPE_AUTO); + } + // Create thumbnail. + $data['picture'] = $upload_data['file_name']; + $this->image->save_thumbnail($upload_data['file_path'] + . $upload_data['file_name']. '-thumb.jpg', 120, 90); + } + + // TODO: To much info as session data? // Update session user data. $this->_update_session_userdata($data); @@ -166,7 +315,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); @@ -178,6 +327,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'], @@ -199,6 +349,17 @@ class User extends CI_Controller { { // TODO handle user not found + $user_id = $this->session->userdata('user_id'); + if ($user_id) + { + if (intval($user_id) & USER_ROLE_ADMIN) + $allow_unactivated = TRUE; + else + $allow_unactivated = FALSE; + } + else + $allow_unactivated = FALSE; + $this->load->config('localization'); $this->load->helper('date'); $this->lang->load('date'); @@ -208,33 +369,29 @@ class User extends CI_Controller { // ** // Logged in user time zone $time_zone = $this->session->userdata('time_zone'); - if (! $time_zone) - $time_zone = 'UTC'; // User data $userdata = $this->users_model->get_userdata($username); $userdata['roles'] = Users_model::roles_to_string($userdata['roles']); $country_list = $this->config->item('country_list'); $userdata['country_name'] = $country_list[ $userdata['country'] ]; - $userdata['last_login'] = date('Y-m-d H:i:s', - gmt_to_local( - strtotime($userdata['last_login']), - $time_zone, - TRUE)) . ($time_zone == 'UTC' ? ' (UTC)' : ''); + $userdata['last_login'] = human_gmt_to_human_local( + $userdata['last_login'], $time_zone); $userdata['time_zone'] = $this->lang->line($userdata['time_zone']); // User's videos $this->load->model('videos_model'); $vs_data['videos'] = $this->videos_model->get_videos_summary( - NULL, $username, intval($videos_offset), - $this->config->item('videos_per_page')); + NULL, $username, intval($videos_offset), + $this->config->item('videos_per_page'), 'hottest', + $allow_unactivated); // Pagination $this->load->library('pagination'); $pg_config['base_url'] = site_url("user/profile/$username/"); $pg_config['uri_segment'] = 4; $pg_config['total_rows'] = $this->videos_model->get_videos_count( - NULL, $username); + NULL, $username, $allow_unactivated); $pg_config['per_page'] = $this->config->item('videos_per_page'); $this->pagination->initialize($pg_config); $vs_data['pagination'] = $this->pagination->create_links(); @@ -273,29 +430,61 @@ class User extends CI_Controller { public function activate($user_id, $method='', $activation_code='') { - $user_id = intval($user_id); + $user_id = intval($user_id); + $res_form_validation = FALSE; + + if ($method == 'code') + { + if (! $activation_code) + $res_form_validation = $this->form_validation->run('activate'); + // Activation code is provided in URL. + else + { + if ($this->_valid_activation_code($activation_code) + && $this->users_model->activate_account($user_id, + $activation_code)) + { + $this->load->helper('message'); + show_info_msg_page($this, sprintf( + $this->lang->line('user_msg_activated_account'), + site_url('user/login'))); + return; + } + else + { + $this->load->helper('message'); + show_error_msg_page($this, + $this->lang->line( + 'user_msg_wrong_activation_code')); + return; + } + } + } + else if ($method == 'resend') + { + $res_form_validation = + $this->form_validation->run('resend_activation'); + } + $userdata = $this->users_model->get_userdata($user_id, 'email, a.activation_code'); $email = $userdata['email']; - //print_r($userdata['activation_code']); $activated_account = ($userdata['activation_code'] == NULL); + if ($activated_account) + { + $this->load->helper('message'); + show_info_msg_page($this, sprintf( + $this->lang->line('user_msg_activated_account'), + site_url('user/login'))); + return; + } + $this->load->library('form_validation'); $this->form_validation->set_error_delimiters('', ''); - $res_form_validation = FALSE; - if ($method == 'code') - { - $res_form_validation = $this->form_validation->run('activate'); - } - else if ($method == 'resend') - { - $res_form_validation = - $this->form_validation->run('resend_activation'); - } - if ($res_form_validation === FALSE) { $params = array( @@ -312,19 +501,12 @@ class User extends CI_Controller { $this->load->view('html_begin', $this->html_head_params); $this->load->view('header', array()); - if (! $activated_account) - { - $main_params['content'] = - $this->load->view('user/activate_view', - array('user_id'=> $user_id, 'email'=> $userdata['email']), - TRUE); - } - else - { - $main_params['content'] = - $this->load->view('user/activated_account_view', - NULL, TRUE); - } + // Show form + $main_params['content'] = + $this->load->view('user/activate_view', + array( 'user_id'=> $user_id, + 'email'=> $userdata['email']), + TRUE); $main_params['side'] = $this->load->view('side_default', NULL, TRUE); $this->load->view('main', $main_params); @@ -336,22 +518,93 @@ class User extends CI_Controller { { if ($method == 'code') { - // Redirect to a message which tells the user that the + // A message which tells the user that the // activation was successful. - header('Location: '. site_url("user/activate/$user_id")); + $this->load->helper('message'); + show_info_msg_page($this, sprintf( + $this->lang->line('user_msg_activated_account'), + site_url('user/login'))); + return; } else if ($method == 'resend') { - // Redirect to home page - header('Location: '. site_url()); + // Redirect to resent message + $this->load->helper('message'); + show_info_msg_page($this, sprintf( + $this->lang->line('user_msg_activation_resent'), + $this->input->post('email'))); + return; } } } + public function recover_password() + { + $this->load->library('form_validation'); + + $this->form_validation->set_error_delimiters('', + ''); + + if ($this->form_validation->run('recover_password') === FALSE) + { + $params = array( 'title' => + $this->lang->line( + 'user_title_password_recovery') + .' – ' + . $this->config->item('site_name'), + //'metas' => array('description'=>'') + ); + $this->load->library('html_head_params', $params); + + // ** + // ** LOADING VIEWS + // ** + $this->load->view('html_begin', $this->html_head_params); + $this->load->view('header', array('selected_menu' => + 'recover_password')); + + $main_params['content'] = $this->load->view( + 'user/recover_password_view', array(), + TRUE); + + $main_params['side'] = $this->load->view('side_default', NULL, TRUE); + $this->load->view('main', $main_params); + + $this->load->view('footer'); + $this->load->view('html_end'); + } + else + { + // Resent message + $this->load->helper('message'); + show_info_msg_page($this, sprintf( + $this->lang->line('user_msg_password_recovery_email_sent'), + $this->input->post('username'), + $this->input->post('email'))); + return; + } + } + + public function _format_message($msg, $val = '', $sub = '%s') + { + return str_replace($sub, $val, $this->lang->line($msg)); + } + 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) + { + if ($this->users_model->get_userdata($username)) + return FALSE; + + return TRUE; } public function _valid_username($username) @@ -377,12 +630,21 @@ class User extends CI_Controller { return (preg_match('/[\d]{4}-[\d]{2}-[\d]{2}/', $date) === 1); } - public function _valid_old_password($old_password, $field_username) + public function _postprocess_birth_date($date) + { + // If the user entered no birth date NULL needs to be inserted into DB. + if (! $date) + return NULL; + + return $date; + } + + 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; @@ -402,7 +664,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; @@ -438,6 +700,7 @@ class User extends CI_Controller { 'user_id'=> $user['id'], 'username'=> $user['username'], 'auth_src'=> $user['auth_src'], + 'roles'=> $user['roles'], 'time_zone'=> $user['time_zone'] )); $this->import = (isset($user['import']) ? $user['import'] : FALSE); @@ -457,7 +720,53 @@ class User extends CI_Controller { public function _do_resend_activation($email) { - return FALSE; + $user_id = $this->input->post('user-id'); + if ($user_id === FALSE) + return FALSE; + $user_id = intval($user_id); + + $this->users_model->set_userdata($user_id, + array('email'=> $email)); + + return $this->users_model->send_activation_email($user_id, $email); + } + + public function _username_exists($username) + { + $userdata = $this->users_model->get_userdata($username); + + if (! $userdata) + return FALSE; + + 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'); + if (! $userdata) + return FALSE; + + if ($userdata['auth_src'] != 'internal') + return FALSE; + + return TRUE; + } + + public function _do_recover_password($username) + { + $email = $this->input->post('email'); + if (! $email) + return FALSE; + + return $this->users_model->recover_password($username, $email); } }