applied some bug fixes

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@10 1ca29b6e-896d-4ea0-84a5-967f57386b96

diff --git a/utf8/action.php b/utf8/action.php
index f18729a..f027ae3 100755 (executable)
--- a/utf8/action.php
+++ b/utf8/action.php
@@ -112,9 +112,9 @@ function sendMessage() {
 \r
        $title = _MMAIL_TITLE . ' ' . $fromName;\r
 //     mail($tomem->getEmail(), $title, $message, 'From: '. $fromMail);\r
-               mb_language('ja');\r
-               mb_internal_encoding(_CHARSET);\r
-               @mb_send_mail($tomem->getEmail(), $title, $message, "From: ". $fromMail);\r
+       mb_language('ja');\r
+       mb_internal_encoding(_CHARSET);\r
+       @mb_send_mail($tomem->getEmail(), $title, $message, "From: ". $fromMail);\r
 \r
        if (postVar('url')) {\r
                        redirect(postVar('url'));\r
@@ -174,6 +174,7 @@ function createAccount() {
        if (postVar('desturl')) {\r
                redirect(postVar('desturl'));\r
        } else {\r
+               header ("Content-Type: text/html; charset="._CHARSET);\r
                echo _MSG_ACCOUNTCREATED;\r
        }\r
 }\r
@@ -198,6 +199,7 @@ function forgotPassword() {
        if (postVar('url')) {\r
                redirect(postVar('url'));\r
        } else {\r
+               header ("Content-Type: text/html; charset="._CHARSET);\r
                echo _MSG_PASSWORDSENT;\r
        }\r
 }\r

diff --git a/utf8/nucleus/documentation/help.html b/utf8/nucleus/documentation/help.html
index 34f9ddb..d2904de 100755 (executable)
--- a/utf8/nucleus/documentation/help.html
+++ b/utf8/nucleus/documentation/help.html
@@ -67,7 +67,7 @@
                        border: 3px solid red;\r
                        padding: 5px;\r
                        font-size: medium;\r
-               }\r
+       }\r
 \r
                tt, code {\r
                        font-size: small;\r
@@ -2991,13 +2991,13 @@ $GATEWAY_INTERFACE, $SERVER_NAME, $SERVER_SOFTWARE
        <td><a href="#templatevar-date">date</a></td>\r
        <td>フォーマット済みの日付</td>\r
 </tr><tr>\r
-       <td><a href="#templatevar-time">time</td>\r
+       <td><a href="#templatevar-time">time</a></td>\r
        <td>フォーマット済みの時刻</td>\r
 </tr><tr>\r
        <td>daylink</td>\r
        <td>その日のアーカイブへの未加工のリンク</td>\r
 </tr><tr>\r
-       <td><a href="#templatevar-comments">comments</td>\r
+       <td><a href="#templatevar-comments">comments</a></td>\r
        <td>コメント・ブロックかコメント数</td>\r
 </tr><tr>\r
        <td>itemid</td>\r
@@ -3289,16 +3289,16 @@ $GATEWAY_INTERFACE, $SERVER_NAME, $SERVER_SOFTWARE
        <th>部分名</th><th colspan="2">空っぽか否か？</th>\r
 </tr><tr>\r
        <td>本文</td><td>いいえ</td><td>いいえ</td>\r
-</tr></tr>\r
+</tr><tr>\r
        <td>続き</td><td>はい</td><td>いいえ</td>\r
-</tr></tr>\r
+</tr><tr>\r
        <th>smartbodyの表示＝</th><th>「本文部分」</th><th>「続き部分」</th>\r
 </tr></table>\r
 \r
 <h2>使用例</h2>\r
 \r
 <p>本文のテキストが完全なテキストと判断され、続きの部分はフロントページに表示される「紹介」や「抜粋」と判断されます。</p>\r
-<p>フロントページで使われているテンプレートには<tt>&lt;%smartbody%&gt;</tt>を使い、抜粋が存在するときにはそれを、無い場合は完全なテキストを挿入します。アイテムの詳細テンプレートには、<tt>&lt;%body%&gt;</tt> + <tt>&lt;%more%&gt;</tt>のかわりに<tt>&lt;%body%&gt;</tt>を使います。<tt>&lt%body%&gt;</tt>は少なくとも完全なアイテムが入っているのですから。</p>\r
+<p>フロントページで使われているテンプレートには<tt>&lt;%smartbody%&gt;</tt>を使い、抜粋が存在するときにはそれを、無い場合は完全なテキストを挿入します。アイテムの詳細テンプレートには、<tt>&lt;%body%&gt;</tt> + <tt>&lt;%more%&gt;</tt>のかわりに<tt>&lt;%body%&gt;</tt>を使います。<tt>&lt;%body%&gt;</tt>は少なくとも完全なアイテムが入っているのですから。</p>\r
 \r
 \r
 \r
@@ -3688,4 +3688,4 @@ $GATEWAY_INTERFACE, $SERVER_NAME, $SERVER_SOFTWARE
 </div>\r
 \r
 </body>\r
-</html>
\ No newline at end of file
+</html>\r

diff --git a/utf8/nucleus/forgotpassword.html b/utf8/nucleus/forgotpassword.html
index 00e441c..b152f23 100755 (executable)
--- a/utf8/nucleus/forgotpassword.html
+++ b/utf8/nucleus/forgotpassword.html
@@ -18,7 +18,7 @@
                        <h2>パスワードを忘れましたか？</h2>\r
 \r
                        <p>\r
-                       以ä¸\8bã\81«ã\83¦ã\83¼ã\82¶ã\83¼å\90\8dã\81¨ã\83¡ã\83¼ã\83«ã\82¢ã\83\89ã\83¬ã\82¹ã\82\92å\85¥å\8a\9bã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84ã\80\82æ\96°ã\81\97ã\81\84ã\83\91ã\82¹ã\83¯ã\83¼ã\83\89ã\82\92é\81¸æ\8a\9eã\81\99ã\82\8bã\83\9aã\83¼ã\82¸ã\81¸ã\81®ã\83ªã\83³ã\82¯ã\81®å\85¥ã\81£ã\81\9fã\83¡ã\83¼ã\83«ã\81\8c送信されます。\r
+                       以ä¸\8bã\81«ã\83¦ã\83¼ã\82¶ã\83¼å\90\8dã\81¨ã\83¡ã\83¼ã\83«ã\82¢ã\83\89ã\83¬ã\82¹ã\82\92å\85¥å\8a\9bã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84ã\80\82æ\96°ã\81\97ã\81\84ã\83\91ã\82¹ã\83¯ã\83¼ã\83\89ã\81\8cã\83¡ã\83¼ã\83«ã\81§送信されます。\r
                        </p>\r
 \r
                        <form method="post" action="../action.php"><p>\r
@@ -47,4 +47,4 @@
                </div><!-- content -->\r
 \r
 </body>\r
-</html>
\ No newline at end of file
+</html>\r

diff --git a/utf8/nucleus/language/japanese-utf8.php b/utf8/nucleus/language/japanese-utf8.php
index 83b2f4f..5844e15 100755 (executable)
--- a/utf8/nucleus/language/japanese-utf8.php
+++ b/utf8/nucleus/language/japanese-utf8.php
@@ -608,8 +608,8 @@ define('_UPLOAD_MSG',                               'アップロードするファイルを選択して、
 define('_UPLOAD_BUTTON',                       'アップロード');\r
 \r
 // some status messages\r
-//define('_MSG_ACCOUNTCREATED',                'アカウントが作成されました。パスワードがメールで送信されます');\r
-//define('_MSG_PASSWORDSENT',                  'パスワードがメールで送信されました。');\r
+define('_MSG_ACCOUNTCREATED',          'アカウントが作成されました。パスワードがメールで送信されます');\r
+define('_MSG_PASSWORDSENT',                    'パスワードがメールで送信されました。');\r
 define('_MSG_LOGINAGAIN',                      'あなたの情報が変更された為、ログインしなおす必要があります');\r
 define('_MSG_SETTINGSCHANGED',         '設定が変更されました');\r
 define('_MSG_ADMINCHANGED',                    '管理者権限 が変更されました');\r

diff --git a/utf8/nucleus/libs/ADMIN.php b/utf8/nucleus/libs/ADMIN.php
index f9892e5..dbeef1a 100755 (executable)
--- a/utf8/nucleus/libs/ADMIN.php
+++ b/utf8/nucleus/libs/ADMIN.php
@@ -5750,10 +5750,13 @@ function listplug_table_teamlist($template, $type) {
        }\r
 }\r
 function encode_desc(&$data)\r
-    {   $to_entities = get_html_translation_table(HTML_ENTITIES);\r
+    {   //_$to_entities = get_html_translation_table(HTML_ENTITIES);\r
+        $to_entities = get_html_translation_table(HTML_SPECIALCHARS);\r
         $from_entities = array_flip($to_entities);\r
+        $data = str_replace('<br />','\n',$data); //hack\r
         $data = strtr($data,$from_entities);\r
         $data = strtr($data,$to_entities);\r
+        $data = str_replace('\n','<br />',$data); //hack\r
         return $data;\r
     }\r
 function listplug_table_pluginlist($template, $type) {\r

diff --git a/utf8/nucleus/libs/COMMENTS.php b/utf8/nucleus/libs/COMMENTS.php
index e73736c..1336731 100755 (executable)
--- a/utf8/nucleus/libs/COMMENTS.php
+++ b/utf8/nucleus/libs/COMMENTS.php
@@ -381,8 +381,13 @@ class COMMENTACTIONS extends BaseActions {
                        echo $this->currentComment['user'];\r
        }\r
        function parse_short() {\r
-               $tmp = strtok($this->currentComment['body'],"\n");\r
-               $tmp = str_replace('<br />','',$tmp);\r
+//             $tmp = strtok($this->currentComment['body'],"\n");\r
+//             $tmp = str_replace('<br />','',$tmp);\r
+               $tmp = strip_tags($this->currentComment['body']);\r
+               $tmp = mb_strimwidth($tmp, 0, 60, "...", "UTF-8");\r
+               $tmp = str_replace("\r\n", "\r", $tmp);\r
+               $tmp = str_replace("\r", "\n", $tmp);\r
+               $tmp = str_replace("\n",'&para;',$tmp);\r
                echo $tmp;\r
                if ($tmp != $this->currentComment['body'])\r
                        $this->parser->parse($this->template['COMMENTS_CONTINUED']); \r

diff --git a/utf8/nucleus/libs/MEMBER.php b/utf8/nucleus/libs/MEMBER.php
index 9f08ba9..73abc9a 100755 (executable)
--- a/utf8/nucleus/libs/MEMBER.php
+++ b/utf8/nucleus/libs/MEMBER.php
@@ -158,7 +158,7 @@ class MEMBER {
          */\r
        function canAlterComment($commentid) {\r
                if ($this->isAdmin()) return 1;\r
-       \r
+\r
                $query =  'SELECT citem as itemid, iblog as blogid, cmember as cauthor, iauthor'\r
                       . ' FROM '.sql_table('comment') .', '.sql_table('item').', '.sql_table('blog')\r
                       . ' WHERE citem=inumber and iblog=bnumber and cnumber=' . intval($commentid);\r
@@ -300,13 +300,16 @@ class MEMBER {
          */\r
        function sendPassword($password) {\r
                global $CONF;\r
-               \r
-               $message = "Someone, possibly you, requested a new password for your account at '" . $CONF['SiteName'] . "' (". $CONF['IndexURL']. ") to be sent out to you.\n Here is your new login information: \n\n";\r
+\r
+               $message = "誰か（おそらくはあなた）が'" . $CONF['SiteName'] . "' (". $CONF['IndexURL']. ") \nにおけるアカウントと新規パスワードの送信を要求しました。\nあなたの新規ログイン情報は以下のとおりです。: \n\n";\r
                $message .= "\tLogin: " . $this->getDisplayName();\r
                $message .= "\n\tPassword: " . $password; \r
                $message .= getMailFooter();\r
-               \r
-               @mail($this->getEmail(),'Your password',$message,"From: " . $CONF['AdminEmail']);\r
+\r
+               $title = 'パスワード情報';\r
+               mb_language('ja');\r
+               mb_internal_encoding(_CHARSET);\r
+               @mb_send_mail($this->getEmail(), $title, $message, "From: ". $CONF['AdminEmail']);\r
                \r
                ACTIONLOG::add(INFO, _ACTIONLOG_PWDREMINDERSENT . $this->getDisplayName());\r
        }\r
@@ -480,7 +483,7 @@ class MEMBER {
                $r = sql_query('select * FROM '.sql_table('member')." WHERE mnumber='".intval($id)."'");\r
                return (mysql_num_rows($r) != 0);\r
        }\r
-       \r
+\r
        // checks if a username is protected. If so, it can not be used on anonymous comments\r
        function isNameProtected($name) {\r
                \r

diff --git a/utf8/nucleus/libs/SEARCH.php b/utf8/nucleus/libs/SEARCH.php
index 33f72db..329715b 100755 (executable)
--- a/utf8/nucleus/libs/SEARCH.php
+++ b/utf8/nucleus/libs/SEARCH.php
@@ -222,6 +222,11 @@ class SEARCH {
        $result=str_replace(' ,',',',$result);\r
        $result=str_replace('- ','-',$result);\r
        $result=str_replace('+','',$result);\r
+\r
+       // remove double spaces (we might have introduced some new ones above)\r
+       $result=trim($result);\r
+       $result=preg_replace("/([[:space:]]{2,})/",' ',$result);\r
+\r
        // apply arbitrary function to all 'word' atoms\r
 \r
         $result_a = explode(" ",$result);\r
@@ -267,4 +272,4 @@ class SEARCH {
 */\r
 \r
 }\r
-?>
\ No newline at end of file
+?>\r

diff --git a/utf8/nucleus/libs/SKIN.php b/utf8/nucleus/libs/SKIN.php
index cbe9009..ab6ab19 100755 (executable)
--- a/utf8/nucleus/libs/SKIN.php
+++ b/utf8/nucleus/libs/SKIN.php
@@ -440,12 +440,9 @@ class ACTIONS extends BaseActions {
                                $condition = ($blog && $blog->isValidCategory($catid));\r
                                break;\r
                        case 'blogsetting':\r
-                               $condition = ($blog && $blog->isValidCategory($catid));\r
-                               break;\r
-                       case 'blogsetting':\r
                                if ($name == 'trackback' && $manager->pluginInstalled('NP_TrackBack')) {\r
                                        $plugin =& $manager->getPlugin('NP_TrackBack');\r
-                                       if ($plugin != NULL){\r
+                                       if ($plugin != NULL && $blog){\r
                                                $bid = $blog->getID();\r
                                                if ($value === '1') $value = 'yes';\r
                                                if ($value === '0') $value = 'no';\r

diff --git a/utf8/nucleus/libs/globalfunctions.php b/utf8/nucleus/libs/globalfunctions.php
index e879dd5..9fd88fa 100755 (executable)
--- a/utf8/nucleus/libs/globalfunctions.php
+++ b/utf8/nucleus/libs/globalfunctions.php
@@ -350,7 +350,7 @@ function sendContentType($contenttype, $pagetype = '', $charset = _CHARSET) {
 function startUpError($msg, $title) {\r
        ?>\r
        <html xmlns="http://www.w3.org/1999/xhtml">\r
-               <head><title><?php echo htmlspecialchars($title)?></title></head>\r
+               <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title><?php echo htmlspecialchars($title)?></title></head>\r
                <body>\r
                        <h1><?php echo htmlspecialchars($title)?></h1>\r
                        <?php echo $msg?>\r
@@ -577,13 +577,13 @@ function selector() {
 \r
                sscanf($archive,'%d-%d-%d',$y,$m,$d);\r
                if ($d != 0) {\r
-                       $archivetype = _ARCHIVETYPE_DAY;        // TODO: move to language file\r
+                       $archivetype = _ARCHIVETYPE_DAY;\r
                        $t = mktime(0,0,0,$m,$d,$y);\r
                        $archiveprev = strftime('%Y-%m-%d',$t - (24*60*60));\r
                        $archivenext = strftime('%Y-%m-%d',$t + (24*60*60));\r
 \r
                } else {\r
-                       $archivetype = _ARCHIVETYPE_MONTH; // TODO: move to language file\r
+                       $archivetype = _ARCHIVETYPE_MONTH;\r
                        $t = mktime(0,0,0,$m,1,$y);\r
                        $archiveprev = strftime('%Y-%m',$t - (1*24*60*60));\r
                        $archivenext = strftime('%Y-%m',$t + (32*24*60*60));\r
@@ -604,7 +604,7 @@ function selector() {
                if(preg_match("/^(\xA1{2}|\xe3\x80{2}|\x20)+$/",$query)){\r
                                        $type = 'index';\r
                }\r
-               $order = (_CHARSET == 'euc-jp') ? 'EUC-JP, UTF-8,' : 'UTF-8, EUC-JP,';\r
+               $order = (_CHARSET == 'EUC-JP') ? 'EUC-JP, UTF-8,' : 'UTF-8, EUC-JP,';\r
                $query = mb_convert_encoding($query, _CHARSET, $order.' JIS, SJIS, ASCII');\r
                if (intval($blogid)==0)\r
                        $blogid = getBlogIDFromName($blogid);\r

diff --git a/utf8/nucleus/libs/vars4.0.6.php b/utf8/nucleus/libs/vars4.0.6.php
index 1924879..21a3bd4 100755 (executable)
--- a/utf8/nucleus/libs/vars4.0.6.php
+++ b/utf8/nucleus/libs/vars4.0.6.php
@@ -10,7 +10,7 @@
   * of the License, or (at your option) any later version.\r
   * (see nucleus/documentation/index.html#license for more info)\r
   *\r
-  * $Id: vars4.0.6.php,v 1.2 2005-03-04 08:09:34 kimitake Exp $\r
+  * $Id: vars4.0.6.php,v 1.3 2005-03-04 08:20:47 kimitake Exp $\r
   */\r
   \r
 /**\r

diff --git a/utf8/nucleus/libs/vars4.1.0.php b/utf8/nucleus/libs/vars4.1.0.php
index 71943a5..b15b3a2 100755 (executable)
--- a/utf8/nucleus/libs/vars4.1.0.php
+++ b/utf8/nucleus/libs/vars4.1.0.php
@@ -10,7 +10,7 @@
   * of the License, or (at your option) any later version.\r
   * (see nucleus/documentation/index.html#license for more info)\r
   *\r
-  * $Id: vars4.1.0.php,v 1.2 2005-03-04 08:09:34 kimitake Exp $\r
+  * $Id: vars4.1.0.php,v 1.3 2005-03-04 08:20:47 kimitake Exp $\r
   */\r
   \r
 function getVar($name) {\r

diff --git a/utf8/nucleus/libs/xmlrpc.inc.php b/utf8/nucleus/libs/xmlrpc.inc.php
index 1703ae4..01cf1aa 100755 (executable)
--- a/utf8/nucleus/libs/xmlrpc.inc.php
+++ b/utf8/nucleus/libs/xmlrpc.inc.php
@@ -1,7 +1,7 @@
 <?php                                  // -*-c++-*-\r
 // by Edd Dumbill (C) 1999-2001\r
 // <edd@usefulinc.com>\r
-// $Id: xmlrpc.inc.php,v 1.2 2005-03-04 08:09:34 kimitake Exp $\r
+// $Id: xmlrpc.inc.php,v 1.3 2005-03-04 08:20:47 kimitake Exp $\r
 \r
 /*\r
        Modifications made for use with Nucleus:\r

diff --git a/utf8/nucleus/libs/xmlrpcs.inc.php b/utf8/nucleus/libs/xmlrpcs.inc.php
index a80544f..6837bf4 100755 (executable)
--- a/utf8/nucleus/libs/xmlrpcs.inc.php
+++ b/utf8/nucleus/libs/xmlrpcs.inc.php
@@ -1,7 +1,7 @@
 <?php\r
 // by Edd Dumbill (C) 1999-2001\r
 // <edd@usefulinc.com>\r
-// $Id: xmlrpcs.inc.php,v 1.2 2005-03-04 08:09:34 kimitake Exp $\r
+// $Id: xmlrpcs.inc.php,v 1.3 2005-03-04 08:20:47 kimitake Exp $\r
 \r
 // Copyright (c) 1999,2000,2001 Edd Dumbill.\r
 // All rights reserved.\r

diff --git a/utf8/skins/atom/skinbackup.xml b/utf8/skins/atom/skinbackup.xml
index 76027c7..0f47dec 100755 (executable)
--- a/utf8/skins/atom/skinbackup.xml
+++ b/utf8/skins/atom/skinbackup.xml
@@ -1,4 +1,4 @@
-<nucleusskin><meta><skin name="feeds/atom" /><template name="feeds/atom/modified" /><template name="feeds/atom/entries" /><info><![CDATA[Atom 0.3 weblog syndication]]></info></meta><skin name="feeds/atom" type="application/atom+xml" includeMode="normal" includePrefix=""><description>Atom 0.3 weblog syndication</description><part name="index"><![CDATA[<?xml version="1.0" encoding="utf-8"?>\r
+<nucleusskin><meta><skin name="feeds/atom" /><template name="feeds/atom/modified" /><template name="feeds/atom/entries" /><info><![CDATA[Atom 0.3 weblog syndication]]></info></meta><skin name="feeds/atom" type="application/atom+xml" includeMode="normal" includePrefix=""><description>Atom 0.3 weblog syndication</description><part name="index"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>\r
 <feed version="0.3" xmlns="http://purl.org/atom/ns#">\r
     <title><%blogsetting(name)%></title>\r
     <link rel="alternate" type="text/html" href="<%blogsetting(url)%>" />\r
@@ -15,4 +15,4 @@
  <issued><%date(iso8601)%></issued>\r
  <content type="text/html" mode="escaped"><![CDATA[<%body%><%more%>]]></content>\r
  <id><%blogurl%>:<%blogid%>:<%itemid%></id>\r
-</entry>]]></part></template></nucleusskin>
\ No newline at end of file
+</entry>]]></part></template></nucleusskin>\r

diff --git a/utf8/skins/grey/skinbackup.xml b/utf8/skins/grey/skinbackup.xml
index ee7971f..e6edfa0 100755 (executable)
--- a/utf8/skins/grey/skinbackup.xml
+++ b/utf8/skins/grey/skinbackup.xml
@@ -702,4 +702,4 @@
 \r
 </template>\r
 \r
-</nucleusskin>
\ No newline at end of file
+</nucleusskin>\r