From 07bf8a2a7c2a2d3a6af44c9126bd8504d5aa689d Mon Sep 17 00:00:00 2001 From: jengo Date: Thu, 16 Nov 2000 08:00:18 +0000 Subject: [PATCH] Converted the flags to use the new style --- admin/accesslog.php | 2 +- admin/accounts.php | 6 +----- admin/applications.php | 1 - admin/currentusers.php | 2 +- admin/deleteaccount.php | 2 -- admin/deleteapplication.php | 5 +---- admin/deletegroup.php | 6 +----- admin/editaccount.php | 6 +----- admin/editapplication.php | 6 +----- admin/editgroup.php | 6 +----- admin/groups.php | 2 +- admin/index.php | 1 - admin/killsession.php | 1 - admin/newaccount.php | 5 +---- admin/newapplication.php | 6 +----- 15 files changed, 11 insertions(+), 46 deletions(-) diff --git a/admin/accesslog.php b/admin/accesslog.php index 69f9f60760..97d2057259 100755 --- a/admin/accesslog.php +++ b/admin/accesslog.php @@ -11,7 +11,7 @@ /* $Id$ */ - $phpgw_info["flags"]["currentapp"] = "admin"; + $phpgw_info["flags"] = array("currentapp" => "admin", "enable_nextmatchs_class" => True); include("../header.inc.php"); $phpgw->template->set_file(array( "header" => "accesslog.tpl", diff --git a/admin/accounts.php b/admin/accounts.php index 8f208c348f..2ce483b815 100755 --- a/admin/accounts.php +++ b/admin/accounts.php @@ -11,11 +11,7 @@ /* $Id$ */ - $phpgw_info["flags"]["currentapp"] = "admin"; - $phpgw_info["flags"]["disable_message_class"] = True; - $phpgw_info["flags"]["disable_send_class"] = True; - $phpgw_info["flags"]["parent_page"] = "index.php"; - + $phpgw_info["flags"] = array("currentapp" => "admin", "enable_nextmatchs_class" => True); include("../header.inc.php"); include($phpgw_info["server"]["server_root"] . "/admin/inc/accounts_" . $phpgw_info["server"]["auth_type"] . ".inc.php"); diff --git a/admin/applications.php b/admin/applications.php index 3e2f440eb3..90f923a967 100644 --- a/admin/applications.php +++ b/admin/applications.php @@ -12,7 +12,6 @@ /* $Id$ */ $phpgw_info["flags"] = array("currentapp" => "admin", "enable_nextmatchs_class" => True); - include("../header.inc.php"); if ($order) diff --git a/admin/currentusers.php b/admin/currentusers.php index d5df72eee5..6617cc00c7 100755 --- a/admin/currentusers.php +++ b/admin/currentusers.php @@ -11,7 +11,7 @@ /* $Id$ */ - $phpgw_info["flags"]["currentapp"] = "admin"; + $phpgw_info["flags"] = array("currentapp" => "admin", "enable_nextmatchs_class" => True); include("../header.inc.php"); $phpgw->template->set_file(array("header" => "currentusers.tpl", diff --git a/admin/deleteaccount.php b/admin/deleteaccount.php index 6954233070..cd5e7653de 100755 --- a/admin/deleteaccount.php +++ b/admin/deleteaccount.php @@ -16,8 +16,6 @@ } $phpgw_info["flags"]["currentapp"] = "admin"; - $phpgw_info["flags"]["disable_message_class"] = True; - $phpgw_info["flags"]["disable_send_class"] = True; include("../header.inc.php"); include($phpgw_info["server"]["server_root"] . "/admin/inc/accounts_" . $phpgw_info["server"]["auth_type"] . ".inc.php"); diff --git a/admin/deleteapplication.php b/admin/deleteapplication.php index c021091771..bbdf0c5f9e 100644 --- a/admin/deleteapplication.php +++ b/admin/deleteapplication.php @@ -11,14 +11,11 @@ /* $Id$ */ - $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" = "admin"); if (! $app_name) Header("Location: " . $phpgw->link("applications.php")); - $phpgw_info["flags"]["disable_message_class"] = True; - $phpgw_info["flags"]["disable_send_class"] = True; - $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); if ($confirm) { diff --git a/admin/deletegroup.php b/admin/deletegroup.php index fc65960f39..411a1e9bb9 100755 --- a/admin/deletegroup.php +++ b/admin/deletegroup.php @@ -11,15 +11,11 @@ /* $Id$ */ - $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" => "admin"); if (! $group_id) Header("Location: " . $phpgw->link("groups.php")); - - $phpgw_info["flags"]["currentapp"] = "admin"; - $phpgw_info["flags"]["disable_message_class"] = True; - $phpgw_info["flags"]["disable_send_class"] = True; include("../header.inc.php"); if ((($group_id) && ($confirm)) || $removeusers) { diff --git a/admin/editaccount.php b/admin/editaccount.php index 8eac25937f..58d89b2df7 100755 --- a/admin/editaccount.php +++ b/admin/editaccount.php @@ -11,11 +11,7 @@ /* $Id$ */ - $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); - - $phpgw_info["flags"]["currentapp"] = "admin"; - $phpgw_info["flags"]["disable_message_class"] = True; - $phpgw_info["flags"]["disable_send_class"] = True; + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" => "admin"); include("../header.inc.php"); include($phpgw_info["server"]["server_root"] . "/admin/inc/accounts_" . $phpgw_info["server"]["auth_type"] . ".inc.php"); diff --git a/admin/editapplication.php b/admin/editapplication.php index a8a624bf77..287857fe34 100644 --- a/admin/editapplication.php +++ b/admin/editapplication.php @@ -12,12 +12,8 @@ /* $Id$ */ if ($submit) { - $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" => "admin"); } - - $phpgw_info["flags"]["disable_message_class"] = True; - $phpgw_info["flags"]["disable_send_class"] = True; - $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); $phpgw->template->set_file(array("form" => "application_form.tpl")); diff --git a/admin/editgroup.php b/admin/editgroup.php index 63198ff1a8..a163fca65b 100755 --- a/admin/editgroup.php +++ b/admin/editgroup.php @@ -12,12 +12,8 @@ /* $Id$ */ if ($submit) { - $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" => "admin"); } - - $phpgw_info["flags"]["disable_message_class"] = True; - $phpgw_info["flags"]["disable_send_class"] = True; - $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); if (! $group_id) { diff --git a/admin/groups.php b/admin/groups.php index f289d656f7..60ca17b8e3 100755 --- a/admin/groups.php +++ b/admin/groups.php @@ -11,7 +11,7 @@ /* $Id$ */ - $phpgw_info["flags"]["currentapp"] = "admin"; + $phpgw_info["flags"] = array("currentapp" => "admin", "enable_nextmatchs_class" => True); include("../header.inc.php"); if (! $start) diff --git a/admin/index.php b/admin/index.php index 9a591a5998..1d4a417dc7 100755 --- a/admin/index.php +++ b/admin/index.php @@ -15,7 +15,6 @@ /* $Id$ */ $phpgw_info["flags"]["currentapp"] = "admin"; - include("../header.inc.php"); check_code($cd); diff --git a/admin/killsession.php b/admin/killsession.php index dbdab42b57..e37e47f935 100755 --- a/admin/killsession.php +++ b/admin/killsession.php @@ -14,7 +14,6 @@ if ($confirm) { $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); if ($ksessionid == $phpgw_info["user"]["sessionid"]) { diff --git a/admin/newaccount.php b/admin/newaccount.php index c3a8a5a586..c9046a89a6 100755 --- a/admin/newaccount.php +++ b/admin/newaccount.php @@ -11,10 +11,7 @@ /* $Id$ */ - $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, - "disable_message_class" => True, "disable_send_class" => True, - "currentapp" => "admin"); - + $phpgw_info["flags"] = array("currentapp" => "admin", "noheader" => True, "nonavbar" => True); include("../header.inc.php"); include($phpgw_info["server"]["server_root"] . "/admin/inc/accounts_" . $phpgw_info["server"]["auth_type"] . ".inc.php"); diff --git a/admin/newapplication.php b/admin/newapplication.php index ae7a31e2e7..d288c933f5 100644 --- a/admin/newapplication.php +++ b/admin/newapplication.php @@ -11,11 +11,7 @@ /* $Id$ */ - $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); - - $phpgw_info["flags"]["disable_message_class"] = True; - $phpgw_info["flags"]["disable_send_class"] = True; - $phpgw_info["flags"]["currentapp"] = "admin"; + $phpgw_info["flags"] = array("currentapp" => "admin", "noheader" => True, "nonavbar" => True); include("../header.inc.php"); //$phpgw->template->set_unknowns("remove");