diff options
| author | Alex Vitkov <alexvitkov98@gmail.com> | 2021-02-13 12:43:07 +0200 |
|---|---|---|
| committer | Alex Vitkov <alexvitkov98@gmail.com> | 2021-02-13 12:43:07 +0200 |
| commit | 0c56b6431133facf94f83faf920cfa58e311dd19 (patch) | |
| tree | 7d18ff74ccc139bbbb9bdcdb4412e1eea42c4d37 | |
| parent | f10a55259c4eda39e909bc54ac97744a4d053b8a (diff) | |
| parent | e4c0f4eeaa3f1a0707d6bf668619bb48b77c43ce (diff) | |
| download | fileup-0c56b6431133facf94f83faf920cfa58e311dd19.tar.gz | |
Merge branch 'master' of https://github.com/alexvitkov/india
| -rw-r--r-- | index.php | 13 | ||||
| -rw-r--r-- | loggedin.php | 7 | ||||
| -rw-r--r-- | php/login.php | 2 | ||||
| -rw-r--r-- | php/logout.php | 2 |
4 files changed, 17 insertions, 7 deletions
@@ -1,4 +1,5 @@ <?php + require_once "php/user.php"; session_start(); ?> <!DOCTYPE html> @@ -20,9 +21,15 @@ <div style="flex: 1 0 0;"></div> <ul id="topmenu"> - <?php if (array_key_exists("username", $_SESSION)) { ?> + <?php if (array_key_exists("user_object", $_SESSION)) { ?> - <li><?php echo $_SESSION['username'];?></li> + <li> + <?php + $user=$_SESSION['user_object']; + error_log($user->username); + echo $user->username; + ?> + </li> <li onclick="window.location.href='/php/logout.php'">Sign out</li> <?php } else {?> @@ -38,7 +45,7 @@ <div id="page"> <?php - if (array_key_exists("username", $_SESSION)) { + if (array_key_exists("user_object", $_SESSION)) { require_once("loggedin.php"); } else { require_once("loginregister.php"); diff --git a/loggedin.php b/loggedin.php index b655819..cc31684 100644 --- a/loggedin.php +++ b/loggedin.php @@ -6,7 +6,12 @@ <button id="upload_btn" onclick="new_folder()">New Folder</button> <div class="separator"></div> <div class="path" id="the_path"> - <button class="pathentry" id="home_path_entry"><?php echo $_SESSION['username'] ?>'s files</button> + <button class="pathentry" id="home_path_entry"> + <?php + $user=$_SESSION['user_object']; + echo $user->username; + ?> + 's files</button> </div> </h2> diff --git a/php/login.php b/php/login.php index c26445e..6fb3909 100644 --- a/php/login.php +++ b/php/login.php @@ -13,14 +13,12 @@ if(gettype($username)!="string" || gettype($password)!="string") die("You didn't specify the pass or the username"); } -$database=new Database(); $user=$database->authenticate($username,$password); if(!$user) { die("Password or username is incorrect"); } -$_SESSION['username'] = $user->username; $_SESSION['user_object'] = $user; header('Location: /'); diff --git a/php/logout.php b/php/logout.php index 9a4cdd7..d37b0a0 100644 --- a/php/logout.php +++ b/php/logout.php @@ -5,6 +5,6 @@ // which will log the user out of our webpage session_start(); -unset($_SESSION['username']); +unset($_SESSION['user_object']); header('Location: /'); ?> |