merged 3.15rc3 modification

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

diff --git a/euc/atom.php b/euc/atom.php
index 7d569b2..3c83016 100755 (executable)
--- a/euc/atom.php
+++ b/euc/atom.php
@@ -38,6 +38,8 @@ if (!$CONF['DisableSite']) {
                header("HTTP/1.0 304 Not Modified");\r
                header('Content-Length: 0');\r
        } else {\r
+               $feed = mb_convert_encoding($feed, "UTF-8", "EUC-JP");\r
+               header("Content-Type: application/xml");\r
                // dump feed\r
                echo $feed;\r
        }\r

diff --git a/euc/install.sql b/euc/install.sql
index 4f7b695..1996f74 100755 (executable)
--- a/euc/install.sql
+++ b/euc/install.sql
@@ -187,9 +187,9 @@ CREATE TABLE `nucleus_skin` (
   PRIMARY KEY  (`sdesc`,`stype`)\r
 ) TYPE=MyISAM;\r
 \r
-INSERT INTO `nucleus_skin` VALUES (2, 'index', '<?xml version="1.0" encoding="euc-jp"?>\r\n<feed version="0.3" xmlns="http://purl.org/atom/ns#">\r\n    <title><%blogsetting(name)%></title>\r\n    <link rel="alternate" type="text/html" href="<%blogsetting(url)%>" />\r\n    <generator url="http://nucleuscms.org/"><%version%></generator>\r\n    <modified><%blog(feeds/atom/modified,1)%></modified>\r\n    <%blog(feeds/atom/entries,10)%>\r\n</feed>');\r
+INSERT INTO `nucleus_skin` VALUES (2, 'index', '<?xml version="1.0" encoding="UTF-8"?>\r\n<feed version="0.3" xmlns="http://purl.org/atom/ns#">\r\n    <title><%blogsetting(name)%></title>\r\n    <link rel="alternate" type="text/html" href="<%blogsetting(url)%>" />\r\n    <generator url="http://nucleuscms.org/"><%version%></generator>\r\n    <modified><%blog(feeds/atom/modified,1)%></modified>\r\n    <%blog(feeds/atom/entries,10)%>\r\n</feed>');\r
 INSERT INTO `nucleus_skin` VALUES (4, 'index', '<?xml version="1.0"?>\r\n<rsd version="1.0">\r\n <service>\r\n  <engineName><%version%></engineName>\r\n  <engineLink>http://nucleuscms.org/</engineLink>\r\n  <homepageLink><%sitevar(url)%></homepageLink>\r\n  <apis>\r\n   <api name="MetaWeblog" preferred="true" apiLink="<%adminurl%>xmlrpc/server.php" blogID="<%blogsetting(id)%>">\r\n    <docs>http://nucleuscms.org/documentation/devdocs/xmlrpc.html</docs>\r\n   </api>\r\n   <api name="Blogger" preferred="false" apiLink="<%adminurl%>xmlrpc/server.php" blogID="<%blogsetting(id)%>">\r\n    <docs>http://nucleuscms.org/documentation/devdocs/xmlrpc.html</docs>\r\n   </api>\r\n  </apis>\r\n </service>\r\n</rsd>');\r
