From b6d9c47481bfcae3eddb0b13206c9a518bdb92a4 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Mon, 25 Jun 2007 13:21:43 +0200
Subject: [PATCH] HTML validity fixes

darcs-hash:20070625112143-6e07b-e02dd73d250161681e04305364b67b473840f3a1.gz
---
 inc/init.php                               |  1 +
 inc/smarty/plugins/modifier.noteparser.php |  2 +-
 templates/entry_edit.tpl                   | 80 +++++++++++-----------
 templates/entry_map.tpl                    |  4 +-
 templates/entry_show.tpl                   |  4 +-
 templates/list_entry.tpl                   |  2 +-
 templates/list_map_entry.tpl               |  2 +-
 templates/orgs.tpl                         |  4 +-
 8 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/inc/init.php b/inc/init.php
index 6d16606..c6097b2 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -10,6 +10,7 @@
   define('NL',"\n");
 
   //init session
+  @ini_set('arg_separator.output', '&amp;');
   session_name("ldapab");
   session_start();
 
diff --git a/inc/smarty/plugins/modifier.noteparser.php b/inc/smarty/plugins/modifier.noteparser.php
index 0f96f00..10b145a 100644
--- a/inc/smarty/plugins/modifier.noteparser.php
+++ b/inc/smarty/plugins/modifier.noteparser.php
@@ -36,7 +36,7 @@ function smarty_modifier_noteparser($string){
     $string = preg_replace('!\n\n+!','</p><p>',$string);
     $string = nl2br($string);
 
-    return '<p>'.$string.'</p>';
+    return '<p>'.$string.'&nbsp;</p>';
 }
 
 /* vim: set expandtab: */
diff --git a/templates/entry_edit.tpl b/templates/entry_edit.tpl
index bfaad4d..62b43d2 100644
--- a/templates/entry_edit.tpl
+++ b/templates/entry_edit.tpl
@@ -4,7 +4,7 @@
 
 <h1>
   {if $entry.type != ''}
-  <img src="pix/{$entry.type|h}.png" border="0" width="22" height="22" align="middle" title="{$entry.type|h}">
+  <img src="pix/{$entry.type|h}.png" border="0" width="22" height="22" align="middle" title="{$entry.type|h}" alt="" />
   {/if}
   {$entry.givenname|h} {$entry.name|h}
 </h1>
@@ -22,19 +22,19 @@
 {* always required ... if $fields.name *}
         <tr>
           <th>{$lang.name}:</th>
-          <td><input type="text" class="input ac" name="entry[name]" value="{$entry.name|h}" id="firstfield"></td>
+          <td><input type="text" class="input ac" name="entry[name]" value="{$entry.name|h}" id="firstfield" /></td>
         </tr>
 {* /if *}
 {if $fields.givenname}
         <tr>
           <th>{$lang.givenname}:</th>
-          <td><input type="text" class="input ac" name="entry[givenname]" value="{$entry.givenname|h}"></td>
+          <td><input type="text" class="input ac" name="entry[givenname]" value="{$entry.givenname|h}" /></td>
         </tr>
 {/if}
 {if $fields.title}
         <tr>
           <th>{$lang.title}:</th>
-          <td><input type="text" class="input ac" name="entry[title]" value="{$entry.title|h}"></td>
+          <td><input type="text" class="input ac" name="entry[title]" value="{$entry.title|h}" /></td>
         </tr>
 {/if}
       </table>
@@ -58,70 +58,70 @@
         <tr>
           <th>{$lang.organization}:</th>
           <td>
-            <input type="text" class="input ac" name="entry[organization]" value="{$entry.organization|h}">
+            <input type="text" class="input ac" name="entry[organization]" value="{$entry.organization|h}" />
           </td>
         </tr>
 {/if}
 {if $fields.office}
         <tr>
           <th>{$lang.office}:</th>
-          <td><input type="text" class="input ac" name="entry[office]" value="{$entry.office|h}"></td>
+          <td><input type="text" class="input ac" name="entry[office]" value="{$entry.office|h}" /></td>
         </tr>
 {/if}
 {if $fields.street}
         <tr>
           <th>{$lang.street}:</th>
