From 51fb3b6facb76baf990d0407baf9be4c669fffa7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Tue, 27 Jul 2010 15:36:05 +0200
Subject: [PATCH] Fixes a few smarty warnings and notices.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 templates/emails/send.tpl              |  7 ++++---
 templates/platal/preferences.tpl       |  2 +-
 templates/skin/common.title.header.tpl |  9 +++++++--
 templates/skin/default.tpl             |  2 +-
 templates/skin/espace.tpl              |  2 +-
 templates/skin/humlinux.tpl            |  2 +-
 templates/skin/keynote.tpl             |  2 +-
 templates/skin/linux.tpl               |  2 +-
 templates/skin/liteskin.tpl            |  2 +-
 templates/skin/nbviolet.tpl            |  2 +-
 templates/skin/newxorg.tpl             |  2 +-
 templates/skin/oldtimes.tpl            |  2 +-
 templates/skin/openweb.tpl             | 14 +++++++-------
 templates/skin/register.tpl            |  2 +-
 templates/skin/sharky.tpl              |  2 +-
 templates/skin/spectral.tpl            |  2 +-
 templates/skin/trapped.tpl             |  2 +-
 templates/survey/index.tpl             |  6 ++++--
 templates/xnet/skin.tpl                |  2 +-
 templates/xnetgrp/edit.tpl             |  8 ++++----
 20 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/templates/emails/send.tpl b/templates/emails/send.tpl
index 3b4d0e1..99326de 100644
--- a/templates/emails/send.tpl
+++ b/templates/emails/send.tpl
@@ -218,7 +218,7 @@
         <div style="float: right; width: 40%;">
           <select id="to_contacts" name="to_contacts[]" multiple="multiple" style="width: 100%; height: 5em">
           {foreach key=key item=contact from=$contacts}
-          {if in_array($contact->hrpid,$smarty.request.to_contacts)}
+          {if t($smarty.request.to_contacts) && in_array($contact->hrpid,$smarty.request.to_contacts)}
           <option value="{$contact->hrpid}">
             {$contact->full_name}
           </option>
@@ -235,7 +235,7 @@
           <br />
           <select id="cc_contacts" name="cc_contacts[]" multiple="multiple" style="width: 100%; height: 5em">
           {foreach key=key item=contact from=$contacts}
-          {if in_array($contact->hrpid,$smarty.request.cc_contacts)}
+          {if t($smarty.request.cc_contacts) && in_array($contact->hrpid,$smarty.request.cc_contacts)}
           <option value="{$contact->hrpid}">
             {$contact->full_name}
           </option>
@@ -263,7 +263,8 @@
         <div style="float: right; width: 40%">
           <select id="contacts" name="all_contacts[]" multiple="multiple" style="height: 10em; width: 100%">
             {foreach item=contact from=$contacts}
-            {if !in_array($contact->hrpid,$smarty.request.to_contacts) && !in_array($contact->hrpid,$smarty.request.cc_contacts)}
+            {if !(isset($smarty.request.to_contacts|smarty:nodefaults) && isset($smarty.request.cc_contacts|smarty:nodefaults)) ||
+                (!in_array($contact->hrpid,$smarty.request.to_contacts) && !in_array($contact->hrpid,$smarty.request.cc_contacts))}
             <option value="{$contact->hrpid}">
               {$contact->full_name}
             </option>
diff --git a/templates/platal/preferences.tpl b/templates/platal/preferences.tpl
index d7ba64a..590cf80 100644
--- a/templates/platal/preferences.tpl
+++ b/templates/platal/preferences.tpl
@@ -61,7 +61,7 @@
   </tr>
   <tr class="impair">
     <td class="half">
-      {if $smarty.session.user->email_format eq html}
+      {if $smarty.session.user->email_format eq 'html'}
       <h3>
         <a href="javascript:dynpostkv('prefs','email_format','text')">Recevoir les emails en format texte</a>
       </h3>
diff --git a/templates/skin/common.title.header.tpl b/templates/skin/common.title.header.tpl
index 89a83d0..16d869a 100644
--- a/templates/skin/common.title.header.tpl
+++ b/templates/skin/common.title.header.tpl
@@ -30,6 +30,11 @@
               </td>
               <td class="inscrits">
                 {$globals->core->NbIns|number_format} polytechniciens sur le web
+                {if t($smarty.request.quick)}
+                  {assign var=requestQuick value=$smarty.request.quick}
+                {else}
+                  {assign var=requestQuick value="Recherche dans l\'annuaire"}
+                {/if}
                 <form action="search" method="get">
                     <div>
                         <button id="quick_button" type="submit" style="display: none"
@@ -37,10 +42,10 @@
                           OK
                         </button>
                         <input type="text" size="20" name="quick" id="quick" class="quick_search"
-                               value="{$smarty.request.quick|default:'Recherche dans l\'annuaire'}"
+                               value="{$requestQuick}"
                                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='{$requestQuick|escape:javascript}'"
                                />
                     </div>
                 </form>
