merged 3.2.1(?) modification

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

diff --git a/action.php b/action.php
index de6628e..5e34126 100755 (executable)
--- a/action.php
+++ b/action.php
@@ -1,19 +1,23 @@
 <?php\r
-/** \r
-  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) \r
-  * Copyright (C) 2002-2005 The Nucleus Group\r
-  *\r
-  * This program is free software; you can redistribute it and/or\r
-  * modify it under the terms of the GNU General Public License\r
-  * as published by the Free Software Foundation; either version 2\r
-  * of the License, or (at your option) any later version.\r
-  * (see nucleus/documentation/index.html#license for more info)  \r
-  *\r
-  * File containing actions that can be performed by visitors of the site,\r
-  * like adding comments, etc...\r
-  *\r
-  * $Id: action.php,v 1.4 2005-03-12 06:19:03 kimitake Exp $\r
-  */\r
+/* \r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) \r
+ * Copyright (C) 2002-2005 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)  \r
+ */\r
+\r
+/**\r
+ * File containing actions that can be performed by visitors of the site,\r
+ * like adding comments, etc...\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2005 The Nucleus Group\r
+ * @version $Id: action.php,v 1.5 2005-04-20 06:49:45 kimitake Exp $\r
+ * $NucleusJP$\r
+ */\r
 \r
 $CONF = array();\r
 include('./config.php');                       // common functions\r
@@ -29,4 +33,4 @@ if ($errorInfo)
        doError($errorInfo['message'], new SKIN($errorInfo['skinid'])); \r
 }\r
 \r
-?>
\ No newline at end of file
+?>\r

diff --git a/atom.php b/atom.php
index cd9c0d3..c0131cd 100755 (executable)
--- a/atom.php
+++ b/atom.php
@@ -1,17 +1,23 @@
 <?php\r
 \r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2005 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+\r
 /**\r
-  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) \r
-  * Copyright (C) 2002-2005 The Nucleus Group\r
-  *\r
-  * This program is free software; you can redistribute it and/or\r
-  * modify it under the terms of the GNU General Public License\r
-  * as published by the Free Software Foundation; either version 2\r
-  * of the License, or (at your option) any later version.\r
-  * (see nucleus/documentation/index.html#license for more info)\r
-  *\r
-  * Nucleus Atom Syndication\r
-  */\r
+ * Nucleus Atom Syndication\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2005 The Nucleus Group\r
+ * @version $Id: atom.php,v 1.5 2005-04-20 06:49:45 kimitake Exp $\r
+ * $NucleusJP$\r
+ */\r
 \r
 header("Pragma: no-cache");\r
 \r

diff --git a/install.php b/install.php
index c6e0927..13854e4 100755 (executable)
--- a/install.php
+++ b/install.php
@@ -1,19 +1,23 @@
 <?php\r
+       /*\r
+        * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+        * Copyright (C) 2002-2005 The Nucleus Group\r
+        *\r
+        * This program is free software; you can redistribute it and/or\r
+        * modify it under the terms of the GNU General Public License\r
+        * as published by the Free Software Foundation; either version 2\r
+        * of the License, or (at your option) any later version.\r
+        * (see nucleus/documentation/index.html#license for more info)\r
+        * This script will install the Nucleus tables in your SQL-database, and initialize the data in\r
+        * those tables.\r
+        */\r
        /**\r
-         * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
-         * Copyright (C) 2002-2005 The Nucleus Group\r
-         *\r
-         * This program is free software; you can redistribute it and/or\r
-         * modify it under the terms of the GNU General Public License\r
-         * as published by the Free Software Foundation; either version 2\r
-         * of the License, or (at your option) any later version.\r
-         * (see nucleus/documentation/index.html#license for more info)\r
-         * This script will install the Nucleus tables in your SQL-database, and initialize the data in\r
-         * those tables.\r
-         *\r
-         * Below is a friendly way of letting users on non-php systems know that Nucleus won't run there.\r
-         *\r
-         * ?><div style="font-size: xx-large;">If you see this text in your browser when you open <i>install.php</i>, your web server is not able to run PHP-scripts, and therefor Nucleus will not be able to run there. </div><div style="display: none"><?php         */\r
+        * Below is a friendly way of letting users on non-php systems know that Nucleus won't run there.\r
+        * @license http://nucleuscms.org/license.txt GNU General Public License\r
+        * @copyright Copyright (C) 2002-2005 The Nucleus Group\r
+        * @version $Id: install.php,v 1.5 2005-04-20 06:53:20 kimitake Exp $\r
+        */\r
+       ?><div style="font-size: xx-large;">If you see this text in your browser when you open <i>install.php</i>, your web server is not able to run PHP-scripts, and therefor Nucleus will not be able to run there. </div><div style="display: none"><?php     */\r
 \r
        /*\r
                This part of the install.php code allows for customization of the install process.\r

diff --git a/install.sql b/install.sql
index 97c0ffa..9e46304 100755 (executable)
--- a/install.sql
+++ b/install.sql
@@ -197,9 +197,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="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 (2, 'index', '<?xml version="1.0" encoding="<%charset%>"?>\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="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>ｩ</copyright>             <!-- Copyright notice -->\r\n    <category>Weblog</category>\r\n    <docs>http://backend.userland.com/rss</docs>\r\n    <image>\r\n      <url><%blogsetting(url)%>/nucleus/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="<%charset%>"?>\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>ｩ</copyright>             <!-- Copyright notice -->\r\n    <category>Weblog</category>\r\n    <docs>http://backend.userland.com/rss</docs>\r\n    <image>\r\n      <url><%blogsetting(url)%>/nucleus/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
 \r
 CREATE TABLE `nucleus_skin_desc` (\r
   `sdnumber` int(11) NOT NULL auto_increment,\r

diff --git a/xml-rss2.php b/xml-rss2.php
index f5f7716..8814631 100755 (executable)
--- a/xml-rss2.php
+++ b/xml-rss2.php
@@ -1,17 +1,23 @@
 <?php\r
 \r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2005 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+\r
 /**\r
-  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) \r
-  * Copyright (C) 2002-2005 The Nucleus Group\r
-  *\r
-  * This program is free software; you can redistribute it and/or\r
-  * modify it under the terms of the GNU General Public License\r
-  * as published by the Free Software Foundation; either version 2\r
-  * of the License, or (at your option) any later version.\r
-  * (see nucleus/documentation/index.html#license for more info)\r
-  *\r
-  * Nucleus RSS syndication channel skin\r
-  */\r
+ * Nucleus RSS syndication channel skin\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2005 The Nucleus Group\r
+ * @version $Id: xml-rss2.php,v 1.5 2005-04-20 06:49:45 kimitake Exp $\r
+ * $NucleusJP$\r
+ */\r
 \r
 header("Pragma: no-cache");\r
 \r