Allow {include wiki=Xorg.Machin} in templates to include a wiki page

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1705 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/classes/platalpage.php b/classes/platalpage.php
index 2550d62..096c39d 100644 (file)
--- a/classes/platalpage.php
+++ b/classes/platalpage.php
@@ -87,6 +87,7 @@ abstract class PlatalPage extends Smarty
 
         $this->register_prefilter('trimwhitespace');
         $this->register_prefilter('form_force_encodings');
+        $this->register_prefilter('wiki_include');
         $this->assign('xorg_errors', $this->_errors);
         $this->assign('xorg_failure', $this->_failure);
         $this->assign('globals', $globals);
@@ -331,6 +332,16 @@ function trimwhitespace($source, &$smarty)
 }
 
 // }}}
+// {{{ function wiki_include
+
+function wiki_include($source, &$smarty)
+{
+    return preg_replace('/\{include( [^}]*)? wiki=([^} ]+)(.*?)\}/ui',
+                        '{include\1 file="../spool/wiki.d/cache_\2.tpl"\3 included=1}',
+                        $source);
+}
+
+// }}}
 // {{{
 
 function form_force_encodings($source, &$smarty)

diff --git a/templates/emails/antispam.tpl b/templates/emails/antispam.tpl
index 060ec90..a57bf27 100644 (file)
--- a/templates/emails/antispam.tpl
+++ b/templates/emails/antispam.tpl
@@ -20,7 +20,7 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{include file=../spool/wiki.d/cache_Xorg.Antispam.tpl part=1 included=1}
+{include wiki=Xorg.Antispam part=1}
 
 {javascript name=ajax}
 <script type="text/javascript">//<![CDATA[
@@ -48,6 +48,6 @@
 
   <div id="bogo-msg" style="position:absolute;"></div><br />
 
-{include file=../spool/wiki.d/cache_Xorg.Antispam.tpl part=2 included=1}
+{include wiki=Xorg.Antispam part=2}
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}

diff --git a/templates/emails/broken.tpl b/templates/emails/broken.tpl
index 34e11a9..13b13ed 100644 (file)
--- a/templates/emails/broken.tpl
+++ b/templates/emails/broken.tpl
@@ -81,6 +81,6 @@ correspondant si tu veux que nous puissions te répondre.
   </form>
 </div>
 
-{include file=../spool/wiki.d/cache_Xorg.PatteCassée.tpl included=1}
+{include wiki=Xorg.PatteCassée}
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}

diff --git a/templates/emails/submit_spam.tpl b/templates/emails/submit_spam.tpl
index 5a775c7..7837c54 100644 (file)
--- a/templates/emails/submit_spam.tpl
+++ b/templates/emails/submit_spam.tpl
@@ -56,6 +56,6 @@
   <li><strong>nonspam</strong> : pour soumettre un mail légitime mal reconnu</li>
 </ul>
 
-{include file=../spool/wiki.d/cache_Xorg.Mails.tpl part=clients included=1}
+{include wiki=Xorg.Mails part=clients}
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}

diff --git a/templates/events/submit.tpl b/templates/events/submit.tpl
index 44a71db..ca00e24 100644 (file)
--- a/templates/events/submit.tpl
+++ b/templates/events/submit.tpl
@@ -36,9 +36,8 @@ Merci pour ta contribution à la vie du site!
 
 {include file="events/form.tpl"}
 
-{include file="../spool/wiki.d/cache_Xorg.Annonce.tpl included=1}
+{include wiki=Xorg.Annonce}
 
 {/if}
 
-
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}

diff --git a/templates/newsletter/submit.tpl b/templates/newsletter/submit.tpl
index 6d7da3d..6c76b9e 100644 (file)
--- a/templates/newsletter/submit.tpl
+++ b/templates/newsletter/submit.tpl
@@ -130,7 +130,7 @@ Tu peux <a href='nl/submit#conseils'>lire les conseils de rédaction</a> avant d
 </form>
 
 <a id='conseils'></a>
-{include file=../spool/wiki.d/cache_Xorg.LettreMensuelle.tpl included=1}
+{include wiki=Xorg.LettreMensuelle}
 
 {/if}
 

diff --git a/templates/platal/acces_smtp.tpl b/templates/platal/acces_smtp.tpl
index 50f1a28..75fe33a 100644 (file)
--- a/templates/platal/acces_smtp.tpl
+++ b/templates/platal/acces_smtp.tpl
@@ -105,12 +105,12 @@
 <p>
   <a href="{$platal->pl_self()}?doc=smtp">Pourquoi et comment</a> utiliser le serveur SMTP de {#globals.core.sitename#}.<br />
 </p>
-{include file=../spool/wiki.d/cache_Xorg.NNTPSécurisé.tpl included=1}
+{include wiki=Xorg.NNTPSécurisé}
 {elseif $smarty.request.doc eq "smtp"}
 <p> 
   <a href="{$platal->pl_self()}?doc=nntp">Pourquoi et comment</a> utiliser le serveur NNTP de {#globals.core.sitename#}.<br />
 </p>
-{include file=../spool/wiki.d/cache_Xorg.SMTPSécurisé.tpl included=1}
+{include wiki=Xorg.SMTPSécurisé}
 {else}
 <p>
   <a href="{$platal->pl_self()}?doc=smtp">Pourquoi et comment</a> utiliser le serveur SMTP de {#globals.core.sitename#}.<br />

diff --git a/templates/profile/referent.tpl b/templates/profile/referent.tpl
index 8194fdf..1005ac8 100644 (file)
--- a/templates/profile/referent.tpl
+++ b/templates/profile/referent.tpl
@@ -24,7 +24,7 @@
 {if $plset_count}
 {include file="core/plset.tpl"}
 {else}
-{include file=../spool/wiki.d/cache_Docs.Emploi.tpl included=1}
+{include wiki=Docs.Emploi}
 {/if}
 
 <p>

diff --git a/templates/register/step0.tpl b/templates/register/step0.tpl
index 21972e8..3b7c80d 100644 (file)
--- a/templates/register/step0.tpl
+++ b/templates/register/step0.tpl
@@ -37,7 +37,7 @@ L'enregistrement se déroule <strong>en deux étapes</strong> :
   </li>
 </ul>
 
-{include file=../spool/wiki.d/cache_Reference.Charte.tpl public=1 included=1}
+{include wiki=Reference.Charte public=1}
 
 <form action="register" method="post">
   <div class="center">