From f71d39467f353ae5f67984c0809bbda5ff7968b0 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Sun, 11 Aug 2013 12:55:19 +0200
Subject: Remove api keys dependency on username

We don't need it and getting the user name from the user drivers is way
more complicated.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/views/file/upload_form.php | 2 +-
 application/views/header.php           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'application/views')

diff --git a/application/views/file/upload_form.php b/application/views/file/upload_form.php
index 99c1d9e42..841ac3746 100644
--- a/application/views/file/upload_form.php
+++ b/application/views/file/upload_form.php
@@ -1,4 +1,4 @@
-<?php if (isset($username) && $username) { ?>
+<?php if (user_logged_in()) { ?>
 <div class="well">
 	<div class="row-fluid">
 		<div class="span12 text-upload-form">
diff --git a/application/views/header.php b/application/views/header.php
index e85463735..ba6d6ae9d 100644
--- a/application/views/header.php
+++ b/application/views/header.php
@@ -45,7 +45,7 @@ if (is_cli_client() && !isset($force_full_html)) {
 				</a>
 				<?php if(!isset($GLOBALS["is_error_page"])) { ?>
 					<ul class="nav pull-right">
-						<?php if(isset($username) && $username) { ?>
+						<?php if(user_logged_in()) { ?>
 							<li><a href="<?php echo site_url("/user/logout"); ?>">Logout</a></li>
 						<?php } else { ?>
 							<li class="dropdown">
@@ -65,7 +65,7 @@ if (is_cli_client() && !isset($force_full_html)) {
 					</ul>
 					<?php }; ?>
 					<ul class="nav">
-						<?php if(isset($username) && $username) { ?>
+						<?php if(user_logged_in()) { ?>
 							<li><a href="<?php echo site_url("file/index") ?>"><i class="icon-pencil icon-white"></i> New</a></li>
 							<li><a href="<?php echo site_url("file/upload_history") ?>"><i class="icon-book icon-white"></i> History</a></li>
 							<li class="dropdown">
-- 
cgit v1.2.3-24-g4f1b