Index: openacs-4/packages/photo-album/tcl/photo-album-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/tcl/photo-album-procs.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/photo-album/tcl/photo-album-procs.tcl	14 Oct 2013 17:56:29 -0000	1.20
+++ openacs-4/packages/photo-album/tcl/photo-album-procs.tcl	23 Jun 2015 16:34:08 -0000	1.21
@@ -585,11 +585,19 @@
     # append the 'prev' link
     append photo_nav_html "<div class=\"photo_album_nav\">\n"
     if { $prev_id ne "" } {
-	append photo_nav_html "\t<div style=\"text-align: left; float: left; margin-right: 1em; margin-bottom: 1em\">\n\t\t<a href=\"${link}$prev_id\">&lt;&lt;&nbsp;[_ photo-album.Prev]$what</a>\n\t</div>\n"
+	append photo_nav_html [subst {
+	    <div style="text-align: left; float: left; margin-right: 1em; margin-bottom: 1em">
+	    <a href="[ns_quotehtml ${link}$prev_id]">&lt;&lt;&nbsp;[_ photo-album.Prev]$what</a>
+	    </div>
+	}]
     }
     # append the 'next' link
     if { $next_id ne "" } {
-	append photo_nav_html "\t<div style=\"text-align: right; float: right; margin-left: 1em; margin-bottom: 1em\">\n\t\t<a href=\"${link}$next_id\">[_ photo-album.Netx]$what&nbsp;&gt;&gt;</a>\n\t</div>\n"
+	append photo_nav_html [subst {
+	    <div style="text-align: right; float: right; margin-left: 1em; margin-bottom: 1em">
+	    <a href="[ns_quotehtml ${link}$next_id]">[_ photo-album.Netx]$what&nbsp;&gt;&gt;</a>
+	    </div>
+	}]
     }
 
     # append page number links for all pages except for this page
@@ -604,7 +612,7 @@
 	if { $cur_id == $id } {
 	    append photo_nav_html "\t\t<strong>$i</strong>\n"
 	} else {
-	    append photo_nav_html "\t\t<a href=\"${link}$id\">$i</a>\n"
+	    append photo_nav_html [subst {<a href="[ns_quotehtml ${link}$id]">$i</a>}]
 	}
 	
     }
Index: openacs-4/packages/photo-album/www/album-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-delete.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/photo-album/www/album-delete.adp	12 Sep 2013 20:39:24 -0000	1.5
+++ openacs-4/packages/photo-album/www/album-delete.adp	23 Jun 2015 16:34:08 -0000	1.6
@@ -3,14 +3,14 @@
 <property name="context">@context_list@</property>
 
 <form method=POST action=album-delete>
-<input type=hidden name=album_id value=@album_id@>
-<input type=hidden name=confirmed_p value="t">
+<input type="hidden" name="album_id" value="@album_id@">
+<input type="hidden" name="confirmed_p" value="t">
 
 <p>#photo-album.lt_Are_you_sure_you_want#
 
 <p>
 <center>
-<input type=submit value="#photo-album._Yes_Delete#">
+<input type="submit" value="#photo-album._Yes_Delete#">
 </center>
 
 </form>
Index: openacs-4/packages/photo-album/www/folder-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-delete.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/photo-album/www/folder-delete.adp	12 Sep 2013 20:39:24 -0000	1.5
+++ openacs-4/packages/photo-album/www/folder-delete.adp	23 Jun 2015 16:34:08 -0000	1.6
@@ -3,14 +3,14 @@
 <property name="context">@context_list@</property>
 
 <form method=POST action=folder-delete>
-<input type=hidden name=folder_id value=@folder_id@>
-<input type=hidden name=confirmed_p value="t">
+<input type="hidden" name="folder_id" value="@folder_id@">
+<input type="hidden" name="confirmed_p" value="t">
 
 <p>#photo-album.lt_Are_you_sure_you_want_1#
 
 <p>
 <center>
-<input type=submit value="#photo-album._Yes_Delete#">
+<input type="submit" value="#photo-album._Yes_Delete#">
 </center>
 
 </form>
Index: openacs-4/packages/photo-album/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/index.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/photo-album/www/index.adp	12 Sep 2013 20:39:24 -0000	1.9
+++ openacs-4/packages/photo-album/www/index.adp	23 Jun 2015 16:34:08 -0000	1.10
@@ -31,8 +31,8 @@
 
 <table border="0">
  <tr class="list-header">
-  <td align=center>#photo-album.Name#</td>
-  <td align=center>#photo-album.Description#</td>
+  <td align="center">#photo-album.Name#</td>
+  <td align="center">#photo-album.Description#</td>
  </tr>
 
 <multiple name="child">