-INSERT INTO `nucleus_skin` VALUES (3, 'index', '<?xml version="1.0" encoding="euc-jp"?>\r\n<rss version="2.0">\r\n  <channel>\r\n    <title><%blogsetting(name)%></title>\r\n    <link><%blogsetting(url)%></link>\r\n    <description><%blogsetting(desc)%></description>\r\n    <!-- optional tags -->\r\n    <language>ja</language>           <!-- valid langugae goes here -->\r\n    <generator><%version%></generator>\r\n    <copyright>&#169;</copyright>             <!-- Copyright notice -->\r\n    <category>Weblog</category>\r\n    <docs>http://backend.userland.com/rss</docs>\r\n    <image>\r\n      <url><%adminurl%>nucleus2.gif</url>\r\n      <title><%blogsetting(name)%></title>\r\n      <link><%blogsetting(url)%></link>\r\n    </image>\r\n    <%blog(feeds/rss20,10)%>\r\n  </channel>\r\n</rss>');\r
+INSERT INTO `nucleus_skin` VALUES (3, 'index', '<?xml version="1.0" encoding="UTF-8"?>\r\n<rss version="2.0">\r\n  <channel>\r\n    <title><%blogsetting(name)%></title>\r\n    <link><%blogsetting(url)%></link>\r\n    <description><%blogsetting(desc)%></description>\r\n    <!-- optional tags -->\r\n    <language>ja</language>           <!-- valid langugae goes here -->\r\n    <generator><%version%></generator>\r\n    <copyright>&#169;</copyright>             <!-- Copyright notice -->\r\n    <category>Weblog</category>\r\n    <docs>http://backend.userland.com/rss</docs>\r\n    <image>\r\n      <url><%adminurl%>nucleus2.gif</url>\r\n      <title><%blogsetting(name)%></title>\r\n      <link><%blogsetting(url)%></link>\r\n    </image>\r\n    <%blog(feeds/rss20,10)%>\r\n  </channel>\r\n</rss>');\r
 INSERT INTO `nucleus_skin` VALUES (1, 'item', '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">\n\n<html>\n<head>\n  <meta http-equiv="Content-Type" content="text/html; charset=EUC-JP" />\n  <title><%itemtitle%> - <%blogsetting(name)%></title>\n\n  <!-- some meta information (search engines might read this) -->\n  <meta name="generator" content="<%version%>" />\n  <meta name="description" content="<%blogsetting(desc)%>" />\n\n  <!-- stylesheet definition (points to the place where colors -->\n  <!-- and layout is defined -->\n  <link rel="stylesheet" type="text/css" href="<%skinfile(grey.css)%>" />\n\n  <!-- prevent caching (can be removed) -->\n  <meta http-equiv="Pragma" content="no-cache" />\n  <meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />\n  <meta http-equiv="Expires" content="-1" />\n  \n  <!-- extra navigational links -->\n  <link rel="bookmark" title="Nucleus" href="http://nucleuscms.org/" />\n  <link rel="alternate" type="application/xml+rss" title="RSS" href="xml-rss2.php" />\n  <link rel="archives" title="Archives" href="<%archivelink%>" />\n  <link rel="top" title="Today" href="<%sitevar(url)%>" />\n  <link rel="next" href="<%nextlink%>" title="Next Item" />\n  <link rel="prev" href="<%prevlink%>" title="Previous Item" />\n  <link rel="up" href="<%todaylink%>" title="Today" />\n\n</head>\n<body>\n\n<!-- here starts the code that will be displayed in your browser -->\n<div class="contents">\n\n <!-- page title -->\n <h1><%blogsetting(name)%></h1>\n\n <!-- this is a normally hidden link, included for accessibility reasons -->\n <a href="#navigation" class="skip">Jump to navigation</a>\n\n <!-- inserts the selected item using the template named ''grey/full''     -->\n <%item(grey/full)%>\n\n <!-- this tag inserts the comments on the selected item, also using the -->\n <!-- template with name ''grey/full''                                     -->\n <h2>Comments</h2>\n <%comments(grey/full)%>\n\n <h2>Add Comments</h2>\n <%commentform%>\n\n</div><!-- end of the contents div -->\n\n<!-- definition of the logo left-top -->\n<div class="logo">\n <a href="<%sitevar(url)%>"><img src="<%skinfile(atom3.gif)%>" width="155" height="137" alt="" /></a>\n</div>\n\n<!-- definition of the menu -->\n<div class="menu">\n\n <!-- accessibility anchor -->\n <a name="navigation" id="navigation" class="skip"></a>\n <h1 class="skip">Navigation</h1>\n\n <h2>Navigation</h2>\n <ul class="nobullets">\n  <li><a href="<%nextlink%>">Previous Item</a></li>\n  <li><a href="<%prevlink%>">Next Item</a></li>\n  <li><a href="<%todaylink%>">Today</a></li>\n  <li><a href="<%archivelink%>">Archives</a></li>\n  <li><a href="<%adminurl%>">Admin Area</a></li>\n </ul>\n\n <h2>Categories</h2>\n <%categorylist(grey/short)%>\n\n <h2>Search</h2>\n <%searchform%>\n \n <h2>Login</h2>\n <%loginform%>\n\n <h2>Powered by</h2>\n <%nucleusbutton(nucleus.gif,85,31)%>\n\n</div>\n\n</body>\n</html>');\r
 INSERT INTO `nucleus_skin` VALUES (1, 'member', '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">\n\n<html>\n<head>\n  <meta http-equiv="Content-Type" content="text/html; charset=EUC-JP" />\n  <title><%sitevar(name)%></title>\n\n  <!-- some meta information (search engines might read this) -->\n  <meta name="generator" content="<%version%>" />\n\n  <!-- stylesheet definition (points to the place where colors -->\n  <!-- and layout is defined -->\n  <link rel="stylesheet" type="text/css" href="<%skinfile(grey.css)%>" />\n\n  <!-- prevent caching (can be removed) -->\n  <meta http-equiv="Pragma" content="no-cache" />\n  <meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />\n  <meta http-equiv="Expires" content="-1" />\n  \n  <!-- extra navigational links -->\n  <link rel="bookmark" title="Nucleus" href="http://nucleuscms.org/" />\n  <link rel="top" title="Today" href="<%todaylink%>" />\n  <link rel="up" href="<%todaylink%>" title="Today" />\n\n</head>\n<body>\n\n<!-- here starts the code that will be displayed in your browser -->\n<div class="contents">\n\n <!-- this is a normally hidden link, included for accessibility reasons -->\n <a href="#navigation" class="skip">Jump to navigation</a>\n\n <!-- a title -->\n <h1><%sitevar(name)%></h1>\n\n <h2>Info about <%member(name)%></h2>\n\n <ul>\n  <li>Real name: <%member(realname)%></li>\n  <li>Website: <a href="<%member(url)%>"><%member(url)%></a></li>\n </ul>\n\n <h2>Send Message</h2>\n <%membermailform%>\n\n</div><!-- end of the contents div -->\n\n<!-- definition of the logo left-top -->\n<div class="logo">\n <a href="<%sitevar(url)%>"><img src="<%skinfile(atom3.gif)%>" width="155" height="137" alt="" /></a>\n</div>\n\n<!-- definition of the menu -->\n<div class="menu">\n <!-- accessibility anchor -->\n <a name="navigation" id="navigation" class="skip"></a>\n <h1 class="skip">Navigation</h1>\n\n <h2>Navigation</h2>\n\n <ul class="nobullets">\n  <li><a href="<%todaylink%>">Today</a></li>\n  <li><a href="<%adminurl%>">Admin Area</a></li>\n </ul>\n \n <h2>Login</h2>\n <%loginform%>\n\n <h2>Powered by</h2>\n <%nucleusbutton(nucleus.gif,85,31)%>\n\n</div>\n\n</body>\n</html>');\r
 INSERT INTO `nucleus_skin` VALUES (1, 'search', '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">\n\n<html>\n<head>\n  <meta http-equiv="Content-Type" content="text/html; charset=EUC-JP" />\n  <title><%blogsetting(name)%></title>\n\n  <!-- some meta information (search engines might read this) -->\n  <meta name="generator" content="<%version%>" />\n  <meta name="description" content="<%blogsetting(desc)%>" />\n\n  <!-- stylesheet definition (points to the place where colors -->\n  <!-- and layout is defined -->\n  <link rel="stylesheet" type="text/css" href="<%skinfile(grey.css)%>" />\n  \n  <!-- prevent caching (can be removed) -->\n  <meta http-equiv="Pragma" content="no-cache" />\n  <meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />\n  <meta http-equiv="Expires" content="-1" />\n  \n  <!-- extra navigational links -->\n  <link rel="bookmark" title="Nucleus" href="http://nucleuscms.org/" />\n  <link rel="alternate" type="application/xml+rss" title="RSS" href="xml-rss2.php" />\n  <link rel="archives" title="Archives" href="<%archivelink%>" />\n  <link rel="top" title="Today" href="<%sitevar(url)%>" />\n  <link rel="up" href="<%todaylink%>" title="Today" />\n\n</head>\n<body>\n\n<!-- here starts the code that will be displayed in your browser -->\n<div class="contents">\n\n <!-- this is a normally hidden link, included for accessibility reasons -->\n <a href="#navigation" class="skip">Jump to navigation</a>\n\n <!-- a title -->\n <h1><%blogsetting(name)%></h1>\n\n <h2>Search</h2>\n <%searchform%>\n\n <h2>Search results</h2>\n <%searchresults(grey/short)%>\n\n</div><!-- end of the contents div -->\n\n<!-- definition of the logo left-top -->\n<div class="logo">\n <a href="<%sitevar(url)%>"><img src="<%skinfile(atom3.gif)%>" width="155" height="137" alt="" /></a>\n</div>\n\n<!-- definition of the menu -->\n<div class="menu">\n <!-- accessibility anchor -->\n <a name="navigation" id="navigation" class="skip"></a>\n <h1 class="skip">Navigation</h1>\n\n <h2>Navigation</h2>\n\n <ul class="nobullets">\n   <li><a href="<%todaylink%>">Today</a></li>\n   <li><a href="<%archivelink%>">Archives</a></li>\n   <li><a href="<%adminurl%>">Admin Area</a></li>\n </ul>\n\n <h2>Search</h2>\n <%searchform%>\n \n <h2>Login</h2>\n <%loginform%>\n\n <h2>Powered by</h2>\n <%nucleusbutton(nucleus.gif,85,31)%>\n\n</div>\n\n</body>\n</html>');\r

