Skip to content

smart_core_connect / core-connect

Go to a project
Commit 1f2c42df by Prasong Putichanchai
Options

update user con

parent c06a328c
Showing with 155 additions and 74 deletions
www/src/Controller/AppController.php
......@@ -92,10 +92,24 @@ class AppController extends Controller {
$this->request->session()->write('SessionLanguage', 'tha');
}
$this->checkSessionAuth();
$this->Auth->allow(['signin', 'signout', 'signup', 'verify']);
}
/**
*
* Function check for session
* @author sarawutt.b
* @return void
*/
public function checkSessionAuth() {
$currentPath = strtolower(trim($this->request->here));
if (!empty($this->Auth->user('id')) && ($currentPath == '/')) {
return $this->redirect(Configure::read('RedirectApplicationURL'));
}
}
/**
* Before render callback.
*
* @param \Cake\Event\Event $event The beforeRender event.
......
www/src/Controller/UsersController.php
......@@ -18,13 +18,25 @@ class UsersController extends AppController {
*/
public function initialize() {
parent::initialize();
// $this->Auth->allow(['signin', 'signout', 'signup', 'verify', 'forgotPassword', 'createAccount', 'pinCode', 'pinCodepassword', 'changeForgotpassword']);
$this->Auth->allow(['signin', 'signout', 'signup', 'verify','forgotPassword','createAccount','pinCode','pinCodepassword','registersendpin','forgotsendpin','changeForgotpassword']);
}
public function index() {
return $this->redirect(['controller' => 'Users', 'action' => 'signin']);
}
/**
*
* Function signin / login make for user authentication
* @author sarawutt.b
* @since 20108/05/24 10:49:20
* @license Pakgon
* @return void
*/
public function signin() {
$this->viewBuilder()->layout('blank');
}
......@@ -50,14 +62,12 @@ class UsersController extends AppController {
//$url = Router::url(['controller' => 'Homes', 'action' => 'index'], true);
// Before chan logic to OAUTH
// echo "<script>setTimeout(function(){Login.onLogin('" . $response['result']['token'] . "','" . $url . "','" . $response['result']['topic'] . "')},1000);</script>";
$statusCode = '200';
// echo "<script type='text/javascript'>setTimeout(function(){Login.onLogin('" . $statusCode . "','" . $this->_redirectApplicationURL . "','" . $response['result']['topic'] . "')},1000);</script>";
$redirectApplicationURL = Configure::read('RedirectApplicationURL');
$RedirectApplicationURL = Configure::read('RedirectApplicationURL');
$topic = $response['result']['topic'];
$this->set(compact('statusCode', 'redirectApplicationURL', 'topic'));
$token = $response['result']['token'];
$this->set(compact('statusCode', 'RedirectApplicationURL', 'topic', 'token'));
#echo "<script>setTimeout(function(){alert('".$response['result']['token']."')},1000);</script>";
#echo "<script>Login.onLogin('".$response['result']['token']."','".$url."','".$response['result']['topic']."');</script>";
......@@ -82,6 +92,7 @@ class UsersController extends AppController {
#------------------------------------------------------------------
//$this->redirect($this->_redirectApplicationURL);
//header('Location: ' . $this->_redirectApplicationURL);
//return $this->redirect($redirectApplicationURL);
} else {
$this->Flash->error(__('Verify Fail'));
return $this->redirect(['controller' => 'Users', 'action' => 'signin']);
......@@ -97,8 +108,7 @@ class UsersController extends AppController {
}
}
public function signup()
{
public function signup() {
$this->loadModel('MasterCountries');
$this->loadModel('MasterProvinces');
......@@ -127,8 +137,8 @@ class UsersController extends AppController {
#---------------------------------------------------------------------------------------------------
#Signup
public function createAccount()
{
public function createAccount() {
$this->loadModel('UserPersonals');
$users = $this->Users->newEntity();
......@@ -150,11 +160,11 @@ class UsersController extends AppController {
$confirm_password = $this->request->data['confirm_password'];
$btn = $this->request->data['btn'];
if(!empty($this->request->data['birthdate'])){
if (!empty($this->request->data['birthdate'])) {
$birthdate = explode("/", $this->request->data['birthdate']);
$birthdate = $birthdate[2].'-'.$birthdate[1].'-'.$birthdate[0];
$birthdate = $birthdate[2] . '-' . $birthdate[1] . '-' . $birthdate[0];
$this->request->data['birthdate'] = $birthdate;
}else{
} else {
$birthdate = '2000-10-10';
}
......@@ -165,31 +175,30 @@ class UsersController extends AppController {
$users['dynamic_key'] = 'dynamic_key';
// $users['point'] = 0;
$users['dynamic_key_expiry'] = date('Y-m-d',strtotime('+3 day'));
$users['token'] = Security::hash($this->request->data['username'].date('Y-m-d h:i:s'), 'md5', true);
$users['token_expiry'] = date('Y-m-d',strtotime('+3 day'));
$users['dynamic_key_expiry'] = date('Y-m-d', strtotime('+3 day'));
$users['token'] = Security::hash($this->request->data['username'] . date('Y-m-d h:i:s'), 'md5', true);
$users['token_expiry'] = date('Y-m-d', strtotime('+3 day'));
// $users['modified_by'] = $modified_by;
$digits = 4;
$users['pin_code'] = str_pad(rand(0, pow(10, $digits)-1), $digits, '0', STR_PAD_LEFT);
$users['pin_code'] = str_pad(rand(0, pow(10, $digits) - 1), $digits, '0', STR_PAD_LEFT);
if(!empty($this->request->data['accept'])){
if (!empty($this->request->data['accept'])) {
$username_check = $this->Users->find('all',[
$username_check = $this->Users->find('all', [
'conditions' => [
'Users.username' => $this->request->data['username']
]
])->toArray();
$email_check = $this->UserPersonals->find('all',[
$email_check = $this->UserPersonals->find('all', [
'conditions' => [
'UserPersonals.email' => $this->request->data['email']
]
])->toArray();
if((empty($username_check))&&(empty($email_check))){
if ((empty($username_check)) && (empty($email_check))) {
$users = $this->Users->patchEntity($users, $this->request->getData());
// pr($users);die;
//------------------------------ ส่งอีเมล์ -----------------------------------------------------
$data_notification = [];
$data_notification['email'] = $this->request->data['email'];
......@@ -208,12 +217,12 @@ class UsersController extends AppController {
$this->UserPersonals->save($user_personals);
// $this->Flash->success(__('The register success.'));
return $this->redirect(['controller' => 'Users', 'action' => 'pinCode/'.$users['token']]);
return $this->redirect(['controller' => 'Users', 'action' => 'pinCode/' . $users['token']]);
// return $this->redirect(['action' => 'signin']);
}
$this->Flash->error(__('Username or Email Address already used by others.'));
return $this->redirect(['action' => 'signup']);
}else if(empty($this->request->data['accept'])){
} else if (empty($this->request->data['accept'])) {
$this->Flash->error(__('please accept'));
return $this->redirect(['action' => 'signup']);
}
......@@ -221,10 +230,8 @@ class UsersController extends AppController {
}
}
public function notification($data = null)
{
if(!empty($data)){
public function notification($data = null) {
if (!empty($data)) {
$verify_code = $data['pin_code'];
$from_email = ['support@pakgon.com' => 'Support'];
$to_emails = [$data['email']];
......@@ -241,16 +248,13 @@ class UsersController extends AppController {
$email->viewVars(compact('verify_code'));
#$email->send($message);
$email->send();
} catch (Exception $e) {
echo 'Exception : ', $e->getMessage(), "\n";
}
#$this->httpStatusCode = 200;
#$this->apiResponse['message'] = 'Signup Connect Completed!!';
}
}
#---------------------------------------------------------------------------------------------------
......@@ -273,77 +277,73 @@ class UsersController extends AppController {
// }
#Verify Pin Code
public function pinCode($token=null)
{
public function pinCode($token = null) {
$this->viewBuilder()->layout('blank');
$data = $this->request->data();
if(!empty($data)){
if (!empty($data)) {
$api_core_verify_pin_code = Configure::read('Config.apiCore.verifyPinCode');
$http = new Client();
#$response = json_decode($http->post($api_core_verify_pin_code,$data)->body(),'_full');
$response = $http->post($api_core_verify_pin_code,$data)->body();
$response = json_decode($response,'_full');
$response = $http->post($api_core_verify_pin_code, $data)->body();
$response = json_decode($response, '_full');
if(!empty($response)){
if(trim($response['status']) == 'Success'){
if (!empty($response)) {
if (trim($response['status']) == 'Success') {
$this->Flash->success(__('Verify Completed.'));
return $this->redirect(['controller' => 'Users', 'action' => 'signin']);
}else{
} else {
$this->Flash->error(__('Pin Code Invalid'));
return $this->redirect(['controller' => 'Users', 'action' => 'pinCode/'.$token]);
return $this->redirect(['controller' => 'Users', 'action' => 'pinCode/' . $token]);
}
}
}
$this->set(array('token' => $token, '_serialize' => array('token')));
}
#---------------------------------------------------------------------------------------------------
#---------------------------------------------------------------------------------------------------
public function forgotPassword()
{
/**
*
* Function user forgot password
* @return void
*/
public function forgotPassword() {
$this->viewBuilder()->layout('blank');
$this->loadModel('UserPersonals');
if ($this->request->is('post')) {
$hasher = new DefaultPasswordHasher();
$email = $this->request->data['email'];
$user_personals = $this->UserPersonals->find('all',[
$user_personals = $this->UserPersonals->find('all', [
'conditions' => [
'UserPersonals.email' => $email
]
])->first();
if(!empty($user_personals)){
if (!empty($user_personals)) {
$users = $this->Users->find('all',[
$users = $this->Users->find('all', [
'conditions' => [
'Users.id' => $user_personals['user_id']
]
])->first();
$digits = 4;
$users['pin_pass'] = str_pad(rand(0, pow(10, $digits)-1), $digits, '0', STR_PAD_LEFT);
$users['pin_pass'] = str_pad(rand(0, pow(10, $digits) - 1), $digits, '0', STR_PAD_LEFT);
$token = $users['token'];
//--------------------ตัวส่ง Email ---------------------------------------------------------
//pr($user_personals);die;
$data_notification = [];
$data_notification['email'] = $this->request->data['email'];
$data_notification['pin_code'] = $users['pin_pass'].'<br>'." Username: ".$users['username'];
$data_notification['pin_code'] = $users['pin_pass'];
$this->notification($data_notification);
//----------------------------------------------------------------------------------------
$this->Users->save($users);
$this->Flash->success(__('send password to email success'));
return $this->redirect(['action' => 'pinCodepassword/'.$token]);
}else{
return $this->redirect(['action' => 'pinCodepassword/' . $token]);
} else {
$this->Flash->error(__('Invalid Email.'));
return $this->redirect(['action' => 'forgot-password']);
}
......@@ -423,6 +423,73 @@ class UsersController extends AppController {
}
// if ($this->request->is('post')) {
// $data = $this->request->data();
// $data['pin_pass'] = $data['pin_code_1'] . $data['pin_code_2'] . $data['pin_code_3'] . $data['pin_code_4'];
// if ($data['pin_pass'] == $users['pin_pass']) {
// $this->Flash->success(__('Pin Completed.'));
// return $this->redirect(['controller' => 'Users', 'action' => 'changeForgotpassword/' . $token]);
// }
// $this->Flash->error(__('Pin Invalid'));
// return $this->redirect(['controller' => 'Users', 'action' => 'pinCodepassword/' . $token]);
// }
// $this->set(array('token' => $token, '_serialize' => array('token')));
// }
// public function changePassword($token = null) {
// $id = $this->Auth->user('id');
// $this->viewBuilder()->layout('blank');
// $users = $this->Users->get($id);
// if ($this->request->is('post')) {
// $hasher = new DefaultPasswordHasher();
// $password = $this->request->data['password'];
// $confirm_password = $this->request->data['confirm_password'];
// $oldpassword = $this->request->data['oldpassword'];
// $this->request->data['password'] = $hasher->hash($this->request->data['password']);
// //------- เทียบ password ที่เข้ารหัส ---------------password_verify($password,hashed_password)---------------------------
// if (password_verify($oldpassword, $users['password'])) {
// $users = $this->Users->patchEntity($users, $this->request->getData());
// $this->Users->save($users);
// $this->Flash->success(__('change password success'));
// $this->Flash->success(__('You are now logged out.'));
// return $this->redirect(['action' => 'signout']);
// } else {
// $this->Flash->error(__('Invalid password.'));
// return $this->redirect(['action' => 'change-password']);
// }
// }
// $this->set(array('token' => $token, '_serialize' => array('token')));
// }
// public function changeForgotpassword($token = null) {
// $this->viewBuilder()->layout('blank');
// $users = $this->Users->find('all', [
// 'conditions' => [
// 'Users.token' => $token
// ]
// ])->first();
// if ($this->request->is('post')) {
// $hasher = new DefaultPasswordHasher();
// $password = $this->request->data['password'];
// //$confirm_password = $this->request->data['confirm_password'];
// $this->request->data['password'] = $hasher->hash($this->request->data['password']);
// //------- เทียบ password ที่เข้ารหัส ---------------password_verify($password,hashed_password)---------------------------
// $users = $this->Users->patchEntity($users, $this->request->getData());
// if ($this->Users->save($users)) {
// $this->Flash->success(__('change password success'));
// return $this->redirect(['action' => 'signin']);
// }
// $this->Flash->error(__('Invalid password.'));
// return $this->redirect(['action' => 'change_forgotpassword']);
// }
// $this->set(array('token' => $token, '_serialize' => array('token')));
// }
#---------------------------------------------------------------------------------------------------
/**
......@@ -440,6 +507,7 @@ class UsersController extends AppController {
return $this->redirect($this->Auth->logout());
}
public function forgotsendpin($token=null) {
$this->loadModel('UserPersonals');
$users = $this->Users->find('all',[
......@@ -500,5 +568,4 @@ class UsersController extends AppController {
return $this->redirect(['action' => 'pin_code/'.$token]);
}
}
www/src/Template/Layout/blank.ctp
......@@ -17,40 +17,40 @@
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700,800%7CShadows+Into+Light" rel="stylesheet" type="text/css">
<!-- Vendor CSS -->
<?php echo $this->Html->css('/css/pakgon.css'); ?>
<?php echo $this->Html->css('/css/bootstrap/css/bootstrap.min') ?>
<?php echo $this->Html->css('/css/font-awesome/css/font-awesome.min') ?>
<?php echo $this->Html->css('/css/animate/animate.min') ?>
<?php echo $this->Html->css('/css/simple-line-icons/css/simple-line-icons.min') ?>
<?php echo $this->Html->css('/css/owl.carousel/assets/owl.carousel.min') ?>
<?php echo $this->Html->css('/css/owl.carousel/assets/owl.theme.default.min') ?>
<?php echo $this->Html->css('/css/magnific-popup/magnific-popup.min') ?>
<?php echo $this->Html->css('/css/bootstrap/css/bootstrap.min'); ?>
<?php echo $this->Html->css('/css/font-awesome/css/font-awesome.min'); ?>
<?php echo $this->Html->css('/css/animate/animate.min'); ?>
<?php echo $this->Html->css('/css/simple-line-icons/css/simple-line-icons.min'); ?>
<?php echo $this->Html->css('/css/owl.carousel/assets/owl.carousel.min'); ?>
<?php echo $this->Html->css('/css/owl.carousel/assets/owl.theme.default.min'); ?>
<?php echo $this->Html->css('/css/magnific-popup/magnific-popup.min'); ?>
<!-- Theme CSS -->
<?php echo $this->Html->css('/css/css/theme') ?>
<?php echo $this->Html->css('/css/css/theme-elements') ?>
<?php echo $this->Html->css('/css/css/theme-blog') ?>
<?php echo $this->Html->css('/css/css/theme-shop') ?>
<?php echo $this->Html->css('/css/css/theme'); ?>
<?php echo $this->Html->css('/css/css/theme-elements'); ?>
<?php echo $this->Html->css('/css/css/theme-blog'); ?>
<?php echo $this->Html->css('/css/css/theme-shop'); ?>
<!-- Skin CSS -->
<?php echo $this->Html->css('/css/css/skins/default') ?>
<?php echo $this->Html->css('/css/css/skins/default'); ?>
<?php echo $this->Html->script('/js/master/style-switcher/style.switcher.localstorage'); ?>
<!-- Theme Custom CSS -->
<?php echo $this->Html->css('/css/css/custom') ?>
<?php echo $this->Html->css('/css/css/custom'); ?>
<!-- Head Libs -->
<?php echo $this->Html->script('/js/modernizr/modernizr.min'); ?>
<!-- APP -->
<?php echo $this->Html->script('custom/core'); ?>
<?php echo $this->Html->css('/css/pakgon.css'); ?>
<style>
<style type="text/css">
@font-face {
font-family: 'Conv_supermarket';
src: url('../font/fonts/supermarket.eot');
src: local('☺'), url('../font/fonts/supermarket.woff') format('woff'), url('../font/fonts/supermarket.ttf') format('truetype'), url('../font/fonts/supermarket.svg') format('svg');
src: url('/font/fonts/supermarket.eot');
src: local('☺'), url('/font/fonts/supermarket.woff') format('woff'), url('/font/fonts/supermarket.ttf') format('truetype'), url('/font/fonts/supermarket.svg') format('svg');
font-weight: normal;
font-style: normal;
}
</style>
<?php echo $this->Html->script('/js/jquery/jquery-1.11.3.min'); ?>
<!-- Isolated Version of Bootstrap, not needed if your site already uses Bootstrap -->
<?php echo $this->Html->css('/css/css/bootstrap-iso') ?>
<?php echo $this->Html->css('/css/css/bootstrap-iso'); ?>
<?php echo $this->Html->script('/js/jquery/alex-date-time'); ?>
<?php echo $this->Html->css('/css/chosen_v151/bootstrap-chosen/bootstrap-chosen.css'); ?>
<?php echo $this->Html->script('/css/chosen_v151/chosen.jquery.min.js'); //Chosen select box?>
......@@ -76,6 +76,7 @@
</div>
</div>
</div>
<?php echo $this->Html->script('/js/cleave-phone.th'); ?>
<?php echo $this->Html->script('/js/cleave.min'); ?>
<?php echo $this->Html->script('jquery.appear/jquery.appear.min'); ?>
......
www/src/Template/Profiles/index.ctp
......@@ -30,7 +30,6 @@
<div class="row">
<div class="col-xs-1 col-sm-1 col-md-1 box-arrow" ></div>
<div class="col-xs-10 col-sm-10 col-md-10">
<div data-toggle="modal" data-target="#defaultModal" style="text-align: center; cursor: pointer;">
<img src="/img/core/img/connect-card-v3.png" class="img-responsive" id="img-upload" alt="Profile picture">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment