From a82cf90d12a31b16f05726275286a19fad02cbbf Mon Sep 17 00:00:00 2001 From: JonatanRek Date: Fri, 11 Oct 2019 16:32:05 +0200 Subject: [PATCH] Base Directory Fix #1 --- app/controls/automation.php | 4 ++-- app/controls/dashboard.php | 2 +- app/controls/home.php | 6 +++--- app/controls/scene.php | 4 ++-- app/views/Ajax.php | 4 ++-- app/views/Automation.php | 2 +- app/views/Dashboard.php | 2 +- app/views/Home.php | 2 +- app/views/Log.php | 2 +- app/views/Login.php | 2 +- app/views/Logout.php | 2 +- app/views/Rooms.php | 2 +- app/views/Scene.php | 2 +- app/views/Setting.php | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/controls/automation.php b/app/controls/automation.php index 4c12005..adf8282 100644 --- a/app/controls/automation.php +++ b/app/controls/automation.php @@ -10,7 +10,7 @@ if (isset($_POST) && !empty($_POST)){ AutomationManager::create($_POST['name'], $onDays, $doCode, $ifCode); - header('Location: /vasek/home/' . strtolower(basename(__FILE__, '.php')), TRUE); + header('Location: ' . BASEDIR . strtolower(basename(__FILE__, '.php')), TRUE); die(); } else if (isset($_POST['modalFinal']) && $_POST['modalFinal'] == "Upravit") { $doCode = json_encode($_POST['device'], JSON_PRETTY_PRINT); @@ -38,7 +38,7 @@ if (isset($_POST) && !empty($_POST)){ AutomationManager::create($_POST['name'], $onDays, $doCode, $ifCode, (isset ($_POST['automation_id']) ? $_POST['automation_id'] : "")); - header('Location: /vasek/home/' . strtolower(basename(__FILE__, '.php'))); + header('Location: ' . BASEDIR . strtolower(basename(__FILE__, '.php'))); die(); } } diff --git a/app/controls/dashboard.php b/app/controls/dashboard.php index c2dbda5..ed952f5 100644 --- a/app/controls/dashboard.php +++ b/app/controls/dashboard.php @@ -7,7 +7,7 @@ if (isset($_POST) && !empty($_POST)){ DashboardManager::Add($subDeviceId); } } - header('Location: /vasek/home/' . strtolower(basename(__FILE__, '.php'))); + header('Location: ' . BASEDIR . strtolower(basename(__FILE__, '.php'))); die(); } ?> diff --git a/app/controls/home.php b/app/controls/home.php index b82e748..608c7bf 100644 --- a/app/controls/home.php +++ b/app/controls/home.php @@ -42,7 +42,7 @@ if (isset($_POST) && !empty($_POST)){ echo $deviceId; var_dump(json_decode ($permissionsInJson)); echo ''; - echo 'CONTINUE'; + echo 'CONTINUE'; die(); } } else if (isset($_POST['approveDevice'])) { @@ -64,10 +64,10 @@ if (isset($_POST) && !empty($_POST)){ echo '
';
 		var_dump($POST);
 		echo '
'; - echo 'CONTINUE'; + echo 'CONTINUE'; die(); } - header('Location: /vasek/home/'); + header('Location: ' . BASEDIR ); die(); } ?> diff --git a/app/controls/scene.php b/app/controls/scene.php index 041f922..2da90ac 100644 --- a/app/controls/scene.php +++ b/app/controls/scene.php @@ -9,10 +9,10 @@ if (isset($_POST) && !empty($_POST)){ echo '
';
 		var_dump($_POST);
 		echo '