diff --git a/euc/nucleus/libs/include/admin-add.template b/euc/nucleus/libs/include/admin-add.template
index 146bc2d..4e6bcc8 100755 (executable)
--- a/euc/nucleus/libs/include/admin-add.template
+++ b/euc/nucleus/libs/include/admin-add.template
@@ -66,14 +66,14 @@
                        <input name="actiontype" value="addfuture" type="radio" id="act_future" tabindex="61" /><label for="act_future" ><%text(_ADD_ADDLATER)%></label> <%helplink(future)%>\r
                        <div class="indent">\r
                                <%text(_ADD_PLACE_ON)%>\r
-                               <input id="inputmonth" name="month" tabindex="63" size="2" value="<%currenttime(mon)%>" />·î\r
-                               <input id="inputday" name="day" tabindex="64" size="2" value="<%currenttime(mday)%>" />Æü\r
-                               <input id="inputyear" name="year" tabindex="65" size="4" value="<%currenttime(year)%>" />ǯ\r
+                               <input id="inputyear" name="year" tabindex="63" size="4" value="<%currenttime(year)%>" />ǯ\r
+                               <input id="inputmonth" name="month" tabindex="64" size="2" value="<%currenttime(mon)%>" />·î\r
+                               <input id="inputday" name="day" tabindex="65" size="2" value="<%currenttime(mday)%>" />Æü\r
                                 \r
                                <input id="inputhour" name="hour" tabindex="66" size="2" value="<%currenttime(hours)%>" />»þ\r
                                <input id="inputminutes" name="minutes" tabindex="67" size="2" value="<%currenttime(minutes)%>" />ʬ\r
                                <br />\r
