Index: luna/add_success.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/add_success.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- luna/add_success.html       23 Aug 2006 20:53:31 -0000      1.15
+++ luna/add_success.html       6 Sep 2007 01:36:04 -0000       1.16
@@ -46,15 +46,15 @@
 </div>
 <div class="row clear">
   <label class="name">Description:</label>
-  <div class="value wrappedtext"><%Description%></div>
+  <div class="value wrappedtext"><%escape_html Description%></div>
 </div>
 <div class="row clear">
   <label class="name">Contact Name:</label>
-  <div class="value wrappedtext"><%Contact_Name%></div>
+  <div class="value wrappedtext"><%escape_html Contact_Name%></div>
 </div>
 <div class="row clear">
   <label class="name">Contact E-mail:</label>
-  <div class="value wrappedtext"><%Contact_Email%></div>
+  <div class="value wrappedtext"><%escape_html Contact_Email%></div>
 </div>

 <p>
Index: luna/bookmark_folder_view.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/bookmark_folder_view.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- luna/bookmark_folder_view.html      23 Aug 2006 20:53:31 -0000      1.18
+++ luna/bookmark_folder_view.html      6 Sep 2007 01:36:04 -0000       1.19
@@ -2,7 +2,7 @@
 <%~set secondarynav = "bookmark_nav.html"%>
 <html>
 <head>
-  <title><%site_title%>: Bookmarks: <%my_folder_username%><%if my_folder_name%>: <%my_folder_name%><%else%>'s Bookmarks<%endif%></title>
+  <title><%site_title%>: Bookmarks: <%escape_html my_folder_username%><%if my_folder_name%>: <%my_folder_name%><%else%>'s Bookmarks<%endif%></title>
 <%include include_common_head.html%>
 </head>
 <body id="bookmark_folder_view">
@@ -21,13 +21,13 @@
 <%include include_content_top.html%>

 <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div>
-<h2><%my_folder_username%><%if my_folder_name%>: <%my_folder_name%><%else%>'s Bookmarks<%endif%></h2>
+<h2><%escape_html my_folder_username%><%if my_folder_name%>: <%my_folder_name%><%else%>'s Bookmarks<%endif%></h2>

 <p>
 <%~if my_folder_name%>
   There <%if link_count != 1%>are<%else%>is<%endif%> <%link_count%> link<%if link_count != 1%>s<%endif%> in this folder.
 <%~else%>
-  <%if my_folder_username eq $user.Username%>You have<%else%><%my_folder_username%> has<%endif%> <%folder_count%> folder<%if folder_count != 1%>s<%endif%> with <%link_count%> link<%if link_count != 1%>s<%endif%>.
+  <%if my_folder_username eq $user.Username%>You have<%else%><%escape_html my_folder_username%> has<%endif%> <%folder_count%> folder<%if folder_count != 1%>s<%endif%> with <%link_count%> link<%if link_count != 1%>s<%endif%>.
 <%~endif%>
 </p>

Index: luna/bookmark_link.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/bookmark_link.html,v
retrieving revision 1.4
retrieving revision 1.6
diff -u -r1.4 -r1.6
--- luna/bookmark_link.html     17 Feb 2005 01:28:34 -0000      1.4
+++ luna/bookmark_link.html     6 Sep 2007 01:36:04 -0000       1.6
@@ -3,8 +3,8 @@
 <%include link.html%>
 <%~if editable or my_comment%>
   <p class="comments">
-    <label><%if my_folder_user_username_fk eq $user.Username%>My<%else%><%my_folder_user_username_fk%>'s<%endif%> Comments
-    <%~if editable%> <span>(<a href="<%config.db_cgi_url%>/bookmark.cgi?action=edit_bookmark;id=<%my_link_id_fk%>">edit</a>)</span><%endif~%>
+    <label><%if my_folder_user_username_fk eq $user.Username%>My<%else%><%escape_html my_folder_user_username_fk%>'s<%endif%> Comments
+    <%~if editable%> <span>(<a href="<%config.db_cgi_url%>/bookmark.cgi?action=edit_bookmark;my_id=<%my_id%>">edit</a>)</span><%endif~%>
     :</label> <%if my_comment%><%my_comment%><%else%><em>none</em><%endif%>
   </p>
 <%~endif%>
