diff --git a/app/main/controller/admin.php b/app/main/controller/admin.php index a9fe322f..eb5a5a91 100644 --- a/app/main/controller/admin.php +++ b/app/main/controller/admin.php @@ -49,7 +49,7 @@ class Admin extends Controller{ $this->dispatch($f3, $params, $character); } - $f3->set('tplAuthType', $f3->alias( 'sso', ['action' => 'requestAdminAuthorization'])); + $f3->set('tplAuthType', $f3->get('BASE') . $f3->alias( 'sso', ['action' => 'requestAdminAuthorization'])); // page title $f3->set('tplPageTitle', 'Admin | ' . Config::getPathfinderData('name')); diff --git a/app/main/controller/appcontroller.php b/app/main/controller/appcontroller.php index 305b2c10..6079c365 100644 --- a/app/main/controller/appcontroller.php +++ b/app/main/controller/appcontroller.php @@ -29,7 +29,7 @@ class AppController extends Controller { if($return = parent::beforeroute($f3, $params)){ // href for SSO Auth - $f3->set('tplAuthType', $f3->alias( 'sso', ['action' => 'requestAuthorization'] )); + $f3->set('tplAuthType', $f3->get('BASE') . $f3->alias( 'sso', ['action' => 'requestAuthorization'] )); // characters from cookies $f3->set('cookieCharacters', $this->getCookieByName(self::COOKIE_PREFIX_CHARACTER, true)); diff --git a/app/requirements.ini b/app/requirements.ini index 6df69822..761df9d1 100644 --- a/app/requirements.ini +++ b/app/requirements.ini @@ -30,7 +30,7 @@ ZMQ = 1.1.3 EVENT = 2.3.0 ; exec() function required for run Shell scripts from PHP -EXEC = 1 +EXEC = 1 ; max execution time for requests (seconds) MAX_EXECUTION_TIME = 10 diff --git a/public/templates/ui/admin_panel.html b/public/templates/ui/admin_panel.html index 63ef5024..deb75e37 100644 --- a/public/templates/ui/admin_panel.html +++ b/public/templates/ui/admin_panel.html @@ -1,6 +1,6 @@
\ No newline at end of file diff --git a/public/templates/view/admin.html b/public/templates/view/admin.html index 4c5ea072..76b6fa30 100644 --- a/public/templates/view/admin.html +++ b/public/templates/view/admin.html @@ -16,11 +16,11 @@ diff --git a/public/templates/view/index.html b/public/templates/view/index.html index 91bc8712..c2299935 100644 --- a/public/templates/view/index.html +++ b/public/templates/view/index.html @@ -22,7 +22,7 @@ - + diff --git a/public/templates/view/login.html b/public/templates/view/login.html index 966b9bad..aadaac2b 100644 --- a/public/templates/view/login.html +++ b/public/templates/view/login.html @@ -78,7 +78,7 @@