onokazu
onoka****@users*****
2006年 6月 7日 (水) 03:25:55 JST
Index: xoops2jp/html/modules/system/admin/mailusers/mailusers.php
diff -u xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.5 xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.5.2.1
--- xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.5 Mon May 1 11:37:30 2006
+++ xoops2jp/html/modules/system/admin/mailusers/mailusers.php Wed Jun 7 03:25:55 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: mailusers.php,v 1.5 2006/05/01 02:37:30 onokazu Exp $
+// $Id: mailusers.php,v 1.5.2.1 2006/06/06 18:25:55 onokazu Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -218,7 +218,6 @@
$subject_hidden = new XoopsFormHidden("mail_subject", $myts->makeTboxData4PreviewInForm($_POST['mail_subject']));
$body_hidden = new XoopsFormHidden("mail_body", $myts->makeTareaData4PreviewInForm($_POST['mail_body']));
$start_hidden = new XoopsFormHidden("mail_start", $mail_end);
- $to_hidden = new XoopsFormHidden("mail_send_to[]", "mail");
$op_hidden = new XoopsFormHidden("op", "send");
$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));
@@ -233,7 +232,14 @@
$form->addElement($femail_hidden);
$form->addElement($subject_hidden);
$form->addElement($body_hidden);
- $form->addElement($to_hidden);
+ if (in_array('mail', $_POST['mail_send_to'])) {
+ $to_hidden = new XoopsFormHidden('mail_send_to[]', 'mail');
+ $form->addElement($to_hidden);
+ }
+ if (in_array('pm', $_POST['mail_send_to']) && empty($_POST['mail_inactive'])) {
+ $to_hidden = new XoopsFormHidden('mail_send_to[]', 'pm');
+ $form->addElement($to_hidden);
+ }
$form->addElement($op_hidden);
$form->addElement($start_hidden);
$form->addElement($submit_button);