[Xoops-cvs2] xoops-current/html/modules/system/admin/users users.php,1.2,1.3 userform.php,1.1.1.1,1.2 main.php,1.2,1.3

[<on...@us...>]

Update of /cvsroot/xoops/xoops-current/html/modules/system/admin/users
In directory usw-pr-cvs1:/tmp/cvs-serv29482

Modified Files:
	users.php userform.php main.php 
Log Message:
no message

Index: users.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/users/users.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** users.php	6 Aug 2002 01:21:10 -0000	1.2
--- users.php	5 Sep 2002 04:11:11 -0000	1.3
***************
*** 58,61 ****
--- 58,62 ----
  	$bio_value = "";
  	$rank_value = 0;
+ 	$mailok_value = 0;
  	$op_value = "addUser";
  	$form_title = _AM_ADDUSER;
***************
*** 105,108 ****
--- 106,110 ----
  		$bio_value = $user->getVar("bio", "E");
  		$rank_value = $user->rank(false);
+ 		$mailok_value = $user->getVar('user_mailok', 'E');
  		$op_value = "updateUser";
  		$form_title = _AM_UPDATEUSER.": ".$user->getVar("uname");
***************
*** 130,134 ****
  }
  
! function updateUser($uid, $uname, $name, $url, $email, $user_icq, $user_aim, $user_yim, $user_msnm, $user_from, $user_occ, $user_intrest, $user_viewemail, $user_avatar, $user_sig, $attachsig, $theme, $pass, $pass2, $rank, $bio, $uorder, $umode, $timezone_offset) {
  
  	global $xoopsConfig, $xoopsDB, $xoopsModule;
--- 132,136 ----
  }
  
! function updateUser($uid, $uname, $name, $url, $email, $user_icq, $user_aim, $user_yim, $user_msnm, $user_from, $user_occ, $user_intrest, $user_viewemail, $user_avatar, $user_sig, $attachsig, $theme, $pass, $pass2, $rank, $bio, $uorder, $umode, $timezone_offset, $user_mailok) {
  
  	global $xoopsConfig, $xoopsDB, $xoopsModule;
***************
*** 157,160 ****
--- 159,163 ----
  	$edituser->setVar("user_occ", $user_occ);
  	$edituser->setVar("user_intrest", $user_intrest);
+ 	$edituser->setVar('user_mailok', $user_mailok);
  	if ($pass2 != "") {
                  if ( $pass != $pass2 ) {
***************
*** 169,173 ****
  	if ( !$edituser->store() ) {
  		xoops_cp_header();
! 		echo $editusers->getErrors();
  		xoops_cp_footer();
  	} else {
--- 172,176 ----
  	if ( !$edituser->store() ) {
  		xoops_cp_header();
! 		echo $edituser->getErrors();
  		xoops_cp_footer();
  	} else {

Index: userform.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/users/userform.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** userform.php	15 Jul 2002 08:13:47 -0000	1.1.1.1
--- userform.php	5 Sep 2002 04:11:12 -0000	1.2
***************
*** 74,77 ****
--- 74,78 ----
  	$pwd_text = new XoopsFormPassword(_AM_PASSWORD, "pass", 10, 20);
  	$pwd_text2 = new XoopsFormPassword(_AM_RETYPEPD, "pass2", 10, 20);
+ 	$mailok_radio = new XoopsFormRadioYN(_US_MAILOK, 'user_mailok', $mailok_value);
  	$fct_hidden = new XoopsFormHidden("fct", "users");
  	$op_hidden = new XoopsFormHidden("op", $op_value);
***************
*** 100,103 ****
--- 101,105 ----
  	$form->addElement($pwd_text);
  	$form->addElement($pwd_text2);
+ 	$form->addElement($mailok_radio);
  	$form->addElement($fct_hidden);
  	$form->addElement($op_hidden);

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/users/main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.php	6 Aug 2002 01:21:10 -0000	1.2
--- main.php	5 Sep 2002 04:11:12 -0000	1.3
***************
*** 14,18 ****
                          break;
                  case "updateUser":
!                         updateUser($uid, $uname, $name, $url, $email, $user_icq, $user_aim, $user_yim, $user_msnm, $user_from, $user_occ, $user_intrest, $user_viewemail, $user_avatar, $user_sig, $attachsig, $theme, $pass, $pass2, $rank, $bio, $uorder, $umode, $timezone_offset);
                          break;
                  case "delUser":
--- 14,18 ----
                          break;
                  case "updateUser":
!                         updateUser($uid, $uname, $name, $url, $email, $user_icq, $user_aim, $user_yim, $user_msnm, $user_from, $user_occ, $user_intrest, $user_viewemail, $user_avatar, $user_sig, $attachsig, $theme, $pass, $pass2, $rank, $bio, $uorder, $umode, $timezone_offset, $user_mailok);
                          break;
                  case "delUser":
***************
*** 113,116 ****
--- 113,117 ----
  			$newuser->setVar("user_occ", $user_occ);
  			$newuser->setVar("user_intrest", $user_intrest);
+ 			$newuser->setVar('user_mailok', $user_mailok);
  			if ( !$newuser->store() ) {
  				echo _AM_CNRNU;