Merge branch 'platal-0.9.17'

Conflicts:

	plugins/compiler.checkpasswd.php
	templates/events/rss.tpl
	templates/xnetgrp/announce-rss.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --cc modules/payment.php
Simple merge

diff --cc templates/events/rss.tpl
index 1caa179,0221c96..0000000
deleted file mode 100644,100644
--- 1/templates/events/rss.tpl
--- 2/templates/events/rss.tpl
+++ /dev/null
@@@ -1,36 -1,62 +1,0 @@@
--{**************************************************************************}
--{*                                                                        *}
--{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
--{*  http://opensource.polytechnique.org/                                  *}
--{*                                                                        *}
--{*  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.                                   *}
--{*                                                                        *}
--{*  This program is distributed in the hope that it will be useful,       *}
--{*  but WITHOUT ANY WARRANTY; without even the implied warranty of        *}
--{*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *}
--{*  GNU General Public License for more details.                          *}
--{*                                                                        *}
--{*  You should have received a copy of the GNU General Public License     *}
--{*  along with this program; if not, write to the Free Software           *}
--{*  Foundation, Inc.,                                                     *}
--{*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
--{*                                                                        *}
--{**************************************************************************}
- {if $article->photo}
- <div style="float: left; padding-right: 0.5em">
-   <img src="{#globals.baseurl#}/events/photo/{$article->id}" alt="{$article->title|htmlentities}" />
- </div>
- {/if}
- <div>{if $article->wiki}{$article->texte|miniwiki}{else}{$article->texte}{/if}</div>
- {if $article->post_id neq -1}
- <div style="clear: both">
-   <br />
-   <a href="{#globals.baseurl#}/banana/{#globals.banana.event_reply#|default:#globals.banana.event_forum#}/read/{$article->post_id}">
-   {icon name=comments full=true} Suivre la discussion
-   </a>
- </div>
- {/if}
 -
 -<?xml version="1.0"?>
 -<rss version="2.0">
 -  <channel>
 -    <title>{#globals.core.sitename#} :: News</title>
 -    <language>fr</language>
 -    <link>{#globals.baseurl#}/</link>
 -    <description>L'actualite polytechnicienne...</description>
 -    <image>
 -      <title>{#globals.core.sitename#}</title>
 -      <url>{#globals.baseurl#}/images/logo.png</url>
 -      <link>{#globals.baseurl#}/</link>
 -    </image>
 -    {iterate item=line from=$rss}
 -    <item>
 -      <title><![CDATA[{$line.titre|strip_tags}]]></title>
 -      <guid isPermaLink="false">{$line.id}</guid>
 -      <link>{#globals.baseurl#}/events#newsid{$line.id}</link>
 -      <description><![CDATA[
 -        {if $line.photo}
 -        <div style="float: left; padding-right: 0.5em">
 -          <img src="{#globals.baseurl#}/events/photo/{$line.id}" alt="{$line.title}" />
 -        </div>
 -        {/if}
 -        <div>{if $line.wiki}{$line.texte|miniwiki}{else}{$line.texte}{/if}</div>
 -        {if $line.post_id neq -1}
 -        <div style="clear: both">
 -          <br />
 -          <a href="{#globals.baseurl#}/banana/{#globals.banana.event_reply#|default:#globals.banana.event_forum#}/read/{$line.post_id}">
 -          {icon name=comments full=true} Suivre la discussion
 -          </a>
 -        </div>
 -        {/if}
 -      ]]></description>
 -      <author>{$line.prenom} {$line.nom} (X{$line.promo})</author>
 -      <pubDate>{$line.creation_date|rss_date}</pubDate>
 -    </item>
 -    {/iterate}
 -  </channel>
 -</rss>
--{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}

diff --cc templates/googleapps/index.tpl
Simple merge

diff --cc templates/xnetgrp/announce-rss.tpl
index e1172d7,3a675ea..0000000
deleted file mode 100644,100644
--- 1/templates/xnetgrp/announce-rss.tpl
--- 2/templates/xnetgrp/announce-rss.tpl
+++ /dev/null
@@@ -1,28 -1,53 +1,0 @@@
--{**************************************************************************}
--{*                                                                        *}
--{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
--{*  http://opensource.polytechnique.org/                                  *}
--{*                                                                        *}
--{*  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.                                   *}
--{*                                                                        *}
--{*  This program is distributed in the hope that it will be useful,       *}
--{*  but WITHOUT ANY WARRANTY; without even the implied warranty of        *}
--{*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *}
--{*  GNU General Public License for more details.                          *}
--{*                                                                        *}
--{*  You should have received a copy of the GNU General Public License     *}
--{*  along with this program; if not, write to the Free Software           *}
--{*  Foundation, Inc.,                                                     *}
--{*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
--{*                                                                        *}
--{**************************************************************************}
- {if $article->photo}
- <div style="float: left; padding-right: 0.5em">
-   <img src="{#globals.baseurl#}/{$asso.diminutif}/announce/photo/{$article->id}" alt="{$article->titre|strip_tags}" />
- </div>
- {/if}
- <div>{$article->texte|miniwiki}{if $article->contacts}<br/><br/><strong>Contacts&nbsp;:</strong><br/>{$article->contacts|miniwiki}{/if}</div>
 -
 -<?xml version="1.0"?>
 -<rss version="2.0">
 -  <channel>
 -    <title>Polytechnique.net :: {$asso.nom|htmlentities} :: News</title>
 -    <language>fr</language>
 -    <link>{#globals.baseurl#}/{$asso.diminutif}/</link>
 -    <description>L'actualite polytechnicienne...</description>
 -    <image>
 -      <title>{#globals.core.sitename#}</title>
 -      <url>{#globals.baseurl#}/images/logo.png</url>
 -      <link>{#globals.baseurl#}/{$asso.diminutif}/</link>
 -    </image>
 -    {iterate item=line from=$rss}
 -    <item>
 -      <title><![CDATA[{$line.titre|strip_tags}]]></title>
 -      <guid isPermaLink="false">{$line.id}</guid>
 -      <link>{#globals.baseurl#}/{$asso.diminutif}/#art{$line.id}</link>
 -      <description><![CDATA[
 -        {if $line.photo}
 -        <div style="float: left; padding-right: 0.5em">
 -          <img src="{#globals.baseurl#}/{$asso.diminutif}/announce/photo/{$line.id}" alt="{$line.titre|strip_tags}" />
 -        </div>
 -        {/if}
 -        <div>{$line.texte|miniwiki}{if $line.contacts}<br/><br/><strong>Contacts&nbsp;:</strong><br/>{$line.contacts|miniwiki}{/if}</div>]]></description>
 -      <author>{$line.prenom} {$line.nom} (X{$line.promo})</author>
 -      <pubDate>{$line.create_date|rss_date}</pubDate>
 -    </item>
 -    {/iterate}
 -  </channel>
 -</rss>
--{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}