From dc41059a07170bdc0be6c181a8311a0ab05018eb Mon Sep 17 00:00:00 2001
From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Mon, 13 Nov 2006 14:11:26 +0000
Subject: [PATCH] Add 'guid' in RSS feed Add an handler for favicon.ico

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1072 839d8a87-29fc-0310-9880-83ba4fa771e5
---
 modules/core.php                       |  9 +++++++++
 modules/platal.php                     | 10 +++++-----
 templates/rss.tpl                      |  1 +
 templates/xnet/groupe/announce-rss.tpl |  1 +
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/modules/core.php b/modules/core.php
index 27f0c36..b7def03 100644
--- a/modules/core.php
+++ b/modules/core.php
@@ -29,6 +29,7 @@ class CoreModule extends PLModule
             'purge_cache' => $this->make_hook('purge_cache', AUTH_COOKIE, 'admin'),
 
             'valid.html'  => $this->make_hook('valid', AUTH_PUBLIC),
+            'favicon.ico' => $this->make_hook('favicon', AUTH_PUBLIC),
         );
     }
 
@@ -50,6 +51,14 @@ class CoreModule extends PLModule
         $page->changeTpl('404.tpl');
     }
 
+    function handler_favicon(&$page)
+    {
+        $data = file_get_contents(dirname(__FILE__).'/../htdocs/images/favicon.png');
+        header('Content-Type: image/png');
+        echo $data;
+        exit;
+    }
+
     function handler_purge_cache(&$page)
     {
         require_once 'wiki.inc.php';
diff --git a/modules/platal.php b/modules/platal.php
index dff65ce..887c133 100644
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -39,7 +39,7 @@ class PlatalModule extends PLModule
     {
         return array(
             'index'       => $this->make_hook('index',     AUTH_PUBLIC),
-	    'cacert.pem'  => $this->make_hook('cacert',    AUTH_PUBLIC),
+    	    'cacert.pem'  => $this->make_hook('cacert',    AUTH_PUBLIC),
             'changelog'   => $this->make_hook('changelog', AUTH_PUBLIC),
 
             // Preferences thingies
@@ -73,10 +73,10 @@ class PlatalModule extends PLModule
     {
         $data = file_get_contents("/etc/ssl/xorgCA/cacert.pem","r");
         header("Pragma:");
-	header("Set-Cookie:");
-	header("Cache-Control:");
-	header("Expires:");
-	header("Content-Type: application/x-x509-ca-cert");
+        header("Set-Cookie:");
+        header("Cache-Control:");
+        header("Expires:");
+        header("Content-Type: application/x-x509-ca-cert");
         header("Content-Length: ".strlen($data));
         echo $data;
         exit;
diff --git a/templates/rss.tpl b/templates/rss.tpl
index 91fb54b..7bb9bef 100644
--- a/templates/rss.tpl
+++ b/templates/rss.tpl
@@ -35,6 +35,7 @@
     {iterate item=line from=$rss}
     <item>
       <title>{$line.titre|strip_tags}</title>
+      <guid isPermaLink="false">{$line.id}</guid>
       <link>{#globals.baseurl#}/events#newsid{$line.id}</link>
       <description><![CDATA[{$line.texte|nl2br}]]></description>
       <author>{$line.prenom} {$line.nom} (X{$line.promo})</author>
diff --git a/templates/xnet/groupe/announce-rss.tpl b/templates/xnet/groupe/announce-rss.tpl
index c4353d5..8f3ecae 100644
--- a/templates/xnet/groupe/announce-rss.tpl
+++ b/templates/xnet/groupe/announce-rss.tpl
@@ -35,6 +35,7 @@
     {iterate item=line from=$rss}
     <item>
       <title>{$line.titre|strip_tags}</title>
+      <guid isPermaLink="false">{$line.id}</guid>
       <link>{#globals.baseurl#}/{$asso.diminutif}/#art{$line.id}</link>
       <description><![CDATA[{$line.texte|nl2br}{if $line.contacts}<br/><br/><strong>Contacts :</strong><br/>{$line.contacts|url_catcher|nl2br}{/if}]]></description>
       <author>{$line.prenom} {$line.nom} (X{$line.promo})</author>
-- 
2.1.4