-                               ¥Õ¥©¡¼¥Þ¥Ã¥È¡§(mm)·î(dd)Æü(yyyy)ǯ (hh)»þ(mm)ʬ\r
+                               ¥Õ¥©¡¼¥Þ¥Ã¥È¡§(yyyy)ǯ(mm)·î(dd)Æü (hh)»þ(mm)ʬ\r
                                \r
                                <%ifblogsetting(ballowpast,0)%>\r
                                        <br />\r
@@ -104,4 +104,4 @@
 </table>\r
 \r
 </div>\r
-</form>        
\ No newline at end of file
+</form>        \r

diff --git a/euc/nucleus/libs/include/admin-edit.template b/euc/nucleus/libs/include/admin-edit.template
index f6d92ee..133da7b 100755 (executable)
--- a/euc/nucleus/libs/include/admin-edit.template
+++ b/euc/nucleus/libs/include/admin-edit.template
@@ -94,14 +94,14 @@
                <br />\r
                <input name="actiontype" value="changedate" type="radio" id="act_changedate" tabindex="70" /><label for="act_changedate"><%text(_ADD_CHANGEDATE)%></label> <%helplink(changedate)%>\r
                        <div class="indent">\r
-                               <input id="inputmonth" name="month" tabindex="71" size="2" value="<%itemtime(mon)%>" />·î\r
-                               <input id="inputday" name="day" tabindex="72" size="2" value="<%itemtime(mday)%>" />Æü\r
-                               <input id="inputyear" name="year" tabindex="73" size="4" value="<%itemtime(year)%>" />ǯ\r
+                               <input id="inputyear" name="year" tabindex="71" size="4" value="<%itemtime(year)%>" />ǯ\r
+                               <input id="inputmonth" name="month" tabindex="72" size="2" value="<%itemtime(mon)%>" />·î\r
+                               <input id="inputday" name="day" tabindex="73" size="2" value="<%itemtime(mday)%>" />Æü\r
                                 \r
                                <input id="inputhour" name="hour" tabindex="74" size="2" value="<%itemtime(hours)%>" />»þ\r
                                <input id="inputminutes" name="minutes" tabindex="75" size="2" value="<%itemtime(minutes)%>" />ʬ\r
                                <br />\r
