diff -ur geeklog-1.3.8-1/config.php geeklog-latest/config.php
--- geeklog-1.3.8-1/config.php 2003-08-10 01:16:15.000000000 +0900
+++ geeklog-latest/config.php 2003-09-02 22:32:51.000000000 +0900
@@ -162,15 +162,16 @@
// +---------------------------------------------------------------------------+
// | LOCALE SETTINGS |
// +---------------------------------------------------------------------------+
-$_CONF['language'] = 'english';
-$_CONF['locale'] = 'en-gb';
+$_CONF['language'] = 'japanese';
+$_CONF['locale'] = 'euc-jp';
+$_CONF['mail_locale'] = 'iso-2022-jp';
$_CONF['date'] = '%A, %B %d %Y @ %I:%M %p %Z';
$_CONF['daytime'] = '%m/%d %I:%M%p';
$_CONF['shortdate'] = '%x';
$_CONF['dateonly'] = '%d-%b';
$_CONF['timeonly'] = '%I:%M %p %Z';
-$_CONF['default_charset'] = 'iso-8859-1';
-$_CONF['rdf_language'] = 'en-gb'; // may have to be different than the locale
+$_CONF['default_charset'] = 'euc-jp';
+$_CONF['rdf_language'] = 'euc-jp'; // may have to be different than the locale
// ----------------------------------------------------------------------------+
// | SITE STATUS |
Only in geeklog-latest: config.php.1~
diff -ur geeklog-1.3.8-1/language/japanese.php geeklog-latest/language/japanese.php
--- geeklog-1.3.8-1/language/japanese.php 2003-08-08 17:17:18.000000000 +0900
+++ geeklog-latest/language/japanese.php 2003-09-02 22:17:27.000000000 +0900
@@ -66,7 +66,7 @@
22 => "ID",
23 => "管理レベル",
24 => "匿名",
- 25 => "お返事",
+ 25 => "コメント",
26 => "コメントは投稿者の責任においてなされるものであり、サイト管理者はなんら責任をおうものではありません。",
27 => "最新の投稿",
28 => "削除",
@@ -740,9 +740,9 @@
45 => '件のアクセス',
46 => '注意: 記事の日付を将来の日付に変更すると、その日まで表示されません。また、RDFヘッドラインにも反映されませんし、検索やサイト情報にも反映されないことに注意してください。',
47 => '画像',
- 48 => '画像',
- 49 => '右',
- 50 => '左',
+ 48 => 'image',
+ 49 => 'right',
+ 50 => 'left',
51 => '添付した画像を記事に表示するためには、特別な書式が必要です。書式は、[imageX] 、[imageX_right]あるいは、[imageX_left]のいずれかです。ただし、Xは添付した画像の番号です。注意:添付した画像は記事内で使用しなければ記事を保存できません。
プレビュー: 画像付きの記事はドラフトとして保存して閲覧してください。プレビューボタンは画像が無い場合だけに使用してください。',
52 => '削除',
53 => 'は使用されていません。保存する前に本文か詳細説明に画像を使用しなければなりません。',
@@ -955,8 +955,8 @@
18 => "To",
19 => "NOTE: サイトの登録者全員にメールを送るには、ドロップダウンリストから「Logged-in Users」を選択してください。",
20 => "
';
- if (!mail($A['email'], stripslashes ($vars['subject']),
+ if (!mb_send_mail($A['email'], stripslashes ($vars['subject']),
stripslashes ($vars['message']), $headers)) {
$failures[] .= $til;
} else {
diff -ur geeklog-1.3.8-1/public_html/admin/moderation.php geeklog-latest/public_html/admin/moderation.php
--- geeklog-1.3.8-1/public_html/admin/moderation.php 2003-08-08 17:16:38.000000000 +0900
+++ geeklog-latest/public_html/admin/moderation.php 2003-09-02 19:53:00.000000000 +0900
@@ -608,16 +608,18 @@
$mailtext .= "{$LANG04[14]}\n\n";
$mailtext .= "{$_CONF["site_name"]}\n";
$mailtext .= "{$_CONF['site_url']}\n";
- if (empty ($LANG_CHARSET)) {
- $charset = $_CONF['default_charset'];
- if (empty ($charset)) {
- $charset = "iso-8859-1";
- }
- }
- else {
- $charset = $LANG_CHARSET;
- }
- mail($A["email"], "{$_CONF["site_name"]}: {$LANG04[16]}",
+ $charset= $_CONF['mail_locale'];
+ if (empty ($charset)) {
+ $charset = $LANG_CHARSET;
+ }
+ if (empty ($charset)) {
+ $charset = $_CONF['default_charset'];
+ if (empty ($charset)) {
+ $charset = "iso-8859-1";
+ }
+ }
+
+ mb_send_mail($A["email"], "{$_CONF["site_name"]}: {$LANG04[16]}",
$mailtext,
"From: {$_CONF["site_name"]} <{$_CONF["site_mail"]}>\r\nReturn-Path: <{$_CONF["site_mail"]}>\r\nX-Mailer: GeekLog " . VERSION . "\r\nContent-Type: text/plain; charset={$charset}");
}
diff -ur geeklog-1.3.8-1/public_html/admin/user.php geeklog-latest/public_html/admin/user.php
--- geeklog-1.3.8-1/public_html/admin/user.php 2003-08-08 17:16:38.000000000 +0900
+++ geeklog-latest/public_html/admin/user.php 2003-09-02 19:53:00.000000000 +0900
@@ -527,16 +527,18 @@
$mailtext .= "{$LANG04[14]}\n\n";
$mailtext .= "{$_CONF["site_name"]}\n";
$mailtext .= "{$_CONF['site_url']}\n";
- if (empty ($LANG_CHARSET)) {
- $charset = $_CONF['default_charset'];
+ $charset= $_CONF['mail_locale'];
if (empty ($charset)) {
- $charset = "iso-8859-1";
+ $charset = $LANG_CHARSET;
}
- }
- else {
- $charset = $LANG_CHARSET;
- }
- mail($A["email"]
+ if (empty ($charset)) {
+ $charset = $_CONF['default_charset'];
+ if (empty ($charset)) {
+ $charset = "iso-8859-1";
+ }
+ }
+
+ mb_send_mail($A["email"]
,"{$_CONF["site_name"]}: {$LANG04[16]}"
,$mailtext
,"From: {$_CONF["site_name"]} <{$_CONF["site_mail"]}>\r\nReturn-Path: <{$_CONF["site_mail"]}>\r\nX-Mailer: GeekLog " . VERSION . "\r\nContent-Type: text/plain; charset={$charset}"
diff -ur geeklog-1.3.8-1/public_html/profiles.php geeklog-latest/public_html/profiles.php
--- geeklog-1.3.8-1/public_html/profiles.php 2003-08-08 17:17:15.000000000 +0900
+++ geeklog-latest/public_html/profiles.php 2003-09-02 19:49:00.000000000 +0900
@@ -55,13 +55,15 @@
if (COM_isemail($authoremail)) {
$result = DB_query("SELECT username,email FROM {$_TABLES['users']} WHERE uid = $uid");
$A = DB_fetchArray($result);
- if (empty ($LANG_CHARSET)) {
+ $charset= $_CONF['mail_locale'];
+ if (empty ($charset)) {
+ $charset = $LANG_CHARSET;
+ }
+ if (empty ($charset)) {
$charset = $_CONF['default_charset'];
if (empty ($charset)) {
$charset = "iso-8859-1";
}
- } else {
- $charset = $LANG_CHARSET;
}
// Append the user's signature to the message
@@ -76,7 +78,7 @@
$subject = strip_tags (stripslashes ($subject));
$subject = substr ($subject, 0, strcspn ($subject, "\r\n"));
- $RET = @mail($A['email'], $subject,
+ $RET = @mb_send_mail($A['email'], $subject,
strip_tags(stripslashes($message)) . $sig,
"From: $author <$authoremail>\r\n" .
"Return-Path: <$authoremail>\r\n" .
@@ -216,7 +218,7 @@
$mailfrom = 'From: '.$from.' <'.$fromemail.'>';
$subject = COM_undoSpecialChars(strip_tags(stripslashes('Re: '.$A['title'])));
- @mail($toemail,$subject,$mailtext,$mailfrom);
+ @mb_send_mail($toemail,$subject,$mailtext,$mailfrom);
$retval .= COM_refresh("{$_CONF['site_url']}/article.php?story=$sid");
// Increment numemails counter for story
$result = DB_query("SELECT numemails FROM {$_TABLES['stories']} WHERE sid = '$sid'");
diff -ur geeklog-1.3.8-1/public_html/users.php geeklog-latest/public_html/users.php
--- geeklog-1.3.8-1/public_html/users.php 2003-08-08 17:17:15.000000000 +0900
+++ geeklog-latest/public_html/users.php 2003-09-02 19:51:00.000000000 +0900
@@ -281,16 +281,17 @@
$mailtext .= "{$LANG04[14]}\n\n";
$mailtext .= "{$_CONF["site_name"]}\n";
$mailtext .= "{$_CONF['site_url']}\n";
- if (empty ($LANG_CHARSET)) {
- $charset = $_CONF['default_charset'];
- if (empty ($charset)) {
- $charset = "iso-8859-1";
- }
- }
- else {
+ $charset= $_CONF['mail_locale'];
+ if (empty ($charset)) {
$charset = $LANG_CHARSET;
}
- mail($A["email"]
+ if (empty ($charset)) {
+ $charset = $_CONF['default_charset'];
+ if (empty ($charset)) {
+ $charset = "iso-8859-1";
+ }
+ };
+ mb_send_mail($A["email"]
,"{$_CONF["site_name"]}: {$LANG04[16]}"
,$mailtext
,"From: {$_CONF["site_name"]} <{$_CONF["site_mail"]}>\r\nReturn-Path: <{$_CONF["site_mail"]}>\r\nX-Mailer: GeekLog " . VERSION . "\r\nContent-Type: text/plain; charset={$charset}"