reverted deafult modifier, added shortcut for manual escaping

[contagged] / templates / entry_show.tpl

diff --git a/templates/entry_show.tpl b/templates/entry_show.tpl
index 3f0c5f22dfdc619475b0c8755e1e7cf66bc30987..fa794bdc2f69a0ef814cadc169718383067e2b0f 100644 (file)
--- a/templates/entry_show.tpl
+++ b/templates/entry_show.tpl
@@ -1,14 +1,14 @@
 {include file="header.tpl"}
 
 {if $entry.photo != ''}
-  <a href="img.php?dn={$entry.dn|escape:url}&amp;.jpg" rel="imagebox" title="{$entry.givenname} {$entry.name}"><img src="img.php?dn={$entry.dn|escape:url}" align="right" class="photo" width="130" /></a>
+  <a href="img.php?dn={$entry.dn|escape:url}&amp;.jpg" rel="imagebox" title="{$entry.givenname|h} {$entry.name|h}"><img src="img.php?dn={$entry.dn|escape:url}" align="right" class="photo" width="130" /></a>
 {/if}
 <h1>
-  <img src="pix/{$entry.type}.png" border="0" width="22" height="22" align="middle" title="{$entry.type}" />
-  {$entry.givenname} {$entry.name}
+  <img src="pix/{$entry.type|h}.png" border="0" width="22" height="22" align="middle" title="{$entry.type|h}" />
+  {$entry.givenname|h} {$entry.name|h}
 </h1>
 
-<table width="100%" {if $user}ondblclick="window.location.href='entry.php?dn={$entry.dn|escape:url}&mode=edit'"{/if}>
+<table width="100%" {if $user}ondblclick="window.location.href='entry.php?dn={$entry.dn|escape:url}&mode=edit'"{/if|h}>
   <tr>
     <td valign="top" width="50%">
       <b>{$lang.business}</b>
@@ -16,24 +16,24 @@
         <table>
           <tr>
             <td colspan="2">
-              {$entry.title} {$entry.givenname} {$entry.name}<br>
+              {$entry.title|h} {$entry.givenname|h} {$entry.name|h}<br>
 {if $entry.organization}
-              <a href="index.php?org={$entry.organization|escape:url}">{$entry.organization}</a><br>
+              <a href="index.php?org={$entry.organization|escape:url}">{$entry.organization|h}</a><br>
 {/if}
 {if $entry.office}
-              {$entry.office}<br>
+              {$entry.office|h}<br>
 {/if}
 {if $entry.street}
-              {$entry.street}<br>
+              {$entry.street|h}<br>
 {/if}
 {if $entry.location}
-              {$entry.zip} {$entry.location}<br>
+              {$entry.zip} {$entry.location|h}<br>
 {/if}
 {if $entry.state}
-              {$entry.state}
+              {$entry.state|h}
 {/if}
 {if $entry.country}
-              {$entry.country}
+              {$entry.country|h}
 {/if}
               <br><br>
             </td>
@@ -41,25 +41,25 @@
 {if $entry.phone}
           <tr>
             <td align="right">{$lang.phone}:</td>
-            <td>{$entry.phone}</td>
+            <td>{$entry.phone|h}</td>
           </tr>
 {/if}
 {if $entry.switchboard}
           <tr>
             <td align="right">{$lang.switchboard}:</td>
-            <td>{$entry.switchboard}</td>
+            <td>{$entry.switchboard|h}</td>
           </tr>
 {/if}
 {if $entry.fax}
           <tr>
             <td align="right">{$lang.fax}:</td>
-            <td>{$entry.fax}</td>
+            <td>{$entry.fax|h}</td>
           </tr>
 {/if}
 {if $entry.pager}
           <tr>
             <td align="right">{$lang.pager}:</td>
-            <td>{$entry.pager}</td>
+            <td>{$entry.pager|h}</td>
           </tr>
 {/if}
 {if $managername}
@@ -71,13 +71,13 @@
 {if $entry.position}
           <tr>
             <td align="right">{$lang.position}:</td>
-            <td>{$entry.position}</td>
+            <td>{$entry.position|h}</td>
           </tr>
 {/if}
 {if $entry.department}
           <tr>
             <td align="right">{$lang.department}:</td>
