onokazu
onoka****@users*****
2005年 6月 8日 (水) 13:32:11 JST
Index: xoops2jp/html/modules/system/admin/mailusers/mailform.php
diff -u xoops2jp/html/modules/system/admin/mailusers/mailform.php:1.2.6.2 xoops2jp/html/modules/system/admin/mailusers/mailform.php:1.2.6.3
--- xoops2jp/html/modules/system/admin/mailusers/mailform.php:1.2.6.2 Fri May 13 20:02:32 2005
+++ xoops2jp/html/modules/system/admin/mailusers/mailform.php Wed Jun 8 13:32:11 2005
@@ -1,5 +1,5 @@
<?php
-// $Id: mailform.php,v 1.2.6.2 2005/05/13 11:02:32 minahito Exp $
+// $Id: mailform.php,v 1.2.6.3 2005/06/08 04:32:11 onokazu Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -34,46 +34,46 @@
// from finduser section
if (!empty($_POST['memberslist_id'])) {
- $user_count = count($_POST['memberslist_id']);
- $display_names = "";
- for ( $i = 0; $i < $user_count; $i++ ) {
- $uid_hidden = new XoopsFormHidden("mail_to_user[]", $_POST['memberslist_id'][$i]);
- $form->addElement($uid_hidden);
- $display_names .= "<a href='".XOOPS_URL."/userinfo.php?uid=".$_POST['memberslist_id'][$i]."' target='_blank'>".$_POST['memberslist_uname'][$_POST['memberslist_id'][$i]]."</a>, ";
- unset($uid_hidden);
- }
- $users_label = new XoopsFormLabel(_AM_SENDTOUSERS2, substr($display_names, 0, -2));
- $form->addElement($users_label);
- $display_criteria = 0;
+ $user_count = count($_POST['memberslist_id']);
+ $display_names = "";
+ for ( $i = 0; $i < $user_count; $i++ ) {
+ $uid_hidden = new XoopsFormHidden("mail_to_user[]", $_POST['memberslist_id'][$i]);
+ $form->addElement($uid_hidden);
+ $display_names .= "<a href='".XOOPS_URL."/userinfo.php?uid=".$_POST['memberslist_id'][$i]."' target='_blank'>".$_POST['memberslist_uname'][$_POST['memberslist_id'][$i]]."</a>, ";
+ unset($uid_hidden);
+ }
+ $users_label = new XoopsFormLabel(_AM_SENDTOUSERS2, substr($display_names, 0, -2));
+ $form->addElement($users_label);
+ $display_criteria = 0;
}
if ( !empty($display_criteria) ) {
- $selected_groups = array();
- $group_select = new XoopsFormSelectGroup(_AM_GROUPIS."<br />", "mail_to_group", false, $selected_groups, 5, true);
- $lastlog_min = new XoopsFormText(_AM_LASTLOGMIN."<br />"._AM_TIMEFORMAT."<br />", "mail_lastlog_min", 20, 10);
- $lastlog_max = new XoopsFormText(_AM_LASTLOGMAX."<br />"._AM_TIMEFORMAT."<br />", "mail_lastlog_max", 20, 10);
- $regd_min = new XoopsFormText(_AM_REGDMIN."<br />"._AM_TIMEFORMAT."<br />", "mail_regd_min", 20, 10);
- $regd_max = new XoopsFormText(_AM_REGDMAX."<br />"._AM_TIMEFORMAT."<br />", "mail_regd_max", 20, 10);
- $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);
- $criteria_tray->addElement($lastlog_min);
- $criteria_tray->addElement($lastlog_max);
- $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);
- $criteria_tray->addElement($regd_max);
- $form->addElement($criteria_tray);
+ $selected_groups = array();
+ $group_select = new XoopsFormSelectGroup(_AM_GROUPIS."<br />", "mail_to_group", false, $selected_groups, 5, true);
+ $lastlog_min = new XoopsFormText(_AM_LASTLOGMIN."<br />"._AM_TIMEFORMAT."<br />", "mail_lastlog_min", 20, 10);
+ $lastlog_max = new XoopsFormText(_AM_LASTLOGMAX."<br />"._AM_TIMEFORMAT."<br />", "mail_lastlog_max", 20, 10);
+ $regd_min = new XoopsFormText(_AM_REGDMIN."<br />"._AM_TIMEFORMAT."<br />", "mail_regd_min", 20, 10);
+ $regd_max = new XoopsFormText(_AM_REGDMAX."<br />"._AM_TIMEFORMAT."<br />", "mail_regd_max", 20, 10);
+ $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);
+ $criteria_tray->addElement($lastlog_min);
+ $criteria_tray->addElement($lastlog_max);
+ $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);
+ $criteria_tray->addElement($regd_max);
+ $form->addElement($criteria_tray);
}
-$fname_text = new XoopsFormText(_AM_MAILFNAME, "mail_fromname", 30, 255, $xoopsConfig['sitename']);
+$fname_text = new XoopsFormText(_AM_MAILFNAME, "mail_fromname", 30, 255, htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES));
$fromemail = !empty($xoopsConfig['adminmail']) ? $xoopsConfig['adminmail'] : $xoopsUser->getVar("email", "E");
$femail_text = new XoopsFormText(_AM_MAILFMAIL, "mail_fromemail", 30, 255, $fromemail);
//$subject_caption = _AM_MAILSUBJECT."<br /><br /><span style='font-size:x-small;font-weight:bold;'>"._AM_MAILTAGS."</span><br /><span style='font-size:x-small;font-weight:normal;'>"._AM_MAILTAGS1."<br />"._AM_MAILTAGS2."<br />"._AM_MAILTAGS3."</span>";