upcase-project-cvs

[<jhe...@us...>]

Update of /cvsroot/upcase-project/UpCase/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv16360

Modified Files:
	useredit.php 
Log Message:
added user deletion, use the account manager


Index: useredit.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/admin/useredit.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** useredit.php	12 Nov 2002 17:56:17 -0000	1.3
--- useredit.php	28 Nov 2002 14:40:04 -0000	1.4
***************
*** 10,54 ****
  
  include_once("../config/uc_config.inc");
! 
! include_once("lib/uc_page.php");
  $page = new UcPage("userEdition");
  $page->open();
! 
  session_register("user");
  
  include("config/uc_templates.inc");
  $tmpl = new ModeliXe($uc_tmpl["USER_EDIT"]);
  $tmpl->SetModeliXe();
  
! if (isset($username))
  {
! 	$user = getUser($username, '');
  }
  else
  {
- 	$db = new UcSql();
- 	$user->db = $db;
  	$user->setPrimaryGroup($primarygroup);
  	$user->setLanguage($preflang);
  	if (isset($secondarygroups))
  		$user->setSecondaryGroups($secondarygroups);
  	else
  		$user->setSecondaryGroups(array());
  
  	if (strlen($password) > 0)
! 		$user->setPassword($password);
  
  	$user->setFirstName($firstname);
  	$user->setLastName($lastname);
  	$user->setEmail($email);
  }
  
! $groups = getAllGroups();
! 
  $tmpl->MxText("username", $user->name);
  $tmpl->MxSelect("primarygroup", "primarygroup",
  				$user->gid, $groups);
  $tmpl->MxSelect("secondarygroups", "secondarygroups",
! 				$user->groups, $groups, "", 5);
  $tmpl->MxSelect("preflang", "preflang",
  				$user->lang, $ucConfig->languages);
--- 10,64 ----
  
  include_once("../config/uc_config.inc");
! include_once("uc_page.php");
! include_once("uc_utils.php");
! include_once("uc_accounts.php");
  $page = new UcPage("userEdition");
  $page->open();
! $username = checkVar("username", false);
! 	
  session_register("user");
  
+ 
+ if (checkVar("delete", false))
+ 	header("Location: " . $ucConfig->upcaseUrl 
+ 			. "/admin/userdel.php?uid=$user->uid");
+ 
  include("config/uc_templates.inc");
  $tmpl = new ModeliXe($uc_tmpl["USER_EDIT"]);
  $tmpl->SetModeliXe();
  
! $accountMgr = new UcAccountManager($page->session->db);
! 
! if ($username)
  {
! 	$user = $accountMgr->getUser($username);
  }
  else
  {
  	$user->setPrimaryGroup($primarygroup);
  	$user->setLanguage($preflang);
  	if (isset($secondarygroups))
+ 	{
  		$user->setSecondaryGroups($secondarygroups);
+ 	}
  	else
  		$user->setSecondaryGroups(array());
  
  	if (strlen($password) > 0)
! 		$accountMgr->setUserPassword($user, $password);
  
  	$user->setFirstName($firstname);
  	$user->setLastName($lastname);
  	$user->setEmail($email);
+ 	$accountMgr->updateUser($user);
  }
  
! $groups = $accountMgr->listGroups();
! 	
  $tmpl->MxText("username", $user->name);
  $tmpl->MxSelect("primarygroup", "primarygroup",
  				$user->gid, $groups);
  $tmpl->MxSelect("secondarygroups", "secondarygroups",
! 				$user->secGids, $groups, "", 5);
  $tmpl->MxSelect("preflang", "preflang",
  				$user->lang, $ucConfig->languages);