-          <td><input type="text" class="input ac" name="entry[street]" value="{$entry.street|h}"></td>
+          <td><input type="text" class="input ac" name="entry[street]" value="{$entry.street|h}" /></td>
         </tr>
 {/if}
 {if $fields.zip}
         <tr>
           <th>{$lang.zip}:</th>
-          <td><input type="text" class="input ac" name="entry[zip]" value="{$entry.zip|h}"></td>
+          <td><input type="text" class="input ac" name="entry[zip]" value="{$entry.zip|h}" /></td>
         </tr>
 {/if}
 {if $fields.location}
         <tr>
           <th>{$lang.location}:</th>
-          <td><input type="text" class="input ac" name="entry[location]" value="{$entry.location|h}"></td>
+          <td><input type="text" class="input ac" name="entry[location]" value="{$entry.location|h}" /></td>
         </tr>
 {/if}
 {if $fields.state}
         <tr>
           <th>{$lang.state}:</th>
-          <td><input type="text" class="input ac" name="entry[state]" value="{$entry.state|h}"></td>
+          <td><input type="text" class="input ac" name="entry[state]" value="{$entry.state|h}" /></td>
         </tr>
 {/if}
 {if $fields.country}
         <tr>
           <td align="right" valign="top">{$lang.country}:</td>
           <td>
-            <input type="text" class="input ac" name="entry[country]" value="{$entry.country|h}"><br />
+            <input type="text" class="input ac" name="entry[country]" value="{$entry.country|h}" /><br />
           </td>
         </tr>
 {/if}
 {if $fields.phone}
         <tr>
           <th>{$lang.phone}:</th>
-          <td><input type="text" class="input" name="entry[phone]" value="{$entry.phone|h}"></td>
+          <td><input type="text" class="input" name="entry[phone]" value="{$entry.phone|h}" /></td>
         </tr>
 {/if}
 {if $fields.switchboard}
         <tr>
           <th>{$lang.switchboard}:</th>
-          <td><input type="text" class="input" name="entry[switchboard]" value="{$entry.switchboard|h}"></td>
+          <td><input type="text" class="input" name="entry[switchboard]" value="{$entry.switchboard|h}" /></td>
         </tr>
 {/if}
 {if $fields.fax}
         <tr>
           <th>{$lang.fax}:</th>
-          <td><input type="text" class="input" name="entry[fax]" value="{$entry.fax|h}"></td>
+          <td><input type="text" class="input" name="entry[fax]" value="{$entry.fax|h}" /></td>
         </tr>
 {/if}
 {if $fields.pager}
         <tr>
           <th>{$lang.pager}:</th>
-          <td><input type="text" class="input" name="entry[pager]" value="{$entry.pager|h}"></td>
+          <td><input type="text" class="input" name="entry[pager]" value="{$entry.pager|h}" /></td>
         </tr>
 {/if}
 {if $fields.manager}
@@ -138,13 +138,13 @@
 {if $fields.position}
         <tr>
           <td align="right" valign="top">{$lang.position}:</td>
-          <td><input type="text" class="input ac" name="entry[position]" value="{$entry.position|h}"></td>
+          <td><input type="text" class="input ac" name="entry[position]" value="{$entry.position|h}" /></td>
         </tr>
 {/if}
 {if $fields.department}
         <tr>
           <td align="right" valign="top">{$lang.department}:</td>
-          <td><input type="text" class="input ac" name="entry[department]" value="{$entry.department|h}"></td>
+          <td><input type="text" class="input ac" name="entry[department]" value="{$entry.department|h}" /></td>
         </tr>
 {/if}
 
@@ -155,7 +155,7 @@
 
       <table width="100%">
         <tr>
-          <td colspan="2"><h3>{$lang.private}</b></h3>
+          <td colspan="2"><h3>{$lang.private}</h3></td>
         </tr>
 {if $fields.homestreet}
         <tr>
