Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / atom.php

diff --git a/atom.php b/atom.php
index ea20a65..9caf5a2 100644 (file)
--- a/atom.php
+++ b/atom.php
@@ -1,49 +1,49 @@
-<?php\r
-/*\r
- * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
- * Copyright (C) 2002-2009 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-2009 The Nucleus Group\r
- * @version $Id: atom.php 1388 2009-07-18 06:31:28Z shizuki $\r
- */\r
-\r
-header('Pragma: no-cache');\r
-\r
-$CONF = array();\r
-include('./config.php');\r
-\r
-if ( !$CONF['DisableSite'] )\r
-{\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
-       {\r
-               header('HTTP/1.0 304 Not Modified');\r
-               header('Content-Length: 0');\r
-       }\r
-       else\r
-       {\r
-               echo $feed;\r
-       }\r
-}\r
+<?php
+/*
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+ * Copyright (C) 2002-2009 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-2009 The Nucleus Group
+ * @version $Id: atom.php 1693 2012-03-10 11:37:56Z sakamocchi $
+ */
+
+header('Pragma: no-cache');
+
+$CONF = array();
+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
+       {
+               echo $feed;
+       }
+}