Converted to use accounts class - please verify

This commit is contained in:
Miles Lott 2001-04-06 20:54:47 +00:00
parent 8e48f8b764
commit 96e882ca11
2 changed files with 417 additions and 338 deletions

View File

@ -12,7 +12,8 @@
/* $Id$ */ /* $Id$ */
$phpgw_info = array(); $phpgw_info = array();
if ($submit) { if ($submit)
{
$phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True); $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True);
} }
$phpgw_info["flags"]["currentapp"] = "admin"; $phpgw_info["flags"]["currentapp"] = "admin";
@ -21,41 +22,55 @@
function is_odd($n) function is_odd($n)
{ {
$ln = substr($n,-1); $ln = substr($n,-1);
if ($ln == 1 || $ln == 3 || $ln == 5 || $ln == 7 || $ln == 9) { if ($ln == 1 || $ln == 3 || $ln == 5 || $ln == 7 || $ln == 9)
{
return True; return True;
} else { }
else
{
return False; return False;
} }
} }
if (! $group_id) { if (! $group_id)
{
Header("Location: " . $phpgw->link("/admin/groups.php")); Header("Location: " . $phpgw->link("/admin/groups.php"));
} }
if ($submit) { if ($submit)
$old_group_name = $phpgw->accounts->id2name($group_id); {
$group = CreateObject('phpgwapi.accounts',intval($group_id));
$group->read_repository();
$old_group_name = $group->id2name($group_id);
if($n_group != $old_group_name) { if($n_group != $old_group_name)
$phpgw->db->query("SELECT count(*) FROM phpgw_accounts WHERE account_lid='" . $n_group . "'",__LINE__,__FILE__); {
$phpgw->db->next_record(); if ($group->exists($n_group))
{
if ($phpgw->db->f(0) == 2) {
$error = lang("Sorry, that group name has already been taken."); $error = lang("Sorry, that group name has already been taken.");
} }
} }
if (! $error) { if (!$error)
{
// Lock tables
$phpgw->db->lock(Array('phpgw_accounts','phpgw_preferences','phpgw_config','phpgw_applications','phpgw_hooks','phpgw_sessions','phpgw_acl')); $phpgw->db->lock(Array('phpgw_accounts','phpgw_preferences','phpgw_config','phpgw_applications','phpgw_hooks','phpgw_sessions','phpgw_acl'));
// Set group apps
$apps = CreateObject('phpgwapi.applications',intval($group_id)); $apps = CreateObject('phpgwapi.applications',intval($group_id));
$apps_before = $apps->read_account_specific(); $apps_before = $apps->read_account_specific();
$apps->update_data(Array()); $apps->update_data(Array());
$new_apps = Array(); $new_apps = Array();
if(isset($n_group_permissions)) { if(isset($n_group_permissions))
{
reset($n_group_permissions); reset($n_group_permissions);
while($app = each($n_group_permissions)) { while($app = each($n_group_permissions))
if($app[1]) { {
if($app[1])
{
$apps->add($app[0]); $apps->add($app[0]);
if(!$apps_before[$app[0]]) { if(!$apps_before[$app[0]])
{
$new_apps[] = $app[0]; $new_apps[] = $app[0];
} }
} }
@ -63,19 +78,25 @@
} }
$apps->save_repository(); $apps->save_repository();
if($old_group_name <> $n_group) { // Set new account_lid, if needed
$phpgw->db->query("UPDATE phpgw_accounts SET account_lid='$n_group' WHERE account_id=$group_id",__LINE__,__FILE__); if($old_group_name <> $n_group)
{
$group->data['account_lid'] = $n_group;
} }
$group->save_repository();
// Set group acl
$acl = CreateObject('phpgwapi.acl',$group_id); $acl = CreateObject('phpgwapi.acl',$group_id);
$acl->read_repository(); $acl->read_repository();
$old_group_list = $acl->get_ids_for_location($group_id,1,'phpgw_group'); $old_group_list = $acl->get_ids_for_location($group_id,1,'phpgw_group');
@reset($old_group_list); @reset($old_group_list);
while($old_group_list && $user_id = each($old_group_list)) { while($old_group_list && $user_id = each($old_group_list))
{
$acl->delete_repository('phpgw_group',$group_id,$user_id[1]); $acl->delete_repository('phpgw_group',$group_id,$user_id[1]);
} }
for ($i=0; $i<count($n_users);$i++) { for ($i=0; $i<count($n_users);$i++)
{
$acl->add_repository('phpgw_group',$group_id,$n_users[$i],1); $acl->add_repository('phpgw_group',$group_id,$n_users[$i],1);
// If the user is logged in, it will force a refresh of the session_info // If the user is logged in, it will force a refresh of the session_info
@ -85,35 +106,48 @@
// The following sets any default preferences needed for new applications.. // The following sets any default preferences needed for new applications..
// This is smart enough to know if previous preferences were selected, use them. // This is smart enough to know if previous preferences were selected, use them.
$docommit = False; $docommit = False;
if($new_apps) { if($new_apps)
{
$pref = CreateObject('phpgwapi.preferences',intval($n_users[$i])); $pref = CreateObject('phpgwapi.preferences',intval($n_users[$i]));
$t = $pref->read_repository(); $t = $pref->read_repository();
for ($j=1;$j<count($new_apps) - 1;$j++) { for ($j=1;$j<count($new_apps) - 1;$j++)
if($new_apps[$j]=='admin') { {
if($new_apps[$j]=='admin')
{
$check = 'common'; $check = 'common';
} else { }
else
{
$check = $new_apps[$j]; $check = $new_apps[$j];
} }
if (!$t[$check]) { if (!$t[$check])
{
$phpgw->common->hook_single('add_def_pref', $new_apps[$j]); $phpgw->common->hook_single('add_def_pref', $new_apps[$j]);
$docommit = True; $docommit = True;
} }
} }
} }
if ($docommit) { if ($docommit)
{
$pref->save_repository(); $pref->save_repository();
} }
} }
if ($old_group_name <> $n_group) { if ($old_group_name <> $n_group)
{
$basedir = $phpgw_info['server']['files_dir'] . SEP . 'groups' . SEP; $basedir = $phpgw_info['server']['files_dir'] . SEP . 'groups' . SEP;
if (! @rename($basedir . $old_group_name, $basedir . $n_group)) { if (! @rename($basedir . $old_group_name, $basedir . $n_group))
{
$cd = 39; $cd = 39;
} else { }
else
{
$cd = 33; $cd = 33;
} }
} else { }
else
{
$cd = 33; $cd = 33;
} }
@ -125,28 +159,35 @@
} }
$p = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('admin')); $p = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('admin'));
$p->set_file(array('form' => 'groups_form.tpl')); $p->set_file(array('form' => 'groups_form.tpl'));
if ($error) { if ($error)
{
$phpgw->common->phpgw_header(); $phpgw->common->phpgw_header();
echo parse_navbar(); echo parse_navbar();
$p->set_var('error','<p><center>'.$error.'</center>'); $p->set_var('error','<p><center>'.$error.'</center>');
} else { }
else
{
$p->set_var('error',''); $p->set_var('error','');
} }
if ($submit) { if ($submit)
{
// $p->set_var('group_name_value',$n_group_name); // $p->set_var('group_name_value',$n_group_name);
for ($i=0; $i<count($n_users); $i++) { for ($i=0; $i<count($n_users); $i++)
{
$selected_users[$n_user[$i]] = ' selected'; $selected_users[$n_user[$i]] = ' selected';
} }
} else { }
else
{
$group_user = $phpgw->acl->get_ids_for_location($group_id,1,'phpgw_group'); $group_user = $phpgw->acl->get_ids_for_location($group_id,1,'phpgw_group');
if (!$group_user) { $group_user = array(); } if (!$group_user) { $group_user = array(); }
while ($user = each($group_user)) { while ($user = each($group_user))
{
$selected_users[intval($user[1])] = ' selected'; $selected_users[intval($user[1])] = ' selected';
} }
@ -160,27 +201,32 @@
$p->set_var('lang_group_name',lang('group name')); $p->set_var('lang_group_name',lang('group name'));
$p->set_var('group_name_value',$phpgw->accounts->id2name($group_id)); $p->set_var('group_name_value',$phpgw->accounts->id2name($group_id));
$phpgw->db->query("SELECT count(*) FROM phpgw_accounts WHERE account_status !='L' AND account_type='u'"); $accounts = CreateObject('phpgwapi.accounts',$group_id);
$phpgw->db->next_record(); $account_list = $accounts->get_list('accounts');
$account_num = count($account_list);
if ($phpgw->db->f(0) < 5) { if ($account_num < 5)
$p->set_var('select_size',$phpgw->db->f(0)); {
} else { $p->set_var('select_size',$account_num);
}
else
{
$p->set_var('select_size','5'); $p->set_var('select_size','5');
} }
$p->set_var('lang_include_user',lang('Select users for inclusion')); $p->set_var('lang_include_user',lang('Select users for inclusion'));
$phpgw->db->query("SELECT account_id,account_firstname,account_lastname,account_lid FROM phpgw_accounts WHERE "
. "account_status != 'L' AND account_type='u' ORDER BY account_lastname,account_firstname,account_lid asc"); while (list($key,$entry) = each($account_list))
while ($phpgw->db->next_record()) { {
$user_list .= '<option value="' . $phpgw->db->f('account_id') . '"' $user_list .= '<option value="' . $entry['account_id'] . '"'
. $selected_users[intval($phpgw->db->f('account_id'))] . '>' . $selected_users[intval($entry['account_id'])] . '>'
. $phpgw->common->display_fullname($phpgw->db->f('account_lid'), . $phpgw->common->display_fullname(
$phpgw->db->f('account_firstname'), $entry['account_lid'],
$phpgw->db->f('account_lastname')) . '</option>'; $entry['account_firstname'],
$entry['account_lastname'])
. '</option>'."\n";
} }
$p->set_var('user_list',$user_list); $p->set_var('user_list',$user_list);
$p->set_var("lang_permissions",lang("Permissions this group has")); $p->set_var("lang_permissions",lang("Permissions this group has"));
$i = 0; $i = 0;
@ -188,8 +234,10 @@
$sorted_apps = $phpgw_info["apps"]; $sorted_apps = $phpgw_info["apps"];
@asort($sorted_apps); @asort($sorted_apps);
@reset($sorted_apps); @reset($sorted_apps);
while ($permission = each($sorted_apps)) { while ($permission = each($sorted_apps))
if ($permission[1]["enabled"]) { {
if ($permission[1]["enabled"])
{
$perm_display[$i][0] = $permission[0]; $perm_display[$i][0] = $permission[0];
$perm_display[$i][1] = $permission[1]["title"]; $perm_display[$i][1] = $permission[1]["title"];
$i++; $i++;
@ -197,18 +245,21 @@
} }
$perm_html = ""; $perm_html = "";
for ($i=0;$i<200;) { // The $i<200 is only used for a brake for ($i=0;$i<200;)
{ // The $i<200 is only used for a brake
if (! $perm_display[$i][1]) break; if (! $perm_display[$i][1]) break;
$perm_html .= '<tr bgcolor="'.$phpgw_info["theme"]["row_on"].'"><td>' . lang($perm_display[$i][1]) . '</td>' $perm_html .= '<tr bgcolor="'.$phpgw_info["theme"]["row_on"].'"><td>' . lang($perm_display[$i][1]) . '</td>'
. '<td><input type="checkbox" name="n_group_permissions[' . '<td><input type="checkbox" name="n_group_permissions['
. $perm_display[$i][0] . ']" value="True"'; . $perm_display[$i][0] . ']" value="True"';
if ($n_group_permissions[$perm_display[$i][0]] || $db_perms[$perm_display[$i][0]]) { if ($n_group_permissions[$perm_display[$i][0]] || $db_perms[$perm_display[$i][0]])
{
$perm_html .= " checked"; $perm_html .= " checked";
} }
$perm_html .= "></td>"; $perm_html .= "></td>";
$i++; $i++;
if ($i == count($perm_display) && is_odd(count($perm_display))) { if ($i == count($perm_display) && is_odd(count($perm_display)))
{
$perm_html .= '<td colspan="2">&nbsp;</td></tr>'; $perm_html .= '<td colspan="2">&nbsp;</td></tr>';
} }
@ -216,7 +267,8 @@
$perm_html .= '<td>' . lang($perm_display[$i][1]) . '</td>' $perm_html .= '<td>' . lang($perm_display[$i][1]) . '</td>'
. '<td><input type="checkbox" name="n_group_permissions[' . '<td><input type="checkbox" name="n_group_permissions['
. $perm_display[$i][0] . ']" value="True"'; . $perm_display[$i][0] . ']" value="True"';
if ($n_group_permissions[$perm_display[$i][0]] || $db_perms[$perm_display[$i][0]]) { if ($n_group_permissions[$perm_display[$i][0]] || $db_perms[$perm_display[$i][0]])
{
$perm_html .= " checked"; $perm_html .= " checked";
} }
$perm_html .= "></td></tr>\n"; $perm_html .= "></td></tr>\n";
@ -224,9 +276,7 @@
} }
$p->set_var("permissions_list",$perm_html); $p->set_var("permissions_list",$perm_html);
$p->set_var("lang_submit_button",lang("submit changes")); $p->set_var("lang_submit_button",lang("submit changes"));
$p->pparse("out","form"); $p->pparse("out","form");
$phpgw->common->phpgw_footer(); $phpgw->common->phpgw_footer();

View File

@ -12,7 +12,8 @@
/* $Id$ */ /* $Id$ */
$phpgw_info = array(); $phpgw_info = array();
if ($submit) { if ($submit)
{
$phpgw_info['flags'] = array('noheader' => True, 'nonavbar' => True); $phpgw_info['flags'] = array('noheader' => True, 'nonavbar' => True);
} }
@ -22,36 +23,44 @@
function is_odd($n) function is_odd($n)
{ {
$ln = substr($n,-1); $ln = substr($n,-1);
if ($ln == 1 || $ln == 3 || $ln == 5 || $ln == 7 || $ln == 9) { if ($ln == 1 || $ln == 3 || $ln == 5 || $ln == 7 || $ln == 9)
{
return True; return True;
} else { }
else
{
return False; return False;
} }
} }
if ($submit) { if ($submit)
{
if (! $n_group) { if (!$n_group)
{
$error = '<br>' . lang('You must enter a group name.'); $error = '<br>' . lang('You must enter a group name.');
} else { }
$phpgw->db->query("select count(*) from phpgw_accounts where account_lid='" . $n_group . "'"); else
$phpgw->db->next_record(); {
if ($phpgw->accounts->exists($n_group))
if ($phpgw->db->f(0) != 0) { {
$error = '<br>' . lang('Sorry, that group name has already been taken.'); $error = '<br>' . lang('Sorry, that group name has already been taken.');
} }
} }
if (! $error) { if (!$error)
$phpgw->db->lock(array('phpgw_accounts','phpgw_preferences','phpgw_config','phpgw_applications','phpgw_hooks','phpgw_sessions','phpgw_acl')); {
while(1) { $phpgw->db->lock(array(
$group_id = mt_rand (1000, 60000); 'phpgw_accounts',
$phpgw->db->query("SELECT account_id FROM phpgw_accounts WHERE account_id=$group_id",__LINE__,__FILE__); 'phpgw_nextid',
if(!$phpgw->db->num_rows()) { break; } 'phpgw_preferences',
} 'phpgw_sessions',
'phpgw_acl',
'phpgw_applications'
));
$phpgw->db->query("INSERT INTO phpgw_accounts(account_id,account_pwd,account_lid,account_type,account_firstname,account_lastname) " $group = CreateObject('phpgwapi.accounts',$group_id);
."VALUES($group_id,'".md5('')."','$n_group','g','$n_group','Group')"); $group->create('g', $n_group, 'Group', $n_group, '', '');
$group_id = $phpgw->accounts->name2id($n_group);
$apps = CreateObject('phpgwapi.applications',intval($group_id)); $apps = CreateObject('phpgwapi.applications',intval($group_id));
$apps->update_data(Array()); $apps->update_data(Array());
@ -72,7 +81,8 @@
$acl = CreateObject('phpgwapi.acl',$group_id); $acl = CreateObject('phpgwapi.acl',$group_id);
$acl->read_repository(); $acl->read_repository();
for ($i=0; $i<count($n_users);$i++) { for ($i=0; $i<count($n_users);$i++)
{
$acl->add_repository('phpgw_group',$group_id,$n_users[$i],1); $acl->add_repository('phpgw_group',$group_id,$n_users[$i],1);
// If the user is logged in, it will force a refresh of the session_info // If the user is logged in, it will force a refresh of the session_info
@ -83,28 +93,35 @@
$t = $pref->read_repository(); $t = $pref->read_repository();
$docommit = False; $docommit = False;
for ($j=0;$j<count($new_apps);$j++) { for ($j=0;$j<count($new_apps);$j++)
if($new_apps[$j]=="admin") { {
if($new_apps[$j]=="admin")
{
$check = "common"; $check = "common";
} else { }
else
{
$check = $new_apps[$j]; $check = $new_apps[$j];
} }
if (!$t["$check"]) { if (!$t["$check"])
{
$phpgw->common->hook_single("add_def_pref", $new_apps[$j]); $phpgw->common->hook_single("add_def_pref", $new_apps[$j]);
$docommit = True; $docommit = True;
} }
} }
if ($docommit) { if ($docommit)
{
$pref->save_repository(); $pref->save_repository();
} }
} }
$basedir = $phpgw_info["server"]["files_dir"] . SEP . "groups" . SEP; $basedir = $phpgw_info["server"]["files_dir"] . SEP . "groups" . SEP;
$cd = 31; $cd = 31;
umask(000); umask(000);
if (! @mkdir ($basedir . $n_group, 0707)) $cd = 37; if (! @mkdir ($basedir . $n_group, 0707))
{
$cd = 37;
}
$phpgw->db->unlock(); $phpgw->db->unlock();
@ -114,14 +131,16 @@
} }
$p = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('admin')); $p = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('admin'));
$p->set_file(array("form" => "groups_form.tpl")); $p->set_file(array("form" => "groups_form.tpl"));
if ($error) { if ($error)
{
$phpgw->common->phpgw_header(); $phpgw->common->phpgw_header();
echo parse_navbar(); echo parse_navbar();
$p->set_var("error","<p><center>$error</center>"); $p->set_var("error","<p><center>$error</center>");
} else { }
else
{
$p->set_var("error",""); $p->set_var("error","");
} }
@ -130,31 +149,37 @@
$p->set_var("lang_group_name",lang("New group name")); $p->set_var("lang_group_name",lang("New group name"));
$p->set_var("group_name_value",""); $p->set_var("group_name_value","");
$phpgw->db->query("select count(*) from phpgw_accounts where account_status !='L' AND account_type='u'"); $accounts = CreateObject('phpgwapi.accounts',$group_id);
$phpgw->db->next_record(); $account_list = $accounts->get_list('accounts');
$account_num = count($account_list);
if ($phpgw->db->f(0) < 5) { if ($account_num < 5)
$p->set_var("select_size",$phpgw->db->f(0)); {
} else { $p->set_var('select_size',$account_num);
$p->set_var("select_size","5"); }
else
{
$p->set_var('select_size','5');
} }
$p->set_var("lang_include_user",lang("Select users for inclusion")); $p->set_var("lang_include_user",lang("Select users for inclusion"));
for ($i=0; $i<count($n_users); $i++) { for ($i=0; $i<count($n_users); $i++) {
$selected_users[$n_users[$i]] = " selected"; $selected_users[$n_users[$i]] = " selected";
} }
$phpgw->db->query("SELECT account_id,account_firstname,account_lastname,account_lid FROM phpgw_accounts WHERE " while (list($key,$entry) = each($account_list))
. "account_status != 'L' and account_type='u' ORDER BY account_lastname,account_firstname,account_lid asc"); {
while ($phpgw->db->next_record()) { $user_list .= '<option value="' . $entry['account_id'] . '"'
$user_list .= '<option value="' . $phpgw->db->f('account_id') . '"' . $selected_users[intval($entry['account_id'])] . '>'
. $selected_users[$phpgw->db->f('account_id')] . '>' . $phpgw->common->display_fullname(
. $phpgw->common->display_fullname($phpgw->db->f('account_lid'), $entry['account_lid'],
$phpgw->db->f('account_firstname'), $entry['account_firstname'],
$phpgw->db->f('account_lastname')) . '</option>'; $entry['account_lastname'])
. '</option>'."\n";
} }
$p->set_var("user_list",$user_list);
$p->set_var("user_list",$user_list);
$p->set_var("lang_permissions",lang("Permissions this group has")); $p->set_var("lang_permissions",lang("Permissions this group has"));
$i = 0; $i = 0;
@ -164,8 +189,10 @@
$sorted_apps = $phpgw_info["apps"]; $sorted_apps = $phpgw_info["apps"];
@asort($sorted_apps); @asort($sorted_apps);
@reset($sorted_apps); @reset($sorted_apps);
while ($permission = each($sorted_apps)) { while ($permission = each($sorted_apps))
if ($permission[1]["enabled"]) { {
if ($permission[1]["enabled"])
{
$perm_display[$i][0] = $permission[0]; $perm_display[$i][0] = $permission[0];
$perm_display[$i][1] = $permission[1]["title"]; $perm_display[$i][1] = $permission[1]["title"];
$i++; $i++;
@ -178,13 +205,15 @@
$perm_html .= '<tr bgcolor="'.$phpgw_info["theme"]["row_on"].'"><td>' . lang($perm_display[$i][1]) . '</td>' $perm_html .= '<tr bgcolor="'.$phpgw_info["theme"]["row_on"].'"><td>' . lang($perm_display[$i][1]) . '</td>'
. '<td><input type="checkbox" name="n_group_permissions[' . '<td><input type="checkbox" name="n_group_permissions['
. $perm_display[$i][0] . ']" value="True"'; . $perm_display[$i][0] . ']" value="True"';
if ($n_group_permissions[$perm_display[$i][0]]) { if ($n_group_permissions[$perm_display[$i][0]])
{
$perm_html .= " checked"; $perm_html .= " checked";
} }
$perm_html .= "></td>"; $perm_html .= "></td>";
$i++; $i++;
if ($i == count($perm_display) && is_odd(count($perm_display))) { if ($i == count($perm_display) && is_odd(count($perm_display)))
{
$perm_html .= '<td colspan="2">&nbsp;</td></tr>'; $perm_html .= '<td colspan="2">&nbsp;</td></tr>';
} }
@ -192,7 +221,8 @@
$perm_html .= '<td>' . lang($perm_display[$i][1]) . '</td>' $perm_html .= '<td>' . lang($perm_display[$i][1]) . '</td>'
. '<td><input type="checkbox" name="n_group_permissions[' . '<td><input type="checkbox" name="n_group_permissions['
. $perm_display[$i][0] . ']" value="True"'; . $perm_display[$i][0] . ']" value="True"';
if ($n_group_permissions[$perm_display[$i][0]]) { if ($n_group_permissions[$perm_display[$i][0]])
{
$perm_html .= " checked"; $perm_html .= " checked";
} }
$perm_html .= "></td></tr>\n"; $perm_html .= "></td></tr>\n";
@ -201,7 +231,6 @@
$p->set_var("permissions_list",$perm_html); $p->set_var("permissions_list",$perm_html);
$p->set_var("lang_submit_button",lang("Create Group")); $p->set_var("lang_submit_button",lang("Create Group"));
$p->pparse("out","form"); $p->pparse("out","form");
$phpgw->common->phpgw_footer(); $phpgw->common->phpgw_footer();