@@ -166,43 +166,43 @@
 {if $fields.homephone}
         <tr>
           <th>{$lang.homephone}:</th>
-          <td><input type="text" class="input" name="entry[homephone]" value="{$entry.homephone|h}"></td>
+          <td><input type="text" class="input" name="entry[homephone]" value="{$entry.homephone|h}" /></td>
         </tr>
 {/if}
 {if $fields.mobile}
         <tr>
           <th>{$lang.mobile}:</th>
-          <td><input type="text" class="input" name="entry[mobile]" value="{$entry.mobile|h}"></td>
+          <td><input type="text" class="input" name="entry[mobile]" value="{$entry.mobile|h}" /></td>
         </tr>
 {/if}
 {if $fields.photo}
         <tr>
           <th>{$lang.photo}:<br /><span class="hint">({$lang.msg_jpegonly})</span></th>
           <td>{if $entry.photo}
-                <input type="checkbox" class="radio" name="delphoto" id="delphoto" value="1">
+                <input type="checkbox" class="radio" name="delphoto" id="delphoto" value="1" />
                 <label for="delphoto">{$lang.delphoto}</label>
                 <br />
               {/if}
-            <input type="file" class="input" name="photoupload">
+            <input type="file" class="input" name="photoupload" />
           </td>
         </tr>
 {/if}
 {if $fields.birthday}
         <tr>
           <td align="right" valign="top">{$lang.birthday}:<br /><span class="hint">({$lang.msg_dateformat})</span></td>
-          <td><input type="text" class="input" name="entry[birthday]" value="{$entry.birthday|h}" maxlength="10"></td>
+          <td><input type="text" class="input" name="entry[birthday]" value="{$entry.birthday|h}" maxlength="10" /></td>
         </tr>
 {/if}
 {if $fields.anniversary}
         <tr>
           <th>{$lang.anniversary}:<br /><span class="hint">({$lang.msg_dateformat})</span></th>
-          <td><input type="text" class="input" name="entry[anniversary]" value="{$entry.anniversary|h}" maxlength="10"></td>
+          <td><input type="text" class="input" name="entry[anniversary]" value="{$entry.anniversary|h}" maxlength="10" /></td>
         </tr>
 {/if}
 {if $fields.spouse}
         <tr>
           <th>{$lang.spouse}:</th>
-          <td><input type="text" class="input" name="entry[spouse]" value="{$entry.spouse|h}"></td>
+          <td><input type="text" class="input" name="entry[spouse]" value="{$entry.spouse|h}" /></td>
         </tr>
 {/if}
 
@@ -212,35 +212,35 @@
 {if $fields.url}
         <tr>
           <th>{$lang.url}:</th>
-          <td><input type="text" class="input" name="entry[url]" value="{$entry.url|h}"></td>
+          <td><input type="text" class="input" name="entry[url]" value="{$entry.url|h}" /></td>
         </tr>
 {/if}
 {if $fields._mail}
         {foreach from=$entry.mail|smarty:nodefaults item=mail}
         <tr>
           <th>{$lang.mail} {counter}:</th>
-          <td><input type="text" class="input" name="entry[mail][]" value="{$mail}"></td>
+          <td><input type="text" class="input" name="entry[mail][]" value="{$mail}" /></td>
         </tr>
         {/foreach}
         <tr>
           <th>{$lang.mail} {counter}:</th>
-          <td><input type="text" class="input" name="entry[mail][]" value=""></td>
+          <td><input type="text" class="input" name="entry[mail][]" value="" /></td>
         </tr>
         <tr>
           <th>{$lang.mail} {counter}:</th>
-          <td><input type="text" class="input" name="entry[mail][]" value=""></td>
+          <td><input type="text" class="input" name="entry[mail][]" value="" /></td>
         </tr>
 {/if}
 {if $fields.instantmessenger}
         <tr>
           <td align="right" valign="top">{$lang.instantmessenger}:</td>
