diff --git a/addressbook/add.php b/addressbook/add.php index bebb3b5309..ab74d806c8 100755 --- a/addressbook/add.php +++ b/addressbook/add.php @@ -13,10 +13,10 @@ /* $Id$ */ if ($submit) { - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_flags["currentapp"] = "addressbook"; + $phpgw_info["flags"]["currentapp"] = "addressbook"; include("../header.inc.php"); if ($add_email) { diff --git a/addressbook/delete.php b/addressbook/delete.php index f4d3ffc3af..b9089fbb10 100755 --- a/addressbook/delete.php +++ b/addressbook/delete.php @@ -13,10 +13,10 @@ /* $Id$ */ if ($confirm) { - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_flags["currentapp"] = "addressbook"; + $phpgw_info["flags"]["currentapp"] = "addressbook"; include("../header.inc.php"); if (! $con) { diff --git a/addressbook/edit.php b/addressbook/edit.php index 9391099ed2..a2c448c6bd 100755 --- a/addressbook/edit.php +++ b/addressbook/edit.php @@ -13,10 +13,10 @@ /* $Id$ */ if ($submit) { - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_flags["currentapp"] = "addressbook"; + $phpgw_info["flags"]["currentapp"] = "addressbook"; include("../header.inc.php"); if (! $con) { diff --git a/addressbook/index.php b/addressbook/index.php index 9a79afd8f9..c61e4b43ff 100755 --- a/addressbook/index.php +++ b/addressbook/index.php @@ -12,7 +12,7 @@ /* $Id$ */ - $phpgw_flags["currentapp"] = "addressbook"; + $phpgw_info["flags"]["currentapp"] = "addressbook"; include("../header.inc.php"); diff --git a/addressbook/view.php b/addressbook/view.php index b003f323c0..64b328442d 100755 --- a/addressbook/view.php +++ b/addressbook/view.php @@ -13,10 +13,10 @@ /* $Id$ */ if ($submit) { - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_flags["currentapp"] = "addressbook"; + $phpgw_info["flags"]["currentapp"] = "addressbook"; include("../header.inc.php"); if (! $con) Header("Location: " . $phpgw_info["server"]["webserver_url"] . diff --git a/admin/accesslog.php b/admin/accesslog.php index 1980f151f7..635fd607d7 100755 --- a/admin/accesslog.php +++ b/admin/accesslog.php @@ -11,7 +11,7 @@ /* $Id$ */ - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); $t = new Template($phpgw_info["server"]["template_dir"]); diff --git a/admin/accounts.php b/admin/accounts.php index 05dc483c4f..aa8d83fa29 100755 --- a/admin/accounts.php +++ b/admin/accounts.php @@ -11,7 +11,7 @@ /* $Id$ */ - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); $t = new Template($phpgw_info["server"]["template_dir"]); diff --git a/admin/applications.php b/admin/applications.php index d7339e63a5..a6f5c51b76 100644 --- a/admin/applications.php +++ b/admin/applications.php @@ -11,7 +11,7 @@ /* $Id$ */ - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); if ($order) diff --git a/admin/currentusers.php b/admin/currentusers.php index 45f0bd552c..9f4d40159c 100755 --- a/admin/currentusers.php +++ b/admin/currentusers.php @@ -11,7 +11,7 @@ /* $Id$ */ - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); $t = new Template($phpgw_info["server"]["template_dir"]); diff --git a/admin/deleteaccount.php b/admin/deleteaccount.php index 08e94cf880..20779e2607 100755 --- a/admin/deleteaccount.php +++ b/admin/deleteaccount.php @@ -12,10 +12,10 @@ /* $Id$ */ if ($confirm) { - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); // Make sure they are not attempting to delete there own account. // If they are, they should not reach this point anyway. diff --git a/admin/deleteapplication.php b/admin/deleteapplication.php index dd6169d6ef..bc3630678d 100644 --- a/admin/deleteapplication.php +++ b/admin/deleteapplication.php @@ -11,12 +11,12 @@ /* $Id$ */ - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); if (! $app_name) Header("Location: " . $phpgw->link("applications.php")); - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); if ($confirm) { diff --git a/admin/deletegroup.php b/admin/deletegroup.php index c946a7f723..9f461e51b2 100755 --- a/admin/deletegroup.php +++ b/admin/deletegroup.php @@ -11,12 +11,12 @@ /* $Id$ */ - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); if (! $group_id) Header("Location: " . $phpgw->link("groups.php")); - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); if ((($group_id) && ($confirm)) || $removeusers) { diff --git a/admin/deleteheadline.php b/admin/deleteheadline.php index 52c0881f34..c5ef431ad4 100755 --- a/admin/deleteheadline.php +++ b/admin/deleteheadline.php @@ -12,15 +12,15 @@ /* $Id$ */ if ($confirm) { - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); function remove_account_data($query,$t) { - global $phpgw->db; + global $phpgw; $phpgw->db->query("delete from $t where $query"); } diff --git a/admin/editaccount.php b/admin/editaccount.php index 577b8fb644..764fff0295 100755 --- a/admin/editaccount.php +++ b/admin/editaccount.php @@ -11,9 +11,9 @@ /* $Id$ */ - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); if (! $con) Header("Location: " . $phpgw->link("accounts.php")); diff --git a/admin/editapplication.php b/admin/editapplication.php index a4c0627698..39f0b4a76a 100644 --- a/admin/editapplication.php +++ b/admin/editapplication.php @@ -12,10 +12,10 @@ /* $Id$ */ if ($submit) { - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); $t = new Template($phpgw_info["server"]["template_dir"]); diff --git a/admin/editgroup.php b/admin/editgroup.php index f47924246d..b9c38bd823 100755 --- a/admin/editgroup.php +++ b/admin/editgroup.php @@ -12,10 +12,10 @@ /* $Id$ */ if ($submit) { - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); if (! $group_id) { diff --git a/admin/editheadline.php b/admin/editheadline.php index 930f46ef58..3cc258f2b4 100755 --- a/admin/editheadline.php +++ b/admin/editheadline.php @@ -12,10 +12,10 @@ /* $Id$ */ if ($submit) { - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); if (! $con) Header("Location: " . $phpgw->link("headlines.php")); diff --git a/admin/groups.php b/admin/groups.php index 193ea1ce01..2823e1486f 100755 --- a/admin/groups.php +++ b/admin/groups.php @@ -11,7 +11,7 @@ /* $Id$ */ - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); if (! $start) diff --git a/admin/headlines.php b/admin/headlines.php index 640de7f80f..19dd67f1c4 100755 --- a/admin/headlines.php +++ b/admin/headlines.php @@ -12,7 +12,7 @@ /* $Id$ */ - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); echo "

" . lang_admin("Headline Sites") . "
" . "" diff --git a/admin/index.php b/admin/index.php index 12bca51f7a..0654e1fee0 100755 --- a/admin/index.php +++ b/admin/index.php @@ -12,7 +12,7 @@ /* $Id$ */ - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); check_code($cd); diff --git a/admin/killsession.php b/admin/killsession.php index a707241aca..ef52841c2d 100755 --- a/admin/killsession.php +++ b/admin/killsession.php @@ -12,10 +12,10 @@ /* $Id$ */ if ($confirm) { - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); if ($ksessionid == $phpgw_info["user"]["sessionid"]) { Header("Location: " . $phpgw->link("currentusers.php")); diff --git a/admin/newaccount.php b/admin/newaccount.php index fde4f205ad..8cbf9915c5 100755 --- a/admin/newaccount.php +++ b/admin/newaccount.php @@ -11,9 +11,9 @@ /* $Id$ */ - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); if ($submit) { if (! $n_loginid) diff --git a/admin/newapplication.php b/admin/newapplication.php index fecc7b0d96..61bf501a46 100644 --- a/admin/newapplication.php +++ b/admin/newapplication.php @@ -12,10 +12,10 @@ /* $Id$ */ if ($submit) { - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); $t = new Template($phpgw_info["server"]["template_dir"]); diff --git a/admin/newgroup.php b/admin/newgroup.php index 2ad3499f1f..7b5c002a55 100755 --- a/admin/newgroup.php +++ b/admin/newgroup.php @@ -12,10 +12,10 @@ /* $Id$ */ if ($submit) { - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); $t = new Template($phpgw_info["server"]["template_dir"]); diff --git a/admin/newheadline.php b/admin/newheadline.php index a8792a10bf..153556e48c 100755 --- a/admin/newheadline.php +++ b/admin/newheadline.php @@ -12,9 +12,9 @@ /* $Id$ */ if ($submit) { - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); if (! $submit) { ?> diff --git a/admin/nntp.php b/admin/nntp.php index 1b2157e4ba..c9cdd13068 100755 --- a/admin/nntp.php +++ b/admin/nntp.php @@ -13,14 +13,14 @@ /* $Id$ */ if ($submit && $nntplist) { - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_flags["currentapp"] = "admin"; - $phpgw_flags["disable_network_class"] = True; - $phpgw_flags["disable_message_class"] = True; - $phpgw_flags["disable_send_class"] = True; - $phpgw_flags["disable_vfs_class"] = True; + $phpgw_info["flags"]["currentapp"] = "admin"; + $phpgw_info["flags"]["disable_network_class"] = True; + $phpgw_info["flags"]["disable_message_class"] = True; + $phpgw_info["flags"]["disable_send_class"] = True; + $phpgw_info["flags"]["disable_vfs_class"] = True; include("../header.inc.php"); $phpgw->include_lang("nntp"); diff --git a/admin/viewaccount.php b/admin/viewaccount.php index fde83adb54..864c20682e 100755 --- a/admin/viewaccount.php +++ b/admin/viewaccount.php @@ -12,7 +12,7 @@ /* $Id$ */ - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); if (! $con) diff --git a/admin/viewheadline.php b/admin/viewheadline.php index b113662a31..cbca0d90d2 100755 --- a/admin/viewheadline.php +++ b/admin/viewheadline.php @@ -12,7 +12,7 @@ /* $Id$ */ - $phpgw_flags["currentapp"] = "admin"; + $phpgw_info["flags"]["currentapp"] = "admin"; include("../header.inc.php"); if (! $con) diff --git a/calendar/day.php b/calendar/day.php index 148e99c708..fe59a2ee27 100644 --- a/calendar/day.php +++ b/calendar/day.php @@ -15,10 +15,10 @@ /* $Id$ */ if ($friendly) { - $phpgw_flags["noheader"] = True; + $phpgw_info["flags"]["noheader"] = True; } - $phpgw_flags["currentapp"] = "calendar"; + $phpgw_info["flags"]["currentapp"] = "calendar"; include("../header.inc.php"); $view = "day"; diff --git a/calendar/delete.php b/calendar/delete.php index 659f666ce2..1a780fb995 100755 --- a/calendar/delete.php +++ b/calendar/delete.php @@ -13,7 +13,7 @@ \**************************************************************************/ /* $Id$ */ - $phpgw_flags = array("noheader" => True, "nonavbar" => True, "currentapp" => "calendar"); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" => "calendar"); include("../header.inc.php"); if ($id > 0) { diff --git a/calendar/edit_entry.php b/calendar/edit_entry.php index 577f9d69e5..431e4649de 100755 --- a/calendar/edit_entry.php +++ b/calendar/edit_entry.php @@ -14,7 +14,7 @@ /* $Id$ */ - $phpgw_flags["currentapp"] = "calendar"; + $phpgw_info["flags"]["currentapp"] = "calendar"; include("../header.inc.php"); diff --git a/calendar/edit_entry_handler.php b/calendar/edit_entry_handler.php index f8a32e2cd3..4d2515ff6b 100755 --- a/calendar/edit_entry_handler.php +++ b/calendar/edit_entry_handler.php @@ -14,8 +14,8 @@ /* $Id$ */ - $phpgw_flags["noheader"]="True"; - $phpgw_flags["currentapp"]="calendar"; + $phpgw_info["flags"]["noheader"]="True"; + $phpgw_info["flags"]["currentapp"]="calendar"; include("../header.inc.php"); // Input time format "2359" function add_duration($time, $duration) diff --git a/calendar/inc/functions.inc.php b/calendar/inc/functions.inc.php index 3b9b7c710c..ee9f6e0aeb 100755 --- a/calendar/inc/functions.inc.php +++ b/calendar/inc/functions.inc.php @@ -191,10 +191,10 @@ function month_name ( $m ) { // LC: links back to an entry view for $id using $pic function link_to_entry($id, $pic, $description) { - global $phpgw, $phpgw_info, $phpgw_flags, $friendly, $appname; + global $phpgw, $phpgw_info, $friendly, $appname; if (! $friendly) echo "link($phpgw_info["server"]["webserver_url"] - ."/".$phpgw_flags["currentapp"]."/view.php","id=$id")."\">\"".htmlentities($description)."\""; } diff --git a/calendar/index.php b/calendar/index.php index 915d2d8820..1479fe52bb 100755 --- a/calendar/index.php +++ b/calendar/index.php @@ -15,10 +15,10 @@ /* $Id$ */ if ($friendly) { - $phpgw_flags["noheader"] = True; + $phpgw_info["flags"]["noheader"] = True; } - $phpgw_flags["currentapp"] = "calendar"; + $phpgw_info["flags"]["currentapp"] = "calendar"; include("../header.inc.php"); if (strlen($date) > 0) { $thisyear = substr($date, 0, 4); diff --git a/calendar/search.php b/calendar/search.php index d19d7316bb..1c2a82803e 100755 --- a/calendar/search.php +++ b/calendar/search.php @@ -14,7 +14,7 @@ /* $Id$ */ - $phpgw_flags["currentapp"] = "calendar"; + $phpgw_info["flags"]["currentapp"] = "calendar"; if (! $keywords) { // If we reach this it becuase they didn't search for anything, diff --git a/calendar/view.php b/calendar/view.php index d1c5d02fff..b1b7e6626c 100755 --- a/calendar/view.php +++ b/calendar/view.php @@ -14,7 +14,7 @@ /* $Id$ */ - $phpgw_flags["currentapp"] = "calendar"; + $phpgw_info["flags"]["currentapp"] = "calendar"; include("../header.inc.php"); function grab_group($db,$id) diff --git a/calendar/week.php b/calendar/week.php index b8c311b059..8eed2b73ac 100755 --- a/calendar/week.php +++ b/calendar/week.php @@ -14,10 +14,10 @@ /* $Id$ */ if (!$friendly){ - $phpgw_flags["noheader"]="True"; + $phpgw_info["flags"]["noheader"]="True"; } - $phpgw_flags["currentapp"] = "calendar"; + $phpgw_info["flags"]["currentapp"] = "calendar"; include("../header.inc.php"); if (! $friendly) { diff --git a/calendar/year.php b/calendar/year.php index 1e63d74caa..da0a3d3026 100755 --- a/calendar/year.php +++ b/calendar/year.php @@ -13,10 +13,10 @@ /* $Id$ */ if ($friendly) { - $phpgw_flags["noheader"] = True; + $phpgw_info["flags"]["noheader"] = True; } - $phpgw_flags["currentapp"] = "calendar"; + $phpgw_info["flags"]["currentapp"] = "calendar"; include("../header.inc.php"); if ($friendly) { diff --git a/doc/developers/phpGW_Developers-HOWTO.sgml b/doc/developers/phpGW_Developers-HOWTO.sgml index 490ccdcf5a..5677ff6c50 100644 --- a/doc/developers/phpGW_Developers-HOWTO.sgml +++ b/doc/developers/phpGW_Developers-HOWTO.sgml @@ -56,7 +56,7 @@ This is done by putting this at the top of each PHP page. diff --git a/header.inc.php.sample b/header.inc.php.sample index 619298c259..ab47f7ad20 100644 --- a/header.inc.php.sample +++ b/header.inc.php.sample @@ -21,7 +21,7 @@ $phpgw_info["server"]["include_root"] = "/path/to/phpgroupware/inc"; /* This is the basic include needed on each page for phpGroupWare application compliance */ - $phpgw_flags["htmlcompliant"] = True; + $phpgw_info["flags"]["htmlcompliant"] = True; /**************************************************************************\ * Do not edit this line * diff --git a/index.php b/index.php index ab84155145..a6dff5d1d4 100755 --- a/index.php +++ b/index.php @@ -17,7 +17,7 @@ exit; } - $phpgw_flags = array("noheader" => True, "nonavbar" => True, "currentapp" => "home"); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" => "home"); include("header.inc.php"); // Note: I need to add checks to make sure these apps are installed. diff --git a/login.php b/login.php index ae2ea51a51..3a1108b794 100755 --- a/login.php +++ b/login.php @@ -12,7 +12,7 @@ /* $Id$ */ - $phpgw_flags = array("disable_message_class" => True, "disable_send_class" => True, + $phpgw_info["flags"] = array("disable_message_class" => True, "disable_send_class" => True, "disable_nextmatchs_class" => True, "disable_template_class" => True, "login" => True, "currentapp" => "login", "noheader" => True diff --git a/logout.php b/logout.php index d22af7753c..5c4aa6699d 100755 --- a/logout.php +++ b/logout.php @@ -12,12 +12,12 @@ /* $Id$ */ - $phpgw_flags["disable_message_class"] = True; - $phpgw_flags["disable_send_class"] = True; - $phpgw_flags["disable_nextmatchs_class"] = True; - $phpgw_flags["disable_template_class"] = True; - $phpgw_flags["currentapp"] = "logout"; - $phpgw_flags["noheader"] = True; + $phpgw_info["flags"]["disable_message_class"] = True; + $phpgw_info["flags"]["disable_send_class"] = True; + $phpgw_info["flags"]["disable_nextmatchs_class"] = True; + $phpgw_info["flags"]["disable_template_class"] = True; + $phpgw_info["flags"]["currentapp"] = "logout"; + $phpgw_info["flags"]["noheader"] = True; include("header.inc.php"); diff --git a/preferences/changepassword.php b/preferences/changepassword.php index 5e1d3b4cd0..8aaad30586 100755 --- a/preferences/changepassword.php +++ b/preferences/changepassword.php @@ -12,9 +12,9 @@ /* $Id$ */ - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); - $phpgw_flags["currentapp"] = "preferences"; + $phpgw_info["flags"]["currentapp"] = "preferences"; include("../header.inc.php"); if ($phpgw_info["user"]["permissions"]["anonymous"]) { Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/")); diff --git a/preferences/changeprofile.php b/preferences/changeprofile.php index 986015afd7..f7f7166e66 100644 --- a/preferences/changeprofile.php +++ b/preferences/changeprofile.php @@ -16,7 +16,7 @@ Header("Pragma: no-cache"); //Header("Expires: Sat, Jan 01 2000 01:01:01 GMT"); - $phpgw_flags["currentapp"] = "preferences"; + $phpgw_info["flags"]["currentapp"] = "preferences"; include("../header.inc.php"); if ($phpgw_info["user"]["permissions"]["anonymous"]) { Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/")); diff --git a/preferences/changetheme.php b/preferences/changetheme.php index c3ae58ebeb..95b5b17861 100755 --- a/preferences/changetheme.php +++ b/preferences/changetheme.php @@ -12,9 +12,9 @@ /* $Id$ */ - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); - $phpgw_flags["currentapp"] = "preferences"; + $phpgw_info["flags"]["currentapp"] = "preferences"; include("../header.inc.php"); if ($phpgw_info["user"]["permissions"]["anonymous"]) { diff --git a/preferences/index.php b/preferences/index.php index 2c1c4f9b65..b981865f8d 100755 --- a/preferences/index.php +++ b/preferences/index.php @@ -12,9 +12,9 @@ /* $Id$ */ - //$phpgw_flags = array("noheader" => True, "nonavbar" => True); + //$phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); - $phpgw_flags["currentapp"] = "preferences"; + $phpgw_info["flags"]["currentapp"] = "preferences"; include("../header.inc.php"); if ($phpgw_info["user"]["apps"]["anonymous"]) { Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/")); diff --git a/preferences/nntp.php b/preferences/nntp.php index eb987d64d5..f2b43dfa66 100755 --- a/preferences/nntp.php +++ b/preferences/nntp.php @@ -13,10 +13,10 @@ /* $Id$ */ if ($submit && $nntplist) { - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); } - $phpgw_flags["currentapp"] = "preferences"; + $phpgw_info["flags"]["currentapp"] = "preferences"; include("../header.inc.php"); $phpgw->include_lang("nntp"); function get_tg() diff --git a/preferences/settings.php b/preferences/settings.php index d912a030c8..50854cc3f6 100755 --- a/preferences/settings.php +++ b/preferences/settings.php @@ -12,9 +12,9 @@ /* $Id$ */ - $phpgw_flags = array("noheader" => True, "nonavbar" => True); + $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); - $phpgw_flags["currentapp"] = "preferences"; + $phpgw_info["flags"]["currentapp"] = "preferences"; include("../header.inc.php"); if ($phpgw_info["user"]["permissions"]["anonymous"]) { Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/"));
" . lang_admin("Site") . "