Fixes some PHP notice (debug & 4 != 0)

diff --git a/templates/carnet/mescontacts.tpl b/templates/carnet/mescontacts.tpl
index d3231d2..06ffcad 100644 (file)
--- a/templates/carnet/mescontacts.tpl
+++ b/templates/carnet/mescontacts.tpl
@@ -47,7 +47,7 @@
   Sur la page de résultats d'une recherche, tu peux ajouter un contact en cliquant sur {icon name=add}.
 </p>
 
-{if $plset_count || $smarty.request.quick}
+{if $plset_count || t($smarty.request.quick)}
 <p>
   Tu peux télécharger des informations sur tes contacts&nbsp;:
 </p>
@@ -84,10 +84,10 @@
 <form action="carnet/contacts/search#plset_content" method="get">
   <div style="float: right">
       <input type="text" size="30" name="quick" class="quick_search"
-             value="{$smarty.request.quick|default:'recherche dans tes contacts'}"
+             value="{t($smarty.request.quick)|default:'recherche dans tes contacts'}"
              onfocus="if (this.value == 'recherche dans tes contacts') this.value=''"
              onblur="if (this.value == '') this.value='recherche dans tes contacts'"/>
-      {if $smarty.request.quick}<a href="carnet/contacts">{icon name=arrow_undo title='Annuler la recherche'}</a>{/if}
+      {if t($smarty.request.quick)}<a href="carnet/contacts">{icon name=arrow_undo title='Annuler la recherche'}</a>{/if}
   </div>
 </form>
 <p>

diff --git a/templates/events/index.tpl b/templates/events/index.tpl
index 83eb602..afb4ba9 100644 (file)
--- a/templates/events/index.tpl
+++ b/templates/events/index.tpl
@@ -20,14 +20,14 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{if $ask_naissance}
+{if t($ask_naissance)}
 
 {include file='include/form_naissance.tpl'}
 
 {else}
 
 <h1 id='pagetop'>
-Bienvenue {$smarty.session.user->displayName()}{if $birthday}
+Bienvenue {$smarty.session.user->displayName()}{if t($birthday)}
   &nbsp;et joyeux anniversaire de la part de toute l'équipe&nbsp;!
 {else},
 {/if}
@@ -35,13 +35,13 @@ Bienvenue {$smarty.session.user->displayName()}{if $birthday}
 
 {if $smarty.session.user->host}
 <div class="smaller">
-  {if $birthday}T{else}t{/if}a connexion précédente date du
+  {if t($birthday)}T{else}t{/if}a connexion précédente date du
   <strong>{$smarty.session.user->lastlogin|date_format:"%x, %X"}</strong>
   depuis la machine <strong>{$smarty.session.user->host}</strong>.
 </div>
 {/if}
 
-{if $reminder}
+{if t($reminder)}
 {include file="reminder/base.tpl"}
 {else}
 {include file="include/tips.tpl" full=true}
@@ -149,7 +149,7 @@ Bienvenue {$smarty.session.user->displayName()}{if $birthday}
           {if hasPerm('admin')}
           <a href="admin/events/edit/{$ev.id}">{icon name=page_edit title="Editer cet article"}</a>
           {/if}
-          <a href="events/read/{$ev.id}{if $previd}/newsid{$previd}{/if}" onclick="return readEvent('{$ev.id}')">{icon name=cross title="Cacher cet article"}</a>
+          <a href="events/read/{$ev.id}{if t($previd)}/newsid{$previd}{/if}" onclick="return readEvent('{$ev.id}')">{icon name=cross title="Cacher cet article"}</a>
         </div>
         {assign var="previd" value=$ev.id}
         <a id="newsid{$ev.id}"></a>

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 83ee3aa..6e284eb 100644 (file)
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -153,7 +153,7 @@
         <td class="lt">Profession&nbsp;:</td>
         <td class="rt">
           {if $job->company->url|default:$job->user_site}<a href="{$job->company->url|default:$job->user_site}">{$job->company->name}</a>{else}{$job->company->name}{/if}
-          {if $job->subsubsector}&nbsp;({$job->subsubsector}){/if}{if $job->description}<br />{$job->description}{/if}
+          {if $job->description}<br />{$job->description}{/if}
         </td>
       </tr>
       {/if}

diff --git a/templates/include/tips.tpl b/templates/include/tips.tpl
index 32e2d58..efcc665 100644 (file)
--- a/templates/include/tips.tpl
+++ b/templates/include/tips.tpl
@@ -20,15 +20,17 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{if $tips}
-{if $full}
+{if t($tips)}
+{if t($full)}
 <fieldset id="tod">
 {/if}
