Chiefsoft/CoreGrade
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2020-02-05 07:15:27 -05:00
parent fb5c9b7709
commit 5d9da78cf6
5 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/controllers/Auth.php
+14 -10
View File
@@ -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
www/application/controllers/Vemail.php
+5 -12
View File
@@ -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() {
www/application/libraries/Start_Controller.php
+1 -1
View File
@@ -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';
www/application/views/auth/view_login.php
+2 -2
View File
@@ -27,7 +27,7 @@
<div class="card-body pt-1">
<form action="/auth" method="POST">
<fieldset class="form-label-group form-group position-relative has-icon-left">
<input type="text" class="form-control" id="user-name" placeholder="Username" required>
<input type="text" class="form-control" name='username' id="user-name" placeholder="Username" required>
<div class="form-control-position">
<i class="feather icon-user"></i>
</div>
@@ -35,7 +35,7 @@
</fieldset>
<fieldset class="form-label-group position-relative has-icon-left">
<input type="password" class="form-control" id="user-password" placeholder="Password" required>
<input type="password" class="form-control" name='pass1' id="user-password" placeholder="Password" required>
<div class="form-control-position">
<i class="feather icon-lock"></i>
</div>
www/application/views/member/view_securehead.php
+1 -1
View File
@@ -202,7 +202,7 @@
</ul>
</li>
<li class="dropdown dropdown-user nav-item"><a class="dropdown-toggle nav-link dropdown-user-link" href="#" data-toggle="dropdown">
<div class="user-nav d-sm-flex d-none"><span class="user-name text-bold-600">John Doe</span><span class="user-status">Available</span></div><span><img class="round" src="/assets2/images/portrait/small/avatar-s-11.jpg" alt="avatar" height="40" width="40"></span>
<div class="user-nav d-sm-flex d-none"><span class="user-name text-bold-600"> <?=isset($_SESSION['firstname'])?$_SESSION['firstname']:''?> <?=isset($_SESSION['lastname'])?$_SESSION['lastname']:''?></span><span class="user-status">Available</span></div><span><img class="round" src="/assets2/images/portrait/small/avatar-s-11.jpg" alt="avatar" height="40" width="40"></span>
</a>
<div class="dropdown-menu dropdown-menu-right"><a class="dropdown-item" href="page-user-profile.html"><i class="feather icon-user"></i> Edit Profile</a><a class="dropdown-item" href="app-email.html"><i class="feather icon-mail"></i> My Inbox</a><a class="dropdown-item" href="app-todo.html"><i class="feather icon-check-square"></i> Task</a><a class="dropdown-item" href="app-chat.html"><i class="feather icon-message-square"></i> Chats</a>
<div class="dropdown-divider"></div><a class="dropdown-item" href="/auth/logout"><i class="feather icon-power"></i> Logout</a>