-                               ¥Õ¥©¡¼¥Þ¥Ã¥È¡§(mm)·î(dd)Æü(yyyy)ǯ (hh)»þ(mm)ʬ\r
+                               ¥Õ¥©¡¼¥Þ¥Ã¥È¡§(yyyy)ǯ(mm)·î(dd)Æü (hh)»þ(mm)ʬ\r
                        </div>\r
        <%endif%>       \r
        <br />\r
@@ -129,4 +129,4 @@
 </tr></table>\r
 \r
 </div>\r
-</form>                
\ No newline at end of file
+</form>                \r

diff --git a/euc/nucleus/libs/include/bookmarklet-add.template b/euc/nucleus/libs/include/bookmarklet-add.template
index 2564b03..fabe03b 100755 (executable)
--- a/euc/nucleus/libs/include/bookmarklet-add.template
+++ b/euc/nucleus/libs/include/bookmarklet-add.template
@@ -100,13 +100,13 @@
                                        <input name="actiontype" value="addfuture" type="radio" id="act_future" /><label for="act_future"><%text(_ADD_ADDLATER)%></label> <%helplink(future)%>\r
                                        <div class="indent">\r
                                                <%text(_ADD_PLACE_ON)%>\r
+                                               <input id="inputyear" name="year" size="4" value="<%currenttime(year)%>" />ǯ\r
                                                <input id="inputmonth" name="month" size="2" value="<%currenttime(mon)%>" />·î\r
                                                <input id="inputday" name="day" size="2" value="<%currenttime(mday)%>" />Æü\r
-                                               <input id="inputyear" name="year" size="4" value="<%currenttime(year)%>" />ǯ\r
                                                <input id="inputhour" name="hour" size="2" value="<%currenttime(hours)%>" />»þ\r
                                                <input id="inputminutes" name="minutes" size="2" value="<%currenttime(minutes)%>" />ʬ\r
                                                <br />\r
-                                               ¥Õ¥©¡¼¥Þ¥Ã¥È¡§(mm)·î(dd)Æü(yyyy)ǯ (hh)»þ(mm)ʬ\r
+                                               ¥Õ¥©¡¼¥Þ¥Ã¥È¡§(yyyy)ǯ(mm)·î(dd)Æü (hh)»þ(mm)ʬ\r
                                                <%ifblogsetting(ballowpast,0)%>\r
                                                        <br />\r
                                                        <%text(_ADD_NOPASTDATES)%>\r

diff --git a/euc/nucleus/libs/include/bookmarklet-edit.template b/euc/nucleus/libs/include/bookmarklet-edit.template
index a4c9945..a09e3b2 100755 (executable)
--- a/euc/nucleus/libs/include/bookmarklet-edit.template
+++ b/euc/nucleus/libs/include/bookmarklet-edit.template
@@ -101,13 +101,13 @@
                                                <li>\r
                                                        <input name="actiontype" value="changedate" type="radio" id="act_changedate" tabindex="70" /><label for="act_changedate"><%text(_BMLET_CHANGEDATE)%></label> <%helplink(changedate)%>\r
                                                                        <div class="indent">\r