diff --git a/templates/skin/default.tpl b/templates/skin/default.tpl
index c929dc1..66e41e2 100644
--- a/templates/skin/default.tpl
+++ b/templates/skin/default.tpl
@@ -30,7 +30,7 @@
     {if !$simple}
       {include file=skin/common.bandeau.tpl}
     {/if}
-    {if $smarty.session.suid}
+    {if t($smarty.session.suid)}
     <div id="suid">
       <a href="exit">
         Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
diff --git a/templates/skin/espace.tpl b/templates/skin/espace.tpl
index fd314ef..ce82b94 100644
--- a/templates/skin/espace.tpl
+++ b/templates/skin/espace.tpl
@@ -31,7 +31,7 @@
     {if !$simple}
       {include file=skin/common.bandeau.tpl}
     {/if}
-    {if $smarty.session.suid}
+    {if t($smarty.session.suid)}
     <div id="suid">
       <a href="exit">
         Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
diff --git a/templates/skin/humlinux.tpl b/templates/skin/humlinux.tpl
index a1e2280..8857323 100644
--- a/templates/skin/humlinux.tpl
+++ b/templates/skin/humlinux.tpl
@@ -31,7 +31,7 @@
     {if !$simple}
       {include file=skin/common.bandeau.tpl}
     {/if}
-    {if $smarty.session.suid}
+    {if t($smarty.session.suid)}
     <div id="suid">
       <a href="exit">
         Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
diff --git a/templates/skin/keynote.tpl b/templates/skin/keynote.tpl
index 773b903..dd63773 100644
--- a/templates/skin/keynote.tpl
+++ b/templates/skin/keynote.tpl
@@ -30,7 +30,7 @@
     {if !$simple}
       {include file=skin/common.bandeau.tpl}
     {/if}
-    {if $smarty.session.suid}
+    {if t($smarty.session.suid)}
     <div id="suid">
       <a href="exit">
         Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
diff --git a/templates/skin/linux.tpl b/templates/skin/linux.tpl
index e983733..fe108ed 100644
--- a/templates/skin/linux.tpl
+++ b/templates/skin/linux.tpl
@@ -31,7 +31,7 @@
     {if !$simple}
       {include file=skin/common.bandeau.tpl}
     {/if}
-    {if $smarty.session.suid}
+    {if t($smarty.session.suid)}
     <div id="suid">
       <a href="exit">
         Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
diff --git a/templates/skin/liteskin.tpl b/templates/skin/liteskin.tpl
index b61e0cd..35c62dc 100644
--- a/templates/skin/liteskin.tpl
+++ b/templates/skin/liteskin.tpl
@@ -31,7 +31,7 @@
     {if !$simple}
       {include file=skin/common.bandeau.tpl}
     {/if}
-    {if $smarty.session.suid}
+    {if t($smarty.session.suid)}
     <div id="suid">
       <a href="exit">
         Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
diff --git a/templates/skin/nbviolet.tpl b/templates/skin/nbviolet.tpl
index 568b79c..41f517c 100644
--- a/templates/skin/nbviolet.tpl
+++ b/templates/skin/nbviolet.tpl
@@ -31,7 +31,7 @@
     {if !$simple}
       {include file=skin/common.bandeau.tpl}
     {/if}
-    {if $smarty.session.suid}
+    {if t($smarty.session.suid)}
     <div id="suid">
       <a href="exit">
         Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
diff --git a/templates/skin/newxorg.tpl b/templates/skin/newxorg.tpl
index 017c769..a262554 100644
--- a/templates/skin/newxorg.tpl
+++ b/templates/skin/newxorg.tpl
@@ -31,7 +31,7 @@
     {if !$simple}
       {include file=skin/common.bandeau.tpl}
     {/if}
-    {if $smarty.session.suid}
+    {if t($smarty.session.suid)}
     <div id="suid">
       <a href="exit">
         Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
diff --git a/templates/skin/oldtimes.tpl b/templates/skin/oldtimes.tpl
index 1a1cb5c..d34754d 100644
--- a/templates/skin/oldtimes.tpl
+++ b/templates/skin/oldtimes.tpl
@@ -29,7 +29,7 @@
   <body>
     {include core=plpage.devel.tpl}
 
-    {if $smarty.session.suid}
+    {if t($smarty.session.suid)}
     <table id="suid" cellpadding="0" cellspacing="0">
       <tr>
         <td>
diff --git a/templates/skin/openweb.tpl b/templates/skin/openweb.tpl
index 78d358e..3953c99 100644
--- a/templates/skin/openweb.tpl
+++ b/templates/skin/openweb.tpl
@@ -31,13 +31,13 @@
     {if !$simple}
       {include file=skin/common.bandeau.tpl}
     {/if}
-    {if $smarty.session.suid} 
-    <div id="suid"> 
-      <a href="exit"> 
-        Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()}) 
-      </a> 
-    </div> 
-    {/if} 
+    {if t($smarty.session.suid)}
+    <div id="suid">
+      <a href="exit">
+        Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
+      </a>
+    </div>
+    {/if}
 
   {if $simple}
 
