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

closed #90 (IGB map not working) jsPlumb v2.0.5 downgraded to v1.7.6

Browse Source 
#84 renamed "landingpage" view to "login" view
#84 added some basic CREST API data mappers
#84 added "isNPC" flag t Corporation table (WIP)
#84  added CREST API settings to environment.ini
This commit is contained in:
Exodus4D
2016-02-06 16:18:24 +01:00
parent 18cb3a7987
commit 27c069848e
61 changed files with 38995 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/main/controller/controller.php
View File

@@ -137,7 +137,7 @@ class Controller {
if( !$f3->get('AJAX') ){
// redirect to landing page
$f3->reroute('@landing');
$f3->reroute('@login');
}else{
$params = $f3->get('POST');
$return = (object) [];
@@ -145,7 +145,7 @@ class Controller {
isset($params['reroute']) &&
(bool)$params['reroute']
){
$return->reroute = rtrim(self::getEnvironmentData('URL'), '/') . $f3->alias('landing');
$return->reroute = rtrim(self::getEnvironmentData('URL'), '/') . $f3->alias('login');
}else{
// no reroute -> errors can be shown
$return->error[] = $this->getUserLoggedOffError();
@@ -428,7 +428,7 @@ class Controller {
$url = $this->getF3()->alias( $this->getF3()->get('ALIAS') );
}else{
// get main (index.php) URL
$url = $this->getF3()->alias('landing');
$url = $this->getF3()->alias('login');
}
return $url;
@@ -440,7 +440,6 @@ class Controller {
*/
protected function getUserAgent(){
$userAgent = '';
$userAgent .= $this->getF3()->get('PATHFINDER.NAME');
$userAgent .= ' - ' . $this->getF3()->get('PATHFINDER.VERSION');
$userAgent .= ' | ' . $this->getF3()->get('PATHFINDER.CONTACT');