From 41ce4a71aa24929057906689cdc36f38dd413c89 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Mon, 2 Apr 2001 20:47:22 +0000
Subject: [PATCH] Add userinfo and current users to navbar

---
 phpgwapi/templates/idsociety/navbar.inc.php | 3 ++-
 phpgwapi/templates/idsociety/navbar.tpl     | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/templates/idsociety/navbar.inc.php b/phpgwapi/templates/idsociety/navbar.inc.php
index e7bd557083..6fb3d714de 100644
--- a/phpgwapi/templates/idsociety/navbar.inc.php
+++ b/phpgwapi/templates/idsociety/navbar.inc.php
@@ -73,13 +73,14 @@
 /*     if ($phpgw_info["server"]["showpoweredbyon"] == "top") {
         $tpl->set_var("powered_by",lang("Powered by phpGroupWare version x",$phpgw_info["server"]["versions"]["phpgwapi"]));
      }
+*/
      if (isset($phpgw_info["navbar"]["admin"]) && isset($phpgw_info["user"]["preferences"]["common"]["show_currentusers"])) {
         $db  = $phpgw->db;
         $db->query("select count(*) from phpgw_sessions");
         $db->next_record();
         $tpl->set_var("current_users",'<a href="' . $phpgw->link("/admin/currentusers.php") . '">&nbsp;'
                                     . lang("Current users") . ': ' . $db->f(0) . '</a>');
-     } */
+     }
      $tpl->set_var("user_info",$phpgw->common->display_fullname() . " - "
                              . lang($phpgw->common->show_date(time(),"l")) . " "
                              . lang($phpgw->common->show_date(time(),"F")) . " "
diff --git a/phpgwapi/templates/idsociety/navbar.tpl b/phpgwapi/templates/idsociety/navbar.tpl
index c0c0a0fcec..79bd878a6d 100755
--- a/phpgwapi/templates/idsociety/navbar.tpl
+++ b/phpgwapi/templates/idsociety/navbar.tpl
@@ -41,7 +41,12 @@
 
      </TD>
 	</TR>
+    <TR>
+      <TD ALIGN="left" COLSPAN="2">
+{user_info}&nbsp;&nbsp;{current_users}
+      </TD>
+    </TR>
 	<TR>
 		<TD>
 
-<!-- END navbar -->
\ No newline at end of file
+<!-- END navbar -->