[Xoops-cvs2] xoops-current/html/modules/system/admin/mailusers mailusers.php,1.2,1.3 mailform.php,1.1.1.1,1.2

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

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

Modified Files:
	mailusers.php mailform.php 
Log Message:
no message

Index: mailusers.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/mailusers/mailusers.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mailusers.php	4 Aug 2002 20:01:42 -0000	1.2
--- mailusers.php	5 Sep 2002 04:11:27 -0000	1.3
***************
*** 29,40 ****
  			$criteria[] = "level = 0";
  		} else {
! 			if ( !empty($HTTP_POST_VARS['mail_to_group']) ) {
! 				foreach ($HTTP_POST_VARS['mail_to_group'] as $groupid ) {
! 					$mailgroup = new XoopsGroup($groupid);
! 					$members = $mailgroup->getMembers(true);
! 					foreach ( $members as $member ) {
! 						if ( !in_array($member_id, $added) ) {
! 							$added_id[] = $member->uid;
! 							$added[] = $member;
  						}
  					}
--- 29,44 ----
  			$criteria[] = "level = 0";
  		} else {
! 			if (!empty($HTTP_POST_VARS['mail_mailok'])) {
! 				$criteria[] = 'user_mailok = 1';
! 			} else {
! 				if ( count($HTTP_POST_VARS['mail_to_group']) > 0 ) {
! 					foreach ($HTTP_POST_VARS['mail_to_group'] as $groupid ) {
! 						$mailgroup = new XoopsGroup($groupid);
! 						$members = $mailgroup->getMembers(true);
! 						foreach ( $members as $member ) {
! 							if ( !in_array($member_id, $added) ) {
! 								$added_id[] = $member->uid;
! 								$added[] = $member;
! 							}
  						}
  					}
***************
*** 71,74 ****
--- 75,79 ----
  				}
  			}
+ 			
  		}
  		if ( !empty($HTTP_POST_VARS['mail_regd_min']) ) {

Index: mailform.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/mailusers/mailform.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mailform.php	15 Jul 2002 08:13:47 -0000	1.1.1.1
--- mailform.php	5 Sep 2002 04:11:27 -0000	1.2
***************
*** 24,30 ****
  	$idle_more = new XoopsFormText(_AM_IDLEMORE."<br />", "mail_idle_more", 10, 5);
  	$idle_less = new XoopsFormText(_AM_IDLELESS."<br />", "mail_idle_less", 10, 5);
  	$inactive_cbox = new XoopsFormCheckBox(_AM_INACTIVE."<br />", "mail_inactive");
  	$inactive_cbox->addOption(1, _AMIFCHECKD);
! 	$inactive_cbox->setExtra("onclick='javascript:disableElement(\"mail_lastlog_min\");disableElement(\"mail_lastlog_max\");disableElement(\"mail_idle_more\");disableElement(\"mail_idle_less\");disableElement(\"mail_to_group\");'");
  	$criteria_tray = new XoopsFormElementTray(_AM_SENDTOUSERS, "<br /><br />");
  	$criteria_tray->addElement($group_select);
--- 24,32 ----
  	$idle_more = new XoopsFormText(_AM_IDLEMORE."<br />", "mail_idle_more", 10, 5);
  	$idle_less = new XoopsFormText(_AM_IDLELESS."<br />", "mail_idle_less", 10, 5);
+ 	$mailok_cbox = new XoopsFormCheckBox('', 'mail_mailok');
+ 	$mailok_cbox->addOption(1, _AM_MAILOK);
  	$inactive_cbox = new XoopsFormCheckBox(_AM_INACTIVE."<br />", "mail_inactive");
  	$inactive_cbox->addOption(1, _AMIFCHECKD);
! 	$inactive_cbox->setExtra("onclick='javascript:disableElement(\"mail_lastlog_min\");disableElement(\"mail_lastlog_max\");disableElement(\"mail_idle_more\");disableElement(\"mail_idle_less\");disableElement(\"mail_to_group[]\");'");
  	$criteria_tray = new XoopsFormElementTray(_AM_SENDTOUSERS, "<br /><br />");
  	$criteria_tray->addElement($group_select);
***************
*** 33,36 ****
--- 35,39 ----
  	$criteria_tray->addElement($idle_more);
  	$criteria_tray->addElement($idle_less);
+ 	$criteria_tray->addElement($mailok_cbox);
  	$criteria_tray->addElement($inactive_cbox);
  	$criteria_tray->addElement($regd_min);