From 23950abfe9f84e23ad645366f40f00fa37f8f1c6 Mon Sep 17 00:00:00 2001 From: seek3r Date: Sat, 23 Sep 2000 01:25:17 +0000 Subject: [PATCH] switched to a new distributed pref and admin which allow add-on apps to have their settings put into the main screens --- calendar/inc/functions.inc.php | 16 ++- preferences/inc/preferences.inc.php | 30 +++++ preferences/index.php | 46 +++++-- preferences/nntp.php | 196 ---------------------------- 4 files changed, 74 insertions(+), 214 deletions(-) create mode 100644 preferences/inc/preferences.inc.php delete mode 100755 preferences/nntp.php diff --git a/calendar/inc/functions.inc.php b/calendar/inc/functions.inc.php index 400d02a4b6..a1e42b8b6b 100755 --- a/calendar/inc/functions.inc.php +++ b/calendar/inc/functions.inc.php @@ -388,14 +388,18 @@ function month_name ( $m ) { . "WHERE webcal_entry.cal_id = webcal_entry_repeats.cal_id " . "AND webcal_entry.cal_id = webcal_entry_user.cal_id " . "AND webcal_entry_groups.cal_id = webcal_entry.cal_id " - . "AND (webcal_entry_user.cal_login = '" . $phpgw_info["user"]["userid"] . "' OR (webcal_entry.cal_access='group' AND ("; + . "AND (webcal_entry_user.cal_login = '" . $phpgw_info["user"]["userid"] . "' OR (webcal_entry.cal_access='group' "; $group_names = $phpgw->accounts->read_group_names(); - for ($i=0;$idb->query($sql); diff --git a/preferences/inc/preferences.inc.php b/preferences/inc/preferences.inc.php new file mode 100644 index 0000000000..37694f345a --- /dev/null +++ b/preferences/inc/preferences.inc.php @@ -0,0 +1,30 @@ +link("changepassword.php") . "\">" + . lang("change your password") . ""; + echo "
link("changetheme.php") . "\">" + . lang("select different theme") . ""; + echo "
link("settings.php") . "\">" + . lang("change your settings") . ""; + echo "
link("changeprofile.php") . "\">" + . lang("change your profile") . ""; + + + section_end(); +} +?> diff --git a/preferences/index.php b/preferences/index.php index 5960a451a6..cba208a70d 100755 --- a/preferences/index.php +++ b/preferences/index.php @@ -21,17 +21,39 @@ exit; } - echo "
link("changepassword.php") . "\">" - . lang("change your password") . ""; - echo "
link("changetheme.php") . "\">" - . lang("select different theme") . ""; - echo "
link("settings.php") . "\">" - . lang("change your settings") . ""; - echo "
link("changeprofile.php") . "\">" - . lang("change your profile") . ""; -// if ($phpgw_info["user"]["permissions"]["nntp"]) - if ($phpgw_info["user"]["apps"]["nntp"]) - echo "
link("nntp.php") . "\">" - . lang("monitor newsgroups") . ""; + // This func called by the includes to dump a row header + function section_start($name="",$icon="") { + global $phpgw,$phpgw_info; + //echo "\n"; + echo "
\n"; + //echo ""; + echo ""; + if ($icon != "") { + echo ""; + echo ""; + } else { + echo ""; + } + echo "\n"; + echo "
[Icon]".lang($name)."$name
\n"; + } + function section_end() { + echo "
\n\n"; + } + + // The account stuff that should be at the top of the list + $appname = "preferences"; + $f = $phpgw_info["server"]["server_root"] . "/" . $appname . "/inc/prefrences.inc.php"; + if (file_exists($f)) { + include($f); + } + while (list(,$appname) = each($phpgw_info["user"]["app_perms"])) { + $f = $phpgw_info["server"]["server_root"] . "/" . $appname . "/inc/prefrences.inc.php"; + if (file_exists($f)) { + echo "