Index: luna/bookmark_link_edit.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/bookmark_link_edit.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- luna/bookmark_link_edit.html        23 Aug 2006 20:53:31 -0000      1.18
+++ luna/bookmark_link_edit.html        26 Oct 2006 19:44:23 -0000      1.19
@@ -33,7 +33,7 @@

 <form action="<%config.db_cgi_url%>/bookmark.cgi" method="post">
   <input type="hidden" name="action" value="edit_bookmark" />
-  <input type="hidden" name="id" value="<%escape_html ID%>" />
+  <input type="hidden" name="my_id" value="<%escape_html my_id%>" />
   <div class="row clear">
     <label for="my_comment" class="name">Comments:</label>
     <div class="value">
@@ -47,7 +47,7 @@
       <input type="hidden" name="my_folder_id_fk" value="<%escape_html Folders.0.my_folder_id%>" /><%Folders.0.my_folder_name%>
     <%~else%>
       <select id="my_folder_id_fk" name="my_folder_id_fk">
-        <%loop Folders%><option value="<%escape_html my_folder_id%>"<%if my_folder_default%> selected="selected"<%endif%>><%my_folder_name%></option><%endloop%>
+        <%loop Folders%><option value="<%escape_html my_folder_id%>"<%if my_folder_id_fk == $my_folder_id%> selected="selected"<%endif%>><%my_folder_name%></option><%endloop%>
       </select>
     <%~endif%>
     </div>
Index: luna/bookmark_list.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/bookmark_list.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- luna/bookmark_list.html     23 Aug 2006 20:53:31 -0000      1.17
+++ luna/bookmark_list.html     26 Oct 2006 19:44:23 -0000      1.18
@@ -54,7 +54,7 @@
   <input type="hidden" name="action" value="links_manage" />
   <input type="hidden" name="my_folder_id" value="<%escape_html my_folder_id%>" />
 <%~loop Bookmarks%>
-  <input type="checkbox" name="m-id" value="<%escape_html ID%>" class="checkbox" />
+  <input type="checkbox" name="my_id" value="<%escape_html my_id%>" class="checkbox" />
 <%~set editable = 1%>
 <%include bookmark_link.html%>
 <%~endloop%>
Index: luna/bookmark_users.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/bookmark_users.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- luna/bookmark_users.html    23 Aug 2006 20:53:31 -0000      1.14
+++ luna/bookmark_users.html    6 Sep 2007 01:36:04 -0000       1.15
@@ -36,7 +36,7 @@
 <%if users~%>
 <ul>
 <%~loop users%>
-  <li><a href="<%config.db_cgi_url%>/bookmark.cgi?action=users_folder;my_folder_username=<%my_folder_user_username_fk%>"><%my_folder_user_username_fk%></a> (<%public_folders%> folder<%if public_folders != 1%>s<%endif%> with <%public_links%> link<%if public_links != 1%>s<%endif%>)</li>
+  <li><a href="<%config.db_cgi_url%>/bookmark.cgi?action=users_folder;my_folder_username=<%escape_url my_folder_user_username_fk%>"><%escape_html my_folder_user_username_fk%></a> (<%public_folders%> folder<%if public_folders != 1%>s<%endif%> with <%public_links%> link<%if public_links != 1%>s<%endif%>)</li>
 <%~endloop%>
 </ul>
 <%~endif%>
Index: luna/category.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/category.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- luna/category.html  23 Aug 2006 20:53:31 -0000      1.31
+++ luna/category.html  6 Sep 2007 01:36:04 -0000       1.32
@@ -66,7 +66,7 @@
 <h3>Editors</h3>
 <ul>
 <%~loop editors_loop%>
-  <li><%Username%></li>
+  <li><%escape_html Username%></li>
 <%~endloop%>
 </ul>
 <%~endif%>
Index: luna/detailed.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/detailed.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- luna/detailed.html  23 Aug 2006 20:53:31 -0000      1.17
+++ luna/detailed.html  6 Sep 2007 01:36:04 -0000       1.18
@@ -46,7 +46,7 @@
 <%if Description%><p class="description"><%Description%></p><%endif%>

 <p class="info">