-            <td>{$entry.department}</td>
+            <td>{$entry.department|h}</td>
           </tr>
 {/if}
 
@@ -94,46 +94,46 @@
         <table>
           <tr>
             <td colspan="2">
-              {$entry.title} {$entry.givenname} {$entry.name}<br>
+              {$entry.title} {$entry.givenname} {$entry.name|h}<br>
 {if $entry.homestreet}
-              {$entry.homestreet|nl2br}<br><br>
+              {$entry.homestreet|h|nl2br}<br><br>
 {/if}
             </td>
           </tr>
 {if $entry.homephone}
           <tr>
             <td align="right">{$lang.homephone}:</td>
-            <td>{$entry.homephone}</td>
+            <td>{$entry.homephone|h}</td>
           </tr>
 {/if}
 {if $entry.mobile}
           <tr>
             <td align="right">{$lang.mobile}:</td>
-            <td>{$entry.mobile}</td>
+            <td>{$entry.mobile|h}</td>
           </tr>
 {/if}
 {if $entry.url}
           <tr>
             <td align="right">{$lang.url}:</td>
-            <td><a href="{$entry.url}" target="_blank">{$entry.url}</a></td>
+            <td><a href="{$entry.url}" target="_blank">{$entry.url|h}</a></td>
           </tr>
 {/if}
 {if $entry.birthday}
           <tr>
             <td align="right">{$lang.birthday}:</td>
-            <td>{$entry.birthday}</td>
+            <td>{$entry.birthday|h}</td>
           </tr>
 {/if}
 {if $entry.anniversary}
           <tr>
             <td align="right">{$lang.anniversary}:</td>
-            <td>{$entry.anniversary|date_format:$conf.dateformat}</td>
+            <td>{$entry.anniversary|date_format:$conf.dateformat|h}</td>
           </tr>
 {/if}
 {if $entry.spouse}
           <tr>
             <td align="right">{$lang.spouse}:</td>
-            <td>{$entry.spouse}</td>
+            <td>{$entry.spouse|h}</td>
           </tr>
 {/if}
 
@@ -148,7 +148,7 @@
             <td valign="top" align="right">{$lang.mail}:</td>
             <td>
               {foreach from=$entry.mail item=mail}
-                <a href="mailto:{$mail}">{$mail}</a><br>
+                <a href="mailto:{$mail|escape:url}">{$mail|h}</a><br>
               {/foreach}
             </td>
           </tr>
@@ -156,13 +156,13 @@
 {if $entry.instantmessenger}
           <tr>
             <td align="right">{$lang.instantmessenger}:</td>
-            <td>{$entry.instantmessenger}</td>
+            <td>{$entry.instantmessenger|h}</td>
           </tr>
 {/if}
 {if $entry.ipphone}
           <tr>
             <td align="right">{$lang.ipphone}:</td>
-            <td>{$entry.ipphone}</td>
+            <td>{$entry.ipphone|h}</td>
           </tr>
 {/if}
 
@@ -189,7 +189,7 @@
             <td id="tedit_insert">
               <span id="tedit_out">
                 {foreach from=$entry.marker item=marker}
-                  <a href="index.php?marker={$marker|escape:url}" class="tag">{$marker}</a> 
+                  <a href="index.php?marker={$marker|escape:url}" class="tag">{$marker|h}</a> 
                 {/foreach}
               </span>
               {if $user}
@@ -226,20 +226,20 @@
          <tr>
            <td align="right">{$lang.certificate}:</td>
            <td><form>
-              <textarea rows=3 cols=28 name='certificate' onClick='this.form.certificate.select();'>{$entry.certificate}</textarea>
+              <textarea rows=3 cols=28 name='certificate' onClick='this.form.certificate.select();'>{$entry.certificate|h}</textarea>
             </form></td>
           </tr>
 {/if}
 {if $entry.domain}
           <tr>
             <td align="right">{$lang.domain}:</td>
-            <td>{$entry.domain}</td>
+            <td>{$entry.domain|h}</td>
           </tr>
 {/if}
 {if $entry.timezone}
           <tr>
             <td align="right">{$lang.timezone}:</td>
-            <td>{$entry.timezone}</td>
+            <td>{$entry.timezone|h}</td>
           </tr>
 {/if}
         </table>