ben/status-board
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix misc login and display issues

Browse Source
This commit is contained in:
Ben Roberts
2011-12-19 17:21:54 +00:00
parent fed73e2268
commit 6ab5f683e9
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/webui/pages/login.php
View File

@@ -3,13 +3,14 @@
$main = StatusBoard_Main::instance(); $main = StatusBoard_Main::instance();
$request = $main->request(); $request = $main->request();
$auth = $main->auth(); $auth = $main->auth();
$log = $main->log();
$authenticated = false; $authenticated = false;
$authentication_failed = false; $authentication_failed = false;
if ($request->exists('do')) { if ($request->exists('do')) {
$username = StatusBoard_Main::issetelse($_POST['username'], Sihnon_Exception_InvalidParameters); $username = StatusBoard_Main::issetelse($_POST['username'], 'Sihnon_Exception_InvalidParameters');
$password = StatusBoard_Main::issetelse($_POST['password'], Sihnon_Exception_InvalidParameters); $password = StatusBoard_Main::issetelse($_POST['password'], 'Sihnon_Exception_InvalidParameters');
try { try {
$auth->authenticate($username, $password); $auth->authenticate($username, $password);

16
source/webui/pages/navigation.php
View File

@@ -1,18 +1,16 @@
<?php <?php
$display_login = true; $authenticated = false;
$display_admin = false; $user = null;
$auth = StatusBoard_Main::instance()->auth(); $auth = StatusBoard_Main::instance()->auth();
if ($auth->isAuthenticated()) { if ($auth->isAuthenticated()) {
$display_login = false; $authenticated = true;
$user = $auth->authenticatedUser();
} }
if ($auth->isAdministrator()) { $this->smarty->assign('authenticated', $authenticated);
$display_admin = true; $this->smarty->assign('auth', $auth);
} $this->smarty->assign('user', $user);
$this->smarty->assign('display_login', $display_login);
$this->smarty->assign('display_admin', $display_admin);
?> ?>

13
source/webui/templates/navigation.tpl
View File

@@ -3,17 +3,18 @@
<ul class="nav"> <ul class="nav">
<li class="active"><a href="{$base_uri}home/" title="Home">Home</a></li> <li class="active"><a href="{$base_uri}home/" title="Home">Home</a></li>
{if $display_admin} {if $authenticated}
{if $auth->isAdministrator()}
<li><a href="{$base_uri}admin/" title="Admin">Admin</a></li> <li><a href="{$base_uri}admin/" title="Admin">Admin</a></li>
{/if} {/if}
{if $display_login}
<li><a href="{$base_uri}login/" title="Login">Login</a></li>
{else}
<li><a href="{$base_uri}logout/" title="Logout">Logout</a></li> <li><a href="{$base_uri}logout/" title="Logout">Logout</a></li>
{else}
<li><a href="{$base_uri}login/" title="Login">Login</a></li>
{/if} {/if}
</ul> </ul>
{if $authenticated}
<p class="pull-right"> <p class="pull-right">
Logged in as <a href="#">username</a> Logged in as <a href="#">{$user->username}</a>
</p> </p>
{/if}