Just reviewing code formatting.

[nucleus-jp/nucleus-jp-ancient.git] / utf8 / atom.php

diff --git a/utf8/atom.php b/utf8/atom.php
index c0131cd..566b5df 100755 (executable)
--- a/utf8/atom.php
+++ b/utf8/atom.php
@@ -1,54 +1,56 @@
-<?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 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
-$CONF = array();\r
-$CONF['Self'] = 'atom.php';\r
-\r
-include('./config.php');\r
-\r
-if (!$CONF['DisableSite']) {\r
-       // get feed into $feed\r
-       ob_start();\r
-               selectSkin('feeds/atom');\r
-               selector();\r
-       $feed = ob_get_contents();\r
-       ob_end_clean();\r
-       \r
-       // create ETAG (hash of feed)\r
-       // (HTTP_IF_NONE_MATCH has quotes around it)\r
-       $eTag = '"'.md5($feed).'"';\r
-       header('Etag: '.$eTag);\r
-       \r
-       // compare Etag to what we got\r
-       if ($eTag == serverVar('HTTP_IF_NONE_MATCH')) { \r
-               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
-               \r
-}\r
-\r
-?>\r
+<?php
+/*
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+ * Copyright (C) 2002-2011 The Nucleus Group
+ *
+ * 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.
+ * (see nucleus/documentation/index.html#license for more info)
+ */
+
+/**
+ * Nucleus Atom Syndication
+ * @license http://nucleuscms.org/license.txt GNU General Public License
+ * @copyright Copyright (C) 2002-2011 The Nucleus Group
+ * @version $Id$
+ * $NucleusJP: atom.php,v 1.6 2006/07/12 07:11:45 kimitake Exp $
+ */
+
+header('Pragma: no-cache');
+
+$CONF = array();
+$CONF['Self'] = 'atom.php';
+
+include('./config.php');
+
+if (!$CONF['DisableSite']) {
+       // get feed into $feed
+       ob_start();
+               selectSkin('feeds/atom');
+               selector();
+               $feed = ob_get_contents();
+       ob_end_clean();
+
+       // create ETAG (hash of feed)
+       // (HTTP_IF_NONE_MATCH has quotes around it)
+       $eTag = '"' . md5($feed) . '"';
+       header('Etag: ' . $eTag);
+
+       // compare Etag to what we got
+       if ($eTag == serverVar('HTTP_IF_NONE_MATCH') ) {
+               header('HTTP/1.0 304 Not Modified');
+               header('Content-Length: 0');
+       } else {
+               if (strtolower(_CHARSET) != 'utf-8') {
+                   $feed = mb_convert_encoding($feed, "UTF-8", _CHARSET);
+               }
+               header("Content-Type: application/xml");
+               // dump feed
+               echo $feed;
+       }
+
+}
+
+?>
\ No newline at end of file