-  Submitted by: <%LinkOwner%><br />
+  Submitted by: <%escape_html LinkOwner%><br />
   Hits: <%Hits%><br />
   Added: <%Add_Date%><br />
   <%if Add_Date ne $Mod_Date%>Last Modified: <%Mod_Date%><br /><%endif%>
Index: luna/include_form.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/include_form.html,v
retrieving revision 1.14
retrieving revision 1.16
diff -u -r1.14 -r1.16
--- luna/include_form.html      19 Aug 2006 03:23:10 -0000      1.14
+++ luna/include_form.html      15 Nov 2007 01:41:26 -0000      1.16
@@ -11,7 +11,7 @@
   </div>
 </div>
 <div class="row<%unless category_loop_selected%> required<%endunless%> clear">
-  <label for="CatLinks.CategoryID" class="name">Category:<%unless category_loop_selected%> <span>*</span><%endunless%></label>
+  <label class="name">Category:<%unless category_loop_selected%> <span>*</span><%endunless%></label>
   <div class="value wrappedtext">
   <%~if config.db_gen_category_list == 2%>
     <script type="text/javascript" src="<%config.build_static_url%>/treecats.js"></script>
@@ -31,7 +31,7 @@
     </noscript>
     <div id="treecats"></div>
     <script type="text/javascript">
-      var tc = new treecats({ <%-- selectionMode : 'multiple', --%> cgiURL : '<%config.db_cgi_url%>', imageURL : '<%config.build_static_url%>/<%t%>/images' });
+      var tc = new treecats({ <%-- selectionMode : 'multiple', --%> cgiURL : '<%config.db_cgi_url%>', cgiQueryString : '<%url_hidden%>', imageURL : '<%config.build_static_url%>/<%t%>/images' });
       tc.load();
     </script>
   <%~elsif category_loop_selected%>
Index: luna/include_header.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/include_header.html,v
retrieving revision 1.12
retrieving revision 1.14
diff -u -r1.12 -r1.14
--- luna/include_header.html    18 Apr 2005 21:39:36 -0000      1.12
+++ luna/include_header.html    19 Dec 2007 07:06:36 -0000      1.14
@@ -1,15 +1,15 @@
 <div id="header">
   <div id="loginbar"><a href="<%config.db_cgi_url%>/user.cgi<%if user.Username%>?logout=1<%endif%>" class="<%if user.Username%>in<%else%>out<%endif%>"><%if user.Username%>Logout<%else%>Login/Register<%endif%></a></div>
-  <div id="logo"><h1><a href="<%config.build_root_url%>"><%site_title%></a></h1></div>
+  <div id="logo"><h1><a href="<%config.build_root_url%>/<%home_index%>"><%site_title%></a></h1></div>
 </div>
 <div class="navbar clear">
   <ul class="primarynav">
-    <li class="home"><a href="<%config.build_root_url%>">Home</a></li>
+    <li class="home"><a href="<%config.build_root_url%>/<%home_index%>">Home</a></li>
     <li><a href="<%config.db_cgi_url%>/add.cgi<%if category_id%>?ID=<%category_id%><%endif%>">Add a Link</a></li>
     <li><a href="<%config.db_cgi_url%>/modify.cgi<%if category_id%>?ID=<%category_id%><%endif%>">Modify a Link</a></li>
-    <li><a href="<%config.build_root_url%>/New/">New Links</a></li>
-    <li><a href="<%config.build_root_url%>/Cool/">Cool Links</a></li>
-    <li><a href="<%config.build_root_url%>/Ratings/">Top Rated</a></li>
+    <li><a href="<%config.build_new_url%>/">New Links</a></li>
+    <li><a href="<%config.build_cool_url%>/">Cool Links</a></li>
+    <li><a href="<%config.build_ratings_url%>/">Top Rated</a></li>
     <li><a href="<%config.db_cgi_url%>/jump.cgi?ID=random<%if config.build_detailed%>;Detailed=1<%endif%>">Random Link</a></li>
     <%if config.newsletter_enabled%><li><a href="<%config.db_cgi_url%>/subscribe.cgi">Newsletter</a></li><%endif%>
     <%if config.bookmark_enabled%><li><a href="<%config.db_cgi_url%>/bookmark.cgi">Bookmarks</a></li><%endif%>