-                                                                               <input id="inputmonth" name="month" tabindex="71" size="2" value="<%itemtime(mon)%>" />·î\r
-                                                                               <input id="inputday" name="day" tabindex="72" size="2" value="<%itemtime(mday)%>" />Æü\r
-                                                                               <input id="inputyear" name="year" tabindex="73" size="4" value="<%itemtime(year)%>" />ǯ\r
+                                                                               <input id="inputyear" name="year" tabindex="71" size="4" value="<%itemtime(year)%>" />ǯ\r
+                                                                               <input id="inputmonth" name="month" tabindex="72" size="2" value="<%itemtime(mon)%>" />·î\r
+                                                                               <input id="inputday" name="day" tabindex="73" size="2" value="<%itemtime(mday)%>" />Æü\r
                                                                                <input id="inputhour" name="hour" tabindex="74" size="2" value="<%itemtime(hours)%>" />»þ\r
                                                                                <input id="inputminutes" name="minutes" tabindex="75" size="2" value="<%itemtime(minutes)%>" />ʬ\r
                                                                                <br />\r
-                                                                               ¥Õ¥©¡¼¥Þ¥Ã¥È¡§(mm)·î(dd)Æü(yyyy)ǯ (hh)»þ(mm)ʬ\r
+                                                                               ¥Õ¥©¡¼¥Þ¥Ã¥È¡§(yyyy)ǯ(mm)·î(dd)Æü (hh)»þ(mm)ʬ\r
                                                                        </div>\r
                                                        </li>\r
                                        <%endif%>                                               \r

diff --git a/euc/xml-rss2.php b/euc/xml-rss2.php
index 5af9419..505220d 100755 (executable)
--- a/euc/xml-rss2.php
+++ b/euc/xml-rss2.php
@@ -38,6 +38,8 @@ if (!$CONF['DisableSite']) {
                header("HTTP/1.0 304 Not Modified");\r
                header('Content-Length: 0');\r
        } else {\r
+               $feed = mb_convert_encoding($feed, "UTF-8", "EUC-JP");\r
+               header("Content-Type: application/xml");\r
                // dump feed\r
                echo $feed;\r
        }\r

diff --git a/utf8/atom.php b/utf8/atom.php
index 1dbe816..cd9c0d3 100755 (executable)
--- a/utf8/atom.php
+++ b/utf8/atom.php
@@ -38,6 +38,7 @@ if (!$CONF['DisableSite']) {
                header("HTTP/1.0 304 Not Modified");\r
                header('Content-Length: 0');\r
        } else {\r
+               header("Content-Type: application/xml");\r
                // dump feed\r
                echo $feed;\r
        }\r

diff --git a/utf8/nucleus/libs/include/admin-add.template b/utf8/nucleus/libs/include/admin-add.template
index 5e92845..9e7e996 100755 (executable)
--- a/utf8/nucleus/libs/include/admin-add.template
+++ b/utf8/nucleus/libs/include/admin-add.template
@@ -68,14 +68,14 @@
                        <input name="actiontype" value="addfuture" type="radio" id="act_future" tabindex="61" /><label for="act_future" ><%text(_ADD_ADDLATER)%></label> <%helplink(future)%>\r
                        <div class="indent">\r
                                <%text(_ADD_PLACE_ON)%>\r
-                               <input id="inputmonth" name="month" tabindex="63" size="2" value="<%currenttime(mon)%>" />月\r
-                               <input id="inputday" name="day" tabindex="64" size="2" value="<%currenttime(mday)%>" />日\r
-                               <input id="inputyear" name="year" tabindex="65" size="4" value="<%currenttime(year)%>" />年\r
+                               <input id="inputyear" name="year" tabindex="63" size="4" value="<%currenttime(year)%>" />年\r
+                               <input id="inputmonth" name="month" tabindex="64" size="2" value="<%currenttime(mon)%>" />æ\9c\r
+                               <input id="inputday" name="day" tabindex="65" size="2" value="<%currenttime(mday)%>" />日\r
                                 \r
-                               <input id="inputhour" name="hour" tabindex="66" size="2" value="<%currenttime(hours)%>" />æ\99\82\r
-                               <input id="inputminutes" name="minutes" tabindex="67" size="2" value="<%currenttime(minutes)%>" />å\88\86\r
+                               <input id="inputhour" name="hour" tabindex="66" size="2" value="<%currenttime(hours)%>" />æ\99\r
+                               <input id="inputminutes" name="minutes" tabindex="67" size="2" value="<%currenttime(minutes)%>" />å\88\r
                                <br />\r
