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 06:05:47 -05:00
parent bcbc8067e4
commit d3ccc39e57
8 changed files with 277 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/config/constants.php
+8
View File
@@ -83,3 +83,11 @@ defined('EXIT_USER_INPUT') OR define('EXIT_USER_INPUT', 7); // invalid user
defined('EXIT_DATABASE') OR define('EXIT_DATABASE', 8); // database error
defined('EXIT__AUTO_MIN') OR define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
define('COREGRADE_ACCOUNT_TESTEMAIL',11001);
define('COREGRADE_ACCOUNT_PENDING',11010);
define('COREGRADE_VERIFY_PENDING_LINK',11015);
define('COREGRADE_ACCOUNT_CREATEACC',11020);
define('COREGRADE_ACCOUNT_LOGIN',11025);
www/application/controllers/Auth.php
+79 -3
View File
@@ -7,13 +7,54 @@ class Auth extends Start_Controller {
public function index() {
$login_done = false;
$data = array();
$username = '';
$password = '';
$error_message = '';
$valid_entry = false;
$valid_login = false;
$out = [];
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->testLoginInput($username, $password, $error_message, $valid_entry);
if (true == $valid_entry) {
if ($username != '' && $password != '') {
$data["page_title"] = "";
$data["username"] = $username; //"auxsupport";
$data["password"] = $password;
$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);
//$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");
} else {
$error_message = "Invalid Username/Password";
}
}
}
$this->renderMemberPages('view_dash', $data);
$login_done = true;
// exit();
}
echo 'hhhh jjjj';
$this->coregrade_webapi(100, $data, $out);
print_r($out);
if (false == $login_done) {
$this->renderAuthPages('view_login', $data);
@@ -22,6 +63,41 @@ class Auth extends Start_Controller {
public function newuser() {
//$this->load->view('home/home');
$data["firstname"] = $data["lastname"] = $data["password"] = $data["email"] = "";
$valid_entry = true;
$valid_login = false;
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$data['firstname'] = trim($this->input->post('firstname'));
$data['lastname'] = trim($this->input->post('lastname'));
$data['username'] = trim($this->input->post('username'));
$data['password'] = trim($this->input->post('pass1'));
$data['email'] = $data['username'];
if (true == $valid_entry) {
if ($data['username'] != '' && $data['password'] != '') {
$out = [];
$this->coregrade_webapi(COREGRADE_ACCOUNT_PENDING, $data, $out);
//print_r( $data );
// 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
$this->renderAuthPages('view_pending', $data);
$login_done = true;
// redirect("page/index");
} else {
$error_message = "Invalid Username/Password";
}
}
}
// exit();
}
$this->load->view('auth/view_head');
$this->load->view('auth/view_register');
$this->load->view('auth/view_foot');
@@ -35,8 +111,8 @@ class Auth extends Start_Controller {
$this->load->view('auth/view_foot');
}
public function logout() {
$this->index();
}
}
www/application/controllers/Vemail.php
+60
View File
@@ -0,0 +1,60 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
class Vemail extends Start_Controller {
public function index() {
//$this->load->view('home/home');
$valid_entry = true;
$valid_login = false;
if ($_SERVER['REQUEST_METHOD'] == 'GET') {
$data['verify_link'] = trim($this->input->get('vlnk'));
if (true == $valid_entry) {
if ($data['verify_link'] != '') {
$out = [];
$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
$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 {
$error_message = "Invalid Username/Password";
}
}
}
// exit();
}
$this->load->view('auth/view_head');
$this->load->view('auth/view_register');
$this->load->view('auth/view_foot');
}
public function resetpass() {
//$this->load->view('home/home');
//echo "START RESET 1";
$this->load->view('auth/view_head');
$this->load->view('auth/view_reset_password');
$this->load->view('auth/view_foot');
}
}
www/application/core/COR_Controller.php
+3 -3
View File
@@ -52,6 +52,7 @@ class COR_Controller extends CI_Controller {
$this->load->model('backend_model');
$in["action"] = $action;
$in["pid"] = 100;
// print_r($in);
$ret = $this->backend_model->coregrade_api($in, $out);
//echo $ret;
return $ret;
@@ -67,7 +68,7 @@ class COR_Controller extends CI_Controller {
$this->load->view('member/view_securefoot');
return 0;
}
protected function renderAuthPages($pagename, $data) {
$this->load->view('auth/view_head');
@@ -76,6 +77,5 @@ class COR_Controller extends CI_Controller {
return 0;
}
}
www/application/views/auth/view_pending.php
+60
View File
@@ -0,0 +1,60 @@
<!-- BEGIN: Body-->
<body class="vertical-layout vertical-menu-modern 1-column navbar-floating footer-static bg-full-screen-image blank-page blank-page" data-open="click" data-menu="vertical-menu-modern" data-col="1-column">
<!-- BEGIN: Content-->
<div class="app-content content">
<div class="content-overlay"></div>
<div class="header-navbar-shadow"></div>
<div class="content-wrapper">
<div class="content-header row">
</div>
<div class="content-body">
<section class="row flexbox-container">
<div class="col-xl-7 col-10 d-flex justify-content-center">
<div class="card bg-authentication rounded-0 mb-0 w-100">
<div class="row m-0">
<div class="col-lg-6 d-lg-block d-none text-center align-self-center p-0">
<img src="/assets2/images/pages/reset-password.png" alt="branding logo">
</div>
<div class="col-lg-6 col-12 p-0">
<div class="card rounded-0 mb-0 px-2">
<div class="card-header pb-1">
<div class="card-title">
<h4 class="mb-0">Check your Email </h4>
</div>
</div>
<p class="px-2">Please check your email to continue.</p>
<div class="card-content">
<div class="card-body pt-1">
<form>
<fieldset class="form-label-group">
Message Here ...
</fieldset>
<div class="row pt-2">
<div class="col-12 col-md-6 mb-1">
<!-- a href="/auth" class="btn btn-outline-primary btn-block px-0">Go Back to Login</a -->
</div>
<div class="col-12 col-md-6 mb-1">
<a href="/auth" class="btn btn-outline-primary btn-block px-0">Logn now</a>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
</div>
</div>
</div>
<!-- END: Content-->
www/application/views/auth/view_register.php
+65 -65
View File
@@ -1,78 +1,78 @@
<!-- BEGIN: Content-->
<div class="app-content content">
<div class="content-overlay"></div>
<div class="header-navbar-shadow"></div>
<div class="content-wrapper">
<div class="content-header row">
</div>
<div class="content-body">
<section class="row flexbox-container">
<div class="col-xl-8 col-10 d-flex justify-content-center">
<div class="card bg-authentication rounded-0 mb-0">
<div class="row m-0">
<div class="col-lg-6 d-lg-block d-none text-center align-self-center pl-0 pr-3 py-0">
<img src="/assets2/images/pages/register.jpg" alt="branding logo">
</div>
<div class="col-lg-6 col-12 p-0">
<div class="card rounded-0 mb-0 p-2">
<div class="card-header pt-50 pb-1">
<div class="card-title">
<h4 class="mb-0">Create Account</h4>
</div>
<!-- BEGIN: Content-->
<div class="app-content content">
<div class="content-overlay"></div>
<div class="header-navbar-shadow"></div>
<div class="content-wrapper">
<div class="content-header row">
</div>
<div class="content-body">
<section class="row flexbox-container">
<div class="col-xl-8 col-10 d-flex justify-content-center">
<div class="card bg-authentication rounded-0 mb-0">
<div class="row m-0">
<div class="col-lg-6 d-lg-block d-none text-center align-self-center pl-0 pr-3 py-0">
<img src="/assets2/images/pages/register.jpg" alt="branding logo">
</div>
<div class="col-lg-6 col-12 p-0">
<div class="card rounded-0 mb-0 p-2">
<div class="card-header pt-50 pb-1">
<div class="card-title">
<h4 class="mb-0">Create Account</h4>
</div>
<p class="px-2">Fill the below form to create a new account.</p>
<div class="card-content">
<div class="card-body pt-0">
<form action="/auth/newuser" method="POST">
<div class="form-label-group">
<input type="text" id="firstname" class="form-control" placeholder="Firstname" required>
<label for="firstname">Name</label>
</div>
<div class="form-label-group">
<input type="text" id="lastname" class="form-control" placeholder="Lastname" required>
<label for="lastname">Name</label>
</div>
<div class="form-label-group">
<input type="email" id="email" class="form-control" placeholder="Email" required>
<label for="email">Email</label>
</div>
<div class="form-label-group">
<input type="password" id="pass1" class="form-control" placeholder="Password" required>
<label for="pass1">Password</label>
</div>
<div class="form-label-group">
<input type="password" id="pass2" class="form-control" placeholder="Confirm Password" required>
<label for="pass2">Confirm Password</label>
</div>
<div class="form-group row">
<div class="col-12">
<fieldset class="checkbox">
<div class="vs-checkbox-con vs-checkbox-primary">
<input type="checkbox" checked>
<span class="vs-checkbox">
<span class="vs-checkbox--check">
<i class="vs-icon feather icon-check"></i>
</span>
</div>
<p class="px-2">Fill the below form to create a new account.</p>
<div class="card-content">
<div class="card-body pt-0">
<form action="/auth/newuser" method="POST">
<div class="form-label-group">
<input type="text" id="firstname" name="firstname" class="form-control" placeholder="Firstname" value='<?= isset($firstname) ? $firstname : '' ?>' required>
<label for="firstname">Name</label>
</div>
<div class="form-label-group">
<input type="text" id="lastname" name="lastname" class="form-control" placeholder="Lastname" value='<?= isset($lastname) ? $lastname : '' ?>' required>
<label for="lastname">Name</label>
</div>
<div class="form-label-group">
<input type="email" id="email" name="username" name="username" class="form-control" placeholder="Email-Username" value='<?= isset($username) ? $username : '' ?>' required>
<label for="email">Email</label>
</div>
<div class="form-label-group">
<input type="password" id="pass1" class="form-control" name="pass1" placeholder="Password" required>
<label for="pass1">Password</label>
</div>
<!-- div class="form-label-group">
<input type="password" id="pass2" class="form-control" placeholder="Confirm Password" required>
<label for="pass2">Confirm Password</label>
</div -->
<div class="form-group row">
<div class="col-12">
<fieldset class="checkbox">
<div class="vs-checkbox-con vs-checkbox-primary">
<input type="checkbox" checked>
<span class="vs-checkbox">
<span class="vs-checkbox--check">
<i class="vs-icon feather icon-check"></i>
</span>
<span class=""> I accept the terms & conditions.</span>
</div>
</fieldset>
</div>
</span>
<span class=""> I accept the terms & conditions.</span>
</div>
</fieldset>
</div>
<a href="/auth" class="btn btn-outline-primary float-left btn-inline mb-50">Login</a>
<button type="submit" class="btn btn-primary float-right btn-inline mb-50">Register</a>
</form>
</div>
</div>
<a href="/auth" class="btn btn-outline-primary float-left btn-inline mb-50">Login</a>
<button type="submit" class="btn btn-primary float-right btn-inline mb-50">Register</a>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
</div>
</section>
</div>
</div>
</div>
<!-- END: Content-->
</div>
<!-- END: Content-->
www/application/views/auth/view_reset_password.php
+1 -1
View File
@@ -45,7 +45,7 @@
</fieldset>
<div class="row pt-2">
<div class="col-12 col-md-6 mb-1">
<a href="auth-login.html" class="btn btn-outline-primary btn-block px-0">Go Back to Login</a>
<a href="/auth" class="btn btn-outline-primary btn-block px-0">Go Back to Login</a>
</div>
<div class="col-12 col-md-6 mb-1">
<button type="submit" class="btn btn-primary btn-block px-0">Reset</button>
www/application/views/member/view_securehead.php
+1 -1
View File
@@ -205,7 +205,7 @@
<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>
</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-login.html"><i class="feather icon-power"></i> Logout</a>
<div class="dropdown-divider"></div><a class="dropdown-item" href="/auth/logout"><i class="feather icon-power"></i> Logout</a>
</div>
</li>
</ul>