Index: luna/jump.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/jump.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- luna/jump.html      25 Feb 2005 06:05:50 -0000      1.2
+++ luna/jump.html      6 Sep 2007 01:36:04 -0000       1.3
@@ -4,7 +4,7 @@
   <title><%site_title%>: <%Title%></title>
 </head>
 <frameset id="jump" rows="40,*">
-  <frame src="<%config.db_cgi_url%>/jump.cgi?action=jump_frame;ID=<%ID%>" scrolling="no" noresize="noresize" />
+  <frame src="<%config.db_cgi_url%>/jump.cgi?action=jump_frame;ID=<%escape_html ID%>" scrolling="no" noresize="noresize" />
   <frame src="<%destination%>" />
   <noframes>
     <body>
Index: luna/jump_frame.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/jump_frame.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- luna/jump_frame.html        4 Jul 2005 23:12:23 -0000       1.7
+++ luna/jump_frame.html        19 Dec 2007 07:06:36 -0000      1.8
@@ -7,7 +7,7 @@
 </head>
 <body id="jump_frame">
   <div class="jumpwrapper">
-    <a href="<%config.build_root_url%>"><img src="<%Links::Utils::image_url('logo-small.gif')%>" class="jumplogo" alt="<%site_title%>" /></a>
+    <a href="<%config.build_root_url%>/<%home_index%>"><img src="<%Links::Utils::image_url('logo-small.gif')%>" class="jumplogo" alt="<%site_title%>" /></a>

   <%if error%>
     <p class="errormessage">
Index: luna/link_added.eml
===================================================================
RCS file: glinks/cgi/admin/templates/luna/link_added.eml,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -r1.6 -r1.8
--- luna/link_added.eml 27 Oct 2005 23:25:24 -0000      1.6
+++ luna/link_added.eml 19 Dec 2007 07:06:36 -0000      1.8
@@ -16,13 +16,13 @@

 You can see your new listing at:

-    <%config.build_root_url%>
+    <%config.build_root_url%>/<%home_index%>

 Should you have any questions, please don't hesitate to ask.

 Sincerely,

-Links Manager
+<%site_title%>

 <%~--
         File        : link_added.eml
Index: luna/link_expired.eml
===================================================================
RCS file: glinks/cgi/admin/templates/luna/link_expired.eml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- luna/link_expired.eml       27 Oct 2005 23:25:24 -0000      1.7
+++ luna/link_expired.eml       26 Aug 2006 03:22:15 -0000      1.8
@@ -15,7 +15,7 @@

 Sincerely,

-Links Manager
+<%site_title%>

 <%~--
         File        : link_expired.eml
Index: luna/link_expiry_notify.eml
===================================================================
RCS file: glinks/cgi/admin/templates/luna/link_expiry_notify.eml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- luna/link_expiry_notify.eml 27 Oct 2005 23:25:24 -0000      1.8
+++ luna/link_expiry_notify.eml 26 Aug 2006 03:22:15 -0000      1.9
@@ -15,7 +15,7 @@

 Sincerely,

-Links Manager
+<%site_title%>

 <%~--
         File        : link_expiry_notify.eml
Index: luna/link_modified.eml
===================================================================
RCS file: glinks/cgi/admin/templates/luna/link_modified.eml,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -r1.6 -r1.8
--- luna/link_modified.eml      27 Oct 2005 23:25:24 -0000      1.6
+++ luna/link_modified.eml      19 Dec 2007 07:06:36 -0000      1.8
@@ -16,13 +16,13 @@

 You can see your updated listing at:

-    <%config.build_root_url%>
-  
+    <%config.build_root_url%>/<%home_index%>
+
 Should you have any questions, please don't hesitate to ask.

 Sincerely,

-Links Manager
+<%site_title%>

 <%~--
         File        : link_modified.eml
Index: luna/link_rejected.eml
===================================================================
RCS file: glinks/cgi/admin/templates/luna/link_rejected.eml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- luna/link_rejected.eml      27 Oct 2005 23:25:24 -0000      1.4
+++ luna/link_rejected.eml      26 Aug 2006 03:22:15 -0000      1.5
@@ -16,7 +16,7 @@

 If you have any questions, please don't hesitate to ask.

-Links Manager
+<%site_title%>

 <%~--
         File        : link_rejected.eml
