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=5820379117738b795d91fd26e3bbbcd4fa83bc5d;hpb=480a21049384e47afe920e73972ca336ec8e6a54;p=living-lab-site.git diff --git a/application/controllers/user.php b/application/controllers/user.php index 5820379..169d5d2 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']; } /** @@ -155,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))); @@ -165,6 +190,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('', ''); @@ -192,23 +219,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 +262,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 +272,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 +306,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 +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); @@ -290,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'], @@ -311,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'); @@ -333,15 +382,16 @@ class User extends CI_Controller { // 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(); @@ -543,7 +593,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 +639,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 +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; @@ -647,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); @@ -687,6 +741,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');