Minahito
minah****@users*****
2005年 6月 17日 (金) 18:22:17 JST
Index: xoops2jp/html/modules/system/admin/mailusers/mailusers.php
diff -u xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.2.6.2.2.1 xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.2.6.2.2.2
--- xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.2.6.2.2.1 Thu Jun 16 22:35:53 2005
+++ xoops2jp/html/modules/system/admin/mailusers/mailusers.php Fri Jun 17 18:22:17 2005
@@ -1,5 +1,5 @@
<?php
-// $Id: mailusers.php,v 1.2.6.2.2.1 2005/06/16 13:35:53 minahito Exp $
+// $Id: mailusers.php,v 1.2.6.2.2.2 2005/06/17 09:22:17 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -29,6 +29,8 @@
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
+define ('SEND_SIM_PROCESS_AMMO',100);
+
if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
exit("Access Denied");
} else {
@@ -171,7 +173,7 @@
//OpenTable();
if ( $added_count > 0 ) {
$mail_start = !empty($_POST['mail_start']) ? $_POST['mail_start'] : 0;
- $mail_end = ($added_count > ($mail_start + 100)) ? ($mail_start + 100) : $added_count;
+ $mail_end = ($added_count > ($mail_start + SIM_PROCESS_AMMO)) ? ($mail_start + SIM_PROCESS_AMMO) : $added_count;
$myts =& MyTextSanitizer::getInstance();
$xoopsMailer =& getMailer();
for ( $i = $mail_start; $i < $mail_end; $i++) {
@@ -201,8 +203,10 @@
$form->addElement($group_hidden);
}
}
- $inactive_hidden = new XoopsFormHidden("mail_inactive", intval($_POST['mail_inactive']));
- $mailok_hidden = new XoopsFormHidden("mail_mailok", intval($_POST['mail_mailok']));
+ if(isset($_POST['mail_inactive']))
+ $form->addElement(new XoopsFormHidden("mail_inactive", intval($_POST['mail_inactive'])));
+ if(isset($_POST['mail_mailok']))
+ $form->addElement(new XoopsFormHidden("mail_mailok", intval($_POST['mail_mailok'])));
$lastlog_min_hidden = new XoopsFormHidden("mail_lastlog_min", $myts->makeTboxData4PreviewInForm($_POST['mail_lastlog_min']));
$lastlog_max_hidden = new XoopsFormHidden("mail_lastlog_max", $myts->makeTboxData4PreviewInForm($_POST['mail_lastlog_max']));
$regd_min_hidden = new XoopsFormHidden("mail_regd_min", $myts->makeTboxData4PreviewInForm($_POST['mail_regd_max']));
@@ -219,8 +223,6 @@
$submit_button = new XoopsFormButton("", "mail_submit", _AM_SENDNEXT, "submit");
$sent_label = new XoopsFormLabel(_AM_SENT, sprintf(_AM_SENTNUM, $_POST['mail_start']+1, $mail_end, $added_count));
$form->addElement($sent_label);
- $form->addElement($inactive_hidden);
- $form->addElement($mailok_hidden);
$form->addElement($lastlog_min_hidden);
$form->addElement($lastlog_max_hidden);
$form->addElement($regd_min_hidden);