onokazu
onoka****@users*****
2005年 9月 5日 (月) 05:46:09 JST
Index: xoops2jp/html/language/japanese/notification.php
diff -u xoops2jp/html/language/japanese/notification.php:1.4 xoops2jp/html/language/japanese/notification.php:1.5
--- xoops2jp/html/language/japanese/notification.php:1.4 Wed Aug 3 21:39:12 2005
+++ xoops2jp/html/language/japanese/notification.php Mon Sep 5 05:46:09 2005
@@ -1,5 +1,5 @@
<?php
-// $Id: notification.php,v 1.4 2005/08/03 12:39:12 onokazu Exp $
+// $Id: notification.php,v 1.5 2005/09/04 20:46:09 onokazu Exp $
// RMV-NOTIFY
@@ -32,7 +32,7 @@
define ('_NOT_PM', 'プライベート・メッセージ');
define ('_NOT_DISABLE', '無効にする');
define ('_NOT_CHANGE', '変更');
-
+define ('_NOT_RUSUREDEL', '選択したイベントを削除してもいいですか？');
define ('_NOT_NOACCESS', 'このページにアクセスする権限がありません。');
// Text for module config options
Index: xoops2jp/html/language/japanese/xoopsmailerlocal.php
diff -u xoops2jp/html/language/japanese/xoopsmailerlocal.php:1.1 xoops2jp/html/language/japanese/xoopsmailerlocal.php:1.2
--- xoops2jp/html/language/japanese/xoopsmailerlocal.php:1.1 Thu Sep 9 14:15:04 2004
+++ xoops2jp/html/language/japanese/xoopsmailerlocal.php Mon Sep 5 05:46:09 2005
@@ -1,63 +1,141 @@
<?php
+// $Id: xoopsmailerlocal.php,v 1.2 2005/09/04 20:46:09 onokazu Exp $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: NobuNobu (Nobuk****@Kowa*****) //
+// URL: http://jp.xoops.org //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
class XoopsMailerLocal extends XoopsMailer {
- function XoopsMailerLocal(){
- $this->XoopsMailer();
- $this->charSet = 'iso-2022-jp';
- $this->encoding = '7bit';
- }
-
- function encodeFromName($text){
- return $this->EUCtoJIS($text);
- }
-
- function encodeSubject($text){
- return $this->EUCtoJIS($text);
- }
-
- function encodeBody(&$text){
- $text = $this->EUCtoJIS($text);
- }
+ function XoopsMailerLocal(){
+ $this->multimailer = new XoopsMultiMailerLocal();
+ $this->reset();
+ $this->charSet = 'iso-2022-jp';
+ $this->encoding = '7bit';
+ }
+
+ function encodeFromName($text){
+ return $this->STRtoJIS($text,_CHARSET);
+ }
+
+ function encodeSubject($text){
+ if ($this->multimailer->needs_encode) {
+ return $this->STRtoJIS($text,_CHARSET);
+ } else {
+ return $text;
+ }
+ }
+
+ function encodeBody(&$text){
+ if ($this->multimailer->needs_encode) {
+ $text = $this->STRtoJIS($text,_CHARSET);
+ }
+ }
+
+ /*-------------------------------------
+ PHP FORM MAIL 1.01 by TOMO
+ URL : http://www.spencernetwork.org/
+ E-Mail : groov****@spenc*****
+ --------------------------------------*/
+ function STRtoJIS($str, $from_charset){
+ if (function_exists('mb_convert_encoding')) { //Use mb_string extension if exists.
+ $str_JIS = mb_convert_encoding($str, "ISO-2022-JP", $from_charset);
+ } else if ($from_charset=='EUC-JP') {
+ $str_JIS = '';
+ $mode = 0;
+ $b = unpack("C*", $str);
+ $n = count($b);
+ for ($i = 1; $i <= $n; $i++) {
+ if ($b[$i] == 0x8E) {
+ if ($mode != 2) {
+ $mode = 2;
+ $str_JIS .= pack("CCC", 0x1B, 0x28, 0x49);
+ }
+ $b[$i+1] -= 0x80;
+ $str_JIS .= pack("C", $b[$i+1]);
+ $i++;
+ } elseif ($b[$i] > 0x8E) {
+ if ($mode != 1){
+ $mode = 1;
+ $str_JIS .= pack("CCC", 0x1B, 0x24, 0x42);
+ }
+ $b[$i] -= 0x80; $b[$i+1] -= 0x80;
+ $str_JIS .= pack("CC", $b[$i], $b[$i+1]);
+ $i++;
+ } else {
+ if ($mode != 0) {
+ $mode = 0;
+ $str_JIS .= pack("CCC", 0x1B, 0x28, 0x42);
+ }
+ $str_JIS .= pack("C", $b[$i]);
+ }
+ }
+ if ($mode != 0) $str_JIS .= pack("CCC", 0x1B, 0x28, 0x42);
+ }
+ return $str_JIS;
+ }
+}
+class XoopsMultiMailerLocal extends XoopsMultiMailer {
+ var $needs_encode;
- /*-------------------------------------
- PHP FORM MAIL 1.01 by TOMO
- URL : http://www.spencernetwork.org/
- E-Mail : groov****@spenc*****
- --------------------------------------*/
- function EUCtoJIS($str_EUC){
- $str_JIS = '';
- $mode = 0;
- $b = unpack("C*", $str_EUC);
- $n = count($b);
- for ($i = 1; $i <= $n; $i++) {
- if ($b[$i] == 0x8E) {
- if ($mode != 2) {
- $mode = 2;
- $str_JIS .= pack("CCC", 0x1B, 0x28, 0x49);
- }
- $b[$i+1] -= 0x80;
- $str_JIS .= pack("C", $b[$i+1]);
- $i++;
- } elseif ($b[$i] > 0x8E) {
- if ($mode != 1){
- $mode = 1;
- $str_JIS .= pack("CCC", 0x1B, 0x24, 0x42);
- }
- $b[$i] -= 0x80; $b[$i+1] -= 0x80;
- $str_JIS .= pack("CC", $b[$i], $b[$i+1]);
- $i++;
- } else {
- if ($mode != 0) {
- $mode = 0;
- $str_JIS .= pack("CCC", 0x1B, 0x28, 0x42);
- }
- $str_JIS .= pack("C", $b[$i]);
- }
- }
- if ($mode != 0) $str_JIS .= pack("CCC", 0x1B, 0x28, 0x42);
- return $str_JIS;
- }
+ function XoopsMultiMailerLocal() {
+ $this->XoopsMultiMailer();
+
+ $this->needs_encode = true;
+ if (function_exists('mb_convert_encoding')) {
+ $mb_overload = ini_get('mbstring.func_overload');
+ if (($this->Mailer == 'mail') && (intval($mb_overload) & 1)) { //check if mbstring extension overloads mail()
+ $this->needs_encode = false;
+ }
+ }
+ }
+
+ function addr_format($addr) {
+ if(empty($addr[1])) {
+ $formatted = $addr[0];
+ } else {
+ $formatted = sprintf('%s <%s>', $this->encode_header($addr[1], 'text', true), $addr[0]);
+ }
+ return $formatted;
+ }
+
+ function encode_header ($str, $position = 'text', $force=false) {
+ if (function_exists('mb_convert_encoding')) { //Use mb_string extension if exists.
+ if ($this->needs_encode || $force) {
+ $encoded = mb_convert_encoding($str, _CHARSET, mb_detect_encoding($str));
+ $encoded = mb_encode_mimeheader($encoded, "ISO-2022-JP", "B", "\n");
+ } else {
+ $encoded = $str;
+ }
+ } else {
+ $encoded = parent::encode_header($str, $position);
+ }
+ return $encoded;
+ }
}
?>
\ No newline at end of file