-  <legend>{icon name=lightbulb} {if !$tips.special}
+  <legend>{icon name=lightbulb} {if !t($tips.special)}
     Astuce&nbsp;: {$tips.title}
-    {if hasPerm('admin') && !$tips.special && !$nochange}
+    {if hasPerm('admin') && !t($tips.special)}
+    {if !t($nochange)}
     <a href="admin/tips/edit/{$tips.id}">{icon name="page_edit" title="Editer"}</a>
     {/if}
+    {/if}
   {else}
     <span style="color: red; font-weight: bold;">{$tips.titre}</span>
   {/if}
@@ -36,14 +38,14 @@
   {tidy}
   {$tips.text|nl2br|smarty:nodefaults}
   {/tidy}
-  {if !$nochange}
+  {if !t($nochange)}
   <div class="right">
     <a href="events" onclick="Ajax.update_html('tod', 'ajax/tips/{$tips.id}'); return false" style="text-decoration: none">
       Astuce suivante {icon name=resultset_next title="Astuce suivante"}
     </a>
   </div>
   {/if}
-{if $full}
+{if t($full)}
 </fieldset>
 {/if}
 {/if}

diff --git a/templates/profile/jobs.job.tpl b/templates/profile/jobs.job.tpl
index e47caee..112b0da 100644 (file)
--- a/templates/profile/jobs.job.tpl
+++ b/templates/profile/jobs.job.tpl
@@ -57,12 +57,12 @@
         Entreprise n°{$i+1} :
         {if $hiddenjob}
         (masquée)
-        {if !$job.tmp_name}
+        {if !t($job.tmp_name)}
         <input type="hidden" name="{$jobpref}[name]" value="{$job.name}" />
         {/if}
         {else}
-        {if $job.tmp_name}{$job.tmp_name} <small>(en cours de validation)</small>{else}
-        <input type="text" class="enterpriseName{if $job.name_error} error{/if}" size="35" maxlength="100"
+        {if t($job.tmp_name)}{$job.tmp_name} <small>(en cours de validation)</small>{else}
+        <input type="text" class="enterpriseName{if t($job.name_error)} error{/if}" size="35" maxlength="100"
                name="{$jobpref}[name]" value="{$job.name}" />
         {/if}
         {/if}
@@ -71,7 +71,7 @@
         </a>
       </th>
     </tr>
-    {if !$job.tmp_name && !$job.name}
+    {if !t($job.tmp_name)}{if !t($job.name)}
     <tr class="{$entreprise}" {if $hiddenjob}style="display: none"{/if}>
       <td class="center" colspan="2">
         <small>Si l'entreprise ne figure pas dans la liste,
@@ -114,7 +114,7 @@
         <input type="text" maxlength="28" name="{$jobpref}[hq_fax]" />
       </td>
     </tr>
-    {/if}
+    {/if}{/if}
 
     <tr class="pair" {if $hiddenjob}style="display: none"{/if}>
       <td colspan="2" class="center" style="font-style: italic">Place dans l'entreprise</td>
@@ -150,14 +150,14 @@
     <tr class="pair" {if $hiddenjob}style="display: none"{/if}>
       <td class="titre">Description</td>
       <td>
-        <input type="text" size="35" maxlength="120" {if $job.description_error}class="error"{/if}
+        <input type="text" size="35" maxlength="120" {if t($job.description_error)}class="error"{/if}
            name="{$jobpref}[description]" value="{$job.description}" />
       </td>
     </tr>
     <tr class="pair" {if $hiddenjob}style="display: none"{/if}>
       <td class="titre">Page&nbsp;perso</td>
       <td>
-          <input type="text" size="35" maxlength="255" {if $job.w_rul}class="error"{/if}
+          <input type="text" size="35" maxlength="255" {if t($job.w_rul)}class="error"{/if}
                  name="{$jobpref}[w_url]" value="{$job.w_url}" />
       </td>
     </tr>
@@ -184,7 +184,7 @@
     </tr>
     {else}
     {include file="include/emails.combobox.tpl" name=$jobpref|cat:'[w_email]' val=$job.w_email
-             class="pair" i=$i error=$job.w_email_error prefix="w_" pub=$job.w_email_pub id=$i}
+             class="pair" i=$i error=t($job.w_email_error) prefix="w_" pub=$job.w_email_pub id=$i}
     {/if}
     <tr class="pair" {if $hiddenjob}style="display: none"{/if}>
       <td colspan="2">