-          <td><input type="text" class="input" name="entry[instantmessenger]" value="{$entry.instantmessenger|h}"></td>
+          <td><input type="text" class="input" name="entry[instantmessenger]" value="{$entry.instantmessenger|h}" /></td>
         </tr>
 {/if}
 {if $fields.ipphone}
         <tr>
           <td align="right" valign="top">{$lang.ipphone}:</td>
-          <td><input type="text" class="input" name="entry[ipphone]" value="{$entry.ipphone|h}"></td>
+          <td><input type="text" class="input" name="entry[ipphone]" value="{$entry.ipphone|h}" /></td>
         </tr>
 {/if}
 
@@ -262,7 +262,7 @@
 {if $fields.note}
         <tr>
           <td align="right" valign="top">{$lang.note}:</td>
-          <td align="right"><textarea class="input" rows="6" cols="30" name="entry[note]" class="note">{$entry.note|h}</textarea></td>
+          <td align="right"><textarea rows="6" cols="30" name="entry[note]" class="input note">{$entry.note|h}</textarea></td>
         </tr>
 {/if}
 
@@ -283,21 +283,21 @@
           <td align="right" valign="top">{$lang.certificate}:</td>
           <td>
             <textarea name="entry[certificate]" class="input" rows="6" cols="28" onClick="this.form.elements['entry[certificate]'].select();">{$entry.certificate|h}</textarea>
-            <br /><input type="button" name="clearCert" value="Clear" onClick="if (confirm('Are you sure?')) this.form.elements['entry[certificate]'].value='';">
+            <br /><input type="button" name="clearCert" value="Clear" onclick="if (confirm('Are you sure?')) this.form.elements['entry[certificate]'].value='';" />
           </td>
         </tr>
 {/if}
 {if $fields.domain}
         <tr>
           <td align="right" valign="top">{$lang.domain}:</td>
-          <td><input type="text" class="input" name="entry[domain]" value="{$entry.domain|h}"></td>
+          <td><input type="text" class="input" name="entry[domain]" value="{$entry.domain|h}" /></td>
         </tr>
 {/if}
 {if $fields.timezone}
         <tr>
           <td align="right" valign="top">{$lang.timezone}:</td>
           <td>
-            <input type="text" class="inputbr" name="entry[timezone]" value="{$entry.timezone|h}"><br />
+            <input type="text" class="inputbr" name="entry[timezone]" value="{$entry.timezone|h}" /><br />
           </td>
         </tr>
 {/if}
@@ -310,17 +310,17 @@
     <td colspan="2" align="center">
       {$lang.msg_addto}<br />
       <table><tr><td>
-      <input type="radio" name="type" value="public" id="typepublic" class="radio" checked="checked">
-      <label for="typepublic"><img src="pix/public.png" border="0" width="16" height="16" align="middle">{$lang.publicbook}</label><br />
-      <input type="radio" name="type" value="private" id="typeprivate" class="radio">
-      <label for="typeprivate"><img src="pix/private.png" border="0" width="16" height="16" align="middle">{$lang.privatebook}</label>
+      <input type="radio" name="type" value="public" id="typepublic" class="radio" checked="checked" />
+      <label for="typepublic"><img src="pix/public.png" border="0" width="16" height="16" align="middle" />{$lang.publicbook}</label><br />
+      <input type="radio" name="type" value="private" id="typeprivate" class="radio" />
+      <label for="typeprivate"><img src="pix/private.png" border="0" width="16" height="16" align="middle" />{$lang.privatebook}</label>
       </td></tr></table>
     </td>
   </tr>
   {/if}
 
   <tr>
-    <td colspan="2" align="center"><br /><input type="submit" class="button" value="{$lang.submit}"></td>
+    <td colspan="2" align="center"><br /><input type="submit" class="button" value="{$lang.submit}" /></td>
   </tr>
 </table>
 