'; - echo 'CONTINUE'; + echo 'CONTINUE'; die(); } - header('Location: /vasek/home/' . strtolower(basename(__FILE__, '.php'))); + header('Location: ' . BASEDIR . strtolower(basename(__FILE__, '.php'))); die(); } diff --git a/app/views/Ajax.php b/app/views/Ajax.php index 6b12500..d00c6f2 100644 --- a/app/views/Ajax.php +++ b/app/views/Ajax.php @@ -13,12 +13,12 @@ class Ajax extends Template global $lang; if (!$userManager->isLogin()){ - header('Location: ./'); + header('Location: ' . BASEDIR); } $is_ajax = 'XMLHttpRequest' == ( $_SERVER['HTTP_X_REQUESTED_WITH'] ?? '' ); if (!$is_ajax){ - header('Location: ./'); + header('Location: ' . BASEDIR); } if ( diff --git a/app/views/Automation.php b/app/views/Automation.php index 33f59bd..1d32cd5 100644 --- a/app/views/Automation.php +++ b/app/views/Automation.php @@ -13,7 +13,7 @@ class Automation extends Template global $langMng; if (!$userManager->isLogin()){ - header('Location: ./login'); + header('Location: ' . BASEDIR . 'login'); } $automations = []; diff --git a/app/views/Dashboard.php b/app/views/Dashboard.php index 990c057..a4b84fc 100644 --- a/app/views/Dashboard.php +++ b/app/views/Dashboard.php @@ -7,7 +7,7 @@ class Dashboard extends Template global $langMng; if (!$userManager->isLogin()){ - header('Location: ./login'); + header('Location: ' . BASEDIR . 'login'); } $template = new Template('dashboard'); diff --git a/app/views/Home.php b/app/views/Home.php index 5cbfc91..09c586e 100644 --- a/app/views/Home.php +++ b/app/views/Home.php @@ -9,7 +9,7 @@ class Home extends Template global $langMng; if (!$userManager->isLogin()){ - header('Location: ./login'); + header('Location: ' . BASEDIR . 'login'); } $template = new Template('home'); diff --git a/app/views/Log.php b/app/views/Log.php index 40496a3..b8c5363 100644 --- a/app/views/Log.php +++ b/app/views/Log.php @@ -9,7 +9,7 @@ class Log extends Template global $langMng; if (!$userManager->isLogin()){ - header('Location: ./login'); + header('Location: ' . BASEDIR . 'login'); } $template = new Template('log'); diff --git a/app/views/Login.php b/app/views/Login.php index 4d205c1..f34c7f5 100644 --- a/app/views/Login.php +++ b/app/views/Login.php @@ -7,7 +7,7 @@ class Login extends Template global $lang; if ($userManager->isLogin()){ - header('Location: ./'); + header('Location: ' . BASEDIR); } $template = new Template('login'); diff --git a/app/views/Logout.php b/app/views/Logout.php index 026d680..0747434 100644 --- a/app/views/Logout.php +++ b/app/views/Logout.php @@ -5,7 +5,7 @@ class Logout extends Template { global $userManager; $userManager->logout(); - header('Location: /vasek/home/login', TRUE); + header('Location: ' . BASEDIR . 'login'); die(); } } diff --git a/app/views/Rooms.php b/app/views/Rooms.php index 32a5ae5..0725d33 100644 --- a/app/views/Rooms.php +++ b/app/views/Rooms.php @@ -9,7 +9,7 @@ class Rooms extends Template global $lang; if (!$userManager->isLogin()){ - header('Location: ./login'); + header('Location: ' . BASEDIR . 'login'); } $template = new Template('rooms'); diff --git a/app/views/Scene.php b/app/views/Scene.php index 5ca091c..ec84c57 100644 --- a/app/views/Scene.php +++ b/app/views/Scene.php @@ -7,7 +7,7 @@ class Scene extends Template global $langMng; if (!$userManager->isLogin()){ - header('Location: ./'); + header('Location: ' . BASEDIR . 'login'); } $template = new Template('scene'); diff --git a/app/views/Setting.php b/app/views/Setting.php index 3f8c39a..7f8b67b 100644 --- a/app/views/Setting.php +++ b/app/views/Setting.php @@ -7,7 +7,7 @@ class Setting extends Template global $langMng; if (!$userManager->isLogin()){ - header('Location: ./login'); + header('Location: ' . BASEDIR . 'login'); } $automations = [];