dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

landing page pricing table, map bug fixes, signature module improvement

Browse Source
This commit is contained in:
exodus4d
2015-06-06 16:47:04 +02:00
parent 34e41a6553
commit 639bff363c
80 changed files with 6168 additions and 6999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/main/controller/Controller.php
View File

@@ -58,7 +58,7 @@ class Controller {
* set/change DB connection
* @param $type
*/
protected function setDB($type){
protected function setDB($type = ''){
if($type === 'CCP'){
// CCP DB
@@ -84,14 +84,20 @@ class Controller {
/**
* get current user model
* @return bool|null
* @throws \Exception
*/
protected function _getUser(){
$user = Model\BasicModel::getNew('UserModel', 5);
$user->getById($this->f3->get('SESSION.user.id'));
$user = false;
$userId = $this->f3->get('SESSION.user.id');
if($user->dry()){
$user = false;
if($userId > 0){
$userModel = Model\BasicModel::getNew('UserModel', 5);
$userModel->getById($userId);
if( !$userModel->dry() ){
$user = $userModel;
}
}
return $user;