diff -U 3 -H -d -r -N -- 400/templates/default/admin/addfields.tpl wsnlinks/templates/default/admin/addfields.tpl
--- 400/templates/default/admin/addfields.tpl	2006-09-07 12:31:00.000000000 -0700
+++ wsnlinks/templates/default/admin/addfields.tpl	2006-09-12 18:19:46.000000000 -0700
@@ -29,8 +29,8 @@
  <option value="hidden">invisible</option>
 </select> <br>
 Label to use in template (field name by default): <input type="text" name="newfieldtitle" size="20"><br>
-<input type="checkbox" name="showtouser"> Make this a user-submittable field (N/A for usergroup and setting)<br>
-<input type="checkbox" name="useredit"> Allow users to edit field (N/A for usergroup and setting)<br>
+<input type="checkbox" name="showtouser" checked> Make this a user-submittable field (N/A for usergroup and setting)<br>
+<input type="checkbox" name="useredit" checked> Allow users to edit field (N/A for usergroup and setting)<br>
 If dropdown selector, radio, combo box or multiple checkbox options, enter the options separated by commas (if other type, N/A):<br>
 <input type="text" name="selectoptions" size="50"> <br>
 <input type="submit" value="Add Field" class="button">
diff -U 3 -H -d -r -N -- 400/templates/default/admin/alias.tpl wsnlinks/templates/default/admin/alias.tpl
--- 400/templates/default/admin/alias.tpl	2006-09-07 12:31:00.000000000 -0700
+++ wsnlinks/templates/default/admin/alias.tpl	1969-12-31 16:00:00.000000000 -0800
@@ -1,16 +0,0 @@
-<form action="edit.php?action=aliaslink&id={ID}&filled=1" method="post">
-<p>Choose the category in which you want to place an alias to this link:
-<select name="catid">
-{CATOPTIONS}
-</select>
-<br>Or, type in the desired category id number directly: <input type="text" name="altcatid" size="5">
-<br>
-<input type="hidden" name="alias" value="{ID}">
-<input type="submit" value="Create Alias">
-</p>
-</form>
-
-<p>Currently this link has aliases in these categories:</p>
-<!-- BEGIN ALIAS LIST -->
-<a href="[IFADMIN../]index.php?action=displaycat&catid={CATID}">{CATNAME}</a> [<a href="edit.php?action=aliaslink&id={ID}&aliasid={ALIASID}&filled=1&todo=delete">Delete this alias</a>] <br>
-<!-- END ALIAS LIST -->
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/admin/catusergroups.tpl wsnlinks/templates/default/admin/catusergroups.tpl
--- 400/templates/default/admin/catusergroups.tpl	2006-09-07 12:34:00.000000000 -0700
+++ wsnlinks/templates/default/admin/catusergroups.tpl	2006-09-17 11:22:48.000000000 -0700
@@ -24,7 +24,7 @@
 <br>
 
 Can edit all:
-<input type="checkbox" name="caneditalllinks" {CANEDITALLLINKS}> Links 
+<input type="checkbox" name="caneditalllinks" {CANEDITALLLINKS}> Links
 <input type="checkbox" name="caneditallcomments" {CANEDITALLCOMMENTS}> Comments 
 <input type="checkbox" name="candofulledit" {CANDOFULLEDIT}> Full details? (rating, views, etc)
 <input type="checkbox" name="caneditvotes" {CANEDITVOTES}> Link votes 
@@ -40,7 +40,8 @@
 <br>
 
 Can submit:
-<input type="checkbox" name="cansubmitlinks" {CANSUBMITLINKS}> Links
+<input type="checkbox" name="cansubmitlinks" {CANSUBMITLINKS}> Links 
+<input type="checkbox" name="cansubmitcategories" {CANSUBMITCATEGORIES}> Subcategories
 <input type="checkbox" name="cansubmitcomments" {CANSUBMITCOMMENTS}> Comments 
 <br>
 
diff -U 3 -H -d -r -N -- 400/templates/default/admin/dmoz.tpl wsnlinks/templates/default/admin/dmoz.tpl
--- 400/templates/default/admin/dmoz.tpl	2006-06-29 13:10:00.000000000 -0700
+++ wsnlinks/templates/default/admin/dmoz.tpl	1969-12-31 16:00:00.000000000 -0800
@@ -1,18 +0,0 @@
-<div class="title" align="center">DMOZ Import</div>
-
-<p>Read <a href="http://scripts.webmastersite.net/wsnlinks/?section=dmozimporter">these instructions</a> to gain an understanding of how to create a report file and use it here, as well as of the terms involved in usage of Open Directory Project data.</p>
-
-<p>The checkbox options are explained <a href="http://scripts.webmastersite.net/wsnlinks/wsnmanual/articles/310">here</a>.</p>
-
-<p>Please specify the location of the TulipChain report file which you wish to import categories and links from below.</p>
-<br><form action="dmozimporter.php?filled=1" enctype="multipart/form-data" method="post">
-Report File: <input type="file" name="reportfile"> 
-<br>Link type for all imported links: <select name="linktype">{FUNC_TYPESELECTOR[]}</select>
-<br>
-<br>Category to merge the import into: <select name="initialcat"><option value="0">Don't merge, make it a separate category</option>{CATOPTIONS}</select>
-<br><input type="checkbox" name="allinonecat" value="1"> Put all links in one category (don't create subcategories)
-<br><input type="checkbox" name="ignoremost" value="1"> Only import first level, ignore all data in subcategories
-<br><input type="checkbox" name="ignorelinks" value="1"> Only import category structure, ignore all links
-<br><br>
-<input type="submit" value="Import" class="button">
-</form>
diff -U 3 -H -d -r -N -- 400/templates/default/admin/emailprefs.tpl wsnlinks/templates/default/admin/emailprefs.tpl
--- 400/templates/default/admin/emailprefs.tpl	2006-09-07 12:35:00.000000000 -0700
+++ wsnlinks/templates/default/admin/emailprefs.tpl	2006-09-19 20:32:51.000000000 -0700
@@ -3,6 +3,9 @@
 
 <span class="labels">Enable E-mail Queue:</span> <select name="queue">{FUNC_YESNO[{QUEUE}]}</select><br>Enabling the queue is strongly recommended. Large sites which may be sending hundreds of subscription notifications at once, or sites which send out bulk mail to all members, may require that the queue be enabled to avoid PHP timeouts and lost emails.
 
+<br><br><span class="labels">E-Mail Log Duration:</span> 
+<br>Keep e-mails in log for <input type="text" name="emaillogsize" value="{EMAILLOGSIZE}" size="5"> days
+
 <br><br><span class="labels">Number of emails to send at a time from queue:</span> <input type="text" name="perqueue" value="{PERQUEUE}" size="3">
 <br>A larger number will send them faster but will also increase page load time.
 
diff -U 3 -H -d -r -N -- 400/templates/default/admin/linkchecks.tpl wsnlinks/templates/default/admin/linkchecks.tpl
--- 400/templates/default/admin/linkchecks.tpl	2006-09-07 12:39:00.000000000 -0700
+++ wsnlinks/templates/default/admin/linkchecks.tpl	2006-09-13 09:08:47.000000000 -0700
@@ -36,16 +36,16 @@
 Type: {LINKTYPE} <br>
 URL: <a href="{LINKURL}" {EXTERNALLINKS}>{LINKURL}</a> <br>
 Reciprocal URL: <a href="{LINKRECIPURL}" {EXTERNALLINKS}>{LINKRECIPURL}</a> <br>
-Category: <a href="../index.php?action=displaycat&catid={LINKCATID}">{LINKCATNAME}</a> <br>
+Category: <a href="../index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a> <br>
 Description: {LINKDESCRIPTION} <br>
 Rating: {LINKRATING} with {LINKVOTES} votes<br>
 Hits: {LINKHITS} out, {LINKHITSIN} in<br>
 
-[<a href="edit.php?action=link&field=id&fieldvalue={LINKID}&condition=equals">Edit Link</a>]
+[<a href="edit.php?action=link&field=id&amp;fieldvalue={LINKID}&amp;condition=equals">Edit Link</a>]
 
 <br><br>
 <IF {LINKSUSPENDED}>
-<b>[<a href="linkchecks.php?action=showsuspended&todo=unsuspend&id={LINKID}">Restore Suspended Link</a>]</b>
+<b>[<a href="linkchecks.php?action=showsuspended&amp;todo=unsuspend&amp;id={LINKID}">Restore Suspended Link</a>]</b>
 </IF>
 </p>
 <!-- END ROW -->
diff -U 3 -H -d -r -N -- 400/templates/default/admin/sseo.tpl wsnlinks/templates/default/admin/sseo.tpl
--- 400/templates/default/admin/sseo.tpl	2006-09-07 12:39:00.000000000 -0700
+++ wsnlinks/templates/default/admin/sseo.tpl	2006-09-17 20:58:02.000000000 -0700
@@ -37,13 +37,17 @@
 </tr>
 </table>
 
+<br><br><span class="labels">Other .htaccess content:</span>
+<br>If you want anything else in your .htaccess, write it here and it'll be placed near the top. 
+<br><textarea name="htaccessextras" rows="5" cols="60">{HTACCESSEXTRAS}</textarea>
+
 </div>
 
 
 <br><br>
 {FUNC_HELPICON[61]}
 <span class="labels">Default meta tags:</span><br>Meta tags and other header insertions for anywhere except categories that have their own specified. Edit a category to set category meta tags.<br>
-<textarea name="mainmeta" cols="45" rows="4">{MAINMETA}</textarea>
+<textarea name="mainmeta" cols="60" rows="4">{MAINMETA}</textarea>
 
 <br><br><span class="labels">Spider identification:</span> 
 <br>Type a portion of the spider user agent which can be used to identify it, one per line. (Among other things, identified spiders will not be counted as views.)<br>
diff -U 3 -H -d -r -N -- 400/templates/default/admin/switches.tpl wsnlinks/templates/default/admin/switches.tpl
--- 400/templates/default/admin/switches.tpl	2006-09-07 12:38:00.000000000 -0700
+++ wsnlinks/templates/default/admin/switches.tpl	2006-09-17 20:59:18.000000000 -0700
@@ -29,7 +29,7 @@
  <td class="oddcolumns"><input type="radio" name="ratings" value="0"></td>
 </tr>
 <tr>
- <td class="oddcolumns">Hits tracking</td>
+ <td class="oddcolumns">{FUNC_HELPICON[221]} Hits tracking</td>
  <td class="evencolumns"><input type="radio" name="hits" value="1"></td>
  <td class="oddcolumns"><input type="radio" name="hits" value="0"></td>
 </tr>
@@ -59,7 +59,7 @@
  <td class="oddcolumns"><input type="radio" name="onlineusers" value="0"></td>
 </tr>
 <tr>
- <td class="oddcolumns">Attachments</td>
+ <td class="oddcolumns">{FUNC_HELPICON[44 <,> cat]} Attachments</td>
  <td class="evencolumns"><input type="radio" name="attachments" value="1"></td>
  <td class="oddcolumns"><input type="radio" name="attachments" value="0"></td>
 </tr>
@@ -114,7 +114,7 @@
  <td class="oddcolumns"><input type="radio" name="similar" value="0"></td>
 </tr>
 <tr>
- <td class="oddcolumns">{FUNC_HELPICON[228]} Check for reciprocal link on submission?</td>
+ <td class="oddcolumns">{FUNC_HELPICON[228]} Check for reciprocal link on submission</td>
  <td class="evencolumns"><input type="radio" name="requirerecip" value="1"></td>
  <td class="oddcolumns"><input type="radio" name="requirerecip" value="0"></td>
 </tr>
@@ -134,17 +134,17 @@
  <td class="oddcolumns"><input type="radio" name="help" value="0"></td>
 </tr>
 <tr>
- <td class="oddcolumns">Auction-Style Member Feedback</td>
+ <td class="oddcolumns">{FUNC_HELPICON[338]} Auction-Style Member Feedback</td>
  <td class="evencolumns"><input type="radio" name="trader" value="1"></td>
  <td class="oddcolumns"><input type="radio" name="trader" value="0"></td>
 </tr>
 <tr>
- <td class="oddcolumns">Search Log</td>
+ <td class="oddcolumns">{FUNC_HELPICON[339]} Search Log</td>
  <td class="evencolumns"><input type="radio" name="searchlog" value="1"></td>
  <td class="oddcolumns"><input type="radio" name="searchlog" value="0"></td>
 </tr>
 <tr>
- <td class="oddcolumns">Invitations</td>
+ <td class="oddcolumns">{FUNC_HELPICON[335]} Invitations</td>
  <td class="evencolumns"><input type="radio" name="invites" value="1"></td>
  <td class="oddcolumns"><input type="radio" name="invites" value="0"></td>
 </tr>
@@ -225,7 +225,7 @@
  <td class="oddcolumns"><input type="radio" name="maintoplist" value="0"></td>
 </tr>
 <tr>
- <td class="oddcolumns">WYSIWYG editor</td>
+ <td class="oddcolumns">{FUNC_HELPICON[340]} WYSIWYG editor</td>
  <td class="evencolumns"><input type="radio" name="wysi" value="1"></td>
  <td class="oddcolumns"><input type="radio" name="wysi" value="0"></td>
 </tr>
@@ -235,12 +235,12 @@
  <td class="oddcolumns"><input type="radio" name="wysidescrip" value="0"></td>
 </tr>
 <tr>
- <td class="oddcolumns">Comment types</td>
+ <td class="oddcolumns">{FUNC_HELPICON[36]} Comment types</td>
  <td class="evencolumns"><input type="radio" name="posttypes" value="1"></td>
  <td class="oddcolumns"><input type="radio" name="posttypes" value="0"></td>
 </tr>
 <tr>
- <td class="oddcolumns">Link types</td>
+ <td class="oddcolumns">{FUNC_HELPICON[35]} Link types</td>
  <td class="evencolumns"><input type="radio" name="topictypes" value="1"></td>
  <td class="oddcolumns"><input type="radio" name="topictypes" value="0"></td>
 </tr>
@@ -265,12 +265,12 @@
  <td class="oddcolumns"><input type="radio" name="memberhits" value="0"></td>
 </tr>
 <tr>
- <td class="oddcolumns">Quick registration</td>
+ <td class="oddcolumns">{FUNC_HELPICON[341]} Quick registration</td>
  <td class="evencolumns"><input type="radio" name="quickregistration" value="1"></td>
  <td class="oddcolumns"><input type="radio" name="quickregistration" value="0"></td>
 </tr>
 <tr>
- <td class="oddcolumns">Combine detail and comments pages</td>
+ <td class="oddcolumns">{FUNC_HELPICON[342]} Combine detail and comments pages</td>
  <td class="evencolumns"><input type="radio" name="detailcomments" value="1"></td>
  <td class="oddcolumns"><input type="radio" name="detailcomments" value="0"></td>
 </tr>
@@ -280,12 +280,17 @@
  <td class="oddcolumns"><input type="radio" name="emaillogin" value="0"></td>
 </tr>
 <tr>
- <td class="oddcolumns">Google PageRank</td>
+ <td class="oddcolumns">{FUNC_HELPICON[336]} Autogenerate Accounts</td>
+ <td class="evencolumns"><input type="radio" name="autoregister" value="1"></td>
+ <td class="oddcolumns"><input type="radio" name="autoregister" value="0"></td>
+</tr>
+<tr>
+ <td class="oddcolumns">{FUNC_HELPICON[343]} Google PageRank</td>
  <td class="evencolumns"><input type="radio" name="pagerank" value="1"></td>
  <td class="oddcolumns"><input type="radio" name="pagerank" value="0"></td>
 </tr>
 <tr>
- <td class="oddcolumns">Open Links in Frameset?</td>
+ <td class="oddcolumns">Open Links in Frameset</td>
  <td class="evencolumns"><input type="radio" name="frameset" value="1"></td>
  <td class="oddcolumns"><input type="radio" name="frameset" value="0"></td>
 </tr>
diff -U 3 -H -d -r -N -- 400/templates/default/admin/templates.tpl wsnlinks/templates/default/admin/templates.tpl
--- 400/templates/default/admin/templates.tpl	2006-09-07 12:38:00.000000000 -0700
+++ wsnlinks/templates/default/admin/templates.tpl	2006-09-11 15:16:00.000000000 -0700
@@ -317,4 +317,4 @@
 
 <br>
 
-<p>Descriptions of standard variables: <a href="{MANUALPATH}link.php?id=10" target="_blank">link vars</a>, <a href="{MANUALPATH}link.php?id=11" target="_blank">category vars</a>, <a href="{MANUALPATH}link.php?id=12" target="_blank">comment vars</a>, <a href="{MANUALPATH}link.php?id=13" target="_blank">member vars</a>, <a href="{MANUALPATH}link.php?id=312" target="_blank">attachment vars</a>, <a href="{MANUALPATH}link.php?id=163" target="_blank">online user vars</a>, <a href="{MANUALPATH}link.php?id=334" target="_blank">search log vars</a></p>
\ No newline at end of file
+<p>Descriptions of standard variables: <a href="{MANUALPATH}link.php?id=10" target="_blank">link vars</a>, <a href="{MANUALPATH}link.php?id=11" target="_blank">category vars</a>, <a href="{MANUALPATH}link.php?id=12" target="_blank">comment vars</a>, <a href="{MANUALPATH}link.php?id=13" target="_blank">member vars</a>, <a href="{MANUALPATH}link.php?id=312" target="_blank">attachment vars</a>, <a href="{MANUALPATH}link.php?id=163" target="_blank">online user vars</a>, <a href="{MANUALPATH}link.php?id=334" target="_blank">search log vars</a>, <a href="{MANUALPATH}link.php?id=337" target="_blank">event vars</a></p>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/admin/toplist.tpl wsnlinks/templates/default/admin/toplist.tpl
--- 400/templates/default/admin/toplist.tpl	2006-09-07 12:39:00.000000000 -0700
+++ wsnlinks/templates/default/admin/toplist.tpl	2006-09-11 14:26:58.000000000 -0700
@@ -17,6 +17,7 @@
   document.getElementById("val").style.display = "block";
   document.getElementById("hid").style.display = "block";
   document.getElementById("alb").style.display = "block";
+  document.getElementById("events").style.display = "none";
  }
  if (divid == 'cat')
  {
@@ -34,6 +35,7 @@
   document.getElementById("val").style.display = "block";
   document.getElementById("hid").style.display = "block";
   document.getElementById("alb").style.display = "none";
+  document.getElementById("events").style.display = "none";
  }
  if (divid == 'com')
  {
@@ -51,6 +53,7 @@
   document.getElementById("val").style.display = "block";
   document.getElementById("hid").style.display = "block";
   document.getElementById("alb").style.display = "none";
+  document.getElementById("events").style.display = "none";
  }
  if (divid == 'mem')
  {
@@ -68,6 +71,7 @@
   document.getElementById("val").style.display = "block";
   document.getElementById("hid").style.display = "none";
   document.getElementById("alb").style.display = "none";
+  document.getElementById("events").style.display = "none";
  }
  if (divid == 'on')
  {
@@ -85,6 +89,7 @@
   document.getElementById("val").style.display = "none";
   document.getElementById("hid").style.display = "none";
   document.getElementById("alb").style.display = "none";
+  document.getElementById("events").style.display = "none";
  }
  if (divid == 'att')
  {
@@ -102,6 +107,7 @@
   document.getElementById("val").style.display = "block";
   document.getElementById("hid").style.display = "none";
   document.getElementById("alb").style.display = "none";
+  document.getElementById("events").style.display = "none";
  }
  if (divid == 'mod')
  {
@@ -119,6 +125,7 @@
   document.getElementById("val").style.display = "none";
   document.getElementById("hid").style.display = "none";
   document.getElementById("alb").style.display = "none";
+  document.getElementById("events").style.display = "none";
  }
  if (divid == 'sea')
  {
@@ -136,6 +143,7 @@
   document.getElementById("val").style.display = "none";
   document.getElementById("hid").style.display = "none";
   document.getElementById("alb").style.display = "none";
+  document.getElementById("events").style.display = "none";
  }
  if (divid == 'helpc')
  {
@@ -153,6 +161,7 @@
   document.getElementById("val").style.display = "none";
   document.getElementById("hid").style.display = "none";
   document.getElementById("alb").style.display = "none";
+  document.getElementById("events").style.display = "none";
  }
  if (divid == 'helpi')
  {
@@ -170,6 +179,24 @@
   document.getElementById("val").style.display = "none";
   document.getElementById("hid").style.display = "none";
   document.getElementById("alb").style.display = "none";
+  document.getElementById("events").style.display = "none";
+ }
+ if (divid == 'events')
+ {
+  document.getElementById(divid).style.display = "block";
+  document.getElementById("link").style.display = "none";
+  document.getElementById("cat").style.display = "none";
+  document.getElementById("com").style.display = "none";
+  document.getElementById("mem").style.display = "none";
+  document.getElementById("on").style.display = "none";
+  document.getElementById("att").style.display = "none";
+  document.getElementById("mod").style.display = "none";
+  document.getElementById("sea").style.display = "none";
+  document.getElementById("helpc").style.display = "none";
+  document.getElementById("showing").style.display = "none";
+  document.getElementById("val").style.display = "none";
+  document.getElementById("hid").style.display = "none";
+  document.getElementById("alb").style.display = "none";
  }
 }
 </script>
@@ -190,6 +217,8 @@
 <input type="radio" name="table" value="helpcats" onclick="javascript:toptoggle('helpc');"> Help Categories
 <input type="radio" name="table" value="helpitems" onclick="javascript:toptoggle('helpi');"> Help Items
 </IF>
+<IF {SWITCH_CALENDAR}><input type="radio" name="table" value="cal" onclick="javascript:toptoggle('events');"> Events</IF>
+
 <br><br>
 What field do you want to order by?<br>
 <div id="link">
@@ -226,6 +255,11 @@
  <select name="helpitemsfield">{OPTIONSHELPITEMFIELDS}<option value="rand()">random</option></select> with secondary order <select name="helpitemsfield2"><option value="">none</option>{OPTIONSHELPITEMFIELDS}<option value="rand()">random</option></select>
 </div>
 </IF>
+<IF {SWITCH_CALENDAR}>
+<div id="events" style="display: none;">
+ <select name="calfield">{OPTIONSCALFIELDS}<option value="rand()">random</option></select> with secondary order <select name="calfield2"><option value="">none</option>{OPTIONSCALFIELDS}<option value="rand()">random</option></select>
+</div>
+</IF>
 <br>
 
 <br>
@@ -286,4 +320,5 @@
 <br><br>
 <input type="submit" value="Generate Toplist" class="button">
 </form>
-<br>For your reference, the template variables you may use in the content for each item (the last last step listed above) are listed in the manual: <br><a href="{MANUALPATH}link.php?id=10" target="_blank">link vars</a>, <a href="{MANUALPATH}link.php?id=11" target="_blank">category vars</a>, <a href="{MANUALPATH}link.php?id=12" target="_blank">comment vars</a>, <a href="{MANUALPATH}link.php?id=13" target="_blank">member vars</a>, <a href="{MANUALPATH}link.php?id=312" target="_blank">attachment vars</a>, <a href="{MANUALPATH}link.php?id=163" target="_blank">online user vars</a>, <a href="{MANUALPATH}link.php?id=334" target="_blank">search log vars</a>
+<br>For your reference, the template variables you may use in the content for each item (the last last step listed above) are listed in the manual: <br><a href="{MANUALPATH}link.php?id=10" target="_blank">link vars</a>, <a href="{MANUALPATH}link.php?id=11" target="_blank">category vars</a>, <a href="{MANUALPATH}link.php?id=12" target="_blank">comment vars</a>, <a href="{MANUALPATH}link.php?id=13" target="_blank">member vars</a>, <a href="{MANUALPATH}link.php?id=312" target="_blank">attachment vars</a>, <a href="{MANUALPATH}link.php?id=163" target="_blank">online user vars</a>, <a href="{MANUALPATH}link.php?id=334" target="_blank">search log vars</a>, <a href="{MANUALPATH}link.php?id=337" target="_blank">event vars</a>
+
diff -U 3 -H -d -r -N -- 400/templates/default/admin/validation.tpl wsnlinks/templates/default/admin/validation.tpl
--- 400/templates/default/admin/validation.tpl	2006-09-07 12:39:00.000000000 -0700
+++ wsnlinks/templates/default/admin/validation.tpl	2006-09-12 09:58:15.000000000 -0700
@@ -2,8 +2,9 @@
 
 <a onclick="checkall()" style="cursor: pointer">Select</a> / <a onclick="uncheckall()" style="cursor: pointer">Unselect</a> all
 
-<table width=100%>
+<table width="100%">
 <tr>
+<IF {UNVALLINKS}>
 <td width="25%" valign="top">
 <p>These suggested links are currently awaiting validation: </p>
 <!-- BEGIN VALIDATE AREA -->
@@ -30,7 +31,54 @@
 [<a href="index.php?action=customaccept&id={LINKID}">Custom Accept</a>]
 </p>
 <!-- END VALIDATE AREA -->
+</td>
+</IF>
 
+<IF {UNVALCATS}>
+<td width="25%" valign="top">
+<p>These suggested categories are currently awaiting validation:</p>
+<!-- BEGIN VALIDATE CATS AREA -->
+<p><input type="checkbox" name="cat[]" value="{CATID}">
+<span class="title">{CATNAME}</span> <br>
+<span class="labels">Description:</span> {CATDESCRIPTION} <br>
+<span class="labels">Parent:</span> {CATPARENTNAME} <br>
+[<a href="../edit.php?action=category&field=id&fieldvalue={CATID}&condition=equals" target="_blank">Edit</a>]</p>
+<!-- END VALIDATE CATS AREA -->
+</td>
+</IF>
+
+<IF {UNVALCOMS}>
+<td width="25%" valign="top">
+<p>These suggested comments are currently awaiting validation: </p>
+<!-- BEGIN VALIDATE COMMENTS AREA -->
+<p><input type="checkbox" name="comment[]" value="{COMMENTID}">
+<span class="title">Comment on <a href="../comments.php?id={COMMENTLINKID}">{COMMENTLINKNAME}</a></span> <br>
+<span class="labels">Poster:</span> {COMMENTPOSTERNAME} <br>
+<span class="labels">Comment:</span> {COMMENTMESSAGE} <br>
+[<a href="../edit.php?action=comment&field=id&fieldvalue={COMMENTID}&condition=equals" target="_blank">Edit</a>] or [<a href="index.php?action=reject&amp;comid={COMMENTID}&amp;customreject=yes">Custom Reject</a>] or 
+[<a href="index.php?action=customaccept&amp;comid={COMMENTID}">Custom Accept</a>] </p>
+<!-- END VALIDATE COMMENTS AREA -->
+</td>
+</IF>
+
+<IF {UNVALMEMS}>
+<td width="25%" valign="top">
+<p>These members are currently awaiting validation: </p>
+<!-- BEGIN VALIDATE MEMBERS AREA -->
+<p><input type="checkbox" name="member[]" value="{MEMBERID}">
+<span class="title">{MEMBERNAME}</span> <br>
+<span class="labels">IP Address:</span> <a href="searchips.php?action=resolvehost&amp;ip={MEMBERIP}&amp;fullpage=1" target="_blank">{MEMBERIP}</a> <br>
+<span class="labels">E-mail:</span> {MEMBEREMAIL} <br>
+[<a href="../edit.php?action=member&field=id&fieldvalue={MEMBERID}&condition=equals" target="_blank">Edit</a>] or [<a href="index.php?action=reject&id={MEMBERID}&customreject=yes&rejectiontype=member">Custom Reject</a>] or [<a href="index.php?action=customaccept&amp;memid={MEMBERID}">Custom Accept</a>]</p>
+<!-- END VALIDATE MEMBERS AREA -->
+</td>
+</IF>
+
+</tr>
+<tr>
+
+<IF {UNVALLINKEDITS}>
+<td width="25%" valign="top">
 <p>These suggested link edits are currently awaiting validation:</p>
 <!-- BEGIN VALIDATE EDITS AREA -->
 <p><input type="checkbox" name="linkedit[]" value="{LINKID}">
@@ -56,48 +104,47 @@
 </p>
 <!-- END VALIDATE EDITS AREA -->
 </td>
+</IF>
 
+<IF {UNVALATTACHMENTS}>
 <td width="25%" valign="top">
-<p>These suggested categories are currently awaiting validation:</p>
-<!-- BEGIN VALIDATE CATS AREA -->
-<p><input type="checkbox" name="cat[]" value="{CATID}">
-<span class="title">{CATNAME}</span> <br>
-<span class="labels">Description:</span> {CATDESCRIPTION} <br>
-<span class="labels">Parent:</span> {CATPARENTNAME} <br>
-[<a href="../edit.php?action=category&field=id&fieldvalue={CATID}&condition=equals" target="_blank">Edit</a>]</p>
-<!-- END VALIDATE CATS AREA -->
-
-<IF {SWITCH_ATTACHMENTS}>
 <p>These suggested attachments are currently awaiting validation:</p>
 <!-- BEGIN VALIDATE ATTACHMENTS AREA -->
 <p><input type="checkbox" name="attach[]" value="{ATTACHID}">
 <span class="title"><a href="download.php?attachid={ATTACHID}">{ATTACHFILETITLE}</a></span></p>
 <!-- END VALIDATE ATTACHMENTS AREA -->
-</IF>
 </td>
+</IF>
 
+<IF {UNVALEVENTS}>
 <td width="25%" valign="top">
-<p>These suggested comments are currently awaiting validation: </p>
-<!-- BEGIN VALIDATE COMMENTS AREA -->
-<p><input type="checkbox" name="comment[]" value="{COMMENTID}">
-<span class="title">Comment on <a href="../comments.php?id={COMMENTLINKID}">{COMMENTLINKNAME}</a></span> <br>
-<span class="labels">Poster:</span> {COMMENTPOSTERNAME} <br>
-<span class="labels">Comment:</span> {COMMENTMESSAGE} <br>
-[<a href="../edit.php?action=comment&field=id&fieldvalue={COMMENTID}&condition=equals" target="_blank">Edit</a>] or [<a href="index.php?action=reject&amp;comid={COMMENTID}&amp;customreject=yes">Custom Reject</a>] or 
-[<a href="index.php?action=customaccept&amp;comid={COMMENTID}">Custom Accept</a>] </p>
-<!-- END VALIDATE COMMENTS AREA -->
+<p>These suggested events are currently awaiting validation:</p>
+<!-- BEGIN VALIDATE EVENTS AREA -->
+<p><input type="checkbox" name="event[]" value="{EVENTID}">
+<span class="title">{EVENTTITLE}</a></span><br>
+{EVENTDESCRIPTION} <br>
+<IF not {EVENTDATE}>
+Starts: {EVENTSTARTDATE}<br>
+Ends: {EVENTENDDATE} <br>
+<ELSE>
+{EVENTDATE}<br>
+</IF>
+Scheduled by: <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a>
+</p>
+<!-- END VALIDATE EVENTS AREA -->
 </td>
+</IF>
 
+<IF {UNVALQUOTES}>
 <td width="25%" valign="top">
-<p>These members are currently awaiting validation: </p>
-<!-- BEGIN VALIDATE MEMBERS AREA -->
-<p><input type="checkbox" name="member[]" value="{MEMBERID}">
-<span class="title">{MEMBERNAME}</span> <br>
-<span class="labels">IP Address:</span> <a href="searchips.php?action=resolvehost&amp;ip={MEMBERIP}&amp;fullpage=1" target="_blank">{MEMBERIP}</a> <br>
-<span class="labels">E-mail:</span> {MEMBEREMAIL} <br>
-[<a href="../edit.php?action=member&field=id&fieldvalue={MEMBERID}&condition=equals" target="_blank">Edit</a>] or [<a href="index.php?action=reject&id={MEMBERID}&customreject=yes&rejectiontype=member">Custom Reject</a>] or [<a href="index.php?action=customaccept&amp;memid={MEMBERID}">Custom Accept</a>]</p>
-<!-- END VALIDATE MEMBERS AREA -->
+<p>These suggested quotes are currently awaiting validation: </p>
+<!-- BEGIN VALIDATE QUOTES AREA -->
+<p><input type="checkbox" name="quote[]" value="{QUOTEID}"> "{QUOTECONTENT}" - {QUOTEAUTHOR} <IF {QUOTESOURCE}>({QUOTESOURCE})</IF>
+<IF {QUOTEOWNERID}><br>Submitted by <a href="[IFADMIN../]memberlist.php?action=profile&amp;id={QUOTEOWNERID}">{QUOTEOWNERNAME}</a></IF>
+</p>
+<!-- END VALIDATE QUOTES AREA -->
 </td>
+</IF>
 
 </tr>
 </table>
diff -U 3 -H -d -r -N -- 400/templates/default/admin/wrapper.tpl wsnlinks/templates/default/admin/wrapper.tpl
--- 400/templates/default/admin/wrapper.tpl	2006-09-07 12:39:00.000000000 -0700
+++ wsnlinks/templates/default/admin/wrapper.tpl	2006-09-13 09:32:22.000000000 -0700
@@ -1,107 +1,107 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>WSN Links Administration Panel</title>
-<link rel="stylesheet" href="{TEMPLATESDIR}/admin/style.css" type="text/css">
-<IF {ISMULTILINGUAL}><meta http-equiv="Content-Type" content="text/html; charset={LANG_CHARSET};"></IF>
-
-<script language="javascript" type="text/javascript">
-function toggleBox(szDivID, iState) // 1 visible, 0 hidden
-{
-    if(document.layers)	   //NN4+
-    {
-       document.layers[szDivID].visibility = iState ? "show" : "hide";
-       document.layers[szDivID].height = iState ? "100%" : "0px";
-    }
-    else if(document.getElementById)	  //gecko(NN6) + IE 5+
-    {
-        var obj = document.getElementById(szDivID);
-        obj.style.visibility = iState ? "visible" : "hidden";
-        obj.style.height = iState ? "100%" : "0px";
-    }
-
-}
-
-/*
-Select and Copy form element script- By Dynamicdrive.com
-For full source, Terms of service, and 100s DTHML scripts
-Visit http://www.dynamicdrive.com
-*/
-
-//specify whether contents should be auto copied to clipboard (memory)
-//Applies only to IE 4+
-//0=no, 1=yes
-var copytoclip=1
-
-function HighlightAll(theField) {
-var tempval=eval("document."+theField)
-tempval.focus()
-tempval.select()
-if (document.all&&copytoclip==1){
-therange=tempval.createTextRange()
-therange.execCommand("Copy")
-window.status="Contents highlighted and copied to clipboard"
-setTimeout("window.status=''",3800)
-}
-}
-
-function checkall() 
-{
- var boxes = document.getElementsByName('link[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = true;
- var boxes = document.getElementsByName('linkedit[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = true;
- var boxes = document.getElementsByName('linkid[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = true;
- var boxes = document.getElementsByName('cat[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = true;
- var boxes = document.getElementsByName('comment[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = true;
- var boxes = document.getElementsByName('member[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = true;
-}
-
-function uncheckall() 
-{
- var boxes = document.getElementsByName('link[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = false;
- var boxes = document.getElementsByName('linkedit[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = false;
- var boxes = document.getElementsByName('linkid[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = false;
- var boxes = document.getElementsByName('cat[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = false;
- var boxes = document.getElementsByName('comment[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = false;
- var boxes = document.getElementsByName('member[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = false;
-}
-</script>
-</head>
-
-<body>
-<center><span class="group">{VERSION} Admin Panel</span></center>
-<br>
-
-<div class="adminmenu">
-<!-- BODY GOES HERE -->
-</div>
-
-<p align="center">
-<a href="[IFADMIN../]index.php?action=userlogout" target="_top">Logout</a> | <a href="[IFADMIN../]index.php" target="_top">Browse Categories</a> | <a href="[IFADMIN../]memberlist.php" target="_top">Member List</a>
-</p>
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>WSN Links Administration Panel</title>
+<link rel="stylesheet" href="{TEMPLATESDIR}/admin/style.css" type="text/css">
+<IF {ISMULTILINGUAL}><meta http-equiv="Content-Type" content="text/html; charset={LANG_CHARSET};"></IF>
+
+<script language="javascript" type="text/javascript">
+function toggleBox(szDivID, iState) // 1 visible, 0 hidden
+{
+    if(document.layers)	   //NN4+
+    {
+       document.layers[szDivID].visibility = iState ? "show" : "hide";
+       document.layers[szDivID].height = iState ? "100%" : "0px";
+    }
+    else if(document.getElementById)	  //gecko(NN6) + IE 5+
+    {
+        var obj = document.getElementById(szDivID);
+        obj.style.visibility = iState ? "visible" : "hidden";
+        obj.style.height = iState ? "100%" : "0px";
+    }
+
+}
+
+/*
+Select and Copy form element script- By Dynamicdrive.com
+For full source, Terms of service, and 100s DTHML scripts
+Visit http://www.dynamicdrive.com
+*/
+
+//specify whether contents should be auto copied to clipboard (memory)
+//Applies only to IE 4+
+//0=no, 1=yes
+var copytoclip=1
+
+function HighlightAll(theField) {
+var tempval=eval("document."+theField)
+tempval.focus()
+tempval.select()
+if (document.all&&copytoclip==1){
+therange=tempval.createTextRange()
+therange.execCommand("Copy")
+window.status="Contents highlighted and copied to clipboard"
+setTimeout("window.status=''",3800)
+}
+}
+
+function checkall() 
+{
+ var boxes = document.getElementsByName('link[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = true;
+ var boxes = document.getElementsByName('linkedit[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = true;
+ var boxes = document.getElementsByName('linkid[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = true;
+ var boxes = document.getElementsByName('cat[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = true;
+ var boxes = document.getElementsByName('comment[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = true;
+ var boxes = document.getElementsByName('member[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = true;
+}
+
+function uncheckall() 
+{
+ var boxes = document.getElementsByName('link[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = false;
+ var boxes = document.getElementsByName('linkedit[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = false;
+ var boxes = document.getElementsByName('linkid[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = false;
+ var boxes = document.getElementsByName('cat[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = false;
+ var boxes = document.getElementsByName('comment[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = false;
+ var boxes = document.getElementsByName('member[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = false;
+}
+</script>
+</head>
+
+<body>
+<center><span class="group">{VERSION} Admin Panel</span></center>
+<br>
+
+<div class="adminmenu">
+<!-- BODY GOES HERE -->
+</div>
+
+<p align="center">
+<a href="[IFADMIN../]index.php?action=userlogout" target="_top">Logout</a> | <a href="{DIRURL}" target="_top">Browse Categories</a> | <a href="[IFADMIN../]memberlist.php" target="_top">Member List</a>
+</p>
+</body>
 </html>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/albumlist.tpl wsnlinks/templates/default/albumlist.tpl
--- 400/templates/default/albumlist.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/albumlist.tpl	2006-09-13 09:29:38.000000000 -0700
@@ -1,7 +1,7 @@
-<br><br>
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Link Lists</div>
-<br>
-
-<!-- BEGIN SUBCATEGORIES -->
-<p><b><a href="albums.php?catid={CATID}">{CATNAME}</a></b> ({CATNUMLINKS}) {CATHASNEW} {CATADMIN}</p>
-<!-- END SUBCATEGORIES -->
+<br><br>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Link Lists</div>
+<br>
+
+<!-- BEGIN SUBCATEGORIES -->
+<p><b><a href="albums.php?catid={CATID}">{CATNAME}</a></b> ({CATNUMLINKS}) {CATHASNEW} {CATADMIN}</p>
+<!-- END SUBCATEGORIES -->
diff -U 3 -H -d -r -N -- 400/templates/default/albums.tpl wsnlinks/templates/default/albums.tpl
--- 400/templates/default/albums.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/albums.tpl	2006-09-13 09:29:38.000000000 -0700
@@ -1,203 +1,203 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {NAVIGATION} </div>
-<br>
-
-<IF {CATNUMSUBCATS}>
-<table width="96%" cellpadding="5" cellspacing="10">
-<!-- BEGIN SUBCATEGORIES -->
-<!-- BEGIN REGULAR -->
-<td {SUBCATWIDTH} align="center" valign="top" class="category">
-<img src="{TEMPLATESDIR}/images/folder.gif" alt="folder"> <a href="albums.php?action=displaycat&amp;catid={CATID}" class="categoryname">{CATNAME}</a> ({CATNUMIMAGES}) {CATHASNEW} {CATADMIN}
-<br>{CATDESCRIPTION}
-</td>
-<!-- END REGULAR -->
-<!-- END SUBCATEGORIES -->
-</table>
-</IF>
-
-<IF {CATLINKSHERE}>
-<div class="sort">
-<form action="albums.php">
-<input type="hidden" name="todo" value="orderlinks">
-<input type="hidden" name="catid" value="{CATID}">
-<table align="center">
-<tr>
-<td valign="top">Sort links by </td>
-<td valign="top">
- <select name="orderlinks"><option value="id">newest</option>
- <option value="lastedit">last edited</option>
- <option value="title">title</option>
- <IF {SWITCH_RATINGS}>
- <option value="rating">rating</option>
- <option value="votes">votes</option>
- </IF>
- <IF {SWITCH_HITS}>
- <option value="hits">hits out</option>
- <option value="hitsin">hits in</option>
- </IF>
-</select>
-</td>
-<td valign="top"> in </td>
-<td valign="top">
- <select name="ascdesc">
- <option value="asc">ascending</option>
- <option value="desc">decending</option>
-</select>
-</td>
-<td valign="top"> order, and show </td>
-<td valign="top">
- <select name="perpage">
- <option value="{PERPAGEALBUMS}">{PERPAGEALBUMS}</option>
- <option value="10">10</option>
- <option value="20">20</option>
- <option value="30">30</option>
- <option value="40">40</option>
- <option value="50">50</option>
- </select>
-</td>
-<td valign="top"> links per page.</td>
-<td valign="top">
- <input type="submit" value="Sort" class="button">
-</td>
-</tr>
-</table>
-</form>
-</div>
-</IF>
-
-<div style="float: left; width: 80%;">
-
-<IF {SHOWRECIP}>
-<table width="100%" cellpadding="5" cellspacing="10">
-<!-- BEGIN RECIP LINKS -->
-<td {LINKWIDTH} valign="top" class="link">
-<img src="{TEMPLATESDIR}/images/star.gif" alt="reciprocal"> 
-<IF {LINKURL}>
-<a href="{TRACKLINKURL}" class="reciplink" {EXTERNALLINKS}>{LINKTITLE}</a>
-<OTHERWISE>
-{LINKTITLE}
-</IF>
-{LINKNEW} {LINKISUPDATED} <IF {LINKISREAD}><img src="{TEMPLATESDIR}/images/visited.gif" alt="viewed" title="Already Viewed"></IF> {LINKADMIN} <IF {LINKCANREMOVE}>[<a href="albums.php?action=remove&amp;linkid={LINKID}&amp;catid={CATID}">Remove</a>]</IF>
-<IF {SWITCH_RATINGS} and {LINKRATING}><br><img src="{TEMPLATESDIR}/images/stars{LINKNUMSTARS}.gif" alt="{LINKRATING} out of {MAXVOTE} stars" title="{LINKRATING} out of {MAXVOTE} stars"> ({LINKVOTES} votes)</IF>
-<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="PageRank {LINKPAGERANK}" title="PageRank {LINKPAGERANK}"></IF>
-<br>{LINKDESCRIPTION} 
-
-<div class="linktools">
-<br>Submitted {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, edited {LINKLASTEDITDATE}</IF>. <br>
-<IF {SWITCH_HITS}>{LINKHITS} hits outgoing, {LINKHITSIN} incoming.<br></IF> 
-<br>
-<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="Details"> Details</a> 
-<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="Rate"> Rate</a></IF> 
-<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="Report"> Report</a></IF> 
-<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="Email Link"> E-Mail Link</a></IF> 
-<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="Email Submitter"> E-Mail Submitter</a></IF> 
-<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="Bookmark"> Bookmark</a> 
-<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="Comments"> Reviews (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
-
-</div>
-
-<IF {LINKFILEFIELD}><br>Attached files:<br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
-<IF {ATTACHISIMAGE}><a href="download.php?id={LINKID}&amp;attachid={ATTACHID}"><img src="thumbnail.php?id={LINKID}&amp;attachid={ATTACHID}" alt="image"></a><br></IF>
-<!-- END LINK ATTACHMENTS -->
-</IF>
-
-</td>
-<!-- END RECIP LINKS -->
-</table>
-</IF>
-
-<IF {SHOWREGULAR}>
-<table width="100%" cellpadding="5" cellspacing="10">
-<!-- BEGIN REGULAR LINKS -->
-<td {LINKWIDTH} valign="top" class="link">
-<IF {LINKURL}>
-<a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a>
-<OTHERWISE>
-{LINKTITLE}
-</IF>
-{LINKNEW} {LINKISUPDATED} <IF {LINKISREAD}><img src="{TEMPLATESDIR}/images/visited.gif" alt="viewed" title="Already Viewed"></IF> {LINKADMIN} <IF {LINKCANREMOVE}>[<a href="albums.php?action=remove&amp;linkid={LINKID}&amp;catid={CATID}">Remove</a>]</IF>
-<IF {SWITCH_RATINGS} and {LINKRATING}><br><img src="{TEMPLATESDIR}/images/stars{LINKNUMSTARS}.gif" alt="{LINKRATING} out of {MAXVOTE} stars" title="{LINKRATING} out of {MAXVOTE} stars"> ({LINKVOTES} votes)</IF>
-<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="PageRank {LINKPAGERANK}" title="PageRank {LINKPAGERANK}"></IF>
-<br>{LINKDESCRIPTION} 
-
-<div class="linktools">
-<br>Submitted {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, edited {LINKLASTEDITDATE}</IF>. <br>
-<IF {SWITCH_HITS}>{LINKHITS} hits outgoing, {LINKHITSIN} incoming.<br></IF> 
-<br>
-<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="Details"> Details</a> 
-<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="Rate"> Rate</a></IF> 
-<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="Report"> Report</a></IF> 
-<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="Email Link"> E-Mail Link</a></IF> 
-<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="Email Submitter"> E-Mail Submitter</a></IF> 
-<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="Bookmark"> Bookmark</a> 
-<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="Comments"> Reviews (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
-
-</div>
-
-<IF {LINKFILEFIELD}><br>Attached files:<br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
-<IF {ATTACHISIMAGE}><a href="download.php?id={LINKID}&amp;attachid={ATTACHID}"><img src="thumbnail.php?id={LINKID}&amp;attachid={ATTACHID}" alt="image"></a><br></IF>
-<!-- END LINK ATTACHMENTS -->
-</IF>
-
-</td>
-<!-- END REGULAR LINKS -->
-</table>
-</IF>
-
-<IF {MULTIPAGE}>
-<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-</div>
-
-<div style="float: right; width: 20%;">
-<br>
-<IF {THISMEMBERSALBUM[{CATID}]}>
-<div class="box">
-<div class="boxtitle" onClick="minmax('actionsbox')"><img src="{TEMPLATESDIR}/images/icon_submit.gif" alt="submit"> Actions</div>
-<div id="actionsbox" class="boxbody">
-<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="suggest.php?action=addcat&amp;parent={CATID}&amp;isalbum=1">Submit Subcategory</a><br>
-<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="suggest.php?action=addlink&amp;catid={CATID}&amp;isalbum=1">Submit Link</a><br>
-</div>
-</div>
-</IF>
-
-<div class="box">
-<div class="boxtitle" onClick="minmax('infobox')"><img src="{TEMPLATESDIR}/images/icon_info.gif" alt="submit"> Category Stats</div>
-<div id="infobox" class="boxbody">
-<IF {CATNUMSUBCATS}><span class="minilabels">Subcategories:</span> {CATNUMSUBCATS}<br></IF> 
-<span class="minilabels">Links:</span> {CATLINKSHERE} 
-<IF {CATNUMLINKS} is greater than {CATLINKSHERE}>({CATNUMLINKS} counting subcategories)</IF> 
-<IF {RECIPTOTAL} and {REGULARTOTAL}>
-<br><span class="minilabels">Regular:</span> {REGULARTOTAL} 
-<br><span class="minilabels">Reciprocal:</span> {RECIPTOTAL}
-</IF> 
-<IF {CATLASTLINKTIME}><br><span class="minilabels">Last Link:</span> {CATLASTLINKDATE}</IF>
-
-<IF {SWITCH_ONLINEUSERS}>
-<IF {TOPLISTTOTAL3}><br><br><span class="minilabels">Browsing:</span></IF>
-<!-- BEGIN TOPLIST 3 -->
-<CONFIG>online,time,100,descending,catid={CATID} AND memberid>0,,</CONFIG>
-<a href="memberlist.php?action=profile&amp;id={ONLINEMEMBERID}">{ONLINENAME}</a>,  
-<!-- END TOPLIST 3 -->
-</IF>
-</div>
-</div>
-
-<IF {CATISMODERATOR} or {THISMEMBERISADMIN}>
-<div class="box">
-<div class="boxtitle" onClick="minmax('modbox')"><img src="{TEMPLATESDIR}/images/icon_mod.gif" alt="submit"> Editorial Controls</div>
-<div id="modbox" class="boxbody">
-<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="modcp.php">Moderator Control Panel</a> 
-<br>({CATUNVALIDATEDLINKS} links, {CATUNVALIDATEDCOMMENTS} comments pending)
-<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=bulkedit">Bulk edit/move/delete links</a>
-<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=showdeleted">Show/undelete deleted links</a>
-</div>
-</div>
-</IF>
-
-
-</div>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {NAVIGATION} </div>
+<br>
+
+<IF {CATNUMSUBCATS}>
+<table width="96%" cellpadding="5" cellspacing="10">
+<!-- BEGIN SUBCATEGORIES -->
+<!-- BEGIN REGULAR -->
+<td {SUBCATWIDTH} align="center" valign="top" class="category">
+<img src="{TEMPLATESDIR}/images/folder.gif" alt="folder"> <a href="albums.php?action=displaycat&amp;catid={CATID}" class="categoryname">{CATNAME}</a> ({CATNUMIMAGES}) {CATHASNEW} {CATADMIN}
+<br>{CATDESCRIPTION}
+</td>
+<!-- END REGULAR -->
+<!-- END SUBCATEGORIES -->
+</table>
+</IF>
+
+<IF {CATLINKSHERE}>
+<div class="sort">
+<form action="albums.php">
+<input type="hidden" name="todo" value="orderlinks">
+<input type="hidden" name="catid" value="{CATID}">
+<table align="center">
+<tr>
+<td valign="top">Sort links by </td>
+<td valign="top">
+ <select name="orderlinks"><option value="id">newest</option>
+ <option value="lastedit">last edited</option>
+ <option value="title">title</option>
+ <IF {SWITCH_RATINGS}>
+ <option value="rating">rating</option>
+ <option value="votes">votes</option>
+ </IF>
+ <IF {SWITCH_HITS}>
+ <option value="hits">hits out</option>
+ <option value="hitsin">hits in</option>
+ </IF>
+</select>
+</td>
+<td valign="top"> in </td>
+<td valign="top">
+ <select name="ascdesc">
+ <option value="asc">ascending</option>
+ <option value="desc">decending</option>
+</select>
+</td>
+<td valign="top"> order, and show </td>
+<td valign="top">
+ <select name="perpage">
+ <option value="{PERPAGEALBUMS}">{PERPAGEALBUMS}</option>
+ <option value="10">10</option>
+ <option value="20">20</option>
+ <option value="30">30</option>
+ <option value="40">40</option>
+ <option value="50">50</option>
+ </select>
+</td>
+<td valign="top"> links per page.</td>
+<td valign="top">
+ <input type="submit" value="Sort" class="button">
+</td>
+</tr>
+</table>
+</form>
+</div>
+</IF>
+
+<div style="float: left; width: 80%;">
+
+<IF {SHOWRECIP}>
+<table width="100%" cellpadding="5" cellspacing="10">
+<!-- BEGIN RECIP LINKS -->
+<td {LINKWIDTH} valign="top" class="link">
+<img src="{TEMPLATESDIR}/images/star.gif" alt="reciprocal"> 
+<IF {LINKURL}>
+<a href="{TRACKLINKURL}" class="reciplink" {EXTERNALLINKS}>{LINKTITLE}</a>
+<OTHERWISE>
+{LINKTITLE}
+</IF>
+{LINKNEW} {LINKISUPDATED} <IF {LINKISREAD}><img src="{TEMPLATESDIR}/images/visited.gif" alt="viewed" title="Already Viewed"></IF> {LINKADMIN} <IF {LINKCANREMOVE}>[<a href="albums.php?action=remove&amp;linkid={LINKID}&amp;catid={CATID}">Remove</a>]</IF>
+<IF {SWITCH_RATINGS} and {LINKRATING}><br><img src="{TEMPLATESDIR}/images/stars{LINKNUMSTARS}.gif" alt="{LINKRATING} out of {MAXVOTE} stars" title="{LINKRATING} out of {MAXVOTE} stars"> ({LINKVOTES} votes)</IF>
+<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="PageRank {LINKPAGERANK}" title="PageRank {LINKPAGERANK}"></IF>
+<br>{LINKDESCRIPTION} 
+
+<div class="linktools">
+<br>Submitted {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, edited {LINKLASTEDITDATE}</IF>. <br>
+<IF {SWITCH_HITS}>{LINKHITS} hits outgoing, {LINKHITSIN} incoming.<br></IF> 
+<br>
+<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="Details"> Details</a> 
+<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="Rate"> Rate</a></IF> 
+<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="Report"> Report</a></IF> 
+<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="Email Link"> E-Mail Link</a></IF> 
+<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="Email Submitter"> E-Mail Submitter</a></IF> 
+<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="Bookmark"> Bookmark</a> 
+<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="Comments"> Reviews (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
+
+</div>
+
+<IF {LINKFILEFIELD}><br>Attached files:<br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
+<IF {ATTACHISIMAGE}><a href="download.php?id={LINKID}&amp;attachid={ATTACHID}"><img src="thumbnail.php?id={LINKID}&amp;attachid={ATTACHID}" alt="image"></a><br></IF>
+<!-- END LINK ATTACHMENTS -->
+</IF>
+
+</td>
+<!-- END RECIP LINKS -->
+</table>
+</IF>
+
+<IF {SHOWREGULAR}>
+<table width="100%" cellpadding="5" cellspacing="10">
+<!-- BEGIN REGULAR LINKS -->
+<td {LINKWIDTH} valign="top" class="link">
+<IF {LINKURL}>
+<a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a>
+<OTHERWISE>
+{LINKTITLE}
+</IF>
+{LINKNEW} {LINKISUPDATED} <IF {LINKISREAD}><img src="{TEMPLATESDIR}/images/visited.gif" alt="viewed" title="Already Viewed"></IF> {LINKADMIN} <IF {LINKCANREMOVE}>[<a href="albums.php?action=remove&amp;linkid={LINKID}&amp;catid={CATID}">Remove</a>]</IF>
+<IF {SWITCH_RATINGS} and {LINKRATING}><br><img src="{TEMPLATESDIR}/images/stars{LINKNUMSTARS}.gif" alt="{LINKRATING} out of {MAXVOTE} stars" title="{LINKRATING} out of {MAXVOTE} stars"> ({LINKVOTES} votes)</IF>
+<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="PageRank {LINKPAGERANK}" title="PageRank {LINKPAGERANK}"></IF>
+<br>{LINKDESCRIPTION} 
+
+<div class="linktools">
+<br>Submitted {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, edited {LINKLASTEDITDATE}</IF>. <br>
+<IF {SWITCH_HITS}>{LINKHITS} hits outgoing, {LINKHITSIN} incoming.<br></IF> 
+<br>
+<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="Details"> Details</a> 
+<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="Rate"> Rate</a></IF> 
+<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="Report"> Report</a></IF> 
+<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="Email Link"> E-Mail Link</a></IF> 
+<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="Email Submitter"> E-Mail Submitter</a></IF> 
+<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="Bookmark"> Bookmark</a> 
+<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="Comments"> Reviews (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
+
+</div>
+
+<IF {LINKFILEFIELD}><br>Attached files:<br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
+<IF {ATTACHISIMAGE}><a href="download.php?id={LINKID}&amp;attachid={ATTACHID}"><img src="thumbnail.php?id={LINKID}&amp;attachid={ATTACHID}" alt="image"></a><br></IF>
+<!-- END LINK ATTACHMENTS -->
+</IF>
+
+</td>
+<!-- END REGULAR LINKS -->
+</table>
+</IF>
+
+<IF {MULTIPAGE}>
+<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+</div>
+
+<div style="float: right; width: 20%;">
+<br>
+<IF {THISMEMBERSALBUM[{CATID}]}>
+<div class="box">
+<div class="boxtitle" onClick="minmax('actionsbox')"><img src="{TEMPLATESDIR}/images/icon_submit.gif" alt="submit"> Actions</div>
+<div id="actionsbox" class="boxbody">
+<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="suggest.php?action=addcat&amp;parent={CATID}&amp;isalbum=1">Submit Subcategory</a><br>
+<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="suggest.php?action=addlink&amp;catid={CATID}&amp;isalbum=1">Submit Link</a><br>
+</div>
+</div>
+</IF>
+
+<div class="box">
+<div class="boxtitle" onClick="minmax('infobox')"><img src="{TEMPLATESDIR}/images/icon_info.gif" alt="submit"> Category Stats</div>
+<div id="infobox" class="boxbody">
+<IF {CATNUMSUBCATS}><span class="minilabels">Subcategories:</span> {CATNUMSUBCATS}<br></IF> 
+<span class="minilabels">Links:</span> {CATLINKSHERE} 
+<IF {CATNUMLINKS} is greater than {CATLINKSHERE}>({CATNUMLINKS} counting subcategories)</IF> 
+<IF {RECIPTOTAL} and {REGULARTOTAL}>
+<br><span class="minilabels">Regular:</span> {REGULARTOTAL} 
+<br><span class="minilabels">Reciprocal:</span> {RECIPTOTAL}
+</IF> 
+<IF {CATLASTLINKTIME}><br><span class="minilabels">Last Link:</span> {CATLASTLINKDATE}</IF>
+
+<IF {SWITCH_ONLINEUSERS}>
+<IF {TOPLISTTOTAL3}><br><br><span class="minilabels">Browsing:</span></IF>
+<!-- BEGIN TOPLIST 3 -->
+<CONFIG>online,time,100,descending,catid={CATID} AND memberid>0,,</CONFIG>
+<a href="memberlist.php?action=profile&amp;id={ONLINEMEMBERID}">{ONLINENAME}</a>,  
+<!-- END TOPLIST 3 -->
+</IF>
+</div>
+</div>
+
+<IF {CATISMODERATOR} or {THISMEMBERISADMIN}>
+<div class="box">
+<div class="boxtitle" onClick="minmax('modbox')"><img src="{TEMPLATESDIR}/images/icon_mod.gif" alt="submit"> Editorial Controls</div>
+<div id="modbox" class="boxbody">
+<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="modcp.php">Moderator Control Panel</a> 
+<br>({CATUNVALIDATEDLINKS} links, {CATUNVALIDATEDCOMMENTS} comments pending)
+<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=bulkedit">Bulk edit/move/delete links</a>
+<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=showdeleted">Show/undelete deleted links</a>
+</div>
+</div>
+</IF>
+
+
+</div>
diff -U 3 -H -d -r -N -- 400/templates/default/badrequest.tpl wsnlinks/templates/default/badrequest.tpl
--- 400/templates/default/badrequest.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/badrequest.tpl	2006-09-20 16:43:37.000000000 -0700
@@ -1 +1,3 @@
-The requested page does not exist.
\ No newline at end of file
+<p>The requested page does not exist.</p>
+
+<p><a href="{DIRURL}">Back to {SITETITLE}</a></p>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/blank.htm wsnlinks/templates/default/blank.htm
--- 400/templates/default/blank.htm	1969-12-31 16:00:00.000000000 -0800
+++ wsnlinks/templates/default/blank.htm	2005-01-19 11:14:18.000000000 -0800
@@ -0,0 +1,11 @@
+<html>
+<head>
+	<title></title>
+</head>
+
+<body>
+
+
+
+</body>
+</html>
diff -U 3 -H -d -r -N -- 400/templates/default/buddyignore.tpl wsnlinks/templates/default/buddyignore.tpl
--- 400/templates/default/buddyignore.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/buddyignore.tpl	2006-09-13 09:31:32.000000000 -0700
@@ -1,26 +1,26 @@
-<div class="nav"><a href="[IFADMIN../]index.php">{LANG_NAVORIGIN}</a> > <a href="[IFADMIN../]memberlist.php">Member List</a> > <a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > Buddy and Ignore Lists</div>
-
-<form action="profile.php?filled=1&amp;action=buddyignore" method="post">
-
-<p>Your buddy list allows you to more quickly contact particular people and optionally not accept messages from anyone else. Your ignore list allows you to cease viewing the contributions of particular members, so that it's as if they don't exist.</p>
-
-<p>Type usernames one per line.</p>
-
-<table align="center" cellpadding="10" cellspacing="10">
-<tr>
-<td width="50%">
-<center><span class="labels">Buddy List</span><br>
-<textarea name="buddylist" cols="40" rows="5">{MEMBERLISTBUDDIES}</textarea>
-</center>
-</td>
-<td width="50%" align="center">
-<center><span class="labels">Ignore List</span><br>
-<textarea name="ignorelist" cols="40" rows="5">{MEMBERLISTIGNORED}</textarea>
-</center>
-</td>
-</tr>
-</table>
-
-<center><input type="submit" value="Update" class="button"></center>
-
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="[IFADMIN../]memberlist.php">Member List</a> > <a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > Buddy and Ignore Lists</div>
+
+<form action="profile.php?filled=1&amp;action=buddyignore" method="post">
+
+<p>Your buddy list allows you to more quickly contact particular people and optionally not accept messages from anyone else. Your ignore list allows you to cease viewing the contributions of particular members, so that it's as if they don't exist.</p>
+
+<p>Type usernames one per line.</p>
+
+<table align="center" cellpadding="10" cellspacing="10">
+<tr>
+<td width="50%">
+<center><span class="labels">Buddy List</span><br>
+<textarea name="buddylist" cols="40" rows="5">{MEMBERLISTBUDDIES}</textarea>
+</center>
+</td>
+<td width="50%" align="center">
+<center><span class="labels">Ignore List</span><br>
+<textarea name="ignorelist" cols="40" rows="5">{MEMBERLISTIGNORED}</textarea>
+</center>
+</td>
+</tr>
+</table>
+
+<center><input type="submit" value="Update" class="button"></center>
+
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/bulkeditposts.tpl wsnlinks/templates/default/bulkeditposts.tpl
--- 400/templates/default/bulkeditposts.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/bulkeditposts.tpl	2006-09-13 09:29:38.000000000 -0700
@@ -1,38 +1,38 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="link.php?id={LINKID}">{LINKTITLE}</a> > Bulk Edit Comments</div>
-<br>
-
-<form action="threadadmin.php?id={LINKID}&amp;filled=1&amp;bulkedit=1" method="post">
-<table width="100%">
-<tr>
-<td {COLUMNHEADER}>&nbsp;</td>
-<td {COLUMNHEADER}>Author</td>
-<td {COLUMNHEADER}>Content</td>
-<IF {SWITCH_POSTTYPES}><td {COLUMNHEADER}>Type</td></IF>
-<td {COLUMNHEADER}>Deletion Reason</td>
-<td {COLUMNHEADER}>Full Edit</td>
-</tr>
-<!-- BEGIN POSTS -->
-<tr>
- <td valign="top" class="oddcolumns"><input type="checkbox" name="selection[{COMMENTID}]" value="1"></td>
- <td valign="top" class="evencolumns">{COMMENTPOSTERNAME}</td>
- <td valign="top" class="oddcolumns"><textarea name="message[{COMMENTID}]" rows="5" cols="75">{COMMENTUNPARSEDMESSAGE}</textarea></td>
- <IF {SWITCH_POSTTYPES}><td valign="top" class="evencolumns"><select name="type[{COMMENTID}]">{COMMENTTYPEOPTIONS}</select></td></IF>
- <td valign="top" class="oddcolumns"><input type="text" name="deletionreason" size="20"></td>
- <td valign="top" class="evencolumns">{COMMENTADMIN}</td>
-</tr>
-<!-- END POSTS -->
-</table>
-<IF {MULTIPAGE}>
-<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-<p>With selected, 
-<select name="action">
- <option value="bulkedit">ignore selections, just edit</option>
- <option value="deleteposts">delete</option>
- <option value="move">move to another link's thread</option>
- <option value="mergeposts">merge the comments</option>
-</select>
-<br>If moving, supply the URL of the thread to move to: <input type="text" name="movedthread" size="{STANDARDSIZE}">
-</p>
-<p><input type="submit" value="Save Changes" class="button"></p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="link.php?id={LINKID}">{LINKTITLE}</a> > Bulk Edit Comments</div>
+<br>
+
+<form action="threadadmin.php?id={LINKID}&amp;filled=1&amp;bulkedit=1" method="post">
+<table width="100%">
+<tr>
+<td {COLUMNHEADER}>&nbsp;</td>
+<td {COLUMNHEADER}>Author</td>
+<td {COLUMNHEADER}>Content</td>
+<IF {SWITCH_POSTTYPES}><td {COLUMNHEADER}>Type</td></IF>
+<td {COLUMNHEADER}>Deletion Reason</td>
+<td {COLUMNHEADER}>Full Edit</td>
+</tr>
+<!-- BEGIN POSTS -->
+<tr>
+ <td valign="top" class="oddcolumns"><input type="checkbox" name="selection[{COMMENTID}]" value="1"></td>
+ <td valign="top" class="evencolumns">{COMMENTPOSTERNAME}</td>
+ <td valign="top" class="oddcolumns"><textarea name="message[{COMMENTID}]" rows="5" cols="75">{COMMENTUNPARSEDMESSAGE}</textarea></td>
+ <IF {SWITCH_POSTTYPES}><td valign="top" class="evencolumns"><select name="type[{COMMENTID}]">{COMMENTTYPEOPTIONS}</select></td></IF>
+ <td valign="top" class="oddcolumns"><input type="text" name="deletionreason" size="20"></td>
+ <td valign="top" class="evencolumns">{COMMENTADMIN}</td>
+</tr>
+<!-- END POSTS -->
+</table>
+<IF {MULTIPAGE}>
+<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+<p>With selected, 
+<select name="action">
+ <option value="bulkedit">ignore selections, just edit</option>
+ <option value="deleteposts">delete</option>
+ <option value="move">move to another link's thread</option>
+ <option value="mergeposts">merge the comments</option>
+</select>
+<br>If moving, supply the URL of the thread to move to: <input type="text" name="movedthread" size="{STANDARDSIZE}">
+</p>
+<p><input type="submit" value="Save Changes" class="button"></p>
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/bulkedit.tpl wsnlinks/templates/default/bulkedit.tpl
--- 400/templates/default/bulkedit.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/bulkedit.tpl	2006-09-13 09:29:38.000000000 -0700
@@ -1,40 +1,40 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {CATNAV} > Bulk Edit</div>
-<br>
-
-<form action="bulkedit.php?catid={CATID}&amp;filled=1" method="post">
-<table>
-<tr>
-<td {COLUMNHEADER}>&nbsp;</td>
-<td {COLUMNHEADER}>Title</td>
-<td {COLUMNHEADER}>Description</td>
-<td {COLUMNHEADER}>URL</td>
-</tr>
-<!-- BEGIN LINKS -->
-<tr>
- <td class="oddcolumns"><input type="checkbox" name="selection[{LINKID}]" value="1"></td>
- <td class="evencolumns"><input type="text" name="title[{LINKID}]" value="{LINKTITLE}" size="{STANDARDSIZE}"></td>
- <td class="oddcolumns"><textarea name="description[{LINKID}]" rows="2" cols="50">{LINKDESCRIPTION}</textarea></td>
- <td class="evencolumns"><input type="text" name="url[{LINKID}]" value="{LINKURL}" size="{STANDARDSIZE}"></td>
-</tr>
-<!-- END LINKS -->
-</table>
-<IF {MULTIPAGE}>
-<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<p>With selected, 
-<select name="action">
- <option value="nothing">ignore selections, just edit</option>
- <option value="delete">delete</option>
- <option value="move">move to another category</option>
- <option value="alias">alias to another category</option>
-</select>
-<br>If moving or aliasing, select a category: 
-<IF {SWITCH_CATSELECTOR}>
-<select name="newcategory"><option value="">not applicable</option>{CATOPTIONS}</select>
-<ELSE>
-<input type="text" name="newcategory" size="6"> (type id number)
-</IF>
-</p>
-<p><input type="submit" value="Save Changes" class="button"></p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {CATNAV} > Bulk Edit</div>
+<br>
+
+<form action="bulkedit.php?catid={CATID}&amp;filled=1" method="post">
+<table>
+<tr>
+<td {COLUMNHEADER}>&nbsp;</td>
+<td {COLUMNHEADER}>Title</td>
+<td {COLUMNHEADER}>Description</td>
+<td {COLUMNHEADER}>URL</td>
+</tr>
+<!-- BEGIN LINKS -->
+<tr>
+ <td class="oddcolumns"><input type="checkbox" name="selection[{LINKID}]" value="1"></td>
+ <td class="evencolumns"><input type="text" name="title[{LINKID}]" value="{LINKTITLE}" size="{STANDARDSIZE}"></td>
+ <td class="oddcolumns"><textarea name="description[{LINKID}]" rows="2" cols="50">{LINKDESCRIPTION}</textarea></td>
+ <td class="evencolumns"><input type="text" name="url[{LINKID}]" value="{LINKURL}" size="{STANDARDSIZE}"></td>
+</tr>
+<!-- END LINKS -->
+</table>
+<IF {MULTIPAGE}>
+<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<p>With selected, 
+<select name="action">
+ <option value="nothing">ignore selections, just edit</option>
+ <option value="delete">delete</option>
+ <option value="move">move to another category</option>
+ <option value="alias">alias to another category</option>
+</select>
+<br>If moving or aliasing, select a category: 
+<IF {SWITCH_CATSELECTOR}>
+<select name="newcategory"><option value="">not applicable</option>{CATOPTIONS}</select>
+<ELSE>
+<input type="text" name="newcategory" size="6"> (type id number)
+</IF>
+</p>
+<p><input type="submit" value="Save Changes" class="button"></p>
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/calendarday.tpl wsnlinks/templates/default/calendarday.tpl
--- 400/templates/default/calendarday.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/calendarday.tpl	2006-09-13 09:29:38.000000000 -0700
@@ -1,50 +1,50 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="calendar.php?monthID={MONTHID}&amp;yearID={YEARID}">Calendar</a> > {MONTHID}/{DAYID}/{YEARID}
-
-<IF {NUMEVENTS} is 0>
-<p>There are no events scheduled for {MONTHID}/{DAYID}/{YEARID}.</p>
-<OTHERWISE>
-<p>Events scheduled for {MONTHID}/{DAYID}/{YEARID}:</p>
-</IF>
-
-<!-- BEGIN EVENTS -->
-<p>
-<span class="important">{EVENTTITLE}</span> <IF {EVENTCANEDIT}>[<a href="calendar.php?action=editevent&amp;id={EVENTID}&amp;dayID={DAYID}&amp;monthID={MONTHID}&amp;yearID={YEARID}">Edit</a>]</IF><br />
-{EVENTDESCRIPTION} <br />
-<IF not {EVENTDATE}>
-<i>Starts: {EVENTSTARTDATE}
-<br />Ends: {EVENTENDDATE}</i> <br />
-</IF>
-(Scheduled by <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a>)
-
-<IF {EVENTINFUTURE}>
-<IF {EVENTJOINED}><br>These people are planning to participate in the event: {EVENTJOINEDLIST}
-</IF>
-<IF {EVENTTHERE}>
-<br><a href="calendar.php?monthID={MONTHID}&amp;dayID={DAYID}&amp;yearID={YEARID}&amp;action=joinevent&amp;eventid={EVENTID}">Un-join Event</a>
-<ELSE>
-<br><a href="calendar.php?monthID={MONTHID}&amp;dayID={DAYID}&amp;yearID={YEARID}&amp;action=joinevent&amp;eventid={EVENTID}">Join Event</a>
-</IF>
-</IF>
-</p>
-<!-- END EVENTS -->
-
-<IF {NUMBIRTHDAYS} is 0>
-<p>There are no member birthdays on {MONTHID}/{DAYID}/{YEARID}.</p>
-<OTHERWISE>
-<p>Member birthdays on {MONTHID}/{DAYID}/{YEARID}:</p>
-</IF>
-
-<!-- BEGIN BIRTHDAYLIST -->
-<a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMECOLOR}">{MEMBERNAME}</a> <IF {AGE}>({AGE})</IF> <br>
-<!-- END BIRTHDAYLIST -->
-
-<IF {THISMEMBERGROUPCANSUBMITEVENTS}>
-<a name="addevent"></a>
-<form action="calendar.php?monthID={MONTHID}&amp;dayID={DAYID}&amp;yearID={YEARID}&amp;action=addevent" method="post">
-<p><span class="important">Add a New Event</span></p>
-Event Title: <input type="text" name="title" size="{STANDARDSIZE}">
-<br>Event Description: <br><textarea name="description" rows="8" cols="60"></textarea>
-<br>The event will run from <input type="text" name="starttime" size="8" value="12 AM"> to <input type="text" name="endtime" size="8" value="11:59 PM">
-<br><input type="submit" value="Submit Event" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="calendar.php?monthID={MONTHID}&amp;yearID={YEARID}">Calendar</a> > {MONTHID}/{DAYID}/{YEARID}
+
+<IF {NUMEVENTS} is 0>
+<p>There are no events scheduled for {MONTHID}/{DAYID}/{YEARID}.</p>
+<OTHERWISE>
+<p>Events scheduled for {MONTHID}/{DAYID}/{YEARID}:</p>
+</IF>
+
+<!-- BEGIN EVENTS -->
+<p>
+<span class="important">{EVENTTITLE}</span> <IF {EVENTCANEDIT}>[<a href="calendar.php?action=editevent&amp;id={EVENTID}&amp;dayID={DAYID}&amp;monthID={MONTHID}&amp;yearID={YEARID}">Edit</a>]</IF><br />
+{EVENTDESCRIPTION} <br />
+<IF not {EVENTDATE}>
+<i>Starts: {EVENTSTARTDATE}
+<br />Ends: {EVENTENDDATE}</i> <br />
+</IF>
+(Scheduled by <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a>)
+
+<IF {EVENTINFUTURE}>
+<IF {EVENTJOINED}><br>These people are planning to participate in the event: {EVENTJOINEDLIST}
+</IF>
+<IF {EVENTTHERE}>
+<br><a href="calendar.php?monthID={MONTHID}&amp;dayID={DAYID}&amp;yearID={YEARID}&amp;action=joinevent&amp;eventid={EVENTID}">Un-join Event</a>
+<ELSE>
+<br><a href="calendar.php?monthID={MONTHID}&amp;dayID={DAYID}&amp;yearID={YEARID}&amp;action=joinevent&amp;eventid={EVENTID}">Join Event</a>
+</IF>
+</IF>
+</p>
+<!-- END EVENTS -->
+
+<IF {NUMBIRTHDAYS} is 0>
+<p>There are no member birthdays on {MONTHID}/{DAYID}/{YEARID}.</p>
+<OTHERWISE>
+<p>Member birthdays on {MONTHID}/{DAYID}/{YEARID}:</p>
+</IF>
+
+<!-- BEGIN BIRTHDAYLIST -->
+<a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMECOLOR}">{MEMBERNAME}</a> <IF {AGE}>({AGE})</IF> <br>
+<!-- END BIRTHDAYLIST -->
+
+<IF {THISMEMBERGROUPCANSUBMITEVENTS}>
+<a name="addevent"></a>
+<form action="calendar.php?monthID={MONTHID}&amp;dayID={DAYID}&amp;yearID={YEARID}&amp;action=addevent" method="post">
+<p><span class="important">Add a New Event</span></p>
+Event Title: <input type="text" name="title" size="{STANDARDSIZE}">
+<br>Event Description: <br><textarea name="description" rows="8" cols="60"></textarea>
+<br>The event will run from <input type="text" name="starttime" size="8" value="12 AM"> to <input type="text" name="endtime" size="8" value="11:59 PM">
+<br><input type="submit" value="Submit Event" class="button">
+</form>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/calendar.tpl wsnlinks/templates/default/calendar.tpl
--- 400/templates/default/calendar.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/calendar.tpl	2006-09-21 16:20:23.000000000 -0700
@@ -1,7 +1,9 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Calendar</div>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Calendar</div>
 
 <div align="center">
 <!-- INSERT CALENDAR HERE -->
 </div>
 
-<p>If you wish to schedule or join an event, click the day.</p>
\ No newline at end of file
+<p>If you wish to schedule or join an event, click the day.</p>
+
+<p><IF {THISMEMBERCALSUB}><a href="calendar.php?action=subscribe">Unsubscribe from calendar</a><ELSE><a href="calendar.php?action=subscribe">Subscribe to calendar</a></p>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/confirm.tpl wsnlinks/templates/default/confirm.tpl
--- 400/templates/default/confirm.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/confirm.tpl	2006-09-13 09:29:38.000000000 -0700
@@ -1,10 +1,10 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="link.php?action=detail&amp;id={LINKID}">{LINKTITLE}</a></div> <br>
-
-<p>You are about to give "{LINKTITLE}" a rating of {VOTEVALUE}, where {MINVOTE} is the lowest rating and {MAXVOTE} is the highest.</p>
-
-<p align="center">
-<form action="vote.php?action=vote&amp;id={LINKID}" method="post">
-<input type="hidden" name="votevalue" value="{VOTEVALUE}">
-<input type="submit" value="Confirm Vote" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="link.php?action=detail&amp;id={LINKID}">{LINKTITLE}</a></div> <br>
+
+<p>You are about to give "{LINKTITLE}" a rating of {VOTEVALUE}, where {MINVOTE} is the lowest rating and {MAXVOTE} is the highest.</p>
+
+<p align="center">
+<form action="vote.php?action=vote&amp;id={LINKID}" method="post">
+<input type="hidden" name="votevalue" value="{VOTEVALUE}">
+<input type="submit" value="Confirm Vote" class="button">
+</form>
 </p>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/contactreply.tpl wsnlinks/templates/default/contactreply.tpl
--- 400/templates/default/contactreply.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/contactreply.tpl	2006-09-13 09:29:38.000000000 -0700
@@ -1,24 +1,24 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Contact Reply Form</div>
-
-<form action="contactreply.php?filled=1" method="post">
-<input type="hidden" name="returntopage" value="{DIRURL}">
-<table width="100%">
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Reply to Contact Form Submission</td></tr><tr>
- <td class="labelscolumn"><span class="labels">Send From:</span>
- <td class="optionscolumn"><input type="text" name="fromemail" size="{STANDARDSIZE}" value="{THISMEMBEREMAIL}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Send To:</span>
- <td class="optionscolumn"><input type="text" name="toemail" size="{STANDARDSIZE}" value=""></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Subject:</span>
- <td class="optionscolumn"><input type="text" name="subject" size="{STANDARDSIZE}" value="Re: contact form submission"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Message:</span>
- <td class="optionscolumn"><textarea rows="10" cols="75" name="message"></textarea></td>
-</tr>
-</table>
-<input type="submit" value="Send E-Mail" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Contact Reply Form</div>
+
+<form action="contactreply.php?filled=1" method="post">
+<input type="hidden" name="returntopage" value="{DIRURL}">
+<table width="100%">
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Reply to Contact Form Submission</td></tr><tr>
+ <td class="labelscolumn"><span class="labels">Send From:</span>
+ <td class="optionscolumn"><select name="fromemail"><option value="{EMAIL}">{EMAIL}</option><option value="{THISMEMBEREMAIL}">{THISMEMBEREMAIL}</option></select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Send To:</span>
+ <td class="optionscolumn"><input type="text" name="toemail" size="{STANDARDSIZE}" value=""></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Subject:</span>
+ <td class="optionscolumn"><input type="text" name="subject" size="{STANDARDSIZE}" value="Re: contact form submission"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Message:</span>
+ <td class="optionscolumn"><textarea rows="10" cols="75" name="message"></textarea></td>
+</tr>
+</table>
+<input type="submit" value="Send E-Mail" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/deletedposts.tpl wsnlinks/templates/default/deletedposts.tpl
--- 400/templates/default/deletedposts.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/deletedposts.tpl	2006-09-13 09:29:38.000000000 -0700
@@ -1,56 +1,56 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="link.php?id={LINKID}">{LINKTITLE}</a> > Bulk Edit Comments</div>
-<br>
-
-<p>There are <span class="labels">{LINKDELETEDPOSTS}</span> deleted comments in the thread.</p>
-
-<form action="threadadmin.php?id={LINKID}&amp;filled=1&amp;bulkedit=1&amp;undelete=1" method="post">
-<table width="100%">
-<tr><td colspan="3" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> <span class="labels">{LINKDELETEDPOSTS}</span> deleted comments in the thread</td></tr>
-<!-- BEGIN POSTS -->
-<IF {COMMENTDELETED}>
-<tr>
- <td valign="top" class="oddcolumns"><input type="checkbox" name="selection[{COMMENTID}]" value="1"></td>
- <td valign="top" width="20%"  class="commentposter">
-<a name="post{COMMENTID}"></a>
-<IF {MEMBERUSERGROUP} is 1>
-<span class="{MEMBERGROUPNAMESTYLE}">{COMMENTPOSTERNAME}</span><br>
-<OTHERWISE> 
-<a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</a> 
-<br> 
-<IF {MEMBERRANKIMAGE}><img src="{MEMBERRANKIMAGE}" alt="{MEMBERRANK}"><br></IF>
-{MEMBERRANK}
-<br>
-<IF {MEMBERSHOWAVATAR}> <img src="{MEMBERAVATARURL}" alt="avatar"> <br> </IF>
-
-<br><span class="labels">Group:</span> {MEMBERGROUPTITLE}
-<br><span class="labels">Joined:</span> {MEMBERREGDATE}
-<IF {MEMBERLOCATION}><br><span class="labels">Location:</span> {MEMBERLOCATION}</IF>
-<br>
-<br><span class="labels">Topics:</span> <a href="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERTOPICS}</a>
-<br><span class="labels">Posts:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERPOSTS}</a>
-</IF>
-
-<IF {THISMEMBERGROUPCANVIEWIP}><br><br>IP: {COMMENTIP}</IF>
-</td>
- <td valign="top" width="80%" class="comment">
-<span class="commentdate">Posted {COMMENTDATE}:</span><br><br>
-{COMMENTMESSAGE}
-<IF {COMMENTLASTEDITBY}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
-<br><br><span class="labels">Deleted by:</span> <a href="memberlist.php?action=profile&amp;id={COMMENTDELETEDBY}">{COMMENTDELETEDBYNAME}</a>
-<br><span class="labels">Reason for deletion:</span> {COMMENTDELETIONREASON}
-</td>
-</tr>
-<OTHERWISE>
-<tr>
- <td valign="top"></td>
- <td valign="top" width="20%" class="oddcolumns">{COMMENTPOSTERNAME}</td>
- <td valign="top" width="80%" class="evencolumns">{COMMENTMESSAGE[150 <,> remove]}</td>
-</tr>
-</IF>
-<!-- END POSTS -->
-</table>
-<IF {MULTIPAGE}>
-<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-<p><input type="submit" value="Undelete Selected Comments" class="button"></p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="link.php?id={LINKID}">{LINKTITLE}</a> > Bulk Edit Comments</div>
+<br>
+
+<p>There are <span class="labels">{LINKDELETEDPOSTS}</span> deleted comments in the thread.</p>
+
+<form action="threadadmin.php?id={LINKID}&amp;filled=1&amp;bulkedit=1&amp;undelete=1" method="post">
+<table width="100%">
+<tr><td colspan="3" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> <span class="labels">{LINKDELETEDPOSTS}</span> deleted comments in the thread</td></tr>
+<!-- BEGIN POSTS -->
+<IF {COMMENTDELETED}>
+<tr>
+ <td valign="top" class="oddcolumns"><input type="checkbox" name="selection[{COMMENTID}]" value="1"></td>
+ <td valign="top" width="20%"  class="commentposter">
+<a name="post{COMMENTID}"></a>
+<IF {MEMBERUSERGROUP} is 1>
+<span class="{MEMBERGROUPNAMESTYLE}">{COMMENTPOSTERNAME}</span><br>
+<OTHERWISE> 
+<a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</a> 
+<br> 
+<IF {MEMBERRANKIMAGE}><img src="{MEMBERRANKIMAGE}" alt="{MEMBERRANK}"><br></IF>
+{MEMBERRANK}
+<br>
+<IF {MEMBERSHOWAVATAR}> <img src="{MEMBERAVATARURL}" alt="avatar"> <br> </IF>
+
+<br><span class="labels">Group:</span> {MEMBERGROUPTITLE}
+<br><span class="labels">Joined:</span> {MEMBERREGDATE}
+<IF {MEMBERLOCATION}><br><span class="labels">Location:</span> {MEMBERLOCATION}</IF>
+<br>
+<br><span class="labels">Topics:</span> <a href="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERTOPICS}</a>
+<br><span class="labels">Posts:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERPOSTS}</a>
+</IF>
+
+<IF {THISMEMBERGROUPCANVIEWIP}><br><br>IP: {COMMENTIP}</IF>
+</td>
+ <td valign="top" width="80%" class="comment">
+<span class="commentdate">Posted {COMMENTDATE}:</span><br><br>
+{COMMENTMESSAGE}
+<IF {COMMENTLASTEDITBY}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
+<br><br><span class="labels">Deleted by:</span> <a href="memberlist.php?action=profile&amp;id={COMMENTDELETEDBY}">{COMMENTDELETEDBYNAME}</a>
+<br><span class="labels">Reason for deletion:</span> {COMMENTDELETIONREASON}
+</td>
+</tr>
+<OTHERWISE>
+<tr>
+ <td valign="top"></td>
+ <td valign="top" width="20%" class="oddcolumns">{COMMENTPOSTERNAME}</td>
+ <td valign="top" width="80%" class="evencolumns">{COMMENTMESSAGE[150 <,> remove]}</td>
+</tr>
+</IF>
+<!-- END POSTS -->
+</table>
+<IF {MULTIPAGE}>
+<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+<p><input type="submit" value="Undelete Selected Comments" class="button"></p>
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/deletedtopics.tpl wsnlinks/templates/default/deletedtopics.tpl
--- 400/templates/default/deletedtopics.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/deletedtopics.tpl	2006-09-13 09:29:38.000000000 -0700
@@ -1,46 +1,46 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {CATNAV} > Deleted Links</div>
-<br>
-
-<p>There are <span class="labels">{CATDELETEDTOPICS}</span> deleted links in the category.</p>
-
-<IF {CATDELETEDTOPICS}>
-<form action="bulkedit.php?catid={CATID}&amp;filled=1&amp;type=showdeleted" method="post">
-<table width="100%">
-<tr>
- <td {COLUMNHEADER}>&nbsp;</td>
- <td {COLUMNHEADER}>Link</td>
- <td {COLUMNHEADER}>Submitter</td>
- <td {COLUMNHEADER}>Comments</td>
- <IF {SWITCH_HITS}><td {COLUMNHEADER}>Views</td></IF>
- <IF {SWITCH_RATINGS}><td {COLUMNHEADER}>Rating</td></IF>
- <td {COLUMNHEADER}>Created</td>
- <td {COLUMNHEADER}>Deleted By</td>
- <td {COLUMNHEADER}>Reason For Deletion</td>
-</tr>
-<!-- BEGIN LINKS -->
-<IF {LINKDELETED}>
-<tr>
- <td class="oddcolumns"><input type="checkbox" name="selection[{LINKID}]" value="1"></td>
- <td class="evencolumns"><a href="{TRACKLINKURL}">{LINKTITLE}</a>
-<br>{LINKDESCRIPTION}
-</td>
- <td class="oddcolumns"><IF {LINKOWNERID}><a href="memberlist.php?action=profile&amp;id={LINKOWNERID}">{LINKOWNERNAME}</a>
-<ELSE>
-<IF {LINKOWNERNAME}>{LINKOWNERNAME}<ELSE>Guest</IF>
-</IF></td>
- <td class="evencolumns"><a href="comments.php?id={LINKID}">{LINKNUMCOMMENTS} comments</a></td>
- <td class="oddcolumns">{LINKHITS}</td>
- <IF {SWITCH_RATINGS}><td class="evencolumns"><IF {LINKVOTES}>{LINKSTARS} <br>{LINKRATING}/{MAXVOTE} with {LINKVOTES} votes<ELSE>&nbsp;</IF></td></IF>
- <td class="oddcolumns">{LINKDATE}</td>
- <td class="oddcolumns"><a href="memberlist.php?action=profile&amp;id={LINKDELETEDBY}">{LINKDELETEDBYNAME}</a></td>
- <td class="evencolumns">{LINKDELETIONREASON}</td>
-</tr>
-</IF>
-<!-- END LINKS -->
-</table>
-<IF {MULTIPAGE}>
-<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-<p><input type="submit" value="Undelete Selected Links" class="button"></p>
-</form>
-</IF>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {CATNAV} > Deleted Links</div>
+<br>
+
+<p>There are <span class="labels">{CATDELETEDTOPICS}</span> deleted links in the category.</p>
+
+<IF {CATDELETEDTOPICS}>
+<form action="bulkedit.php?catid={CATID}&amp;filled=1&amp;type=showdeleted" method="post">
+<table width="100%">
+<tr>
+ <td {COLUMNHEADER}>&nbsp;</td>
+ <td {COLUMNHEADER}>Link</td>
+ <td {COLUMNHEADER}>Submitter</td>
+ <td {COLUMNHEADER}>Comments</td>
+ <IF {SWITCH_HITS}><td {COLUMNHEADER}>Views</td></IF>
+ <IF {SWITCH_RATINGS}><td {COLUMNHEADER}>Rating</td></IF>
+ <td {COLUMNHEADER}>Created</td>
+ <td {COLUMNHEADER}>Deleted By</td>
+ <td {COLUMNHEADER}>Reason For Deletion</td>
+</tr>
+<!-- BEGIN LINKS -->
+<IF {LINKDELETED}>
+<tr>
+ <td class="oddcolumns"><input type="checkbox" name="selection[{LINKID}]" value="1"></td>
+ <td class="evencolumns"><a href="{TRACKLINKURL}">{LINKTITLE}</a>
+<br>{LINKDESCRIPTION}
+</td>
+ <td class="oddcolumns"><IF {LINKOWNERID}><a href="memberlist.php?action=profile&amp;id={LINKOWNERID}">{LINKOWNERNAME}</a>
+<ELSE>
+<IF {LINKOWNERNAME}>{LINKOWNERNAME}<ELSE>Guest</IF>
+</IF></td>
+ <td class="evencolumns"><a href="comments.php?id={LINKID}">{LINKNUMCOMMENTS} comments</a></td>
+ <td class="oddcolumns">{LINKHITS}</td>
+ <IF {SWITCH_RATINGS}><td class="evencolumns"><IF {LINKVOTES}>{LINKSTARS} <br>{LINKRATING}/{MAXVOTE} with {LINKVOTES} votes<ELSE>&nbsp;</IF></td></IF>
+ <td class="oddcolumns">{LINKDATE}</td>
+ <td class="oddcolumns"><a href="memberlist.php?action=profile&amp;id={LINKDELETEDBY}">{LINKDELETEDBYNAME}</a></td>
+ <td class="evencolumns">{LINKDELETIONREASON}</td>
+</tr>
+</IF>
+<!-- END LINKS -->
+</table>
+<IF {MULTIPAGE}>
+<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+<p><input type="submit" value="Undelete Selected Links" class="button"></p>
+</form>
+</IF>
diff -U 3 -H -d -r -N -- 400/templates/default/detailcomments.tpl wsnlinks/templates/default/detailcomments.tpl
--- 400/templates/default/detailcomments.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/detailcomments.tpl	2006-09-13 09:29:38.000000000 -0700
@@ -1,245 +1,245 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {LINKNAV} > {LINKTITLE}</div><br>
-
-<div class="detailsborder">
-<div class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Details of "{LINKTITLE}"</div>
-
-<IF {LINKURL}><div class="details"><span class="labels">URL:</span>
-<a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKURL}</a> </div></IF>
-
-<div class="details"><span class="labels">Date Submitted:</span>
-{LINKDATE} <IF {LINKLASTEDITDATE}> (Edited {LINKLASTEDITDATE})</IF></div>
-
-<div class="details"><span class="labels">Description:</span>
-{LINKDESCRIPTION}</div>
-
-<IF {SWITCH_RATINGS}><div class="details"><span class="labels">Rating:</span>
-{LINKSTARS} <br>{LINKRATING}/{MAXVOTE} based on {LINKVOTES} votes
-<br>Median rating: {LINKMEDIANRATING}
-<IF {THISMEMBERGROUPCANVIEWVOTES}><br><a href="showvotes.php?id={LINKID}">Show Individual Votes</a></IF>
-</div></IF>
-
-<IF {SWITCH_HITS}><div class="details"><span class="labels">Hits:</span>
-{LINKHITS} to site, {LINKHITSIN} from site. Averaging {LINKHITSOUTPERDAY} out and {LINKHITSINPERDAY} in per day. 
-<IF {HITSTEMPDAYS}><br>In the most recent {HITSTEMPDAYS} day period, there've been {LINKHITSOUTTEMP} to the site and {LINKHITSINTEMP} from the site.</IF></div></IF>
-
-<IF {LINKFILEFIELD}>
-<div class="details"><span class="labels">Attached Files:</span><br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
-<IF {ATTACHISIMAGE}><img src="thumbnail.php?id={LINKID}&amp;attachid={ATTACHID}" alt="image"></a><br></IF>
-<!-- END LINK ATTACHMENTS -->
-</div>
-</IF>
-
-<IF {LINKRELATED}>
-<div class="details"><span class="labels">Related Links:</span>
-<!-- BEGIN RELATED --> <a href="{TRACKLINKURL}">{LINKTITLE}</a>, <!-- END RELATED -->
-</div>
-</IF>
-
-<IF {SWITCH_SIMILAR} and {LINKNUMSIMILAR}>
-<div class="details"><span class="labels">Similar Links:</span><br>
-<!-- BEGIN SIMILAR --> <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a> <br> <!-- END SIMILAR -->
-</div>
-</IF>
-
-<IF {SWITCH_RATINGS}>
-<div class="details"><span class="labels">Rate this Link:</span>
-<form action="vote.php?action=vote&amp;id={LINKID}" method="post">
-<select name="votevalue">
-<option value="5">5 - Perfect</option>
-<option value="4">4 - Good</option>
-<option value="3">3 - Average</option>
-<option value="2">2 - Mediocre</option>
-<option value="1">1 - Bad</option>
-</select>
-<input type="submit" value="Rate this site">
-</form>
-</div>
-</IF>
-
-<IF {THISMEMBERGROUPCANEMAIL}>
-<div class="details"><span class="labels">E-mail Link to Someone:</span>
-<form action="email.php?filled=1" method="post">
- Send from <input type="text" name="fromemail" size="20"> to the email <input type="text" name="toemail" size="20"> <input type="hidden" name="id" value="{LINKID}"><input type="submit" value="Send Link">
-</form></div>
-</IF>
-
-<div class="details">
-
-<table width="100%">
-<!-- BEGIN POST -->
-<!-- BEGIN REGULAR -->
-<tr>
-<td height="100%" class="commentposter" valign="top">
-
-<a name="comment{COMMENTID}"></a>
-<IF {MEMBERUSERGROUP} is 1>
-<span class="{MEMBERGROUPNAMESTYLE}">{COMMENTPOSTERNAME}</span><br>
-<OTHERWISE> 
-<a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</a> 
-<br> 
-<IF {MEMBERRANKIMAGE}><img src="{MEMBERRANKIMAGE}" alt="{MEMBERRANK}"><br></IF>
-{MEMBERRANK}
-<br>
-<IF {MEMBERSHOWAVATAR}> <img src="{MEMBERAVATARURL}" alt="avatar"> <br> </IF>
-
-<br><span class="labels">Group:</span> {MEMBERGROUPTITLE}
-<br><span class="labels">Joined:</span> {MEMBERREGDATE}
-<IF {MEMBERLOCATION}><br><span class="labels">Location:</span> {MEMBERLOCATION}</IF>
-<br>
-
-<IF {THISMEMBERISREGISTERED}>
-<br><span class="labels">Links:</span> <a href="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERLINKS}</a>
-<br><span class="labels">Comments:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERCOMMENTS}</a>
-<ELSE>
-<br><span class="labels">Links:</span> {MEMBERLINKS}
-<br><span class="labels">Comments:</span> {MEMBERCOMMENTS}
-</IF>
-
-</IF>
-
-<IF {SWITCH_REPORTS} and {THISMEMBERGROUPCANREPORT}><br><br><a href="reportcomment.php?id={COMMENTID}"><img src="{TEMPLATESDIR}/images/report.gif" border="0" alt="report bad post"></a></IF>
-
-<IF {SWITCH_RATINGS} and {THISMEMBERGROUPCANRATECOMMENTS}>
-<br><br>Rate this post: <a href="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}&amp;votevalue=plus&amp;voteplus=1">
-<img src="{TEMPLATESDIR}/images/plus.gif" border="0" alt="rate post up"></a> <a href="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}&amp;votevalue=minus&amp;voteminus=1">
-<img src="{TEMPLATESDIR}/images/minus.gif" border="0" alt="rate post down"></a>
-</IF>
-
-<IF {THISMEMBERGROUPCANVIEWIP}><br><br>IP: <a href="searchips.php?filled=1&getmembers=1&ip={COMMENTIP}">{COMMENTIP}</a></IF>
-
-</td>
-
-<td width="80%" class="comment" valign="top" height="100%">
-<table width="100%">
-<tr valign="top">
-<td align="left"><span class="commentdate">
-<IF {COMMENTVOTES} is greater than 0>{COMMENTAPPROVED} of {COMMENTVOTES} people found this post helpful <br></IF>
-Posted {COMMENTDATE}:</span> <IF {COMMENTCANEDIT}><a href="edit.php?action=comment&amp;field=id&amp;condition=equals&amp;fieldvalue={COMMENTID}"><img src="{TEMPLATESDIR}/images/editpost.gif" border="0" alt="edit"></a></IF> 
-<IF {COMMENTTITLE}><br>{COMMENTICONIMAGE} Subject: <span class="important">{COMMENTTITLE}</span> <ELSE><br>{COMMENTICONIMAGE} </IF>
-</td>
-<td align="right"><a href="postreply.php?id={LINKID}&amp;quotepost={COMMENTID}#postarea"><img src="{TEMPLATESDIR}/images/quote.gif" border="0" alt="quote post"></a> <br>#{COMMENTNUMBER}</td>
-  </tr>
-  <tr valign="middle">
-   <td height="100%" valign="top">{COMMENTMESSAGE}
-   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
-   </td>
-  </tr>
-  <tr valign="bottom">
-   <td valign="bottom">
-<IF {COMMENTNUMATTACHMENTS}>
-<br>Attached Files:<br>
-<table>
-<tr>
-<!-- BEGIN ATTACHMENTS -->
-<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
-<IF {ATTACHISIMAGE}>
-<a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}"><img src="thumbnail.php?comid={COMMENTID}&amp;attachid={ATTACHID}" border="0" alt="attachment"></a>
-</IF>
-</td>
-<!-- END ATTACHMENTS -->
-</tr>
-</table>
-</IF>
-  <IF {COMMENTSHOWSIG}>
-     <br>_____________________
-     <br>{MEMBERSIGNATURE}
-  </IF>
-   </td>
-  </tr>
-</table>
-</td> 
-</tr>
-<!-- END REGULAR -->
-<!-- END POST -->
-</table>
-
-<IF {MULTIPAGE}>
-Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
-</IF>
-
-<IF {LINKCANPOST}><p align="right"><a href="postreply.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/postreply.gif" border="0" alt="Post Reply"></a></p></IF>
-
-
-<a name="commentarea"></a>
-
-<IF {LINKCANPOST}>
-<p>Post a quick reply:</p>
-<form <IF {THISMEMBERPOSTEDITOR} is WYSIWYG>onsubmit="return submitForm();"</IF> enctype="multipart/form-data" name="commentform" action="postreply.php?filled=1&amp;id={LINKID}" method="POST">
-<table>
-<IF {THISMEMBERUSERGROUP} is 1>
-<tr>
- <td valign="top"><span class="labels">Your Name:</span></td>
- <td valign="top"><input type=text name="commentername" value="{COMMENTPOSTERNAME}"></td>
-</tr>
-</IF>
-<input type="hidden" name="type" value="regular">
-
-<!-- INSERT NEW FIELDS HERE -->
-
-<tr>
- <td valign="top" width="25%"><span class="labels">Your post:</span>
-<br><br>
-<center>
-<IF {SWITCH_SMILIES}>
-<div class="smiliebox">
-<!-- BEGIN SMILIES -->
-<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
-<!-- END SMILIES -->
-</div>
-</IF>
-</center>
-<IF {SWITCH_WSNCODES}>
-<br><IF {THISMEMBERPOSTEDITOR} is WYSIWYG>Drag a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.<ELSE>Click a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.</IF> You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400,scrollbars=yes');">WSN Codes</a> in your message.
-</IF>
-</td>
-
- <td valign="top" width="75%">
-<IF {THISMEMBERPOSTEDITOR} is WYSIWYG>
-<script language="JavaScript" type="text/javascript" src="{TEMPLATESDIR}/richtext.js"></script>
-<script language="JavaScript" type="text/javascript">
-function submitForm() { updateRTEs(); return true; }
-initRTE("{DIRURL}/{TEMPLATESDIR}/images/posteditor/", "{TEMPLATESDIR}/", "{DIRURL}/templates/styles/{STYLESHEET}.css");
-</script>
-<script language="JavaScript" type="text/javascript">
-writeRichText('message', '{COMMENTMESSAGEWYSIWYG}', 300, 100, true, false);
-</script>
-<OTHERWISE>
-<textarea name="message" rows="8" cols="70">{COMMENTMESSAGE}</textarea>
-</IF>
- </td></tr>
-<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
-<tr>
- <td><span class="labels">Anti-Spam Image:</span>
-<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
- <td><img src="securityimage.php" class="bullet" alt="security image"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<input type="hidden" name="linkid" value="{LINKID}">
-<input type="submit" value="Submit" class="button"> <input type="submit" name="preview" value="Advanced" class="button">
-</form>
-<OTHERWISE>
-<IF {LINKTHREADCLOSED}>
-<p>This thread is closed, so you cannot post a reply.</p>
-<OTHERWISE>
-<p>You don't have permission to post replies.</p> 
-<IF {CATREQLINKS} or {CATREQCOMS}>
-<p>You must have at least {CATREQLINKS} topics and {CATREQCOMS} posts elsewhere before you can post in this forum.</p>
-</IF>
-<IF {THISMEMBERISGUEST}>Please <a href="index.php?action=userlogin">login</a> or <a href="register.php">register</a>.</IF>
-</IF>
-</IF>
-
-</div>
-
-<IF {SWITCH_ONLINEUSERS}>
-<div class="details">
-Members currently reading these link details: 
-<!-- BEGIN TOPLIST 3 -->
-<CONFIG>online,time,100,descending,threadid={LINKID} AND memberid>0,,</CONFIG>
-<a href="memberlist.php?action=profile&amp;id={ONLINEMEMBERID}">{ONLINENAME}</a>,  
-<!-- END TOPLIST 3 -->
-</div>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {LINKNAV} > {LINKTITLE}</div><br>
+
+<div class="detailsborder">
+<div class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Details of "{LINKTITLE}"</div>
+
+<IF {LINKURL}><div class="details"><span class="labels">URL:</span>
+<a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKURL}</a> </div></IF>
+
+<div class="details"><span class="labels">Date Submitted:</span>
+{LINKDATE} <IF {LINKLASTEDITDATE}> (Edited {LINKLASTEDITDATE})</IF></div>
+
+<div class="details"><span class="labels">Description:</span>
+{LINKDESCRIPTION}</div>
+
+<IF {SWITCH_RATINGS}><div class="details"><span class="labels">Rating:</span>
+{LINKSTARS} <br>{LINKRATING}/{MAXVOTE} based on {LINKVOTES} votes
+<br>Median rating: {LINKMEDIANRATING}
+<IF {THISMEMBERGROUPCANVIEWVOTES}><br><a href="showvotes.php?id={LINKID}">Show Individual Votes</a></IF>
+</div></IF>
+
+<IF {SWITCH_HITS}><div class="details"><span class="labels">Hits:</span>
+{LINKHITS} to site, {LINKHITSIN} from site. Averaging {LINKHITSOUTPERDAY} out and {LINKHITSINPERDAY} in per day. 
+<IF {HITSTEMPDAYS}><br>In the most recent {HITSTEMPDAYS} day period, there've been {LINKHITSOUTTEMP} to the site and {LINKHITSINTEMP} from the site.</IF></div></IF>
+
+<IF {LINKFILEFIELD}>
+<div class="details"><span class="labels">Attached Files:</span><br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
+<IF {ATTACHISIMAGE}><img src="thumbnail.php?id={LINKID}&amp;attachid={ATTACHID}" alt="image"></a><br></IF>
+<!-- END LINK ATTACHMENTS -->
+</div>
+</IF>
+
+<IF {LINKRELATED}>
+<div class="details"><span class="labels">Related Links:</span>
+<!-- BEGIN RELATED --> <a href="{TRACKLINKURL}">{LINKTITLE}</a>, <!-- END RELATED -->
+</div>
+</IF>
+
+<IF {SWITCH_SIMILAR} and {LINKNUMSIMILAR}>
+<div class="details"><span class="labels">Similar Links:</span><br>
+<!-- BEGIN SIMILAR --> <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a> <br> <!-- END SIMILAR -->
+</div>
+</IF>
+
+<IF {SWITCH_RATINGS}>
+<div class="details"><span class="labels">Rate this Link:</span>
+<form action="vote.php?action=vote&amp;id={LINKID}" method="post">
+<select name="votevalue">
+<option value="5">5 - Perfect</option>
+<option value="4">4 - Good</option>
+<option value="3">3 - Average</option>
+<option value="2">2 - Mediocre</option>
+<option value="1">1 - Bad</option>
+</select>
+<input type="submit" value="Rate this site">
+</form>
+</div>
+</IF>
+
+<IF {THISMEMBERGROUPCANEMAIL}>
+<div class="details"><span class="labels">E-mail Link to Someone:</span>
+<form action="email.php?filled=1" method="post">
+ Send from <input type="text" name="fromemail" size="20"> to the email <input type="text" name="toemail" size="20"> <input type="hidden" name="id" value="{LINKID}"><input type="submit" value="Send Link">
+</form></div>
+</IF>
+
+<div class="details">
+
+<table width="100%">
+<!-- BEGIN POST -->
+<!-- BEGIN REGULAR -->
+<tr>
+<td height="100%" class="commentposter" valign="top">
+
+<a name="comment{COMMENTID}"></a>
+<IF {MEMBERUSERGROUP} is 1>
+<span class="{MEMBERGROUPNAMESTYLE}">{COMMENTPOSTERNAME}</span><br>
+<OTHERWISE> 
+<a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</a> 
+<br> 
+<IF {MEMBERRANKIMAGE}><img src="{MEMBERRANKIMAGE}" alt="{MEMBERRANK}"><br></IF>
+{MEMBERRANK}
+<br>
+<IF {MEMBERSHOWAVATAR}> <img src="{MEMBERAVATARURL}" alt="avatar"> <br> </IF>
+
+<br><span class="labels">Group:</span> {MEMBERGROUPTITLE}
+<br><span class="labels">Joined:</span> {MEMBERREGDATE}
+<IF {MEMBERLOCATION}><br><span class="labels">Location:</span> {MEMBERLOCATION}</IF>
+<br>
+
+<IF {THISMEMBERISREGISTERED}>
+<br><span class="labels">Links:</span> <a href="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERLINKS}</a>
+<br><span class="labels">Comments:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERCOMMENTS}</a>
+<ELSE>
+<br><span class="labels">Links:</span> {MEMBERLINKS}
+<br><span class="labels">Comments:</span> {MEMBERCOMMENTS}
+</IF>
+
+</IF>
+
+<IF {SWITCH_REPORTS} and {THISMEMBERGROUPCANREPORT}><br><br><a href="reportcomment.php?id={COMMENTID}"><img src="{TEMPLATESDIR}/images/report.gif" border="0" alt="report bad post"></a></IF>
+
+<IF {SWITCH_RATINGS} and {THISMEMBERGROUPCANRATECOMMENTS}>
+<br><br>Rate this post: <a href="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}&amp;votevalue=plus&amp;voteplus=1">
+<img src="{TEMPLATESDIR}/images/plus.gif" border="0" alt="rate post up"></a> <a href="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}&amp;votevalue=minus&amp;voteminus=1">
+<img src="{TEMPLATESDIR}/images/minus.gif" border="0" alt="rate post down"></a>
+</IF>
+
+<IF {THISMEMBERGROUPCANVIEWIP}><br><br>IP: <a href="searchips.php?filled=1&getmembers=1&ip={COMMENTIP}">{COMMENTIP}</a></IF>
+
+</td>
+
+<td width="80%" class="comment" valign="top" height="100%">
+<table width="100%">
+<tr valign="top">
+<td align="left"><span class="commentdate">
+<IF {COMMENTVOTES} is greater than 0>{COMMENTAPPROVED} of {COMMENTVOTES} people found this post helpful <br></IF>
+Posted {COMMENTDATE}:</span> <IF {COMMENTCANEDIT}><a href="edit.php?action=comment&amp;field=id&amp;condition=equals&amp;fieldvalue={COMMENTID}"><img src="{TEMPLATESDIR}/images/editpost.gif" border="0" alt="edit"></a></IF> 
+<IF {COMMENTTITLE}><br>{COMMENTICONIMAGE} Subject: <span class="important">{COMMENTTITLE}</span> <ELSE><br>{COMMENTICONIMAGE} </IF>
+</td>
+<td align="right"><a href="postreply.php?id={LINKID}&amp;quotepost={COMMENTID}#postarea"><img src="{TEMPLATESDIR}/images/quote.gif" border="0" alt="quote post"></a> <br>#{COMMENTNUMBER}</td>
+  </tr>
+  <tr valign="middle">
+   <td height="100%" valign="top">{COMMENTMESSAGE}
+   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
+   </td>
+  </tr>
+  <tr valign="bottom">
+   <td valign="bottom">
+<IF {COMMENTNUMATTACHMENTS}>
+<br>Attached Files:<br>
+<table>
+<tr>
+<!-- BEGIN ATTACHMENTS -->
+<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
+<IF {ATTACHISIMAGE}>
+<a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}"><img src="thumbnail.php?comid={COMMENTID}&amp;attachid={ATTACHID}" border="0" alt="attachment"></a>
+</IF>
+</td>
+<!-- END ATTACHMENTS -->
+</tr>
+</table>
+</IF>
+  <IF {COMMENTSHOWSIG}>
+     <br>_____________________
+     <br>{MEMBERSIGNATURE}
+  </IF>
+   </td>
+  </tr>
+</table>
+</td> 
+</tr>
+<!-- END REGULAR -->
+<!-- END POST -->
+</table>
+
+<IF {MULTIPAGE}>
+Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
+</IF>
+
+<IF {LINKCANPOST}><p align="right"><a href="postreply.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/postreply.gif" border="0" alt="Post Reply"></a></p></IF>
+
+
+<a name="commentarea"></a>
+
+<IF {LINKCANPOST}>
+<p>Post a quick reply:</p>
+<form <IF {THISMEMBERPOSTEDITOR} is WYSIWYG>onsubmit="return submitForm();"</IF> enctype="multipart/form-data" name="commentform" action="postreply.php?filled=1&amp;id={LINKID}" method="POST">
+<table>
+<IF {THISMEMBERUSERGROUP} is 1>
+<tr>
+ <td valign="top"><span class="labels">Your Name:</span></td>
+ <td valign="top"><input type=text name="commentername" value="{COMMENTPOSTERNAME}"></td>
+</tr>
+</IF>
+<input type="hidden" name="type" value="regular">
+
+<!-- INSERT NEW FIELDS HERE -->
+
+<tr>
+ <td valign="top" width="25%"><span class="labels">Your post:</span>
+<br><br>
+<center>
+<IF {SWITCH_SMILIES}>
+<div class="smiliebox">
+<!-- BEGIN SMILIES -->
+<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
+<!-- END SMILIES -->
+</div>
+</IF>
+</center>
+<IF {SWITCH_WSNCODES}>
+<br><IF {THISMEMBERPOSTEDITOR} is WYSIWYG>Drag a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.<ELSE>Click a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.</IF> You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400,scrollbars=yes');">WSN Codes</a> in your message.
+</IF>
+</td>
+
+ <td valign="top" width="75%">
+<IF {THISMEMBERPOSTEDITOR} is WYSIWYG>
+<script language="JavaScript" type="text/javascript" src="{TEMPLATESDIR}/richtext.js"></script>
+<script language="JavaScript" type="text/javascript">
+function submitForm() { updateRTEs(); return true; }
+initRTE("{DIRURL}/{TEMPLATESDIR}/images/posteditor/", "{TEMPLATESDIR}/", "{DIRURL}/templates/styles/{STYLESHEET}.css");
+</script>
+<script language="JavaScript" type="text/javascript">
+writeRichText('message', '{COMMENTMESSAGEWYSIWYG}', 300, 100, true, false);
+</script>
+<OTHERWISE>
+<textarea name="message" rows="8" cols="70">{COMMENTMESSAGE}</textarea>
+</IF>
+ </td></tr>
+<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
+<tr>
+ <td><span class="labels">Anti-Spam Image:</span>
+<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
+ <td><img src="securityimage.php" class="bullet" alt="security image"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<input type="hidden" name="linkid" value="{LINKID}">
+<input type="submit" value="Submit" class="button"> <input type="submit" name="preview" value="Advanced" class="button">
+</form>
+<OTHERWISE>
+<IF {LINKTHREADCLOSED}>
+<p>This thread is closed, so you cannot post a reply.</p>
+<OTHERWISE>
+<p>You don't have permission to post replies.</p> 
+<IF {CATREQLINKS} or {CATREQCOMS}>
+<p>You must have at least {CATREQLINKS} topics and {CATREQCOMS} posts elsewhere before you can post in this forum.</p>
+</IF>
+<IF {THISMEMBERISGUEST}>Please <a href="index.php?action=userlogin">login</a> or <a href="register.php">register</a>.</IF>
+</IF>
+</IF>
+
+</div>
+
+<IF {SWITCH_ONLINEUSERS}>
+<div class="details">
+Members currently reading these link details: 
+<!-- BEGIN TOPLIST 3 -->
+<CONFIG>online,time,100,descending,threadid={LINKID} AND memberid>0,,</CONFIG>
+<a href="memberlist.php?action=profile&amp;id={ONLINEMEMBERID}">{ONLINENAME}</a>,  
+<!-- END TOPLIST 3 -->
+</div>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/details.tpl wsnlinks/templates/default/details.tpl
--- 400/templates/default/details.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/details.tpl	2006-09-13 09:29:38.000000000 -0700
@@ -1,84 +1,84 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {LINKNAV} > {LINKTITLE}</div><br>
-
-<div class="detailsborder">
-<div class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Details of "{LINKTITLE}"</div>
-
-<IF {LINKURL}><div class="details"><span class="labels">URL:</span>
-<a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKURL}</a> </div></IF>
-
-<div class="details"><span class="labels">Date Submitted:</span>
-{LINKDATE} <IF {LINKLASTEDITDATE}> (Edited {LINKLASTEDITDATE})</IF></div>
-
-<div class="details"><span class="labels">Description:</span>
-{LINKDESCRIPTION}</div>
-
-<IF {SWITCH_RATINGS}><div class="details"><span class="labels">Rating:</span>
-{LINKSTARS} <br>{LINKRATING}/{MAXVOTE} based on {LINKVOTES} votes
-<br>Median rating: {LINKMEDIANRATING}
-<IF {THISMEMBERGROUPCANVIEWVOTES}><br><a href="showvotes.php?id={LINKID}">Show Individual Votes</a></IF>
-</div></IF>
-
-<IF {SWITCH_TRADER} and {LINKOWNERID}><div class="details"><span class="labels">Submitter's Trader Rating:</span> <a href="trader.php?id={MEMBERID}">{MEMBERTRADERRATING}</a></div></IF>
-
-<IF {SWITCH_HITS}><div class="details"><span class="labels">Hits:</span>
-{LINKHITS} to site, {LINKHITSIN} from site. Averaging {LINKHITSOUTPERDAY} out and {LINKHITSINPERDAY} in per day. 
-<IF {HITSTEMPDAYS}><br>In the most recent {HITSTEMPDAYS} day period, there've been {LINKHITSOUTTEMP} to the site and {LINKHITSINTEMP} from the site.</IF></div></IF>
-
-<IF {SWITCH_COMMENTS}><div class="details"><span class="labels">Reviews:</span>
-<a href="comments.php?id={LINKID}">{LINKNUMCOMMENTS} comments</a></div></IF>
-
-<IF {LINKFILEFIELD}>
-<div class="details"><span class="labels">Attached Files:</span><br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
-<IF {ATTACHISIMAGE}><img src="{ATTACHTHUMBURL}" alt="image"></a><br></IF>
-<!-- END LINK ATTACHMENTS -->
-</div>
-</IF>
-
-<IF {LINKRELATED}>
-<div class="details"><span class="labels">Related Links:</span>
-<!-- BEGIN RELATED --> <a href="{TRACKLINKURL}">{LINKTITLE}</a>, <!-- END RELATED -->
-</div>
-</IF>
-
-<IF {SWITCH_SIMILAR} and {LINKNUMSIMILAR}>
-<div class="details"><span class="labels">Similar Links:</span><br>
-<!-- BEGIN SIMILAR --> <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a> <br> <!-- END SIMILAR -->
-</div>
-</IF>
-
-<IF {SWITCH_RATINGS}>
-<div class="details"><span class="labels">Rate this Link:</span>
-<form action="vote.php?action=vote&amp;id={LINKID}" method="post">
-<select name="votevalue">
-<option value="5">5 - Perfect</option>
-<option value="4">4 - Good</option>
-<option value="3">3 - Average</option>
-<option value="2">2 - Mediocre</option>
-<option value="1">1 - Bad</option>
-</select>
-<input type="submit" value="Rate this site">
-</form>
-</div>
-</IF>
-
-<IF {THISMEMBERGROUPCANEMAIL}>
-<div class="details"><span class="labels">E-mail Link to Someone:</span>
-<form action="email.php?filled=1" method="post">
- Send from <input type="text" name="fromemail" size="20"> to the email <input type="text" name="toemail" size="20"> <input type="hidden" name="id" value="{LINKID}"><input type="submit" value="Send Link">
-</form></div>
-
-<p align="center"><IF {PREVIOUSEXISTS}><a href="link.php?action=detail&catid={LINKCATID}&orderid={PREVIOUS}">Previous</a></IF>
-<IF {PREVIOUSEXISTS} and {NEXTEXISTS}> | </IF>
-<IF {NEXTEXISTS}><a href="link.php?action=detail&catid={LINKCATID}&orderid={NEXT}">Next</a></IF></p>
-
-</div>
-</IF>
-
-<IF {THISMEMBERUSERGROUP} is greater than 1 and {THISMEMBERID} is {LINKOWNERID}>
-<IF {SWITCH_RATINGS}><br><br>[<a href="index.php?action=getvotingcode&amp;id={LINKID}">Get voting code to place on your site</a>] </IF>
-<IF {SPONSORUSELINK} is yes>
-<br>[<a href="link.php?action=sponsor&amp;id={LINKID}">Move your link to the top: sponsor this category</a>]<br>
-</IF>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {LINKNAV} > {LINKTITLE}</div><br>
+
+<div class="detailsborder">
+<div class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Details of "{LINKTITLE}"</div>
+
+<IF {LINKURL}><div class="details"><span class="labels">URL:</span>
+<a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKURL}</a> </div></IF>
+
+<div class="details"><span class="labels">Date Submitted:</span>
+{LINKDATE} <IF {LINKLASTEDITDATE}> (Edited {LINKLASTEDITDATE})</IF></div>
+
+<div class="details"><span class="labels">Description:</span>
+{LINKDESCRIPTION}</div>
+
+<IF {SWITCH_RATINGS}><div class="details"><span class="labels">Rating:</span>
+{LINKSTARS} <br>{LINKRATING}/{MAXVOTE} based on {LINKVOTES} votes
+<br>Median rating: {LINKMEDIANRATING}
+<IF {THISMEMBERGROUPCANVIEWVOTES}><br><a href="showvotes.php?id={LINKID}">Show Individual Votes</a></IF>
+</div></IF>
+
+<IF {SWITCH_TRADER} and {LINKOWNERID}><div class="details"><span class="labels">Submitter's Trader Rating:</span> <a href="trader.php?id={MEMBERID}">{MEMBERTRADERRATING}</a></div></IF>
+
+<IF {SWITCH_HITS}><div class="details"><span class="labels">Hits:</span>
+{LINKHITS} to site, {LINKHITSIN} from site. Averaging {LINKHITSOUTPERDAY} out and {LINKHITSINPERDAY} in per day. 
+<IF {HITSTEMPDAYS}><br>In the most recent {HITSTEMPDAYS} day period, there've been {LINKHITSOUTTEMP} to the site and {LINKHITSINTEMP} from the site.</IF></div></IF>
+
+<IF {SWITCH_COMMENTS}><div class="details"><span class="labels">Reviews:</span>
+<a href="comments.php?id={LINKID}">{LINKNUMCOMMENTS} comments</a></div></IF>
+
+<IF {LINKFILEFIELD}>
+<div class="details"><span class="labels">Attached Files:</span><br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
+<IF {ATTACHISIMAGE}><img src="{ATTACHTHUMBURL}" alt="image"></a><br></IF>
+<!-- END LINK ATTACHMENTS -->
+</div>
+</IF>
+
+<IF {LINKRELATED}>
+<div class="details"><span class="labels">Related Links:</span>
+<!-- BEGIN RELATED --> <a href="{TRACKLINKURL}">{LINKTITLE}</a>, <!-- END RELATED -->
+</div>
+</IF>
+
+<IF {SWITCH_SIMILAR} and {LINKNUMSIMILAR}>
+<div class="details"><span class="labels">Similar Links:</span><br>
+<!-- BEGIN SIMILAR --> <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a> <br> <!-- END SIMILAR -->
+</div>
+</IF>
+
+<IF {SWITCH_RATINGS}>
+<div class="details"><span class="labels">Rate this Link:</span>
+<form action="vote.php?action=vote&amp;id={LINKID}" method="post">
+<select name="votevalue">
+<option value="5">5 - Perfect</option>
+<option value="4">4 - Good</option>
+<option value="3">3 - Average</option>
+<option value="2">2 - Mediocre</option>
+<option value="1">1 - Bad</option>
+</select>
+<input type="submit" value="Rate this site">
+</form>
+</div>
+</IF>
+
+<IF {THISMEMBERGROUPCANEMAIL}>
+<div class="details"><span class="labels">E-mail Link to Someone:</span>
+<form action="email.php?filled=1" method="post">
+ Send from <input type="text" name="fromemail" size="20"> to the email <input type="text" name="toemail" size="20"> <input type="hidden" name="id" value="{LINKID}"><input type="submit" value="Send Link">
+</form></div>
+
+<p align="center"><IF {PREVIOUSEXISTS}><a href="link.php?action=detail&catid={LINKCATID}&orderid={PREVIOUS}">Previous</a></IF>
+<IF {PREVIOUSEXISTS} and {NEXTEXISTS}> | </IF>
+<IF {NEXTEXISTS}><a href="link.php?action=detail&catid={LINKCATID}&orderid={NEXT}">Next</a></IF></p>
+
+</div>
+</IF>
+
+<IF {THISMEMBERUSERGROUP} is greater than 1 and {THISMEMBERID} is {LINKOWNERID}>
+<IF {SWITCH_RATINGS}><br><br>[<a href="index.php?action=getvotingcode&amp;id={LINKID}">Get voting code to place on your site</a>] </IF>
+<IF {SPONSORUSELINK} is yes>
+<br>[<a href="link.php?action=sponsor&amp;id={LINKID}">Move your link to the top: sponsor this category</a>]<br>
+</IF>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/displaylinks.tpl wsnlinks/templates/default/displaylinks.tpl
--- 400/templates/default/displaylinks.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/displaylinks.tpl	2006-09-13 09:29:38.000000000 -0700
@@ -1,253 +1,253 @@
-<br><br>
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {NAVIGATION} </div>
-<br>
-
-<center>
-<h2>{CATNAME} {CATADMIN}</h2>
-</center>
-
-<IF {CATNUMBERRELATED} is greater than 0>
-{CATNUMBERRELATED} related categories: </IF>
-<!-- BEGIN RELATED -->
-<a href="index.php?action=displaycat&amp;catid={CATID}" class="categoryname">{CATNAME}</a> ({CATNUMLINKS}) {CATHASNEW} {CATADMIN} <br>
-<!-- END RELATED -->
-
-<IF {SWITCH_SORTCATS}>
-<IF {CATNUMSUB} is greater than 0>
-<div class="sort">
-<form action="index.php?todo=ordercats&amp;action=displaycat&amp;catid={CATID}" method="post">
-Sort categories by 
-<select name="catfield">
- <option value="name">name</option>
- <option value="numlinks">number of links</option>
- <option value="numsub">number of subcategories</option>
- <option value="time">date created</option>
- <option value="lastedit">date edited</option>
-</select>
-in 
-<select name="catascdesc">
- <option value="asc">ascending</option>
- <option value="desc">descending</option>
-</select>
-order.
-<input type="submit" value="Sort" class="button">
-</form>
-</div>
-</IF>
-</IF>
-
-<table width="96%" cellpadding="5" cellspacing="10">
-<!-- BEGIN SUBCATEGORIES -->
-<!-- BEGIN REGULAR -->
-<td {SUBCATWIDTH} align="center" valign="top" class="category">
-<img src="{TEMPLATESDIR}/images/folder.gif" alt="folder"> <a href="index.php?action=displaycat&amp;catid={CATID}" class="categoryname">{CATNAME}</a> ({CATNUMLINKS}) {CATHASNEW} {CATADMIN}
-<br>{CATDESCRIPTION} <br>
-<IF {SWITCH_FORUMVIEWS}>{CATVIEWS} views<br></IF>
-<!-- BEGIN SUBSUB -->
- <a href="index.php?action=displaycat&amp;catid={CATID}">{CATNAME}</a>,  
-<!-- END SUBSUB -->
-</td>
-<!-- END REGULAR -->
-<!-- END SUBCATEGORIES -->
-</table>
-
-<IF {SUBMULTIPAGE}><p>Page: {SUBPREVIOUS} <b>{SUBCURRENTPAGE}</b> {SUBNEXT}</p></IF>
-
-<br>
-
-<IF {SWITCH_SORTLINKS} and {CATLINKSHERE}>
-<div class="sort">
-<form action="index.php">
-<input type="hidden" name="todo" value="orderlinks">
-<input type="hidden" name="action" value="displaycat">
-<input type="hidden" name="catid" value="{CATID}">
-Sort links by 
-<select name="orderlinks"><option value="id">newest</option>
- <option value="lastedit">last edited</option>
- <option value="title">title</option>
-<IF {SWITCH_RATINGS}>
- <option value="rating">rating</option>
- <option value="votes">votes</option>
-</IF>
-<IF {SWITCH_HITS}>
- <option value="hits">hits out</option>
- <option value="hitsin">hits in</option>
-</IF>
-<IF {SWITCH_COMMENTS}>
- <option value="numcomments">number of comments</option>
-</IF>
-<IF {SWITCH_PAGERANK}><option value="pagerank">pagerank</option></IF>
-</select>
-in
-<select name="ascdesc">
- <option value="asc">ascending</option>
- <option value="desc">decending</option>
-</select>
-order, and show 
-<select name="perpage">
- <option value="{PERPAGE}">{PERPAGE}</option>
- <option value="20">20</option>
- <option value="30">30</option>
- <option value="40">40</option>
- <option value="50">50</option>
-</select>
-links per page.
-<input type="submit" value="Sort" class="button">
-</form>
-</div>
-</IF>
-
-<div style="float: left; width: 80%;">
-
-<IF {SHOWRECIP}>
-<table width="100%" cellpadding="5" cellspacing="10">
-<!-- BEGIN RECIP LINKS -->
-<td {LINKWIDTH} valign="top" class="link">
-<img src="{TEMPLATESDIR}/images/star.gif" alt="reciprocal"> 
-<IF {LINKURL}>
-<a href="{TRACKLINKURL}" class="reciplink" {EXTERNALLINKS}>{LINKTITLE}</a>
-<OTHERWISE>
-{LINKTITLE}
-</IF>
-{LINKNEW} {LINKISUPDATED} <IF {LINKISREAD}><img src="{TEMPLATESDIR}/images/visited.gif" alt="viewed" title="Already Viewed"></IF> {LINKADMIN}
-<IF {SWITCH_RATINGS} and {LINKRATING}><br><img src="{TEMPLATESDIR}/images/stars{LINKNUMSTARS}.gif" alt="{LINKRATING} out of {MAXVOTE} stars" title="{LINKRATING} out of {MAXVOTE} stars"> ({LINKVOTES} votes)</IF>
-<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="PageRank {LINKPAGERANK}" title="PageRank {LINKPAGERANK}"></IF>
-<br>{LINKDESCRIPTION} 
-
-<div class="linktools">
-<br>Submitted {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, edited {LINKLASTEDITDATE}</IF>. <br>
-<IF {SWITCH_HITS}>{LINKHITS} hits outgoing, {LINKHITSIN} incoming.<br></IF> 
-<br>
-<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="Details"> Details</a> 
-<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="Rate"> Rate</a></IF> 
-<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="Report"> Report</a></IF> 
-<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="Email Link"> E-Mail Link</a></IF> 
-<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="Email Submitter"> E-Mail Submitter</a></IF> 
-<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="Bookmark"> Bookmark</a> 
-<IF {SWITCH_ALBUMS} and {THISMEMBERISREGISTERED}><a href="albums.php?add={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_save.gif" border="0" alt="Save"> Save</a></IF> 
-<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="Comments"> Reviews (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
-
-</div>
-
-<IF {LINKFILEFIELD}><br>Attached files:<br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
-<IF {ATTACHISIMAGE}><a href="download.php?id={LINKID}&amp;attachid={ATTACHID}"><img src="{ATTACHTHUMBURL}" alt="image"></a><br></IF>
-<!-- END LINK ATTACHMENTS -->
-</IF>
-
-</td>
-<!-- END RECIP LINKS -->
-</table>
-</IF>
-
-<IF {SHOWREGULAR}>
-<table width="100%" cellpadding="5" cellspacing="10">
-<!-- BEGIN REGULAR LINKS -->
-<td {LINKWIDTH} valign="top" class="link">
-<IF {LINKURL}>
-<a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a>
-<OTHERWISE>
-{LINKTITLE}
-</IF>
-{LINKNEW} {LINKISUPDATED} <IF {LINKISREAD}><img src="{TEMPLATESDIR}/images/visited.gif" alt="viewed" title="Already Viewed"></IF> {LINKADMIN}
-<IF {SWITCH_RATINGS} and {LINKRATING}><br><img src="{TEMPLATESDIR}/images/stars{LINKNUMSTARS}.gif" alt="{LINKRATING} out of {MAXVOTE} stars" title="{LINKRATING} out of {MAXVOTE} stars"> ({LINKVOTES} votes)</IF>
-<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="PageRank {LINKPAGERANK}" title="PageRank {LINKPAGERANK}"></IF>
-<br>{LINKDESCRIPTION} 
-
-<div class="linktools">
-<br>Submitted {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, edited {LINKLASTEDITDATE}</IF>. <br>
-<IF {SWITCH_HITS}>{LINKHITS} hits outgoing, {LINKHITSIN} incoming.<br></IF> 
-<br>
-<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="Details"> Details</a> 
-<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="Rate"> Rate</a></IF> 
-<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="Report"> Report</a></IF> 
-<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="Email Link"> E-Mail Link</a></IF> 
-<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="Email Submitter"> E-Mail Submitter</a></IF> 
-<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="Bookmark"> Bookmark</a> 
-<IF {SWITCH_ALBUMS} and {THISMEMBERISREGISTERED}><a href="albums.php?add={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_save.gif" border="0" alt="Save"> Save</a></IF> 
-<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="Comments"> Reviews (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
-
-</div>
-
-<IF {LINKFILEFIELD}><br>Attached files:<br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
-<IF {ATTACHISIMAGE}><a href="download.php?id={LINKID}&amp;attachid={ATTACHID}"><img src="{ATTACHTHUMBURL}" alt="image"></a><br></IF>
-<!-- END LINK ATTACHMENTS -->
-</IF>
-
-</td>
-<!-- END REGULAR LINKS -->
-</table>
-</IF>
-
-<IF {MULTIPAGE}>
-<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<IF {SWITCH_SEARCHINCAT}>
-<div align="center">
-<form action="search.php?filled=1&amp;condition={DEFAULTSEARCHTYPE}" method="post"><input type="hidden" name="whichtype" value="links">
-Search for <input type="text" name="search" size="{STANDARDSIZE}">
-in <select name="incat"><option value="">All Categories</option>{CATOPTIONS}</select>
-<input type="submit" value="Search" class="button"></form></div>   
-</IF>
-
-</div>
-
-<div style="float: right; width: 20%;">
-<br>
-<div class="box">
-<div class="boxtitle" onClick="minmax('actionsbox')"><img src="{TEMPLATESDIR}/images/icon_submit.gif" alt="submit"> Actions</div>
-<div id="actionsbox" class="boxbody">
-<IF {MEMBERISREGISTERED} and {SWITCH_SUBSCRIPTIONS}>
-<IF {CATSUBSCRIBERS} contains |||{MEMBERID}|||>
-<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="index.php?action=displaycat&amp;catid={CATID}&amp;todo=subscribe">Unsubscribe From Category</a>
-<OTHERWISE>
-<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="index.php?action=displaycat&amp;catid={CATID}&amp;todo=subscribe">Subscribe to Category</a>
-</IF>
-<br>
-</IF>
-
-<IF {CATCANSUBMITSUBS}><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="suggest.php?action=addcat&amp;parent={CATID}">Submit Subcategory</a><br></IF> 
-<IF {CATCANSUBMITLINKS}><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="suggest.php?action=addlink&amp;catid={CATID}">Submit Link</a><br></IF>
-</div>
-</div>
-
-<div class="box">
-<div class="boxtitle" onClick="minmax('infobox')"><img src="{TEMPLATESDIR}/images/icon_info.gif" alt="submit"> Category Stats</div>
-<div id="infobox" class="boxbody">
-<IF {CATNUMSUBCATS}><span class="minilabels">Subcategories:</span> {CATNUMSUBCATS}<br></IF> 
-<span class="minilabels">Links:</span> {CATLINKSHERE} 
-<IF {CATNUMLINKS} is greater than {CATLINKSHERE}>({CATNUMLINKS} counting subcategories)</IF> 
-<IF {RECIPTOTAL} and {REGULARTOTAL}>
-<br><span class="minilabels">Regular:</span> {REGULARTOTAL} 
-<br><span class="minilabels">Reciprocal:</span> {RECIPTOTAL}
-</IF> 
-<IF {CATLASTLINKTIME}><br><span class="minilabels">Last Link:</span> {CATLASTLINKDATE}</IF>
-
-<IF {SWITCH_ONLINEUSERS}>
-<IF {TOPLISTTOTAL3}><br><br><span class="minilabels">Browsing:</span></IF>
-<!-- BEGIN TOPLIST 3 -->
-<CONFIG>online,time,100,descending,catid={CATID} AND memberid>0,,</CONFIG>
-<a href="memberlist.php?action=profile&amp;id={ONLINEMEMBERID}">{ONLINENAME}</a>,  
-<!-- END TOPLIST 3 -->
-</IF>
-</div>
-</div>
-
-<IF {CATISMODERATOR} or {THISMEMBERISADMIN}>
-<div class="box">
-<div class="boxtitle" onClick="minmax('modbox')"><img src="{TEMPLATESDIR}/images/icon_mod.gif" alt="submit"> Editorial Controls</div>
-<div id="modbox" class="boxbody">
-<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="modcp.php">Moderator Control Panel</a> 
-<br>({CATUNVALIDATEDLINKS} links, {CATUNVALIDATEDCOMMENTS} comments pending)
-<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=bulkedit">Bulk edit/move/delete links</a>
-<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=showdeleted">Show/undelete deleted links</a>
-</div>
-</div>
-</IF>
-
-
+<br><br>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {NAVIGATION} </div>
+<br>
+
+<center>
+<h2>{CATNAME} {CATADMIN}</h2>
+</center>
+
+<IF {CATNUMBERRELATED} is greater than 0>
+{CATNUMBERRELATED} related categories: </IF>
+<!-- BEGIN RELATED -->
+<a href="{CATURL}" class="categoryname">{CATNAME}</a> ({CATNUMLINKS}) {CATHASNEW} {CATADMIN} <br>
+<!-- END RELATED -->
+
+<IF {SWITCH_SORTCATS}>
+<IF {CATNUMSUB} is greater than 0>
+<div class="sort">
+<form action="index.php?todo=ordercats&amp;action=displaycat&amp;catid={CATID}" method="post">
+Sort categories by 
+<select name="catfield">
+ <option value="name">name</option>
+ <option value="numlinks">number of links</option>
+ <option value="numsub">number of subcategories</option>
+ <option value="time">date created</option>
+ <option value="lastedit">date edited</option>
+</select>
+in 
+<select name="catascdesc">
+ <option value="asc">ascending</option>
+ <option value="desc">descending</option>
+</select>
+order.
+<input type="submit" value="Sort" class="button">
+</form>
+</div>
+</IF>
+</IF>
+
+<table width="96%" cellpadding="5" cellspacing="10">
+<!-- BEGIN SUBCATEGORIES -->
+<!-- BEGIN REGULAR -->
+<td {SUBCATWIDTH} align="center" valign="top" class="category">
+<img src="{TEMPLATESDIR}/images/folder.gif" alt="folder"> <a href="{CATURL}" class="categoryname">{CATNAME}</a> ({CATNUMLINKS}) {CATHASNEW} {CATADMIN}
+<br>{CATDESCRIPTION} <br>
+<IF {SWITCH_FORUMVIEWS}>{CATVIEWS} views<br></IF>
+<!-- BEGIN SUBSUB -->
+ <a href="{CATURL}">{CATNAME}</a>,  
+<!-- END SUBSUB -->
+</td>
+<!-- END REGULAR -->
+<!-- END SUBCATEGORIES -->
+</table>
+
+<IF {SUBMULTIPAGE}><p>Page: {SUBPREVIOUS} <b>{SUBCURRENTPAGE}</b> {SUBNEXT}</p></IF>
+
+<br>
+
+<IF {SWITCH_SORTLINKS} and {CATLINKSHERE}>
+<div class="sort">
+<form action="{DIRURL}">
+<input type="hidden" name="todo" value="orderlinks">
+<input type="hidden" name="action" value="displaycat">
+<input type="hidden" name="catid" value="{CATID}">
+Sort links by 
+<select name="orderlinks"><option value="id">newest</option>
+ <option value="lastedit">last edited</option>
+ <option value="title">title</option>
+<IF {SWITCH_RATINGS}>
+ <option value="rating">rating</option>
+ <option value="votes">votes</option>
+</IF>
+<IF {SWITCH_HITS}>
+ <option value="hits">hits out</option>
+ <option value="hitsin">hits in</option>
+</IF>
+<IF {SWITCH_COMMENTS}>
+ <option value="numcomments">number of comments</option>
+</IF>
+<IF {SWITCH_PAGERANK}><option value="pagerank">pagerank</option></IF>
+</select>
+in
+<select name="ascdesc">
+ <option value="asc">ascending</option>
+ <option value="desc">decending</option>
+</select>
+order, and show 
+<select name="perpage">
+ <option value="{PERPAGE}">{PERPAGE}</option>
+ <option value="20">20</option>
+ <option value="30">30</option>
+ <option value="40">40</option>
+ <option value="50">50</option>
+</select>
+links per page.
+<input type="submit" value="Sort" class="button">
+</form>
+</div>
+</IF>
+
+<div style="float: left; width: 80%;">
+
+<IF {SHOWRECIP}>
+<table width="100%" cellpadding="5" cellspacing="10">
+<!-- BEGIN RECIP LINKS -->
+<td {LINKWIDTH} valign="top" class="link">
+<img src="{TEMPLATESDIR}/images/star.gif" alt="reciprocal"> 
+<IF {LINKURL}>
+<a href="{TRACKLINKURL}" class="reciplink" {EXTERNALLINKS}>{LINKTITLE}</a>
+<OTHERWISE>
+{LINKTITLE}
+</IF>
+{LINKNEW} {LINKISUPDATED} <IF {LINKISREAD}><img src="{TEMPLATESDIR}/images/visited.gif" alt="viewed" title="Already Viewed"></IF> {LINKADMIN}
+<IF {SWITCH_RATINGS} and {LINKRATING}><br><img src="{TEMPLATESDIR}/images/stars{LINKNUMSTARS}.gif" alt="{LINKRATING} out of {MAXVOTE} stars" title="{LINKRATING} out of {MAXVOTE} stars"> ({LINKVOTES} votes)</IF>
+<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="PageRank {LINKPAGERANK}" title="PageRank {LINKPAGERANK}"></IF>
+<br>{LINKDESCRIPTION} 
+
+<div class="linktools">
+<br>Submitted {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, edited {LINKLASTEDITDATE}</IF>. <br>
+<IF {SWITCH_HITS}>{LINKHITS} hits outgoing, {LINKHITSIN} incoming.<br></IF> 
+<br>
+<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="Details"> Details</a> 
+<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="Rate"> Rate</a></IF> 
+<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="Report"> Report</a></IF> 
+<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="Email Link"> E-Mail Link</a></IF> 
+<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="Email Submitter"> E-Mail Submitter</a></IF> 
+<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="Bookmark"> Bookmark</a> 
+<IF {SWITCH_ALBUMS} and {THISMEMBERISREGISTERED}><a href="albums.php?add={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_save.gif" border="0" alt="Save"> Save</a></IF> 
+<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="Comments"> Reviews (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
+
+</div>
+
+<IF {LINKFILEFIELD}><br>Attached files:<br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
+<IF {ATTACHISIMAGE}><a href="download.php?id={LINKID}&amp;attachid={ATTACHID}"><img src="{ATTACHTHUMBURL}" alt="image"></a><br></IF>
+<!-- END LINK ATTACHMENTS -->
+</IF>
+
+</td>
+<!-- END RECIP LINKS -->
+</table>
+</IF>
+
+<IF {SHOWREGULAR}>
+<table width="100%" cellpadding="5" cellspacing="10">
+<!-- BEGIN REGULAR LINKS -->
+<td {LINKWIDTH} valign="top" class="link">
+<IF {LINKURL}>
+<a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a>
+<OTHERWISE>
+{LINKTITLE}
+</IF>
+{LINKNEW} {LINKISUPDATED} <IF {LINKISREAD}><img src="{TEMPLATESDIR}/images/visited.gif" alt="viewed" title="Already Viewed"></IF> {LINKADMIN}
+<IF {SWITCH_RATINGS} and {LINKRATING}><br><img src="{TEMPLATESDIR}/images/stars{LINKNUMSTARS}.gif" alt="{LINKRATING} out of {MAXVOTE} stars" title="{LINKRATING} out of {MAXVOTE} stars"> ({LINKVOTES} votes)</IF>
+<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="PageRank {LINKPAGERANK}" title="PageRank {LINKPAGERANK}"></IF>
+<br>{LINKDESCRIPTION} 
+
+<div class="linktools">
+<br>Submitted {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, edited {LINKLASTEDITDATE}</IF>. <br>
+<IF {SWITCH_HITS}>{LINKHITS} hits outgoing, {LINKHITSIN} incoming.<br></IF> 
+<br>
+<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="Details"> Details</a> 
+<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="Rate"> Rate</a></IF> 
+<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="Report"> Report</a></IF> 
+<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="Email Link"> E-Mail Link</a></IF> 
+<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="Email Submitter"> E-Mail Submitter</a></IF> 
+<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="Bookmark"> Bookmark</a> 
+<IF {SWITCH_ALBUMS} and {THISMEMBERISREGISTERED}><a href="albums.php?add={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_save.gif" border="0" alt="Save"> Save</a></IF> 
+<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="Comments"> Reviews (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
+
+</div>
+
+<IF {LINKFILEFIELD}><br>Attached files:<br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
+<IF {ATTACHISIMAGE}><a href="download.php?id={LINKID}&amp;attachid={ATTACHID}"><img src="{ATTACHTHUMBURL}" alt="image"></a><br></IF>
+<!-- END LINK ATTACHMENTS -->
+</IF>
+
+</td>
+<!-- END REGULAR LINKS -->
+</table>
+</IF>
+
+<IF {MULTIPAGE}>
+<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<IF {SWITCH_SEARCHINCAT}>
+<div align="center">
+<form action="search.php?filled=1&amp;condition={DEFAULTSEARCHTYPE}" method="post"><input type="hidden" name="whichtype" value="links">
+Search for <input type="text" name="search" size="{STANDARDSIZE}">
+in <select name="incat"><option value="">All Categories</option>{CATOPTIONS}</select>
+<input type="submit" value="Search" class="button"></form></div>   
+</IF>
+
+</div>
+
+<div style="float: right; width: 20%;">
+<br>
+<div class="box">
+<div class="boxtitle" onClick="minmax('actionsbox')"><img src="{TEMPLATESDIR}/images/icon_submit.gif" alt="submit"> Actions</div>
+<div id="actionsbox" class="boxbody">
+<IF {MEMBERISREGISTERED} and {SWITCH_SUBSCRIPTIONS}>
+<IF {CATSUBSCRIBERS} contains |||{MEMBERID}|||>
+<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="index.php?action=displaycat&amp;catid={CATID}&amp;todo=subscribe">Unsubscribe From Category</a>
+<OTHERWISE>
+<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="index.php?action=displaycat&amp;catid={CATID}&amp;todo=subscribe">Subscribe to Category</a>
+</IF>
+<br>
+</IF>
+
+<IF {CATCANSUBMITSUBS}><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="suggest.php?action=addcat&amp;parent={CATID}">Submit Subcategory</a><br></IF> 
+<IF {CATCANSUBMITLINKS}><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="suggest.php?action=addlink&amp;catid={CATID}">Submit Link</a><br></IF>
+</div>
+</div>
+
+<div class="box">
+<div class="boxtitle" onClick="minmax('infobox')"><img src="{TEMPLATESDIR}/images/icon_info.gif" alt="submit"> Category Stats</div>
+<div id="infobox" class="boxbody">
+<IF {CATNUMSUBCATS}><span class="minilabels">Subcategories:</span> {CATNUMSUBCATS}<br></IF> 
+<span class="minilabels">Links:</span> {CATLINKSHERE} 
+<IF {CATNUMLINKS} is greater than {CATLINKSHERE}>({CATNUMLINKS} counting subcategories)</IF> 
+<IF {RECIPTOTAL} and {REGULARTOTAL}>
+<br><span class="minilabels">Regular:</span> {REGULARTOTAL} 
+<br><span class="minilabels">Reciprocal:</span> {RECIPTOTAL}
+</IF> 
+<IF {CATLASTLINKTIME}><br><span class="minilabels">Last Link:</span> {CATLASTLINKDATE}</IF>
+
+<IF {SWITCH_ONLINEUSERS}>
+<IF {TOPLISTTOTAL3}><br><br><span class="minilabels">Browsing:</span></IF>
+<!-- BEGIN TOPLIST 3 -->
+<CONFIG>online,time,100,descending,catid={CATID} AND memberid>0,,</CONFIG>
+<a href="memberlist.php?action=profile&amp;id={ONLINEMEMBERID}">{ONLINENAME}</a>,  
+<!-- END TOPLIST 3 -->
+</IF>
+</div>
+</div>
+
+<IF {CATISMODERATOR} or {THISMEMBERISADMIN}>
+<div class="box">
+<div class="boxtitle" onClick="minmax('modbox')"><img src="{TEMPLATESDIR}/images/icon_mod.gif" alt="submit"> Editorial Controls</div>
+<div id="modbox" class="boxbody">
+<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="modcp.php">Moderator Control Panel</a> 
+<br>({CATUNVALIDATEDLINKS} links, {CATUNVALIDATEDCOMMENTS} comments pending)
+<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=bulkedit">Bulk edit/move/delete links</a>
+<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=showdeleted">Show/undelete deleted links</a>
+</div>
+</div>
+</IF>
+
+
 </div>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/editcat.tpl wsnlinks/templates/default/editcat.tpl
--- 400/templates/default/editcat.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/editcat.tpl	2006-09-17 18:42:45.000000000 -0700
@@ -1,4 +1,4 @@
-<div class="nav"><a href="[IFADMIN../]index.php">{LANG_NAVORIGIN}</a> > <a href="[IFADMIN../]index.php?action=displaycat&amp;catid={CATID}">{CATNAME}</a> > Edit Category</div>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="{CATURL}">{CATNAME}</a> > Edit Category</div>
 
 <IF {CATCANDELETE}>
 <form action="edit.php?action=category&amp;filled=1&amp;delete=1&amp;id={CATID}" method="post">
@@ -36,7 +36,7 @@
 </tr>
 <tr>
  <td class="labelscolumn"><span class="labels">Description:</span>
-<IF {SWITCH_WYSIWYGDESCRIP}>
+<IF {SWITCH_WYSIDESCRIP}>
 <p align="center">
 <IF {THISMEMBERPOSTEDITOR} is WYSIWYG><input type="submit" name="switcheditor" value="Switch to plain editor" class="button"></IF>
 <IF {THISMEMBERPOSTEDITOR} is plain><input type="submit" name="switcheditor" value="Switch to WYSIWYG editor" class="button"></IF>
diff -U 3 -H -d -r -N -- 400/templates/default/editcomments.tpl wsnlinks/templates/default/editcomments.tpl
--- 400/templates/default/editcomments.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/editcomments.tpl	2006-09-13 09:31:32.000000000 -0700
@@ -1,123 +1,123 @@
-<div class="nav"><a href="[IFADMIN../]index.php">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="[IFADMIN../]comments.php?id={LINKID}">{LINKTITLE}</a> > Edit Comment</div>
-
-<IF {COMMENTCANDELETE}>
-<form action="edit.php?action=comment&amp;filled=1&amp;id={COMMENTID}" method="post">
-<input type="hidden" name="usernote" value="{USERNOTE}">
-<input type="hidden" name="modnote" value="{MODNOTE}">
-<div class="deletions"><span class="labels">Delete Comment</span>
-<br>Reason for deletion: <input type="text" name="deletionreason" size="{STANDARDSIZE}" value="{COMMENTDELETIONREASON}"><br>
-<IF {COMMENTDELETED}>
-<input type="submit" name="delete" value="Restore Deleted Comment" class="button">
-<OTHERWISE>
-<IF {THISMEMBERGROUPCANHARDDELETE}><input type="checkbox" name="harddelete" value="1"> Hard-delete? (This will be non-recoverable.)<br></IF>
-<input type="submit" name="delete" value="Delete Comment" class="button">
-</IF>
-</div>
-</form>
-</IF>
-
-<IF {PREVIEWING}><div class="comment">{PREVIEW}</div></IF>
-
-<span class="important">{INCOMPLETE}</span>
-
-<form <IF {THISMEMBERPOSTEDITOR} is WYSIWYG>onsubmit="return submitForm();"</IF> name="commentform" enctype="multipart/form-data" action="edit.php?action=comment&amp;filled=1&amp;id={COMMENTID}" method="post">
-<input type="hidden" name="usernote" value="{USERNOTE}">
-<input type="hidden" name="modnote" value="{MODNOTE}">
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Edit Comment</td></tr>
-<IF {THISMEMBERGROUPCANDOFULLEDIT}>
-<tr>
- <td class="labelscolumn"><span class="labels">Poster Name:</span></td>
- <td class="optionscolumn"><input type="text" name="postername" size="{STANDARDSIZE}" value="{COMMENTPOSTERNAME}"></td>
-</tr>
-<IF {SWITCH_POSTTYPES}>
-<tr>
- <td class="labelscolumn"><span class="labels">Comment Type:</span></td>
- <td class="optionscolumn"><select name="type">{COMMENTTYPEOPTIONS}</select></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Comment Rating:</span></td>
- <td class="optionscolumn"><input type="text" name="approved" value="{COMMENTAPPROVED}" size="5"> approved out of <input type="text" name="votes" value="{COMMENTVOTES}" size="5"> votes</td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Comment Title:</span></td>
- <td class="optionscolumn"><input type="text" name="title" value="{COMMENTTITLE}" size="{STANDARDSIZE}"></td>
-</tr>
-<tr>
- <td class="labelscolumn" valign="top"><span class="labels">Comment Text:</span>
-<br><br>
-<center>
-<IF {SWITCH_SMILIES}>
-<div class="smiliebox">
-<!-- BEGIN SMILIES -->
-<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
-<!-- END SMILIES -->
-</div>
-</IF>
-</center>
-<IF {SWITCH_WSNCODES}>
-<br><IF {THISMEMBERPOSTEDITOR} is WYSIWYG>Drag a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.<ELSE>Click a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.</IF> You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400,scrollbars=yes');">WSN Codes</a> in your message.
-</IF>
-<br>
-<IF {SWITCH_WSNCODES} and {SWITCH_WYSI}>
-<p align="center">
-<IF {THISMEMBERPOSTEDITOR} is WYSIWYG><input type="submit" name="switcheditor" value="Switch to plain editor" class="button"></IF>
-<IF {THISMEMBERPOSTEDITOR} is plain><input type="submit" name="switcheditor" value="Switch to WYSIWYG editor" class="button"></IF>
-</p>
-</IF>
-</td>
- <td class="optionscolumn" valign="top">
-<IF {THISMEMBERPOSTEDITOR} is WYSIWYG>
-<script language="JavaScript" type="text/javascript" src="{TEMPLATESDIR}/richtext.js"></script>
-<script language="JavaScript" type="text/javascript">
-function submitForm() {	updateRTEs(); return true; }
-initRTE("{TEMPLATESDIR}/images/posteditor/", "{TEMPLATESDIR}/", "{DIRURL}/templates/styles/{STYLESHEET}.css");
-</script>
-<script language="JavaScript" type="text/javascript">
-writeRichText('message', '{COMMENTMESSAGEWYSIWYG}', 400, 200, true, false);
-</script>
-<OTHERWISE>
-<textarea name="message" rows="15" cols="80">{COMMENTMESSAGE}</textarea>
-</IF>
-<br>Reason for edit: <input type="text" name="editreason" size="{STANDARDSIZE}" value="{COMMENTEDITREASON}">
-<IF {THISMEMBERID} is not {COMMENTOWNERID}><br><input type="checkbox" name="preventedit" value="1" {COMMENTPREVENTEDITCHECK}> Prevent original poster from editing?</IF>
-</td> 
-</tr>
-<IF {THISMEMBERGROUPCANUPLOAD}>
-<tr>
- <td class="labelscolumn"><span class="labels">Attach Files:</span></td>
- <td class="optionscolumn">
-<IF {COMMENTNUMATTACHMENTS} is less than {THISMEMBERGROUPATTACHPERPOST}><input type="file" name="filefield"> <input type="submit" name="uploadattachment" value="Attach" class="button"></IF>
-<IF {COMMENTNUMATTACHMENTS}>
-<br>Current Attachments:<br>
-<!-- BEGIN ATTACHMENTS -->
-<input type="checkbox" name="attachdelete[]" value="{ATTACHID}"> {ATTACHFILETITLE} ({ATTACHKB} KB)<br>
-<!-- END ATTACHMENTS -->
-<input type="submit" name="attachdeletion" value="Delete Selected" class="button">
-</IF>
-</td>
-</tr>
-</IF>
-
-<!-- INSERT NEW FIELDS HERE -->
-
-<tr>
- <td class="labelscolumn"><span class="labels">Options:</span></td>
- <td class="optionscolumn">
-<IF {SWITCH_SMILIES}><input type="checkbox" name="disablesmilies" value="1" {COMMENTCHECKED[disablesmilies]}> Disable smilies? <br> </IF>
-<input type="checkbox" name="disablesig" value="1" {COMMENTCHECKED[disablesig]}> Disable signature? <br>
-<IF {THISMEMBERGROUPCANUSEHTML}><input type="checkbox" name="disablehtml" value="1" {COMMENTCHECKED[disablehtml]}> Disable HTML? <br></IF>
-<IF {SWITCH_WSNCODES}><input type="checkbox" name="disablewsn" value="1" {COMMENTCHECKED[disablewsn]}> Disable WSN Codes? </IF>
- </td>
-</tr>
-<IF {COMMENTCANHIDE}>
-<tr>
- <td class="labelscolumn"><span class="labels">Hide Comment?</span></td>
- <td class="optionscolumn"><select name="hide">{HIDEYESNO}</select></td>
-</tr>
-</IF>
-</table>
-<input type="submit" value="Edit Comment" class="button"> <input type="submit" name="preview" value="Preview Changes" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="[IFADMIN../]comments.php?id={LINKID}">{LINKTITLE}</a> > Edit Comment</div>
+
+<IF {COMMENTCANDELETE}>
+<form action="edit.php?action=comment&amp;filled=1&amp;id={COMMENTID}" method="post">
+<input type="hidden" name="usernote" value="{USERNOTE}">
+<input type="hidden" name="modnote" value="{MODNOTE}">
+<div class="deletions"><span class="labels">Delete Comment</span>
+<br>Reason for deletion: <input type="text" name="deletionreason" size="{STANDARDSIZE}" value="{COMMENTDELETIONREASON}"><br>
+<IF {COMMENTDELETED}>
+<input type="submit" name="delete" value="Restore Deleted Comment" class="button">
+<OTHERWISE>
+<IF {THISMEMBERGROUPCANHARDDELETE}><input type="checkbox" name="harddelete" value="1"> Hard-delete? (This will be non-recoverable.)<br></IF>
+<input type="submit" name="delete" value="Delete Comment" class="button">
+</IF>
+</div>
+</form>
+</IF>
+
+<IF {PREVIEWING}><div class="comment">{PREVIEW}</div></IF>
+
+<span class="important">{INCOMPLETE}</span>
+
+<form <IF {THISMEMBERPOSTEDITOR} is WYSIWYG>onsubmit="return submitForm();"</IF> name="commentform" enctype="multipart/form-data" action="edit.php?action=comment&amp;filled=1&amp;id={COMMENTID}" method="post">
+<input type="hidden" name="usernote" value="{USERNOTE}">
+<input type="hidden" name="modnote" value="{MODNOTE}">
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Edit Comment</td></tr>
+<IF {THISMEMBERGROUPCANDOFULLEDIT}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Poster Name:</span></td>
+ <td class="optionscolumn"><input type="text" name="postername" size="{STANDARDSIZE}" value="{COMMENTPOSTERNAME}"></td>
+</tr>
+<IF {SWITCH_POSTTYPES}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Comment Type:</span></td>
+ <td class="optionscolumn"><select name="type">{COMMENTTYPEOPTIONS}</select></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">Comment Rating:</span></td>
+ <td class="optionscolumn"><input type="text" name="approved" value="{COMMENTAPPROVED}" size="5"> approved out of <input type="text" name="votes" value="{COMMENTVOTES}" size="5"> votes</td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">Comment Title:</span></td>
+ <td class="optionscolumn"><input type="text" name="title" value="{COMMENTTITLE}" size="{STANDARDSIZE}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn" valign="top"><span class="labels">Comment Text:</span>
+<br><br>
+<center>
+<IF {SWITCH_SMILIES}>
+<div class="smiliebox">
+<!-- BEGIN SMILIES -->
+<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
+<!-- END SMILIES -->
+</div>
+</IF>
+</center>
+<IF {SWITCH_WSNCODES}>
+<br><IF {THISMEMBERPOSTEDITOR} is WYSIWYG>Drag a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.<ELSE>Click a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.</IF> You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400,scrollbars=yes');">WSN Codes</a> in your message.
+</IF>
+<br>
+<IF {SWITCH_WSNCODES} and {SWITCH_WYSI}>
+<p align="center">
+<IF {THISMEMBERPOSTEDITOR} is WYSIWYG><input type="submit" name="switcheditor" value="Switch to plain editor" class="button"></IF>
+<IF {THISMEMBERPOSTEDITOR} is plain><input type="submit" name="switcheditor" value="Switch to WYSIWYG editor" class="button"></IF>
+</p>
+</IF>
+</td>
+ <td class="optionscolumn" valign="top">
+<IF {THISMEMBERPOSTEDITOR} is WYSIWYG>
+<script language="JavaScript" type="text/javascript" src="{TEMPLATESDIR}/richtext.js"></script>
+<script language="JavaScript" type="text/javascript">
+function submitForm() {	updateRTEs(); return true; }
+initRTE("{TEMPLATESDIR}/images/posteditor/", "{TEMPLATESDIR}/", "{DIRURL}/templates/styles/{STYLESHEET}.css");
+</script>
+<script language="JavaScript" type="text/javascript">
+writeRichText('message', '{COMMENTMESSAGEWYSIWYG}', 400, 200, true, false);
+</script>
+<OTHERWISE>
+<textarea name="message" rows="15" cols="80">{COMMENTMESSAGE}</textarea>
+</IF>
+<br>Reason for edit: <input type="text" name="editreason" size="{STANDARDSIZE}" value="{COMMENTEDITREASON}">
+<IF {THISMEMBERID} is not {COMMENTOWNERID}><br><input type="checkbox" name="preventedit" value="1" {COMMENTPREVENTEDITCHECK}> Prevent original poster from editing?</IF>
+</td> 
+</tr>
+<IF {THISMEMBERGROUPCANUPLOAD}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Attach Files:</span></td>
+ <td class="optionscolumn">
+<IF {COMMENTNUMATTACHMENTS} is less than {THISMEMBERGROUPATTACHPERPOST}><input type="file" name="filefield"> <input type="submit" name="uploadattachment" value="Attach" class="button"></IF>
+<IF {COMMENTNUMATTACHMENTS}>
+<br>Current Attachments:<br>
+<!-- BEGIN ATTACHMENTS -->
+<input type="checkbox" name="attachdelete[]" value="{ATTACHID}"> {ATTACHFILETITLE} ({ATTACHKB} KB)<br>
+<!-- END ATTACHMENTS -->
+<input type="submit" name="attachdeletion" value="Delete Selected" class="button">
+</IF>
+</td>
+</tr>
+</IF>
+
+<!-- INSERT NEW FIELDS HERE -->
+
+<tr>
+ <td class="labelscolumn"><span class="labels">Options:</span></td>
+ <td class="optionscolumn">
+<IF {SWITCH_SMILIES}><input type="checkbox" name="disablesmilies" value="1" {COMMENTCHECKED[disablesmilies]}> Disable smilies? <br> </IF>
+<input type="checkbox" name="disablesig" value="1" {COMMENTCHECKED[disablesig]}> Disable signature? <br>
+<IF {THISMEMBERGROUPCANUSEHTML}><input type="checkbox" name="disablehtml" value="1" {COMMENTCHECKED[disablehtml]}> Disable HTML? <br></IF>
+<IF {SWITCH_WSNCODES}><input type="checkbox" name="disablewsn" value="1" {COMMENTCHECKED[disablewsn]}> Disable WSN Codes? </IF>
+ </td>
+</tr>
+<IF {COMMENTCANHIDE}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Hide Comment?</span></td>
+ <td class="optionscolumn"><select name="hide">{HIDEYESNO}</select></td>
+</tr>
+</IF>
+</table>
+<input type="submit" value="Edit Comment" class="button"> <input type="submit" name="preview" value="Preview Changes" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/editmembers.tpl wsnlinks/templates/default/editmembers.tpl
--- 400/templates/default/editmembers.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/editmembers.tpl	2006-09-13 09:31:32.000000000 -0700
@@ -1,258 +1,258 @@
-<IF {THISMEMBERISADMIN}>
-<br>
-<form action="redirecttourl.php">
-Admin Options: 
-<select name="destination">
- <option value="edit.php?action=member&amp;field=id&amp;condition=equals&amp;fieldvalue={MEMBERID}">Edit Profile</option>
- <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}">Ban</option>
- <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}&amp;partial=1">Partially Ban (from categories/threads)</option>
- <option value="[IFADMINadmin/]useradmin.php?action=suspend&amp;id={MEMBERID}">Suspend Member</option>
-<option value="usernotes.php?id={MEMBERID}&amp;modnote=1">Moderator Notes ({MEMBERMODNOTES})</option>
- <option value="[IFADMINadmin/]useradmin.php?action=modlogon&amp;id={MEMBERID}">Show Moderating History on Member</option>
-</select>
-<input type="submit" value="Go" class="button">
-</form>
-<br>
-</IF>
-
-<div class="nav"><a href="[IFADMIN../]index.php">{LANG_NAVORIGIN}</a> > <a href="[IFADMIN../]memberlist.php">Member List</a> > <a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > Edit Profile</div>
-
-<span class="important">{INCOMPLETE}</span>
-
-<form enctype="multipart/form-data" action="edit.php?action=member&amp;filled=1&amp;id={MEMBERID}" method="post">
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Edit Profile</td></tr>
-<IF {THISMEMBERGROUPCANDOFULLEDIT}>
-<tr>
- <td class="labelscolumn"><span class="labels">Member Name:</span></td>
- <td class="optionscolumn"><input type="text" name="name" size="{STANDARDSIZE}" value="{MEMBERNAME}" maxlength="{MAXUSERNAMELENGTH}"></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">E-mail:</span><br><IF {REGISTRATION} is email>Needed to activate your account.<ELSE>Needed if you lose your password.</IF></td>
- <td class="optionscolumn"><input type="text" name="email" size="{STANDARDSIZE}" value="{MEMBEREMAIL}"></td>
-</tr>
-<IF not {INTEGRATION}>
-<tr>
- <td class="labelscolumn"><span class="labels">Change Password To:</span><br>(Leave blank to keep current password)</td>
- <td class="optionscolumn"><input type="text" name="replacepassword" size="{STANDARDSIZE}"></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Change Avatar:</span><br>Leave blank to keep current avatar. Must be {AVATARWIDTH} by {AVATARHEIGHT} pixels or smaller and no more than {AVATARSIZE} bytes, and one of these file types: {AVATARTYPES}</td>
- <td class="optionscolumn"><input type="file" name="newavatar"> <input type="submit" value="Upload Avatar" class="button"> 
-<IF {MEMBERSHOWAVATAR[1]}><br>Current avatar:<br><img src="{MEMBERAVATARURL}">
-<br><input type="submit" name="removeavatar" value="Remove Avatar" class="button">
-</IF>
-</td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Signature:</span></td>
- <td class="optionscolumn"><textarea name="signature" rows="3" cols="60">{MEMBERSIGNATURE}</textarea></td>
-</tr>
-<IF {THISMEMBERGROUPCUSTOMTITLE}>
-<tr>
- <td class="labelscolumn"><span class="labels">Custom Title:</span><br>If you wish, you may choose text to appear under your name that will override your default rank title.</td>
- <td class="optionscolumn"><input type="text" name="customtitle" size="{CUSTOMTITLELENGTH}" maxlength="{CUSTOMTITLELENGTH}" value="{MEMBERCUSTOMTITLE}"></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Style:</span></td>
- <td class="optionscolumn"><select name="stylesheet">{STYLEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Template Set:</span></td>
- <td class="optionscolumn"><select name="thetemplate">{MEMBERTEMPOPTIONS}</select>
-<input type="hidden" name="thelanguage" value="{MEMBERLANGUAGE}">
- </td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Accept e-mails from site administrator?</span></td>
- <td class="optionscolumn"><select name="allowemail">{MEMBERALLOWEMAILYESNO}</select></td> 
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Allow e-mails from other users?</span></td>
- <td class="optionscolumn"><select name="allowuseremail">{MEMBERALLOWUSEREMAILYESNO}</select></td> 
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Receive email notification of every new link added to the directory?</span></td>
- <td class="optionscolumn"><select name="notifyoflinks">{MEMBERNOTIFYOFLINKSYESNO}</select></td>
-</tr>
-<IF {SWITCH_PM}>
-<tr>
- <td class="labelscolumn"><span class="labels">Accept private messages from:</span></td>
- <td class="optionscolumn"><select name="acceptpms">{MEMBERACCEPTPMSOPS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Receive email notification of new private messages?</span></td>
- <td class="optionscolumn"><select name="notifyofpms">{MEMBERNOTIFYOFPMSYESNO}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Show popup alert notification of new PMs?</span></td>
- <td class="optionscolumn"><select name="pmnotify">{MEMBERPMNOTIFYYESNO}</select></td>
-</tr>
-<IF {SWITCH_MODNOTIFY}>
-<tr>
- <td class="labelscolumn"><span class="labels">Notify me via PM of moderator actions taken on my links and comments?</span></td>
- <td class="optionscolumn"><select name="moderationpm">{MEMBERMODERATIONPMYESNO}</select></td>
-</tr>
-</IF>
-</IF>
-<IF {SWITCH_COMMENTS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Automatically subscribe to comments thread of all links you submit?</span></td>
- <td class="optionscolumn"><select name="autosubscribe">{MEMBERAUTOSUBSCRIBEYESNO}</select></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Subscription Notification Frequency:</span></td>
- <td class="optionscolumn"><select name="notifymethod">{MEMBERNOTIFYMETHODOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Time Zone:</span></td>
- <td class="optionscolumn"><select name="timezone">
-{FUNC_SELECTOPTIONS[-12,-11,-10,-9,-8,-7,-6,-5,-4,-3.5,-3,-2,-1,0,1,2,3,3.5,4,4.5,5,5.5,5.75,6,6.5,7,8,9,9.5,10,11,12,13 <,> GMT-12,GMT-11,GMT-10,GMT-9,GMT-8,GMT-7,GMT-6,GMT-5,GMT-4,GMT-3.5,GMT-3,GMT-2,GMT-1,GMT,GMT+1,GMT+2,GMT+3,GMT+3.5,GMT+4,GMT+4.5,GMT+5,GMT+5.5,GMT+5.75,GMT+6,GMT+6.5,GMT+7,GMT+8,GMT+9,GMT+9.5,GMT+10,GMT+11,GMT+12,GMT+13 <,> {MEMBERTIMEZONE}]}
-</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Make me login again every:</span></td>
- <td class="optionscolumn"><select name="cookieduration">{MEMBERCOOKIEOPTIONS}</select></td>
-</tr>
-<IF {SWITCH_IMS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Accept instant messages from:</span></td>
- <td class="optionscolumn"><select name="acceptims">{MEMBERACCEPTIMSOPTIONS}</select></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Posts per page:</span></td>
- <td class="optionscolumn"><select name="commentsperpage">{MEMBERCOMMENTSPERPAGEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Links per page:</span></td>
- <td class="optionscolumn"><select name="linksperpage">{MEMBERLINKSPERPAGEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Location:</span></td>
- <td class="optionscolumn"><input type="text" name="location" size="{STANDARDSIZE}" value="{MEMBERLOCATION}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Homepage:</span></td>
- <td class="optionscolumn"><input type="text" name="homepage" size="{STANDARDSIZE}" value="{MEMBERHOMEPAGE}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Occupation:</span></td>
- <td class="optionscolumn"><input type="text" name="occupation" size="{STANDARDSIZE}" value="{MEMBEROCCUPATION}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Biography:</span></td>
- <td class="optionscolumn"><textarea name="bio" rows="5" cols="45">{MEMBERBIO}</textarea></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Interests:</span></td>
- <td class="optionscolumn"><input type="text" name="interests" size="{STANDARDSIZE}" value="{MEMBERINTERESTS}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Instant Messanger Handles:</span></td>
- <td class="optionscolumn">
-AIM: <input type="text" name="aim" size="15" value="{MEMBERAIM}"><br>
-ICQ: <input type="text" name="icq" size="15" value="{MEMBERICQ}"><br>
-MSN: <input type="text" name="msn" size="15" value="{MEMBERMSN}"><br>
-YIM: <input type="text" name="yahoo" size="15" value="{MEMBERYAHOO}">
-</td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Birthdate:</span></td>
- <td class="optionscolumn">
-<select name="birthmonth"><option value=""></option>{MEMBERBIRTHMONTHOPTIONS}</select>
-<select name="birthday"><option value=""></option>{MEMBERBIRTHDAYOPTIONS}</select>
-<select name="birthyear"><option value=""></option>{MEMBERBIRTHYEAROPTIONS}</select>
-</td>
-</tr>
-<IF {SWITCH_ONLINEUSERS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Show my online status to:</span></td>
- <td class="optionscolumn">
-  <select name="visibility">
-  {MEMBERVISIBILITYOPTIONS}
-  </select>
- </td>
-</tr>
-</IF>
-<IF {SWITCH_WYSIDESCRIP} or {SWITCH_WYSI}>
-<tr>
- <td class="labelscolumn"><span class="labels">Post Editor:</span></td>
- <td class="optionscolumn"><select name="posteditor">{MEMBERPOSTEDITOROPTIONS}</select></td>
-</tr>
-</IF>
-<IF {SWITCH_COMMENTS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Show avatars by posts?</span></td>
- <td class="optionscolumn"><select name="showavatars">{MEMBERSHOWAVATARSYESNO}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Show signatures below posts?</span></td>
- <td class="optionscolumn"><select name="showsigs">{MEMBERSHOWSIGSYESNO}</select></td>
-</tr>
-</IF>
-
-<!-- INSERT NEW FIELDS HERE -->
-
-<IF {THISMEMBERGROUPCANDOFULLEDIT}>
-<tr>
- <td class="labelscolumn"><span class="labels">Link Total:</span></td>
- <td class="optionscolumn"><input type="text" name="links" size="5" value="{MEMBERLINKS}"></td> 
-</tr>
-<IF {SWITCH_COMMENTS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Comment Total:</span></td>
- <td class="optionscolumn"><input type="text" size="5" name="comments" value="{MEMBERCOMMENTS}"></td> 
-</tr>
-</IF>
-<IF {SWITCH_HITS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Hits Out Total:</span></td>
- <td class="optionscolumn"><input type="text" size="5" name="totalhits" value="{MEMBERTOTALHITS}"></td> 
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Change Registration Date:</span>
-<br>Currently {MEMBERREGDATE}. To change, type a new date in a common format such as  August 31, 2004 or 5/7/2004.</td>
- <td class="optionscolumn"><input type="text" name="changeregdate" size="20"></td>
-</tr>
-<IF {THISMEMBERISADMIN}>
-<tr>
- <td class="labelscolumn"><span class="labels">Category Access:</span>
-<br>Select any categories which this user's usergroup doesn't normally have access to which you would like to give this user special access to.</td>
- <td class="optionscolumn"><select multiple name="forumaccess[]" size="5">{MEMBERFORUMACCESSOPS}</select><input type="hidden" name="forumaccess[123]" value=""></td>
-</tr>
-</IF>
-<IF {SPONSORUSEUG} is yes>
-<tr>
- <td class="labelscolumn"><span class="labels">Member Funds:</span><br>This is for if you do usergroup sponsorship.</td>
- <td class="optionscolumn"><input type="text" name="funds" size="5" value="{MEMBERFUNDS}"></td>
-</tr>
-</IF>
-<IF not {INTEGRATION}>
-<IF {THISMEMBERISADMIN}>
-<tr>
- <td class="labelscolumn"><span class="labels">Primary Usergroup:</span></td>
- <td class="optionscolumn"><select name="usergroup">{MEMBERUSERGROUPOPTIONS}</select></td> 
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Secondary Usergroups:</span></td>
- <td class="optionscolumn"><select multiple size="5" name="secondarygroups[]">{MEMBERSECONDARYUSERGROUPOPTIONS}</select>
-<input type="hidden" name="secondarygroups[123]" value="">
-</td> 
-</tr>
-</IF>
-</IF>
-</IF>
-<IF {THISMEMBERCANDELETE}>
-<tr>
- <td colspan="2"><span class="labels">Delete member?</span> <input type="checkbox" name="delete"></td>
-</tr>
-</IF>
-</table>
-<input type="submit" value="Edit Profile" class="button">
+<IF {THISMEMBERISADMIN}>
+<br>
+<form action="redirecttourl.php">
+Admin Options: 
+<select name="destination">
+ <option value="edit.php?action=member&amp;field=id&amp;condition=equals&amp;fieldvalue={MEMBERID}">Edit Profile</option>
+ <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}">Ban</option>
+ <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}&amp;partial=1">Partially Ban (from categories/threads)</option>
+ <option value="[IFADMINadmin/]useradmin.php?action=suspend&amp;id={MEMBERID}">Suspend Member</option>
+<option value="usernotes.php?id={MEMBERID}&amp;modnote=1">Moderator Notes ({MEMBERMODNOTES})</option>
+ <option value="[IFADMINadmin/]useradmin.php?action=modlogon&amp;id={MEMBERID}">Show Moderating History on Member</option>
+</select>
+<input type="submit" value="Go" class="button">
+</form>
+<br>
+</IF>
+
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="[IFADMIN../]memberlist.php">Member List</a> > <a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > Edit Profile</div>
+
+<span class="important">{INCOMPLETE}</span>
+
+<form enctype="multipart/form-data" action="edit.php?action=member&amp;filled=1&amp;id={MEMBERID}" method="post">
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Edit Profile</td></tr>
+<IF {THISMEMBERGROUPCANDOFULLEDIT}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Member Name:</span></td>
+ <td class="optionscolumn"><input type="text" name="name" size="{STANDARDSIZE}" value="{MEMBERNAME}" maxlength="{MAXUSERNAMELENGTH}"></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">E-mail:</span><br><IF {REGISTRATION} is email>Needed to activate your account.<ELSE>Needed if you lose your password.</IF></td>
+ <td class="optionscolumn"><input type="text" name="email" size="{STANDARDSIZE}" value="{MEMBEREMAIL}"></td>
+</tr>
+<IF not {INTEGRATION}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Change Password To:</span><br>(Leave blank to keep current password)</td>
+ <td class="optionscolumn"><input type="text" name="replacepassword" size="{STANDARDSIZE}"></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">Change Avatar:</span><br>Leave blank to keep current avatar. Must be {AVATARWIDTH} by {AVATARHEIGHT} pixels or smaller and no more than {AVATARSIZE} bytes, and one of these file types: {AVATARTYPES}</td>
+ <td class="optionscolumn"><input type="file" name="newavatar"> <input type="submit" value="Upload Avatar" class="button"> 
+<IF {MEMBERSHOWAVATAR[1]}><br>Current avatar:<br><img src="{MEMBERAVATARURL}">
+<br><input type="submit" name="removeavatar" value="Remove Avatar" class="button">
+</IF>
+</td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Signature:</span></td>
+ <td class="optionscolumn"><textarea name="signature" rows="3" cols="60">{MEMBERSIGNATURE}</textarea></td>
+</tr>
+<IF {THISMEMBERGROUPCUSTOMTITLE}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Custom Title:</span><br>If you wish, you may choose text to appear under your name that will override your default rank title.</td>
+ <td class="optionscolumn"><input type="text" name="customtitle" size="{CUSTOMTITLELENGTH}" maxlength="{CUSTOMTITLELENGTH}" value="{MEMBERCUSTOMTITLE}"></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">Style:</span></td>
+ <td class="optionscolumn"><select name="stylesheet">{STYLEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Template Set:</span></td>
+ <td class="optionscolumn"><select name="thetemplate">{MEMBERTEMPOPTIONS}</select>
+<input type="hidden" name="thelanguage" value="{MEMBERLANGUAGE}">
+ </td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Accept e-mails from site administrator?</span></td>
+ <td class="optionscolumn"><select name="allowemail">{MEMBERALLOWEMAILYESNO}</select></td> 
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Allow e-mails from other users?</span></td>
+ <td class="optionscolumn"><select name="allowuseremail">{MEMBERALLOWUSEREMAILYESNO}</select></td> 
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Receive email notification of every new link added to the directory?</span></td>
+ <td class="optionscolumn"><select name="notifyoflinks">{MEMBERNOTIFYOFLINKSYESNO}</select></td>
+</tr>
+<IF {SWITCH_PM}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Accept private messages from:</span></td>
+ <td class="optionscolumn"><select name="acceptpms">{MEMBERACCEPTPMSOPS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Receive email notification of new private messages?</span></td>
+ <td class="optionscolumn"><select name="notifyofpms">{MEMBERNOTIFYOFPMSYESNO}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Show popup alert notification of new PMs?</span></td>
+ <td class="optionscolumn"><select name="pmnotify">{MEMBERPMNOTIFYYESNO}</select></td>
+</tr>
+<IF {SWITCH_MODNOTIFY}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Notify me via PM of moderator actions taken on my links and comments?</span></td>
+ <td class="optionscolumn"><select name="moderationpm">{MEMBERMODERATIONPMYESNO}</select></td>
+</tr>
+</IF>
+</IF>
+<IF {SWITCH_COMMENTS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Automatically subscribe to comments thread of all links you submit?</span></td>
+ <td class="optionscolumn"><select name="autosubscribe">{MEMBERAUTOSUBSCRIBEYESNO}</select></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">Subscription Notification Frequency:</span></td>
+ <td class="optionscolumn"><select name="notifymethod">{MEMBERNOTIFYMETHODOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Time Zone:</span></td>
+ <td class="optionscolumn"><select name="timezone">
+{FUNC_SELECTOPTIONS[-12,-11,-10,-9,-8,-7,-6,-5,-4,-3.5,-3,-2,-1,0,1,2,3,3.5,4,4.5,5,5.5,5.75,6,6.5,7,8,9,9.5,10,11,12,13 <,> GMT-12,GMT-11,GMT-10,GMT-9,GMT-8,GMT-7,GMT-6,GMT-5,GMT-4,GMT-3.5,GMT-3,GMT-2,GMT-1,GMT,GMT+1,GMT+2,GMT+3,GMT+3.5,GMT+4,GMT+4.5,GMT+5,GMT+5.5,GMT+5.75,GMT+6,GMT+6.5,GMT+7,GMT+8,GMT+9,GMT+9.5,GMT+10,GMT+11,GMT+12,GMT+13 <,> {MEMBERTIMEZONE}]}
+</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Make me login again every:</span></td>
+ <td class="optionscolumn"><select name="cookieduration">{MEMBERCOOKIEOPTIONS}</select></td>
+</tr>
+<IF {SWITCH_IMS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Accept instant messages from:</span></td>
+ <td class="optionscolumn"><select name="acceptims">{MEMBERACCEPTIMSOPTIONS}</select></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">Posts per page:</span></td>
+ <td class="optionscolumn"><select name="commentsperpage">{MEMBERCOMMENTSPERPAGEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Links per page:</span></td>
+ <td class="optionscolumn"><select name="linksperpage">{MEMBERLINKSPERPAGEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Location:</span></td>
+ <td class="optionscolumn"><input type="text" name="location" size="{STANDARDSIZE}" value="{MEMBERLOCATION}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Homepage:</span></td>
+ <td class="optionscolumn"><input type="text" name="homepage" size="{STANDARDSIZE}" value="{MEMBERHOMEPAGE}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Occupation:</span></td>
+ <td class="optionscolumn"><input type="text" name="occupation" size="{STANDARDSIZE}" value="{MEMBEROCCUPATION}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Biography:</span></td>
+ <td class="optionscolumn"><textarea name="bio" rows="5" cols="45">{MEMBERBIO}</textarea></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Interests:</span></td>
+ <td class="optionscolumn"><input type="text" name="interests" size="{STANDARDSIZE}" value="{MEMBERINTERESTS}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Instant Messanger Handles:</span></td>
+ <td class="optionscolumn">
+AIM: <input type="text" name="aim" size="15" value="{MEMBERAIM}"><br>
+ICQ: <input type="text" name="icq" size="15" value="{MEMBERICQ}"><br>
+MSN: <input type="text" name="msn" size="15" value="{MEMBERMSN}"><br>
+YIM: <input type="text" name="yahoo" size="15" value="{MEMBERYAHOO}">
+</td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Birthdate:</span></td>
+ <td class="optionscolumn">
+<select name="birthmonth"><option value=""></option>{MEMBERBIRTHMONTHOPTIONS}</select>
+<select name="birthday"><option value=""></option>{MEMBERBIRTHDAYOPTIONS}</select>
+<select name="birthyear"><option value=""></option>{MEMBERBIRTHYEAROPTIONS}</select>
+</td>
+</tr>
+<IF {SWITCH_ONLINEUSERS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Show my online status to:</span></td>
+ <td class="optionscolumn">
+  <select name="visibility">
+  {MEMBERVISIBILITYOPTIONS}
+  </select>
+ </td>
+</tr>
+</IF>
+<IF {SWITCH_WYSIDESCRIP} or {SWITCH_WYSI}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Post Editor:</span></td>
+ <td class="optionscolumn"><select name="posteditor">{MEMBERPOSTEDITOROPTIONS}</select></td>
+</tr>
+</IF>
+<IF {SWITCH_COMMENTS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Show avatars by posts?</span></td>
+ <td class="optionscolumn"><select name="showavatars">{MEMBERSHOWAVATARSYESNO}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Show signatures below posts?</span></td>
+ <td class="optionscolumn"><select name="showsigs">{MEMBERSHOWSIGSYESNO}</select></td>
+</tr>
+</IF>
+
+<!-- INSERT NEW FIELDS HERE -->
+
+<IF {THISMEMBERGROUPCANDOFULLEDIT}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Link Total:</span></td>
+ <td class="optionscolumn"><input type="text" name="links" size="5" value="{MEMBERLINKS}"></td> 
+</tr>
+<IF {SWITCH_COMMENTS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Comment Total:</span></td>
+ <td class="optionscolumn"><input type="text" size="5" name="comments" value="{MEMBERCOMMENTS}"></td> 
+</tr>
+</IF>
+<IF {SWITCH_HITS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Hits Out Total:</span></td>
+ <td class="optionscolumn"><input type="text" size="5" name="totalhits" value="{MEMBERTOTALHITS}"></td> 
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">Change Registration Date:</span>
+<br>Currently {MEMBERREGDATE}. To change, type a new date in a common format such as  August 31, 2004 or 5/7/2004.</td>
+ <td class="optionscolumn"><input type="text" name="changeregdate" size="20"></td>
+</tr>
+<IF {THISMEMBERISADMIN}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Category Access:</span>
+<br>Select any categories which this user's usergroup doesn't normally have access to which you would like to give this user special access to.</td>
+ <td class="optionscolumn"><select multiple name="forumaccess[]" size="5">{MEMBERFORUMACCESSOPS}</select><input type="hidden" name="forumaccess[123]" value=""></td>
+</tr>
+</IF>
+<IF {SPONSORUSEUG} is yes>
+<tr>
+ <td class="labelscolumn"><span class="labels">Member Funds:</span><br>This is for if you do usergroup sponsorship.</td>
+ <td class="optionscolumn"><input type="text" name="funds" size="5" value="{MEMBERFUNDS}"></td>
+</tr>
+</IF>
+<IF not {INTEGRATION}>
+<IF {THISMEMBERISADMIN}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Primary Usergroup:</span></td>
+ <td class="optionscolumn"><select name="usergroup">{MEMBERUSERGROUPOPTIONS}</select></td> 
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Secondary Usergroups:</span></td>
+ <td class="optionscolumn"><select multiple size="5" name="secondarygroups[]">{MEMBERSECONDARYUSERGROUPOPTIONS}</select>
+<input type="hidden" name="secondarygroups[123]" value="">
+</td> 
+</tr>
+</IF>
+</IF>
+</IF>
+<IF {THISMEMBERCANDELETE}>
+<tr>
+ <td colspan="2"><span class="labels">Delete member?</span> <input type="checkbox" name="delete"></td>
+</tr>
+</IF>
+</table>
+<input type="submit" value="Edit Profile" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/edit.tpl wsnlinks/templates/default/edit.tpl
--- 400/templates/default/edit.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/edit.tpl	2006-09-19 23:01:30.000000000 -0700
@@ -9,7 +9,7 @@
 // End --> 
 </script> 
 
-<div class="nav"><a href="[IFADMIN../]index.php">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="[IFADMIN../]{LINKDETAILSURL}">{LINKTITLE}</a> > Edit Link</div>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="[IFADMIN../]{LINKDETAILSURL}">{LINKTITLE}</a> > Edit Link</div>
 
 <IF {PREVIEWING}>
 <div class="comment">{PREVIEW}</div>
@@ -69,7 +69,7 @@
 </tr>
 <tr>
  <td class="labelscolumn"><span class="labels">Description:</span>
-<IF {SWITCH_WYSIWYGDESCRIP}>
+<IF {SWITCH_WYSIDESCRIP}>
 <p align="center">
 <IF {THISMEMBERPOSTEDITOR} is WYSIWYG><input type="submit" name="switcheditor" value="Switch to plain editor" class="button"></IF>
 <IF {THISMEMBERPOSTEDITOR} is plain><input type="submit" name="switcheditor" value="Switch to WYSIWYG editor" class="button"></IF>
@@ -156,7 +156,7 @@
 </tr>
 </IF>
 <tr>
- <td class="labelscolumn"><span class="labels">Owner ID#:</span><br>Current owner is {MEMBERNAME}.</td>
+ <td class="labelscolumn"><span class="labels">Owner Name or ID#:</span><br>Current owner is {MEMBERNAME}.</td>
  <td class="optionscolumn"><input type="text" name="ownerid" size="5" value="{LINKOWNERID}"></td>
 </tr>
 <tr>
diff -U 3 -H -d -r -N -- 400/templates/default/emailmember.tpl wsnlinks/templates/default/emailmember.tpl
--- 400/templates/default/emailmember.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/emailmember.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,29 +1,29 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">Member List</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > Send E-mail</div><br>
-
-<form action="emailmember.php?filled=1&amp;id={MEMBERID}" method="post">
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> E-Mail Member</td></tr>
-<IF {THISMEMBERISGUEST}>
-<tr>
- <td class="labelscolumn">Your E-mail:</td>
- <td class="optionscolumn"><input type="text" name="senderemail" size="{STANDARDSIZE}"></td> 
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn">Subject:</td>
- <td class="optionscolumn"><input type="text" name="subject" size="{STANDARDSIZE}"></td> 
-</tr>
-<tr>
- <td class="labelscolumn">Message:</td> 
- <td class="optionscolumn"><textarea name="message" cols="50" rows="10"></textarea></td> 
-</tr>
-<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
-<tr>
- <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
-<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
- <td class="optionscolumn"><img src="securityimage.php" alt="security image" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<input type="submit" value="Send E-Mail" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">Member List</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > Send E-mail</div><br>
+
+<form action="emailmember.php?filled=1&amp;id={MEMBERID}" method="post">
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> E-Mail Member</td></tr>
+<IF {THISMEMBERISGUEST}>
+<tr>
+ <td class="labelscolumn">Your E-mail:</td>
+ <td class="optionscolumn"><input type="text" name="senderemail" size="{STANDARDSIZE}"></td> 
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn">Subject:</td>
+ <td class="optionscolumn"><input type="text" name="subject" size="{STANDARDSIZE}"></td> 
+</tr>
+<tr>
+ <td class="labelscolumn">Message:</td> 
+ <td class="optionscolumn"><textarea name="message" cols="50" rows="10"></textarea></td> 
+</tr>
+<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
+<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
+ <td class="optionscolumn"><img src="securityimage.php" alt="security image" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<input type="submit" value="Send E-Mail" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/emailsubmitter.tpl wsnlinks/templates/default/emailsubmitter.tpl
--- 400/templates/default/emailsubmitter.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/emailsubmitter.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,29 +1,29 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{NAVIGATION} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > {LANG_TITLE_EMAILSUBMITTER}</div><br>
-
-<form action="emailsubmitter.php?filled=1&amp;id={LINKID}" method="post">
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> E-Mail Owner of "{LINKTITLE}"</td></tr>
-<IF {THISMEMBERISGUEST}>
-<tr>
- <td class="labelscolumn">Your E-Mail:</td>
- <td class="optionscolumn"><input type="text" name="senderemail" size="{STANDARDSIZE}"></td> 
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn">Subject:</td>
- <td class="optionscolumn"><input type="text" name="subject" size="{STANDARDSIZE}"></td> 
-</tr>
-<tr>
- <td class="labelscolumn">Message:</td> 
- <td class="optionscolumn"><textarea name="message" cols="50" rows="10"></textarea></td> 
-</tr>
-<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
-<tr>
- <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
-<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
- <td class="optionscolumn"><img src="securityimage.php" alt="security image" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<input type="submit" value="Send" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{NAVIGATION} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > {LANG_TITLE_EMAILSUBMITTER}</div><br>
+
+<form action="emailsubmitter.php?filled=1&amp;id={LINKID}" method="post">
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> E-Mail Owner of "{LINKTITLE}"</td></tr>
+<IF {THISMEMBERISGUEST}>
+<tr>
+ <td class="labelscolumn">Your E-Mail:</td>
+ <td class="optionscolumn"><input type="text" name="senderemail" size="{STANDARDSIZE}"></td> 
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn">Subject:</td>
+ <td class="optionscolumn"><input type="text" name="subject" size="{STANDARDSIZE}"></td> 
+</tr>
+<tr>
+ <td class="labelscolumn">Message:</td> 
+ <td class="optionscolumn"><textarea name="message" cols="50" rows="10"></textarea></td> 
+</tr>
+<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
+<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
+ <td class="optionscolumn"><img src="securityimage.php" alt="security image" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<input type="submit" value="Send" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/email.tpl wsnlinks/templates/default/email.tpl
--- 400/templates/default/email.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/email.tpl	2006-09-13 09:29:38.000000000 -0700
@@ -1,34 +1,34 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > E-Mail</div><br>
-
-<form action="email.php?filled=1" method="post">
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> E-Mail "{LINKTITLE}"</td></tr>
-<IF not {MEMBEREMAIL}>
-<tr>
- <td class="labelscolumn"><span class="labels">Your E-Mail:</span><br>Note: Your IP address ({SENDERIP}) will be sent with the link... do not attempt to spam.</td>
- <td class="optionscolumn"><input type="text" name="fromemail" size="{STANDARDSIZE}"><td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Send the link to this E-mail:</span></td>
- <td class="optionscolumn"><input type="text" name="toemail" size="{STANDARDSIZE}"><td>
-</tr>
-<OTHERWISE>
-<tr>
- <td class="labelscolumn"><span class="labels">Send the link to this E-mail:</span><br>Note: Your IP address ({SENDERIP}) will be sent with the link... do not attempt to spam. <input type="hidden" name="fromemail" value="{MEMBEREMAIL}"></td>
- <td class="optionscolumn"><input type="text" name="toemail" size="{STANDARDSIZE}"><td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Your Message:</span></td>
- <td class="optionscolumn"><textarea name="customtext" rows="5" cols="60"></textarea><td>
-</tr>
-</IF>
-<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
-<tr>
- <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
-<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
- <td class="optionscolumn"><img src="securityimage.php" alt="security image" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<input type="hidden" name="id" value="{LINKID}"><input type="submit" value="Send Link" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > E-Mail</div><br>
+
+<form action="email.php?filled=1" method="post">
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> E-Mail "{LINKTITLE}"</td></tr>
+<IF not {MEMBEREMAIL}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Your E-Mail:</span><br>Note: Your IP address ({SENDERIP}) will be sent with the link... do not attempt to spam.</td>
+ <td class="optionscolumn"><input type="text" name="fromemail" size="{STANDARDSIZE}"><td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Send the link to this E-mail:</span></td>
+ <td class="optionscolumn"><input type="text" name="toemail" size="{STANDARDSIZE}"><td>
+</tr>
+<OTHERWISE>
+<tr>
+ <td class="labelscolumn"><span class="labels">Send the link to this E-mail:</span><br>Note: Your IP address ({SENDERIP}) will be sent with the link... do not attempt to spam. <input type="hidden" name="fromemail" value="{MEMBEREMAIL}"></td>
+ <td class="optionscolumn"><input type="text" name="toemail" size="{STANDARDSIZE}"><td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Your Message:</span></td>
+ <td class="optionscolumn"><textarea name="customtext" rows="5" cols="60"></textarea><td>
+</tr>
+</IF>
+<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
+<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
+ <td class="optionscolumn"><img src="securityimage.php" alt="security image" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<input type="hidden" name="id" value="{LINKID}"><input type="submit" value="Send Link" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/guestbook.tpl wsnlinks/templates/default/guestbook.tpl
--- 400/templates/default/guestbook.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/guestbook.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,128 +1,128 @@
-<script language="JavaScript">
-<!--
-function update(msg) {document.commentform.message.value += msg;}
-//-->
-</script>
-
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > Guestbook</div><br>
-
-<p>Guestbook of  <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a>:</p>
-
-<table width="100%">
-<!-- BEGIN POST -->
-<!-- BEGIN REGULAR -->
-<tr>
-<td width="20%" class="postauthor" valign="top">
-<a name="post{COMMENTID}">
-<IF {MEMBERUSERGROUP} is 1>
-<span class="mediumtitle">{COMMENTPOSTERNAME}</span><br>
-<OTHERWISE> 
-<a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="mediumtitle"><span class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</span></a>  <br>
- <IF {MEMBERRANKIMAGE}><img src="{MEMBERRANKIMAGE}" alt="{MEMBERRANK}"><br></IF>
-{MEMBERRANK}
-<br>
-<IF {MEMBERSHOWAVATAR}> <img src="{MEMBERAVATARURL}" alt=""> <br> </IF>
-<br><span class="labels">Joined:</span> {MEMBERREGDATE}
-
-<IF {THISMEMBERISREGISTERED}>
-<br><span class="labels">Links:</span> <a href="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERLINKS}</a>
-<br><span class="labels">Comments:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERCOMMENTS}</a>
-<ELSE>
-<br><span class="labels">Links:</span> {MEMBERLINKS}
-<br><span class="labels">Comments:</span> {MEMBERCOMMENTS}
-</IF>
-
-</IF>
-
-<br><br>Rate this comment: <a href="usernotes.php?action=rate&amp;id={MEMBERID}&amp;commentid={COMMENTID}&amp;votevalue=plus&amp;voteplus=1">
-<img src="{TEMPLATESDIR}/images/plus.gif" border="0"></a> <a href="usernotes.php?action=rate&amp;id={MEMBERID}&amp;commentid={COMMENTID}&amp;votevalue=minus&amp;voteminus=1">
-<img src="{TEMPLATESDIR}/images/minus.gif" border="0"></a>
-
-<IF {THISMEMBERGROUPCANVIEWIP}><br><br>IP: <a href="searchips.php?filled=1&getmembers=1&ip={COMMENTIP}">{COMMENTIP}</a></IF>
-
-</td>
-
-<td width="80%" class="post" valign="top" height="100%">
-<table width="100%" height="100%">
-<tr valign="top">
-<td align="left"><span class="postdate">
-<IF {COMMENTVOTES} is greater than 0>{COMMENTAPPROVED} of {COMMENTVOTES} people found this comment helpful <br></IF>
-Posted {COMMENTDATE}:</span> <IF {COMMENTCANEDIT}><a href="edit.php?action=comment&amp;field=id&amp;condition=equals&amp;fieldvalue={COMMENTID}&amp;usernote={ID}"><img src="{TEMPLATESDIR}/images/editpost.gif" border="0" alt="edit"></a></IF> </td>
-<td align="right"><a href="usernotes.php?id={ID}&amp;quotepost={COMMENTID}#postarea"><img src="{TEMPLATESDIR}/images/quote.gif" border="0" alt="quote"></a></td>
-  </tr>
-  <tr valign="middle">
-   <td height="100%" valign="top">{COMMENTMESSAGE}
-   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
-   </td>
-  </tr>
-  <IF {MEMBERUSERGROUP} is greater than 1 and {MEMBERHASSIG}>
-  <tr valign="bottom" width="100%">
-   <td valign="bottom">
-     <br>_____________________
-     <br>{MEMBERSIGNATURE}
-   </td>
-  </tr>
-  </IF>
-</table>
-</td> 
-</tr>
-<!-- END REGULAR -->
-<!-- END POST -->
-</table>
-
-<IF {MULTIPAGE}>
-Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
-</IF>
-
-<span class="important">{INCOMPLETE}</span>
-
-<p>Post a new message:</p>
-
-<a name="postarea"></a>
-
-<IF {THISMEMBERGROUPCANSUBMITCOMMENTS}>
-<form enctype="multipart/form-data" name="commentform" action="usernotes.php?action=post&amp;filled=1&amp;id={MEMBERID}" method="post">
-<table>
-<IF {THISMEMBERUSERGROUP} is 1>
-<tr>
- <td valign="top"><span class="labels">Your Name:</span></td>
- <td valign="top"><input type=text name="postername" value="{COMMENTPOSTERNAME}"></td>
-</tr>
-</IF>
-<input type="hidden" name="type" value="regular">
-
-<!-- INSERT NEW FIELDS HERE -->
-
-<tr>
- <td valign="top" width="25%"><span class="labels">Your post:</span>
-<br><br>
-<center>
-<div class="smiliebox">
-<!-- BEGIN SMILIES -->
-<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
-<!-- END SMILIES -->
-</div>
-</center>
-<br>Click a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message. You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400,scrollbars=yes');">WSN Codes</a> in your message.</td></td>
-
- <td valign="top" width="75%">
-<textarea name="message" rows="10" cols="70">{COMMENTMESSAGE}</textarea>
- </td>
- </td>
-</tr>
-<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
-<tr>
- <td><span class="labels">Anti-Spam Image:</span>
-<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
- <td><img src="securityimage.php"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-<tr>
- <td>&nbsp;<input type="hidden" name="usernoteon" value="{MEMBERID}"></td>
- <td><input type="submit" value="Submit Post" class="button"></td>
-</tr>
-</table>
-</form>
-<OTHERWISE>
-You don't have permission to post. <IF {THISMEMBERISGUEST}>Please <a href="index.php?action=userlogin">login</a> or <a href="register.php">register</a>.</IF>
+<script language="JavaScript">
+<!--
+function update(msg) {document.commentform.message.value += msg;}
+//-->
+</script>
+
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > Guestbook</div><br>
+
+<p>Guestbook of  <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a>:</p>
+
+<table width="100%">
+<!-- BEGIN POST -->
+<!-- BEGIN REGULAR -->
+<tr>
+<td width="20%" class="postauthor" valign="top">
+<a name="post{COMMENTID}">
+<IF {MEMBERUSERGROUP} is 1>
+<span class="mediumtitle">{COMMENTPOSTERNAME}</span><br>
+<OTHERWISE> 
+<a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="mediumtitle"><span class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</span></a>  <br>
+ <IF {MEMBERRANKIMAGE}><img src="{MEMBERRANKIMAGE}" alt="{MEMBERRANK}"><br></IF>
+{MEMBERRANK}
+<br>
+<IF {MEMBERSHOWAVATAR}> <img src="{MEMBERAVATARURL}" alt=""> <br> </IF>
+<br><span class="labels">Joined:</span> {MEMBERREGDATE}
+
+<IF {THISMEMBERISREGISTERED}>
+<br><span class="labels">Links:</span> <a href="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERLINKS}</a>
+<br><span class="labels">Comments:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERCOMMENTS}</a>
+<ELSE>
+<br><span class="labels">Links:</span> {MEMBERLINKS}
+<br><span class="labels">Comments:</span> {MEMBERCOMMENTS}
+</IF>
+
+</IF>
+
+<br><br>Rate this comment: <a href="usernotes.php?action=rate&amp;id={MEMBERID}&amp;commentid={COMMENTID}&amp;votevalue=plus&amp;voteplus=1">
+<img src="{TEMPLATESDIR}/images/plus.gif" border="0"></a> <a href="usernotes.php?action=rate&amp;id={MEMBERID}&amp;commentid={COMMENTID}&amp;votevalue=minus&amp;voteminus=1">
+<img src="{TEMPLATESDIR}/images/minus.gif" border="0"></a>
+
+<IF {THISMEMBERGROUPCANVIEWIP}><br><br>IP: <a href="searchips.php?filled=1&getmembers=1&ip={COMMENTIP}">{COMMENTIP}</a></IF>
+
+</td>
+
+<td width="80%" class="post" valign="top" height="100%">
+<table width="100%" height="100%">
+<tr valign="top">
+<td align="left"><span class="postdate">
+<IF {COMMENTVOTES} is greater than 0>{COMMENTAPPROVED} of {COMMENTVOTES} people found this comment helpful <br></IF>
+Posted {COMMENTDATE}:</span> <IF {COMMENTCANEDIT}><a href="edit.php?action=comment&amp;field=id&amp;condition=equals&amp;fieldvalue={COMMENTID}&amp;usernote={ID}"><img src="{TEMPLATESDIR}/images/editpost.gif" border="0" alt="edit"></a></IF> </td>
+<td align="right"><a href="usernotes.php?id={ID}&amp;quotepost={COMMENTID}#postarea"><img src="{TEMPLATESDIR}/images/quote.gif" border="0" alt="quote"></a></td>
+  </tr>
+  <tr valign="middle">
+   <td height="100%" valign="top">{COMMENTMESSAGE}
+   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
+   </td>
+  </tr>
+  <IF {MEMBERUSERGROUP} is greater than 1 and {MEMBERHASSIG}>
+  <tr valign="bottom" width="100%">
+   <td valign="bottom">
+     <br>_____________________
+     <br>{MEMBERSIGNATURE}
+   </td>
+  </tr>
+  </IF>
+</table>
+</td> 
+</tr>
+<!-- END REGULAR -->
+<!-- END POST -->
+</table>
+
+<IF {MULTIPAGE}>
+Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
+</IF>
+
+<span class="important">{INCOMPLETE}</span>
+
+<p>Post a new message:</p>
+
+<a name="postarea"></a>
+
+<IF {THISMEMBERGROUPCANSUBMITCOMMENTS}>
+<form enctype="multipart/form-data" name="commentform" action="usernotes.php?action=post&amp;filled=1&amp;id={MEMBERID}" method="post">
+<table>
+<IF {THISMEMBERUSERGROUP} is 1>
+<tr>
+ <td valign="top"><span class="labels">Your Name:</span></td>
+ <td valign="top"><input type=text name="postername" value="{COMMENTPOSTERNAME}"></td>
+</tr>
+</IF>
+<input type="hidden" name="type" value="regular">
+
+<!-- INSERT NEW FIELDS HERE -->
+
+<tr>
+ <td valign="top" width="25%"><span class="labels">Your post:</span>
+<br><br>
+<center>
+<div class="smiliebox">
+<!-- BEGIN SMILIES -->
+<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
+<!-- END SMILIES -->
+</div>
+</center>
+<br>Click a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message. You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400,scrollbars=yes');">WSN Codes</a> in your message.</td></td>
+
+ <td valign="top" width="75%">
+<textarea name="message" rows="10" cols="70">{COMMENTMESSAGE}</textarea>
+ </td>
+ </td>
+</tr>
+<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
+<tr>
+ <td><span class="labels">Anti-Spam Image:</span>
+<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
+ <td><img src="securityimage.php"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+<tr>
+ <td>&nbsp;<input type="hidden" name="usernoteon" value="{MEMBERID}"></td>
+ <td><input type="submit" value="Submit Post" class="button"></td>
+</tr>
+</table>
+</form>
+<OTHERWISE>
+You don't have permission to post. <IF {THISMEMBERISGUEST}>Please <a href="index.php?action=userlogin">login</a> or <a href="register.php">register</a>.</IF>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/helpcatcontents.tpl wsnlinks/templates/default/helpcatcontents.tpl
--- 400/templates/default/helpcatcontents.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/helpcatcontents.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,9 +1,9 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="help.php">Help</a> > {HELPCATNAME}</div>
-
-<p><span class="labels">{HELPCATNAME}</span></p>
-
-<!-- BEGIN TOPLIST 1 -->
-<CONFIG>helpitems,priority,1000,ascending,category={HELPCATID}</CONFIG>
-<p><a href="help.php?action=showitem&amp;id={HELPITEMID}">{HELPITEMSUBJECT}</a></p>
-<p>{HELPITEMHELPTEXT}</p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="help.php">Help</a> > {HELPCATNAME}</div>
+
+<p><span class="labels">{HELPCATNAME}</span></p>
+
+<!-- BEGIN TOPLIST 1 -->
+<CONFIG>helpitems,priority,1000,ascending,category={HELPCATID}</CONFIG>
+<p><a href="help.php?action=showitem&amp;id={HELPITEMID}">{HELPITEMSUBJECT}</a></p>
+<p>{HELPITEMHELPTEXT}</p>
 <!-- END TOPLIST 1 -->
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/helpitem.tpl wsnlinks/templates/default/helpitem.tpl
--- 400/templates/default/helpitem.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/helpitem.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,5 +1,5 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="help.php">Help</a> > <a href="help.php?action=showcat&amp;id={HELPCATID}">{HELPCATNAME}</a> > {HELPITEMSUBJECT}</div>
-
-<p><span class="labels">{HELPITEMSUBJECT}</span></p>
-
-<p>{HELPITEMHELPTEXT}</p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="help.php">Help</a> > <a href="help.php?action=showcat&amp;id={HELPCATID}">{HELPCATNAME}</a> > {HELPITEMSUBJECT}</div>
+
+<p><span class="labels">{HELPITEMSUBJECT}</span></p>
+
+<p>{HELPITEMHELPTEXT}</p>
diff -U 3 -H -d -r -N -- 400/templates/default/helpmain.tpl wsnlinks/templates/default/helpmain.tpl
--- 400/templates/default/helpmain.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/helpmain.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,7 +1,7 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Help</div>
-
-<p><span class="labels">Contents:</span></p>
-<!-- BEGIN TOPLIST 1 -->
-<CONFIG>helpcats,priority,100,ascending</CONFIG>
-<p><a href="help.php?action=showcat&amp;id={HELPCATID}">{HELPCATNAME}</a></p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Help</div>
+
+<p><span class="labels">Contents:</span></p>
+<!-- BEGIN TOPLIST 1 -->
+<CONFIG>helpcats,priority,100,ascending</CONFIG>
+<p><a href="help.php?action=showcat&amp;id={HELPCATID}">{HELPCATNAME}</a></p>
 <!-- END TOPLIST 1 -->
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/home.tpl wsnlinks/templates/default/home.tpl
--- 400/templates/default/home.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/home.tpl	2006-09-13 09:07:51.000000000 -0700
@@ -1,4 +1,4 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="profile.php">Member Home</a></div>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="profile.php">Member Home</a></div>
 
 <IF {SWITCH_INVITES}>
 <p>You have {THISMEMBERINVITES} invitations left to send.</p>
diff -U 3 -H -d -r -N -- 400/templates/default/leaders.tpl wsnlinks/templates/default/leaders.tpl
--- 400/templates/default/leaders.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/leaders.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,44 +1,44 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Site Leaders</div>
-
-<!-- BEGIN GROUP -->
-<p><span class="important">{TITLE}</span></p>
-<table>
- <tr>
-  <td {COLUMNHEADER}>Name</td>
-  <IF {ID} is {MODUSERGROUP}><td {COLUMNHEADER}>Categories</td></IF>
-  <td {COLUMNHEADER}>Contact</td>
- </tr>
-<!-- BEGIN ROW -->
- <tr>
-  <td class="oddcolumns"><a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</a> </td>
-  <IF {ID} is {MODUSERGROUP}><td class="evencolumns">{MEMBERMODFORUMS}</td></IF>
-  <td class="oddcolumns">
-<IF {MEMBERREADYTOCHAT}>
-<a href="im.php?with={MEMBERID}" target="win" onClick="window.open('','win','{IMDIMENSIONS}');">Send an instant message to {MEMBERNAME}</a><br></IF>
-<IF {SWITCH_PM} and {MEMBERACCEPTPMS}><a href="privatemessaging.php?action=send&amp;sendto={MEMBERID}">Send a PM to {MEMBERNAME}</a><br></IF>
-<IF {MEMBERALLOWUSEREMAIL} and {THISMEMBERGROUPCANEMAILMEMBERS} and {MEMBERHASEMAIL}><a href="emailmember.php?id={MEMBERID}">Send an E-mail to {MEMBERNAME}</a></IF>
-</td>
- </tr>
-<!-- END ROW -->
-</table>
-<!-- END GROUP -->
-
-<IF {SPONSORUSEUG} is yes>
-<p>These members have helped support {SITETITLE} with their monetary donations:</p>
-<table>
- <tr>
-  <td {COLUMNHEADER}>Name</td>
-  <td {COLUMNHEADER}>Join Date</td>
-  <td {COLUMNHEADER}>Location</td>
- </tr>
-<!-- BEGIN SPONSOR ROW -->
- <tr>
-  <td class="oddcolumns"><a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</a></td>
-  <td class="evenolumns">{MEMBERREGDATE}</td>
-  <td class="oddcolumns">{MEMBERLOCATION}</td>
- </tr>
-<!-- END SPONSOR ROW -->
-</table>
-
-<p>Help out {SITETITLE} by <a href="membersponsor.php">buying a sponsor membership</a>.</p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Site Leaders</div>
+
+<!-- BEGIN GROUP -->
+<p><span class="important">{TITLE}</span></p>
+<table>
+ <tr>
+  <td {COLUMNHEADER}>Name</td>
+  <IF {ID} is {MODUSERGROUP}><td {COLUMNHEADER}>Categories</td></IF>
+  <td {COLUMNHEADER}>Contact</td>
+ </tr>
+<!-- BEGIN ROW -->
+ <tr>
+  <td class="oddcolumns"><a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</a> </td>
+  <IF {ID} is {MODUSERGROUP}><td class="evencolumns">{MEMBERMODFORUMS}</td></IF>
+  <td class="oddcolumns">
+<IF {MEMBERREADYTOCHAT}>
+<a href="im.php?with={MEMBERID}" target="win" onClick="window.open('','win','{IMDIMENSIONS}');">Send an instant message to {MEMBERNAME}</a><br></IF>
+<IF {SWITCH_PM} and {MEMBERACCEPTPMS}><a href="privatemessaging.php?action=send&amp;sendto={MEMBERID}">Send a PM to {MEMBERNAME}</a><br></IF>
+<IF {MEMBERALLOWUSEREMAIL} and {THISMEMBERGROUPCANEMAILMEMBERS} and {MEMBERHASEMAIL}><a href="emailmember.php?id={MEMBERID}">Send an E-mail to {MEMBERNAME}</a></IF>
+</td>
+ </tr>
+<!-- END ROW -->
+</table>
+<!-- END GROUP -->
+
+<IF {SPONSORUSEUG} is yes>
+<p>These members have helped support {SITETITLE} with their monetary donations:</p>
+<table>
+ <tr>
+  <td {COLUMNHEADER}>Name</td>
+  <td {COLUMNHEADER}>Join Date</td>
+  <td {COLUMNHEADER}>Location</td>
+ </tr>
+<!-- BEGIN SPONSOR ROW -->
+ <tr>
+  <td class="oddcolumns"><a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</a></td>
+  <td class="evenolumns">{MEMBERREGDATE}</td>
+  <td class="oddcolumns">{MEMBERLOCATION}</td>
+ </tr>
+<!-- END SPONSOR ROW -->
+</table>
+
+<p>Help out {SITETITLE} by <a href="membersponsor.php">buying a sponsor membership</a>.</p>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/login.tpl wsnlinks/templates/default/login.tpl
--- 400/templates/default/login.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/login.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,33 +1,33 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Login</div><br>
-
-<p>Please supply your username and password in order to log in:</p>
-
-<form action="index.php?action=userlogin&amp;filled=1" method="post">
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Login</td></tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Username:</span></td>
- <td class="optionscolumn"><input type="text" name="username" size="{STANDARDSIZE}"> </td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Password:</span></td> 
- <td class="optionscolumn"><input type="password" name="userpassword" size="{STANDARDSIZE}"> </td>
-</tr>
-</table>
-<input type="submit" value="Login" class="button">
-</form>
-
-<br><br><br>
-
-<form action="index.php?action=lostpw" method="post">
-Lost your password? Type in the email address you registered under in order to have a new password sent to you:
-<br><input type="text" name="email" size="{STANDARDSIZE}">
-<input type="submit" value="Send Password" class="button">
-</form>
-<IF {REGISTRATION} is email>
-<form action="index.php?action=resendconf" method="post">
-<br><br>Trying to confirm your email and need the activation email re-sent? Type in the email address you registered under in order to have another copy sent to you:
-<br><input type="text" name="email" size="{STANDARDSIZE}">
-<input type="submit" value="Resend Activation E-Mail" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Login</div><br>
+
+<p>Please supply your username and password in order to log in:</p>
+
+<form action="index.php?action=userlogin&amp;filled=1" method="post">
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Login</td></tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Username:</span></td>
+ <td class="optionscolumn"><input type="text" name="username" size="{STANDARDSIZE}"> </td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Password:</span></td> 
+ <td class="optionscolumn"><input type="password" name="userpassword" size="{STANDARDSIZE}"> </td>
+</tr>
+</table>
+<input type="submit" value="Login" class="button">
+</form>
+
+<br><br><br>
+
+<form action="index.php?action=lostpw" method="post">
+Lost your password? Type in the email address you registered under in order to have a new password sent to you:
+<br><input type="text" name="email" size="{STANDARDSIZE}">
+<input type="submit" value="Send Password" class="button">
+</form>
+<IF {REGISTRATION} is email>
+<form action="index.php?action=resendconf" method="post">
+<br><br>Trying to confirm your email and need the activation email re-sent? Type in the email address you registered under in order to have another copy sent to you:
+<br><input type="text" name="email" size="{STANDARDSIZE}">
+<input type="submit" value="Resend Activation E-Mail" class="button">
+</form>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/main.tpl wsnlinks/templates/default/main.tpl
--- 400/templates/default/main.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/main.tpl	2006-09-22 04:08:16.000000000 -0700
@@ -31,7 +31,7 @@
 <table align="center" cellpadding="5" cellspacing="10">
 <!-- BEGIN REGULAR -->
 <td {CATWIDTH} valign="top" class="category">
-<img src="{TEMPLATESDIR}/images/folder.gif" alt="folder"> <a href="index.php?action=displaycat&amp;catid={CATID}" class="categoryname">{CATNAME}</a> ({CATNUMLINKS}) {CATHASNEW} {CATADMIN}<br>
+<img src="{TEMPLATESDIR}/images/folder.gif" alt="folder"> <a href="{CATURL}" class="categoryname">{CATNAME}</a> ({CATNUMLINKS}) {CATHASNEW} {CATADMIN}<br>
 <IF {CATHASDESCRIPTION}>{CATDESCRIPTION} <br></IF>
 <IF {SWITCH_FORUMVIEWS}>{CATVIEWS} views<br></IF>
 <div class="subcatsmainpage">
@@ -73,8 +73,19 @@
 <div class="box">
 <div class="boxtitle" onClick="minmax('topbox')"><img src="{TEMPLATESDIR}/images/icon_show.gif" alt="show"> Top {TOPLISTTOTAL1} Links</div>
 <div class="boxbody" id="topbox">
-<form action="index.php" style="margin: 0px; padding: 0px;">
-Show <select name="number[1]"><option value="5">5</option><option value="10">10</option><option value="15">15</option></select> <select name="thefield[1]"><option value="time">newest</option><option value="rating">top rated</option><option value="hits">most visited</option></select> <input type="submit" value="Go" class="button"> 
+<form action="{DIRURL}" style="margin: 0px; padding: 0px;">
+Show 
+<select name="number[1]">
+ <option value="5">5</option>
+ <option value="10">10</option>
+ <option value="15">15</option>
+</select> 
+<select name="thefield[1]">
+ <option value="time">newest</option>
+ <option value="rating">top rated</option>
+ <option value="hits">most visited</option>
+</select> 
+<input type="submit" value="Go" class="button"> 
 <br>
 <!-- BEGIN TOPLIST 1 -->
 <CONFIG>links,id,5,descending</CONFIG>
diff -U 3 -H -d -r -N -- 400/templates/default/memberlist.tpl wsnlinks/templates/default/memberlist.tpl
--- 400/templates/default/memberlist.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/memberlist.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,60 +1,60 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Member List</div><br>
-
-<div align="center">
-<form action="memberlist.php">
-Sort members by 
-<select name="field">
- <option value="time">registration date</option>
- <option value="name">name</option>
- <option value="links">links submitted</option>
- <IF {SWITCH_COMMENTS}><option value="comments">comments posted</option></IF>
- <option value="birthdate">birthdate</option>
- <IF {SWITCH_TIMEONLINE}><option value="timeonline">total time online</option></IF>
-</select> 
-in
-<select name="ascdesc">
- <option value="asc">ascending</option>
- <option value="desc">descending</option>
-</select> 
-order, and show
-<select name="perpage">
- <option value="15">15</option>
- <option value="25">25</option>
- <option value="40">40</option>
- <option value="80">80</option>
-</select>
-members per page.
-<input type="submit" value="Sort" class="button">
-</form>
-</div>
-
-<table width="100%">
-<tr>
- <td {COLUMNHEADER}>Name</td>
- <td {COLUMNHEADER}>Registration Date</td>
- <td {COLUMNHEADER}>Links</td>
- <IF {SWITCH_COMMENTS}><td {COLUMNHEADER}>Comments</td></IF>
- <td {COLUMNHEADER}>Location</td>
- <td {COLUMNHEADER}>Avatar</td>
- <IF {SWITCH_TIMEONLINE}><td {COLUMNHEADER}>Total Time Online</td></IF>
-</tr>
-<!-- BEGIN MEMBERS -->
-<tr>
- <td class="oddcolumns"><a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</a> {MEMBERADMIN} </td>
- <td class="evencolumns">{MEMBERREGDATE}</td>
- <td class="oddcolumns">{MEMBERLINKS}</td>
- <IF {SWITCH_COMMENTS}><td class="evencolumns">{MEMBERCOMMENTS}</td></IF>
- <td class="oddcolumns" width="20%">{MEMBERLOCATION}</td>
- <td class="evencolumns"><IF {MEMBERAVATARNAME}><img src="{MEMBERAVATARURL}" alt=""></IF></td>
- <IF {SWITCH_TIMEONLINE}><td class="oddcolumns">{MEMBERTOTALTIMEONLINE}</td></IF>
-</tr>
-<!-- END MEMBERS -->
-</table>
-
-<IF {MULTIPAGE}>
-<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<form action="search.php?action=filter&amp;filled=1&amp;whichtype=members" method="post">
-Find the member named <input type="hidden" name="namecondition" value="="> <input type="text" size="{STANDARDSIZE}" name="namesearch"> <input type="submit" value="Find Member" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Member List</div><br>
+
+<div align="center">
+<form action="memberlist.php">
+Sort members by 
+<select name="field">
+ <option value="time">registration date</option>
+ <option value="name">name</option>
+ <option value="links">links submitted</option>
+ <IF {SWITCH_COMMENTS}><option value="comments">comments posted</option></IF>
+ <option value="birthdate">birthdate</option>
+ <IF {SWITCH_TIMEONLINE}><option value="timeonline">total time online</option></IF>
+</select> 
+in
+<select name="ascdesc">
+ <option value="asc">ascending</option>
+ <option value="desc">descending</option>
+</select> 
+order, and show
+<select name="perpage">
+ <option value="15">15</option>
+ <option value="25">25</option>
+ <option value="40">40</option>
+ <option value="80">80</option>
+</select>
+members per page.
+<input type="submit" value="Sort" class="button">
+</form>
+</div>
+
+<table width="100%">
+<tr>
+ <td {COLUMNHEADER}>Name</td>
+ <td {COLUMNHEADER}>Registration Date</td>
+ <td {COLUMNHEADER}>Links</td>
+ <IF {SWITCH_COMMENTS}><td {COLUMNHEADER}>Comments</td></IF>
+ <td {COLUMNHEADER}>Location</td>
+ <td {COLUMNHEADER}>Avatar</td>
+ <IF {SWITCH_TIMEONLINE}><td {COLUMNHEADER}>Total Time Online</td></IF>
+</tr>
+<!-- BEGIN MEMBERS -->
+<tr>
+ <td class="oddcolumns"><a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</a> {MEMBERADMIN} </td>
+ <td class="evencolumns">{MEMBERREGDATE}</td>
+ <td class="oddcolumns">{MEMBERLINKS}</td>
+ <IF {SWITCH_COMMENTS}><td class="evencolumns">{MEMBERCOMMENTS}</td></IF>
+ <td class="oddcolumns" width="20%">{MEMBERLOCATION}</td>
+ <td class="evencolumns"><IF {MEMBERAVATARNAME}><img src="{MEMBERAVATARURL}" alt=""></IF></td>
+ <IF {SWITCH_TIMEONLINE}><td class="oddcolumns">{MEMBERTOTALTIMEONLINE}</td></IF>
+</tr>
+<!-- END MEMBERS -->
+</table>
+
+<IF {MULTIPAGE}>
+<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<form action="search.php?action=filter&amp;filled=1&amp;whichtype=members" method="post">
+Find the member named <input type="hidden" name="namecondition" value="="> <input type="text" size="{STANDARDSIZE}" name="namesearch"> <input type="submit" value="Find Member" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/modcpsubwrapper.tpl wsnlinks/templates/default/modcpsubwrapper.tpl
--- 400/templates/default/modcpsubwrapper.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/modcpsubwrapper.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,25 +1,25 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Moderator Control Panel</div>
-
-<table cellspacing="5" width="100%">
-<tr>
-<td width="20%" valign="top">
-
-<a href="modcp.php" class="homenav">Mod CP Main</a>
-<a href="modcp.php?action=modnotes" class="homenav">Moderator Notes</a>
-<IF {THISMEMBERGROUPCANVIEWMODLOG}><a href="modlog.php" class="homenav">Moderator Logs</a></IF>
-<IF {THISMEMBERGROUPCANVIEWIP}><a href="searchips.php" class="homenav">Search IPs</a></IF>
-<div class="homenav">Bulk Edit Categories
-<!-- BEGIN MODFORUM ROW -->
-<br>- <a href="bulkedit.php?catid={CATID}">{CATNAME}</a> 
-<!-- END MODFORUM ROW -->
-</div> 
-
-</td>
-
-<td width="80%" valign="top">
-
-<!-- BODY GOES HERE -->
-
-</td>
-</tr>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Moderator Control Panel</div>
+
+<table cellspacing="5" width="100%">
+<tr>
+<td width="20%" valign="top">
+
+<a href="modcp.php" class="homenav">Mod CP Main</a>
+<a href="modcp.php?action=modnotes" class="homenav">Moderator Notes</a>
+<IF {THISMEMBERGROUPCANVIEWMODLOG}><a href="modlog.php" class="homenav">Moderator Logs</a></IF>
+<IF {THISMEMBERGROUPCANVIEWIP}><a href="searchips.php" class="homenav">Search IPs</a></IF>
+<div class="homenav">Bulk Edit Categories
+<!-- BEGIN MODFORUM ROW -->
+<br>- <a href="bulkedit.php?catid={CATID}">{CATNAME}</a> 
+<!-- END MODFORUM ROW -->
+</div> 
+
+</td>
+
+<td width="80%" valign="top">
+
+<!-- BODY GOES HERE -->
+
+</td>
+</tr>
 </table>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/modcp.tpl wsnlinks/templates/default/modcp.tpl
--- 400/templates/default/modcp.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/modcp.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,89 +1,89 @@
-<script language="JavaScript">
-<!--
-function checkall() 
-{
- var boxes = document.getElementsByName('linklist[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = true;
- var boxes = document.getElementsByName('commentlist[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = true;
-}
-function uncheckall() 
-{
- var boxes = document.getElementsByName('linklist[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = false;
- var boxes = document.getElementsByName('commentlist[]');
- for (i=0; i < boxes.length; i++) 
-     boxes[i].checked = false;
-}
--->
-</script>
-
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Moderator Control Panel</div>
-
-<IF {PENDING}>
-<p>These items are awaiting validation in the categories you moderate:</p>
-
-<p><a onclick="checkall()" style="cursor: pointer">Select</a> / <a onclick="uncheckall()" style="cursor: pointer">Unselect</a> all</p>
-
-<form action="modcp.php?filled=1" method="post">
-<table>
-<tr>
- <td {COLUMNHEADER}>Pending Links</td>
- <td {COLUMNHEADER}>Pending Link Edits</td>
- <td {COLUMNHEADER}>Pending Comments</td>
-</tr>
-<tr>
-<td valign="top" class="oddcolumns">
-<!-- BEGIN LINK LIST -->
-<input type="checkbox" name="linklist[]" value="{LINKID}"> {LINKTITLE} {LINKADMIN}
-<br>URL: <a href="{LINKURL}" {EXTERNALLINKS}>{LINKURL}</a>
-<br>Description: {LINKDESCRIPTION}
-<br>Category: <a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a>
-<br>Link Type: {LINKTYPE}
-<br>Reciprocal URL: <a href="{LINKRECIPURL}">{LINKRECIPURL}</a>
-<br>Reciprocated With: {LINKRECIPWITH}
-<IF {LINKFILEFIELD}><br>Attached files:<br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
-<!-- END LINK ATTACHMENTS -->
-</IF>
-<!-- END LINK LIST -->
-</td>
-<td valign="top" class="evencolumns">
-<!-- BEGIN EDIT LIST -->
-<input type="checkbox" name="linklist[]" value="{LINKID}"> {LINKTITLE}
-<br>URL: <a href="{LINKURL}" {EXTERNALLINKS}>{LINKURL}</a>
-<br>Description: {LINKDESCRIPTION}
-<br>Category: <a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a>
-<br>Link Type: {LINKTYPE}
-<br>Reciprocal URL: <a href="{LINKRECIPURL}">{LINKRECIPURL}</a>
-<br>Reciprocated With: {LINKRECIPWITH}
-<IF {LINKFILEFIELD}><br>Attached files:<br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
-<!-- END LINK ATTACHMENTS -->
-</IF>
-<!-- END EDIT LIST -->
-</td>
-<td valign="top" class="oddcolumns">
-<!-- BEGIN COMMENT LIST -->
-<input type="checkbox" name="commentlist[]" value="{COMMENTID}"> Comment on {COMMENTLINKNAME}
-<br>Associated Link: <a href="link.php?action=detail&amp;id={COMMENTLINKID}">{COMMENTLINKNAME}</a>
-<IF {SWITCH_POSTTYPES}><br>Comment Type: {COMMENTTYPE}</IF>
-<br>Text: {COMMENTTEXT}
-<!-- END COMMENT LIST -->
-</td>
-</tr>
-</table>
-<select name="action">
-<option value="approve">approve</option>
-<option value="reject">reject</option>
-</select> and send the notification email from <select name="fromemail">{FUNC_ALTERNATEEMAILSELECTOR[]}</select> (if applicable) 
-<input type="submit" value="Go" class="button">
-</form>
-<OTHERWISE>
-There are no pending items in your categories.
+<script language="JavaScript">
+<!--
+function checkall() 
+{
+ var boxes = document.getElementsByName('linklist[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = true;
+ var boxes = document.getElementsByName('commentlist[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = true;
+}
+function uncheckall() 
+{
+ var boxes = document.getElementsByName('linklist[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = false;
+ var boxes = document.getElementsByName('commentlist[]');
+ for (i=0; i < boxes.length; i++) 
+     boxes[i].checked = false;
+}
+-->
+</script>
+
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Moderator Control Panel</div>
+
+<IF {PENDING}>
+<p>These items are awaiting validation in the categories you moderate:</p>
+
+<p><a onclick="checkall()" style="cursor: pointer">Select</a> / <a onclick="uncheckall()" style="cursor: pointer">Unselect</a> all</p>
+
+<form action="modcp.php?filled=1" method="post">
+<table>
+<tr>
+ <td {COLUMNHEADER}>Pending Links</td>
+ <td {COLUMNHEADER}>Pending Link Edits</td>
+ <td {COLUMNHEADER}>Pending Comments</td>
+</tr>
+<tr>
+<td valign="top" class="oddcolumns">
+<!-- BEGIN LINK LIST -->
+<input type="checkbox" name="linklist[]" value="{LINKID}"> {LINKTITLE} {LINKADMIN}
+<br>URL: <a href="{LINKURL}" {EXTERNALLINKS}>{LINKURL}</a>
+<br>Description: {LINKDESCRIPTION}
+<br>Category: <a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a>
+<br>Link Type: {LINKTYPE}
+<br>Reciprocal URL: <a href="{LINKRECIPURL}">{LINKRECIPURL}</a>
+<br>Reciprocated With: {LINKRECIPWITH}
+<IF {LINKFILEFIELD}><br>Attached files:<br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
+<!-- END LINK ATTACHMENTS -->
+</IF>
+<!-- END LINK LIST -->
+</td>
+<td valign="top" class="evencolumns">
+<!-- BEGIN EDIT LIST -->
+<input type="checkbox" name="linklist[]" value="{LINKID}"> {LINKTITLE}
+<br>URL: <a href="{LINKURL}" {EXTERNALLINKS}>{LINKURL}</a>
+<br>Description: {LINKDESCRIPTION}
+<br>Category: <a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a>
+<br>Link Type: {LINKTYPE}
+<br>Reciprocal URL: <a href="{LINKRECIPURL}">{LINKRECIPURL}</a>
+<br>Reciprocated With: {LINKRECIPWITH}
+<IF {LINKFILEFIELD}><br>Attached files:<br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
+<!-- END LINK ATTACHMENTS -->
+</IF>
+<!-- END EDIT LIST -->
+</td>
+<td valign="top" class="oddcolumns">
+<!-- BEGIN COMMENT LIST -->
+<input type="checkbox" name="commentlist[]" value="{COMMENTID}"> Comment on {COMMENTLINKNAME}
+<br>Associated Link: <a href="link.php?action=detail&amp;id={COMMENTLINKID}">{COMMENTLINKNAME}</a>
+<IF {SWITCH_POSTTYPES}><br>Comment Type: {COMMENTTYPE}</IF>
+<br>Text: {COMMENTTEXT}
+<!-- END COMMENT LIST -->
+</td>
+</tr>
+</table>
+<select name="action">
+<option value="approve">approve</option>
+<option value="reject">reject</option>
+</select> and send the notification email from <select name="fromemail">{FUNC_ALTERNATEEMAILSELECTOR[]}</select> (if applicable) 
+<input type="submit" value="Go" class="button">
+</form>
+<OTHERWISE>
+There are no pending items in your categories.
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/onepost.tpl wsnlinks/templates/default/onepost.tpl
--- 400/templates/default/onepost.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/onepost.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,81 +1,81 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="comments.php?id={LINKID}">{LINKTITLE}</a> > {COMMENTNUMBER}</div>
-
-<table width="100%">
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Post {COMMENTNUMBER}</td></tr>
-<tr>
-<td height="100%" class="postauthor" valign="top">
-
-<a name="post{COMMENTID}"></a>
-<IF {MEMBERUSERGROUP} is 1>
-<span class="{MEMBERGROUPNAMESTYLE}">{COMMENTPOSTERNAME}</span><br>
-<OTHERWISE> 
-<a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</a> 
-<br> 
-<IF {MEMBERRANKIMAGE}><img src="{MEMBERRANKIMAGE}" alt="{MEMBERRANK}"><br></IF>
-{MEMBERRANK}
-<br>
-<IF {MEMBERSHOWAVATAR}> <img src="{MEMBERAVATARURL}" alt="avatar"> <br> </IF>
-
-<br><span class="labels">Group:</span> {MEMBERGROUPTITLE}
-<br><span class="labels">Joined:</span> {MEMBERREGDATE}
-<IF {MEMBERLOCATION}><br><span class="labels">Location:</span> {MEMBERLOCATION}</IF>
-<br>
-
-<IF {THISMEMBERISREGISTERED}>
-<br><span class="labels">Links:</span> <a href="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERLINKS}</a>
-<br><span class="labels">Comments:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERCOMMENTS}</a>
-<ELSE>
-<br><span class="labels">Links:</span> {MEMBERLINKS}
-<br><span class="labels">Comments:</span> {MEMBERCOMMENTS}
-</IF>
-
-</IF>
-
-<IF {SWITCH_REPORTS} and {THISMEMBERGROUPCANREPORT}><br><br><a href="reportcomment.php?id={COMMENTID}"><img src="{TEMPLATESDIR}/images/report.gif" border="0" alt="report bad comment"></a></IF>
-
-<IF {SWITCH_RATINGS} and {THISMEMBERGROUPCANRATECOMMENTS}>
-<br><br>Rate this comment: <a href="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}&amp;votevalue=plus&amp;voteplus=1">
-<img src="{TEMPLATESDIR}/images/plus.gif" border="0" alt="rate comment up"></a> <a href="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}&amp;votevalue=minus&amp;voteminus=1">
-<img src="{TEMPLATESDIR}/images/minus.gif" border="0" alt="rate comment down"></a>
-</IF>
-
-<IF {THISMEMBERGROUPCANVIEWIP}><br><br>IP: {COMMENTIP}</IF>
-
-</td>
-
-<td width="80%" class="post" valign="top" height="100%">
-<table width="100%">
-<tr valign="top">
-<td align="left"><span class="postdate">
-<IF {COMMENTVOTES} is greater than 0>{COMMENTAPPROVED} of {COMMENTVOTES} people found this comment helpful <br></IF>
-Posted {COMMENTDATE}:</span> <IF {COMMENTCANEDIT}><a href="edit.php?action=comment&amp;field=id&amp;condition=equals&amp;fieldvalue={COMMENTID}"><img src="{TEMPLATESDIR}/images/editpost.gif" border="0" alt="edit"></a></IF> 
-<IF {COMMENTTITLE}><br>Subject: <span class="important">{COMMENTTITLE}</span></IF>
-</td>
-<td align="right"><a href="postreply.php?id={LINKID}&amp;quotepost={COMMENTID}#postarea"><img src="{TEMPLATESDIR}/images/quote.gif" border="0" alt="quote comment"></a> <br>#{COMMENTNUMBER}</td>
-  </tr>
-  <tr valign="middle">
-   <td height="100%" valign="top">{COMMENTMESSAGE}
-   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
-   </td>
-  </tr>
-  <tr valign="bottom">
-   <td valign="bottom">
-<IF {COMMENTNUMATTACHMENTS}>
-<br>Attached Files:<br>
-<!-- BEGIN ATTACHMENTS -->
-<a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
-<IF {ATTACHISIMAGE}>
-<a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}"><img src="thumbnail.php?comid={COMMENTID}&amp;attachid={ATTACHID}" border="0" alt="attachment"></a><br>
-</IF>
-<!-- END ATTACHMENTS -->
-</IF>
-  <IF {COMMENTSHOWSIG}>
-     <br>_____________________
-     <br>{MEMBERSIGNATURE}
-  </IF>
-   </td>
-  </tr>
-</table>
-</td> 
-</tr>
-</table>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="comments.php?id={LINKID}">{LINKTITLE}</a> > {COMMENTNUMBER}</div>
+
+<table width="100%">
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Post {COMMENTNUMBER}</td></tr>
+<tr>
+<td height="100%" class="postauthor" valign="top">
+
+<a name="post{COMMENTID}"></a>
+<IF {MEMBERUSERGROUP} is 1>
+<span class="{MEMBERGROUPNAMESTYLE}">{COMMENTPOSTERNAME}</span><br>
+<OTHERWISE> 
+<a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</a> 
+<br> 
+<IF {MEMBERRANKIMAGE}><img src="{MEMBERRANKIMAGE}" alt="{MEMBERRANK}"><br></IF>
+{MEMBERRANK}
+<br>
+<IF {MEMBERSHOWAVATAR}> <img src="{MEMBERAVATARURL}" alt="avatar"> <br> </IF>
+
+<br><span class="labels">Group:</span> {MEMBERGROUPTITLE}
+<br><span class="labels">Joined:</span> {MEMBERREGDATE}
+<IF {MEMBERLOCATION}><br><span class="labels">Location:</span> {MEMBERLOCATION}</IF>
+<br>
+
+<IF {THISMEMBERISREGISTERED}>
+<br><span class="labels">Links:</span> <a href="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERLINKS}</a>
+<br><span class="labels">Comments:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERCOMMENTS}</a>
+<ELSE>
+<br><span class="labels">Links:</span> {MEMBERLINKS}
+<br><span class="labels">Comments:</span> {MEMBERCOMMENTS}
+</IF>
+
+</IF>
+
+<IF {SWITCH_REPORTS} and {THISMEMBERGROUPCANREPORT}><br><br><a href="reportcomment.php?id={COMMENTID}"><img src="{TEMPLATESDIR}/images/report.gif" border="0" alt="report bad comment"></a></IF>
+
+<IF {SWITCH_RATINGS} and {THISMEMBERGROUPCANRATECOMMENTS}>
+<br><br>Rate this comment: <a href="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}&amp;votevalue=plus&amp;voteplus=1">
+<img src="{TEMPLATESDIR}/images/plus.gif" border="0" alt="rate comment up"></a> <a href="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}&amp;votevalue=minus&amp;voteminus=1">
+<img src="{TEMPLATESDIR}/images/minus.gif" border="0" alt="rate comment down"></a>
+</IF>
+
+<IF {THISMEMBERGROUPCANVIEWIP}><br><br>IP: {COMMENTIP}</IF>
+
+</td>
+
+<td width="80%" class="post" valign="top" height="100%">
+<table width="100%">
+<tr valign="top">
+<td align="left"><span class="postdate">
+<IF {COMMENTVOTES} is greater than 0>{COMMENTAPPROVED} of {COMMENTVOTES} people found this comment helpful <br></IF>
+Posted {COMMENTDATE}:</span> <IF {COMMENTCANEDIT}><a href="edit.php?action=comment&amp;field=id&amp;condition=equals&amp;fieldvalue={COMMENTID}"><img src="{TEMPLATESDIR}/images/editpost.gif" border="0" alt="edit"></a></IF> 
+<IF {COMMENTTITLE}><br>Subject: <span class="important">{COMMENTTITLE}</span></IF>
+</td>
+<td align="right"><a href="postreply.php?id={LINKID}&amp;quotepost={COMMENTID}#postarea"><img src="{TEMPLATESDIR}/images/quote.gif" border="0" alt="quote comment"></a> <br>#{COMMENTNUMBER}</td>
+  </tr>
+  <tr valign="middle">
+   <td height="100%" valign="top">{COMMENTMESSAGE}
+   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
+   </td>
+  </tr>
+  <tr valign="bottom">
+   <td valign="bottom">
+<IF {COMMENTNUMATTACHMENTS}>
+<br>Attached Files:<br>
+<!-- BEGIN ATTACHMENTS -->
+<a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
+<IF {ATTACHISIMAGE}>
+<a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}"><img src="thumbnail.php?comid={COMMENTID}&amp;attachid={ATTACHID}" border="0" alt="attachment"></a><br>
+</IF>
+<!-- END ATTACHMENTS -->
+</IF>
+  <IF {COMMENTSHOWSIG}>
+     <br>_____________________
+     <br>{MEMBERSIGNATURE}
+  </IF>
+   </td>
+  </tr>
+</table>
+</td> 
+</tr>
+</table>
diff -U 3 -H -d -r -N -- 400/templates/default/onlineusers.tpl wsnlinks/templates/default/onlineusers.tpl
--- 400/templates/default/onlineusers.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/onlineusers.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,38 +1,38 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Online Users </div>
-<br>
-
-<p>Most ever online: {MAXMEMBERSONLINE} members on {MAXMEMBERSONLINEDATE} ({MAXTOTALONLINE} total members and guests, on {MAXTOTALONLINEDATE})</p>
-
-<p>There are currently {TOTALMEMBERSONLINE} members and {TOTALGUESTSONLINE} guests online:</p>
-<table width="100%">
-<tr>
- <td {COLUMNHEADER}>Name</td>
- <td {COLUMNHEADER}>Location</td>
- <td {COLUMNHEADER}>Last Seen</td>
- <IF {THISMEMBERGROUPCANVIEWIP}><td {COLUMNHEADER}>IP and User Agent</td></IF>
-</tr>
-<!-- BEGIN TOPLIST 5 -->
-<CONFIG>online,memberid;time,30,descending;descending</CONFIG>
-<tr>
-<IF {ONLINEMEMBERID}>
- <td class="oddcolumns">{ONLINEREADYTOCHATICON} <a href="memberlist.php?action=profile&amp;id={ONLINEMEMBERID}" class="{ONLINEGROUPNAMESTYLE}">{ONLINENAME}</a>{ONLINEINVISMARKER}</td>
- <td class="evencolumns"><a href="{ONLINELOCATION}">{ONLINEAREANAME}</a>
-<IF {ONLINETHREADID} and {ONLINECATID}><br>(In <a href="index.php?action=displaycat&amp;catid={CATID}">{CATNAME}</a>)</IF>
-</td>
- <td class="oddcolumns">{ONLINEDATE}</td>
- <IF {THISMEMBERGROUPCANVIEWIP}><td class="evencolumns">{ONLINEIP} <br> {ONLINEBROWSER}</td></IF>
-<ELSE>
- <td class="oddcolumns">Guest</td>
- <td class="evencolumns"><a href="{ONLINELOCATION}">{ONLINEAREANAME}</a>
-<IF {ONLINETHREADID} and {ONLINECATID}><br>(In <a href="index.php?action=displaycat&amp;catid={CATID}">{CATNAME}</a>)</IF>
-</td>
- <td class="oddcolumns">{ONLINEDATE}</td>
- <IF {THISMEMBERGROUPCANVIEWIP}><td class="evencolumns">{ONLINEIP} <br> {ONLINEBROWSER}</td></IF>
-</IF>
-</tr>
-<!-- END TOPLIST 5 -->
-</table>
-
-<IF {TOPLIST5MULTIPAGE}>
-<p>Page: {TOPLIST5PREVIOUS} <b>{TOPLIST5CURRENTPAGE}</b> {TOPLIST5NEXT}</p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Online Users </div>
+<br>
+
+<p>Most ever online: {MAXMEMBERSONLINE} members on {MAXMEMBERSONLINEDATE} ({MAXTOTALONLINE} total members and guests, on {MAXTOTALONLINEDATE})</p>
+
+<p>There are currently {TOTALMEMBERSONLINE} members and {TOTALGUESTSONLINE} guests online:</p>
+<table width="100%">
+<tr>
+ <td {COLUMNHEADER}>Name</td>
+ <td {COLUMNHEADER}>Location</td>
+ <td {COLUMNHEADER}>Last Seen</td>
+ <IF {THISMEMBERGROUPCANVIEWIP}><td {COLUMNHEADER}>IP and User Agent</td></IF>
+</tr>
+<!-- BEGIN TOPLIST 5 -->
+<CONFIG>online,memberid;time,30,descending;descending</CONFIG>
+<tr>
+<IF {ONLINEMEMBERID}>
+ <td class="oddcolumns">{ONLINEREADYTOCHATICON} <a href="memberlist.php?action=profile&amp;id={ONLINEMEMBERID}" class="{ONLINEGROUPNAMESTYLE}">{ONLINENAME}</a>{ONLINEINVISMARKER}</td>
+ <td class="evencolumns"><a href="{ONLINELOCATION}">{ONLINEAREANAME}</a>
+<IF {ONLINETHREADID} and {ONLINECATID}><br>(In <a href="{CATURL}">{CATNAME}</a>)</IF>
+</td>
+ <td class="oddcolumns">{ONLINEDATE}</td>
+ <IF {THISMEMBERGROUPCANVIEWIP}><td class="evencolumns">{ONLINEIP} <br> {ONLINEBROWSER}</td></IF>
+<ELSE>
+ <td class="oddcolumns">Guest</td>
+ <td class="evencolumns"><a href="{ONLINELOCATION}">{ONLINEAREANAME}</a>
+<IF {ONLINETHREADID} and {ONLINECATID}><br>(In <a href="index.php?action=displaycat&amp;catid={CATID}">{CATNAME}</a>)</IF>
+</td>
+ <td class="oddcolumns">{ONLINEDATE}</td>
+ <IF {THISMEMBERGROUPCANVIEWIP}><td class="evencolumns">{ONLINEIP} <br> {ONLINEBROWSER}</td></IF>
+</IF>
+</tr>
+<!-- END TOPLIST 5 -->
+</table>
+
+<IF {TOPLIST5MULTIPAGE}>
+<p>Page: {TOPLIST5PREVIOUS} <b>{TOPLIST5CURRENTPAGE}</b> {TOPLIST5NEXT}</p>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/pmdrafts.tpl wsnlinks/templates/default/pmdrafts.tpl
--- 400/templates/default/pmdrafts.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/pmdrafts.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,36 +1,36 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="privatemessaging.php">{LANG_TITLE_PM}</a> > {FOLDERNAME}</div><br>
-
-<form action="privatemessaging.php">
-<select name="folder">{FOLDEROPTIONS}</select>
-<input type="submit" value="Go" class="button">
-</form>
-
-<IF {FOLDERTOTAL}>
-<form action="privatemessaging.php?filled=1&amp;folder={FOLDER}" method="post">
-<table width="100%">
-<tr>
- <td {COLUMNHEADER}>&nbsp;</td>
- <td {COLUMNHEADER}>Sending To</td>
- <td {COLUMNHEADER}>Subject</td>
- <td {COLUMNHEADER}>Preview</td>
-</tr>
-<!-- BEGIN PMS -->
-<tr>
- <td class="oddcolumns"><input type="checkbox" name="selectedpms[]" value="{PMID}"></td>
- <td class="evencolumns"><IF {PMTOID}><a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a></IF></td>
- <td class="oddcolumns"><a href="privatemessaging.php?action=send&amp;draftid={PMID}">{PMSUBJECT}</a></td>
- <td class="evencolumns"><a href="privatemessaging.php?action=send&amp;draftid={PMID}">{PMMESSAGE[50 <,> remove]}</a></td>
-</tr>
-<!-- END PMS -->
-</table>
-
-<IF {MULTIPAGE}>
-Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
-</IF>
-
-<p>With selected, <select name="action"><option value="delete">delete</option></select> <input type="submit" value="Go" class="button"></p>
-</form>
-
-<OTHERWISE>
-<p>You don't currently have any saved drafts.</p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="privatemessaging.php">{LANG_TITLE_PM}</a> > {FOLDERNAME}</div><br>
+
+<form action="privatemessaging.php">
+<select name="folder">{FOLDEROPTIONS}</select>
+<input type="submit" value="Go" class="button">
+</form>
+
+<IF {FOLDERTOTAL}>
+<form action="privatemessaging.php?filled=1&amp;folder={FOLDER}" method="post">
+<table width="100%">
+<tr>
+ <td {COLUMNHEADER}>&nbsp;</td>
+ <td {COLUMNHEADER}>Sending To</td>
+ <td {COLUMNHEADER}>Subject</td>
+ <td {COLUMNHEADER}>Preview</td>
+</tr>
+<!-- BEGIN PMS -->
+<tr>
+ <td class="oddcolumns"><input type="checkbox" name="selectedpms[]" value="{PMID}"></td>
+ <td class="evencolumns"><IF {PMTOID}><a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a></IF></td>
+ <td class="oddcolumns"><a href="privatemessaging.php?action=send&amp;draftid={PMID}">{PMSUBJECT}</a></td>
+ <td class="evencolumns"><a href="privatemessaging.php?action=send&amp;draftid={PMID}">{PMMESSAGE[50 <,> remove]}</a></td>
+</tr>
+<!-- END PMS -->
+</table>
+
+<IF {MULTIPAGE}>
+Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
+</IF>
+
+<p>With selected, <select name="action"><option value="delete">delete</option></select> <input type="submit" value="Go" class="button"></p>
+</form>
+
+<OTHERWISE>
+<p>You don't currently have any saved drafts.</p>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/pmedit.tpl wsnlinks/templates/default/pmedit.tpl
--- 400/templates/default/pmedit.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/pmedit.tpl	2006-09-18 14:29:02.000000000 -0700
@@ -4,7 +4,7 @@
 //-->
 </script>
 
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="privatemessaging.php">{LANG_TITLE_PM}</a> > {LANG_TITLE_SENDPM}</div><br>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="privatemessaging.php">{LANG_TITLE_PM}</a> > {LANG_TITLE_SENDPM}</div><br>
 
 <IF {PREVIEWING}>
 <div class="post">{PREVIEW}</div>
@@ -14,7 +14,8 @@
 
 <form <IF {THISMEMBERPOSTEDITOR} is WYSIWYG>onsubmit="return submitForm();"</IF> name="pmform" enctype="multipart/form-data" action="privatemessaging.php?filled=1&amp;action=edit" method="post">
 <input type="hidden" name="id" value="{PMID}">
-<table {STANDARDTABLE}>
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Edit Private Message</td></tr>
 <tr>
  <td class="labelscolumn"><span class="labels">Send to:</span></td>
  <td class="optionscolumn"><input type="text" name="sendto" value="{PMSENDTO}" size="{STANDARDSIZE}"></td>
diff -U 3 -H -d -r -N -- 400/templates/default/pmlist.tpl wsnlinks/templates/default/pmlist.tpl
--- 400/templates/default/pmlist.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/pmlist.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,72 +1,72 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="privatemessaging.php">{LANG_TITLE_PM}</a> > {FOLDERNAME}</div><br>
-
-<p><a href="privatemessaging.php?action=send"><img src="{TEMPLATESDIR}/images/pmsend.gif" border="0" alt="Send PM"></a></p>
-
-<form action="privatemessaging.php">
-<select name="folder">{FOLDEROPTIONS}</select>
-<input type="submit" value="Go" class="button">
-</form>
-
-<IF {INCUSTOMFOLDER}><p><a href="privatemessaging.php?filled=1&amp;action=deletefolder&amp;foldername={FOLDER}">Delete this folder</a></p></IF>
-
-<IF {FOLDERTOTAL}>
-<form action="privatemessaging.php?filled=1&amp;folder={FOLDER}" method="post">
-<table width="100%">
-<tr>
- <td width="3%" {COLUMNHEADER}>&nbsp;</td>
- <td width="3%" {COLUMNHEADER}>&nbsp;</td>
- <td {COLUMNHEADER}>Subject</td>
- <td {COLUMNHEADER}>Preview</td>
- <td {COLUMNHEADER}>Date</td>
- <td {COLUMNHEADER}>From</td>
-</tr>
-<!-- BEGIN PMS -->
-<tr>
- <td class="oddcolumns"><input type="checkbox" name="selectedpms[]" value="{PMID}"></td>
- <td class="evencolumns">
-<IF {PMTIMEREAD}>
- <IF {PMREPLIED}><img src="{TEMPLATESDIR}/images/pmreplied.gif" alt="replied"><ELSE><img src="{TEMPLATESDIR}/images/pmread.gif" alt="read"></IF>
-<ELSE>
- <img src="{TEMPLATESDIR}/images/pmunread.gif" alt="unread">
-</IF>
-</td>
- <td class="oddcolumns"><IF {PMFLAG}><img src="{TEMPLATESDIR}/images/flag.gif" alt="flagged">  </IF>
-<a href="privatemessaging.php?action=view&amp;id={PMID}">{PMSUBJECT}</a></td>
- <td class="evencolumns"><a href="privatemessaging.php?action=view&amp;id={PMID}">{PMMESSAGE[50 <,> remove]}</a></td>
- <td class="oddcolumns">{PMDATE}</td>
- <td class="evencolumns"><a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a></td>
-</tr>
-<!-- END PMS -->
-</table>
-
-<IF {MULTIPAGE}>
-Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
-</IF>
-
-<p>With selected, 
-<select name="action">
-<option value="delete">delete</option>
-<option value="flag">flag/unflag</option>
-<option value="move">move to folder...</option>
-</select> <input type="submit" value="Go" class="button"></p>
-</form>
-
-<p><a href="privatemessaging.php?filled=1&amp;action=download&amp;folder={FOLDER}">Download all PMs from this folder</a></p>
-
-<form action="privatemessaging.php?folder={FOLDER}" method="post">
-<center>Narrow to PMs containing <input type="text" name="searchterm" size="15"> <input type="submit" value="Search" class="button"></center>
-</form>
-
-<form action="privatemessaging.php?filled=1&amp;action=createfolder" method="post">
-<p>Create a new folder named <input type="text" name="foldername" size="15"> <input type="submit" value="Create" class="button">
-</form>
-
-<OTHERWISE>
-<p>You don't currently have any private messages in this folder.</p>
-</IF>
-
-<div class="legend">
-<img src="{TEMPLATESDIR}/images/pmunread.gif" alt="unread"> Unread PM <br>
-<img src="{TEMPLATESDIR}/images/pmread.gif" alt="read"> Read PM <br>
-<img src="{TEMPLATESDIR}/images/pmreplied.gif" alt="replied"> Replied to PM <br>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="privatemessaging.php">{LANG_TITLE_PM}</a> > {FOLDERNAME}</div><br>
+
+<p><a href="privatemessaging.php?action=send"><img src="{TEMPLATESDIR}/images/pmsend.gif" border="0" alt="Send PM"></a></p>
+
+<form action="privatemessaging.php">
+<select name="folder">{FOLDEROPTIONS}</select>
+<input type="submit" value="Go" class="button">
+</form>
+
+<IF {INCUSTOMFOLDER}><p><a href="privatemessaging.php?filled=1&amp;action=deletefolder&amp;foldername={FOLDER}">Delete this folder</a></p></IF>
+
+<IF {FOLDERTOTAL}>
+<form action="privatemessaging.php?filled=1&amp;folder={FOLDER}" method="post">
+<table width="100%">
+<tr>
+ <td width="3%" {COLUMNHEADER}>&nbsp;</td>
+ <td width="3%" {COLUMNHEADER}>&nbsp;</td>
+ <td {COLUMNHEADER}>Subject</td>
+ <td {COLUMNHEADER}>Preview</td>
+ <td {COLUMNHEADER}>Date</td>
+ <td {COLUMNHEADER}>From</td>
+</tr>
+<!-- BEGIN PMS -->
+<tr>
+ <td class="oddcolumns"><input type="checkbox" name="selectedpms[]" value="{PMID}"></td>
+ <td class="evencolumns">
+<IF {PMTIMEREAD}>
+ <IF {PMREPLIED}><img src="{TEMPLATESDIR}/images/pmreplied.gif" alt="replied"><ELSE><img src="{TEMPLATESDIR}/images/pmread.gif" alt="read"></IF>
+<ELSE>
+ <img src="{TEMPLATESDIR}/images/pmunread.gif" alt="unread">
+</IF>
+</td>
+ <td class="oddcolumns"><IF {PMFLAG}><img src="{TEMPLATESDIR}/images/flag.gif" alt="flagged">  </IF>
+<a href="privatemessaging.php?action=view&amp;id={PMID}">{PMSUBJECT}</a></td>
+ <td class="evencolumns"><a href="privatemessaging.php?action=view&amp;id={PMID}">{PMMESSAGE[50 <,> remove]}</a></td>
+ <td class="oddcolumns">{PMDATE}</td>
+ <td class="evencolumns"><a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a></td>
+</tr>
+<!-- END PMS -->
+</table>
+
+<IF {MULTIPAGE}>
+Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
+</IF>
+
+<p>With selected, 
+<select name="action">
+<option value="delete">delete</option>
+<option value="flag">flag/unflag</option>
+<option value="move">move to folder...</option>
+</select> <input type="submit" value="Go" class="button"></p>
+</form>
+
+<p><a href="privatemessaging.php?filled=1&amp;action=download&amp;folder={FOLDER}">Download all PMs from this folder</a></p>
+
+<form action="privatemessaging.php?folder={FOLDER}" method="post">
+<center>Narrow to PMs containing <input type="text" name="searchterm" size="15"> <input type="submit" value="Search" class="button"></center>
+</form>
+
+<form action="privatemessaging.php?filled=1&amp;action=createfolder" method="post">
+<p>Create a new folder named <input type="text" name="foldername" size="15"> <input type="submit" value="Create" class="button">
+</form>
+
+<OTHERWISE>
+<p>You don't currently have any private messages in this folder.</p>
+</IF>
+
+<div class="legend">
+<img src="{TEMPLATESDIR}/images/pmunread.gif" alt="unread"> Unread PM <br>
+<img src="{TEMPLATESDIR}/images/pmread.gif" alt="read"> Read PM <br>
+<img src="{TEMPLATESDIR}/images/pmreplied.gif" alt="replied"> Replied to PM <br>
 </div>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/pmsend.tpl wsnlinks/templates/default/pmsend.tpl
--- 400/templates/default/pmsend.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/pmsend.tpl	2006-09-18 16:14:16.000000000 -0700
@@ -4,7 +4,7 @@
 //-->
 </script>
 
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="privatemessaging.php">{LANG_TITLE_PM}</a> > {LANG_TITLE_SENDPM}</div><br>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="privatemessaging.php">{LANG_TITLE_PM}</a> > {LANG_TITLE_SENDPM}</div><br>
 
 <IF {PREVIEWING}>
 <div class="comment">{PREVIEW}</div>
@@ -14,7 +14,8 @@
 
 <form <IF {THISMEMBERPOSTEDITOR} is WYSIWYG>onsubmit="return submitForm();"</IF> name="pmform" enctype="multipart/form-data" action="privatemessaging.php?filled=1&amp;action=send" method="post">
 <input type="hidden" name="quotepm" value="{QUOTEPM}">
-<table {STANDARDTABLE}>
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Compose Private Message</td></tr>
 <tr>
  <td class="labelscolumn"><span class="labels">Send to:</span></td>
  <td class="optionscolumn"><input type="text" name="sendto" value="{PMSENDTO}" size="{STANDARDSIZE}"></td>
diff -U 3 -H -d -r -N -- 400/templates/default/pmsentitems.tpl wsnlinks/templates/default/pmsentitems.tpl
--- 400/templates/default/pmsentitems.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/pmsentitems.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,47 +1,47 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="privatemessaging.php">{LANG_TITLE_PM}</a> > {FOLDERNAME}</div><br>
-
-<form action="privatemessaging.php">
-<select name="folder">{FOLDEROPTIONS}</select>
-<input type="submit" value="Go" class="button">
-</form>
-
-<IF {FOLDERTOTAL}>
-<form action="privatemessaging.php?filled=1&amp;sentitems=1&amp;folder=sent" method="post">
-<table width="100%">
-<tr>
- <td {COLUMNHEADER}>&nbsp;</td>
- <td {COLUMNHEADER}>&nbsp;</td>
- <td {COLUMNHEADER}>Sent To</td>
- <td {COLUMNHEADER}>Subject</td>
- <td {COLUMNHEADER}>Preview</td>
- <td {COLUMNHEADER}>Date Sent</td>
- <td {COLUMNHEADER}>Date Read</td>
-</tr>
-<!-- BEGIN PMS -->
-<tr>
-  <td class="oddcolumns"><input type="checkbox" name="selectedpms[]" value="{PMID}"></td>
-  <td class="oddcolumns"><IF {PMTIMEREAD}><img src="{TEMPLATESDIR}/images/pmread.gif"><ELSE><img src="{TEMPLATESDIR}/images/pmunread.gif"></IF></td>
- <td class="evencolumns"><a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a></td>
-<IF {PMTIMEREAD}>
- <td class="oddcolumns"><a href="privatemessaging.php?action=view&amp;id={PMID}">{PMSUBJECT}</a></td>
- <td class="evencolumns"><a href="privatemessaging.php?action=view&amp;id={PMID}">{PMMESSAGE[50 <,> remove]}</a></td>
-<ELSE>
- <td class="oddcolumns"><a href="privatemessaging.php?action=edit&amp;id={PMID}">{PMSUBJECT}</a></td>
- <td class="evencolumns"><a href="privatemessaging.php?action=edit&amp;id={PMID}">{PMMESSAGE[50 <,> remove]}</a></td>
-</IF>
- <td class="oddcolumns">{PMDATE}</td>
- <td class="evencolumns"><IF {PMTIMEREAD}>{PMDATEREAD} <ELSE> unread</IF></td>
-</tr>
-<!-- END PMS -->
-</table>
-
-<IF {MULTIPAGE}>
-Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
-</IF>
-
-<p><input type="submit" name="deletesent" value="Delete Selected" class="button"></p>
-</form>
-
-<OTHERWISE>
-<p>You don't currently have any private messages in this folder.</p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="privatemessaging.php">{LANG_TITLE_PM}</a> > {FOLDERNAME}</div><br>
+
+<form action="privatemessaging.php">
+<select name="folder">{FOLDEROPTIONS}</select>
+<input type="submit" value="Go" class="button">
+</form>
+
+<IF {FOLDERTOTAL}>
+<form action="privatemessaging.php?filled=1&amp;sentitems=1&amp;folder=sent" method="post">
+<table width="100%">
+<tr>
+ <td {COLUMNHEADER}>&nbsp;</td>
+ <td {COLUMNHEADER}>&nbsp;</td>
+ <td {COLUMNHEADER}>Sent To</td>
+ <td {COLUMNHEADER}>Subject</td>
+ <td {COLUMNHEADER}>Preview</td>
+ <td {COLUMNHEADER}>Date Sent</td>
+ <td {COLUMNHEADER}>Date Read</td>
+</tr>
+<!-- BEGIN PMS -->
+<tr>
+  <td class="oddcolumns"><input type="checkbox" name="selectedpms[]" value="{PMID}"></td>
+  <td class="oddcolumns"><IF {PMTIMEREAD}><img src="{TEMPLATESDIR}/images/pmread.gif"><ELSE><img src="{TEMPLATESDIR}/images/pmunread.gif"></IF></td>
+ <td class="evencolumns"><a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a></td>
+<IF {PMTIMEREAD}>
+ <td class="oddcolumns"><a href="privatemessaging.php?action=view&amp;id={PMID}">{PMSUBJECT}</a></td>
+ <td class="evencolumns"><a href="privatemessaging.php?action=view&amp;id={PMID}">{PMMESSAGE[50 <,> remove]}</a></td>
+<ELSE>
+ <td class="oddcolumns"><a href="privatemessaging.php?action=edit&amp;id={PMID}">{PMSUBJECT}</a></td>
+ <td class="evencolumns"><a href="privatemessaging.php?action=edit&amp;id={PMID}">{PMMESSAGE[50 <,> remove]}</a></td>
+</IF>
+ <td class="oddcolumns">{PMDATE}</td>
+ <td class="evencolumns"><IF {PMTIMEREAD}>{PMDATEREAD} <ELSE> unread</IF></td>
+</tr>
+<!-- END PMS -->
+</table>
+
+<IF {MULTIPAGE}>
+Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
+</IF>
+
+<p><input type="submit" name="deletesent" value="Delete Selected" class="button"></p>
+</form>
+
+<OTHERWISE>
+<p>You don't currently have any private messages in this folder.</p>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/pmview.tpl wsnlinks/templates/default/pmview.tpl
--- 400/templates/default/pmview.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/pmview.tpl	2006-09-18 14:54:51.000000000 -0700
@@ -1,4 +1,4 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="privatemessaging.php">{LANG_TITLE_PM}</a> > {PMSUBJECT}</div><br>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="privatemessaging.php">{LANG_TITLE_PM}</a> > {PMSUBJECT}</div><br>
 
 <p><a href="privatemessaging.php?action=view&amp;id={PMID}&amp;historywith={MEMBERID}">Show Conversation History</a></p>
 
@@ -7,7 +7,7 @@
 <!-- BEGIN PM -->
 <table width="100%">
 <tr>
-<td width="20%" class="postauthor" valign="top">
+<td width="20%" class="commentposter" valign="top">
 <a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</a> 
 <br> 
 <IF {MEMBERRANKIMAGE}><img src="{MEMBERRANKIMAGE}" alt="{MEMBERRANK}"><br></IF>
@@ -23,10 +23,10 @@
 <br><span class="labels">Comments:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERCOMMENTS}</a>
 </td>
 
-<td width="80%" class="post" valign="top" height="100%">
+<td width="80%" class="comment" valign="top" height="100%">
 <table width="100%" height="100%">
 <tr valign="top">
- <td><span class="postdate">Sent: {PMDATE}</span></td>
+ <td><span class="commentdate">Sent: {PMDATE}</span></td>
 </tr>
   <tr valign="middle">
    <td height="100%" valign="top">{PMMESSAGE}
diff -U 3 -H -d -r -N -- 400/templates/default/postreply.tpl wsnlinks/templates/default/postreply.tpl
--- 400/templates/default/postreply.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/postreply.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,132 +1,132 @@
-<script language="JavaScript">
-<!--
-function update(msg) {document.commentform.message.value += msg;}
-//-->
-</script>
-
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="comments.php?id={LINKID}">{LINKTITLE}</a> > Post Reply</div><br>
-
-<IF {PREVIEWING}>
-<div class="comment">{PREVIEW}</div>
-</IF>
-
-<form <IF {THISMEMBERPOSTEDITOR} is WYSIWYG>onsubmit="return submitForm();"</IF> enctype="multipart/form-data" name="commentform" action="postreply.php?filled=1&amp;id={LINKID}" method="post">
-
-<span class="important">{INCOMPLETE}</span>
-
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Post Reply</td></tr>
-<IF {THISMEMBERUSERGROUP} is 1>
-<tr>
- <td class="labelscolumn"><span class="labels">Your Name:</span></td>
- <td class="optionscolumn"><input type="text" name="postername" value="{COMMENTPOSTERNAME}" size="{STANDARDSIZE}"></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Comment Title:</span></td>
- <td class="optionscolumn"><input type="text" name="title" value="{COMMENTTITLE}" size="{STANDARDSIZE}"></td>
-</tr>
-<IF {SWITCH_POSTTYPES}>
-<tr>
- <td class="labelscolumn"><span class="labels">Comment Type:</span></td>
- <td class="optionscolumn"><select name="type">{COMMENTTYPEOPTIONS}</select></td>
-</tr>
-</IF>
-
-<!-- INSERT NEW FIELDS HERE -->
-
-<tr>
- <td class="labelscolumn"><span class="labels">Your comment:</span>
-<br><br>
-<center>
-<IF {SWITCH_SMILIES}>
-<div class="smiliebox">
-<!-- BEGIN SMILIES -->
-<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
-<!-- END SMILIES -->
-</div>
-</IF>
-</center>
-<IF {SWITCH_WSNCODES}>
-<br><IF {THISMEMBERPOSTEDITOR} is WYSIWYG>Drag a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.<ELSE>Click a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.</IF> You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400,scrollbars=yes');">WSN Codes</a> in your message.
-</IF>
-<br>
-<IF {SWITCH_WSNCODES} and {SWITCH_WYSI}>
-<p align="center">
-<IF {THISMEMBERPOSTEDITOR} is WYSIWYG><input type="submit" name="switcheditor" value="Switch to plain editor" class="button"></IF>
-<IF {THISMEMBERPOSTEDITOR} is plain><input type="submit" name="switcheditor" value="Switch to WYSIWYG editor" class="button"></IF>
-</p>
-</IF>
-</td>
-
- <td class="optionscolumn">
-<IF {THISMEMBERPOSTEDITOR} is WYSIWYG>
-<script language="JavaScript" type="text/javascript" src="{TEMPLATESDIR}/richtext.js"></script>
-<script language="JavaScript" type="text/javascript">
-function submitForm() {	updateRTEs(); return true; }
-initRTE("{TEMPLATESDIR}/images/posteditor/", "{TEMPLATESDIR}/", "{DIRURL}/templates/styles/{STYLESHEET}.css");
-</script>
-<script language="JavaScript" type="text/javascript">
-writeRichText('message', '{COMMENTMESSAGEWYSIWYG}', 400, 200, true, false);
-</script>
-<OTHERWISE>
-<textarea name="message" rows="15" cols="80">{COMMENTMESSAGE}</textarea>
-</IF>
- </td>
-</tr>
-<IF {THISMEMBERGROUPCANUPLOAD}>
-<tr>
- <td class="labelscolumn" width="20%"><span class="labels">Attach Files:</span></td>
- <td class="optionscolumn" width="80%">
-<IF {COMMENTNUMATTACHMENTS} is less than {THISMEMBERGROUPATTACHPERPOST}><input type="file" name="filefield"> <input type="submit" name="uploadattachment" value="Attach" class="button"></IF>
-
-<IF {COMMENTNUMATTACHMENTS}>
-<br>Current Attachments:<br>
-<!-- BEGIN ATTACHMENTS -->
-<input type="checkbox" name="attachdelete[]" value="{ATTACHID}"> {ATTACHFILETITLE} ({ATTACHKB} KB)<br>
-<!-- END ATTACHMENTS -->
-<input type="submit" name="attachdeletion" value="Delete Selected" class="button">
-</IF>
-</td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Options:</span></td>
- <td class="optionscolumn">
-<IF {SWITCH_SMILIES}><input type="checkbox" name="disablesmilies" value="1" {COMMENTCHECKED[disablesmilies]}> Disable smilies? <br> </IF>
-<input type="checkbox" name="disablesig" value="1" {COMMENTCHECKED[disablesig]}> Disable signature? <br>
-<IF {THISMEMBERGROUPCANUSEHTML}><input type="checkbox" name="disablehtml" value="1" {POSTCHECKED[disablehtml]}> Disable HTML? <br></IF>
-<IF {SWITCH_WSNCODES}><input type="checkbox" name="disablewsn" value="1" {POSTCHECKED[disablewsn]}> Disable WSN Codes? </IF>
-</td>
-</tr>
-<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
-<tr>
- <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
-<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
- <td class="optionscolumn"><img src="securityimage.php" class="bullet" alt="security image"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<input type="hidden" name="linkid" value="{LINKID}">
-<input type="submit" value="Submit Comment" class="button"> <input type="submit" name="preview" value="Preview" class="button">
-</form>
-
-<IF {TOPLISTTOTAL1}>
-<div class="posthistory">
-<table width="100%">
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Post History (last {POSTHISTORY} comments)</td></tr>
-<!-- BEGIN TOPLIST 1 -->
-<CONFIG>posts,time,{POSTHISTORY},descending,linkid={LINKID}</CONFIG>
-<tr>
-<td width="20%" valign="top" class="historyposter">
-<span class="mediumtitle">{COMMENTPOSTERNAME}</span>
-</td>
-<td width="80%" valign="top" height="100%" class="historypost">
-<span class="postdate">Posted {COMMENTDATE}:</span> <br><br>
-{COMMENTMESSAGE[ <,> docodes]}
-</td> 
-</tr>
-<!-- END TOPLIST 1 -->
-</table>
-</div>
+<script language="JavaScript">
+<!--
+function update(msg) {document.commentform.message.value += msg;}
+//-->
+</script>
+
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="comments.php?id={LINKID}">{LINKTITLE}</a> > Post Reply</div><br>
+
+<IF {PREVIEWING}>
+<div class="comment">{PREVIEW}</div>
+</IF>
+
+<form <IF {THISMEMBERPOSTEDITOR} is WYSIWYG>onsubmit="return submitForm();"</IF> enctype="multipart/form-data" name="commentform" action="postreply.php?filled=1&amp;id={LINKID}" method="post">
+
+<span class="important">{INCOMPLETE}</span>
+
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Post Reply</td></tr>
+<IF {THISMEMBERUSERGROUP} is 1>
+<tr>
+ <td class="labelscolumn"><span class="labels">Your Name:</span></td>
+ <td class="optionscolumn"><input type="text" name="postername" value="{COMMENTPOSTERNAME}" size="{STANDARDSIZE}"></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">Comment Title:</span></td>
+ <td class="optionscolumn"><input type="text" name="title" value="{COMMENTTITLE}" size="{STANDARDSIZE}"></td>
+</tr>
+<IF {SWITCH_POSTTYPES}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Comment Type:</span></td>
+ <td class="optionscolumn"><select name="type">{COMMENTTYPEOPTIONS}</select></td>
+</tr>
+</IF>
+
+<!-- INSERT NEW FIELDS HERE -->
+
+<tr>
+ <td class="labelscolumn"><span class="labels">Your comment:</span>
+<br><br>
+<center>
+<IF {SWITCH_SMILIES}>
+<div class="smiliebox">
+<!-- BEGIN SMILIES -->
+<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
+<!-- END SMILIES -->
+</div>
+</IF>
+</center>
+<IF {SWITCH_WSNCODES}>
+<br><IF {THISMEMBERPOSTEDITOR} is WYSIWYG>Drag a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.<ELSE>Click a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.</IF> You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400,scrollbars=yes');">WSN Codes</a> in your message.
+</IF>
+<br>
+<IF {SWITCH_WSNCODES} and {SWITCH_WYSI}>
+<p align="center">
+<IF {THISMEMBERPOSTEDITOR} is WYSIWYG><input type="submit" name="switcheditor" value="Switch to plain editor" class="button"></IF>
+<IF {THISMEMBERPOSTEDITOR} is plain><input type="submit" name="switcheditor" value="Switch to WYSIWYG editor" class="button"></IF>
+</p>
+</IF>
+</td>
+
+ <td class="optionscolumn">
+<IF {THISMEMBERPOSTEDITOR} is WYSIWYG>
+<script language="JavaScript" type="text/javascript" src="{TEMPLATESDIR}/richtext.js"></script>
+<script language="JavaScript" type="text/javascript">
+function submitForm() {	updateRTEs(); return true; }
+initRTE("{TEMPLATESDIR}/images/posteditor/", "{TEMPLATESDIR}/", "{DIRURL}/templates/styles/{STYLESHEET}.css");
+</script>
+<script language="JavaScript" type="text/javascript">
+writeRichText('message', '{COMMENTMESSAGEWYSIWYG}', 400, 200, true, false);
+</script>
+<OTHERWISE>
+<textarea name="message" rows="15" cols="80">{COMMENTMESSAGE}</textarea>
+</IF>
+ </td>
+</tr>
+<IF {THISMEMBERGROUPCANUPLOAD}>
+<tr>
+ <td class="labelscolumn" width="20%"><span class="labels">Attach Files:</span></td>
+ <td class="optionscolumn" width="80%">
+<IF {COMMENTNUMATTACHMENTS} is less than {THISMEMBERGROUPATTACHPERPOST}><input type="file" name="filefield"> <input type="submit" name="uploadattachment" value="Attach" class="button"></IF>
+
+<IF {COMMENTNUMATTACHMENTS}>
+<br>Current Attachments:<br>
+<!-- BEGIN ATTACHMENTS -->
+<input type="checkbox" name="attachdelete[]" value="{ATTACHID}"> {ATTACHFILETITLE} ({ATTACHKB} KB)<br>
+<!-- END ATTACHMENTS -->
+<input type="submit" name="attachdeletion" value="Delete Selected" class="button">
+</IF>
+</td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">Options:</span></td>
+ <td class="optionscolumn">
+<IF {SWITCH_SMILIES}><input type="checkbox" name="disablesmilies" value="1" {COMMENTCHECKED[disablesmilies]}> Disable smilies? <br> </IF>
+<input type="checkbox" name="disablesig" value="1" {COMMENTCHECKED[disablesig]}> Disable signature? <br>
+<IF {THISMEMBERGROUPCANUSEHTML}><input type="checkbox" name="disablehtml" value="1" {POSTCHECKED[disablehtml]}> Disable HTML? <br></IF>
+<IF {SWITCH_WSNCODES}><input type="checkbox" name="disablewsn" value="1" {POSTCHECKED[disablewsn]}> Disable WSN Codes? </IF>
+</td>
+</tr>
+<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
+<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
+ <td class="optionscolumn"><img src="securityimage.php" class="bullet" alt="security image"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<input type="hidden" name="linkid" value="{LINKID}">
+<input type="submit" value="Submit Comment" class="button"> <input type="submit" name="preview" value="Preview" class="button">
+</form>
+
+<IF {TOPLISTTOTAL1}>
+<div class="posthistory">
+<table width="100%">
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Post History (last {POSTHISTORY} comments)</td></tr>
+<!-- BEGIN TOPLIST 1 -->
+<CONFIG>posts,time,{POSTHISTORY},descending,linkid={LINKID}</CONFIG>
+<tr>
+<td width="20%" valign="top" class="historyposter">
+<span class="mediumtitle">{COMMENTPOSTERNAME}</span>
+</td>
+<td width="80%" valign="top" height="100%" class="historypost">
+<span class="postdate">Posted {COMMENTDATE}:</span> <br><br>
+{COMMENTMESSAGE[ <,> docodes]}
+</td> 
+</tr>
+<!-- END TOPLIST 1 -->
+</table>
+</div>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/print.tpl wsnlinks/templates/default/print.tpl
--- 400/templates/default/print.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/print.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,101 +1,101 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>{PAGETITLE}</title>
-<link rel="stylesheet" href="{TEMPLATESDIR}/printable.css" type="text/css">
-<script language="JavaScript">
-
-window.print();
-
-</script>
-</head>
-<body>
-
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {NAVIGATION} > <a href="comments.php?id={LINKID}">{LINKTITLE}</a> > Printable Version</div><br>
-
-<p><span class="title">{LINKTITLE}</span>
-<br><a href="{LINKURL}">{LINKURL}</a>
-<br>{LINKDESCRIPTION}
-</p>
-
-<p><a href="comments.php?id={LINKID}">Back to regular version</a></p>
-
-<!-- POLL TEMPLATE HERE -->
-
-<table width="100%">
-<!-- BEGIN POST -->
-<!-- BEGIN REGULAR -->
-<tr>
-<td width="20%" height="100%" class="postauthor" valign="top">
-
-<table width="100%">
-<tr valign="top"><td colspan="2">
-
-<IF {MEMBERUSERGROUP} is 1>
-<span class="{MEMBERGROUPNAMESTYLE}">{COMMENTPOSTERNAME}</span><br>
-<OTHERWISE> 
-<span class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</span></span> 
-<br> 
-<IF {MEMBERRANKIMAGE}><img src="{MEMBERRANKIMAGE}" alt="{MEMBERRANK}"><br></IF>
-{MEMBERRANK}
-<br>
-<br><span class="labels">Joined:</span> {MEMBERREGDATE}
-<br><span class="labels">Location:</span> {MEMBERLOCATION}
-<br>
-<br><span class="labels">Links:</span> {MEMBERLINKS}
-<br><span class="labels">Comments:</span> {MEMBERCOMMENTS}
-
-</IF>
-
-</td></tr>
-</table>
-
-</td>
-
-<td width="80%" class="post" valign="top" height="100%">
-<table width="100%">
-<tr valign="top">
-<td align="left"><span class="postdate">
-<IF {COMMENTVOTES} is greater than 0>{COMMENTAPPROVED} of {COMMENTVOTES} people found this comment helpful <br></IF>
-Posted {COMMENTDATE}:</span>  
-<IF {COMMENTTITLE}><br>Subject: <span class="important">{COMMENTTITLE}</span></IF>
-</td>
-<td align="right">#{COMMENTNUMBER}</td>
-  </tr>
-  <tr valign="middle">
-   <td height="100%" valign="top">{COMMENTMESSAGE}
-   <IF {COMMENTLASTEDITBY}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
-   </td>
-  </tr>
-  <tr valign="bottom" width="100%">
-   <td valign="bottom">
-<IF {COMMENTNUMATTACHMENTS}>
-<br>Attached Files:<br>
-<!-- BEGIN ATTACHMENTS -->
-<a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
-<IF {ATTACHISIMAGE}>
-<a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}"><img src="thumbnail.php?comid={COMMENTID}&amp;attachid={ATTACHID}" border="0"></a><br>
-</IF>
-<!-- END ATTACHMENTS -->
-</IF>
-  <IF {COMMENTSHOWSIG}>
-     <br>_____________________
-     <br>{MEMBERSIGNATURE}
-  </IF>
-   </td>
-  </tr>
-</table>
-</td> 
-</tr>
-<!-- END REGULAR -->
-<!-- END POST -->
-</table>
-
-<IF {MULTIPAGE}>
-<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-<br>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>{PAGETITLE}</title>
+<link rel="stylesheet" href="{TEMPLATESDIR}/printable.css" type="text/css">
+<script language="JavaScript">
+
+window.print();
+
+</script>
+</head>
+<body>
+
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {NAVIGATION} > <a href="comments.php?id={LINKID}">{LINKTITLE}</a> > Printable Version</div><br>
+
+<p><span class="title">{LINKTITLE}</span>
+<br><a href="{LINKURL}">{LINKURL}</a>
+<br>{LINKDESCRIPTION}
+</p>
+
+<p><a href="comments.php?id={LINKID}">Back to regular version</a></p>
+
+<!-- POLL TEMPLATE HERE -->
+
+<table width="100%">
+<!-- BEGIN POST -->
+<!-- BEGIN REGULAR -->
+<tr>
+<td width="20%" height="100%" class="postauthor" valign="top">
+
+<table width="100%">
+<tr valign="top"><td colspan="2">
+
+<IF {MEMBERUSERGROUP} is 1>
+<span class="{MEMBERGROUPNAMESTYLE}">{COMMENTPOSTERNAME}</span><br>
+<OTHERWISE> 
+<span class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</span></span> 
+<br> 
+<IF {MEMBERRANKIMAGE}><img src="{MEMBERRANKIMAGE}" alt="{MEMBERRANK}"><br></IF>
+{MEMBERRANK}
+<br>
+<br><span class="labels">Joined:</span> {MEMBERREGDATE}
+<br><span class="labels">Location:</span> {MEMBERLOCATION}
+<br>
+<br><span class="labels">Links:</span> {MEMBERLINKS}
+<br><span class="labels">Comments:</span> {MEMBERCOMMENTS}
+
+</IF>
+
+</td></tr>
+</table>
+
+</td>
+
+<td width="80%" class="post" valign="top" height="100%">
+<table width="100%">
+<tr valign="top">
+<td align="left"><span class="postdate">
+<IF {COMMENTVOTES} is greater than 0>{COMMENTAPPROVED} of {COMMENTVOTES} people found this comment helpful <br></IF>
+Posted {COMMENTDATE}:</span>  
+<IF {COMMENTTITLE}><br>Subject: <span class="important">{COMMENTTITLE}</span></IF>
+</td>
+<td align="right">#{COMMENTNUMBER}</td>
+  </tr>
+  <tr valign="middle">
+   <td height="100%" valign="top">{COMMENTMESSAGE}
+   <IF {COMMENTLASTEDITBY}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
+   </td>
+  </tr>
+  <tr valign="bottom" width="100%">
+   <td valign="bottom">
+<IF {COMMENTNUMATTACHMENTS}>
+<br>Attached Files:<br>
+<!-- BEGIN ATTACHMENTS -->
+<a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
+<IF {ATTACHISIMAGE}>
+<a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}"><img src="thumbnail.php?comid={COMMENTID}&amp;attachid={ATTACHID}" border="0"></a><br>
+</IF>
+<!-- END ATTACHMENTS -->
+</IF>
+  <IF {COMMENTSHOWSIG}>
+     <br>_____________________
+     <br>{MEMBERSIGNATURE}
+  </IF>
+   </td>
+  </tr>
+</table>
+</td> 
+</tr>
+<!-- END REGULAR -->
+<!-- END POST -->
+</table>
+
+<IF {MULTIPAGE}>
+<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+<br>
+
+</body>
 </html>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/promote.tpl wsnlinks/templates/default/promote.tpl
--- 400/templates/default/promote.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/promote.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,35 +1,35 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Sponsor</div><br>
-
-<IF {MEMBERFUNDS}><p>You have ${MEMBERFUNDS} in funds remaining.</p></IF>
-
-<p>You may purchase promotion to the user group {SPONSORUSERGROUP1} at a rate of USD ${SPONSORUGCHARGE1} per <IF {FEEDURATION} is 1>day<ELSE>{FEEDURATION} days</IF>. Click the 'buy now' button to purchase however many days you wish.</p>
-
-<IF {SPONSORBONUSCUTOFF}><p>If your sponsorship purchase totals more than ${SPONSORBONUSCUTOFF}, you will be credited with an additional bonus of {SPONSORBONUSPERCENT}% of your deposit.</p></IF> 
-
-<IF {PAYPALEMAIL}>
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_xclick">
-<input type="hidden" name="business" value="{PAYPALEMAIL}">
-<input type="hidden" name="undefined_quantity" value="1">
-<input type="hidden" name="item_name" value="{SITETITLE} Sponsorship">
-<input type="hidden" name="item_number" value="{SPONSORUGITEM1}">
-<input type="hidden" name="amount" value="{SPONSORUGCHARGE1}">
-<input type="hidden" name="no_shipping" value="1">
-<input type="hidden" name="return" value="{DIRURL}">
-<input type="hidden" name="cancel_return" value="{DIRURL}">
-<input type="hidden" name="no_note" value="1">
-<input type="hidden" name="currency_code" value="USD">
-<table><tr><td><input type="hidden" name="on0" value="memberid"></td><td><input type="hidden" name="os0" value="{MEMBERID}" maxlength="200"></td></tr></table><input type="image" src="https://www.paypal.com/images/x-click-but23.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!">
-</form>
-</IF>
-
-<IF {CHECKOUTNUM}>
-<form method="post" action="https://www.2checkout.com/2co/buyer/purchase"> 
-<input type="hidden" name="sid" value="{CHECKOUTNUM}"> 
-<input type="hidden" name="product_id" value="{SPONSORUGITEM1}"> 
-Purchase <input type="text" size="3" maxsize="4" name="quantity" value="1"> <IF {SPONSORDURATION} is 1>days<ELSE>group of {SPONSORDURATION} days</IF> of sponsorship <INPUT type="submit" value="Click to pay through 2CheckOut"> 
-</form> 
-2CheckOut.com Inc (Ohio, USA) is an authorized reseller for [your name here]. 
-</IF>
-
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Sponsor</div><br>
+
+<IF {MEMBERFUNDS}><p>You have ${MEMBERFUNDS} in funds remaining.</p></IF>
+
+<p>You may purchase promotion to the user group {SPONSORUSERGROUP1} at a rate of USD ${SPONSORUGCHARGE1} per <IF {FEEDURATION} is 1>day<ELSE>{FEEDURATION} days</IF>. Click the 'buy now' button to purchase however many days you wish.</p>
+
+<IF {SPONSORBONUSCUTOFF}><p>If your sponsorship purchase totals more than ${SPONSORBONUSCUTOFF}, you will be credited with an additional bonus of {SPONSORBONUSPERCENT}% of your deposit.</p></IF> 
+
+<IF {PAYPALEMAIL}>
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_xclick">
+<input type="hidden" name="business" value="{PAYPALEMAIL}">
+<input type="hidden" name="undefined_quantity" value="1">
+<input type="hidden" name="item_name" value="{SITETITLE} Sponsorship">
+<input type="hidden" name="item_number" value="{SPONSORUGITEM1}">
+<input type="hidden" name="amount" value="{SPONSORUGCHARGE1}">
+<input type="hidden" name="no_shipping" value="1">
+<input type="hidden" name="return" value="{DIRURL}">
+<input type="hidden" name="cancel_return" value="{DIRURL}">
+<input type="hidden" name="no_note" value="1">
+<input type="hidden" name="currency_code" value="USD">
+<table><tr><td><input type="hidden" name="on0" value="memberid"></td><td><input type="hidden" name="os0" value="{MEMBERID}" maxlength="200"></td></tr></table><input type="image" src="https://www.paypal.com/images/x-click-but23.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!">
+</form>
+</IF>
+
+<IF {CHECKOUTNUM}>
+<form method="post" action="https://www.2checkout.com/2co/buyer/purchase"> 
+<input type="hidden" name="sid" value="{CHECKOUTNUM}"> 
+<input type="hidden" name="product_id" value="{SPONSORUGITEM1}"> 
+Purchase <input type="text" size="3" maxsize="4" name="quantity" value="1"> <IF {SPONSORDURATION} is 1>days<ELSE>group of {SPONSORDURATION} days</IF> of sponsorship <INPUT type="submit" value="Click to pay through 2CheckOut"> 
+</form> 
+2CheckOut.com Inc (Ohio, USA) is an authorized reseller for [your name here]. 
+</IF>
+
 <p>Thank you for sponsoring the directory.</p>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/register.tpl wsnlinks/templates/default/register.tpl
--- 400/templates/default/register.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/register.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,210 +1,210 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Registration</div>
-
-<p><span class="important">{INCOMPLETE}</span></p>
-
-<form enctype="multipart/form-data" action="register.php?filled=1" method="post">
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Register an Account</td></tr>
-<tr>
- <td class="labelscolumn"><span class="labels">User name:</span></td>
- <td class="optionscolumn"><input type="text" name="name" size="{STANDARDSIZE}" value="{MEMBERNAME}" maxlength="{MAXUSERNAMELENGTH}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">E-mail:</span><br><IF {REGISTRATION} is email>Needed to activate your account.<ELSE>Needed if you lose your password.</IF></td>
- <td class="optionscolumn"><input type="text" name="email" size="{STANDARDSIZE}" value="{MEMBEREMAIL}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Password:</span></td>
- <td class="optionscolumn"><input type="password" name="password" size="{STANDARDSIZE}" value="{MEMBERPASSWORD}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Confirm password:</span><br>Retype above to confirm.</td>
- <td class="optionscolumn"><input type="password" name="passconfirm" size="{STANDARDSIZE}" value="{MEMBERPASSWORD}"></td>
-</tr>
-<IF not {SWITCH_QUICKREGISTRATION}>
-<tr>
- <td class="labelscolumn"><span class="labels">Style:</span></td>
- <td class="optionscolumn"><select name="stylesheet">{STYLEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Template Set:</span></td>
- <td class="optionscolumn"><select name="thetemplate">{TEMPLATEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Allow e-mails from site administrator?</span></td>
- <td class="optionscolumn"><select name="allowemail">{MEMBERALLOWEMAILYESNO}</select></td> 
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Allow e-mails from other users?</span></td>
- <td class="optionscolumn"><select name="allowuseremail">{MEMBERALLOWUSEREMAILYESNO}</select></td> 
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Receive email notification of every new link added to the directory?</span></td>
- <td class="optionscolumn"><select name="notifyoflinks">{MEMBERNOTIFYOFLINKSYESNO}</select></td>
-</tr>
-<IF {SWITCH_PM}>
-<tr>
- <td class="labelscolumn"><span class="labels">Accept private messages from:</span></td>
- <td class="optionscolumn"><select name="acceptpms">{MEMBERACCEPTPMSOPS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Receive email notification of new private messages?</span></td>
- <td class="optionscolumn"><select name="notifyofpms">{MEMBERNOTIFYOFPMSYESNO}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Show popup alert notification of new PMs?</span></td>
- <td class="optionscolumn"><select name="pmnotify">{MEMBERPMNOTIFYYESNO}</select></td>
-</tr>
-<IF {SWITCH_MODNOTIFY}>
-<tr>
- <td class="labelscolumn"><span class="labels">Notify me via PM of moderator actions taken on my links and comments?</span></td>
- <td class="optionscolumn"><select name="moderationpm">{MEMBERMODERATIONPMYESNO}</select></td>
-</tr>
-</IF>
-</IF>
-<IF {SWITCH_COMMENTS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Automatically subscribe to the comments thread of all links you submit?</span></td>
- <td class="optionscolumn"><select name="autosubscribe">{MEMBERAUTOSUBSCRIBEYESNO}</select></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Subscription Notification Frequency:</span></td>
- <td class="optionscolumn"><select name="notifymethod">{MEMBERNOTIFYMETHODOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Time Zone:</span></td>
- <td class="optionscolumn"><select name="timezone">
-{FUNC_SELECTOPTIONS[-12,-11,-10,-9,-8,-7,-6,-5,-4,-3.5,-3,-2,-1,0,1,2,3,3.5,4,4.5,5,5.5,5.75,6,6.5,7,8,9,9.5,10,11,12,13 <,> GMT-12,GMT-11,GMT-10,GMT-9,GMT-8,GMT-7,GMT-6,GMT-5,GMT-4,GMT-3.5,GMT-3,GMT-2,GMT-1,GMT,GMT+1,GMT+2,GMT+3,GMT+3.5,GMT+4,GMT+4.5,GMT+5,GMT+5.5,GMT+5.75,GMT+6,GMT+6.5,GMT+7,GMT+8,GMT+9,GMT+9.5,GMT+10,GMT+11,GMT+12,GMT+13 <,> {MEMBERTIMEZONE}]}
-</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Make me login again every:</span></td>
- <td class="optionscolumn">
- <select name="cookieduration">
-  <option value="21600">{LANG_REGISTER_6HOURS}</option>
-  <option value="86400">{LANG_REGISTER_DAY}</option>
-  <option value="604800">{LANG_REGISTER_WEEK}</option>
-  <option value="2592000">{LANG_REGISTER_MONTH}</option>
-  <option value="31536000">{LANG_REGISTER_YEAR}</option>
- </select>
- </td>
-</tr>
-<IF {SWITCH_IMS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Accept instant messages from:</span></td>
- <td class="optionscolumn"><select name="acceptims"><option value="none">no one</option><option value="buddies">buddies only</option><option value="all" selected>everyone</option></select></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Comments per page:</span></td>
- <td class="optionscolumn"><select name="commentsperpage">{MEMBERCOMMENTSPERPAGEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Links per page:</span></td>
- <td class="optionscolumn"><select name="linksperpage">{MEMBERLINKSPERPAGEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Location:</span></td>
- <td class="optionscolumn"><input type="text" name="location" size="{STANDARDSIZE}" value="{MEMBERLOCATION}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Homepage:</span></td>
- <td class="optionscolumn"><input type="text" name="homepage" size="{STANDARDSIZE}" value="{MEMBERHOMEPAGE}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Occupation:</span></td>
- <td class="optionscolumn"><input type="text" name="occupation" size="{STANDARDSIZE}" value="{MEMBEROCCUPATION}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Biography:</span></td>
- <td class="optionscolumn"><textarea name="bio" rows="5" cols="45">{MEMBERBIO}</textarea></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Interests:</span></td>
- <td class="optionscolumn"><input type="text" name="interests" size="{STANDARDSIZE}" value="{MEMBERINTERESTS}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Instant Messanger Handles:</span></td>
- <td class="optionscolumn">
-AIM: <input type="text" name="aim" size="15" value="{MEMBERAIM}"><br>
-ICQ: <input type="text" name="icq" size="15" value="{MEMBERICQ}"><br>
-MSN: <input type="text" name="msn" size="15" value="{MEMBERMSN}"><br>
-YIM: <input type="text" name="yahoo" size="15" value="{MEMBERYAHOO}">
-</td>
-</tr>
-<IF {SWITCH_ONLINEUSERS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Show my online status to:</span></td>
- <td class="optionscolumn">
-  <select name="visibility">
-   <option value="everyone">everyone</option>
-   <option value="buddies">buddies only</option>
-   <option value="nobody">nobody</option>
-  </select>
- </td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Birthdate:</span></td>
- <td class="optionscolumn">
-<select name="birthmonth"><option value=""></option>{MEMBERBIRTHMONTHOPTIONS}</select>
-<select name="birthday"><option value=""></option>{MEMBERBIRTHDAYOPTIONS}</select>
-<select name="birthyear"><option value=""></option>{MEMBERBIRTHYEAROPTIONS}</select>
-</td>
-</tr>
-<IF {SWITCH_WYSIDESCRIP} or {SWITCH_WYSI}>
-<tr>
- <td class="labelscolumn"><span class="labels">Post Editor:</span></td>
- <td class="optionscolumn"><select name="posteditor">{MEMBERPOSTEDITOROPTIONS}</select></td>
-</tr>
-</IF>
-<IF {SWITCH_COMMENTS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Show avatars by posts?</span></td>
- <td class="optionscolumn"><select name="showavatars">{MEMBERSHOWAVATARSYESNO}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Show signatures below posts?</span></td>
- <td class="optionscolumn"><select name="showsigs">{MEMBERSHOWSIGSYESNO}</select></td>
-</tr>
-</IF>
-
-<!-- INSERT NEW FIELDS HERE -->
-
-<IF {THISMEMBERGROUPISADMIN}>
-<tr>
- <td class="labelscolumn"><span class="labels">Link Total:</span></td>
- <td class="optionscolumn"><input type="text" name="links" size="5" value="{MEMBERLINKS}"></td> 
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Comment Total:</span></td>
- <td class="optionscolumn"><input type="text" size="5" name="comments" value="{MEMBERCOMMENTS}"></td> 
-</tr>
-<IF {SWITCH_MEMBERHITS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Hits Out Total:</span></td>
- <td class="optionscolumn"><input type="text" size="5" name="totalhits" value="{MEMBERTOTALHITS}"></td> 
-</tr>
-</IF>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Referring Member:</span>
-<br>If a current member of this forum recommended that you come here, type their username.</td>
- <td class="optionscolumn"><input type="text" name="referrer" size="{STANDARDSIZE}"></td>
-</tr>
-</IF>
-<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
-<tr>
- <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
-<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
- <td class="optionscolumn"><img src="securityimage.php" alt="security image" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<input type="hidden" name="customwrapper" value="{CUSTOMWRAPPER}">
-<input type="hidden" name="redirectto" value="{REDIRECTTO}">
-<input type="hidden" name="invite" value="{INVITE}">
-<IF {SWITCH_TOS}><input type="checkbox" name="tos" value="1"> I have read and agree to the <a href="index.php?custom=yes&amp;TID=tos&usewrapper=no" target="win" onClick="window.open('','win','width=500,height=350');">terms of service</a><br></IF>
-<input type="submit" value="Register" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Registration</div>
+
+<p><span class="important">{INCOMPLETE}</span></p>
+
+<form enctype="multipart/form-data" action="register.php?filled=1" method="post">
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Register an Account</td></tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">User name:</span></td>
+ <td class="optionscolumn"><input type="text" name="name" size="{STANDARDSIZE}" value="{MEMBERNAME}" maxlength="{MAXUSERNAMELENGTH}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">E-mail:</span><br><IF {REGISTRATION} is email>Needed to activate your account.<ELSE>Needed if you lose your password.</IF></td>
+ <td class="optionscolumn"><input type="text" name="email" size="{STANDARDSIZE}" value="{MEMBEREMAIL}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Password:</span></td>
+ <td class="optionscolumn"><input type="password" name="password" size="{STANDARDSIZE}" value="{MEMBERPASSWORD}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Confirm password:</span><br>Retype above to confirm.</td>
+ <td class="optionscolumn"><input type="password" name="passconfirm" size="{STANDARDSIZE}" value="{MEMBERPASSWORD}"></td>
+</tr>
+<IF not {SWITCH_QUICKREGISTRATION}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Style:</span></td>
+ <td class="optionscolumn"><select name="stylesheet">{STYLEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Template Set:</span></td>
+ <td class="optionscolumn"><select name="thetemplate">{TEMPLATEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Allow e-mails from site administrator?</span></td>
+ <td class="optionscolumn"><select name="allowemail">{MEMBERALLOWEMAILYESNO}</select></td> 
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Allow e-mails from other users?</span></td>
+ <td class="optionscolumn"><select name="allowuseremail">{MEMBERALLOWUSEREMAILYESNO}</select></td> 
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Receive email notification of every new link added to the directory?</span></td>
+ <td class="optionscolumn"><select name="notifyoflinks">{MEMBERNOTIFYOFLINKSYESNO}</select></td>
+</tr>
+<IF {SWITCH_PM}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Accept private messages from:</span></td>
+ <td class="optionscolumn"><select name="acceptpms">{MEMBERACCEPTPMSOPS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Receive email notification of new private messages?</span></td>
+ <td class="optionscolumn"><select name="notifyofpms">{MEMBERNOTIFYOFPMSYESNO}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Show popup alert notification of new PMs?</span></td>
+ <td class="optionscolumn"><select name="pmnotify">{MEMBERPMNOTIFYYESNO}</select></td>
+</tr>
+<IF {SWITCH_MODNOTIFY}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Notify me via PM of moderator actions taken on my links and comments?</span></td>
+ <td class="optionscolumn"><select name="moderationpm">{MEMBERMODERATIONPMYESNO}</select></td>
+</tr>
+</IF>
+</IF>
+<IF {SWITCH_COMMENTS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Automatically subscribe to the comments thread of all links you submit?</span></td>
+ <td class="optionscolumn"><select name="autosubscribe">{MEMBERAUTOSUBSCRIBEYESNO}</select></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">Subscription Notification Frequency:</span></td>
+ <td class="optionscolumn"><select name="notifymethod">{MEMBERNOTIFYMETHODOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Time Zone:</span></td>
+ <td class="optionscolumn"><select name="timezone">
+{FUNC_SELECTOPTIONS[-12,-11,-10,-9,-8,-7,-6,-5,-4,-3.5,-3,-2,-1,0,1,2,3,3.5,4,4.5,5,5.5,5.75,6,6.5,7,8,9,9.5,10,11,12,13 <,> GMT-12,GMT-11,GMT-10,GMT-9,GMT-8,GMT-7,GMT-6,GMT-5,GMT-4,GMT-3.5,GMT-3,GMT-2,GMT-1,GMT,GMT+1,GMT+2,GMT+3,GMT+3.5,GMT+4,GMT+4.5,GMT+5,GMT+5.5,GMT+5.75,GMT+6,GMT+6.5,GMT+7,GMT+8,GMT+9,GMT+9.5,GMT+10,GMT+11,GMT+12,GMT+13 <,> {MEMBERTIMEZONE}]}
+</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Make me login again every:</span></td>
+ <td class="optionscolumn">
+ <select name="cookieduration">
+  <option value="21600">{LANG_REGISTER_6HOURS}</option>
+  <option value="86400">{LANG_REGISTER_DAY}</option>
+  <option value="604800">{LANG_REGISTER_WEEK}</option>
+  <option value="2592000">{LANG_REGISTER_MONTH}</option>
+  <option value="31536000">{LANG_REGISTER_YEAR}</option>
+ </select>
+ </td>
+</tr>
+<IF {SWITCH_IMS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Accept instant messages from:</span></td>
+ <td class="optionscolumn"><select name="acceptims"><option value="none">no one</option><option value="buddies">buddies only</option><option value="all" selected>everyone</option></select></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">Comments per page:</span></td>
+ <td class="optionscolumn"><select name="commentsperpage">{MEMBERCOMMENTSPERPAGEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Links per page:</span></td>
+ <td class="optionscolumn"><select name="linksperpage">{MEMBERLINKSPERPAGEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Location:</span></td>
+ <td class="optionscolumn"><input type="text" name="location" size="{STANDARDSIZE}" value="{MEMBERLOCATION}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Homepage:</span></td>
+ <td class="optionscolumn"><input type="text" name="homepage" size="{STANDARDSIZE}" value="{MEMBERHOMEPAGE}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Occupation:</span></td>
+ <td class="optionscolumn"><input type="text" name="occupation" size="{STANDARDSIZE}" value="{MEMBEROCCUPATION}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Biography:</span></td>
+ <td class="optionscolumn"><textarea name="bio" rows="5" cols="45">{MEMBERBIO}</textarea></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Interests:</span></td>
+ <td class="optionscolumn"><input type="text" name="interests" size="{STANDARDSIZE}" value="{MEMBERINTERESTS}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Instant Messanger Handles:</span></td>
+ <td class="optionscolumn">
+AIM: <input type="text" name="aim" size="15" value="{MEMBERAIM}"><br>
+ICQ: <input type="text" name="icq" size="15" value="{MEMBERICQ}"><br>
+MSN: <input type="text" name="msn" size="15" value="{MEMBERMSN}"><br>
+YIM: <input type="text" name="yahoo" size="15" value="{MEMBERYAHOO}">
+</td>
+</tr>
+<IF {SWITCH_ONLINEUSERS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Show my online status to:</span></td>
+ <td class="optionscolumn">
+  <select name="visibility">
+   <option value="everyone">everyone</option>
+   <option value="buddies">buddies only</option>
+   <option value="nobody">nobody</option>
+  </select>
+ </td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">Birthdate:</span></td>
+ <td class="optionscolumn">
+<select name="birthmonth"><option value=""></option>{MEMBERBIRTHMONTHOPTIONS}</select>
+<select name="birthday"><option value=""></option>{MEMBERBIRTHDAYOPTIONS}</select>
+<select name="birthyear"><option value=""></option>{MEMBERBIRTHYEAROPTIONS}</select>
+</td>
+</tr>
+<IF {SWITCH_WYSIDESCRIP} or {SWITCH_WYSI}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Post Editor:</span></td>
+ <td class="optionscolumn"><select name="posteditor">{MEMBERPOSTEDITOROPTIONS}</select></td>
+</tr>
+</IF>
+<IF {SWITCH_COMMENTS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Show avatars by posts?</span></td>
+ <td class="optionscolumn"><select name="showavatars">{MEMBERSHOWAVATARSYESNO}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Show signatures below posts?</span></td>
+ <td class="optionscolumn"><select name="showsigs">{MEMBERSHOWSIGSYESNO}</select></td>
+</tr>
+</IF>
+
+<!-- INSERT NEW FIELDS HERE -->
+
+<IF {THISMEMBERGROUPISADMIN}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Link Total:</span></td>
+ <td class="optionscolumn"><input type="text" name="links" size="5" value="{MEMBERLINKS}"></td> 
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Comment Total:</span></td>
+ <td class="optionscolumn"><input type="text" size="5" name="comments" value="{MEMBERCOMMENTS}"></td> 
+</tr>
+<IF {SWITCH_MEMBERHITS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Hits Out Total:</span></td>
+ <td class="optionscolumn"><input type="text" size="5" name="totalhits" value="{MEMBERTOTALHITS}"></td> 
+</tr>
+</IF>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">Referring Member:</span>
+<br>If a current member of this forum recommended that you come here, type their username.</td>
+ <td class="optionscolumn"><input type="text" name="referrer" size="{STANDARDSIZE}"></td>
+</tr>
+</IF>
+<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
+<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
+ <td class="optionscolumn"><img src="securityimage.php" alt="security image" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<input type="hidden" name="customwrapper" value="{CUSTOMWRAPPER}">
+<input type="hidden" name="redirectto" value="{REDIRECTTO}">
+<input type="hidden" name="invite" value="{INVITE}">
+<IF {SWITCH_TOS}><input type="checkbox" name="tos" value="1"> I have read and agree to the <a href="index.php?custom=yes&amp;TID=tos&usewrapper=no" target="win" onClick="window.open('','win','width=500,height=350');">terms of service</a><br></IF>
+<input type="submit" value="Register" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/reportcomment.tpl wsnlinks/templates/default/reportcomment.tpl
--- 400/templates/default/reportcomment.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/reportcomment.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,31 +1,31 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="comments.php?id={LINKID}">{LINKTITLE}</a> > Report Comment</div>
-
-<form action="reportcomment.php?filled=1" method="post">
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Report Problem With Comment</td></tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Type of Problem:</span></td>
- <td class="optionscolumn">
-  <select name="problemtype">
-   <option value=""></option>
-   <option value="spam">spam</option>
-   <option value="flaming">flaming</option>
-   <option value="low quality">low post quality</option>
-   <option value="other">other (describe below)</option>
-  </select>
- <td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Details of Problem:</span></td>
- <td class="optionscolumn"><textarea cols="45" rows="5" name="comment"></textarea><td>
-</tr>
-<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
-<tr>
- <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
-<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
- <td class="optionscolumn"><img src="securityimage.php" alt="security image" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<input type="hidden" name="id" value="{COMMENTID}"><input type="submit" value="Send Report" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="comments.php?id={LINKID}">{LINKTITLE}</a> > Report Comment</div>
+
+<form action="reportcomment.php?filled=1" method="post">
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Report Problem With Comment</td></tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Type of Problem:</span></td>
+ <td class="optionscolumn">
+  <select name="problemtype">
+   <option value=""></option>
+   <option value="spam">spam</option>
+   <option value="flaming">flaming</option>
+   <option value="low quality">low post quality</option>
+   <option value="other">other (describe below)</option>
+  </select>
+ <td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Details of Problem:</span></td>
+ <td class="optionscolumn"><textarea cols="45" rows="5" name="comment"></textarea><td>
+</tr>
+<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
+<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
+ <td class="optionscolumn"><img src="securityimage.php" alt="security image" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<input type="hidden" name="id" value="{COMMENTID}"><input type="submit" value="Send Report" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/report.tpl wsnlinks/templates/default/report.tpl
--- 400/templates/default/report.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/report.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,31 +1,31 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > Report</div><br>
-
-<form action="report.php?filled=1" method="post">
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Report Problem With "{LINKTITLE}"</td></tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Type of Problem:</span></td>
- <td class="optionscolumn">
-  <select name="problemtype">
-   <option value="dead link">Dead link</option>
-   <option value="blank or error">Blank page / error page</option>
-   <option value="changed">Changed link info (describe changes below)</option>
-   <option value="other">Other (describe below)</option>
-  </select>
- <td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Comments:</span><br>(optional)</td>
- <td class="optionscolumn"><textarea cols="45" rows="5" name="comment"></textarea><td>
-</tr>
-<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
-<tr>
- <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
-<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
- <td class="optionscolumn"><img src="securityimage.php" alt="security image" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<input type="hidden" name="id" value="{LINKID}">
-<input type="submit" value="Send Report" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > Report</div><br>
+
+<form action="report.php?filled=1" method="post">
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Report Problem With "{LINKTITLE}"</td></tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Type of Problem:</span></td>
+ <td class="optionscolumn">
+  <select name="problemtype">
+   <option value="dead link">Dead link</option>
+   <option value="blank or error">Blank page / error page</option>
+   <option value="changed">Changed link info (describe changes below)</option>
+   <option value="other">Other (describe below)</option>
+  </select>
+ <td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Comments:</span><br>(optional)</td>
+ <td class="optionscolumn"><textarea cols="45" rows="5" name="comment"></textarea><td>
+</tr>
+<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
+<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
+ <td class="optionscolumn"><img src="securityimage.php" alt="security image" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<input type="hidden" name="id" value="{LINKID}">
+<input type="submit" value="Send Report" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/richtext.js wsnlinks/templates/default/richtext.js
--- 400/templates/default/richtext.js	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/richtext.js	2006-09-18 16:16:08.000000000 -0700
@@ -59,8 +59,8 @@
 	isGecko = (ua.indexOf("gecko") != -1);
 	isSafari = (ua.indexOf("safari") != -1);
 	isKonqueror = (ua.indexOf("konqueror") != -1);
-        if (ua.indexOf("opera") != -1) isGecko = 1; // pretend opera is gecko since it works the same for WYSIWYG
-	
+        if (!isGecko) isGecko = (ua.indexOf("opera") != -1); // pretend opera is gecko since it works the same for WYSIWYG
+
 	//check to see if designMode mode is available
 	if (document.getElementById && document.designMode && !isSafari && !isKonqueror) {
 		isRichText = true;
@@ -316,6 +316,8 @@
 		} else {
 			oHdnMessage.value = oRTE.contentWindow.document.body.innerHTML;
 		}
+
+//alert("reached this point with " + oHdnMessage.value);
 		
 		//if there is no content (other than formatting) set value to nothing
 		if (stripHTML(oHdnMessage.value.replace("&nbsp;", " ")) == "" 
diff -U 3 -H -d -r -N -- 400/templates/default/rssfeed.tpl wsnlinks/templates/default/rssfeed.tpl
--- 400/templates/default/rssfeed.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/rssfeed.tpl	2006-09-17 15:33:05.000000000 -0700
@@ -3,7 +3,7 @@
 <rss version="2.0">
 <channel>
 <title>{SITETITLE}</title>
-<link>{MYURL}</link>
+<link>{DIRURL}</link>
 <description>{SITEDESCRIPTION}</description>
 <language>en-us</language>
 <!-- BEGIN ROW -->
@@ -11,6 +11,7 @@
 <title>{TITLE}</title>
 <description>{DESCRIPTION}</description>
 <link>{THELINK}</link>
+<pubDate>{THEDATE}</pubDate>
 <guid>{GUID}</guid>
 </item>
 <!-- END ROW -->
diff -U 3 -H -d -r -N -- 400/templates/default/searchadvanced.tpl wsnlinks/templates/default/searchadvanced.tpl
--- 400/templates/default/searchadvanced.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/searchadvanced.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,304 +1,304 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Advanced Search</div><br>
-
-<div class="box" style="width: 70%;">
-<div class="boxtitle" onClick="minmax('quickbox')"><img src="{TEMPLATESDIR}/images/icon_search.gif" alt="search"> Quick Search</div>
-<div id="quickbox" class="boxbody">
-<form name="searchform" action="search.php?filled=1&amp;condition={DEFAULTSEARCHTYPE}" method="post">
-<input type="text" name="search" size="{STANDARDSIZE}">
-<select name="whichtype">
-<option value="links">search links</option>
-<IF {SWITCH_COMMENTS}><option value="comments">search comments</option></IF>
-</select>
-<input type="submit" value="Search" class="button"></form>
-</div>
-</div>
-
-<p><span class="labels">Advanced Search</span></p>
-
-<p>Leave fields blank where you don't wish to filter by that field.</p>
-
-<div class="box" style="width: 70%;">
-<div class="boxtitle" onClick="minmax('linksbox')"><img src="{TEMPLATESDIR}/images/icon_search.gif" alt="search"> Find Links</div>
-<div id="linksbox" class="boxbody">
-<form action="search.php?action=filter&amp;filled=1&amp;whichtype=links" method="post">
-Find all links where 
-<br>the title <select name="titlecondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value="or">has any of the words</option>
- <option value="and">has all of the words</option>
- <option value="bool">boolean</option>
-</select> 
-<input type="text" size="{STANDARDSIZE}" name="titlesearch">
-<br>and the description <select name="descriptioncondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value="or">has any of the words</option>
- <option value="and">has all of the words</option>
- <option value="bool">boolean</option>
-</select> 
-<input type="text" size="{STANDARDSIZE}" name="descriptionsearch">
-<br>and the URL <select name="urlcondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value="or">has any of the values</option>
- <option value="and">has all of the values</option>
- <option value="bool">boolean</option>
-</select> 
-<input type="text" size="{STANDARDSIZE}" name="urlsearch">
-<IF {SWITCH_HITS}>
-<br>and the number of hits out <select name="hitscondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value=">" selected>is greater than</option>
- <option value="<">is less than</option>
- <option value="or">has any of the values</option>
- <option value="and">has all of the values</option>
- <option value="between">is between</option>
- <option value="bool">boolean</option>
-</select> 
-<input type="text" size="5" name="hitssearch">
-<br>and the number of hits in <select name="hitsincondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value=">" selected>is greater than</option>
- <option value="<">is less than</option>
- <option value="or">has any of the values</option>
- <option value="between">is between</option>
- <option value="bool">boolean</option>
-</select> 
-<input type="text" size="5" name="hitsinsearch"> 
-</IF>
-<IF {SWITCH_RATINGS}>
-<br>and the link rating <select name="ratingcondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value=">" selected>is greater than</option>
- <option value="<">is less than</option>
- <option value="or">has any of the values</option>
- <option value="and">has all of the values</option>
- <option value="between">is between</option>
- <option value="bool">boolean</option>
-</select> 
-<input type="text" size="5" name="ratingsearch"> 
-<br>and the number of votes <select name="votescondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value=">" selected>is greater than</option>
- <option value="<">is less than</option>
- <option value="or">has any of the values</option>
- <option value="and">has all of the values</option>
- <option value="between">is between</option>
- <option value="bool">boolean</option>
-</select> 
-<input type="text" size="5" name="votessearch">
-</IF>
-<IF {SWITCH_COMMENTS}>
-<br>and the number of comments <select name="numcommentscondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value=">" selected>is greater than</option>
- <option value="<">is less than</option>
- <option value="or">has any of the values</option>
- <option value="and">has all of the values</option>
- <option value="between">is between</option>
- <option value="bool">boolean</option>
-</select> 
-<input type="text" size="5" name="numcommentssearch">
-</IF>
-<br>
-<input type="submit" value="Find Links" class="button">
-</form>
-</div>
-</div>
-
-<b>or</b><br><br>
-
-<div class="box" style="width: 70%;">
-<div class="boxtitle" onClick="minmax('catsbox')"><img src="{TEMPLATESDIR}/images/icon_search.gif" alt="search"> Find Categories</div>
-<div id="catsbox" class="boxbody">
-<form action="search.php?action=filter&amp;filled=1&amp;whichtype=categories" method="post">
-Find all categories where 
-<br>the name <select name="namecondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value="or">has any of the words</option>
- <option value="and">has all of the values</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="namesearch">
-<br>and the description <select name="descriptioncondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value="or">has any of the words</option>
- <option value="and">has all of the words</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="descriptionsearch">
-<br>and the number of links <select name="numlinkscondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value=">" selected>is greater than</option>
- <option value="<">is less than</option>
- <option value="or">has any of the values</option>
- <option value="and">has all of the values</option>
- <option value="between">is between</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="5" name="numlinkssearch">
-<br>and the number of subcategories <select name="numsubcondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value=">" selected>is greater than</option>
- <option value="<">is less than</option>
- <option value="or">has any of the values</option>
- <option value="and">has all of the values</option>
- <option value="between">is between</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="5" name="numsubsearch">
-<br>and a parent name <select name="parentnamescondition">
- <option value="like">contains</option>
- <option value="or">has any of the words</option>
- <option value="and">has all of the words</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="parentnamessearch">
-<br>
-<input type="submit" value="Find Categories" class="button">
-</form>
-</div>
-</div>
-
-<IF {SWITCH_COMMENTS}>
-<b>or</b><br><br>
-
-<div class="box" style="width: 70%;">
-<div class="boxtitle" onClick="minmax('comsbox')"><img src="{TEMPLATESDIR}/images/icon_search.gif" alt="search"> Find Comments</div>
-<div id="comsbox" class="boxbody">
-<form action="search.php?action=filter&amp;filled=1&amp;whichtype=comments" method="post">
-Find all comments where 
-<br>the poster name <select name="posternamecondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value="or">has any of the words</option>
- <option value="and">has all of the words</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="posternamesearch">
-<br>and the comment text <select name="messagecondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value="or">has any of the words</option>
- <option value="and">has all of the words</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="messagesearch">
-<br>and the associated link name <select name="linknamecondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value="or">has any of the words</option>
- <option value="and">has all of the words</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="linknamesearch">
-<br>
-<input type="submit" value="Find Comments" class="button">
-</form>
-</div>
-</div>
-</IF>
-
-<IF {SWITCH_MEMBERS}>
-<b>or</b><br><br>
-
-<div class="box" style="width: 70%;">
-<div class="boxtitle" onClick="minmax('memsbox')"><img src="{TEMPLATESDIR}/images/icon_search.gif" alt="search"> Find Members</div>
-<div id="memsbox" class="boxbody">
-<form action="search.php?action=filter&amp;filled=1&amp;whichtype=members" method="post">
-Find all members where 
-<br>the member's name <select name="namecondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value="or">has any of the words</option>
- <option value="and">has all of the words</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="namesearch">
-<br>and the member's location <select name="locationcondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value="or">has any of the words</option>
- <option value="and">has all of the words</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="locationsearch">
-<br>and the member's interests <select name="interestscondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value="or">has any of the words</option>
- <option value="and">has all of the words</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="interestssearch">
-<br>the member's email <select name="emailcondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value="or">has any of the words</option>
- <option value="and">has all of the words</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="emailsearch">
-<br>and the number of links submitted <select name="linkscondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value=">" selected>is greater than</option>
- <option value="<">is less than</option>
- <option value="or">has any of the values</option>
- <option value="and">has all of the values</option>
- <option value="between">is between</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="5" name="linkssearch">
-<IF {SWITCH_COMMENTS}>
-<br>and the number of comments submitted <select name="commentscondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value=">" selected>is greater than</option>
- <option value="<">is less than</option>
- <option value="or">has any of the values</option>
- <option value="and">has all of the values</option>
- <option value="between">is between</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="5" name="commentssearch">
-</IF>
-<br>
-<input type="submit" value="Find Members" class="button">
-</form>
-</div>
-</div>
-</IF>
-
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Advanced Search</div><br>
+
+<div class="box" style="width: 70%;">
+<div class="boxtitle" onClick="minmax('quickbox')"><img src="{TEMPLATESDIR}/images/icon_search.gif" alt="search"> Quick Search</div>
+<div id="quickbox" class="boxbody">
+<form name="searchform" action="search.php?filled=1&amp;condition={DEFAULTSEARCHTYPE}" method="post">
+<input type="text" name="search" size="{STANDARDSIZE}">
+<select name="whichtype">
+<option value="links">search links</option>
+<IF {SWITCH_COMMENTS}><option value="comments">search comments</option></IF>
+</select>
+<input type="submit" value="Search" class="button"></form>
+</div>
+</div>
+
+<p><span class="labels">Advanced Search</span></p>
+
+<p>Leave fields blank where you don't wish to filter by that field.</p>
+
+<div class="box" style="width: 70%;">
+<div class="boxtitle" onClick="minmax('linksbox')"><img src="{TEMPLATESDIR}/images/icon_search.gif" alt="search"> Find Links</div>
+<div id="linksbox" class="boxbody">
+<form action="search.php?action=filter&amp;filled=1&amp;whichtype=links" method="post">
+Find all links where 
+<br>the title <select name="titlecondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value="or">has any of the words</option>
+ <option value="and">has all of the words</option>
+ <option value="bool">boolean</option>
+</select> 
+<input type="text" size="{STANDARDSIZE}" name="titlesearch">
+<br>and the description <select name="descriptioncondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value="or">has any of the words</option>
+ <option value="and">has all of the words</option>
+ <option value="bool">boolean</option>
+</select> 
+<input type="text" size="{STANDARDSIZE}" name="descriptionsearch">
+<br>and the URL <select name="urlcondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value="or">has any of the values</option>
+ <option value="and">has all of the values</option>
+ <option value="bool">boolean</option>
+</select> 
+<input type="text" size="{STANDARDSIZE}" name="urlsearch">
+<IF {SWITCH_HITS}>
+<br>and the number of hits out <select name="hitscondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value=">" selected>is greater than</option>
+ <option value="<">is less than</option>
+ <option value="or">has any of the values</option>
+ <option value="and">has all of the values</option>
+ <option value="between">is between</option>
+ <option value="bool">boolean</option>
+</select> 
+<input type="text" size="5" name="hitssearch">
+<br>and the number of hits in <select name="hitsincondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value=">" selected>is greater than</option>
+ <option value="<">is less than</option>
+ <option value="or">has any of the values</option>
+ <option value="between">is between</option>
+ <option value="bool">boolean</option>
+</select> 
+<input type="text" size="5" name="hitsinsearch"> 
+</IF>
+<IF {SWITCH_RATINGS}>
+<br>and the link rating <select name="ratingcondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value=">" selected>is greater than</option>
+ <option value="<">is less than</option>
+ <option value="or">has any of the values</option>
+ <option value="and">has all of the values</option>
+ <option value="between">is between</option>
+ <option value="bool">boolean</option>
+</select> 
+<input type="text" size="5" name="ratingsearch"> 
+<br>and the number of votes <select name="votescondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value=">" selected>is greater than</option>
+ <option value="<">is less than</option>
+ <option value="or">has any of the values</option>
+ <option value="and">has all of the values</option>
+ <option value="between">is between</option>
+ <option value="bool">boolean</option>
+</select> 
+<input type="text" size="5" name="votessearch">
+</IF>
+<IF {SWITCH_COMMENTS}>
+<br>and the number of comments <select name="numcommentscondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value=">" selected>is greater than</option>
+ <option value="<">is less than</option>
+ <option value="or">has any of the values</option>
+ <option value="and">has all of the values</option>
+ <option value="between">is between</option>
+ <option value="bool">boolean</option>
+</select> 
+<input type="text" size="5" name="numcommentssearch">
+</IF>
+<br>
+<input type="submit" value="Find Links" class="button">
+</form>
+</div>
+</div>
+
+<b>or</b><br><br>
+
+<div class="box" style="width: 70%;">
+<div class="boxtitle" onClick="minmax('catsbox')"><img src="{TEMPLATESDIR}/images/icon_search.gif" alt="search"> Find Categories</div>
+<div id="catsbox" class="boxbody">
+<form action="search.php?action=filter&amp;filled=1&amp;whichtype=categories" method="post">
+Find all categories where 
+<br>the name <select name="namecondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value="or">has any of the words</option>
+ <option value="and">has all of the values</option>
+ <option value="bool">boolean</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="namesearch">
+<br>and the description <select name="descriptioncondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value="or">has any of the words</option>
+ <option value="and">has all of the words</option>
+ <option value="bool">boolean</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="descriptionsearch">
+<br>and the number of links <select name="numlinkscondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value=">" selected>is greater than</option>
+ <option value="<">is less than</option>
+ <option value="or">has any of the values</option>
+ <option value="and">has all of the values</option>
+ <option value="between">is between</option>
+ <option value="bool">boolean</option>
+</select>
+<input type="text" size="5" name="numlinkssearch">
+<br>and the number of subcategories <select name="numsubcondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value=">" selected>is greater than</option>
+ <option value="<">is less than</option>
+ <option value="or">has any of the values</option>
+ <option value="and">has all of the values</option>
+ <option value="between">is between</option>
+ <option value="bool">boolean</option>
+</select>
+<input type="text" size="5" name="numsubsearch">
+<br>and a parent name <select name="parentnamescondition">
+ <option value="like">contains</option>
+ <option value="or">has any of the words</option>
+ <option value="and">has all of the words</option>
+ <option value="bool">boolean</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="parentnamessearch">
+<br>
+<input type="submit" value="Find Categories" class="button">
+</form>
+</div>
+</div>
+
+<IF {SWITCH_COMMENTS}>
+<b>or</b><br><br>
+
+<div class="box" style="width: 70%;">
+<div class="boxtitle" onClick="minmax('comsbox')"><img src="{TEMPLATESDIR}/images/icon_search.gif" alt="search"> Find Comments</div>
+<div id="comsbox" class="boxbody">
+<form action="search.php?action=filter&amp;filled=1&amp;whichtype=comments" method="post">
+Find all comments where 
+<br>the poster name <select name="posternamecondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value="or">has any of the words</option>
+ <option value="and">has all of the words</option>
+ <option value="bool">boolean</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="posternamesearch">
+<br>and the comment text <select name="messagecondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value="or">has any of the words</option>
+ <option value="and">has all of the words</option>
+ <option value="bool">boolean</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="messagesearch">
+<br>and the associated link name <select name="linknamecondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value="or">has any of the words</option>
+ <option value="and">has all of the words</option>
+ <option value="bool">boolean</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="linknamesearch">
+<br>
+<input type="submit" value="Find Comments" class="button">
+</form>
+</div>
+</div>
+</IF>
+
+<IF {SWITCH_MEMBERS}>
+<b>or</b><br><br>
+
+<div class="box" style="width: 70%;">
+<div class="boxtitle" onClick="minmax('memsbox')"><img src="{TEMPLATESDIR}/images/icon_search.gif" alt="search"> Find Members</div>
+<div id="memsbox" class="boxbody">
+<form action="search.php?action=filter&amp;filled=1&amp;whichtype=members" method="post">
+Find all members where 
+<br>the member's name <select name="namecondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value="or">has any of the words</option>
+ <option value="and">has all of the words</option>
+ <option value="bool">boolean</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="namesearch">
+<br>and the member's location <select name="locationcondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value="or">has any of the words</option>
+ <option value="and">has all of the words</option>
+ <option value="bool">boolean</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="locationsearch">
+<br>and the member's interests <select name="interestscondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value="or">has any of the words</option>
+ <option value="and">has all of the words</option>
+ <option value="bool">boolean</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="interestssearch">
+<br>the member's email <select name="emailcondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value="or">has any of the words</option>
+ <option value="and">has all of the words</option>
+ <option value="bool">boolean</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="emailsearch">
+<br>and the number of links submitted <select name="linkscondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value=">" selected>is greater than</option>
+ <option value="<">is less than</option>
+ <option value="or">has any of the values</option>
+ <option value="and">has all of the values</option>
+ <option value="between">is between</option>
+ <option value="bool">boolean</option>
+</select>
+<input type="text" size="5" name="linkssearch">
+<IF {SWITCH_COMMENTS}>
+<br>and the number of comments submitted <select name="commentscondition">
+ <option value="like">contains</option>
+ <option value="=">is exactly</option>
+ <option value="!=">is not</option>
+ <option value=">" selected>is greater than</option>
+ <option value="<">is less than</option>
+ <option value="or">has any of the values</option>
+ <option value="and">has all of the values</option>
+ <option value="between">is between</option>
+ <option value="bool">boolean</option>
+</select>
+<input type="text" size="5" name="commentssearch">
+</IF>
+<br>
+<input type="submit" value="Find Members" class="button">
+</form>
+</div>
+</div>
+</IF>
+
 <p>Note: Boolean searches allow you to use "and" and "or" as operators, and to group them with parenthases. A boolean search "books or videos" would return all results which contain either the word "books" or the word "videos". You can also use parenthases to group combinations. A boolean search for "(books or videos) and cheap" would find all results which contain either "books" or "videos", only so long as they also contain "cheap".</p>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/searchall.tpl wsnlinks/templates/default/searchall.tpl
--- 400/templates/default/searchall.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/searchall.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,104 +1,104 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Search</div><br>
-
-<p>Found {NUMRESULTS} matching results for "{SEARCHTERM}": </p>
-
-<table>
-<tr>
-<IF {CATEGORYTOTAL}><td><u>{CATEGORYTOTAL} total matching categories</u></td></IF>
-<IF {LINKTOTAL}><td><u>{LINKTOTAL} total matching links</u></td></IF>
-<IF {COMMENTTOTAL} and {SWITCH_COMMENTS}><td><u>{COMMENTTOTAL} total matching comments</u></td></IF>
-<IF {MEMBERTOTAL} and {SWITCH_MEMBERS}><td><u>{MEMBERTOTAL} total matching members</u></td></IF>
-</tr>
-
-<tr>
-<IF {CATEGORYTOTAL}>
-<td valign="top" width="25%">
-<!-- BEGIN SEARCH categories RESULTS -->
-<p>
-<span class="title"><a href="[IFADMIN../]index.php?action=displaycat&amp;catid={CATID}">{CATNAME}</a> {CATADMIN} </span><br>
-<span class="labels">Description:</span> {CATDESCRIPTION} <br>
-<span class="labels">Parent:</span> <a href="[IFADMIN../]index.php?action=displaycat&amp;catid={CATPARENT}">{CATPARENTNAME}</a> <br>
-<span class="labels">Number of links:</span> {CATNUMLINKS} <br>
-<span class="labels">Number of subcategories:</span> {CATNUMSUB}
-</p>
-<!-- END SEARCH categories RESULTS -->
-<IF {CATEGORYMULTIPAGE}>
-<p>Page: {CATEGORYPREVIOUS} <b>{CATEGORYCURRENTPAGE}</b> {CATEGORYNEXT}</p>
-</IF>
-</td>
-</IF>
-
-<IF {LINKTOTAL}>
-<td valign="top" width="25%">
-<!-- BEGIN SEARCH links RESULTS -->
-<!-- BEGIN RECIP -->
-<p>
-<span class="title"><img src="{TEMPLATESDIR}/images/star.gif" alt=""> <a href="[IFADMIN../]{TRACKLINKURL}" class="reciplink" {EXTERNALLINKS}>{LINKTITLE}</a></span> {LINKNEW} {LINKUPDATED} {LINKADMIN}<br>
-<span class="labels">Description:</span> {LINKDESCRIPTION} <br>
-<IF {SWITCH_RATINGS}><span class="labels">Rating:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE} based on {LINKVOTES} votes)<br></IF>
-<IF {SWITCH_HITS}><span class="labels">Hits Out:</span> {LINKHITS} | <span class="labels">Hits In:</span> {LINKHITSIN}<br></IF>
-<span class="labels">Category:</span> {LINKNAV[trim]} <br>
-[<a href="[IFADMIN../]{LINKDETAILSURL}">View Link Details</a>]
-</p>
-<!-- END RECIP -->
-<!-- BEGIN REGULAR -->
-<p>
-<span class="title"><a href="[IFADMIN../]{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a></span> {LINKNEW} {LINKUPDATED} {LINKADMIN}<br>
-<span class="labels">Description:</span> {LINKDESCRIPTION} <br>
-<IF {SWITCH_RATINGS}><span class="labels">Rating:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE} based on {LINKVOTES} votes)<br></IF>
-<IF {SWITCH_HITS}><span class="labels">Hits Out:</span> {LINKHITS} | <span class="labels">Hits In:</span> {LINKHITSIN}<br></IF>
-<span class="labels">Category:</span> {LINKNAV[trim]}<br>
-[<a href="[IFADMIN../]{LINKDETAILSURL}">View Link Details</a>]
-</p>
-<!-- END REGULAR -->
-<!-- END SEARCH links RESULTS -->
-<IF {LINKMULTIPAGE}>
-<p>Page: {LINKPREVIOUS} <b>{LINKCURRENTPAGE}</b> {LINKNEXT}</p>
-</IF>
-</td>
-</IF>
-
-<IF {COMMENTTOTAL} and {SWITCH_COMMENTS}>
-<td valign="top" width="25%">
-<!-- BEGIN SEARCH comments RESULTS -->
-<p>
-<span class="labels">Associated Link:</span> <a href="[IFADMIN../]link.php?id={COMMENTLINKID}">{COMMENTLINKNAME}</a> <br>
-<span class="labels">Thread:</span> <a href="[IFADMIN../]comments.php?id={COMMENTLINKID}">Comments on {COMMENTLINKNAME}</a> <br>
-<span class="labels">Poster Name:</span> {COMMENTPOSTERNAME} <br>
-<span class="labels">Message:</span> <br>{COMMENTMESSAGE[150]} <br>
-<span class="labels">Date:</span> {COMMENTDATE} {COMMENTISNEW} {COMMENTISUPDATED}<br>
-{COMMENTADMIN}
-</p>
-<!-- END SEARCH comments RESULTS -->
-<IF {COMMENTMULTIPAGE}>
-<p>Page: {COMMENTPREVIOUS} <b>{COMMENTCURRENTPAGE}</b> {COMMENTNEXT}</p>
-</IF>
-</td>
-</IF>
-
-<IF {MEMBERTOTAL} and {SWITCH_MEMBERS}>
-<td valign="top" width="25%">
-<!-- BEGIN SEARCH members RESULTS -->
-<p>
-<span class="labels">Member Name:</span> {MEMBERNAME} <br>
-<span class="labels">Date Registered:</span> {MEMBERREGDATE} <br>
-<span class="labels">Links:</span> <a href="[IFADMIN../]search.php?whichtype=links&amp;filled=1&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;condition==">{MEMBERLINKS}</a> <br>
-<IF {SWITCH_COMMENTS}><span class="labels">Comments:</span> <a href="[IFADMIN../]search.php?whichtype=comments&amp;filled=1&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;condition==">{MEMBERCOMMENTS}</a> <br></IF>
-<IF {SWITCH_HITS}><span class="labels">Hits:</span> {MEMBERTOTALHITSIN} in, {MEMBERTOTALHITS} out <br></IF>
-[<a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">View Profile</a>]<br>
-{MEMBERADMIN}
-</p>
-<!-- END SEARCH members RESULTS -->
-<IF {MEMBERMULTIPAGE}>
-<p>Page: {MEMBERPREVIOUS} <b>{MEMBERCURRENTPAGE}</b> {MEMBERNEXT}</p>
-</IF>
-</td>
-</IF>
-</tr>
-</table>
-
-<div align="center">
-<form action="search.php?{ALLVARS}" method="post">
-Narrow to results containing <input type="text" name="refine" size="15"> <input type="submit" value="Refine" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Search</div><br>
+
+<p>Found {NUMRESULTS} matching results for "{SEARCHTERM}": </p>
+
+<table>
+<tr>
+<IF {CATEGORYTOTAL}><td><u>{CATEGORYTOTAL} total matching categories</u></td></IF>
+<IF {LINKTOTAL}><td><u>{LINKTOTAL} total matching links</u></td></IF>
+<IF {COMMENTTOTAL} and {SWITCH_COMMENTS}><td><u>{COMMENTTOTAL} total matching comments</u></td></IF>
+<IF {MEMBERTOTAL} and {SWITCH_MEMBERS}><td><u>{MEMBERTOTAL} total matching members</u></td></IF>
+</tr>
+
+<tr>
+<IF {CATEGORYTOTAL}>
+<td valign="top" width="25%">
+<!-- BEGIN SEARCH categories RESULTS -->
+<p>
+<span class="title"><a href="{CATURL}">{CATNAME}</a> {CATADMIN} </span><br>
+<span class="labels">Description:</span> {CATDESCRIPTION} <br>
+<span class="labels">Parent:</span> <a href="[IFADMIN../]index.php?action=displaycat&amp;catid={CATPARENT}">{CATPARENTNAME}</a> <br>
+<span class="labels">Number of links:</span> {CATNUMLINKS} <br>
+<span class="labels">Number of subcategories:</span> {CATNUMSUB}
+</p>
+<!-- END SEARCH categories RESULTS -->
+<IF {CATEGORYMULTIPAGE}>
+<p>Page: {CATEGORYPREVIOUS} <b>{CATEGORYCURRENTPAGE}</b> {CATEGORYNEXT}</p>
+</IF>
+</td>
+</IF>
+
+<IF {LINKTOTAL}>
+<td valign="top" width="25%">
+<!-- BEGIN SEARCH links RESULTS -->
+<!-- BEGIN RECIP -->
+<p>
+<span class="title"><img src="{TEMPLATESDIR}/images/star.gif" alt=""> <a href="{TRACKLINKURL}" class="reciplink" {EXTERNALLINKS}>{LINKTITLE}</a></span> {LINKNEW} {LINKUPDATED} {LINKADMIN}<br>
+<span class="labels">Description:</span> {LINKDESCRIPTION} <br>
+<IF {SWITCH_RATINGS}><span class="labels">Rating:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE} based on {LINKVOTES} votes)<br></IF>
+<IF {SWITCH_HITS}><span class="labels">Hits Out:</span> {LINKHITS} | <span class="labels">Hits In:</span> {LINKHITSIN}<br></IF>
+<span class="labels">Category:</span> {LINKNAV[trim]} <br>
+[<a href="{LINKDETAILSURL}">View Link Details</a>]
+</p>
+<!-- END RECIP -->
+<!-- BEGIN REGULAR -->
+<p>
+<span class="title"><a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a></span> {LINKNEW} {LINKUPDATED} {LINKADMIN}<br>
+<span class="labels">Description:</span> {LINKDESCRIPTION} <br>
+<IF {SWITCH_RATINGS}><span class="labels">Rating:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE} based on {LINKVOTES} votes)<br></IF>
+<IF {SWITCH_HITS}><span class="labels">Hits Out:</span> {LINKHITS} | <span class="labels">Hits In:</span> {LINKHITSIN}<br></IF>
+<span class="labels">Category:</span> {LINKNAV[trim]}<br>
+[<a href="{LINKDETAILSURL}">View Link Details</a>]
+</p>
+<!-- END REGULAR -->
+<!-- END SEARCH links RESULTS -->
+<IF {LINKMULTIPAGE}>
+<p>Page: {LINKPREVIOUS} <b>{LINKCURRENTPAGE}</b> {LINKNEXT}</p>
+</IF>
+</td>
+</IF>
+
+<IF {COMMENTTOTAL} and {SWITCH_COMMENTS}>
+<td valign="top" width="25%">
+<!-- BEGIN SEARCH comments RESULTS -->
+<p>
+<span class="labels">Associated Link:</span> <a href="[IFADMIN../]link.php?id={COMMENTLINKID}">{COMMENTLINKNAME}</a> <br>
+<span class="labels">Thread:</span> <a href="[IFADMIN../]comments.php?id={COMMENTLINKID}">Comments on {COMMENTLINKNAME}</a> <br>
+<span class="labels">Poster Name:</span> {COMMENTPOSTERNAME} <br>
+<span class="labels">Message:</span> <br>{COMMENTMESSAGE[150]} <br>
+<span class="labels">Date:</span> {COMMENTDATE} {COMMENTISNEW} {COMMENTISUPDATED}<br>
+{COMMENTADMIN}
+</p>
+<!-- END SEARCH comments RESULTS -->
+<IF {COMMENTMULTIPAGE}>
+<p>Page: {COMMENTPREVIOUS} <b>{COMMENTCURRENTPAGE}</b> {COMMENTNEXT}</p>
+</IF>
+</td>
+</IF>
+
+<IF {MEMBERTOTAL} and {SWITCH_MEMBERS}>
+<td valign="top" width="25%">
+<!-- BEGIN SEARCH members RESULTS -->
+<p>
+<span class="labels">Member Name:</span> {MEMBERNAME} <br>
+<span class="labels">Date Registered:</span> {MEMBERREGDATE} <br>
+<span class="labels">Links:</span> <a href="[IFADMIN../]search.php?whichtype=links&amp;filled=1&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;condition==">{MEMBERLINKS}</a> <br>
+<IF {SWITCH_COMMENTS}><span class="labels">Comments:</span> <a href="[IFADMIN../]search.php?whichtype=comments&amp;filled=1&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;condition==">{MEMBERCOMMENTS}</a> <br></IF>
+<IF {SWITCH_HITS}><span class="labels">Hits:</span> {MEMBERTOTALHITSIN} in, {MEMBERTOTALHITS} out <br></IF>
+[<a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">View Profile</a>]<br>
+{MEMBERADMIN}
+</p>
+<!-- END SEARCH members RESULTS -->
+<IF {MEMBERMULTIPAGE}>
+<p>Page: {MEMBERPREVIOUS} <b>{MEMBERCURRENTPAGE}</b> {MEMBERNEXT}</p>
+</IF>
+</td>
+</IF>
+</tr>
+</table>
+
+<div align="center">
+<form action="search.php?{ALLVARS}" method="post">
+Narrow to results containing <input type="text" name="refine" size="15"> <input type="submit" value="Refine" class="button">
+</form>
 </div>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/searchcats.tpl wsnlinks/templates/default/searchcats.tpl
--- 400/templates/default/searchcats.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/searchcats.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,44 +1,44 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Search Categories</div><br>
-
-<IF {NUMRESULTS} is greater than 0>
-<p>Found {NUMRESULTS} matching categories for "{SEARCHTERM}": </p>
-
-<form action="search.php?{ALLVARS}" method="post">
-<div class="sort">
-Sort results by 
-<select name="orderfield">
- <option value="name">name</option>
- <option value="numlinks">number of links</option>
- <option value="time">date added</option>
-</select>
-in 
-<select name="orderascdesc">
- <option value="asc">ascending</option>
- <option value="desc">descending</option>
-</select>
-order. <input type="submit" value="Sort" class="button">
-</div>
-</form>
-</IF>
-
-<table>
-<!-- BEGIN SEARCH categories RESULTS -->
-<td>
-<span class="title"><a href="[IFADMIN../]index.php?action=displaycat&amp;catid={CATID}">{CATNAME}</a> {CATADMIN} </span><br>
-<span class="labels">Description:</span> {CATDESCRIPTION} <br>
-<span class="labels">Parent:</span> <a href="[IFADMIN../]index.php?action=displaycat&amp;catid={CATPARENT}">{CATPARENTNAME}</a> <br>
-<span class="labels">Number of links:</span> {CATNUMLINKS} <br>
-<span class="labels">Number of subcategories:</span> {CATNUMSUB}
-</td>
-<!-- END SEARCH categories RESULTS -->
-</table>
-
-<IF {MULTIPAGE}>
-<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT} </p>
-</IF>
-
-<div align="center">
-<form action="search.php?{ALLVARS}" method="post">
-Narrow results to categories containing <input type="text" name="refine" size="15"> <input type="submit" value="Refine" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Search Categories</div><br>
+
+<IF {NUMRESULTS} is greater than 0>
+<p>Found {NUMRESULTS} matching categories for "{SEARCHTERM}": </p>
+
+<form action="search.php?{ALLVARS}" method="post">
+<div class="sort">
+Sort results by 
+<select name="orderfield">
+ <option value="name">name</option>
+ <option value="numlinks">number of links</option>
+ <option value="time">date added</option>
+</select>
+in 
+<select name="orderascdesc">
+ <option value="asc">ascending</option>
+ <option value="desc">descending</option>
+</select>
+order. <input type="submit" value="Sort" class="button">
+</div>
+</form>
+</IF>
+
+<table>
+<!-- BEGIN SEARCH categories RESULTS -->
+<td>
+<span class="title"><a href="{CATURL}">{CATNAME}</a> {CATADMIN} </span><br>
+<span class="labels">Description:</span> {CATDESCRIPTION} <br>
+<span class="labels">Parent:</span> <a href="[IFADMIN../]index.php?action=displaycat&amp;catid={CATPARENT}">{CATPARENTNAME}</a> <br>
+<span class="labels">Number of links:</span> {CATNUMLINKS} <br>
+<span class="labels">Number of subcategories:</span> {CATNUMSUB}
+</td>
+<!-- END SEARCH categories RESULTS -->
+</table>
+
+<IF {MULTIPAGE}>
+<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT} </p>
+</IF>
+
+<div align="center">
+<form action="search.php?{ALLVARS}" method="post">
+Narrow results to categories containing <input type="text" name="refine" size="15"> <input type="submit" value="Refine" class="button">
+</form>
 </div>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/searchcomments.tpl wsnlinks/templates/default/searchcomments.tpl
--- 400/templates/default/searchcomments.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/searchcomments.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,45 +1,45 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Search Comments</div><br>
-
-<IF {NUMRESULTS} is greater than 0>
-<p>Found {NUMRESULTS} matching comments for "{SEARCHTERM}": </p>
-
-<form action="search.php?{ALLVARS}" method="post">
-<div class="sort">
-Sort results by 
-<select name="orderfield">
- <option value="approved/votes">rating</option>
- <option value="postername">poster name</option>
- <option value="time">date added</option>
-</select>
-in 
-<select name="orderascdesc">
- <option value="asc">ascending</option>
- <option value="desc">descending</option>
-</select>
-order. <input type="submit" value="Sort" class="button">
-</div>
-</form>
-</IF>
-
-<table>
-<!-- BEGIN SEARCH comments RESULTS -->
-<td>
-<span class="labels">Associated Link:</span> <a href="[IFADMIN../]link.php?action=detail&amp;id={COMMENTLINKID}">{COMMENTLINKNAME}</a> <br>
-<span class="labels">Thread:</span> <a href="[IFADMIN../]comments.php?id={COMMENTLINKID}">Comments on {COMMENTLINKNAME}</a> <br> 
-<span class="labels">Poster Name:</span> {COMMENTPOSTERNAME} <br>
-<span class="labels">Message:</span> <br>{COMMENTMESSAGE} <br>
-<span class="labels">Date:</span> {COMMENTDATE} {COMMENTISNEW} {COMMENTISUPDATED}<br>
-{COMMENTADMIN}
-</td>
-<!-- END SEARCH comments RESULTS -->
-</table>
-
-<IF {MULTIPAGE}>
-<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT} </p>
-</IF>
-
-<div align="center">
-<form action="search.php?{ALLVARS}" method="post">
-Narrow results to comments containing <input type="text" name="refine" size="15"> <input type="submit" value="Refine" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Search Comments</div><br>
+
+<IF {NUMRESULTS} is greater than 0>
+<p>Found {NUMRESULTS} matching comments for "{SEARCHTERM}": </p>
+
+<form action="search.php?{ALLVARS}" method="post">
+<div class="sort">
+Sort results by 
+<select name="orderfield">
+ <option value="approved/votes">rating</option>
+ <option value="postername">poster name</option>
+ <option value="time">date added</option>
+</select>
+in 
+<select name="orderascdesc">
+ <option value="asc">ascending</option>
+ <option value="desc">descending</option>
+</select>
+order. <input type="submit" value="Sort" class="button">
+</div>
+</form>
+</IF>
+
+<table>
+<!-- BEGIN SEARCH comments RESULTS -->
+<td>
+<span class="labels">Associated Link:</span> <a href="[IFADMIN../]link.php?action=detail&amp;id={COMMENTLINKID}">{COMMENTLINKNAME}</a> <br>
+<span class="labels">Thread:</span> <a href="[IFADMIN../]comments.php?id={COMMENTLINKID}">Comments on {COMMENTLINKNAME}</a> <br> 
+<span class="labels">Poster Name:</span> {COMMENTPOSTERNAME} <br>
+<span class="labels">Message:</span> <br>{COMMENTMESSAGE} <br>
+<span class="labels">Date:</span> {COMMENTDATE} {COMMENTISNEW} {COMMENTISUPDATED}<br>
+{COMMENTADMIN}
+</td>
+<!-- END SEARCH comments RESULTS -->
+</table>
+
+<IF {MULTIPAGE}>
+<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT} </p>
+</IF>
+
+<div align="center">
+<form action="search.php?{ALLVARS}" method="post">
+Narrow results to comments containing <input type="text" name="refine" size="15"> <input type="submit" value="Refine" class="button">
+</form>
 </div>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/searchmembers.tpl wsnlinks/templates/default/searchmembers.tpl
--- 400/templates/default/searchmembers.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/searchmembers.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,49 +1,49 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Search Members</div><br>
-
-<IF {NUMRESULTS} is greater than 0>
-<p>Found {NUMRESULTS} matching members for "{SEARCHTERM}": </p>
-
-<form action="search.php?{ALLVARS}" method="post">
-<div class="sort">
-Sort results by 
-<select name="orderfield">
- <option value="name">name</option>
- <option value="links">links submitted</option>
-<IF {SWITCH_COMMENTS}>
- <option value="comments">comments posted</option>
-</IF>
- <option value="time">registration date</option>
-</select>
-in 
-<select name="orderascdesc">
- <option value="asc">ascending</option>
- <option value="desc">descending</option>
-</select>
-order. <input type="submit" value="Sort" class="button">
-</div>
-</form>
-</IF>
-
-<table>
-<!-- BEGIN SEARCH members RESULTS -->
-<td>
-<span class="mediumtitle"><a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</span></a> {MEMBERADMIN}<br>
-<span class="labels">Date Registered:</span> {MEMBERREGDATE} <br>
-<span class="labels">Links:</span> <a href="[IFADMIN../]search.php?whichtype=links&amp;filled=1&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;condition==">{MEMBERLINKS}</a> <br>
-<IF {SWITCH_COMMENTS}><span class="labels">Comments:</span> <a href="[IFADMIN../]search.php?whichtype=comments&amp;filled=1&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;condition==">{MEMBERCOMMENTS}</a> <br></IF>
-<IF {MEMBERLOCATION}><span class="labels">Location:</span> {MEMBERLOCATION}<br></IF>
-<IF {MEMBERINTERESTS}><span class="labels">Interests:</span> {MEMBERINTERESTS}<br></IF>
-<IF {SWITCH_MEMBERHITS}>{MEMBERTOTALHITSIN} hits in, {MEMBERTOTALHITS} hits out<br></IF>
-</td>
-<!-- END SEARCH members RESULTS -->
-</table>
-
-<IF {MULTIPAGE}>
-<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT} </p>
-</IF>
-
-<div align="center">
-<form action="search.php?{ALLVARS}" method="post">
-Narrow results to members containing <input type="text" name="refine" size="15"> <input type="submit" value="Refine" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Search Members</div><br>
+
+<IF {NUMRESULTS} is greater than 0>
+<p>Found {NUMRESULTS} matching members for "{SEARCHTERM}": </p>
+
+<form action="search.php?{ALLVARS}" method="post">
+<div class="sort">
+Sort results by 
+<select name="orderfield">
+ <option value="name">name</option>
+ <option value="links">links submitted</option>
+<IF {SWITCH_COMMENTS}>
+ <option value="comments">comments posted</option>
+</IF>
+ <option value="time">registration date</option>
+</select>
+in 
+<select name="orderascdesc">
+ <option value="asc">ascending</option>
+ <option value="desc">descending</option>
+</select>
+order. <input type="submit" value="Sort" class="button">
+</div>
+</form>
+</IF>
+
+<table>
+<!-- BEGIN SEARCH members RESULTS -->
+<td>
+<span class="mediumtitle"><a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</span></a> {MEMBERADMIN}<br>
+<span class="labels">Date Registered:</span> {MEMBERREGDATE} <br>
+<span class="labels">Links:</span> <a href="[IFADMIN../]search.php?whichtype=links&amp;filled=1&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;condition==">{MEMBERLINKS}</a> <br>
+<IF {SWITCH_COMMENTS}><span class="labels">Comments:</span> <a href="[IFADMIN../]search.php?whichtype=comments&amp;filled=1&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;condition==">{MEMBERCOMMENTS}</a> <br></IF>
+<IF {MEMBERLOCATION}><span class="labels">Location:</span> {MEMBERLOCATION}<br></IF>
+<IF {MEMBERINTERESTS}><span class="labels">Interests:</span> {MEMBERINTERESTS}<br></IF>
+<IF {SWITCH_MEMBERHITS}>{MEMBERTOTALHITSIN} hits in, {MEMBERTOTALHITS} hits out<br></IF>
+</td>
+<!-- END SEARCH members RESULTS -->
+</table>
+
+<IF {MULTIPAGE}>
+<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT} </p>
+</IF>
+
+<div align="center">
+<form action="search.php?{ALLVARS}" method="post">
+Narrow results to members containing <input type="text" name="refine" size="15"> <input type="submit" value="Refine" class="button">
+</form>
 </div>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/search.tpl wsnlinks/templates/default/search.tpl
--- 400/templates/default/search.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/search.tpl	2006-09-13 09:29:39.000000000 -0700
@@ -1,71 +1,71 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Search Links</div><br>
-
-<IF {NUMRESULTS}>
-<p>Found {NUMRESULTS} matching links for "{SEARCHTERM}": </p>
-
-<form action="search.php?{ALLVARS}" method="post">
-<div class="sort">
-Sort results by 
-<select name="orderfield">
- <option value="title">title</option>
-<IF {SWITCH_RATINGS}>
- <option value="rating">rating</option>
- <option value="votes">votes</option>
-</IF>
-<IF {SWITCH_HITS}>
- <option value="hits">hits out</option>
- <option value="hitsin">hits in</option>
-</IF>
-<IF {SWITCH_COMMENTS}>
- <option value="numcomments">number of comments</option>
-</IF>
-<IF {SWITCH_PAGERANK}>
- <option value="pagerank">pagerank</option>
-</IF>
-</select>
-in 
-<select name="orderascdesc">
- <option value="asc">ascending</option>
- <option value="desc">descending</option>
-</select>
-order. <input type="submit" value="Sort" class="button">
-</div>
-</form>
-</IF>
-
-<table>
-<!-- BEGIN SEARCH links RESULTS -->
-<!-- BEGIN RECIP -->
-<td>
-<span class="title"><img src="{TEMPLATESDIR}/images/star.gif" alt=""> <a href="[IFADMIN../]{TRACKLINKURL}" class="reciplink" {EXTERNALLINKS}>{LINKTITLE}</a></span> {LINKNEW} {LINKUPDATED} {LINKADMIN}<br>
-<span class="labels">Description:</span> {LINKDESCRIPTION} <br>
-<IF {SWITCH_RATINGS}><span class="labels">Rating:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE} based on {LINKVOTES} votes)<br></IF>
-<IF {SWITCH_HITS}><span class="labels">Hits Out:</span> {LINKHITS} | <span class="labels">Hits In:</span> {LINKHITSIN}<br></IF>
-<span class="labels">Category:</span> {LINKNAV[trim]} <br>
-[<a href="[IFADMIN../]{LINKDETAILSURL}">View Link Details</a>]
-</td>
-<!-- END RECIP -->
-</table>
-<table>
-<!-- BEGIN REGULAR -->
-<td>
-<span class="title"><a href="[IFADMIN../]{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a></span> {LINKNEW} {LINKUPDATED} {LINKADMIN}<br>
-<span class="labels">Description:</span> {LINKDESCRIPTION} <br>
-<IF {SWITCH_RATINGS}><span class="labels">Rating:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE} based on {LINKVOTES} votes)<br></IF>
-<IF {SWITCH_HITS}><span class="labels">Hits Out:</span> {LINKHITS} | <span class="labels">Hits In:</span> {LINKHITSIN}<br></IF>
-<span class="labels">Category:</span> {LINKNAV[trim]} <br>
-[<a href="[IFADMIN../]{LINKDETAILSURL}">View Link Details</a>]
-</td>
-<!-- END REGULAR -->
-<!-- END SEARCH links RESULTS -->
-</table>
-
-<IF {MULTIPAGE}>
-<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<div align="center">
-<form action="search.php?{ALLVARS}" method="post">
-Narrow results to links containing <input type="text" name="refine" size="15"> <input type="submit" value="Refine" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Search Links</div><br>
+
+<IF {NUMRESULTS}>
+<p>Found {NUMRESULTS} matching links for "{SEARCHTERM}": </p>
+
+<form action="search.php?{ALLVARS}" method="post">
+<div class="sort">
+Sort results by 
+<select name="orderfield">
+ <option value="title">title</option>
+<IF {SWITCH_RATINGS}>
+ <option value="rating">rating</option>
+ <option value="votes">votes</option>
+</IF>
+<IF {SWITCH_HITS}>
+ <option value="hits">hits out</option>
+ <option value="hitsin">hits in</option>
+</IF>
+<IF {SWITCH_COMMENTS}>
+ <option value="numcomments">number of comments</option>
+</IF>
+<IF {SWITCH_PAGERANK}>
+ <option value="pagerank">pagerank</option>
+</IF>
+</select>
+in 
+<select name="orderascdesc">
+ <option value="asc">ascending</option>
+ <option value="desc">descending</option>
+</select>
+order. <input type="submit" value="Sort" class="button">
+</div>
+</form>
+</IF>
+
+<table>
+<!-- BEGIN SEARCH links RESULTS -->
+<!-- BEGIN RECIP -->
+<td>
+<span class="title"><img src="{TEMPLATESDIR}/images/star.gif" alt=""> <a href="{TRACKLINKURL}" class="reciplink" {EXTERNALLINKS}>{LINKTITLE}</a></span> {LINKNEW} {LINKUPDATED} {LINKADMIN}<br>
+<span class="labels">Description:</span> {LINKDESCRIPTION} <br>
+<IF {SWITCH_RATINGS}><span class="labels">Rating:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE} based on {LINKVOTES} votes)<br></IF>
+<IF {SWITCH_HITS}><span class="labels">Hits Out:</span> {LINKHITS} | <span class="labels">Hits In:</span> {LINKHITSIN}<br></IF>
+<span class="labels">Category:</span> {LINKNAV[trim]} <br>
+[<a href="{LINKDETAILSURL}">View Link Details</a>]
+</td>
+<!-- END RECIP -->
+</table>
+<table>
+<!-- BEGIN REGULAR -->
+<td>
+<span class="title"><a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a></span> {LINKNEW} {LINKUPDATED} {LINKADMIN}<br>
+<span class="labels">Description:</span> {LINKDESCRIPTION} <br>
+<IF {SWITCH_RATINGS}><span class="labels">Rating:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE} based on {LINKVOTES} votes)<br></IF>
+<IF {SWITCH_HITS}><span class="labels">Hits Out:</span> {LINKHITS} | <span class="labels">Hits In:</span> {LINKHITSIN}<br></IF>
+<span class="labels">Category:</span> {LINKNAV[trim]} <br>
+[<a href="{LINKDETAILSURL}">View Link Details</a>]
+</td>
+<!-- END REGULAR -->
+<!-- END SEARCH links RESULTS -->
+</table>
+
+<IF {MULTIPAGE}>
+<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<div align="center">
+<form action="search.php?{ALLVARS}" method="post">
+Narrow results to links containing <input type="text" name="refine" size="15"> <input type="submit" value="Refine" class="button">
+</form>
 </div>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/showvotecode.tpl wsnlinks/templates/default/showvotecode.tpl
--- 400/templates/default/showvotecode.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/showvotecode.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,24 +1,24 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > Voting Code</div><br>
-
-<p>This is the HTML you need to insert on your site to allow your visitors to vote for it:</p>
-
-<center>
-<textarea rows="15" cols="70">
-<form action="{DIRURL}/vote.php?action=vote&id={LINKID}" method="post">
-<b>Rate this site:</b>
-<select name="votevalue">
- <option value="5">5 - Perfect</option>
- <option value="4">4 - Good</option>
- <option value="3">3 - Average</option>
- <option value="2">2 - Mediocre</option>
- <option value="1">1 - Bad</option>
-</select>
-<input type="submit" value="Rate this site">
-</form>
-</textarea>
-</center>
-
-<p>If you prefer a simple link, you can get credit for people you send to {SITETITLE} by using this linking code:</p>
-<p align="center">
-<textarea rows="5" cols="70"><a href="{DIRURL}/in.php?id={LINKID}">{SITETITLE}</a></textarea>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > Voting Code</div><br>
+
+<p>This is the HTML you need to insert on your site to allow your visitors to vote for it:</p>
+
+<center>
+<textarea rows="15" cols="70">
+<form action="{DIRURL}/vote.php?action=vote&id={LINKID}" method="post">
+<b>Rate this site:</b>
+<select name="votevalue">
+ <option value="5">5 - Perfect</option>
+ <option value="4">4 - Good</option>
+ <option value="3">3 - Average</option>
+ <option value="2">2 - Mediocre</option>
+ <option value="1">1 - Bad</option>
+</select>
+<input type="submit" value="Rate this site">
+</form>
+</textarea>
+</center>
+
+<p>If you prefer a simple link, you can get credit for people you send to {SITETITLE} by using this linking code:</p>
+<p align="center">
+<textarea rows="5" cols="70"><a href="{DIRURL}/in.php?id={LINKID}">{SITETITLE}</a></textarea>
 </p>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/showvotes.tpl wsnlinks/templates/default/showvotes.tpl
--- 400/templates/default/showvotes.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/showvotes.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,10 +1,10 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > Votes</div><br>
-
-<!-- BEGIN RATINGS -->
-<p>
-{MEMBERNAME} ({VOTEIP}) submitted a rating of {VOTEVALUE} on {VOTEDATE}
-<IF {THISMEMBERGROUPCANEDITVOTES}>
-[<a href="showvotes.php?filled=1&amp;id={LINKID}&amp;action=delete&amp;voteid={VOTEID}">Delete Vote</a>]
-</IF>
-</p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > Votes</div><br>
+
+<!-- BEGIN RATINGS -->
+<p>
+{MEMBERNAME} ({VOTEIP}) submitted a rating of {VOTEVALUE} on {VOTEDATE}
+<IF {THISMEMBERGROUPCANEDITVOTES}>
+[<a href="showvotes.php?filled=1&amp;id={LINKID}&amp;action=delete&amp;voteid={VOTEID}">Delete Vote</a>]
+</IF>
+</p>
 <!-- END RATINGS -->
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/sitemap.tpl wsnlinks/templates/default/sitemap.tpl
--- 400/templates/default/sitemap.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/sitemap.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,10 +1,10 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Site Map</div><br>
-
-<!-- BEGIN MAP LINE -->
-<!-- BEGIN REGULAR -->
-{INDENT} <a href="index.php?action=displaycat&amp;catid={CATID}">{CATNAME}</a>
-<br>
-<!-- END REGULAR -->
-<!-- END MAP LINE -->
-
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Site Map</div><br>
+
+<!-- BEGIN MAP LINE -->
+<!-- BEGIN REGULAR -->
+{INDENT} <a href="{CATURL}">{CATNAME}</a>
+<br>
+<!-- END REGULAR -->
+<!-- END MAP LINE -->
+
 <br>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/sponsor.tpl wsnlinks/templates/default/sponsor.tpl
--- 400/templates/default/sponsor.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/default/sponsor.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,35 +1,35 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > Sponsor</div><br>
-
-<IF {LINKSPONSORFUNDS}><p>You have ${LINKSPONSORFUNDS} in funds remaining.</p></IF>
-
-<p>You may purchase priority positioning for "{LINKTITLE}" at a rate of USD ${SPONSORCHARGE1} per <IF {SPONSORUSEPPC} is yes>click<ELSE><IF {FEEDURATION} is 1>day<ELSE>{FEEDURATION} days</IF></IF>. Click the 'buy now' button to purchase whatever length of sponsorship you wish.</p>
-
-<IF {SPONSORBONUSCUTOFF}><p>If your sponsorship purchase totals more than ${SPONSORBONUSCUTOFF}, you will be credited with an additional bonus of {SPONSORBONUSPERCENT}% of your deposit.</p></IF> 
-
-<IF {PAYPALEMAIL}>
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_xclick">
-<input type="hidden" name="business" value="{PAYPALEMAIL}">
-<input type="hidden" name="undefined_quantity" value="1">
-<input type="hidden" name="item_name" value="{SITETITLE} Sponsorship">
-<input type="hidden" name="item_number" value="{SPONSORITEM1}">
-<input type="hidden" name="amount" value="{SPONSORCHARGE1}">
-<input type="hidden" name="no_shipping" value="1">
-<input type="hidden" name="return" value="{DIRURL}">
-<input type="hidden" name="cancel_return" value="{DIRURL}">
-<input type="hidden" name="no_note" value="1">
-<input type="hidden" name="currency_code" value="USD">
-<table><tr><td><input type="hidden" name="on0" value="linkid"></td><td><input type="hidden" name="os0" value="{LINKID}" maxlength="200"></td></tr></table><input type="image" src="https://www.paypal.com/images/x-click-but23.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!">
-</form>
-</IF>
-
-<IF {CHECKOUTNUM}>
-<form method="post" action="https://www.2checkout.com/2co/buyer/purchase"> 
-<input type="hidden" name="sid" value="{CHECKOUTNUM}"> 
-<input type="hidden" name="product_id" value="{SPONSORITEM1}"> 
-Purchase <input type="text" size="3" maxsize="4" name="quantity" value="1"> <IF {SPONSORDURATION} is 1>days<ELSE>group of {SPONSORDURATION} days</IF> of sponsorship <INPUT type="submit" value="Click to pay through 2CheckOut"> 
-</form> 
-2CheckOut.com Inc (Ohio, USA) is an authorized reseller for [your name here]. 
-</IF>
-
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > Sponsor</div><br>
+
+<IF {LINKSPONSORFUNDS}><p>You have ${LINKSPONSORFUNDS} in funds remaining.</p></IF>
+
+<p>You may purchase priority positioning for "{LINKTITLE}" at a rate of USD ${SPONSORCHARGE1} per <IF {SPONSORUSEPPC} is yes>click<ELSE><IF {FEEDURATION} is 1>day<ELSE>{FEEDURATION} days</IF></IF>. Click the 'buy now' button to purchase whatever length of sponsorship you wish.</p>
+
+<IF {SPONSORBONUSCUTOFF}><p>If your sponsorship purchase totals more than ${SPONSORBONUSCUTOFF}, you will be credited with an additional bonus of {SPONSORBONUSPERCENT}% of your deposit.</p></IF> 
+
+<IF {PAYPALEMAIL}>
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_xclick">
+<input type="hidden" name="business" value="{PAYPALEMAIL}">
+<input type="hidden" name="undefined_quantity" value="1">
+<input type="hidden" name="item_name" value="{SITETITLE} Sponsorship">
+<input type="hidden" name="item_number" value="{SPONSORITEM1}">
+<input type="hidden" name="amount" value="{SPONSORCHARGE1}">
+<input type="hidden" name="no_shipping" value="1">
+<input type="hidden" name="return" value="{DIRURL}">
+<input type="hidden" name="cancel_return" value="{DIRURL}">
+<input type="hidden" name="no_note" value="1">
+<input type="hidden" name="currency_code" value="USD">
+<table><tr><td><input type="hidden" name="on0" value="linkid"></td><td><input type="hidden" name="os0" value="{LINKID}" maxlength="200"></td></tr></table><input type="image" src="https://www.paypal.com/images/x-click-but23.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!">
+</form>
+</IF>
+
+<IF {CHECKOUTNUM}>
+<form method="post" action="https://www.2checkout.com/2co/buyer/purchase"> 
+<input type="hidden" name="sid" value="{CHECKOUTNUM}"> 
+<input type="hidden" name="product_id" value="{SPONSORITEM1}"> 
+Purchase <input type="text" size="3" maxsize="4" name="quantity" value="1"> <IF {SPONSORDURATION} is 1>days<ELSE>group of {SPONSORDURATION} days</IF> of sponsorship <INPUT type="submit" value="Click to pay through 2CheckOut"> 
+</form> 
+2CheckOut.com Inc (Ohio, USA) is an authorized reseller for [your name here]. 
+</IF>
+
 <p>Thank you for sponsoring the directory.</p>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/subscriptions.tpl wsnlinks/templates/default/subscriptions.tpl
--- 400/templates/default/subscriptions.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/subscriptions.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,37 +1,37 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Manage Subscriptions</div>
-
-<form action="profile.php?filled=1&amp;id={MEMBERID}&amp;action=unsubscribe" method="post">
-<p>Link thread subscriptions:</p>
-<table width="96%" cellpadding="3" cellspacing="1" border="0">
-<tr>
- <td {COLUMNHEADER}>&nbsp;</td>
- <td {COLUMNHEADER}>Thread</td>
- <td {COLUMNHEADER}>Description</td>
- <td {COLUMNHEADER}>Comments</td>
- <td {COLUMNHEADER}>Created</td>
- <td {COLUMNHEADER}>Last Post</td>
-</tr>
-<!-- BEGIN TOPLIST 1 -->
-<CONFIG>links,id,500,descending,notify LIKE '%|||{MEMBERID}|||%'</CONFIG>
-<input type="checkbox" name="linkids[]" value="{LINKID}"> {LINKTITLE} ({LINKNUMCOMMENTS} comments) <br>
-<tr>
- <td class="oddcolumns"><input type="checkbox" name="linkids[]" value="{LINKID}"></td>
- <td class="evencolumns"><a href="comments.php?id={LINKID}">{LINKTITLE}</a></td>
- <td class="oddcolumns">{LINKDESCRIPTION}</td>
- <td class="evencolumns">{LINKNUMCOMMENTS}</td>
- <td class="oddcolumns">{LINKDATE}</td>
- <td class="evencolumns">{LINKLASTCOMMENTDATE} <br>By <IF {LINKLASTPOSTERID}><a href="memberlist.php?action=profile&amp;id={LINKLASTPOSTERID}">{LINKLASTPOSTERNAME}</a><ELSE>{TOPICLASTPOSTERNAME}</IF>
-<a href="comments.php?id={LINKID}&amp;page=last#lastpost"><img src="{TEMPLATESDIR}/images/lastpost.gif" border="0" alt="last post"></a>
-</td>
-</tr>
-<!-- END TOPLIST 1 -->
-</table>
-
-<p>Category subscriptions:</p>
-<!-- BEGIN TOPLIST 2 -->
-<CONFIG>categories,id,500,descending,subscribers LIKE '%|||{MEMBERID}|||%'</CONFIG>
-<input type="checkbox" name="catids[]" value="{CATID}"> {CATNAME} ({CATNUMLINKS} links) <br>
-<!-- END TOPLIST 2 -->
-<br>
-<input type="submit" value="Cancel Subscriptions" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > Manage Subscriptions</div>
+
+<form action="profile.php?filled=1&amp;id={MEMBERID}&amp;action=unsubscribe" method="post">
+<p>Link thread subscriptions:</p>
+<table width="96%" cellpadding="3" cellspacing="1" border="0">
+<tr>
+ <td {COLUMNHEADER}>&nbsp;</td>
+ <td {COLUMNHEADER}>Thread</td>
+ <td {COLUMNHEADER}>Description</td>
+ <td {COLUMNHEADER}>Comments</td>
+ <td {COLUMNHEADER}>Created</td>
+ <td {COLUMNHEADER}>Last Post</td>
+</tr>
+<!-- BEGIN TOPLIST 1 -->
+<CONFIG>links,id,500,descending,notify LIKE '%|||{MEMBERID}|||%'</CONFIG>
+<input type="checkbox" name="linkids[]" value="{LINKID}"> {LINKTITLE} ({LINKNUMCOMMENTS} comments) <br>
+<tr>
+ <td class="oddcolumns"><input type="checkbox" name="linkids[]" value="{LINKID}"></td>
+ <td class="evencolumns"><a href="comments.php?id={LINKID}">{LINKTITLE}</a></td>
+ <td class="oddcolumns">{LINKDESCRIPTION}</td>
+ <td class="evencolumns">{LINKNUMCOMMENTS}</td>
+ <td class="oddcolumns">{LINKDATE}</td>
+ <td class="evencolumns">{LINKLASTCOMMENTDATE} <br>By <IF {LINKLASTPOSTERID}><a href="memberlist.php?action=profile&amp;id={LINKLASTPOSTERID}">{LINKLASTPOSTERNAME}</a><ELSE>{TOPICLASTPOSTERNAME}</IF>
+<a href="comments.php?id={LINKID}&amp;page=last#lastpost"><img src="{TEMPLATESDIR}/images/lastpost.gif" border="0" alt="last post"></a>
+</td>
+</tr>
+<!-- END TOPLIST 1 -->
+</table>
+
+<p>Category subscriptions:</p>
+<!-- BEGIN TOPLIST 2 -->
+<CONFIG>categories,id,500,descending,subscribers LIKE '%|||{MEMBERID}|||%'</CONFIG>
+<input type="checkbox" name="catids[]" value="{CATID}"> {CATNAME} ({CATNUMLINKS} links) <br>
+<!-- END TOPLIST 2 -->
+<br>
+<input type="submit" value="Cancel Subscriptions" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/suggestcat.tpl wsnlinks/templates/default/suggestcat.tpl
--- 400/templates/default/suggestcat.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/suggestcat.tpl	2006-09-17 18:41:01.000000000 -0700
@@ -1,4 +1,4 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{NAVIGATION} > Suggest Category</div>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{NAVIGATION} > Suggest Category</div>
 
 <span class="important">{INCOMPLETE}</span>
 
@@ -27,7 +27,7 @@
 </tr>
 <tr>
  <td class="labelscolumn"><span class="labels">Description:</span>
-<IF {SWITCH_WYSIWYGDESCRIP}>
+<IF {SWITCH_WYSIDESCRIP}>
 <p align="center">
 <IF {THISMEMBERPOSTEDITOR} is WYSIWYG><input type="submit" name="switcheditor" value="Switch to plain editor" class="button"></IF>
 <IF {THISMEMBERPOSTEDITOR} is plain><input type="submit" name="switcheditor" value="Switch to WYSIWYG editor" class="button"></IF>
diff -U 3 -H -d -r -N -- 400/templates/default/suggestlink.tpl wsnlinks/templates/default/suggestlink.tpl
--- 400/templates/default/suggestlink.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/suggestlink.tpl	2006-09-17 18:43:09.000000000 -0700
@@ -17,7 +17,7 @@
 }
 </script>
 
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{NAVIGATION} > Suggest Link</div>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{NAVIGATION} > Suggest Link</div>
 
 <IF {PREVIEWING}>
 <div class="comment">{PREVIEW}</div>
@@ -68,7 +68,7 @@
 </tr>
 <tr>
  <td class="labelscolumn"><span class="labels">Description:</span><br>Summarize the content of the site.
-<IF {SWITCH_WYSIWYGDESCRIP}>
+<IF {SWITCH_WYSIDESCRIP}>
 <p align="center">
 <IF {THISMEMBERPOSTEDITOR} is WYSIWYG><input type="submit" name="switcheditor" value="Switch to plain editor" class="button"></IF>
 <IF {THISMEMBERPOSTEDITOR} is plain><input type="submit" name="switcheditor" value="Switch to WYSIWYG editor" class="button"></IF>
diff -U 3 -H -d -r -N -- 400/templates/default/traderedit.tpl wsnlinks/templates/default/traderedit.tpl
--- 400/templates/default/traderedit.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/traderedit.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,34 +1,34 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">Member List</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > <a href="trader.php?id={MEMBERID}">Trader Profile</a> > Edit Feedback</div><br>
-
-<form action="trader.php?action=edit&amp;filled=1&amp;id={RATINGID}&amp;mid={MEMBERID}" method="post">
-<table>
-<tr>
- <td class="labelscolumn">ID of deal being rated:</td>
- <td class="optionscolumn"><input type="text" name="linkid" size="{STANDARDSIZE}" value="{RATINGLINKID}"></td>
-</tr>
-<tr>
- <td class="labelscolumn">In the dealing you're rating, you were the:</td>
- <td class="optionscolumn"><select name="type"><option value="buyer">buyer</option><option value="seller">seller</option><option value="trader">trader</option></select></td>
-</tr>
-<tr>
- <td class="labelscolumn">How would you rate your experience with {MEMBERNAME}?</td>
- <td class="optionscolumn">
-<input type="radio" name="rating" value="0" {RATINGNEUCHECK}> Neutral
-<input type="radio" name="rating" value="1" {RATINGPOSCHECK}> Positive
-<input type="radio" name="rating" value="-1" {RATINGNEGCHECK}> Negative
- </td>
-</tr>
-<tr>
- <td class="labelscolumn">Summary Comments:</td>
- <td class="optionscolumn"><input type="text" name="summary" size="{STANDARDSIZE}" maxlength="80" value="{RATINGSUMMARY}"></td>
-</tr>
-<tr>
- <td class="labelscolumn">Additional Comments: <br><br>This will be visible only to the person being rated and staff.</td>
- <td class="optionscolumn"><textarea name="morecomments" rows="10" cols="70">{RATINGMORECOMMENTS}</textarea></td>
-</tr>
-<tr>
- <td class="labelscolumn"> &nbsp; </td>
- <td class="optionscolumn"><input type="checkbox" name="delete" value="1"> Delete this rating?<br><input type="submit" value="Submit Revised Rating" class="button"></td>
-</tr>
-</table>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">Member List</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > <a href="trader.php?id={MEMBERID}">Trader Profile</a> > Edit Feedback</div><br>
+
+<form action="trader.php?action=edit&amp;filled=1&amp;id={RATINGID}&amp;mid={MEMBERID}" method="post">
+<table>
+<tr>
+ <td class="labelscolumn">ID of deal being rated:</td>
+ <td class="optionscolumn"><input type="text" name="linkid" size="{STANDARDSIZE}" value="{RATINGLINKID}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn">In the dealing you're rating, you were the:</td>
+ <td class="optionscolumn"><select name="type"><option value="buyer">buyer</option><option value="seller">seller</option><option value="trader">trader</option></select></td>
+</tr>
+<tr>
+ <td class="labelscolumn">How would you rate your experience with {MEMBERNAME}?</td>
+ <td class="optionscolumn">
+<input type="radio" name="rating" value="0" {RATINGNEUCHECK}> Neutral
+<input type="radio" name="rating" value="1" {RATINGPOSCHECK}> Positive
+<input type="radio" name="rating" value="-1" {RATINGNEGCHECK}> Negative
+ </td>
+</tr>
+<tr>
+ <td class="labelscolumn">Summary Comments:</td>
+ <td class="optionscolumn"><input type="text" name="summary" size="{STANDARDSIZE}" maxlength="80" value="{RATINGSUMMARY}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn">Additional Comments: <br><br>This will be visible only to the person being rated and staff.</td>
+ <td class="optionscolumn"><textarea name="morecomments" rows="10" cols="70">{RATINGMORECOMMENTS}</textarea></td>
+</tr>
+<tr>
+ <td class="labelscolumn"> &nbsp; </td>
+ <td class="optionscolumn"><input type="checkbox" name="delete" value="1"> Delete this rating?<br><input type="submit" value="Submit Revised Rating" class="button"></td>
+</tr>
+</table>
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/tradermain.tpl wsnlinks/templates/default/tradermain.tpl
--- 400/templates/default/tradermain.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/tradermain.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,117 +1,117 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">Member List</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > Trader Profile</div><br>
-
-<p><span class="title">Trader Profile of {MEMBERNAME}</span></p>
-
-<table width="100%">
-<tr>
-<td width="33%" valign="top" class="oddcolumns">
-<p align="center"><span class="labels">Trader Information</span></p>
-
-<b>
-<br>Feedback Score: {MEMBERTRADERRATING}
-<br>Positive Feedback: {POSITIVEPCT}%
-</b>
-<br>
-<br>Members who left positive: {POSITIVE}
-<br>Members who left negative: {NEGATIVE}
-<br>
-<p align="center"><a href="trader.php?action=add&amp;id={MEMBERID}">Submit Feedback For {MEMBERNAME}</a></p>
-</td>
-
-<td width="33%" valign="top" class="evencolumns">
-<p align="center"><span class="labels">Recent Ratings</span></p>
-
-<table>
-<tr>
- <td>&nbsp;</td>
- <td>Past Month</td>
- <td>Past 6 Months</td>
- <td>Past 12 Months</td>
-</tr>
-<tr>
- <td>Positive</td>
- <td>{POSMON}</td>
- <td>{POS6MON}</td>
- <td>{POS12MON}</td>
-</tr>
-<tr>
- <td>Neutral</td>
- <td>{NEUMON}</td>
- <td>{NEU6MON}</td>
- <td>{NEU12MON}</td>
-</tr>
-<tr>
- <td>Negative</td>
- <td>{NEGMON}</td>
- <td>{NEG6MON}</td>
- <td>{NEG12MON}</td>
-</tr>
-</table>
-
-</td>
-
-<td width="33%" valign="top" class="oddcolumns">
-<p align="center"><span class="labels">Contact Information</span></p>
-
-<p><span class="labels">Registered:</span> {MEMBERREGDATE}</p>
-
-<IF {MEMBERCANBEVIEWED}>
-<p>
-<span class="labels">Last seen:</span> {MEMBERLASTVISITDATE}
-<IF {MEMBERISONLINE}>
-<!-- BEGIN TOPLIST 3 -->
-<CONFIG>online,time,1,descending,memberid={MEMBERID}</CONFIG>
-<br>Current Location: <a href="{ONLINELOCATION}">{ONLINEAREANAME}</a>
-<!-- END TOPLIST 3 -->
-</IF>
-</p>
-</IF>
-
-<IF {MEMBERALLOWUSEREMAIL} and {THISMEMBERGROUPCANEMAILMEMBERS} and {MEMBERHASEMAIL}>
-<p><span class="labels">E-Mail:</span> <a href="emailmember.php?id={MEMBERID}">Send an E-mail to {MEMBERNAME}</a></p>
-</IF>
-
-<IF {SWITCH_PM} and {MEMBERACCEPTPMS}><p><span class="labels">Private Messaging:</span> <a href="privatemessaging.php?action=send&amp;sendto={MEMBERID}">Send a PM to {MEMBERNAME}</a></p></IF>
-
-<IF {MEMBERREADYTOCHAT}>
-<p><span class="labels">Instant Messaging:</span> <a href="im.php?with={MEMBERID}" target="win" onClick="window.open('','win','{IMDIMENSIONS}');">Send an instant message to {MEMBERNAME}</a></p></IF>
-
-<p><IF {MEMBERAIM}>AIM: {MEMBERAIM}<br></IF>
-<IF {MEMBERICQ}>ICQ: {MEMBERICQ}<br></IF>
-<IF {MEMBERMSN}>MSN: {MEMBERMSN}<br></IF>
-<IF {MEMBERYAHOO}>YIM: {MEMBERYAHOO}</IF></p>
-
-</td>
-</tr>
-</table>
-
-<IF {TOTAL}>
-<p><IF {VTYPE}><a href="trader.php?id={MEMBERID}">All Feedback</a><ELSE>All Feedback</IF> | <IF {VTYPE} is buyer>From Buyers<ELSE><a href="trader.php?id={MEMBERID}&amp;vtype=buyer">From Buyers</a></IF> | <IF {VTYPE} is seller>From Sellers<ELSE><a href="trader.php?id={MEMBERID}&amp;vtype=seller">From Sellers</a></IF> | <IF {VTYPE} is trader>From Trades<ELSE><a href="trader.php?id={MEMBERID}&amp;vtype=trader">From Trades</a></IF> | <IF {VTYPE} is left>Left For Others<ELSE><a href="trader.php?id={MEMBERID}&amp;vtype=left">Left For Others</a></IF></p>
-<table width="100%">
-<tr>
- <td {COLUMNHEADER}> &nbsp; </td>
- <td {COLUMNHEADER}>Rating Summary</td>
- <td {COLUMNHEADER}>Options</td>
- <td {COLUMNHEADER}>From</td>
- <td {COLUMNHEADER}>Date</td>
- <IF {RATINGCANVIEWFULL}><td {COLUMNHEADER}>Full Comments</td></IF>
-</tr>
-<!-- BEGIN ROW -->
-<tr>
- <td class="oddcolumns"><IF {RATINGVALUE} is 1>+</IF><IF {RATINGVALUE} is -1>-</IF></td>
- <td class="evencolumns"><IF {RATINGLINKID}><a href="link.php?action=detail&amp;id={RATINGLINKID}">{RATINGSUMMARY}</a><ELSE>{RATINGSUMMARY}</IF></td>
- <td class="oddcolumns">
-<IF {RATINGCANEDIT}>
-<a href="trader.php?action=edit&amp;id={RATINGID}&amp;mid={RATINGRATINGOF}"><img src="{TEMPLATESDIR}/images/editpost.gif" border="0" alt="Edit Rating"></a> 
-</IF>
-<IF {THISMEMBERISREGISTERED}>
-<a href="trader.php?action=report&amp;id={RATINGID}&amp;mid={RATINGRATINGOF}"><img src="{TEMPLATESDIR}/images/reportrating.gif" border="0" alt="Report Bad Rating"></a>
-</IF>
- </td>
- <td class="evencolumns"><IF {RATINGTYPE} is buyer>Buyer<ELSE IF {RATINGTYPE} is seller>Seller<ELSE IF {RATINGTYPE} is trader>Trader</IF> <a href="trader.php?id={MEMBERID}">{MEMBERNAME}</a> ({MEMBERTRADERRATING})</td>
- <td class="oddcolumns">{RATINGDATE}</td>
- <IF {RATINGCANVIEWFULL}><td class="evencolumns"><textarea rows="4" cols="45" readonly>{RATINGMORECOMMENTS}</textarea></td></IF>
-</tr>
-<!-- END ROW -->
-</table>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">Member List</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > Trader Profile</div><br>
+
+<p><span class="title">Trader Profile of {MEMBERNAME}</span></p>
+
+<table width="100%">
+<tr>
+<td width="33%" valign="top" class="oddcolumns">
+<p align="center"><span class="labels">Trader Information</span></p>
+
+<b>
+<br>Feedback Score: {MEMBERTRADERRATING}
+<br>Positive Feedback: {POSITIVEPCT}%
+</b>
+<br>
+<br>Members who left positive: {POSITIVE}
+<br>Members who left negative: {NEGATIVE}
+<br>
+<p align="center"><a href="trader.php?action=add&amp;id={MEMBERID}">Submit Feedback For {MEMBERNAME}</a></p>
+</td>
+
+<td width="33%" valign="top" class="evencolumns">
+<p align="center"><span class="labels">Recent Ratings</span></p>
+
+<table>
+<tr>
+ <td>&nbsp;</td>
+ <td>Past Month</td>
+ <td>Past 6 Months</td>
+ <td>Past 12 Months</td>
+</tr>
+<tr>
+ <td>Positive</td>
+ <td>{POSMON}</td>
+ <td>{POS6MON}</td>
+ <td>{POS12MON}</td>
+</tr>
+<tr>
+ <td>Neutral</td>
+ <td>{NEUMON}</td>
+ <td>{NEU6MON}</td>
+ <td>{NEU12MON}</td>
+</tr>
+<tr>
+ <td>Negative</td>
+ <td>{NEGMON}</td>
+ <td>{NEG6MON}</td>
+ <td>{NEG12MON}</td>
+</tr>
+</table>
+
+</td>
+
+<td width="33%" valign="top" class="oddcolumns">
+<p align="center"><span class="labels">Contact Information</span></p>
+
+<p><span class="labels">Registered:</span> {MEMBERREGDATE}</p>
+
+<IF {MEMBERCANBEVIEWED}>
+<p>
+<span class="labels">Last seen:</span> {MEMBERLASTVISITDATE}
+<IF {MEMBERISONLINE}>
+<!-- BEGIN TOPLIST 3 -->
+<CONFIG>online,time,1,descending,memberid={MEMBERID}</CONFIG>
+<br>Current Location: <a href="{ONLINELOCATION}">{ONLINEAREANAME}</a>
+<!-- END TOPLIST 3 -->
+</IF>
+</p>
+</IF>
+
+<IF {MEMBERALLOWUSEREMAIL} and {THISMEMBERGROUPCANEMAILMEMBERS} and {MEMBERHASEMAIL}>
+<p><span class="labels">E-Mail:</span> <a href="emailmember.php?id={MEMBERID}">Send an E-mail to {MEMBERNAME}</a></p>
+</IF>
+
+<IF {SWITCH_PM} and {MEMBERACCEPTPMS}><p><span class="labels">Private Messaging:</span> <a href="privatemessaging.php?action=send&amp;sendto={MEMBERID}">Send a PM to {MEMBERNAME}</a></p></IF>
+
+<IF {MEMBERREADYTOCHAT}>
+<p><span class="labels">Instant Messaging:</span> <a href="im.php?with={MEMBERID}" target="win" onClick="window.open('','win','{IMDIMENSIONS}');">Send an instant message to {MEMBERNAME}</a></p></IF>
+
+<p><IF {MEMBERAIM}>AIM: {MEMBERAIM}<br></IF>
+<IF {MEMBERICQ}>ICQ: {MEMBERICQ}<br></IF>
+<IF {MEMBERMSN}>MSN: {MEMBERMSN}<br></IF>
+<IF {MEMBERYAHOO}>YIM: {MEMBERYAHOO}</IF></p>
+
+</td>
+</tr>
+</table>
+
+<IF {TOTAL}>
+<p><IF {VTYPE}><a href="trader.php?id={MEMBERID}">All Feedback</a><ELSE>All Feedback</IF> | <IF {VTYPE} is buyer>From Buyers<ELSE><a href="trader.php?id={MEMBERID}&amp;vtype=buyer">From Buyers</a></IF> | <IF {VTYPE} is seller>From Sellers<ELSE><a href="trader.php?id={MEMBERID}&amp;vtype=seller">From Sellers</a></IF> | <IF {VTYPE} is trader>From Trades<ELSE><a href="trader.php?id={MEMBERID}&amp;vtype=trader">From Trades</a></IF> | <IF {VTYPE} is left>Left For Others<ELSE><a href="trader.php?id={MEMBERID}&amp;vtype=left">Left For Others</a></IF></p>
+<table width="100%">
+<tr>
+ <td {COLUMNHEADER}> &nbsp; </td>
+ <td {COLUMNHEADER}>Rating Summary</td>
+ <td {COLUMNHEADER}>Options</td>
+ <td {COLUMNHEADER}>From</td>
+ <td {COLUMNHEADER}>Date</td>
+ <IF {RATINGCANVIEWFULL}><td {COLUMNHEADER}>Full Comments</td></IF>
+</tr>
+<!-- BEGIN ROW -->
+<tr>
+ <td class="oddcolumns"><IF {RATINGVALUE} is 1>+</IF><IF {RATINGVALUE} is -1>-</IF></td>
+ <td class="evencolumns"><IF {RATINGLINKID}><a href="link.php?action=detail&amp;id={RATINGLINKID}">{RATINGSUMMARY}</a><ELSE>{RATINGSUMMARY}</IF></td>
+ <td class="oddcolumns">
+<IF {RATINGCANEDIT}>
+<a href="trader.php?action=edit&amp;id={RATINGID}&amp;mid={RATINGRATINGOF}"><img src="{TEMPLATESDIR}/images/editpost.gif" border="0" alt="Edit Rating"></a> 
+</IF>
+<IF {THISMEMBERISREGISTERED}>
+<a href="trader.php?action=report&amp;id={RATINGID}&amp;mid={RATINGRATINGOF}"><img src="{TEMPLATESDIR}/images/reportrating.gif" border="0" alt="Report Bad Rating"></a>
+</IF>
+ </td>
+ <td class="evencolumns"><IF {RATINGTYPE} is buyer>Buyer<ELSE IF {RATINGTYPE} is seller>Seller<ELSE IF {RATINGTYPE} is trader>Trader</IF> <a href="trader.php?id={MEMBERID}">{MEMBERNAME}</a> ({MEMBERTRADERRATING})</td>
+ <td class="oddcolumns">{RATINGDATE}</td>
+ <IF {RATINGCANVIEWFULL}><td class="evencolumns"><textarea rows="4" cols="45" readonly>{RATINGMORECOMMENTS}</textarea></td></IF>
+</tr>
+<!-- END ROW -->
+</table>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/traderreport.tpl wsnlinks/templates/default/traderreport.tpl
--- 400/templates/default/traderreport.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/traderreport.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,6 +1,6 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">Member List</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > <a href="trader.php?id={MEMBERID}">Trader Profile</a> > Report Bad Feedback</div><br>
-
-<form action="trader.php?action=report&amp;filled=1&amp;id={RATINGID}" method="post">
-<br>Describe the problem: <br><textarea name="reportproblem" rows="3" cols="60"></textarea>
-<br><input type="submit" value="Submit Report" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">Member List</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > <a href="trader.php?id={MEMBERID}">Trader Profile</a> > Report Bad Feedback</div><br>
+
+<form action="trader.php?action=report&amp;filled=1&amp;id={RATINGID}" method="post">
+<br>Describe the problem: <br><textarea name="reportproblem" rows="3" cols="60"></textarea>
+<br><input type="submit" value="Submit Report" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/tradersubmit.tpl wsnlinks/templates/default/tradersubmit.tpl
--- 400/templates/default/tradersubmit.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/tradersubmit.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,34 +1,34 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">Member List</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > <a href="trader.php?id={MEMBERID}">Trader Profile</a> > Add Feedback</div><br>
-
-<form action="trader.php?action=add&amp;filled=1&amp;id={MEMBERID}" method="post">
-<table>
-<tr>
- <td class="labelscolumn">Details URL of deal being rated:</td>
- <td class="optionscolumn"><input type="text" name="linkurl" size="{STANDARDSIZE}"></td>
-</tr>
-<tr>
- <td class="labelscolumn">In the dealing you're rating, you were the:</td>
- <td class="optionscolumn"><select name="type"><option value="buyer">buyer</option><option value="seller">seller</option><option value="trader">trader</option></select></td>
-</tr>
-<tr>
- <td class="labelscolumn">How would you rate your experience with {MEMBERNAME}?</td>
- <td class="optionscolumn">
-<input type="radio" name="rating" value="0" checked> Neutral
-<input type="radio" name="rating" value="1"> Positive
-<input type="radio" name="rating" value="-1"> Negative
- </td>
-</tr>
-<tr>
- <td class="labelscolumn">Summary Comments:</td>
- <td class="optionscolumn"><input type="text" name="summary" size="{STANDARDSIZE}" maxlength="80"></td>
-</tr>
-<tr>
- <td class="labelscolumn">Additional Comments: <br><br>This will be visible only to the person being rated and staff.</td>
- <td class="optionscolumn"><textarea name="morecomments" rows="10" cols="70"></textarea></td>
-</tr>
-<tr>
- <td class="labelscolumn"> &nbsp; </td>
- <td class="optionscolumn"><input type="submit" value="Submit Rating" class="button"></td>
-</tr>
-</table>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">Member List</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > <a href="trader.php?id={MEMBERID}">Trader Profile</a> > Add Feedback</div><br>
+
+<form action="trader.php?action=add&amp;filled=1&amp;id={MEMBERID}" method="post">
+<table>
+<tr>
+ <td class="labelscolumn">Details URL of deal being rated:</td>
+ <td class="optionscolumn"><input type="text" name="linkurl" size="{STANDARDSIZE}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn">In the dealing you're rating, you were the:</td>
+ <td class="optionscolumn"><select name="type"><option value="buyer">buyer</option><option value="seller">seller</option><option value="trader">trader</option></select></td>
+</tr>
+<tr>
+ <td class="labelscolumn">How would you rate your experience with {MEMBERNAME}?</td>
+ <td class="optionscolumn">
+<input type="radio" name="rating" value="0" checked> Neutral
+<input type="radio" name="rating" value="1"> Positive
+<input type="radio" name="rating" value="-1"> Negative
+ </td>
+</tr>
+<tr>
+ <td class="labelscolumn">Summary Comments:</td>
+ <td class="optionscolumn"><input type="text" name="summary" size="{STANDARDSIZE}" maxlength="80"></td>
+</tr>
+<tr>
+ <td class="labelscolumn">Additional Comments: <br><br>This will be visible only to the person being rated and staff.</td>
+ <td class="optionscolumn"><textarea name="morecomments" rows="10" cols="70"></textarea></td>
+</tr>
+<tr>
+ <td class="labelscolumn"> &nbsp; </td>
+ <td class="optionscolumn"><input type="submit" value="Submit Rating" class="button"></td>
+</tr>
+</table>
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/usernotes.tpl wsnlinks/templates/default/usernotes.tpl
--- 400/templates/default/usernotes.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/usernotes.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,99 +1,99 @@
-<script language="JavaScript">
-<!--
-function update(msg) {document.commentform.message.value += msg;}
-//-->
-</script>
-
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > Moderator Notes</div><br>
-
-<p>Moderator notes on  <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a>:</p>
-
-<table width="100%">
-<!-- BEGIN POST -->
-<!-- BEGIN REGULAR -->
-<tr>
-<td width="20%" class="postauthor" valign="top">
-<a name="post{COMMENTID}">
-<IF {MEMBERUSERGROUP} is 1>
-<span class="mediumtitle">{COMMENTPOSTERNAME}</span><br>
-<OTHERWISE> 
-<a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="mediumtitle"><span class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</span></a>  <br>
- <IF {MEMBERRANKIMAGE}><img src="{MEMBERRANKIMAGE}" alt="{MEMBERRANK}"><br></IF>
-{MEMBERRANK}
-<br>
-<IF {MEMBERSHOWAVATAR}> <img src="{MEMBERAVATARURL}" alt=""> <br> </IF>
-<br><span class="labels">Joined:</span> {MEMBERREGDATE}
-
-<IF {THISMEMBERISREGISTERED}>
-<br><span class="labels">Links:</span> <a href="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERLINKS}</a>
-<br><span class="labels">Comments:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERCOMMENTS}</a>
-<ELSE>
-<br><span class="labels">Links:</span> {MEMBERLINKS}
-<br><span class="labels">Comments:</span> {MEMBERCOMMENTS}
-</IF>
-
-</IF>
-
-<IF {THISMEMBERGROUPCANVIEWIP}><br><br>IP: {COMMENTIP}</IF>
-</td>
-
-<td width="80%" class="post" valign="top" height="100%">
-<table width="100%" height="100%">
-<tr valign="top">
-<td align="left"><span class="postdate">
-Posted {COMMENTDATE}:</span> <IF {COMMENTCANEDIT}><a href="edit.php?action=comment&amp;field=id&amp;condition=equals&amp;fieldvalue={COMMENTID}&amp;usernote={ID}&amp;modnote=1"><img src="{TEMPLATESDIR}/images/editpost.gif" border="0" alt="edit"></a></IF> </td>
-<td align="right"><a href="usernotes.php?id={ID}&amp;modnote=1&amp;quotepost={COMMENTID}#postarea"><img src="{TEMPLATESDIR}/images/quote.gif" border="0" alt="quote"></a></td>
-  </tr>
-  <tr valign="middle">
-   <td height="100%" valign="top">{COMMENTMESSAGE}
-   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
-   </td>
-  </tr>
-  <IF {MEMBERUSERGROUP} is greater than 1 and {MEMBERHASSIG}>
-  <tr valign="bottom" width="100%">
-   <td valign="bottom">
-     <br>_____________________
-     <br>{MEMBERSIGNATURE}
-   </td>
-  </tr>
-  </IF>
-</table>
-</td> 
-</tr>
-<!-- END REGULAR -->
-<!-- END POST -->
-</table>
-
-<IF {MULTIPAGE}>
-<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<span class="important">{INCOMPLETE}</span>
-
-<p>Post a new note:</p>
-
-<a name="postarea"></a>
-
-<form enctype="multipart/form-data" name="commentform" action="usernotes.php?action=post&amp;filled=1&amp;modnote=1&amp;id={MEMBERID}" method="post">
-<table>
-<input type="hidden" name="type" value="regular">
-<tr>
- <td valign="top" width="25%"><span class="labels">Your note:</span>
-<br><br>
-<center>
-<div class="smiliebox">
-<!-- BEGIN SMILIES -->
-<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
-<!-- END SMILIES -->
-</div>
-</center>
-<br>Click a smilie to insert it into your message. You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400,scrollbars=yes');">WSN Codes</a> in your message.</td>
-
- <td valign="top" width="75%"><textarea name="message" rows="8" cols="70">{COMMENTMESSAGE}</textarea></td>
-</tr>
-<tr>
- <td>&nbsp;<input type="hidden" name="usernoteon" value="{MEMBERID}"></td>
- <td><input type="submit" value="Post Note" class="button"></td>
-</tr>
-</table>
+<script language="JavaScript">
+<!--
+function update(msg) {document.commentform.message.value += msg;}
+//-->
+</script>
+
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > Moderator Notes</div><br>
+
+<p>Moderator notes on  <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a>:</p>
+
+<table width="100%">
+<!-- BEGIN POST -->
+<!-- BEGIN REGULAR -->
+<tr>
+<td width="20%" class="postauthor" valign="top">
+<a name="post{COMMENTID}">
+<IF {MEMBERUSERGROUP} is 1>
+<span class="mediumtitle">{COMMENTPOSTERNAME}</span><br>
+<OTHERWISE> 
+<a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="mediumtitle"><span class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</span></a>  <br>
+ <IF {MEMBERRANKIMAGE}><img src="{MEMBERRANKIMAGE}" alt="{MEMBERRANK}"><br></IF>
+{MEMBERRANK}
+<br>
+<IF {MEMBERSHOWAVATAR}> <img src="{MEMBERAVATARURL}" alt=""> <br> </IF>
+<br><span class="labels">Joined:</span> {MEMBERREGDATE}
+
+<IF {THISMEMBERISREGISTERED}>
+<br><span class="labels">Links:</span> <a href="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERLINKS}</a>
+<br><span class="labels">Comments:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERCOMMENTS}</a>
+<ELSE>
+<br><span class="labels">Links:</span> {MEMBERLINKS}
+<br><span class="labels">Comments:</span> {MEMBERCOMMENTS}
+</IF>
+
+</IF>
+
+<IF {THISMEMBERGROUPCANVIEWIP}><br><br>IP: {COMMENTIP}</IF>
+</td>
+
+<td width="80%" class="post" valign="top" height="100%">
+<table width="100%" height="100%">
+<tr valign="top">
+<td align="left"><span class="postdate">
+Posted {COMMENTDATE}:</span> <IF {COMMENTCANEDIT}><a href="edit.php?action=comment&amp;field=id&amp;condition=equals&amp;fieldvalue={COMMENTID}&amp;usernote={ID}&amp;modnote=1"><img src="{TEMPLATESDIR}/images/editpost.gif" border="0" alt="edit"></a></IF> </td>
+<td align="right"><a href="usernotes.php?id={ID}&amp;modnote=1&amp;quotepost={COMMENTID}#postarea"><img src="{TEMPLATESDIR}/images/quote.gif" border="0" alt="quote"></a></td>
+  </tr>
+  <tr valign="middle">
+   <td height="100%" valign="top">{COMMENTMESSAGE}
+   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
+   </td>
+  </tr>
+  <IF {MEMBERUSERGROUP} is greater than 1 and {MEMBERHASSIG}>
+  <tr valign="bottom" width="100%">
+   <td valign="bottom">
+     <br>_____________________
+     <br>{MEMBERSIGNATURE}
+   </td>
+  </tr>
+  </IF>
+</table>
+</td> 
+</tr>
+<!-- END REGULAR -->
+<!-- END POST -->
+</table>
+
+<IF {MULTIPAGE}>
+<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<span class="important">{INCOMPLETE}</span>
+
+<p>Post a new note:</p>
+
+<a name="postarea"></a>
+
+<form enctype="multipart/form-data" name="commentform" action="usernotes.php?action=post&amp;filled=1&amp;modnote=1&amp;id={MEMBERID}" method="post">
+<table>
+<input type="hidden" name="type" value="regular">
+<tr>
+ <td valign="top" width="25%"><span class="labels">Your note:</span>
+<br><br>
+<center>
+<div class="smiliebox">
+<!-- BEGIN SMILIES -->
+<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
+<!-- END SMILIES -->
+</div>
+</center>
+<br>Click a smilie to insert it into your message. You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400,scrollbars=yes');">WSN Codes</a> in your message.</td>
+
+ <td valign="top" width="75%"><textarea name="message" rows="8" cols="70">{COMMENTMESSAGE}</textarea></td>
+</tr>
+<tr>
+ <td>&nbsp;<input type="hidden" name="usernoteon" value="{MEMBERID}"></td>
+ <td><input type="submit" value="Post Note" class="button"></td>
+</tr>
+</table>
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/viewcomments.tpl wsnlinks/templates/default/viewcomments.tpl
--- 400/templates/default/viewcomments.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/viewcomments.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,220 +1,220 @@
-<script language="JavaScript" type="text/javascript">
-<!--
-function update(msg) {document.commentform.message.value += msg;}
-//-->
-</script>
-
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {NAVIGATION} > <a href="link.php?action=detail&amp;id={LINKID}">{LINKTITLE}</a> > Comments</div><br>
-
-<IF {LINKDELETED}><div class="details">This thread has been deleted.</div></IF>
-
-<IF {LINKCANEDIT}>
-<br><form action="threadadmin.php">
-<input type="hidden" name="id" value="{LINKID}">
-Thread Tools:<br> <select name="action">
-<IF {THISMEMBERISADMIN} or {CATISMODERATOR}>
-<option value="close"><IF {LINKTHREADCLOSED}>Open<ELSE>Close</IF> Thread</option>
-<option value="bulkedit">Edit/Move/Delete Posts</option>
-</IF>
-<IF {THISMEMBERGROUPCANVIEWDELETED}>
-<option value="showdeleted">Show Deleted Posts ({LINKDELETEDPOSTS})</option>
-</IF>
-<IF {THISMEMBERISADMIN}>
-<option value="regeneratethread">Regenerate Thread</option>
-</IF>
-</select>
-<input type="submit" value="Go" class="button">
-</form>
-</IF>
-
-<table width="100%">
-<tr>
- <td align="left">
-| <a href="printthread.php?id={LINKID}">Print</a> | <IF {SWITCH_ALBUMS} and {THISMEMBERISREGISTERED}><a href="albums.php?add={LINKID}">Add to List</a> | </IF>
-<IF {THISMEMBERISREGISTERED} and {SWITCH_SUBSCRIPTIONS}>
-<IF {THISMEMBERSUBSCRIBEDTO[{LINKID}]}><a href="comments.php?id={LINKID}&amp;action=subscribe">Unsubscribe</a><OTHERWISE>
-<a href="comments.php?id={LINKID}&amp;action=subscribe">Subscribe</a></IF>
-</IF> <IF {THISMEMBERISREGISTERED}>|</IF>
- </td>
- <td align="right">
-<IF {LINKCANPOST}><p align="right"><a href="postreply.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/postreply.gif" border="0" alt="Post Reply"></a></p></IF>
- </td>
-</tr>
-</table>
-
-<IF {MULTIPAGE}>
-<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<IF {LINKNUMCOMMENTS}>
-<table width="100%">
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Comments on "{LINKTITLE}"</td></tr>
-<!-- BEGIN POST -->
-<!-- BEGIN REGULAR -->
-<tr>
-<td height="100%" class="commentposter" valign="top">
-
-<a name="post{COMMENTID}"></a>
-<IF {MEMBERUSERGROUP} is 1>
-<span class="{MEMBERGROUPNAMESTYLE}">{COMMENTPOSTERNAME}</span><br>
-<OTHERWISE> 
-<a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</a> 
-<br> 
-<IF {MEMBERRANKIMAGE}><img src="{MEMBERRANKIMAGE}" alt="{MEMBERRANK}"><br></IF>
-{MEMBERRANK}
-<br>
-<IF {MEMBERSHOWAVATAR}> <img src="{MEMBERAVATARURL}" alt="avatar"> <br> </IF>
-
-<br><span class="labels">Group:</span> {MEMBERGROUPTITLE}
-<br><span class="labels">Joined:</span> {MEMBERREGDATE}
-<IF {MEMBERLOCATION}><br><span class="labels">Location:</span> {MEMBERLOCATION}</IF>
-<br>
-
-<IF {THISMEMBERISREGISTERED}>
-<br><span class="labels">Links:</span> <a href="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERLINKS}</a>
-<br><span class="labels">Comments:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERCOMMENTS}</a>
-<ELSE>
-<br><span class="labels">Links:</span> {MEMBERLINKS}
-<br><span class="labels">Comments:</span> {MEMBERCOMMENTS}
-</IF>
-
-</IF>
-
-<IF {SWITCH_REPORTS} and {THISMEMBERGROUPCANREPORT}><br><br><a href="reportcomment.php?id={COMMENTID}"><img src="{TEMPLATESDIR}/images/report.gif" border="0" alt="report bad post"></a></IF>
-
-<IF {SWITCH_RATINGS} and {THISMEMBERGROUPCANRATECOMMENTS}>
-<br><br>Rate this post: <a href="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}&amp;votevalue=plus&amp;voteplus=1">
-<img src="{TEMPLATESDIR}/images/plus.gif" border="0" alt="rate post up"></a> <a href="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}&amp;votevalue=minus&amp;voteminus=1">
-<img src="{TEMPLATESDIR}/images/minus.gif" border="0" alt="rate post down"></a>
-</IF>
-
-<IF {THISMEMBERGROUPCANVIEWIP}><br><br>IP: <a href="searchips.php?filled=1&amp;getmembers=1&amp;ip={COMMENTIP}">{COMMENTIP}</a></IF>
-
-</td>
-
-<td width="80%" class="comment" valign="top" height="100%">
-<table width="100%">
-<tr valign="top">
-<td align="left"><span class="commentdate">
-<IF {COMMENTVOTES} is greater than 0>{COMMENTAPPROVED} of {COMMENTVOTES} people found this post helpful <br></IF>
-Posted {COMMENTDATE}:</span> <IF {COMMENTCANEDIT}><a href="edit.php?action=comment&amp;field=id&amp;condition=equals&amp;fieldvalue={COMMENTID}"><img src="{TEMPLATESDIR}/images/editpost.gif" border="0" alt="edit"></a></IF> 
-<IF {COMMENTTITLE}><br>{COMMENTICONIMAGE} Subject: <span class="important">{COMMENTTITLE}</span> <ELSE><br>{COMMENTICONIMAGE} </IF>
-</td>
-<td align="right"><a href="postreply.php?id={LINKID}&amp;quotepost={COMMENTID}#postarea"><img src="{TEMPLATESDIR}/images/quote.gif" border="0" alt="quote post"></a> <br>#{COMMENTNUMBER}</td>
-  </tr>
-  <tr valign="middle">
-   <td height="100%" valign="top">{COMMENTMESSAGE}
-   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
-   </td>
-  </tr>
-  <tr valign="bottom">
-   <td valign="bottom">
-<IF {COMMENTNUMATTACHMENTS}>
-<br>Attached Files:<br>
-<table>
-<tr>
-<!-- BEGIN ATTACHMENTS -->
-<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
-<IF {ATTACHISIMAGE}>
-<a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}"><img src="thumbnail.php?comid={COMMENTID}&amp;attachid={ATTACHID}" border="0" alt="attachment"></a>
-</IF>
-</td>
-<!-- END ATTACHMENTS -->
-</tr>
-</table>
-</IF>
-  <IF {COMMENTSHOWSIG}>
-     <br>_____________________
-     <br>{MEMBERSIGNATURE}
-  </IF>
-   </td>
-  </tr>
-</table>
-</td> 
-</tr>
-<!-- END REGULAR -->
-<!-- END POST -->
-</table>
-</IF>
-
-<IF {MULTIPAGE}>
-<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<a name="commentarea"></a>
-
-<IF {LINKCANPOST}>
-<form <IF {THISMEMBERPOSTEDITOR} is WYSIWYG>onsubmit="return submitForm();"</IF> enctype="multipart/form-data" name="commentform" action="postreply.php?filled=1&amp;id={LINKID}" method="POST">
-<input type="hidden" name="type" value="regular">
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Quick Reply</td></tr>
-<IF {THISMEMBERUSERGROUP} is 1>
-<tr>
- <td class="labelscolumn"><span class="labels">Your Name:</span></td>
- <td class="optionscolumn"><input type=text name="postername" value="{COMMENTPOSTERNAME}"></td>
-</tr>
-</IF>
-
-<!-- INSERT NEW FIELDS HERE -->
-
-<tr>
- <td class="labelscolumn"><span class="labels">Your post:</span>
-<br><br>
-<center>
-<IF {SWITCH_SMILIES}>
-<div class="smiliebox">
-<!-- BEGIN SMILIES -->
-<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
-<!-- END SMILIES -->
-</div>
-</IF>
-</center>
-<IF {SWITCH_WSNCODES}>
-<br><IF {THISMEMBERPOSTEDITOR} is WYSIWYG>Drag a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.<ELSE>Click a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.</IF> You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400,scrollbars=yes');">WSN Codes</a> in your message.
-</IF>
-</td>
-
- <td class="optionscolumn">
-<IF {THISMEMBERPOSTEDITOR} is WYSIWYG>
-<script language="JavaScript" type="text/javascript" src="{TEMPLATESDIR}/richtext.js"></script>
-<script language="JavaScript" type="text/javascript">
-function submitForm() { updateRTEs(); return true; }
-initRTE("{DIRURL}/{TEMPLATESDIR}/images/posteditor/", "{TEMPLATESDIR}/", "{DIRURL}/templates/styles/{STYLESHEET}.css");
-</script>
-<script language="JavaScript" type="text/javascript">
-writeRichText('message', '{COMMENTMESSAGEWYSIWYG}', 300, 100, true, false);
-</script>
-<OTHERWISE>
-<textarea name="message" rows="8" cols="70">{COMMENTMESSAGE}</textarea>
-</IF>
- </td></tr>
-<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
-<tr>
- <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
-<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
- <td class="optionscolumn"><img src="securityimage.php" class="bullet" alt="security image"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<input type="hidden" name="linkid" value="{LINKID}">
-<input type="submit" value="Submit" class="button"> <input type="submit" name="preview" value="Advanced" class="button">
-</form>
-<OTHERWISE>
-<IF {LINKTHREADCLOSED}>
-<p>This thread is closed, so you cannot post a reply.</p>
-<OTHERWISE>
-<p>You don't have permission to post replies.</p> 
-<IF {CATREQLINKS} or {CATREQCOMS}>
-<p>You must have at least {CATREQLINKS} links and {CATREQCOMS} comments elsewhere before you can post in this category.</p>
-</IF>
-<IF {THISMEMBERISGUEST}>Please <a href="index.php?action=userlogin">login</a> or <a href="register.php">register</a>.</IF>
-</IF>
-</IF>
-
-<IF {SWITCH_ONLINEUSERS}>
-<br><br>Members currently reading this thread: 
-<!-- BEGIN TOPLIST 3 -->
-<CONFIG>online,time,100,descending,threadid={LINKID} AND memberid>0,,</CONFIG>
-<a href="memberlist.php?action=profile&amp;id={ONLINEMEMBERID}">{ONLINENAME}</a>,  
-<!-- END TOPLIST 3 -->
-</IF>
+<script language="JavaScript" type="text/javascript">
+<!--
+function update(msg) {document.commentform.message.value += msg;}
+//-->
+</script>
+
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {NAVIGATION} > <a href="link.php?action=detail&amp;id={LINKID}">{LINKTITLE}</a> > Comments</div><br>
+
+<IF {LINKDELETED}><div class="details">This thread has been deleted.</div></IF>
+
+<IF {LINKCANEDIT}>
+<br><form action="threadadmin.php">
+<input type="hidden" name="id" value="{LINKID}">
+Thread Tools:<br> <select name="action">
+<IF {THISMEMBERISADMIN} or {CATISMODERATOR}>
+<option value="close"><IF {LINKTHREADCLOSED}>Open<ELSE>Close</IF> Thread</option>
+<option value="bulkedit">Edit/Move/Delete Posts</option>
+</IF>
+<IF {THISMEMBERGROUPCANVIEWDELETED}>
+<option value="showdeleted">Show Deleted Posts ({LINKDELETEDPOSTS})</option>
+</IF>
+<IF {THISMEMBERISADMIN}>
+<option value="regeneratethread">Regenerate Thread</option>
+</IF>
+</select>
+<input type="submit" value="Go" class="button">
+</form>
+</IF>
+
+<table width="100%">
+<tr>
+ <td align="left">
+| <a href="printthread.php?id={LINKID}">Print</a> | <IF {SWITCH_ALBUMS} and {THISMEMBERISREGISTERED}><a href="albums.php?add={LINKID}">Add to List</a> | </IF>
+<IF {THISMEMBERISREGISTERED} and {SWITCH_SUBSCRIPTIONS}>
+<IF {THISMEMBERSUBSCRIBEDTO[{LINKID}]}><a href="comments.php?id={LINKID}&amp;action=subscribe">Unsubscribe</a><OTHERWISE>
+<a href="comments.php?id={LINKID}&amp;action=subscribe">Subscribe</a></IF>
+</IF> <IF {THISMEMBERISREGISTERED}>|</IF>
+ </td>
+ <td align="right">
+<IF {LINKCANPOST}><p align="right"><a href="postreply.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/postreply.gif" border="0" alt="Post Reply"></a></p></IF>
+ </td>
+</tr>
+</table>
+
+<IF {MULTIPAGE}>
+<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<IF {LINKNUMCOMMENTS}>
+<table width="100%">
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Comments on "{LINKTITLE}"</td></tr>
+<!-- BEGIN POST -->
+<!-- BEGIN REGULAR -->
+<tr>
+<td height="100%" class="commentposter" valign="top">
+
+<a name="post{COMMENTID}"></a>
+<IF {MEMBERUSERGROUP} is 1>
+<span class="{MEMBERGROUPNAMESTYLE}">{COMMENTPOSTERNAME}</span><br>
+<OTHERWISE> 
+<a href="memberlist.php?action=profile&amp;id={MEMBERID}" class="{MEMBERGROUPNAMESTYLE}">{MEMBERNAME}</a> 
+<br> 
+<IF {MEMBERRANKIMAGE}><img src="{MEMBERRANKIMAGE}" alt="{MEMBERRANK}"><br></IF>
+{MEMBERRANK}
+<br>
+<IF {MEMBERSHOWAVATAR}> <img src="{MEMBERAVATARURL}" alt="avatar"> <br> </IF>
+
+<br><span class="labels">Group:</span> {MEMBERGROUPTITLE}
+<br><span class="labels">Joined:</span> {MEMBERREGDATE}
+<IF {MEMBERLOCATION}><br><span class="labels">Location:</span> {MEMBERLOCATION}</IF>
+<br>
+
+<IF {THISMEMBERISREGISTERED}>
+<br><span class="labels">Links:</span> <a href="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERLINKS}</a>
+<br><span class="labels">Comments:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERCOMMENTS}</a>
+<ELSE>
+<br><span class="labels">Links:</span> {MEMBERLINKS}
+<br><span class="labels">Comments:</span> {MEMBERCOMMENTS}
+</IF>
+
+</IF>
+
+<IF {SWITCH_REPORTS} and {THISMEMBERGROUPCANREPORT}><br><br><a href="reportcomment.php?id={COMMENTID}"><img src="{TEMPLATESDIR}/images/report.gif" border="0" alt="report bad post"></a></IF>
+
+<IF {SWITCH_RATINGS} and {THISMEMBERGROUPCANRATECOMMENTS}>
+<br><br>Rate this post: <a href="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}&amp;votevalue=plus&amp;voteplus=1">
+<img src="{TEMPLATESDIR}/images/plus.gif" border="0" alt="rate post up"></a> <a href="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}&amp;votevalue=minus&amp;voteminus=1">
+<img src="{TEMPLATESDIR}/images/minus.gif" border="0" alt="rate post down"></a>
+</IF>
+
+<IF {THISMEMBERGROUPCANVIEWIP}><br><br>IP: <a href="searchips.php?filled=1&amp;getmembers=1&amp;ip={COMMENTIP}">{COMMENTIP}</a></IF>
+
+</td>
+
+<td width="80%" class="comment" valign="top" height="100%">
+<table width="100%">
+<tr valign="top">
+<td align="left"><span class="commentdate">
+<IF {COMMENTVOTES} is greater than 0>{COMMENTAPPROVED} of {COMMENTVOTES} people found this post helpful <br></IF>
+Posted {COMMENTDATE}:</span> <IF {COMMENTCANEDIT}><a href="edit.php?action=comment&amp;field=id&amp;condition=equals&amp;fieldvalue={COMMENTID}"><img src="{TEMPLATESDIR}/images/editpost.gif" border="0" alt="edit"></a></IF> 
+<IF {COMMENTTITLE}><br>{COMMENTICONIMAGE} Subject: <span class="important">{COMMENTTITLE}</span> <ELSE><br>{COMMENTICONIMAGE} </IF>
+</td>
+<td align="right"><a href="postreply.php?id={LINKID}&amp;quotepost={COMMENTID}#postarea"><img src="{TEMPLATESDIR}/images/quote.gif" border="0" alt="quote post"></a> <br>#{COMMENTNUMBER}</td>
+  </tr>
+  <tr valign="middle">
+   <td height="100%" valign="top">{COMMENTMESSAGE}
+   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
+   </td>
+  </tr>
+  <tr valign="bottom">
+   <td valign="bottom">
+<IF {COMMENTNUMATTACHMENTS}>
+<br>Attached Files:<br>
+<table>
+<tr>
+<!-- BEGIN ATTACHMENTS -->
+<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
+<IF {ATTACHISIMAGE}>
+<a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}"><img src="thumbnail.php?comid={COMMENTID}&amp;attachid={ATTACHID}" border="0" alt="attachment"></a>
+</IF>
+</td>
+<!-- END ATTACHMENTS -->
+</tr>
+</table>
+</IF>
+  <IF {COMMENTSHOWSIG}>
+     <br>_____________________
+     <br>{MEMBERSIGNATURE}
+  </IF>
+   </td>
+  </tr>
+</table>
+</td> 
+</tr>
+<!-- END REGULAR -->
+<!-- END POST -->
+</table>
+</IF>
+
+<IF {MULTIPAGE}>
+<p>Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<a name="commentarea"></a>
+
+<IF {LINKCANPOST}>
+<form <IF {THISMEMBERPOSTEDITOR} is WYSIWYG>onsubmit="return submitForm();"</IF> enctype="multipart/form-data" name="commentform" action="postreply.php?filled=1&amp;id={LINKID}" method="POST">
+<input type="hidden" name="type" value="regular">
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Quick Reply</td></tr>
+<IF {THISMEMBERUSERGROUP} is 1>
+<tr>
+ <td class="labelscolumn"><span class="labels">Your Name:</span></td>
+ <td class="optionscolumn"><input type=text name="postername" value="{COMMENTPOSTERNAME}"></td>
+</tr>
+</IF>
+
+<!-- INSERT NEW FIELDS HERE -->
+
+<tr>
+ <td class="labelscolumn"><span class="labels">Your post:</span>
+<br><br>
+<center>
+<IF {SWITCH_SMILIES}>
+<div class="smiliebox">
+<!-- BEGIN SMILIES -->
+<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
+<!-- END SMILIES -->
+</div>
+</IF>
+</center>
+<IF {SWITCH_WSNCODES}>
+<br><IF {THISMEMBERPOSTEDITOR} is WYSIWYG>Drag a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.<ELSE>Click a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.</IF> You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400,scrollbars=yes');">WSN Codes</a> in your message.
+</IF>
+</td>
+
+ <td class="optionscolumn">
+<IF {THISMEMBERPOSTEDITOR} is WYSIWYG>
+<script language="JavaScript" type="text/javascript" src="{TEMPLATESDIR}/richtext.js"></script>
+<script language="JavaScript" type="text/javascript">
+function submitForm() { updateRTEs(); return true; }
+initRTE("{DIRURL}/{TEMPLATESDIR}/images/posteditor/", "{TEMPLATESDIR}/", "{DIRURL}/templates/styles/{STYLESHEET}.css");
+</script>
+<script language="JavaScript" type="text/javascript">
+writeRichText('message', '{COMMENTMESSAGEWYSIWYG}', 300, 100, true, false);
+</script>
+<OTHERWISE>
+<textarea name="message" rows="8" cols="70">{COMMENTMESSAGE}</textarea>
+</IF>
+ </td></tr>
+<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
+<tr>
+ <td class="labelscolumn"><span class="labels">Anti-Spam Image:</span>
+<br>Type the letters and numbers shown on the left into the box on the right. (This is to prevent automated submissions.)</td>
+ <td class="optionscolumn"><img src="securityimage.php" class="bullet" alt="security image"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<input type="hidden" name="linkid" value="{LINKID}">
+<input type="submit" value="Submit" class="button"> <input type="submit" name="preview" value="Advanced" class="button">
+</form>
+<OTHERWISE>
+<IF {LINKTHREADCLOSED}>
+<p>This thread is closed, so you cannot post a reply.</p>
+<OTHERWISE>
+<p>You don't have permission to post replies.</p> 
+<IF {CATREQLINKS} or {CATREQCOMS}>
+<p>You must have at least {CATREQLINKS} links and {CATREQCOMS} comments elsewhere before you can post in this category.</p>
+</IF>
+<IF {THISMEMBERISGUEST}>Please <a href="index.php?action=userlogin">login</a> or <a href="register.php">register</a>.</IF>
+</IF>
+</IF>
+
+<IF {SWITCH_ONLINEUSERS}>
+<br><br>Members currently reading this thread: 
+<!-- BEGIN TOPLIST 3 -->
+<CONFIG>online,time,100,descending,threadid={LINKID} AND memberid>0,,</CONFIG>
+<a href="memberlist.php?action=profile&amp;id={ONLINEMEMBERID}">{ONLINENAME}</a>,  
+<!-- END TOPLIST 3 -->
+</IF>
diff -U 3 -H -d -r -N -- 400/templates/default/viewprofile.tpl wsnlinks/templates/default/viewprofile.tpl
--- 400/templates/default/viewprofile.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/viewprofile.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,131 +1,131 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">Member List</a> > {MEMBERNAME}</div><br>
-
-<p><span class="title">Profile of {MEMBERNAME}</span></p>
-
-<IF {MEMBERBANNED}><p><b><i>This member has been banned.</i></b></p></IF>
-
-<IF {THISMEMBERISADMIN} or {THISMEMBERGROUPCANVIEWDELETED} or {THISMEMBERGROUPCANVIEWMODLOG}>
-<form action="redirecttourl.php" style="margin: 0px;">
-Admin Options: 
-<select name="destination">
-<IF {THISMEMBERGROUPCANEDITALLPROFILES}>
- <option value="edit.php?action=member&amp;field=id&amp;condition=equals&amp;fieldvalue={MEMBERID}">Edit Profile</option></IF>
-<IF {THISMEMBERISADMIN}>
- <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}">Ban</option>
- <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}&amp;partial=1">Partially Ban (from categories/threads)</option>
- <option value="[IFADMINadmin/]useradmin.php?action=suspend&amp;id={MEMBERID}">Suspend Member</option>
-</IF>
-<option value="usernotes.php?id={MEMBERID}&amp;modnote=1">Moderator Notes ({MEMBERMODNOTES})</option>
-<IF {THISMEMBERGROUPCANVIEWMODLOG}>
- <option value="modlog.php?action=modlogon&amp;id={MEMBERID}">Show Moderating History on Member</option>
-</IF>
-<IF {THISMEMBERGROUPCANVIEWDELETED}>
- <option value="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;deletedonly=1">Show Deleted Links by Member</option>
- <option value="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;deletedonly=1">Show Deleted Comments by Member</option>
-</IF>
-<IF {THISMEMBERISADMIN}>
- <option value="[IFADMINadmin/]updatecounters.php?filled=1&amp;regenone=1&amp;action=members&amp;id={MEMBERID}">Regenerate Member Counters</option>
-</IF>
-</select>
-<input type="submit" value="Go" class="button">
-</form>
-</IF>
-
-<IF {MEMBERCANBEVIEWED}>
-<p>
-Last seen: {MEMBERLASTVISITDATE}
-<IF {MEMBERISONLINE}>
-<!-- BEGIN TOPLIST 3 -->
-<CONFIG>online,time,1,descending,memberid={MEMBERID}</CONFIG>
-<br>Current Location: <a href="{ONLINELOCATION}">{ONLINEAREANAME}</a>
-<!-- END TOPLIST 3 -->
-</IF>
-</p>
-</IF>
-
-<table width="100%">
-<tr>
-<td width="50%" valign="top" class="evencolumns">
-<p align="center"><span class="labels">Contact Information</span></p>
-
-<IF {MEMBERALLOWUSEREMAIL} and {THISMEMBERGROUPCANEMAILMEMBERS} and {MEMBERHASEMAIL}>
-<p><span class="labels">E-Mail:</span> <a href="emailmember.php?id={MEMBERID}">Send an E-mail to {MEMBERNAME}</a></p>
-</IF>
-
-<IF {SWITCH_GUESTBOOK}><p><span class="labels">Guestbook:</span> <a href="usernotes.php?id={MEMBERID}">View or sign {MEMBERNAME}'s guestbook ({MEMBERGUESTNOTES})</a></p></IF>
-
-<IF {SWITCH_PM} and {MEMBERACCEPTPMS}><p><span class="labels">Private Messaging:</span> <a href="privatemessaging.php?action=send&amp;sendto={MEMBERID}">Send a PM to {MEMBERNAME}</a></p></IF>
-
-<IF {MEMBERREADYTOCHAT}>
-<p><span class="labels">Instant Messaging:</span> <a href="im.php?with={MEMBERID}" target="win" onClick="window.open('','win','{IMDIMENSIONS}');">Send an instant message to {MEMBERNAME}</a></p></IF>
-
-<p><IF {MEMBERAIM}>AIM: {MEMBERAIM}<br></IF>
-<IF {MEMBERICQ}>ICQ: {MEMBERICQ}<br></IF>
-<IF {MEMBERMSN}>MSN: {MEMBERMSN}<br></IF>
-<IF {MEMBERYAHOO}>YIM: {MEMBERYAHOO}</IF></p>
-
-</td>
-<td width="50%" valign="top" class="evencolumns">
-<p align="center"><span class="labels">Biographical Information</span></p>
-
-<IF {MEMBERLOCATION}><p><span class="labels">Location:</span> {MEMBERLOCATION}</p></IF>
-
-<IF {MEMBERHOMEPAGE}><p><span class="labels">Homepage:</span> <a href="{MEMBERHOMEPAGE}">{MEMBERHOMEPAGE}</a></p></IF>
-
-<IF {MEMBEROCCUPATION}><p><span class="labels">Occupation:</span> {MEMBEROCCUPATION}</p></IF>
-
-<IF {MEMBERBIRTHDAY}><p><span class="labels">Birthday:</span> {MEMBERBIRTHMONTHNAME} {MEMBERBIRTHDAY}<IF {MEMBERBIRTHYEAR}>, {MEMBERBIRTHYEAR} ({MEMBERAGE} years old)</IF></p></IF>
-
-<IF {MEMBERHASBIO}><p><span class="labels">Biography:</span> {MEMBERBIO}</p></IF>
-
-</td>
-</tr>
-<tr>
-<td width="50%" valign="top" class="evencolumns">
-<p align="center"><span class="labels">Membership Status</span></p>
-
-<p><span class="labels">Registered:</span> {MEMBERREGDATE}</p>
-
-<p><span class="labels">Usergroup:</span> {MEMBERGROUPTITLE}</p>
-
-<IF {SWITCH_TRADER}><p><span class="labels">Trader Rating:</span> <a href="trader.php?id={MEMBERID}">{MEMBERTRADERRATING}</a></p></IF>
-
-<IF {SWITCH_MEMBERRATINGS}><p><span class="labels">Rating:</span> {MEMBERRATING}</p></IF>
-
-<p><span class="labels">Links Submitted:</span> {MEMBERLINKS} links<IF {SWITCH_MEMBERHITS}>, with {MEMBERTOTALHITS} views</IF></p>
-
-<p><span class="labels">Total Comments:</span> {MEMBERCOMMENTS} comment posts ({MEMBERCOMMENTSPERDAY} per day)</p>
-
-<IF {SWITCH_TIMEONLINE}><p><span class="labels">Total Time Online:</span> {MEMBERTOTALTIMEONLINE}</p></IF>
-
-<IF {MEMBERSHOWAVATAR}> <img src="{MEMBERAVATARURL}" alt=""> <br> </IF>
-
-</td>
-<td width="50%" valign="top" class="evencolumns">
-<p align="center"><span class="labels">Submission History</span></p>
-
-<IF {TOPLISTTOTAL1}><p><span class="labels">Most recent links:</span></p></IF>
-<!-- BEGIN TOPLIST 1 -->
-<CONFIG>links,time,5,descending,ownerid={MEMBERID}</CONFIG>
-<a href="{LINKDETAILSURL}">{LINKTITLE}</a> <br>
-<!-- END TOPLIST 1 -->
-<br>
-<IF {TOPLIST1MULTIPAGE}>
-<a href="search.php?filled=1&amp;condition==&amp;whichtype=links&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">Show all links submitted by {MEMBERNAME}</a><br>
-</IF>
-
-<IF {TOPLISTTOTAL2}><p><span class="labels">Most recent comment posts:</span></p></IF>
-<!-- BEGIN TOPLIST 2 -->
-<CONFIG>comments,time,5,descending,ownerid={MEMBERID}</CONFIG>
-<a href="comments.php?id={COMMENTLINKID}&amp;findpost={COMMENTID}#post{COMMENTID}">{COMMENTMESSAGE[50 <,> remove]}</a> <br>
-<!-- END TOPLIST 2 -->
-<br>
-<IF {TOPLIST2MULTIPAGE}>
-<a href="search.php?filled=1&amp;condition==&amp;whichtype=comments&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">Show all comments by {MEMBERNAME}</a>
-</IF>
-
-<IF {THISMEMBERGROUPCANVIEWIP}><p>Registration IP: {MEMBERIP}</p></IF>
-
-</td>
-</tr>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">Member List</a> > {MEMBERNAME}</div><br>
+
+<p><span class="title">Profile of {MEMBERNAME}</span></p>
+
+<IF {MEMBERBANNED}><p><b><i>This member has been banned.</i></b></p></IF>
+
+<IF {THISMEMBERISADMIN} or {THISMEMBERGROUPCANVIEWDELETED} or {THISMEMBERGROUPCANVIEWMODLOG}>
+<form action="redirecttourl.php" style="margin: 0px;">
+Admin Options: 
+<select name="destination">
+<IF {THISMEMBERGROUPCANEDITALLPROFILES}>
+ <option value="edit.php?action=member&amp;field=id&amp;condition=equals&amp;fieldvalue={MEMBERID}">Edit Profile</option></IF>
+<IF {THISMEMBERISADMIN}>
+ <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}">Ban</option>
+ <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}&amp;partial=1">Partially Ban (from categories/threads)</option>
+ <option value="[IFADMINadmin/]useradmin.php?action=suspend&amp;id={MEMBERID}">Suspend Member</option>
+</IF>
+<option value="usernotes.php?id={MEMBERID}&amp;modnote=1">Moderator Notes ({MEMBERMODNOTES})</option>
+<IF {THISMEMBERGROUPCANVIEWMODLOG}>
+ <option value="modlog.php?action=modlogon&amp;id={MEMBERID}">Show Moderating History on Member</option>
+</IF>
+<IF {THISMEMBERGROUPCANVIEWDELETED}>
+ <option value="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;deletedonly=1">Show Deleted Links by Member</option>
+ <option value="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;deletedonly=1">Show Deleted Comments by Member</option>
+</IF>
+<IF {THISMEMBERISADMIN}>
+ <option value="[IFADMINadmin/]updatecounters.php?filled=1&amp;regenone=1&amp;action=members&amp;id={MEMBERID}">Regenerate Member Counters</option>
+</IF>
+</select>
+<input type="submit" value="Go" class="button">
+</form>
+</IF>
+
+<IF {MEMBERCANBEVIEWED}>
+<p>
+Last seen: {MEMBERLASTVISITDATE}
+<IF {MEMBERISONLINE}>
+<!-- BEGIN TOPLIST 3 -->
+<CONFIG>online,time,1,descending,memberid={MEMBERID}</CONFIG>
+<br>Current Location: <a href="{ONLINELOCATION}">{ONLINEAREANAME}</a>
+<!-- END TOPLIST 3 -->
+</IF>
+</p>
+</IF>
+
+<table width="100%">
+<tr>
+<td width="50%" valign="top" class="evencolumns">
+<p align="center"><span class="labels">Contact Information</span></p>
+
+<IF {MEMBERALLOWUSEREMAIL} and {THISMEMBERGROUPCANEMAILMEMBERS} and {MEMBERHASEMAIL}>
+<p><span class="labels">E-Mail:</span> <a href="emailmember.php?id={MEMBERID}">Send an E-mail to {MEMBERNAME}</a></p>
+</IF>
+
+<IF {SWITCH_GUESTBOOK}><p><span class="labels">Guestbook:</span> <a href="usernotes.php?id={MEMBERID}">View or sign {MEMBERNAME}'s guestbook ({MEMBERGUESTNOTES})</a></p></IF>
+
+<IF {SWITCH_PM} and {MEMBERACCEPTPMS}><p><span class="labels">Private Messaging:</span> <a href="privatemessaging.php?action=send&amp;sendto={MEMBERID}">Send a PM to {MEMBERNAME}</a></p></IF>
+
+<IF {MEMBERREADYTOCHAT}>
+<p><span class="labels">Instant Messaging:</span> <a href="im.php?with={MEMBERID}" target="win" onClick="window.open('','win','{IMDIMENSIONS}');">Send an instant message to {MEMBERNAME}</a></p></IF>
+
+<p><IF {MEMBERAIM}>AIM: {MEMBERAIM}<br></IF>
+<IF {MEMBERICQ}>ICQ: {MEMBERICQ}<br></IF>
+<IF {MEMBERMSN}>MSN: {MEMBERMSN}<br></IF>
+<IF {MEMBERYAHOO}>YIM: {MEMBERYAHOO}</IF></p>
+
+</td>
+<td width="50%" valign="top" class="evencolumns">
+<p align="center"><span class="labels">Biographical Information</span></p>
+
+<IF {MEMBERLOCATION}><p><span class="labels">Location:</span> {MEMBERLOCATION}</p></IF>
+
+<IF {MEMBERHOMEPAGE}><p><span class="labels">Homepage:</span> <a href="{MEMBERHOMEPAGE}">{MEMBERHOMEPAGE}</a></p></IF>
+
+<IF {MEMBEROCCUPATION}><p><span class="labels">Occupation:</span> {MEMBEROCCUPATION}</p></IF>
+
+<IF {MEMBERBIRTHDAY}><p><span class="labels">Birthday:</span> {MEMBERBIRTHMONTHNAME} {MEMBERBIRTHDAY}<IF {MEMBERBIRTHYEAR}>, {MEMBERBIRTHYEAR} ({MEMBERAGE} years old)</IF></p></IF>
+
+<IF {MEMBERHASBIO}><p><span class="labels">Biography:</span> {MEMBERBIO}</p></IF>
+
+</td>
+</tr>
+<tr>
+<td width="50%" valign="top" class="evencolumns">
+<p align="center"><span class="labels">Membership Status</span></p>
+
+<p><span class="labels">Registered:</span> {MEMBERREGDATE}</p>
+
+<p><span class="labels">Usergroup:</span> {MEMBERGROUPTITLE}</p>
+
+<IF {SWITCH_TRADER}><p><span class="labels">Trader Rating:</span> <a href="trader.php?id={MEMBERID}">{MEMBERTRADERRATING}</a></p></IF>
+
+<IF {SWITCH_MEMBERRATINGS}><p><span class="labels">Rating:</span> {MEMBERRATING}</p></IF>
+
+<p><span class="labels">Links Submitted:</span> {MEMBERLINKS} links<IF {SWITCH_MEMBERHITS}>, with {MEMBERTOTALHITS} views</IF></p>
+
+<p><span class="labels">Total Comments:</span> {MEMBERCOMMENTS} comment posts ({MEMBERCOMMENTSPERDAY} per day)</p>
+
+<IF {SWITCH_TIMEONLINE}><p><span class="labels">Total Time Online:</span> {MEMBERTOTALTIMEONLINE}</p></IF>
+
+<IF {MEMBERSHOWAVATAR}> <img src="{MEMBERAVATARURL}" alt=""> <br> </IF>
+
+</td>
+<td width="50%" valign="top" class="evencolumns">
+<p align="center"><span class="labels">Submission History</span></p>
+
+<IF {TOPLISTTOTAL1}><p><span class="labels">Most recent links:</span></p></IF>
+<!-- BEGIN TOPLIST 1 -->
+<CONFIG>links,time,5,descending,ownerid={MEMBERID}</CONFIG>
+<a href="{LINKDETAILSURL}">{LINKTITLE}</a> <br>
+<!-- END TOPLIST 1 -->
+<br>
+<IF {TOPLIST1MULTIPAGE}>
+<a href="search.php?filled=1&amp;condition==&amp;whichtype=links&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">Show all links submitted by {MEMBERNAME}</a><br>
+</IF>
+
+<IF {TOPLISTTOTAL2}><p><span class="labels">Most recent comment posts:</span></p></IF>
+<!-- BEGIN TOPLIST 2 -->
+<CONFIG>comments,time,5,descending,ownerid={MEMBERID}</CONFIG>
+<a href="comments.php?id={COMMENTLINKID}&amp;findpost={COMMENTID}#post{COMMENTID}">{COMMENTMESSAGE[50 <,> remove]}</a> <br>
+<!-- END TOPLIST 2 -->
+<br>
+<IF {TOPLIST2MULTIPAGE}>
+<a href="search.php?filled=1&amp;condition==&amp;whichtype=comments&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">Show all comments by {MEMBERNAME}</a>
+</IF>
+
+<IF {THISMEMBERGROUPCANVIEWIP}><p>Registration IP: {MEMBERIP}</p></IF>
+
+</td>
+</tr>
 </table>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/vote.tpl wsnlinks/templates/default/vote.tpl
--- 400/templates/default/vote.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/vote.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,20 +1,20 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a></div> <br>
-
-<form action="vote.php?action=vote&amp;id={LINKID}" method="post">
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Rate "{LINKTITLE}"</td></tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Rate this site:</span></td>
- <td class="optionscolumn">
-  <select name="votevalue">
-   <option value="5">5 - Perfect</option>
-   <option value="4">4 - Good</option>
-   <option value="3">3 - Average</option>
-   <option value="2">2 - Mediocre</option>
-   <option value="1">1 - Bad</option>
- </select>
- </td>
-</tr>
-</table>
-<input type="submit" value="Submit Rating" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a></div> <br>
+
+<form action="vote.php?action=vote&amp;id={LINKID}" method="post">
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> Rate "{LINKTITLE}"</td></tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">Rate this site:</span></td>
+ <td class="optionscolumn">
+  <select name="votevalue">
+   <option value="5">5 - Perfect</option>
+   <option value="4">4 - Good</option>
+   <option value="3">3 - Average</option>
+   <option value="2">2 - Mediocre</option>
+   <option value="1">1 - Bad</option>
+ </select>
+ </td>
+</tr>
+</table>
+<input type="submit" value="Submit Rating" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/default/wrapper.tpl wsnlinks/templates/default/wrapper.tpl
--- 400/templates/default/wrapper.tpl	2006-09-07 12:29:00.000000000 -0700
+++ wsnlinks/templates/default/wrapper.tpl	2006-09-13 09:29:40.000000000 -0700
@@ -1,84 +1,84 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>{PAGETITLE}</title>
-<script language="JavaScript" type="text/javascript" src="{TEMPLATESDIR}/javascriptheader.js"></script>
-<link rel="stylesheet" href="{DIRURL}/templates/styles/{STYLESHEET}.css" type="text/css">
-<link rel="alternate" type="application/rss+xml" title="{SITETITLE}" href="{DIRURL}/rssfeed.php">
-{MAINMETA}
-{CATHEADERINFO}
-</head>
-<body>
-<div class="adbanner">{ADBANNER}</div>
-
-<a href="{DIRURL}"><img src="{TEMPLATESDIR}/images/logo.gif" border="0" alt="{SITETITLE}"></a>
-
-<div class="main">
-<table width="100%">
-<tr>
- <td align="left" valign="top">
-  <IF {SWITCH_STYLESELECT}><form action="[IFADMIN../]index.php?action=setstyle" method="post">Style: <select name="style">{STYLEOPTIONS}</select> <input type="submit" value="Select" class="button"> <input type="hidden" name="returnto" value="{CURRENTHTMLURL}"></form></IF>
-<IF {SWITCH_TEMPLATESELECT}><form action="index.php?action=settemplatesdir" method="post"> <input type="hidden" name="returnto" value="{CURRENTHTMLURL}"><select name="templatesdir">{TEMPOPTIONS}</select> <input type="submit" value="Select" class="button"></form></IF>
- </td>
- <td align="right" valign="top">
-<IF {SWITCH_MEMBERS}>
-<IF {THISMEMBERISGUEST}>
-<div class="login">
-<form action="index.php?action=userlogin&amp;filled=1" method="post">
-Username:
-<input type="text" name="username" onfocus="this.value=''" size="10" value=""> 
-Password:
-<input type="password" onfocus="this.value=''" name="userpassword" size="10" value=""> <input type="submit" value="Login" class="button">
-<br><a href="register.php">Register</a> | <a href="index.php?action=userlogin">Reset Password</a>
-</form>
-</div>
-<OTHERWISE>
-<div class="navbutton" style="background: url('{TEMPLATESDIR}/images/buttonbg.png') repeat-x;">
-<a href="profile.php?action=memberhome&amp;id={MEMBERID}">Options</a> | <IF {SWITCH_PM}><a href="privatemessaging.php">Private Messages</a> | </IF> <IF {SWITCH_MEMBERS}><a href="memberlist.php">Members</a> | </IF> <IF {SWITCH_CALENDAR}><a href="calendar.php">Calendar</a> | </IF> <IF {THISMEMBERGROUPCANUSESEARCH}><a href="search.php">Search</a> | </IF> <a href="newposts.php">New Links</a> | <IF {SWITCH_HELP}><a href="help.php">Help</a> | </IF> <a href="index.php?action=userlogout">Logout</a>
-</div>
-<IF {SWITCH_PM}><br><br>You have <a href="privatemessaging.php">{THISMEMBERNEWPMS[highlight]} new PMs</a>, {THISMEMBERTOTALPMS} total.</IF>
-</IF>
-</IF>
- </td>
-</tr>
-</table>
-
-<IF {SWITCH_IMS} and {THISMEMBERNEWIMS}>
-<p align="center"><span class="important">You have new IMs. Click the username to open the conversation: {THISMEMBERNEWIMLIST}</span></p>
-</IF>
-
-<!-- BODY GOES HERE -->
-
-<div style="clear:both;"></div>
-
-<form action="index.php">
-<p align="right"><input type="hidden" name="action" value="displaycat">
-<select name="catid"><option value="0">Category List</option>{CATOPTIONS}</select>
-<input type="submit" value="Go" class="button">
-</p>
-</form>
-
-</div>
-
-<IF {SWITCH_CONTACT}><p align="center"><a href="contactform.php">Contact the Administration</a></p></IF>
-
-<IF {THISMEMBERISREGISTERED} and {SPONSORUSEUG} is yes><p align="center"><a href="membersponsor.php">Sponsor {SITETITLE}</a></p></IF>
-
-<IF {THISMEMBERISREGISTERED}>
-<p align="center"><b>
-<IF {THISMEMBERISADMIN}><a href="[IFADMINadmin/]index.php">Admin Control Panel</a> | <a href="[IFADMIN../]modcp.php">Moderator Control Panel</a></IF>
-<IF {THISMEMBERISMODERATOR}><a href="[IFADMIN../]modcp.php">Moderator Control Panel</a></IF>
-</b></p>
-</IF>
-
-<p align="center"><a href="sitemap.php">Site Map</a></p>
-
-{LOADSTATS}
-
-<IF {SWITCH_IMS} and {THISMEMBERNEWIMS}>
-<script language="JavaScript"> alert("You have a new instant message. Click the sender's name in the IM notification area near the top of the page to join the conversation.") </script>
-</IF>
-<IF {THISMEMBERPMPOPUP}><script language="JavaScript">alert("You have a new private message.");</script></IF>
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>{PAGETITLE}</title>
+<script language="JavaScript" type="text/javascript" src="{TEMPLATESDIR}/javascriptheader.js"></script>
+<link rel="stylesheet" href="{DIRURL}/templates/styles/{STYLESHEET}.css" type="text/css">
+<link rel="alternate" type="application/rss+xml" title="{SITETITLE}" href="{DIRURL}/rssfeed.php">
+{MAINMETA}
+{CATHEADERINFO}
+</head>
+<body>
+<div class="adbanner">{ADBANNER}</div>
+
+<a href="{DIRURL}"><img src="{TEMPLATESDIR}/images/logo.gif" border="0" alt="{SITETITLE}"></a>
+
+<div class="main">
+<table width="100%">
+<tr>
+ <td align="left" valign="top">
+  <IF {SWITCH_STYLESELECT}><form action="[IFADMIN../]index.php?action=setstyle" method="post">Style: <select name="style">{STYLEOPTIONS}</select> <input type="submit" value="Select" class="button"> <input type="hidden" name="returnto" value="{CURRENTHTMLURL}"></form></IF>
+<IF {SWITCH_TEMPLATESELECT}><form action="index.php?action=settemplatesdir" method="post"> <input type="hidden" name="returnto" value="{CURRENTHTMLURL}"><select name="templatesdir">{TEMPOPTIONS}</select> <input type="submit" value="Select" class="button"></form></IF>
+ </td>
+ <td align="right" valign="top">
+<IF {SWITCH_MEMBERS}>
+<IF {THISMEMBERISGUEST}>
+<div class="login">
+<form action="index.php?action=userlogin&amp;filled=1" method="post">
+Username:
+<input type="text" name="username" onfocus="this.value=''" size="10" value=""> 
+Password:
+<input type="password" onfocus="this.value=''" name="userpassword" size="10" value=""> <input type="submit" value="Login" class="button">
+<br><a href="register.php">Register</a> | <a href="index.php?action=userlogin">Reset Password</a>
+</form>
+</div>
+<OTHERWISE>
+<div class="navbutton" style="background: url('{TEMPLATESDIR}/images/buttonbg.png') repeat-x;">
+<a href="profile.php?action=memberhome&amp;id={MEMBERID}">Options</a> | <IF {SWITCH_PM}><a href="privatemessaging.php">Private Messages</a> | </IF> <IF {SWITCH_MEMBERS}><a href="memberlist.php">Members</a> | </IF> <IF {SWITCH_CALENDAR}><a href="calendar.php">Calendar</a> | </IF> <IF {THISMEMBERGROUPCANUSESEARCH}><a href="search.php">Search</a> | </IF> <a href="newposts.php">New Links</a> | <IF {SWITCH_HELP}><a href="help.php">Help</a> | </IF> <a href="index.php?action=userlogout">Logout</a>
+</div>
+<IF {SWITCH_PM}><br><br>You have <a href="privatemessaging.php">{THISMEMBERNEWPMS[highlight]} new PMs</a>, {THISMEMBERTOTALPMS} total.</IF>
+</IF>
+</IF>
+ </td>
+</tr>
+</table>
+
+<IF {SWITCH_IMS} and {THISMEMBERNEWIMS}>
+<p align="center"><span class="important">You have new IMs. Click the username to open the conversation: {THISMEMBERNEWIMLIST}</span></p>
+</IF>
+
+<!-- BODY GOES HERE -->
+
+<div style="clear:both;"></div>
+
+<form action="{DIRURL}">
+<p align="right"><input type="hidden" name="action" value="displaycat">
+<select name="catid"><option value="0">Category List</option>{CATOPTIONS}</select>
+<input type="submit" value="Go" class="button">
+</p>
+</form>
+
+</div>
+
+<IF {SWITCH_CONTACT}><p align="center"><a href="contactform.php">Contact the Administration</a></p></IF>
+
+<IF {THISMEMBERISREGISTERED} and {SPONSORUSEUG} is yes><p align="center"><a href="membersponsor.php">Sponsor {SITETITLE}</a></p></IF>
+
+<IF {THISMEMBERISREGISTERED}>
+<p align="center"><b>
+<IF {THISMEMBERISADMIN}><a href="[IFADMINadmin/]index.php">Admin Control Panel</a> | <a href="[IFADMIN../]modcp.php">Moderator Control Panel</a></IF>
+<IF {THISMEMBERISMODERATOR}><a href="[IFADMIN../]modcp.php">Moderator Control Panel</a></IF>
+</b></p>
+</IF>
+
+<p align="center"><a href="sitemap.php">Site Map</a></p>
+
+{LOADSTATS}
+
+<IF {SWITCH_IMS} and {THISMEMBERNEWIMS}>
+<script language="JavaScript"> alert("You have a new instant message. Click the sender's name in the IM notification area near the top of the page to join the conversation.") </script>
+</IF>
+<IF {THISMEMBERPMPOPUP}><script language="JavaScript">alert("You have a new private message.");</script></IF>
+</body>
 </html>
\ No newline at end of file
