FILEUP

LOG | FILES | OVERVIEW
F diff --git a/index.php b/index.php
--- a/index.php
+++ b/index.php
  <?php
+     require_once "php/user.php";
      session_start();
  ?>
  <!DOCTYPE html>
                      <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 {?>
                  <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");
F diff --git a/loggedin.php b/loggedin.php
--- a/loggedin.php
+++ b/loggedin.php
              <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>
  
F diff --git a/php/login.php b/php/login.php
--- a/php/login.php
+++ b/php/login.php
  	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: /');
F diff --git a/php/logout.php b/php/logout.php
--- a/php/logout.php
+++ b/php/logout.php
  // which will log the user out of our webpage
  
  session_start();
- unset($_SESSION['username']);
+ unset($_SESSION['user_object']);
  header('Location: /');
  ?>