-                               ã\83\95ã\82©ã\83¼ã\83\9eã\83\83ã\83\88ï¼\9a(mm)æ\9c\88(dd)æ\97¥(yyyy)å¹´ (hh)æ\99\82(mm)å\88\86\r
+                               ã\83\95ã\82©ã\83¼ã\83\9eã\83\83ã\83\88ï¼\81Eyyyy)å¹´(mm)æ\9c\81Edd)æ\97¥ (hh)æ\99\81Emm)å\88\r
                                \r
                                <%ifblogsetting(ballowpast,0)%>\r
                                        <br />\r

diff --git a/utf8/nucleus/libs/include/admin-edit.template b/utf8/nucleus/libs/include/admin-edit.template
index 4ea6c9d..d5c269b 100755 (executable)
--- a/utf8/nucleus/libs/include/admin-edit.template
+++ b/utf8/nucleus/libs/include/admin-edit.template
@@ -96,14 +96,14 @@
                <br />\r
                <input name="actiontype" value="changedate" type="radio" id="act_changedate" tabindex="70" /><label for="act_changedate"><%text(_ADD_CHANGEDATE)%></label> <%helplink(changedate)%>\r
                        <div class="indent">\r
-                               <input id="inputmonth" name="month" tabindex="71" size="2" value="<%itemtime(mon)%>" />月\r
-                               <input id="inputday" name="day" tabindex="72" size="2" value="<%itemtime(mday)%>" />日\r
-                               <input id="inputyear" name="year" tabindex="73" size="4" value="<%itemtime(year)%>" />年\r
+                               <input id="inputyear" name="year" tabindex="71" size="4" value="<%itemtime(year)%>" />年\r
+                               <input id="inputmonth" name="month" tabindex="72" size="2" value="<%itemtime(mon)%>" />æ\9c\r
+                               <input id="inputday" name="day" tabindex="73" size="2" value="<%itemtime(mday)%>" />日\r
                                 \r
-                               <input id="inputhour" name="hour" tabindex="74" size="2" value="<%itemtime(hours)%>" />æ\99\82\r
-                               <input id="inputminutes" name="minutes" tabindex="75" size="2" value="<%itemtime(minutes)%>" />å\88\86\r
+                               <input id="inputhour" name="hour" tabindex="74" size="2" value="<%itemtime(hours)%>" />æ\99\r
+                               <input id="inputminutes" name="minutes" tabindex="75" size="2" value="<%itemtime(minutes)%>" />å\88\r
                                <br />\r
-                               ã\83\95ã\82©ã\83¼ã\83\9eã\83\83ã\83\88ï¼\9a(mm)æ\9c\88(dd)æ\97¥(yyyy)å¹´ (hh)æ\99\82(mm)å\88\86\r
+                               ã\83\95ã\82©ã\83¼ã\83\9eã\83\83ã\83\88ï¼\81Eyyyy)å¹´(mm)æ\9c\81Edd)æ\97¥ (hh)æ\99\81Emm)å\88\r
                        </div>\r
        <%endif%>       \r
        <br />\r

diff --git a/utf8/nucleus/libs/include/bookmarklet-add.template b/utf8/nucleus/libs/include/bookmarklet-add.template
index 123492b..7f455fc 100755 (executable)
--- a/utf8/nucleus/libs/include/bookmarklet-add.template
+++ b/utf8/nucleus/libs/include/bookmarklet-add.template
@@ -102,13 +102,13 @@
                                        <input name="actiontype" value="addfuture" type="radio" id="act_future" /><label for="act_future"><%text(_ADD_ADDLATER)%></label> <%helplink(future)%>\r
                                        <div class="indent">\r
                                                <%text(_ADD_PLACE_ON)%>\r
-                                               <input id="inputmonth" name="month" size="2" value="<%currenttime(mon)%>" />月\r
-                                               <input id="inputday" name="day" size="2" value="<%currenttime(mday)%>" />日\r
                                                <input id="inputyear" name="year" size="4" value="<%currenttime(year)%>" />年\r
