diff --git a/admin/accesslog.php b/admin/accesslog.php index 8e4a1977ae..9e9e582a62 100755 --- a/admin/accesslog.php +++ b/admin/accesslog.php @@ -71,6 +71,9 @@ $t->set_var("row_lo",$li); $t->set_var("row_total",$total); + if ($phpgw->db->num_rows() == 1) { + $t->set_var("output",""); + } if ($phpgw->db->num_rows() != ++$i) { $t->parse("output","row",True); } diff --git a/admin/accounts.php b/admin/accounts.php index c41712ed86..ef1abf86e5 100755 --- a/admin/accounts.php +++ b/admin/accounts.php @@ -87,6 +87,9 @@ $t->set_var("row_view",' ' . lang_common("View") . ' '); + if ($phpgw->db->num_rows() == 1) { + $t->set_var("output",""); + } if ($phpgw->db->num_rows() != ++$i) { $t->parse("output","row",True); } diff --git a/admin/currentusers.php b/admin/currentusers.php index b0216e943d..78799a5fde 100755 --- a/admin/currentusers.php +++ b/admin/currentusers.php @@ -14,6 +14,13 @@ $phpgw_flags["currentapp"] = "admin"; include("../header.inc.php"); + $t = new Template($phpgw_info["server"]["template_dir"]); + $t->set_file(array( "header" => "currentusers.tpl", + "row" => "currentusers.tpl", + "footer" => "currentusers.tpl" )); + + $t->set_block("header","row","footer","output"); + if (! $start) $start = 0; @@ -23,61 +30,59 @@ $total = $phpgw->db->f(0); $limit = $phpgw->nextmatchs->sql_limit($start); -?> -
-: - -"> - nextmatchs->left("currentusers.php",$start,$total); - ?> - - nextmatchs->right("currentusers.php",$start,$total); - ?> - - "> - - - - - - - -set_var("lang_current_users",lang_admin("List of current users")); + $t->set_var("bg_color",$phpgw_info["theme"][bg_color]); + $t->set_var("left_next_matchs",$phpgw->nextmatchs->left("currentusers.php",$start,$total)); + $t->set_var("right_next_matchs",$phpgw->nextmatchs->right("currentusers.php",$start,$total)); + $t->set_var("th_bg",$phpgw_info["theme"]["th_bg"]); - $phpgw->db->query("select * from sessions $ordermethod limit $limit"); + $t->set_var("sort_loginid",$phpgw->nextmatchs->show_sort_order($sort,"loginid",$order, + "currentusers.php",lang_admin("LoginID"))); + $t->set_var("sort_ip",$phpgw->nextmatchs->show_sort_order($sort,"ip",$order, + "currentusers.php",lang_admin("IP"))); + $t->set_var("sort_login_time",$phpgw->nextmatchs->show_sort_order($sort,"logintime",$order, + "currentusers.php",lang_admin("Login Time"))); + $t->set_var("sort_idle",$phpgw->nextmatchs->show_sort_order($sort,"dla",$order, + "currentusers.php",lang_admin("idle"))); + $t->set_var("lang_kill",lang_admin("Kill")); - while ($phpgw->db->next_record()) { + $t->parse("out","header"); + + + if ($order) { + $ordermethod = "order by $order $sort"; + } else { + $ordermethod = "order by dla asc"; + } + + $phpgw->db->query("select * from sessions $ordermethod limit $limit"); + + while ($phpgw->db->next_record()) { $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color); + $t->set_var("tr_color",$tr_color); - ?> - - - - - - - - set_var("row_loginid",$phpgw->db->f("loginid")); + $t->set_var("row_ip",$phpgw->db->f("ip")); + $t->set_var("row_logintime",$phpgw->preferences->show_date($phpgw->db->f("logintime"))); + $t->set_var("row_idle",gmdate("G:i:s",(time() - $phpgw->db->f("dla")))); + + if ($phpgw->db->f("sessionid") != $phpgw->session->id) { + $t->set_var("row_kill",'" . lang_admin("Kill")).''); + } else { + $t->set_var("row_kill"," "); + } + + if ($phpgw->db->num_rows() == 1) { + $t->set_var("output",""); + } + if ($phpgw->db->num_rows() != ++$i) { + $t->parse("output","row",True); + } } +pparse("out","footer"); + include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); ?> - -
 
nextmatchs->show_sort_order($sort,"loginid",$order,"currentusers.php", - lang_admin("LoginID")); ?>nextmatchs->show_sort_order($sort,"ip",$order,"currentusers.php", - lang_admin("IP")); ?>nextmatchs->show_sort_order($sort,"logintime",$order,"currentusers.php", - lang_admin("Login Time"));?>nextmatchs->show_sort_order($sort,"dla",$order,"currentusers.php", - lang_admin("idle")); ?>
db->f("loginid"); ?>db->f("ip"); ?>preferences->show_date($phpgw->db->f("logintime")); ?>db->f("dla")) ); ?>db->f("sessionid") != $phpgw->session->id) { - echo "link("killsession.php","ksession=" - . $phpgw->db->f("sessionid") . "&kill=true\">" - . lang_admin("Kill")); - } else { - echo " "; - } - ?>
- -