Index: luna/login.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/login.html,v
retrieving revision 1.21
retrieving revision 1.24
diff -u -r1.21 -r1.24
--- luna/login.html     23 Aug 2006 20:53:31 -0000      1.21
+++ luna/login.html     5 Jan 2009 21:19:34 -0000       1.24
@@ -1,7 +1,10 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<%~if logout and error%>
-  <%~set message = $error%>
-  <%~set error = ''%>
+<%~if error%>
+  <%~-- Move $error into $message.  Done for backwards compatibility with Links SQL 2.x templates. --%>
+  <%~if logout or send_pass or send_validate%>
+    <%~set message = $error%>
+    <%~set error = ''%>
+  <%~endif%>
 <%~endif%>
 <%~if url and not error%>
   <%~set error = 'You must first login before you can access that.'%>
@@ -51,7 +54,7 @@
   <div class="row clear">
     <label for="Remember" class="name">Remember Me:</label>
     <div class="value">
-      <input type="checkbox" id="Remember" name="Remember" class="checkbox" />
+      <input type="checkbox" id="Remember" name="Remember"<%if Remember%> checked="checked"<%endif%> class="checkbox" />
     </div>
   </div>
 <%~endif%>
@@ -62,7 +65,9 @@

 <p>
   If you don't have an account, please <a href="<%config.db_cgi_url%>/user.cgi?signup_form=1">register</a>.<br />
+<%~if config.user_allow_pass%>
   If you've forgotten your password, we can <a href="<%config.db_cgi_url%>/user.cgi?email_pass=1">e-mail it to you</a>.
+<%~endif%>
 </p>

 <%include include_content_bottom.html%>
Index: luna/modify.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/modify.html,v
retrieving revision 1.17
retrieving revision 1.20
diff -u -r1.17 -r1.20
--- luna/modify.html    23 Aug 2006 20:53:31 -0000      1.17
+++ luna/modify.html    6 Sep 2007 01:36:04 -0000       1.20
@@ -26,8 +26,11 @@
   <input type="hidden" name="modify" value="1" />
 <%~if LinkID%>
   <input type="hidden" name="LinkID" value="<%escape_html LinkID%>" />
+  <input type="hidden" name="Current_ID" value="<%escape_html LinkID%>" />
 <%~else%>
+  <%~if config.db_gen_category_list == 2%>
   <noscript>
+  <%~endif%>
     <p>
       Please enter the URL of the link you wish to modify. Make sure it is identical to the one already in the database:
     </p>
@@ -37,13 +40,14 @@
         <input type="text" name="Current_URL" value="<%if Current_URL%><%escape_html Current_URL%><%endif%>" class="text" />
       </div>
     </div>
+  <%~if config.db_gen_category_list == 2%>
   </noscript>
   <div id="LinkID" class="row required clear" style="display: none">
     <label class="name">Link: <span>*</span></label>
     <div class="value wrappedtext">
-<%~if Current_ID%>
-      <input type="hidden" name="Current_ID" value="<%Current_ID%>" />
-<%~endif%>
+    <%~if Current_ID%>
+      <input type="hidden" name="Current_ID" value="<%escape_html Current_ID%>" />
+    <%~endif%>
       <script type="text/javascript" src="<%config.build_static_url%>/treecats.js"></script>
       <div id="treecats-links"></div>
       <script type="text/javascript">
@@ -55,6 +59,7 @@
   <script type="text/javascript">
     document.getElementById('LinkID').style.display = '';
   </script>
+  <%~endif%>
   <p>
     Enter the new information (all of it, not just the changes) below:
   </p>
Index: luna/modify_success.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/modify_success.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- luna/modify_success.html    23 Aug 2006 20:53:31 -0000      1.15
+++ luna/modify_success.html    6 Sep 2007 01:36:04 -0000       1.16
@@ -50,15 +50,15 @@
 </div>
 <div class="row clear">
   <label class="name">Description:</label>
-  <div class="value wrappedtext"><%Description%></div>
+  <div class="value wrappedtext"><%escape_html Description%></div>
 </div>
 <div class="row clear">
   <label class="name">Contact Name:</label>
-  <div class="value wrappedtext"><%Contact_Name%></div>
+  <div class="value wrappedtext"><%escape_html Contact_Name%></div>
 </div>
 <div class="row clear">
   <label class="name">Contact E-mail:</label>