diff --git a/templates/entry_map.tpl b/templates/entry_map.tpl
index 04e6038..5fb83e0 100644
--- a/templates/entry_map.tpl
+++ b/templates/entry_map.tpl
@@ -5,11 +5,11 @@
     gmap_data = [
         {ldelim}
             adr: '{$entry.street|escape:javascript}, {$entry.zip|escape:javascript} {$entry.location|escape:javascript}',
-            info: '<h4>{$lang.business|escape:javascript}</h4>{$entry.street|escape:javascript}<br />{$entry.zip|escape:javascript} {$entry.location|escape:javascript}'
+            info: '\x3ch4\x3e{$lang.business|escape:javascript}\x3c/h4\x3e{$entry.street|escape:javascript}\x3cbr /\x3e{$entry.zip|escape:javascript} {$entry.location|escape:javascript}'
         {rdelim},
         {ldelim}
             adr: '{$entry.homestreet|replace:"\n":", "|escape:javascript}',
-            info: '<h4>{$lang.private|escape:javascript}</h4>{$entry.homestreet|replace:"\n":"<br />"|escape:javascript}'
+            info: '\x3ch4\x3c{$lang.private|escape:javascript}\x3c/h4\x3e{$entry.homestreet|replace:"\n":"\x3cbr /\x3e"|escape:javascript}'
         {rdelim}
     ];
 </script>
diff --git a/templates/entry_show.tpl b/templates/entry_show.tpl
index a626377..18cc419 100644
--- a/templates/entry_show.tpl
+++ b/templates/entry_show.tpl
@@ -5,7 +5,7 @@
 {if $entry.photo != ''}
     <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>
+       align="right" class="photo" width="130" alt="" /></a>
 {/if}
 <h1>
     <img src="pix/{$entry.type|h}.png" border="0" width="22" height="22"
@@ -41,7 +41,7 @@
 {if $entry.country}
               {$entry.country|h}
 {/if}
-              </br /><br />
+              <br /><br />
             </td>
           </tr>
 {if $entry.phone}
diff --git a/templates/list_entry.tpl b/templates/list_entry.tpl
index 65729b0..847e863 100644
--- a/templates/list_entry.tpl
+++ b/templates/list_entry.tpl
@@ -20,7 +20,7 @@
         {if $entry.photo}
             <a href="img.php?dn={$entry.dn|escape:url}&amp;.jpg" rel="imagebox" target="_blank"
                title="{$entry.givenname|escape} {$entry.name|escape}"><img src="pix/image.png"
-               border="0" width="16" height="16" align="middle" alt="{$lang.photo|h}"></a>
+               border="0" width="16" height="16" align="middle" alt="{$lang.photo|h}" /></a>
         {else}
             &nbsp;
         {/if}
diff --git a/templates/list_map_entry.tpl b/templates/list_map_entry.tpl
index 5557416..3397583 100644
--- a/templates/list_map_entry.tpl
+++ b/templates/list_map_entry.tpl
@@ -1,7 +1,7 @@
 
 {ldelim}
     adr: '{$entry.street|escape:javascript}, {$entry.zip|escape:javascript} {$entry.location|escape:javascript}',
-    info: '<h4>{$entry.organization|escape:javascript}</h4>{$entry.street|escape:javascript}<br />{$entry.zip|escape:javascript} {$entry.location|escape:javascript}'
+    info: '\x3ch4\x3e{$entry.organization|escape:javascript}\x3c/h4\x3e{$entry.street|escape:javascript}\x3cbr /\x3e{$entry.zip|escape:javascript} {$entry.location|escape:javascript}'
 {rdelim},
 
 
diff --git a/templates/orgs.tpl b/templates/orgs.tpl
index ba6bfb5..eaf005e 100644
--- a/templates/orgs.tpl
+++ b/templates/orgs.tpl
@@ -4,10 +4,10 @@
 {foreach from=$orgs item=org}
     <tr>
         <td class="result" width="20">
-            <img src="pix/cog.png" border="0" width="16" height="16" align="middle" />
+            <img src="pix/cog.png" border="0" width="16" height="16" align="middle" alt="" />
         </td>
         <td class="result">
-            <a href="index.php?org={$org|escape:url}">{$org|h}</a><br>
+            <a href="index.php?org={$org|escape:url}">{$org|h}</a><br />
         </td>
     </tr>
 {foreachelse}
-- 
2.39.5