From 71a0a698c93490d729f88c9433b46fa4b590e18d Mon Sep 17 00:00:00 2001 From: skeeter Date: Thu, 18 Jan 2001 03:50:48 +0000 Subject: [PATCH] changed initializing preferences to CreateObject() --- admin/editaccount.php | 6 ++-- admin/editgroup.php | 76 +++++++++++++++++++++---------------------- admin/newaccount.php | 2 +- admin/newgroup.php | 2 +- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/admin/editaccount.php b/admin/editaccount.php index f5b60fd9ac..540eafea75 100755 --- a/admin/editaccount.php +++ b/admin/editaccount.php @@ -89,7 +89,7 @@ // The following sets any default preferences needed for new applications.. // This is smart enough to know if previous preferences were selected, use them. - $pref = new preferences(intval($account_id)); + $pref = CreateObject('phpgwapi.preferences',intval($account_id)); $t = $pref->get_preferences(); $docommit = False; @@ -122,11 +122,11 @@ } // if $submit - $phpgw->template->set_file(array("form" => "account_form.tpl")); - $phpgw->common->phpgw_header(); echo parse_navbar(); + $phpgw->template->set_file(array("form" => "account_form.tpl")); + if ($totalerrors) { $phpgw->template->set_var("error_messages","
" . $phpgw->common->error_list($error) . "
"); } else { diff --git a/admin/editgroup.php b/admin/editgroup.php index f8add1a500..760a53ea1b 100755 --- a/admin/editgroup.php +++ b/admin/editgroup.php @@ -22,8 +22,6 @@ Header("Location: " . $phpgw->link("groups.php")); } - $phpgw->template->set_file(array("form" => "groups_form.tpl")); - if ($submit) { $phpgw->db->query("select group_name from groups where group_id=$group_id"); $phpgw->db->next_record(); @@ -41,58 +39,58 @@ // $phpgw->db->lock(array("accounts","groups","preferences","config","applications","phpgw_hooks","phpgw_sessions")); $phpgw->accounts->add_app($n_group_permissions); - $apps = $phpgw->accounts->add_app("",True); - $apps_after = explode(":",$apps); + $apps = $phpgw->accounts->add_app("",True); + $apps_after = explode(":",$apps); $phpgw->db->query("update groups set group_name='$n_group', group_apps='" . $apps . "' where group_id=$group_id"); for ($i=0; $idb->query("SELECT account_groups, account_lid FROM accounts WHERE account_id=".$n_users[$i]); - $phpgw->db->next_record(); - $account_lid = $phpgw->db->f("account_lid"); - if(strpos($phpgw->db->f("account_groups"),$group_id.":0,") == 0) { - $user_groups = $phpgw->db->f("account_groups") . ",$group_id:0,"; - $user_groups = ereg_replace(",,",",",$user_groups); - $phpgw->db->query("UPDATE accounts SET account_groups='$user_groups' WHERE account_id=".$n_users[$i]); - } + $phpgw->db->query("SELECT account_groups, account_lid FROM accounts WHERE account_id=".$n_users[$i]); + $phpgw->db->next_record(); + $account_lid = $phpgw->db->f("account_lid"); + if(strpos($phpgw->db->f("account_groups"),$group_id.":0,") == 0) { + $user_groups = $phpgw->db->f("account_groups") . ",$group_id:0,"; + $user_groups = ereg_replace(",,",",",$user_groups); + $phpgw->db->query("UPDATE accounts SET account_groups='$user_groups' WHERE account_id=".$n_users[$i]); + } - // If the user is logged in, it will force a refresh of the session_info - $phpgw->db->query("update phpgw_sessions set session_info='' where session_lid='$account_lid@" . $phpgw_info["user"]["domain"] . "'",__LINE__,__FILE__); + // If the user is logged in, it will force a refresh of the session_info + $phpgw->db->query("update phpgw_sessions set session_info='' where session_lid='$account_lid@" . $phpgw_info["user"]["domain"] . "'",__LINE__,__FILE__); // The following sets any default preferences needed for new applications.. // This is smart enough to know if previous preferences were selected, use them. - $pref = new preferences(intval($n_users[$i])); - $t = $pref->get_preferences(); + $pref = CreateObject('phpgwapi.preferences',intval($n_users[$i])); + $t = $pref->get_preferences(); - $docommit = False; - for ($j=1;$jcommon->hook_single("add_def_pref", $apps_after[$j]); - $docommit = True; - } - } - if ($docommit) { - $pref->commit(); - } + $docommit = False; + for ($j=1;$jcommon->hook_single("add_def_pref", $apps_after[$j]); + $docommit = True; + } + } + if ($docommit) { + $pref->commit(); + } } $sep = $phpgw->common->filesystem_separator(); - if ($old_group_name <> $n_group) { - $basedir = $phpgw_info["server"]["files_dir"] . $sep . "groups" . $sep; - if (! @rename($basedir . $old_group_name, $basedir . $n_group)) { - $cd = 39; - } else { - $cd = 33; - } + $basedir = $phpgw_info["server"]["files_dir"] . $sep . "groups" . $sep; + if (! @rename($basedir . $old_group_name, $basedir . $n_group)) { + $cd = 39; + } else { + $cd = 33; + } } else { - $cd = 33; + $cd = 33; } // $phpgw->db->unlock(); @@ -102,6 +100,8 @@ } } + $phpgw->template->set_file(array("form" => "groups_form.tpl")); + if ($error) { $phpgw->common->phpgw_header(); echo parse_navbar(); diff --git a/admin/newaccount.php b/admin/newaccount.php index b5e9d3e804..4dae0bba42 100755 --- a/admin/newaccount.php +++ b/admin/newaccount.php @@ -66,7 +66,7 @@ $phpgw->db->query("SELECT account_permissions, account_id FROM accounts WHERE account_lid='$n_loginid'",__LINE__,__FILE__); $phpgw->db->next_record(); $apps = explode(":",$phpgw->db->f("account_permissions")); - $pref = new preferences(intval($phpgw->db->f("account_id"))); + $pref = CreateObject('phpgwapi.preferences',intval($phpgw->db->f("account_id"))); $phpgw->common->hook_single("add_def_pref", "admin"); for ($i=1;$i"admin") diff --git a/admin/newgroup.php b/admin/newgroup.php index 21797d25b9..24305f978a 100755 --- a/admin/newgroup.php +++ b/admin/newgroup.php @@ -55,7 +55,7 @@ $user_groups = ereg_replace(",,",",",$user_groups); $phpgw->db->query("UPDATE accounts SET account_groups='$user_groups' WHERE account_id=".$n_users[$i]); - $pref = new preferences(intval($n_users[$i])); + $pref = CreateObject('phpgwapi.preferences',intval($n_users[$i])); $t = $pref->get_preferences(); $docommit = False;