-  <div class="value wrappedtext"><%Contact_Email%></div>
+  <div class="value wrappedtext"><%escape_html Contact_Email%></div>
 </div>

 <%if not config.user_direct_mod and payment_term ne free%><p>Thank you! We will send you an e-mail once your link has been validated.</p><%endif%>
Index: luna/newsletter_list.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/newsletter_list.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- luna/newsletter_list.html   23 Aug 2006 20:53:31 -0000      1.16
+++ luna/newsletter_list.html   6 Sep 2007 01:36:04 -0000       1.17
@@ -41,7 +41,7 @@
   <input type="hidden" name="page" value="newsletter_list" />
   <%if subscribed.length > 1%><input type="checkbox" id="checkall" class="checkbox" /> <label for="checkall"><strong>Select All</strong></label><br /><%endif%>
 <%loop subscribed~%>
-  <input type="checkbox" id="ID-<%CategoryID%>" name="ID" value="<%escape_html CategoryID%>" class="checkbox" /> <label for="ID-<%CategoryID%>"><%Full_Name%></label><br />
+  <input type="checkbox" id="ID-<%escape_html CategoryID%>" name="ID" value="<%escape_html CategoryID%>" class="checkbox" /> <label for="ID-<%escape_html CategoryID%>"><%Full_Name%></label><br />
 <%~endloop%>
   <input type="submit" value="Unsubscribe" class="submit" />
 </form>
Index: luna/password.eml
===================================================================
RCS file: glinks/cgi/admin/templates/luna/password.eml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- luna/password.eml   27 Oct 2005 23:25:24 -0000      1.5
+++ luna/password.eml   26 Aug 2006 03:22:15 -0000      1.6
@@ -14,7 +14,7 @@

 Hope that helps,

-Link Manager
+<%site_title%>

 <%~--
         File        : password.eml
Index: luna/payment_direct.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/payment_direct.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- luna/payment_direct.html    23 Aug 2006 20:53:31 -0000      1.14
+++ luna/payment_direct.html    19 Dec 2007 07:05:20 -0000      1.15
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><%site_title%>: Payment Confirmation</title>
-  <meta http-equiv="refresh" content="5;url=<%Links::transform_url($config.build_root_url, '', '&')%>" />
+  <meta http-equiv="refresh" content="5;url=<%Links::transform_url("${config.build_root_url}$home_index", '', '&')%>" />
 <%include include_common_head.html%>
 </head>
 <body id="payment_direct">
@@ -26,7 +26,7 @@
 <p>
   Your payment has been approved, and your link enabled.  You will be redirected
   to the main page shortly.  If this does not happen, click
-  <a href="<%Links::transform_url($config.build_root_url)%>">here</a>.
+  <a href="<%config.build_root_url%>/<%build_index%>">here</a>.
 </p>

 <%include include_content_bottom.html%>
Index: luna/payment_manual_include.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/payment_manual_include.html,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -r1.3 -r1.5
--- luna/payment_manual_include.html    4 Mar 2005 00:45:17 -0000       1.3
+++ luna/payment_manual_include.html    19 Dec 2007 07:06:36 -0000      1.5
@@ -6,7 +6,7 @@
   with your payment:
 </p>
 <p>
-  Link ID: <%ID%><br />
-  Payment ID: <%unique_id%>
+  Link ID: <%escape_html ID%><br />
+  Payment ID: <%escape_html unique_id%>
 </p>
-<input type="button" value="Done" onclick="window.location='<%Links::transform_url($config.build_root_url)%>'" />
+<input type="button" value="Done" onclick="window.location='<%Links::transform_url("${config.build_root_url}$home_index")%>'" />
Index: luna/payment_received.eml
===================================================================
RCS file: glinks/cgi/admin/templates/luna/payment_received.eml,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -r1.6 -r1.8
--- luna/payment_received.eml   27 Oct 2005 23:25:24 -0000      1.6
+++ luna/payment_received.eml   19 Dec 2007 07:06:36 -0000      1.8
@@ -16,13 +16,13 @@

 You can see your new listing at:

-    <%config.build_root_url%>
+    <%config.build_root_url%>/<%home_index%>

 Should you have any questions, please don't hesitate to ask.

 Sincerely,