Index: openacs-4/packages/photo-album/www/photo-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/photo-album/www/photo-delete.adp	12 Sep 2013 20:39:25 -0000	1.4
+++ openacs-4/packages/photo-album/www/photo-delete.adp	23 Jun 2015 16:34:08 -0000	1.5
@@ -4,13 +4,13 @@
 
 <image src="images/@path@" height=@height@ width=@width@>
 <form method=POST action=photo-delete>
-<input type=hidden name=photo_id value=@photo_id@>
-<input type=hidden name=confirmed_p value="t">
+<input type="hidden" name="photo_id" value="@photo_id@">
+<input type="hidden" name="confirmed_p" value="t">
 
 <p>#photo-album.lt_Are_you_sure_you_want_2#
 <p>
 <center>
-<input type=submit value="#photo-album._Yes_Delete#">
+<input type="submit" value="#photo-album._Yes_Delete#">
 </center>
 
 </form>
Index: openacs-4/packages/photo-album/www/photo-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/photo-album/www/photo-edit.adp	12 Sep 2013 20:39:25 -0000	1.4
+++ openacs-4/packages/photo-album/www/photo-edit.adp	23 Jun 2015 16:34:08 -0000	1.5
@@ -8,15 +8,15 @@
   <table>
     <tr bgcolor="#F0F0F0">
       <td>&nbsp;</td>
-      <td align=center>
-	<input type=radio name="d.@photo_id@" value=0 checked>
+      <td align="center">
+	<input type="radio" name="d.@photo_id@" value="0" checked>
       </td>
       <td>&nbsp;</td>
-      <td rowspan=3>
+      <td rowspan="3">
 	<table>
           <tr>
 	    <td>
-	      #photo-album.Hide#: <input @checked_string@ type=checkbox name="hide" value=1>
+	      #photo-album.Hide#: <input @checked_string@ type="checkbox" name="hide" value="1">
 	    </td>
 	  </tr>
           <tr>
@@ -44,21 +44,21 @@
     </tr>
     <tr bgcolor="#F0F0F0">
       <td>
-	<input type=radio name="d.@photo_id@" value=90>
+	<input type="radio" name="d.@photo_id@" value="90">
       </td>
-      <td align=center>
+      <td align="center">
 	<img src="images/@thumb_path@" width="@thumb_width@" height="@thumb_height@">
       </td>
       <td>
-	<input type=radio name="d.@photo_id@" value=270>
+	<input type="radio" name="d.@photo_id@" value="270">
       </td>
     </tr>
     <tr bgcolor="#F0F0F0">
       <td>
 	&nbsp;
       </td>
-      <td align=center>
-	<input type=radio name="d.@photo_id@" value=180>
+      <td align="center">
+	<input type="radio" name="d.@photo_id@" value="180">
       </td>
       <td>
 	&nbsp;
Index: openacs-4/packages/photo-album/www/photo.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/photo-album/www/photo.adp	12 Sep 2013 20:39:25 -0000	1.11
+++ openacs-4/packages/photo-album/www/photo.adp	23 Jun 2015 16:34:08 -0000	1.12
@@ -32,10 +32,10 @@
     </if>
     <if @write_p@ eq 1 or @move_p@ eq 1 or @delete_p@ eq 1><ul>
 	<if @show_html_p@ eq 1>
-          <li><a href="photo.tcl?photo_id=@photo_id@&show_html_p=0">#photo-album.hide_html#</a></li>  
+          <li><a href="photo.tcl?photo_id=@photo_id@&amp;show_html_p=0">#photo-album.hide_html#</a></li>  
 	</if>
 	<else>
-          <li><a href="photo.tcl?photo_id=@photo_id@&show_html_p=1">#photo-album.show_html#</a></li>  
+          <li><a href="photo.tcl?photo_id=@photo_id@&amp;show_html_p=1">#photo-album.show_html#</a></li>  
 	</else>
         <if @write_p@ eq 1>
           <li><a href="photo-iconic?photo_id=@photo_id@">#photo-album.lt_Make_this_photo_the_i#</a>
@@ -93,7 +93,7 @@
     <if @clipped:rowcount@ gt 0> 
       #photo-album.lt_This_photo_clipped_to# 
       <multiple name="clipped"> 