-                                               <input id="inputhour" name="hour" size="2" value="<%currenttime(hours)%>" />時\r
-                                               <input id="inputminutes" name="minutes" size="2" value="<%currenttime(minutes)%>" />分\r
+                                               <input id="inputmonth" name="month" size="2" value="<%currenttime(mon)%>" />æ\9c\r
+                                               <input id="inputday" name="day" size="2" value="<%currenttime(mday)%>" />日\r
+                                               <input id="inputhour" name="hour" size="2" value="<%currenttime(hours)%>" />æ\99\r
+                                               <input id="inputminutes" name="minutes" size="2" value="<%currenttime(minutes)%>" />å\88\r
                                                <br />\r
-                                               ã\83\95ã\82©ã\83¼ã\83\9eã\83\83ã\83\88ï¼\9a(mm)æ\9c\88(dd)æ\97¥(yyyy)å¹´ (hh)æ\99\82(mm)å\88\86\r
+                                               ã\83\95ã\82©ã\83¼ã\83\9eã\83\83ã\83\88ï¼\81Eyyyy)å¹´(mm)æ\9c\81Edd)æ\97¥ (hh)æ\99\81Emm)å\88\r
                                                <%ifblogsetting(ballowpast,0)%>\r
                                                        <br />\r
                                                        <%text(_ADD_NOPASTDATES)%>\r

diff --git a/utf8/nucleus/libs/include/bookmarklet-edit.template b/utf8/nucleus/libs/include/bookmarklet-edit.template
index 640758e..2d1d854 100755 (executable)
--- a/utf8/nucleus/libs/include/bookmarklet-edit.template
+++ b/utf8/nucleus/libs/include/bookmarklet-edit.template
@@ -103,13 +103,13 @@
                                                <li>\r
                                                        <input name="actiontype" value="changedate" type="radio" id="act_changedate" tabindex="70" /><label for="act_changedate"><%text(_BMLET_CHANGEDATE)%></label> <%helplink(changedate)%>\r
                                                                        <div class="indent">\r
-                                                                               <input id="inputmonth" name="month" tabindex="71" size="2" value="<%itemtime(mon)%>" />月\r
-                                                                               <input id="inputday" name="day" tabindex="72" size="2" value="<%itemtime(mday)%>" />日\r
-                                                                               <input id="inputyear" name="year" tabindex="73" size="4" value="<%itemtime(year)%>" />年\r
-                                                                               <input id="inputhour" name="hour" tabindex="74" size="2" value="<%itemtime(hours)%>" />æ\99\82\r
-                                                                               <input id="inputminutes" name="minutes" tabindex="75" size="2" value="<%itemtime(minutes)%>" />å\88\86\r
+                                                                               <input id="inputyear" name="year" tabindex="71" size="4" value="<%itemtime(year)%>" />年\r
+                                                                               <input id="inputmonth" name="month" tabindex="72" size="2" value="<%itemtime(mon)%>" />æ\9c\r
+                                                                               <input id="inputday" name="day" tabindex="73" size="2" value="<%itemtime(mday)%>" />日\r
+                                                                               <input id="inputhour" name="hour" tabindex="74" size="2" value="<%itemtime(hours)%>" />æ\99\r
+                                                                               <input id="inputminutes" name="minutes" tabindex="75" size="2" value="<%itemtime(minutes)%>" />å\88\r
                                                                                <br />\r
-                                                                               ã\83\95ã\82©ã\83¼ã\83\9eã\83\83ã\83\88ï¼\9a(mm)æ\9c\88(dd)æ\97¥(yyyy)å¹´ (hh)æ\99\82(mm)å\88\86\r
+                                                                               ã\83\95ã\82©ã\83¼ã\83\9eã\83\83ã\83\88ï¼\81Eyyyy)å¹´(mm)æ\9c\81Edd)æ\97¥ (hh)æ\99\81Emm)å\88\r
                                                                        </div>\r
                                                        </li>\r
                                        <%endif%>                                               \r

diff --git a/utf8/xml-rss2.php b/utf8/xml-rss2.php
index 3eb26a6..f5f7716 100755 (executable)
--- a/utf8/xml-rss2.php
+++ b/utf8/xml-rss2.php
@@ -38,6 +38,7 @@ if (!$CONF['DisableSite']) {
                header("HTTP/1.0 304 Not Modified");\r
                header('Content-Length: 0');\r
        } else {\r
+               header("Content-Type: application/xml");\r
                // dump feed\r
                echo $feed;\r
        }\r