\n"; + include($f); + } + } + include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); diff --git a/preferences/nntp.php b/preferences/nntp.php deleted file mode 100755 index 1616ac516e..0000000000 --- a/preferences/nntp.php +++ /dev/null @@ -1,196 +0,0 @@ - * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ - - if ($submit && $nntplist) { - $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); - } - - $phpgw_info["flags"]["currentapp"] = "preferences"; - include("../header.inc.php"); - $phpgw->translation->add_app("nntp"); - function get_tg() - { - global $phpgw; - - $phpgw->db->query("SELECT count(con) FROM newsgroups WHERE active='Y'"); - $phpgw->db->next_record(); - return $phpgw->db->f(0); - } - - if(!$submit && !$nntplist) { - - $phpgw->db->query("SELECT con FROM accounts WHERE loginid='".$phpgw_info["user"]["userid"]."'"); - $phpgw->db->next_record(); - $usercon = $phpgw->db->f("con"); - - $urlname = $phpgw_info["server"]["webserver_url"]."/preferences/nntp.php"; - - $t = new Template($phpgw_info["server"]["template_dir"]); - - $t->set_file(array( "nntp_header" => "nntp.tpl", - "nntp_list" => "nntp.tpl", - "nntp_footer" => "nntp.tpl" )); - - $t->set_block("nntp_header","nntp_list","nntp_footer","output"); - - if (! $tg) - { - $tg = get_tg(); - } - - if (! $start) $start = 0; - - if (! $query_result) $query_result = 0; - - $orderby = ""; - if ($order) - { - switch ($order) - { - case 1: - $orderby = " ORDER BY CON $sort"; - break; - case 2: - $orderby = " ORDER BY GROUP $sort"; - break; - case 3: - $orderby = " ORDER BY ACTIVE $sort"; - break; - } - } - - if ($search || $next) { - if ($search) { - $query_result = 0; - } else - $query_result++; - $phpgw->db->query("SELECT name FROM newsgroups WHERE active='Y'$orderby"); - $j = 0; - $i = 0; - while($phpgw->db->next_record()) - { - if (stristr($phpgw->db->f("name"),$query)) { - if($i==$query_result) { - $start = $j; - break; - } else - $i++; - } - $j++; - } - } - - $phpgw->db->query("SELECT con, name FROM newsgroups WHERE active='Y'$orderby LIMIT " - .$phpgw->nextmatchs->sql_limit($start)); - - while($phpgw->db->next_record()) - { - $nntpavailgroups["con"][] = $phpgw->db->f("con"); - $nntpavailgroups["name"][] = $phpgw->db->f("name"); - } - - $first = min($nntpavailgroups["con"]); - - $common_hidden_vars = "\n" - . "\n" - . "\n" - . "\n" - . "\n" - . "\n" - . "\n"; - - $t->set_var("search_value",$query); - $t->set_var("search",lang("search")); - $t->set_var("next",lang("next")); - - $t->set_var("nml",$phpgw->nextmatchs->left( $urlname, - $start, - $tg, - "&tg=$tg&sort=$sort&order=$order")); - $t->set_var("nmr",$phpgw->nextmatchs->right($urlname, - $start, - $tg, - "&tg=$tg&sort=$sort&order=$order")); - - $t->set_var("title",lang("Newsgroups")); - $t->set_var("action_url",$phpgw->link($urlname)); - $t->set_var("common_hidden_vars",$common_hidden_vars); - $t->set_var("th_bg",$phpgw_info["theme"]["th_bg"]); - $t->set_var("th_font",$phpgw_info["theme"]["font"]); - $t->set_var("sort_con",$phpgw->nextmatchs->show_sort_order($sort,"1",$order,$urlname," # ","&tg=$tg")); - $t->set_var("sort_group",$phpgw->nextmatchs->show_sort_order($sort,"2",$order,$urlname,"Group","&tg=$tg")); - $t->set_var("sort_active",$phpgw->nextmatchs->show_sort_order($sort,"3",$order,$urlname," Active ","&tg=$tg")); - - $t->parse("out","nntp_header"); - - $phpgw->db->query("select newsgroup from users_newsgroups where owner=$usercon"); - while ($phpgw->db->next_record()) - { - $found[$phpgw->db->f("newsgroup")] = " checked"; - } - - for($i=0;$inextmatchs->alternate_row_color($tr_color); - - $t->set_var("tr_color",$tr_color); - $con = $nntpavailgroups["con"][$i]; - $t->set_var("con",$con); - - if (! $nntpavailgroups["name"][$i]) $nntpavailgroups["name"][$i] = " "; - $t->set_var("group",$nntpavailgroups["name"][$i]); - - $active_var = ""; - - $t->set_var("active",$active_var); - - if ($i+1 <> count($nntpavailgroups["con"])) - $t->parse("output","nntp_list",True); - } - $t->set_var("lang_update",lang("update")); - $t->set_var("checkmark",$phpgw_info["server"]["webserver_url"]."/email/images/check.gif"); - - $t->pparse("out","nntp_footer"); - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); - } else { - $phpgw->db->lock(array("users_newsgroups","accounts")); - - $orderby = ""; - if ($order) - { - switch ($order) - { - case 1: - $orderby = " ORDER BY CON $sort"; - break; - case 2: - $orderby = " ORDER BY GROUP $sort"; - break; - case 3: - $orderby = " ORDER BY ACTIVE $sort"; - break; - } - } - $phpgw->db->query("DELETE FROM users_newsgroups WHERE newsgroup>=$first AND owner=$usercon$orderby LIMIT " - .$phpgw->nextmatchs->sql_limit(0)); - - for ($i=0;$idb->query("INSERT INTO users_newsgroups VALUES($usercon,".$nntplist[$i].")"); - } - $phpgw->db->unlock(); - - Header("Location: " . $phpgw->link($urlname,"start=$start&tg=$tg")); - } -?>