-Links Manager
+<%site_title%>

 <%~--
         File        : payment_received.eml
Index: luna/payment_success.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/payment_success.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- luna/payment_success.html   23 Aug 2006 20:53:31 -0000      1.14
+++ luna/payment_success.html   19 Dec 2007 07:05:20 -0000      1.15
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><%site_title%>: Payment Confirmation</title>
-  <meta http-equiv="refresh" content="5;url=<%Links::transform_url($config.build_root_url, '', '&')%>" />
+  <meta http-equiv="refresh" content="5;url=<%Links::transform_url("${config.build_root_url}$home_index", '', '&')%>" />
 <%include include_common_head.html%>
 </head>
 <body id="payment_success">
@@ -25,7 +25,7 @@

 <p>
   Your payment has been approved.  You will be redirected to the main page shortly.
-  If this does not happen, click <a href="<%Links::transform_url($config.build_root_url)%>">here</a>.
+  If this does not happen, click <a href="<%config.build_root_url%>/<%home_index%>">here</a>.
 </p>

 <%include include_content_bottom.html%>
Index: luna/review_add_success.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/review_add_success.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- luna/review_add_success.html        23 Aug 2006 20:53:31 -0000      1.17
+++ luna/review_add_success.html        6 Sep 2007 01:36:04 -0000       1.18
@@ -29,29 +29,29 @@
 <%~if Review_Rating%>
 <div class="row clear">
   <label class="name">Rating:</label>
-  <div class="value wrappedtext"><%Review_Rating%></div>
+  <div class="value wrappedtext"><%escape_html Review_Rating%></div>
 </div>
 <%~endif%>
 <div class="row clear">
   <label class="name">Subject:</label>
-  <div class="value wrappedtext"><%Review_Subject%></div>
+  <div class="value wrappedtext"><%escape_html Review_Subject%></div>
 </div>
 <div class="row clear">
   <label class="name">By Line:</label>
-  <div class="value wrappedtext"><%Review_ByLine%></div>
+  <div class="value wrappedtext"><%escape_html Review_ByLine%></div>
 </div>
 <div class="row clear">
   <label class="name">Review:</label>
-  <div class="value wrappedtext"><%Review_Contents%></div>
+  <div class="value wrappedtext"><%if config.review_convert_br_tags%><%Review_Contents%><%else%><%escape_html Review_Contents%><%endif%></div>
 </div>
 <%~if not config.user_review_required and not user.Username%>
 <div class="row clear">
   <label class="name">Name:</label>
-  <div class="value wrappedtext"><%Review_GuestName%></div>
+  <div class="value wrappedtext"><%escape_html Review_GuestName%></div>
 </div>
 <div class="row clear">
   <label class="name">E-mail:</label>
-  <div class="value wrappedtext"><%Review_GuestEmail%></div>
+  <div class="value wrappedtext"><%escape_html Review_GuestEmail%></div>
 </div>
 <%~endif%>

Index: luna/review_added.eml
===================================================================
RCS file: glinks/cgi/admin/templates/luna/review_added.eml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- luna/review_added.eml       15 Aug 2006 00:21:19 -0000      1.9
+++ luna/review_added.eml       26 Aug 2006 03:22:15 -0000      1.10
@@ -27,7 +27,7 @@

 Sincerely,

-Links Manager
+<%site_title%>

 <%~--
         File        : review_added.eml
Index: luna/review_edit_success.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/review_edit_success.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- luna/review_edit_success.html       23 Aug 2006 20:53:31 -0000      1.12
+++ luna/review_edit_success.html       6 Sep 2007 01:36:04 -0000       1.13
@@ -26,21 +26,23 @@
   We have received the following review:
 </p>

+<%~if Review_Rating%>
 <div class="row clear">
   <label class="name">Rating:</label>
-  <div class="value wrappedtext"><%Review_Rating%></div>
+  <div class="value wrappedtext"><%escape_html Review_Rating%></div>
 </div>
+<%~endif%>
 <div class="row clear">
   <label class="name">Subject:</label>
-  <div class="value wrappedtext"><%Review_Subject%></div>
+  <div class="value wrappedtext"><%escape_html Review_Subject%></div>
 </div>
 <div class="row clear">
   <label class="name">By Line:</label>
