display username in header

19 years ago · c93f38c494
parent 0cc89acb29
commit c93f38c494
5 changed files with 23 additions and 6 deletions
--- a/backend.php
+++ b/backend.php
@ -10,6 +10,7 @@
 	require_once "magpierss/rss_fetch.inc";

 	$_SESSION["uid"] = PLACEHOLDER_UID; // FIXME: placeholder
+	$_SESSION["name"] = PLACEHOLDER_NAME;

 	$op = $_REQUEST["op"];

--- a/functions.php
+++ b/functions.php
@ -5,6 +5,7 @@
 	require_once 'db-prefs.php';

 	$_SESSION["uid"] = PLACEHOLDER_UID; // FIXME: placeholder
+	$_SESSION["name"] = PLACEHOLDER_NAME;

 	define('MAGPIE_OUTPUT_ENCODING', 'UTF-8');

--- a/prefs.php
+++ b/prefs.php
@ -6,6 +6,9 @@
 	require_once "db-prefs.php";

 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);	
+
+	$_SESSION["uid"] = PLACEHOLDER_UID; // FIXME: placeholder
+	$_SESSION["name"] = PLACEHOLDER_NAME;
 ?>
 <html>
 <head>
@ -40,12 +43,14 @@
 <tr>
 	<td colspan="2">
 		<table cellspacing="0" cellpadding="0" width="100%"><tr>
-			<td class="header" valign="middle">	
+			<td rowspan="2" class="header" valign="middle">	
 				<img src="images/ttrss_logo.png" alt="logo">	
 			</td>
 			<td align="right" valign="top">
 				<div id="notify"><span id="notify_body"></div>
 			</td>
+		</tr><tr><td class="welcomePrompt">
+			Hello, <b><?= $_SESSION["name"] ?></b> (<a href="logout.php">Logout</a>)</td>
 		</tr></table>
 	</td>
 </tr>
--- a/tt-rss.css
+++ b/tt-rss.css
@ -533,3 +533,10 @@ div.prefHelp, td.prefHelp {
 	padding : 5px;
 }

+td.welcomePrompt {
+	font-size : small;
+	color : gray;
+	text-align : right;
+	padding-right : 10px;
+
+}
--- a/tt-rss.php
+++ b/tt-rss.php
@ -6,6 +6,10 @@
 	require_once "db-prefs.php";

 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);	
+
+	$_SESSION["uid"] = PLACEHOLDER_UID; // FIXME: placeholder
+	$_SESSION["name"] = PLACEHOLDER_NAME;
+
 ?>
 <html>
 <head>
@ -47,18 +51,17 @@
 <table width="100%" height="100%" cellspacing="0" cellpadding="0" class="main">
 <? if (get_pref($link, 'DISPLAY_HEADER')) { ?>
 <tr>
-	<td colspan="2" class="headerBox">
+	<td colspan="2">
 		<table cellspacing="0" cellpadding="0" width="100%"><tr>
-			<td class="header" valign="middle">	
+			<td rowspan="2" class="header" valign="middle">	
 				<img src="images/ttrss_logo.png" alt="logo">	
 			</td>
 			<td align="right" valign="top">
 				<div id="notify"><span id="notify_body"></div>
 			</td>
+		</tr><tr><td class="welcomePrompt">
+			Hello, <b><?= $_SESSION["name"] ?></b> (<a href="logout.php">Logout</a>)</td>
 		</tr></table>
-
-		<div id="userDlg">&nbsp;</div>
-
 	</td>
 </tr>
 <? } ?>