diff --git a/app/class/UserManager.php b/app/class/UserManager.php index 74772cb..ee09fc0 100644 --- a/app/class/UserManager.php +++ b/app/class/UserManager.php @@ -26,7 +26,7 @@ class UserManager if ($user = Db::loadOne ('SELECT * FROM users WHERE LOWER(username)=LOWER(?)', array ($username))) { if ($user['password'] == UserManager::getHashPassword($password)) { if (isset($rememberMe) && $rememberMe == 'true') { - setcookie ("rememberMe" . str_replace(".", "_", $_SERVER['HTTP_HOST']), $this->setEncryptedCookie($user['username']), time () + (30 * 24 * 60 * 60 * 1000), "/", $_SERVER['HTTP_HOST'], 1); + setcookie ("rememberMe", $this->setEncryptedCookie($user['username']), time () + (30 * 24 * 60 * 60 * 1000), str_replace("login", "", str_replace('https://' . $_SERVER['HTTP_HOST'], "", $_SERVER['HTTP_REFERER'])), $_SERVER['HTTP_HOST'], 1); } $_SESSION['user']['id'] = $user['user_id']; $page = "./index.php"; @@ -51,8 +51,8 @@ class UserManager if (isset ($_SESSION['user']) && isset($_SESSION['user']['id'])) { return true; } else { - if (isset ($_COOKIE['rememberMe' . str_replace(".", "_", $_SERVER['HTTP_HOST'])])){ - if ($user = Db::loadOne ('SELECT * FROM users WHERE LOWER(username)=LOWER(?)', array ($this->getDecryptedCookie($_COOKIE['rememberMe' . str_replace(".", "_", $_SERVER['HTTP_HOST'])])))) { + if (isset ($_COOKIE['rememberMe'])){ + if ($user = Db::loadOne ('SELECT * FROM users WHERE LOWER(username)=LOWER(?)', array ($this->getDecryptedCookie($_COOKIE['rememberMe'])))) { $_SESSION['user']['id'] = $user['user_id']; return true; } @@ -62,7 +62,7 @@ class UserManager } public function logout () { - setcookie ("rememberMe" . str_replace(".", "_", $_SERVER['HTTP_HOST']),"", time() - (30 * 24 * 60 * 60 * 1000), "/", $_SERVER['HTTP_HOST'], 1); + setcookie ("rememberMe","", time() - (30 * 24 * 60 * 60 * 1000), str_replace("login", "", str_replace('https://' . $_SERVER['HTTP_HOST'], "", $_SERVER['HTTP_REFERER'])), $_SERVER['HTTP_HOST'], 1); unset($_SESSION['user']); session_destroy(); } diff --git a/app/controls/dashboard.php b/app/controls/dashboard.php index ae37279..db6b879 100644 --- a/app/controls/dashboard.php +++ b/app/controls/dashboard.php @@ -7,7 +7,6 @@ if (isset($_POST) && !empty($_POST)){ DashboardManager::Add($subDeviceId); } } - header('Location: /vasek/home/' . strtolower(basename(__FILE__, '.php')), TRUE); die(); } diff --git a/app/templates/dashboard.phtml b/app/templates/dashboard.phtml index 5df6ff0..e64a691 100644 --- a/app/templates/dashboard.phtml +++ b/app/templates/dashboard.phtml @@ -5,7 +5,7 @@ $partial = new Partial('head'); $partial->render(); ?> - <?php echo $TITLE ?> + <?php echo $TITLE; ?>
@@ -24,13 +24,13 @@ $dashboardItemData) { $partialDeviceButton = new Partial('dashboardButton'); $partialDeviceButton->prepare('dashboardItemData', $dashboardItemData); - + $partialDeviceButton->render(); } ?>
- +