Permalink
Browse files

Merge branch 'master' of github.com:IDzUp/pH2Date

  • Loading branch information...
pH-7 committed Jul 6, 2018
2 parents 0e79699 + 9768944 commit 2ef619ab644b9d96eda56f1e80ea1ccc8899f5a6
@@ -5,7 +5,6 @@ class admin extends Admin_Controller
public function __construct()
{
parent::__construct();
}
public function index()
@@ -33,7 +32,6 @@ public function users()
public function _admin_output($output = null)
{
$this->load->view('view.php', $output);
}
@@ -17,6 +17,7 @@ public function page($id = null)
} else {
redirect('user/login');
}
$this->load->view('page', $this->data);
}
@@ -85,7 +85,6 @@ public function message_box($username = null)
$this->db->insert('chat', $insert_chat);
}
$this->db->where(array('from' => $username, 'to' => $my_user->username));
$message = $this->db->get('chat')->result();
$this->db->where(array('to' => $username, 'from' => $my_user->username));
@@ -140,7 +139,6 @@ public function insert_fake_users()
$local_image = file_put_contents($filenameOut, $url_image);
$this->ion_auth->register($username, $password, $email, $additional_data);
}
}
@@ -338,8 +336,6 @@ public function edit_account()
$this->data['user'] = $this->ion_auth->user()->row();
$this->load->view('edit_account', $this->data);
}
public function mypic()
@@ -368,8 +364,6 @@ public function myvideo()
$user = $this->data['user'] = $this->ion_auth->user()->row();
$this->data['videos'] = $this->db->get_where('video', array('user_id' => $user->id))->result();
$this->load->view('myvideo', $this->data);
}
function upload_video()
@@ -654,7 +648,6 @@ public function reset_password($code = null)
$this->data['csrf'] = $this->_get_csrf_nonce();
$this->data['code'] = $code;
//render
$this->_render_page('auth/reset_password', $this->data);
} else {
// do we have a valid request?
@@ -779,9 +772,8 @@ public function register()
'sex' => $this->input->post('sex', true),
'phone' => $this->input->post('phone', true),
);
}
if ($this->form_validation->run() && $this->ion_auth->register($username, $password, $email, $additional_data)) {
//check to see if we are creating the user
//redirect them back to the admin page
@@ -995,7 +987,6 @@ public function change_password()
'value' => $user->id,
);
//render
$this->_render_page('change_password', $this->data);
} else {
$identity = $this->session->userdata('identity');
@@ -1059,7 +1050,6 @@ private function _get_recommendition($same_country = false, $same_state = false,
$this->db->or_where('matched_user_id', $user->id);
$matched_users = $this->db->get('match')->result_array();
$user_list = array();
if (!empty($matched_users)) {
foreach ($matched_users AS $users) {
@@ -1114,12 +1104,12 @@ private function _operation($id, $operation)
$this->db->insert('user_likes', $data);
$this->session->set_flashdata('msg_success_right', "you passed $otheruser->first_name");
}
redirect('user/recommend');
}
private function _render_page($view, $data = null, $render = false)
{
$this->viewdata = (empty($data)) ? $this->data : $data;
$view_html = $this->load->view($view, $this->viewdata, $render);
Oops, something went wrong.

0 comments on commit 2ef619a

Please sign in to comment.