diff --git a/templates/skin/register.tpl b/templates/skin/register.tpl
index b06dbc8..58562a8 100644
--- a/templates/skin/register.tpl
+++ b/templates/skin/register.tpl
@@ -30,7 +30,7 @@
     {if !$simple}
       {include file=skin/common.bandeau.tpl}
     {/if}
-    {if $smarty.session.suid}
+    {if t($smarty.session.suid)}
     <div id="suid">
       <a href="exit">
         Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
diff --git a/templates/skin/sharky.tpl b/templates/skin/sharky.tpl
index c3e897e..637090b 100644
--- a/templates/skin/sharky.tpl
+++ b/templates/skin/sharky.tpl
@@ -35,7 +35,7 @@
     {else}
 
     {include file=skin/common.bandeau.tpl}
-    {if $smarty.session.suid}
+    {if t($smarty.session.suid)}
     <div id="suid">
       <a href="exit">
         Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
diff --git a/templates/skin/spectral.tpl b/templates/skin/spectral.tpl
index 1dad2ae..24c785b 100644
--- a/templates/skin/spectral.tpl
+++ b/templates/skin/spectral.tpl
@@ -31,7 +31,7 @@
     {if !$simple}
       {include file=skin/common.bandeau.tpl}
     {/if}
-    {if $smarty.session.suid}
+    {if t($smarty.session.suid)}
     <div id="suid">
       <a href="exit">
         Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
diff --git a/templates/skin/trapped.tpl b/templates/skin/trapped.tpl
index 7ea2fa1..9fc4419 100644
--- a/templates/skin/trapped.tpl
+++ b/templates/skin/trapped.tpl
@@ -31,7 +31,7 @@
     {if !$simple}
       {include file=skin/common.bandeau.tpl}
     {/if}
-    {if $smarty.session.suid}
+    {if t($smarty.session.suid)}
     <div id="suid">
       <a href="exit">
         Quitter le SU sur {$smarty.session.hruid} ({$smarty.session.perms->flags()})
diff --git a/templates/survey/index.tpl b/templates/survey/index.tpl
index 29aa292..9a97536 100644
--- a/templates/survey/index.tpl
+++ b/templates/survey/index.tpl
@@ -22,6 +22,8 @@
 
 <h1>Sondages</h1>
 
+{* Survey::MODE_ALL equals 0. *}
+{assign var=SurveyMODE_ALL value=0}
 <table class="bicol">
   <tr>
     <th>
@@ -29,7 +31,7 @@
     </th>
   </tr>
   {iterate item=s from=$survey_current}
-  {if $smarty.session.auth || $s.mode == Survey::MODE_ALL}
+  {if $smarty.session.auth || $s.mode == $SurveyMODE_ALL}
   <tr class="{cycle name=cs_cycle values="impair,pair"}">
     <td class="half">
       &bull;
@@ -58,7 +60,7 @@
     </th>
   </tr>
   {iterate item=s from=$survey_old}
-    {if $smarty.session.auth || $s.mode == Survey::MODE_ALL}
+    {if $smarty.session.auth || $s.mode == $SurveyMODE_ALL}
   <tr class="{cycle name=os_cycle values="impair,pair"}">
     <td class="half">
       &bull;
diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index 00b8fa8..15bda7f 100644
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -110,7 +110,7 @@
               {/if}
             {/foreach}
           {/foreach}
-          {assign var=asso_id value=$asso->id}
+          {if t($asso)}{assign var=asso_id value=$asso->id}{/if}
           {if $asso && $is_admin ||
                       ($smarty.session.suid && ($smarty.session.suid.perms->hasFlag('admin') ||
                                                 $smarty.session.suid.may_update[$asso_id]))}
diff --git a/templates/xnetgrp/edit.tpl b/templates/xnetgrp/edit.tpl
index 0308240..ffd10e6 100644
--- a/templates/xnetgrp/edit.tpl
+++ b/templates/xnetgrp/edit.tpl
@@ -56,10 +56,10 @@
       </td>
       <td>
         <select name="cat">
-          <option value="groupesx" {if $asso->cat eq GroupesX}selected="selected"{/if}>Groupes X</option>
-          <option value="binets" {if $asso->cat eq Binets}selected="selected"{/if}>Binets</option>
-          <option value="promotions" {if $asso->cat eq Promotions}selected="selected"{/if}>Promotions</option>
-          <option value="institutions" {if $asso->cat eq Institutions}selected="selected"{/if}>Institutions</option>
+          <option value="groupesx" {if $asso->cat eq 'GroupesX'}selected="selected"{/if}>Groupes X</option>
+          <option value="binets" {if $asso->cat eq 'Binets'}selected="selected"{/if}>Binets</option>
+          <option value="promotions" {if $asso->cat eq 'Promotions'}selected="selected"{/if}>Promotions</option>
+          <option value="institutions" {if $asso->cat eq 'Institutions'}selected="selected"{/if}>Institutions</option>
         </select>
       </td>
     </tr>
-- 
2.1.4