From d33d08956c822486d85aba579afaace30a4c061f Mon Sep 17 00:00:00 2001
From: Vincent Zanotti <vincent.zanotti@m4x.org>
Date: Thu, 29 Oct 2009 16:38:26 +0100
Subject: [PATCH] Fixes the use of Smarty's "default" modifier. A recent
 "security fix" on Debian changed the way that string was parsed. Hopefully,
 this new use of default: will be resilient to a rollback of Smarty (which is
 likely to happen, since this Debian change has introduced an even bigger
 security hole).

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
---
 templates/include/form.valid.nomusage.tpl | 2 +-
 templates/lists/create.tpl                | 4 ++--
 templates/skin/common.title.header.tpl    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/include/form.valid.nomusage.tpl b/templates/include/form.valid.nomusage.tpl
index 7f034b3..1408192 100644
--- a/templates/include/form.valid.nomusage.tpl
+++ b/templates/include/form.valid.nomusage.tpl
@@ -27,7 +27,7 @@
 </tr>
 <tr class="impair">
   <td class="titre">Nouvel&nbsp;alias&nbsp;:</td>
-  <td>{$valid->alias|default:"<span class='erreur'>suppression</span>"}</td>
+  <td>{$valid->alias|default:'<span class="erreur">suppression</span>'}</td>
 </tr>
 <tr class="impair">
   <td class="titre">Raison&nbsp;:</td>
diff --git a/templates/lists/create.tpl b/templates/lists/create.tpl
index 1d751a4..2d555d8 100644
--- a/templates/lists/create.tpl
+++ b/templates/lists/create.tpl
@@ -161,7 +161,7 @@ liste&nbsp;:
       <td class='titre'>Gestionnaires&nbsp;:</td>
       <td colspan='4'>
         <input type='hidden' name='owners' value='{$owners}' />
-        {$owners|nl2br|default:"<span class='erreur'>pas de gestionnaires</span>"}
+        {$owners|nl2br|default:'<span class="erreur">pas de gestionnaires</span>'}
         <br />
         <input type='text' name='add_owner' />
         <input type='submit' name='add_owner_sub' value='Ajouter' />
@@ -171,7 +171,7 @@ liste&nbsp;:
       <td class='titre'>Membres&nbsp;:</td>
       <td colspan='4'>
         <input type='hidden' name='members' value='{$members}' />
-        {$members|nl2br|default:"<span class='erreur'>pas de membres</span>"}
+        {$members|nl2br|default:'<span class="erreur">pas de membres</span>'}
         <br />
         <input type='text' name='add_member' /><br />
         <input type="file" name="add_member_file" /><br />
diff --git a/templates/skin/common.title.header.tpl b/templates/skin/common.title.header.tpl
index 78259bb..8b1df27 100644
--- a/templates/skin/common.title.header.tpl
+++ b/templates/skin/common.title.header.tpl
@@ -33,10 +33,10 @@
                 <form action="search" method="get">
                     <div>
                         <input type="text" size="20" name="quick" id="quick" class="quick_search"
-                               value="{$smarty.request.quick|default:"Recherche dans l'annuaire"}"
+                               value="{$smarty.request.quick|default:'Recherche dans l\'annuaire'}"
                                onfocus="if (this.value === 'Recherche dans l\'annuaire') this.value='';
                                         $('#quick_button').show()"
-                               onblur="if (this.value === '') this.value='{$smarty.request.quick|default:"Recherche dans l'annuaire"|escape:javascript}'"
+                               onblur="if (this.value === '') this.value='{$smarty.request.quick|default:'Recherche dans l\'annuaire'|escape:javascript}'"
                                />
                         <button id="quick_button" type="submit" style="display: none"
                                 onclick="if ($('#quick').val() === 'Recherche dans l\'annuaire') $('#quick').val('')">
-- 
2.1.4