-        <a href="clipboard-view?collection_id=@clipped.collection_id@">@clipped.title@</a>&nbsp;[<a href="clipboard-remove?collection_id=@clipped.collection_id@&photo_id=@photo_id@">#photo-album.remove#</a>]&nbsp;
+        <a href="clipboard-view?collection_id=@clipped.collection_id@">@clipped.title@</a>&nbsp;[<a href="clipboard-remove?collection_id=@clipped.collection_id@&amp;photo_id=@photo_id@">#photo-album.remove#</a>]&nbsp;
       </multiple>
     </if>
     <if @clipboards:rowcount@ gt 1>
Index: openacs-4/packages/photo-album/www/photos-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-edit.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/photo-album/www/photos-edit.adp	12 Sep 2013 20:39:25 -0000	1.7
+++ openacs-4/packages/photo-album/www/photos-edit.adp	23 Jun 2015 16:34:08 -0000	1.8
@@ -31,22 +31,22 @@
 </ul>
 <if @child_photo:rowcount@ gt 0>
    <form action="photos-edit-2">
-      <input type=hidden name=album_id value="@album_id@">
-      <input type=hidden name=page value="@page@">            
-      <input type=submit value=Submit>
+      <input type="hidden" name="album_id" value="@album_id@">
+      <input type="hidden" name="page" value="@page@">            
+      <input type="submit" value="Submit">
         <table>
           <multiple name="child_photo">
                 <if @child_photo.rownum@ odd><tr bgcolor="#F0F0F0"></if><else><tr bgcolor="#FFFFFF"></else>
               <td>&nbsp;</td>
-              <td align=center><input type=radio name="d.@child_photo.photo_id@"
-                                      value=0 checked></td>
+              <td align="center"><input type="radio" name="d.@child_photo.photo_id@"
+                                      value="0" checked></td>
               <td>&nbsp;</td>
-              <td rowspan=3>
+              <td rowspan="3">
                     <table>
-                      <tr><td>#photo-album.Hide_1#</td><td><if @child_photo.hide_p@ ne 0><input type=checkbox name="hide.@child_photo.photo_id@" value=1></if><else><input checked type=checkbox name="hide.@child_photo.photo_id@" value=0></else></td></tr>
+                      <tr><td>#photo-album.Hide_1#</td><td><if @child_photo.hide_p@ ne 0><input type="checkbox" name="hide.@child_photo.photo_id@" value="1"></if><else><input checked type="checkbox" name="hide.@child_photo.photo_id@" value="0"></else></td></tr>
                       <tr><td>#photo-album.Sequence#</td><td><input type="text" name="sequence.@child_photo.photo_id@" value="@child_photo.sequence@" size="4"></td></tr>
-                      <tr><td>#photo-album.Caption_1#</td><td><input type=text name="caption.@child_photo.photo_id@" value="@child_photo.caption@" size=60></td></tr>
-                      <tr><td>#photo-album.Title_1#</td><td><input type=text name="photo_title.@child_photo.photo_id@" value="@child_photo.photo_title@" size=60></td></tr>
+                      <tr><td>#photo-album.Caption_1#</td><td><input type="text" name="caption.@child_photo.photo_id@" value="@child_photo.caption@" size="60"></td></tr>
+                      <tr><td>#photo-album.Title_1#</td><td><input type="text" name="photo_title.@child_photo.photo_id@" value="@child_photo.photo_title@" size="60"></td></tr>
                       <tr><td>#photo-album.Story_1#</td><td><textarea name="photo_story.@child_photo.photo_id@" cols="60" wrap="soft" rows="3">@child_photo.photo_story@</textarea></td></tr>
                       <tr><td>#photo-album.Description_1#</td><td><textarea name="photo_description.@child_photo.photo_id@" cols="60" wrap="soft" rows="3">@child_photo.photo_description@</textarea></td></tr>
 	
@@ -55,19 +55,19 @@
               </td>
             </tr>
             <if @child_photo.rownum@ odd><tr bgcolor="#F0F0F0"></if><else><tr bgcolor="#FFFFFF"></else>
-              <td><input type=radio name="d.@child_photo.photo_id@" value=90></td>
-              <td align=center><a
+              <td><input type="radio" name="d.@child_photo.photo_id@" value="90"></td>
+              <td align="center"><a
                                   href="photo?photo_id=@child_photo.photo_id@" onclick="javascript:w=window.open('images/@child_photo.viewer_path@','@child_photo.photo_id@','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no,width=@child_photo.window_width@,height=@child_photo.window_height@');w.focus();return false;"><img src="images/@child_photo.thumb_path@" width="@child_photo.thumb_width@" height="@child_photo.thumb_height@"></a></td>
-              <td><input type=radio name="d.@child_photo.photo_id@" value=270></td>
+              <td><input type="radio" name="d.@child_photo.photo_id@" value="270"></td>
             </tr>
             <if @child_photo.rownum@ odd><tr bgcolor="#F0F0F0"></if><else><tr bgcolor="#FFFFFF"></else>
               <td>&nbsp;</td>
-              <td align=center><input type=radio name="d.@child_photo.photo_id@" value=180></td>
+              <td align="center"><input type="radio" name="d.@child_photo.photo_id@" value="180"></td>
               <td>&nbsp;</td>
             </tr>
           </multiple>
         </table>
-        <input type=submit value=Submit>
+        <input type="submit" value="Submit">
     </form>
 </if><else>
 <p>#photo-album.lt_This_album_does_not_c#