diff --git a/www/application/controllers/Auth.php b/www/application/controllers/Auth.php index 2aa8ef0..ee5dec5 100644 --- a/www/application/controllers/Auth.php +++ b/www/application/controllers/Auth.php @@ -4,6 +4,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); class Auth extends Start_Controller { + + + public function index() { $login_done = false; $data = array(); @@ -26,18 +29,20 @@ class Auth extends Start_Controller { $data["page_title"] = ""; $data["username"] = $username; //"auxsupport"; $data["password"] = $password; + $data["sessionid"] ="12345678901234567890"; $out = []; $this->coregrade_webapi(COREGRADE_ACCOUNT_LOGIN, $data, $out); //print_r( $data ); //print_r( $out ); - if (count($out) > 0 && isset($out["session"])) { - //print_r($out); + if (count($out) > 0 && isset($out["sessionid"]) && isset($out["member_id"]) && $out["member_id"] > 0 ) { + // print_r($out); //$this->getSessionData($out[0], $session_data); // just for testing $this->buildUserSession(PHP_API_OK, $out); $valid_login = true; $this->session->set_flashdata('in', $out); - // redirect("page/index"); + redirect("member/index"); + $login_done = true; } else { $error_message = "Invalid Username/Password"; } @@ -46,15 +51,14 @@ class Auth extends Start_Controller { - $this->renderMemberPages('view_dash', $data); - $login_done = true; + // $this->renderMemberPages('view_dash', $data); + // $login_done = true; // exit(); } - echo 'hhhh jjjj'; - $this->coregrade_webapi(100, $data, $out); - - print_r($out); + // echo 'hhhh jjjj'; + //$this->coregrade_webapi(100, $data, $out); + // print_r($out); if (false == $login_done) { $this->renderAuthPages('view_login', $data); @@ -81,7 +85,7 @@ class Auth extends Start_Controller { $this->coregrade_webapi(COREGRADE_ACCOUNT_PENDING, $data, $out); //print_r( $data ); - // print_r($out); + // print_r($out); if (count($out) > 0 && isset($out["pending_id"]) && $out["pending_id"] > 0) { //print_r($out); //$this->getSessionData($out[0], $session_data); // just for testing diff --git a/www/application/controllers/Vemail.php b/www/application/controllers/Vemail.php index bb58fae..e417bee 100644 --- a/www/application/controllers/Vemail.php +++ b/www/application/controllers/Vemail.php @@ -8,6 +8,7 @@ class Vemail extends Start_Controller { //$this->load->view('home/home'); $valid_entry = true; $valid_login = false; + $data = []; if ($_SERVER['REQUEST_METHOD'] == 'GET') { @@ -19,16 +20,10 @@ class Vemail extends Start_Controller { $this->coregrade_webapi(COREGRADE_ACCOUNT_CREATEACC, $data, $out); //print_r( $data ); //print_r( $out ); - if (count($out) > 0 && isset($out["session"])) { - //print_r($out); - //$this->getSessionData($out[0], $session_data); // just for testing + if (count($out) > 0 && isset($out["member_id"]) && $out["member_id"] > 0) { + // $this->renderAuthPages('view_login', $data); + - $this->buildUserSession(PHP_API_OK, $out); - $valid_login = true; - $this->session->set_flashdata('in', $out); - - $this->renderMemberPages('view_dash', $data); - $login_done = true; // redirect("page/index"); } else { @@ -44,9 +39,7 @@ class Vemail extends Start_Controller { } - $this->load->view('auth/view_head'); - $this->load->view('auth/view_register'); - $this->load->view('auth/view_foot'); + $this->renderAuthPages('view_login', $data); } public function resetpass() { diff --git a/www/application/libraries/Start_Controller.php b/www/application/libraries/Start_Controller.php index fb21629..e5a5171 100644 --- a/www/application/libraries/Start_Controller.php +++ b/www/application/libraries/Start_Controller.php @@ -46,7 +46,7 @@ class Start_Controller extends COR_Controller { protected function testLoginInput(&$username, &$password, &$error_message, &$valid_entry) { $valid_entry = true; $username = trim($this->input->post('username')); - $password = trim($this->input->post('password')); + $password = trim($this->input->post('pass1')); if ($username == '' or $password == '') { $valid_entry = false; $error_message = 'Enter a Username/Password & PracticeID to continue'; diff --git a/www/application/views/auth/view_login.php b/www/application/views/auth/view_login.php index e3e46db..c6a0423 100644 --- a/www/application/views/auth/view_login.php +++ b/www/application/views/auth/view_login.php @@ -27,7 +27,7 @@
- +
@@ -35,7 +35,7 @@
- +
diff --git a/www/application/views/member/view_securehead.php b/www/application/views/member/view_securehead.php index db70bef..058d4d4 100644 --- a/www/application/views/member/view_securehead.php +++ b/www/application/views/member/view_securehead.php @@ -202,7 +202,7 @@