-  <div class="value wrappedtext"><%Review_ByLine%></div>
+  <div class="value wrappedtext"><%escape_html Review_ByLine%></div>
 </div>
 <div class="row clear">
   <label class="name">Review:</label>
-  <div class="value wrappedtext"><%Review_Contents%></div>
+  <div class="value wrappedtext"><%if config.review_convert_br_tags%><%Review_Contents%><%else%><%escape_html Review_Contents%><%endif%></div>
 </div>

 <p>
Index: luna/review_include.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/review_include.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- luna/review_include.html    27 Jul 2006 04:29:57 -0000      1.15
+++ luna/review_include.html    6 Sep 2007 01:36:04 -0000       1.16
@@ -6,13 +6,13 @@
   <%~set ID = ''%>
 <%~endif%>
   <h4 class="reviewsubject">
-    <%Review_Subject%><%if Review_CanModify%> <span class="hsmall">(<a href="<%config.db_cgi_url%>/review.cgi?edit_review=1;ID=<%Review_LinkID%>;ReviewID=<%ReviewID%>;confirmed=1">edit</a>)</span><%endif%>
+    <%escape_html Review_Subject%><%if Review_CanModify%> <span class="hsmall">(<a href="<%config.db_cgi_url%>/review.cgi?edit_review=1;ID=<%Review_LinkID%>;ReviewID=<%ReviewID%>;confirmed=1">edit</a>)</span><%endif%>
     <img src="<%Links::Utils::image_url("stars-5-${Review_Rating}.gif")%>" alt="<%Review_Rating%> out of 5 stars" title="<%Review_Rating%> out of 5 stars" />
     <%if Review_IsNew%><span class="new-item"><span>new</span></span><%endif%>
   </h4>
 <%~if Review_ByLine%>
   <h5 class="reviewbyline">
-    <%Review_ByLine%>
+    <%escape_html Review_ByLine%>
   </h5>
 <%~endif%>
   <p class="reviewer">
@@ -20,7 +20,11 @@
   </p>
 <%~if Review_Contents%>
   <div class="reviewcontent">
+  <%~if config.review_convert_br_tags%>
     <%Review_Contents%>
+  <%~else%>
+    <%escape_html Review_Contents%>
+  <%~endif%>
   </div>
 <%~endif%>
   <div class="reviewhelpful clear">
Index: luna/review_rejected.eml
===================================================================
RCS file: glinks/cgi/admin/templates/luna/review_rejected.eml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- luna/review_rejected.eml    27 Oct 2005 23:25:24 -0000      1.5
+++ luna/review_rejected.eml    26 Aug 2006 03:22:15 -0000      1.6
@@ -19,7 +19,7 @@

 If you have any questions, please don't hesitate to ask.

-Links Manager
+<%site_title%>

 <%~--
         File        : review_rejected.eml
Index: luna/signup_success.html
===================================================================
RCS file: glinks/cgi/admin/templates/luna/signup_success.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- luna/signup_success.html    23 Aug 2006 20:53:31 -0000      1.13
+++ luna/signup_success.html    6 Sep 2007 01:36:04 -0000       1.14
@@ -27,7 +27,7 @@
 <%~if Validation%>
   Thanks for signing up, an e-mail has been sent to you with a validation code. Once you receive it, you'll need to enter a <a href="<%config.db_cgi_url%>/user.cgi?validate=1">validation code</a>
 <%~else%>
-  You are now logged into <%site_title%> as '<%user.Username%>'.
+  You are now logged into <%site_title%> as '<%escape_html user.Username%>'.
 <%~endif%>
 </p>

Index: luna/validate.eml
===================================================================
RCS file: glinks/cgi/admin/templates/luna/validate.eml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- luna/validate.eml   27 Oct 2005 23:25:24 -0000      1.5
+++ luna/validate.eml   26 Aug 2006 03:22:15 -0000      1.6
@@ -7,7 +7,7 @@
 Thank you for registering. To activate your account, simply go to:

     <%config.db_cgi_url%>/user.cgi?validate=1
-    
+
 and enter the following code:

     <%Validation%>
@@ -16,7 +16,7 @@

 Sincerely,

-Links Manager
+<%site_title%>

 <%~--
         File        : validate.eml