diff -U 3 -H -d -r -N -- 400/templates/multilingual/admin/addfields.tpl wsnlinks/templates/multilingual/admin/addfields.tpl
--- 400/templates/multilingual/admin/addfields.tpl	2006-09-07 12:30:00.000000000 -0700
+++ wsnlinks/templates/multilingual/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/multilingual/admin/alias.tpl wsnlinks/templates/multilingual/admin/alias.tpl
--- 400/templates/multilingual/admin/alias.tpl	2006-09-07 12:30:00.000000000 -0700
+++ wsnlinks/templates/multilingual/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/multilingual/admin/catusergroups.tpl wsnlinks/templates/multilingual/admin/catusergroups.tpl
--- 400/templates/multilingual/admin/catusergroups.tpl	2006-09-07 12:30:00.000000000 -0700
+++ wsnlinks/templates/multilingual/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/multilingual/admin/dmoz.tpl wsnlinks/templates/multilingual/admin/dmoz.tpl
--- 400/templates/multilingual/admin/dmoz.tpl	2006-06-29 13:09:00.000000000 -0700
+++ wsnlinks/templates/multilingual/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/multilingual/admin/emailprefs.tpl wsnlinks/templates/multilingual/admin/emailprefs.tpl
--- 400/templates/multilingual/admin/emailprefs.tpl	2006-09-07 12:30:00.000000000 -0700
+++ wsnlinks/templates/multilingual/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/multilingual/admin/linkchecks.tpl wsnlinks/templates/multilingual/admin/linkchecks.tpl
--- 400/templates/multilingual/admin/linkchecks.tpl	2006-09-07 12:30:00.000000000 -0700
+++ wsnlinks/templates/multilingual/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/multilingual/admin/sseo.tpl wsnlinks/templates/multilingual/admin/sseo.tpl
--- 400/templates/multilingual/admin/sseo.tpl	2006-09-07 12:30:00.000000000 -0700
+++ wsnlinks/templates/multilingual/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/multilingual/admin/switches.tpl wsnlinks/templates/multilingual/admin/switches.tpl
--- 400/templates/multilingual/admin/switches.tpl	2006-09-07 12:30:00.000000000 -0700
+++ wsnlinks/templates/multilingual/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/multilingual/admin/templates.tpl wsnlinks/templates/multilingual/admin/templates.tpl
--- 400/templates/multilingual/admin/templates.tpl	2006-09-07 12:30:00.000000000 -0700
+++ wsnlinks/templates/multilingual/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/multilingual/admin/toplist.tpl wsnlinks/templates/multilingual/admin/toplist.tpl
--- 400/templates/multilingual/admin/toplist.tpl	2006-09-07 12:30:00.000000000 -0700
+++ wsnlinks/templates/multilingual/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/multilingual/admin/validation.tpl wsnlinks/templates/multilingual/admin/validation.tpl
--- 400/templates/multilingual/admin/validation.tpl	2006-09-07 12:30:00.000000000 -0700
+++ wsnlinks/templates/multilingual/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/multilingual/admin/wrapper.tpl wsnlinks/templates/multilingual/admin/wrapper.tpl
--- 400/templates/multilingual/admin/wrapper.tpl	2006-09-07 12:30:00.000000000 -0700
+++ wsnlinks/templates/multilingual/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/multilingual/albumlist.tpl wsnlinks/templates/multilingual/albumlist.tpl
--- 400/templates/multilingual/albumlist.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/albumlist.tpl	2006-09-13 09:35:25.000000000 -0700
@@ -1,7 +1,7 @@
-<br><br>
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_ALBUMLIST}</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> > {LANG_TITLE_ALBUMLIST}</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/multilingual/albums.tpl wsnlinks/templates/multilingual/albums.tpl
--- 400/templates/multilingual/albums.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/albums.tpl	2006-09-13 09:35:25.000000000 -0700
@@ -1,184 +1,184 @@
-<IF {MEMBERALBUMID} is {CATID}>
-<center><div class="suggest"><a href="suggest.php?action=addlink&amp;catid={CATID}&amp;isalbum=1">{LANG_ALBUM_ADDLINK}</a></div></center>
-</IF>
-
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {NAVIGATION} </div><br>
-
-<center>
-<h2>{CATNAME} {CATADMIN}</h2>
-</center>
-
-<br>
-{CATLINKSHERE} {LANG_GENERAL_LINKS} 
-
-<IF {CATLINKSHERE}>
-<div class="sort">
-<form action="albums.php?todo=orderlinks&amp;catid={CATID}" method="post">
-{LANG_GENERAL_SHOW}
-<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>
-{LANG_GENERAL_LINKS}, {LANG_GENERAL_ORDEREDBY} 
-<select name="orderlinks">
- <option value="id">{LANG_MAIN_NEWEST}</option>
- <option value="lastedit">{LANG_SHOWLINKS_LASTEDITED}</option>
- <option value="title">{LANG_GENERAL_TITLE}</option>
-<IF {SWITCH_RATINGS}>
- <option value="rating">{LANG_GENERAL_RATING}</option>
- <option value="votes">{LANG_GENERAL_VOTES}</option>
-</IF>
-<IF {SWITCH_HITS}>
- <option value="hits">{LANG_GENERAL_HITSOUT}</option>
- <option value="hitsin">{LANG_GENERAL_HITSIN}</option>
-</IF>
-<IF {SWITCH_COMMENTS}>
- <option value="numcomments">{LANG_GENERAL_COMMENTS}</option>
-</IF>
-</select>
-<select name="ascdesc">
- <option value="ASC">{LANG_GENERAL_ASC}</option>
- <option value="DESC">{LANG_GENERAL_DESC}</option>
- </select>
-<input type="submit" value="{LANG_GENERAL_SORT}">
-</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="{LANG_GENERAL_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="{LANG_GENERAL_ALREADYVIEWED}" title="{LANG_GENERAL_ALREADYVIEWED}"></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}/{MAXVOTE}" title="{LINKRATING}/{MAXVOTE}"> ({LINKVOTES} {LANG_GENERAL_VOTES})</IF>
-<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}" title="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}"></IF>
-<br>{LINKDESCRIPTION} 
-
-<div class="linktools">
-<br>{LANG_SHOWLINKS_SUBMITTED} {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, {L_LANG_SHOWLINKS_EDITED} {LINKLASTEDITDATE}</IF>. <br>
-<IF {SWITCH_HITS}>{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}.<br></IF> 
-<br>
-<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="{LANG_GENERAL_DETAILS}"> {LANG_GENERAL_DETAILS}</a> 
-<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="{LANG_GENERAL_RATE}"> {LANG_GENERAL_RATE}</a></IF> 
-<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="{LANG_GENERAL_REPORT}"> {LANG_GENERAL_REPORT}</a></IF> 
-<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="{LANG_GENERAL_EMAIL}"> {LANG_GENERAL_EMAIL}</a></IF> 
-<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="{LANG_GENERAL_EMAILSUBMITTER}"> {LANG_GENERAL_EMAILSUBMITTER}</a></IF> 
-<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="{LANG_SHOWLINKS_BOOKMARK}"> {LANG_SHOWLINKS_BOOKMARK}</a> 
-<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="{P_LANG_GENERAL_COMMENTS}"> {P_LANG_GENERAL_COMMENTS} (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
-
-</div>
-
-<IF {LINKFILEFIELD}><br>{LANG_SHOWLINKS_ATTACHED}:<br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_ALREADYVIEWED}" title="{LANG_GENERAL_ALREADYVIEWED}"></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}/{MAXVOTE}" title="{LINKRATING}/{MAXVOTE}"> ({LINKVOTES} {LANG_GENERAL_VOTES})</IF>
-<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}" title="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}"></IF>
-<br>{LINKDESCRIPTION} 
-
-<div class="linktools">
-<br>{LANG_SHOWLINKS_SUBMITTED} {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, {L_LANG_SHOWLINKS_EDITED} {LINKLASTEDITDATE}</IF>. <br>
-<IF {SWITCH_HITS}>{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}.<br></IF> 
-<br>
-<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="{LANG_GENERAL_DETAILS}"> {LANG_GENERAL_DETAILS}</a> 
-<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="{LANG_GENERAL_RATE}"> {LANG_GENERAL_RATE}</a></IF> 
-<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="{LANG_GENERAL_REPORT}"> {LANG_GENERAL_REPORT}</a></IF> 
-<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="{LANG_GENERAL_EMAIL}"> {LANG_GENERAL_EMAIL}</a></IF> 
-<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="{LANG_GENERAL_EMAILSUBMITTER}"> {LANG_GENERAL_EMAILSUBMITTER}</a></IF> 
-<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="{LANG_SHOWLINKS_BOOKMARK}"> {LANG_SHOWLINKS_BOOKMARK}</a> 
-<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="{P_LANG_GENERAL_COMMENTS}"> {P_LANG_GENERAL_COMMENTS} (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
-
-</div>
-
-<IF {LINKFILEFIELD}><br>{LANG_SHOWLINKS_ATTACHED}:<br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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}>
-{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
-</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"> {LANG_DISPLAYLINKS_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}">{LANG_SHOWLINKS_SUGGESTSUBCAT}</a><br>
-<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="suggest.php?action=addlink&amp;catid={CATID}">{LANG_TITLE_SUGGESTNEWLINK}</a><br>
-</div>
-</div>
-</IF>
-
-<div class="box">
-<div class="boxtitle" onClick="minmax('infobox')"><img src="{TEMPLATESDIR}/images/icon_info.gif" alt="submit"> {LANG_DISPLAYLINKS_CATSTATS}</div>
-<div id="infobox" class="boxbody">
-<IF {CATNUMSUBCATS}><span class="minilabels">{P_LANG_GENERAL_SUBCATEGORIES}:</span> {CATNUMSUBCATS}<br></IF> 
-<span class="minilabels">{P_LANG_GENERAL_LINKS}:</span> {CATLINKSHERE} 
-<IF {CATNUMLINKS} is greater than {CATLINKSHERE}>({CATNUMLINKS} {LANG_DISPLAYLINKS_COUNTINGSUB})</IF> 
-<IF {CATLASTLINKTIME}><br><span class="minilabels">{LANG_SHOWLINKS_LASTLINK}:</span> {CATLASTLINKDATE}</IF>
-
-<IF {SWITCH_ONLINEUSERS}>
-<IF {TOPLISTTOTAL3}><br><br><span class="minilabels">{LANG_MAIN_ONLINE}</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"> {LANG_DISPLAYLINKS_EDITORIAL}</div>
-<div id="modbox" class="boxbody">
-<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="modcp.php">{LANG_TITLE_MODCP}</a> 
-<br>({CATUNVALIDATEDLINKS} {LANG_GENERAL_LINKS}, {CATUNVALIDATEDCOMMENTS} {LANG_GENERAL_COMMENTS} {LANG_MODCP_PENDINGVALIDATION})
-<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=bulkedit">{LANG_BULK_DOIT}</a>
-<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=showdeleted">{LANG_GENERAL_UNDELETELINKS}</a>
-</div>
-</div>
-</IF>
-
-
-</div>
+<IF {MEMBERALBUMID} is {CATID}>
+<center><div class="suggest"><a href="suggest.php?action=addlink&amp;catid={CATID}&amp;isalbum=1">{LANG_ALBUM_ADDLINK}</a></div></center>
+</IF>
+
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {NAVIGATION} </div><br>
+
+<center>
+<h2>{CATNAME} {CATADMIN}</h2>
+</center>
+
+<br>
+{CATLINKSHERE} {LANG_GENERAL_LINKS} 
+
+<IF {CATLINKSHERE}>
+<div class="sort">
+<form action="albums.php?todo=orderlinks&amp;catid={CATID}" method="post">
+{LANG_GENERAL_SHOW}
+<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>
+{LANG_GENERAL_LINKS}, {LANG_GENERAL_ORDEREDBY} 
+<select name="orderlinks">
+ <option value="id">{LANG_MAIN_NEWEST}</option>
+ <option value="lastedit">{LANG_SHOWLINKS_LASTEDITED}</option>
+ <option value="title">{LANG_GENERAL_TITLE}</option>
+<IF {SWITCH_RATINGS}>
+ <option value="rating">{LANG_GENERAL_RATING}</option>
+ <option value="votes">{LANG_GENERAL_VOTES}</option>
+</IF>
+<IF {SWITCH_HITS}>
+ <option value="hits">{LANG_GENERAL_HITSOUT}</option>
+ <option value="hitsin">{LANG_GENERAL_HITSIN}</option>
+</IF>
+<IF {SWITCH_COMMENTS}>
+ <option value="numcomments">{LANG_GENERAL_COMMENTS}</option>
+</IF>
+</select>
+<select name="ascdesc">
+ <option value="ASC">{LANG_GENERAL_ASC}</option>
+ <option value="DESC">{LANG_GENERAL_DESC}</option>
+ </select>
+<input type="submit" value="{LANG_GENERAL_SORT}">
+</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="{LANG_GENERAL_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="{LANG_GENERAL_ALREADYVIEWED}" title="{LANG_GENERAL_ALREADYVIEWED}"></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}/{MAXVOTE}" title="{LINKRATING}/{MAXVOTE}"> ({LINKVOTES} {LANG_GENERAL_VOTES})</IF>
+<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}" title="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}"></IF>
+<br>{LINKDESCRIPTION} 
+
+<div class="linktools">
+<br>{LANG_SHOWLINKS_SUBMITTED} {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, {L_LANG_SHOWLINKS_EDITED} {LINKLASTEDITDATE}</IF>. <br>
+<IF {SWITCH_HITS}>{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}.<br></IF> 
+<br>
+<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="{LANG_GENERAL_DETAILS}"> {LANG_GENERAL_DETAILS}</a> 
+<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="{LANG_GENERAL_RATE}"> {LANG_GENERAL_RATE}</a></IF> 
+<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="{LANG_GENERAL_REPORT}"> {LANG_GENERAL_REPORT}</a></IF> 
+<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="{LANG_GENERAL_EMAIL}"> {LANG_GENERAL_EMAIL}</a></IF> 
+<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="{LANG_GENERAL_EMAILSUBMITTER}"> {LANG_GENERAL_EMAILSUBMITTER}</a></IF> 
+<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="{LANG_SHOWLINKS_BOOKMARK}"> {LANG_SHOWLINKS_BOOKMARK}</a> 
+<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="{P_LANG_GENERAL_COMMENTS}"> {P_LANG_GENERAL_COMMENTS} (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
+
+</div>
+
+<IF {LINKFILEFIELD}><br>{LANG_SHOWLINKS_ATTACHED}:<br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_ALREADYVIEWED}" title="{LANG_GENERAL_ALREADYVIEWED}"></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}/{MAXVOTE}" title="{LINKRATING}/{MAXVOTE}"> ({LINKVOTES} {LANG_GENERAL_VOTES})</IF>
+<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}" title="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}"></IF>
+<br>{LINKDESCRIPTION} 
+
+<div class="linktools">
+<br>{LANG_SHOWLINKS_SUBMITTED} {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, {L_LANG_SHOWLINKS_EDITED} {LINKLASTEDITDATE}</IF>. <br>
+<IF {SWITCH_HITS}>{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}.<br></IF> 
+<br>
+<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="{LANG_GENERAL_DETAILS}"> {LANG_GENERAL_DETAILS}</a> 
+<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="{LANG_GENERAL_RATE}"> {LANG_GENERAL_RATE}</a></IF> 
+<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="{LANG_GENERAL_REPORT}"> {LANG_GENERAL_REPORT}</a></IF> 
+<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="{LANG_GENERAL_EMAIL}"> {LANG_GENERAL_EMAIL}</a></IF> 
+<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="{LANG_GENERAL_EMAILSUBMITTER}"> {LANG_GENERAL_EMAILSUBMITTER}</a></IF> 
+<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="{LANG_SHOWLINKS_BOOKMARK}"> {LANG_SHOWLINKS_BOOKMARK}</a> 
+<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="{P_LANG_GENERAL_COMMENTS}"> {P_LANG_GENERAL_COMMENTS} (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
+
+</div>
+
+<IF {LINKFILEFIELD}><br>{LANG_SHOWLINKS_ATTACHED}:<br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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}>
+{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
+</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"> {LANG_DISPLAYLINKS_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}">{LANG_SHOWLINKS_SUGGESTSUBCAT}</a><br>
+<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="suggest.php?action=addlink&amp;catid={CATID}">{LANG_TITLE_SUGGESTNEWLINK}</a><br>
+</div>
+</div>
+</IF>
+
+<div class="box">
+<div class="boxtitle" onClick="minmax('infobox')"><img src="{TEMPLATESDIR}/images/icon_info.gif" alt="submit"> {LANG_DISPLAYLINKS_CATSTATS}</div>
+<div id="infobox" class="boxbody">
+<IF {CATNUMSUBCATS}><span class="minilabels">{P_LANG_GENERAL_SUBCATEGORIES}:</span> {CATNUMSUBCATS}<br></IF> 
+<span class="minilabels">{P_LANG_GENERAL_LINKS}:</span> {CATLINKSHERE} 
+<IF {CATNUMLINKS} is greater than {CATLINKSHERE}>({CATNUMLINKS} {LANG_DISPLAYLINKS_COUNTINGSUB})</IF> 
+<IF {CATLASTLINKTIME}><br><span class="minilabels">{LANG_SHOWLINKS_LASTLINK}:</span> {CATLASTLINKDATE}</IF>
+
+<IF {SWITCH_ONLINEUSERS}>
+<IF {TOPLISTTOTAL3}><br><br><span class="minilabels">{LANG_MAIN_ONLINE}</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"> {LANG_DISPLAYLINKS_EDITORIAL}</div>
+<div id="modbox" class="boxbody">
+<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="modcp.php">{LANG_TITLE_MODCP}</a> 
+<br>({CATUNVALIDATEDLINKS} {LANG_GENERAL_LINKS}, {CATUNVALIDATEDCOMMENTS} {LANG_GENERAL_COMMENTS} {LANG_MODCP_PENDINGVALIDATION})
+<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=bulkedit">{LANG_BULK_DOIT}</a>
+<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=showdeleted">{LANG_GENERAL_UNDELETELINKS}</a>
+</div>
+</div>
+</IF>
+
+
+</div>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/badrequest.tpl wsnlinks/templates/multilingual/badrequest.tpl
--- 400/templates/multilingual/badrequest.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/badrequest.tpl	2006-09-20 16:44:15.000000000 -0700
@@ -1 +1,3 @@
-{LANG_NOSUCHLINK}
+<p>{LANG_NOSUCHLINK}</p>
+
+<p><a href="{DIRURL}">{SITETITLE}</a></p>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/blank.tpl wsnlinks/templates/multilingual/blank.tpl
--- 400/templates/multilingual/blank.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/blank.tpl	2006-09-07 12:41:45.000000000 -0700
@@ -1,36 +0,0 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{NAVIGATION} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > E-Mail</div><br>
-
-<p>E-mail <a href="{TRACKLINKURL}">{LINKTITLE}</a> to someone:</p>
-
-<table {STANDARDTABLE}>
-<form action="email.php?filled=1" method="post">
-<?php if (!("{MEMBEREMAIL}")) { ?>
-<tr>
- <td class="labelscolumn"><span class="labels">Your E-Mail:</span><br>Note: Your IP address ({SENDERIP}) will be<br>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>
-<?php } else { ?>
-<tr>
-<td colspan="2">
-<input type="hidden" name="fromemail" value="{MEMBEREMAIL}">
-Note: Your IP address ({SENDERIP}) will be sent with the link... do not attempt to spam.
-</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>
-<tr>
- <td class="labelscolumn"><span class="labels">Your Message:</span></td>
- <td class="optionscolumn"><textarea name="customtext" rows="5" cols="60"></textarea><td>
-</tr>
-<?php } ?>
-<tr>
- <td colspan="2"><input type="hidden" name="id" value="{LINKID}"><input type="submit" value="Send Link"></td>
-</tr>
-</form>
-</table>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/buddyignore.tpl wsnlinks/templates/multilingual/buddyignore.tpl
--- 400/templates/multilingual/buddyignore.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/buddyignore.tpl	2006-09-13 09:32:22.000000000 -0700
@@ -1,26 +1,26 @@
-<div class="nav"><a href="[IFADMIN../]index.php">{LANG_NAVORIGIN}</a> > <a href="[IFADMIN../]memberlist.php">{LANG_TITLE_MEMBERLIST}</a> > <a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > {LANG_TITLE_BUDDYIGNORE}</div>
-
-<form action="profile.php?filled=1&amp;action=buddyignore" method="post">
-
-<p>{LANG_BUDDYIGNORE_HELP}</p>
-
-<p>{LANG_BUDDYIGNORE_HELP2}</p>
-
-<table align="center" cellpadding="10" cellspacing="10">
-<tr>
-<td width="50%">
-<center><span class="labels">{LANG_BUDDYIGNORE_BUDDY}</span><br>
-<textarea name="buddylist" cols="40" rows="5">{MEMBERLISTBUDDIES}</textarea>
-</center>
-</td>
-<td width="50%" align="center">
-<center><span class="labels">{LANG_BUDDYIGNORE_IGNORE}</span><br>
-<textarea name="ignorelist" cols="40" rows="5">{MEMBERLISTIGNORED}</textarea>
-</center>
-</td>
-</tr>
-</table>
-
-<center><input type="submit" value="{LANG_GENERAL_UPDATE}" class="button"></center>
-
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="[IFADMIN../]memberlist.php">{LANG_TITLE_MEMBERLIST}</a> > <a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > {LANG_TITLE_BUDDYIGNORE}</div>
+
+<form action="profile.php?filled=1&amp;action=buddyignore" method="post">
+
+<p>{LANG_BUDDYIGNORE_HELP}</p>
+
+<p>{LANG_BUDDYIGNORE_HELP2}</p>
+
+<table align="center" cellpadding="10" cellspacing="10">
+<tr>
+<td width="50%">
+<center><span class="labels">{LANG_BUDDYIGNORE_BUDDY}</span><br>
+<textarea name="buddylist" cols="40" rows="5">{MEMBERLISTBUDDIES}</textarea>
+</center>
+</td>
+<td width="50%" align="center">
+<center><span class="labels">{LANG_BUDDYIGNORE_IGNORE}</span><br>
+<textarea name="ignorelist" cols="40" rows="5">{MEMBERLISTIGNORED}</textarea>
+</center>
+</td>
+</tr>
+</table>
+
+<center><input type="submit" value="{LANG_GENERAL_UPDATE}" class="button"></center>
+
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/bulkeditposts.tpl wsnlinks/templates/multilingual/bulkeditposts.tpl
--- 400/templates/multilingual/bulkeditposts.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/bulkeditposts.tpl	2006-09-13 09:35:25.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> > {LANG_TITLE_BULKPOSTS}</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}>{PALL_LANG_EDITCOM_POSTER}</td>
-<td {COLUMNHEADER}>{LANG_EDITCOM_TEXT}</td>
-<IF {SWITCH_POSTTYPES}><td {COLUMNHEADER}>{LANG_EDITCOM_TYPE}</td></IF>
-<td {COLUMNHEADER}>{PALL_LANG_EDITCOM_REASONDEL}</td>
-<td {COLUMNHEADER}>{LANG_EDITCOM_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>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-<p>{LANG_BULK_WITHSELECTED}
-<select name="action">
- <option value="bulkedit">{LANG_BULK_IGNORE}</option>
- <option value="deleteposts">{LANG_GENERAL_DELETE}</option>
- <option value="move">{LANG_BULK_MOVEPOSTS}</option>
- <option value="mergeposts">{LANG_BULK_MERGEPOSTS}</option>
-</select>
-<br>{LANG_BULK_IFMOVINGPOSTS} <input type="text" name="movedthread" size="{STANDARDSIZE}">
-</p>
-<p><input type="submit" value="{LANG_GENERAL_SAVECHANGES}" class="button"></p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="link.php?id={LINKID}">{LINKTITLE}</a> > {LANG_TITLE_BULKPOSTS}</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}>{PALL_LANG_EDITCOM_POSTER}</td>
+<td {COLUMNHEADER}>{LANG_EDITCOM_TEXT}</td>
+<IF {SWITCH_POSTTYPES}><td {COLUMNHEADER}>{LANG_EDITCOM_TYPE}</td></IF>
+<td {COLUMNHEADER}>{PALL_LANG_EDITCOM_REASONDEL}</td>
+<td {COLUMNHEADER}>{LANG_EDITCOM_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>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+<p>{LANG_BULK_WITHSELECTED}
+<select name="action">
+ <option value="bulkedit">{LANG_BULK_IGNORE}</option>
+ <option value="deleteposts">{LANG_GENERAL_DELETE}</option>
+ <option value="move">{LANG_BULK_MOVEPOSTS}</option>
+ <option value="mergeposts">{LANG_BULK_MERGEPOSTS}</option>
+</select>
+<br>{LANG_BULK_IFMOVINGPOSTS} <input type="text" name="movedthread" size="{STANDARDSIZE}">
+</p>
+<p><input type="submit" value="{LANG_GENERAL_SAVECHANGES}" class="button"></p>
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/bulkedit.tpl wsnlinks/templates/multilingual/bulkedit.tpl
--- 400/templates/multilingual/bulkedit.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/bulkedit.tpl	2006-09-13 09:35:25.000000000 -0700
@@ -1,39 +1,39 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {CATNAV} > {LANG_TITLE_BULKEDIT}</div>
-<br>
-
-<form action="bulkedit.php?catid={CATID}&amp;filled=1" method="post">
-<table>
-<tr>
-<td {COLUMNHEADER}>&nbsp;</td>
-<td {COLUMNHEADER}>{LANG_EDITLINK_TITLE}</td>
-<td {COLUMNHEADER}>{LANG_GENERAL_DESCRIPTION}</td>
-<td {COLUMNHEADER}>{LANG_GENERAL_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>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-<p>{LANG_BULK_WITHSELECTED} 
-<select name="action">
- <option value="nothing">{LANG_BULK_IGNORE}</option>
- <option value="delete">{LANG_GENERAL_DELETE}</option>
- <option value="move">{LANG_BULK_MOVE}</option>
- <option value="alias">{LANG_BULK_ALIAS}</option>
-</select>
-<br>{LANG_BULK_IFMOVING} 
-<IF {SWITCH_CATSELECTOR}>
-<select name="newcategory"><option value="">{LANG_GENERAL_NA}</option>{CATOPTIONS}</select>
-<ELSE>
-<input type="text" name="newcategory" size="6">
-</IF>
-</p>
-<p><input type="submit" value="{LANG_GENERAL_SAVECHANGES}" class="button"></p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {CATNAV} > {LANG_TITLE_BULKEDIT}</div>
+<br>
+
+<form action="bulkedit.php?catid={CATID}&amp;filled=1" method="post">
+<table>
+<tr>
+<td {COLUMNHEADER}>&nbsp;</td>
+<td {COLUMNHEADER}>{LANG_EDITLINK_TITLE}</td>
+<td {COLUMNHEADER}>{LANG_GENERAL_DESCRIPTION}</td>
+<td {COLUMNHEADER}>{LANG_GENERAL_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>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+<p>{LANG_BULK_WITHSELECTED} 
+<select name="action">
+ <option value="nothing">{LANG_BULK_IGNORE}</option>
+ <option value="delete">{LANG_GENERAL_DELETE}</option>
+ <option value="move">{LANG_BULK_MOVE}</option>
+ <option value="alias">{LANG_BULK_ALIAS}</option>
+</select>
+<br>{LANG_BULK_IFMOVING} 
+<IF {SWITCH_CATSELECTOR}>
+<select name="newcategory"><option value="">{LANG_GENERAL_NA}</option>{CATOPTIONS}</select>
+<ELSE>
+<input type="text" name="newcategory" size="6">
+</IF>
+</p>
+<p><input type="submit" value="{LANG_GENERAL_SAVECHANGES}" class="button"></p>
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/calendarday.tpl wsnlinks/templates/multilingual/calendarday.tpl
--- 400/templates/multilingual/calendarday.tpl	1969-12-31 16:00:00.000000000 -0800
+++ wsnlinks/templates/multilingual/calendarday.tpl	2006-09-21 17:23:30.000000000 -0700
@@ -0,0 +1,50 @@
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="calendar.php?monthID={MONTHID}&amp;yearID={YEARID}">{LANG_TITLE_CALENDAR}</a> > {MONTHID}/{DAYID}/{YEARID}
+
+<IF {NUMEVENTS} is 0>
+<p>{LANG_CALENDAR_NOEVENTS} {MONTHID}/{DAYID}/{YEARID}.</p>
+<OTHERWISE>
+<p>{LANG_CALENDAR_AREEVENTS} {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}">{LANG_CALENDAR_EDITEVENT}</a>]</IF><br />
+{EVENTDESCRIPTION} <br />
+<IF not {EVENTDATE}>
+<i>{LANG_CALENDAR_STARTS}: {EVENTSTARTDATE}
+<br />{LANG_CALENDAR_ENDS}: {EVENTENDDATE}</i> <br />
+</IF>
+({LANG_CALENDAR_SCHBY} <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a>)
+
+<IF {EVENTINFUTURE}>
+<IF {EVENTJOINED}><br>{LANG_CALENDAR_PLANNING} {EVENTJOINEDLIST}
+</IF>
+<IF {EVENTTHERE}>
+<br><a href="calendar.php?monthID={MONTHID}&amp;dayID={DAYID}&amp;yearID={YEARID}&amp;action=joinevent&amp;eventid={EVENTID}">{LANG_CALENDAR_UNJOIN}</a>
+<ELSE>
+<br><a href="calendar.php?monthID={MONTHID}&amp;dayID={DAYID}&amp;yearID={YEARID}&amp;action=joinevent&amp;eventid={EVENTID}">{LANG_CALENDAR_JOIN}</a>
+</IF>
+</IF>
+</p>
+<!-- END EVENTS -->
+
+<IF {NUMBIRTHDAYS} is 0>
+<p>{LANG_CALENDAR_NOBDAYS} {MONTHID}/{DAYID}/{YEARID}.</p>
+<OTHERWISE>
+<p>{LANG_CALENDAR_BDAYS} {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">{LANG_CALENDAR_ADDEVENT}</span></p>
+{LANG_CALENDAR_ETITLE}: <input type="text" name="title" size="{STANDARDSIZE}">
+<br>{LANG_CALENDAR_EDESC}: <br><textarea name="description" rows="8" cols="60"></textarea>
+<br>{LANG_CALENDAR_RUNFROM} <input type="text" name="starttime" size="8" value="12 AM"> {LANG_GENERAL_TO} <input type="text" name="endtime" size="8" value="11:59 PM">
+<br><input type="submit" value="{LANG_CALENDAR_SUBMIT}" class="button">
+</form>
+</IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/calendareditevent.tpl wsnlinks/templates/multilingual/calendareditevent.tpl
--- 400/templates/multilingual/calendareditevent.tpl	1969-12-31 16:00:00.000000000 -0800
+++ wsnlinks/templates/multilingual/calendareditevent.tpl	2006-09-21 17:22:28.000000000 -0700
@@ -0,0 +1,11 @@
+<form action="calendar.php?action=editevent&amp;id={EVENTID}&amp;filled=1" method="post">
+<p><span class="important">{LANG_CALENDAR_EDITEVENT}</span></p>
+{LANG_CALENDAR_ETITLE}: <input type="text" name="title" size="{STANDARDSIZE}" value="{EVENTTITLE}">
+<br>{LANG_CALENDAR_EDESC}: <br><textarea name="description" rows="8" cols="60">{EVENTDESCRIPTION}</textarea>
+<br>{LANG_CALENDAR_RUNFROM} <input type="text" name="starttime" size="8" value="{EVENTBEGINSTIME}"> {LANG_GENERAL_TO} <input type="text" name="endtime" size="8" value="{EVENTFINISHESTIME}">
+<IF {EVENTCANDELETE}><br><input type="checkbox" name="delete" value="1"> {LANG_CALENDAR_DELETEEVENT}</IF>
+<br><input type="submit" value="{LANG_CALENDAR_SUBMITEDIT}" class="button">
+<input type="hidden" name="dayID" value="{DAYID}">
+<input type="hidden" name="monthID" value="{MONTHID}">
+<input type="hidden" name="yearID" value="{YEARID}">
+</form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/calendar.tpl wsnlinks/templates/multilingual/calendar.tpl
--- 400/templates/multilingual/calendar.tpl	1969-12-31 16:00:00.000000000 -0800
+++ wsnlinks/templates/multilingual/calendar.tpl	2006-09-21 16:47:09.000000000 -0700
@@ -0,0 +1,9 @@
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_TITLE_CALENDAR}</div>
+
+<div align="center">
+<!-- INSERT CALENDAR HERE -->
+</div>
+
+<p>{LANG_CALENDAR_SCHEDULEHELP}</p>
+
+<p><IF {THISMEMBERCALSUB}><a href="calendar.php?action=subscribe">{LANG_CALENDAR_UNSUB}</a><ELSE><a href="calendar.php?action=subscribe">{LANG_CALENDAR_SUB}</a></p>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/confirm.tpl wsnlinks/templates/multilingual/confirm.tpl
--- 400/templates/multilingual/confirm.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/confirm.tpl	2006-09-13 09:35:25.000000000 -0700
@@ -1,10 +1,10 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a></div> <br>
-
-<p>{LANG_VOTE_CONFIRM}</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="{LANG_VOTE_RATELINK}" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a></div> <br>
+
+<p>{LANG_VOTE_CONFIRM}</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="{LANG_VOTE_RATELINK}" class="button">
+</form>
 </p>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/contactreply.tpl wsnlinks/templates/multilingual/contactreply.tpl
--- 400/templates/multilingual/contactreply.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/contactreply.tpl	2006-09-13 09:35:25.000000000 -0700
@@ -1,25 +1,25 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_CONTACTREPLY}</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"> {LANG_TITLE_CONTACTREPLY}</td></tr><tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_DETAILS_EMAILFROM}:</span>
- <td class="optionscolumn"><input type="text" name="fromemail" size="{STANDARDSIZE}" value="{THISMEMBEREMAIL}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_PM_SENDINGTO}:</span>
- <td class="optionscolumn"><input type="text" name="toemail" size="{STANDARDSIZE}" value=""></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EMAILMEMBER_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">{LANG_EMAILLINK_MESSAGE}:</span>
- <td class="optionscolumn"><textarea rows="10" cols="75" name="message"></textarea></td>
-</tr>
-</table>
-<input type="submit" value="{LANG_EMAILMEMBER_SEND}" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_TITLE_CONTACTREPLY}</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"> {LANG_TITLE_CONTACTREPLY}</td></tr><tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_DETAILS_EMAILFROM}:</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">{LANG_PM_SENDINGTO}:</span>
+ <td class="optionscolumn"><input type="text" name="toemail" size="{STANDARDSIZE}" value=""></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EMAILMEMBER_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">{LANG_EMAILLINK_MESSAGE}:</span>
+ <td class="optionscolumn"><textarea rows="10" cols="75" name="message"></textarea></td>
+</tr>
+</table>
+<input type="submit" value="{LANG_EMAILMEMBER_SEND}" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/deletedposts.tpl wsnlinks/templates/multilingual/deletedposts.tpl
--- 400/templates/multilingual/deletedposts.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/deletedposts.tpl	2006-09-13 09:35:25.000000000 -0700
@@ -1,87 +1,87 @@
-<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&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> {LANG_DELETED_COMMENTS}</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="{LANG_MEMBERLIST_AVATAR}"> <br> </IF>
-
-<br><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}
-<br><span class="labels">{LANG_COMMENTS_JOINED}:</span> {MEMBERREGDATE}
-<IF {MEMBERLOCATION}><br><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</IF>
-<br>
-
-<IF {THISMEMBERISREGISTERED}>
-<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_TOTAL}:</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">{LANG_COMMENTS_LINKSTOTAL}:</span> {MEMBERLINKS}
-<br><span class="labels">{LANG_COMMENTS_TOTAL}:</span> {MEMBERCOMMENTS}
-</IF>
-
-</IF>
-
-<IF {THISMEMBERGROUPCANVIEWIP}><br><br>{LANG_SUGGESTLINK_IP}: <a href="searchips.php?filled=1&amp;getmembers=1&amp;ip={COMMENTIP}">{COMMENTIP}</a></IF>
-</td>
- <td valign="top" width="80%" class="comment">
-<table width="100%">
-<tr valign="top">
-<td align="left"><span class="commentdate">
-<IF {COMMENTVOTES} is greater than 0>{COMMENTAPPROVED} {LANG_MISC_OF}  {COMMENTVOTES} {LANG_COMMENTS_FOUNDHELPFUL}<br></IF>
-{LANG_COMMENTS_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="{LANG_EDITCOM_EDIT}"></a></IF> 
-<IF {COMMENTTITLE}><br>{COMMENTICONIMAGE} {LANG_GENERAL_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="{LANG_COMMENTS_QUOTEPOST}"></a> <br>#{COMMENTNUMBER}</td>
-  </tr>
-  <tr valign="middle">
-   <td height="100%" valign="top">{COMMENTMESSAGE}
-   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">{COMMENTS_EDITEDBY} {COMMENTLASTEDITBY} {LANG_MISC_ON} {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. {LANG_GENERAL_REASON}: {COMMENTEDITREASON}</IF></span></IF>
-   </td>
-  </tr>
-  <tr valign="bottom">
-   <td valign="bottom">
-<IF {COMMENTNUMATTACHMENTS}>
-<br>{LANG_SHOWLINKS_ATTACHED}:<br>
-<table>
-<tr>
-<!-- BEGIN ATTACHMENTS -->
-<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_ATTACHMENT}"></a>
-</IF>
-</td>
-<!-- END ATTACHMENTS -->
-</tr>
-</table>
-</IF>
-  <IF {COMMENTSHOWSIG}>
-     <br>_____________________
-     <br>{MEMBERSIGNATURE}
-  </IF>
-   </td>
-  </tr>
-</table>
- </td>
-</tr>
-</IF>
-<!-- END POSTS -->
-</table>
-<IF {MULTIPAGE}>
-<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-<p><input type="submit" value="{LANG_DELETED_UNDELETECOMMENTS}" 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&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> {LANG_DELETED_COMMENTS}</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="{LANG_MEMBERLIST_AVATAR}"> <br> </IF>
+
+<br><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}
+<br><span class="labels">{LANG_COMMENTS_JOINED}:</span> {MEMBERREGDATE}
+<IF {MEMBERLOCATION}><br><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</IF>
+<br>
+
+<IF {THISMEMBERISREGISTERED}>
+<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_TOTAL}:</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">{LANG_COMMENTS_LINKSTOTAL}:</span> {MEMBERLINKS}
+<br><span class="labels">{LANG_COMMENTS_TOTAL}:</span> {MEMBERCOMMENTS}
+</IF>
+
+</IF>
+
+<IF {THISMEMBERGROUPCANVIEWIP}><br><br>{LANG_SUGGESTLINK_IP}: <a href="searchips.php?filled=1&amp;getmembers=1&amp;ip={COMMENTIP}">{COMMENTIP}</a></IF>
+</td>
+ <td valign="top" width="80%" class="comment">
+<table width="100%">
+<tr valign="top">
+<td align="left"><span class="commentdate">
+<IF {COMMENTVOTES} is greater than 0>{COMMENTAPPROVED} {LANG_MISC_OF}  {COMMENTVOTES} {LANG_COMMENTS_FOUNDHELPFUL}<br></IF>
+{LANG_COMMENTS_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="{LANG_EDITCOM_EDIT}"></a></IF> 
+<IF {COMMENTTITLE}><br>{COMMENTICONIMAGE} {LANG_GENERAL_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="{LANG_COMMENTS_QUOTEPOST}"></a> <br>#{COMMENTNUMBER}</td>
+  </tr>
+  <tr valign="middle">
+   <td height="100%" valign="top">{COMMENTMESSAGE}
+   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">{COMMENTS_EDITEDBY} {COMMENTLASTEDITBY} {LANG_MISC_ON} {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. {LANG_GENERAL_REASON}: {COMMENTEDITREASON}</IF></span></IF>
+   </td>
+  </tr>
+  <tr valign="bottom">
+   <td valign="bottom">
+<IF {COMMENTNUMATTACHMENTS}>
+<br>{LANG_SHOWLINKS_ATTACHED}:<br>
+<table>
+<tr>
+<!-- BEGIN ATTACHMENTS -->
+<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_ATTACHMENT}"></a>
+</IF>
+</td>
+<!-- END ATTACHMENTS -->
+</tr>
+</table>
+</IF>
+  <IF {COMMENTSHOWSIG}>
+     <br>_____________________
+     <br>{MEMBERSIGNATURE}
+  </IF>
+   </td>
+  </tr>
+</table>
+ </td>
+</tr>
+</IF>
+<!-- END POSTS -->
+</table>
+<IF {MULTIPAGE}>
+<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+<p><input type="submit" value="{LANG_DELETED_UNDELETECOMMENTS}" class="button"></p>
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/deletedtopics.tpl wsnlinks/templates/multilingual/deletedtopics.tpl
--- 400/templates/multilingual/deletedtopics.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/deletedtopics.tpl	2006-09-13 09:35:25.000000000 -0700
@@ -1,46 +1,46 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {CATNAV} > {LANG_TITLE_DELETEDTOPICS}</div>
-<br>
-
-<p><span class="labels">{CATDELETEDTOPICS}</span> {LANG_DELETED_INCAT}</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}>{PALL_LANG_GENERAL_LINK}</td>
- <td {COLUMNHEADER}>{PALL_LANG_DELETED_SUBMITTER}</td>
- <td {COLUMNHEADER}>{PALL_LANG_GENERAL_COMMENTS}</td>
- <IF {SWITCH_HITS}><td {COLUMNHEADER}>{LANG_DETAILS_HITS}</td></IF>
- <IF {SWITCH_RATINGS}><td {COLUMNHEADER}>{LANG_DETAILS_RATING}</td></IF>
- <td {COLUMNHEADER}>{PALL_LANG_GENERAL_CREATED}</td>
- <td {COLUMNHEADER}>{PALL_LANG_DELETED_BY}</td>
- <td {COLUMNHEADER}>{PALL_LANG_EDITCOM_REASONDEL}</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>{P_LANG_ONLINE_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} ({LINKVOTES} {LANG_GENERAL_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>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-<p><input type="submit" value="{LANG_DELETED_UNDELETE}" class="button"></p>
-</form>
-</IF>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {CATNAV} > {LANG_TITLE_DELETEDTOPICS}</div>
+<br>
+
+<p><span class="labels">{CATDELETEDTOPICS}</span> {LANG_DELETED_INCAT}</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}>{PALL_LANG_GENERAL_LINK}</td>
+ <td {COLUMNHEADER}>{PALL_LANG_DELETED_SUBMITTER}</td>
+ <td {COLUMNHEADER}>{PALL_LANG_GENERAL_COMMENTS}</td>
+ <IF {SWITCH_HITS}><td {COLUMNHEADER}>{LANG_DETAILS_HITS}</td></IF>
+ <IF {SWITCH_RATINGS}><td {COLUMNHEADER}>{LANG_DETAILS_RATING}</td></IF>
+ <td {COLUMNHEADER}>{PALL_LANG_GENERAL_CREATED}</td>
+ <td {COLUMNHEADER}>{PALL_LANG_DELETED_BY}</td>
+ <td {COLUMNHEADER}>{PALL_LANG_EDITCOM_REASONDEL}</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>{P_LANG_ONLINE_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} ({LINKVOTES} {LANG_GENERAL_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>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+<p><input type="submit" value="{LANG_DELETED_UNDELETE}" class="button"></p>
+</form>
+</IF>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/detailcomments.tpl wsnlinks/templates/multilingual/detailcomments.tpl
--- 400/templates/multilingual/detailcomments.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/detailcomments.tpl	2006-09-13 09:35:25.000000000 -0700
@@ -1,242 +1,242 @@
-<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"> {LINKTITLE}</div>
-
-<IF {LINKURL}><div class="details"><span class="labels">{LANG_SUGGESTLINK_URL}:</span> <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKURL}</a> </div></IF>
-
-<div class="details"><span class="labels">{LANG_SHOWLINKS_SUBMITTED}:</span>
-{LINKDATE} <IF {LINKLASTEDIT} is greater than {LINKTIME}> ({LANG_SHOWLINKS_EDITED} {LINKLASTEDITDATE}) </IF></div>
-
-<div class="details"><span class="labels">{LANG_GENERAL_DESCRIPTION}:</span>
-{LINKDESCRIPTION}</div>
-
-<IF {SWITCH_RATINGS}>
-<div class="details"><span class="labels">{LANG_DETAILS_RATING}:</span>
-{LINKSTARS} <br>{LINKRATING}/{MAXVOTE} {LANG_DETAILS_BASEDON} {LINKVOTES} {LANG_GENERAL_VOTES}</div>
-<IF {THISMEMBERGROUPCANVIEWVOTES}><br><a href="showvotes.php?id={LINKID}">{LANG_SHOWLINKS_INDIVIDUAL}</a></IF>
-</IF>
-
-<IF {SWITCH_HITS}>
-<div class="details"><span class="labels">{LANG_DETAILS_HITS}:</span>
-{LINKHITS} {LANG_DETAILS_TOSITE}, {LINKHITSIN} {LANG_DETAILS_FROMSITE}</div>
-</IF>
-
-<IF {LINKFILEFIELD}>
-<div class="details"><span class="labels">{LANG_SHOWLINKS_ATTACHED}:</span><br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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">{LANG_SUGGESTLINK_RELATED}:</span>
-<!-- BEGIN RELATED --> <a href="{TRACKLINKURL}">{LINKTITLE}</a>, <!-- END RELATED -->
-</div>
-</IF>
-
-<IF {SWITCH_SIMILAR} and {LINKNUMSIMILAR}>
-<div class="details"><span class="labels">{LANG_GENERAL_SIMILARLINKS}:</span><br>
-<!-- BEGIN SIMILAR --> <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a> <br> <!-- END SIMILAR -->
-</div>
-</IF>
-
-<IF {SWITCH_RATINGS}>
-<div class="details"><span class="labels">{LANG_VOTE_RATELINK}:</span>
-<form action="vote.php?action=vote&amp;id={LINKID}" method="post">
-<select name="votevalue">
-<option value="5">5 - {LANG_VOTE_BEST}</option>
-<option value="4">4</option>
-<option value="3">3</option>
-<option value="2">2</option>
-<option value="1">1 - {LANG_VOTE_WORST}</option>
-</select>
-<input type="submit" value="{LANG_SHOWCODE_RATETHIS}">
-</form>
-</div>
-</IF>
-
-<IF {THISMEMBERGROUPCANEMAIL}>
-<div class="details"><span class="labels">{LANG_GENERAL_EMAIL}:</span>
-<form action="email.php?filled=1" method="post">
-{LANG_DETAILS_EMAILFROM} <input type="text" name="fromemail" size="{STANDARDSIZE}"> {LANG_DETAILS_EMAILTO} <input type="text" name="toemail" size="{STANDARDSIZE}"> <input type="hidden" name="id" value="{LINKID}"><input type="submit" value="{LANG_EMAILLINK_SENDLINK}">
-</form></div>
-</div>
-</IF>
-
-<div class="details">
-
-<table width="100%">
-<!-- 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="{LANG_MEMBERLIST_AVATAR}"> <br> </IF>
-
-<br><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}
-<br><span class="labels">{LANG_COMMENTS_JOINED}:</span> {MEMBERREGDATE}
-<IF {MEMBERLOCATION}><br><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</IF>
-<br>
-
-<IF {THISMEMBERISREGISTERED}>
-<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_TOTAL}:</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">{LANG_COMMENTS_LINKSTOTAL}:</span> {MEMBERLINKS}
-<br><span class="labels">{LANG_COMMENTS_TOTAL}:</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="{LANG_COMMENTS_REPORT}"></a></IF>
-
-<IF {SWITCH_RATINGS} and {THISMEMBERGROUPCANRATECOMMENTS}>
-<br><br>{COMMENTS_RATE}: <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="{LANG_GENERAL_APPROVE}"></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="{LANG_GENERAL_DISAPPROVE}"></a>
-</IF>
-
-<IF {THISMEMBERGROUPCANVIEWIP}><br><br>{LANG_SUGGESTLINK_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} {LANG_MISC_OF}  {COMMENTVOTES} {LANG_COMMENTS_FOUNDHELPFUL}<br></IF>
-{LANG_COMMENTS_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="{LANG_EDITCOM_EDIT}"></a></IF> 
-<IF {COMMENTTITLE}><br>{COMMENTICONIMAGE} {LANG_GENERAL_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="{LANG_COMMENTS_QUOTEPOST}"></a> <br>#{COMMENTNUMBER}</td>
-  </tr>
-  <tr valign="middle">
-   <td height="100%" valign="top">{COMMENTMESSAGE}
-   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">{COMMENTS_EDITEDBY} {COMMENTLASTEDITBY} {LANG_MISC_ON} {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. {LANG_GENERAL_REASON}: {COMMENTEDITREASON}</IF></span></IF>
-   </td>
-  </tr>
-  <tr valign="bottom">
-   <td valign="bottom">
-<IF {COMMENTNUMATTACHMENTS}>
-<br>{LANG_SHOWLINKS_ATTACHED}:<br>
-<table>
-<tr>
-<!-- BEGIN ATTACHMENTS -->
-<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_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}>
-<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<IF {LINKCANPOST}><p align="right"><a href="postreply.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/postreply.gif" border="0" alt="{LANG_COMMENTS_POSTREPLY}"></a></p></IF>
-
-<a name="commentarea"></a>
-
-<IF {LINKCANPOST}>
-<p>{LANG_COMMENTS_QUICKREPLY}:</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">{LANG_COMMENTS_YOURNAME}:</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">{LANG_COMMENTS_YOURCOMMENT}:</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>{LANG_COMMENTS_MESSAGEHELPWYSI}<ELSE>{LANG_COMMENTS_MESSAGEHELP}</IF>
-</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">{LANG_GENERAL_SECURITYIMAGE}:</span>
-<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
- <td><img src="securityimage.php" class="bullet" alt="{LANG_ALT_SECIMAGE}"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<input type="hidden" name="linkid" value="{LINKID}">
-<input type="submit" value="{LANG_COMMENTS_POST}" class="button"> <input type="submit" name="preview" value="{LANG_COMMENTS_ADVANCED}" class="button">
-</form>
-<OTHERWISE>
-<IF {LINKTHREADCLOSED}>
-<p>{LANG_COMMENTS_THREADCLOSED}</p>
-<OTHERWISE>
-<p>{LANG_COMMENTS_CANTPOST}</p> 
-<IF {CATREQLINKS} or {CATREQCOMS}>
-<p>{LANG_COMMENTS_NOTENOUGH}</p>
-</IF>
-<IF {THISMEMBERISGUEST}>{LANG_COMMENTS_PLEASEREGISTER}</IF>
-</IF>
-</IF>
-</div>
-
-<IF {SWITCH_ONLINEUSERS}>
-<br><br>{LANG_COMMENTS_ONLINE}: 
-<!-- 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 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"> {LINKTITLE}</div>
+
+<IF {LINKURL}><div class="details"><span class="labels">{LANG_SUGGESTLINK_URL}:</span> <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKURL}</a> </div></IF>
+
+<div class="details"><span class="labels">{LANG_SHOWLINKS_SUBMITTED}:</span>
+{LINKDATE} <IF {LINKLASTEDIT} is greater than {LINKTIME}> ({LANG_SHOWLINKS_EDITED} {LINKLASTEDITDATE}) </IF></div>
+
+<div class="details"><span class="labels">{LANG_GENERAL_DESCRIPTION}:</span>
+{LINKDESCRIPTION}</div>
+
+<IF {SWITCH_RATINGS}>
+<div class="details"><span class="labels">{LANG_DETAILS_RATING}:</span>
+{LINKSTARS} <br>{LINKRATING}/{MAXVOTE} {LANG_DETAILS_BASEDON} {LINKVOTES} {LANG_GENERAL_VOTES}</div>
+<IF {THISMEMBERGROUPCANVIEWVOTES}><br><a href="showvotes.php?id={LINKID}">{LANG_SHOWLINKS_INDIVIDUAL}</a></IF>
+</IF>
+
+<IF {SWITCH_HITS}>
+<div class="details"><span class="labels">{LANG_DETAILS_HITS}:</span>
+{LINKHITS} {LANG_DETAILS_TOSITE}, {LINKHITSIN} {LANG_DETAILS_FROMSITE}</div>
+</IF>
+
+<IF {LINKFILEFIELD}>
+<div class="details"><span class="labels">{LANG_SHOWLINKS_ATTACHED}:</span><br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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">{LANG_SUGGESTLINK_RELATED}:</span>
+<!-- BEGIN RELATED --> <a href="{TRACKLINKURL}">{LINKTITLE}</a>, <!-- END RELATED -->
+</div>
+</IF>
+
+<IF {SWITCH_SIMILAR} and {LINKNUMSIMILAR}>
+<div class="details"><span class="labels">{LANG_GENERAL_SIMILARLINKS}:</span><br>
+<!-- BEGIN SIMILAR --> <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a> <br> <!-- END SIMILAR -->
+</div>
+</IF>
+
+<IF {SWITCH_RATINGS}>
+<div class="details"><span class="labels">{LANG_VOTE_RATELINK}:</span>
+<form action="vote.php?action=vote&amp;id={LINKID}" method="post">
+<select name="votevalue">
+<option value="5">5 - {LANG_VOTE_BEST}</option>
+<option value="4">4</option>
+<option value="3">3</option>
+<option value="2">2</option>
+<option value="1">1 - {LANG_VOTE_WORST}</option>
+</select>
+<input type="submit" value="{LANG_SHOWCODE_RATETHIS}">
+</form>
+</div>
+</IF>
+
+<IF {THISMEMBERGROUPCANEMAIL}>
+<div class="details"><span class="labels">{LANG_GENERAL_EMAIL}:</span>
+<form action="email.php?filled=1" method="post">
+{LANG_DETAILS_EMAILFROM} <input type="text" name="fromemail" size="{STANDARDSIZE}"> {LANG_DETAILS_EMAILTO} <input type="text" name="toemail" size="{STANDARDSIZE}"> <input type="hidden" name="id" value="{LINKID}"><input type="submit" value="{LANG_EMAILLINK_SENDLINK}">
+</form></div>
+</div>
+</IF>
+
+<div class="details">
+
+<table width="100%">
+<!-- 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="{LANG_MEMBERLIST_AVATAR}"> <br> </IF>
+
+<br><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}
+<br><span class="labels">{LANG_COMMENTS_JOINED}:</span> {MEMBERREGDATE}
+<IF {MEMBERLOCATION}><br><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</IF>
+<br>
+
+<IF {THISMEMBERISREGISTERED}>
+<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_TOTAL}:</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">{LANG_COMMENTS_LINKSTOTAL}:</span> {MEMBERLINKS}
+<br><span class="labels">{LANG_COMMENTS_TOTAL}:</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="{LANG_COMMENTS_REPORT}"></a></IF>
+
+<IF {SWITCH_RATINGS} and {THISMEMBERGROUPCANRATECOMMENTS}>
+<br><br>{COMMENTS_RATE}: <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="{LANG_GENERAL_APPROVE}"></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="{LANG_GENERAL_DISAPPROVE}"></a>
+</IF>
+
+<IF {THISMEMBERGROUPCANVIEWIP}><br><br>{LANG_SUGGESTLINK_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} {LANG_MISC_OF}  {COMMENTVOTES} {LANG_COMMENTS_FOUNDHELPFUL}<br></IF>
+{LANG_COMMENTS_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="{LANG_EDITCOM_EDIT}"></a></IF> 
+<IF {COMMENTTITLE}><br>{COMMENTICONIMAGE} {LANG_GENERAL_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="{LANG_COMMENTS_QUOTEPOST}"></a> <br>#{COMMENTNUMBER}</td>
+  </tr>
+  <tr valign="middle">
+   <td height="100%" valign="top">{COMMENTMESSAGE}
+   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">{COMMENTS_EDITEDBY} {COMMENTLASTEDITBY} {LANG_MISC_ON} {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. {LANG_GENERAL_REASON}: {COMMENTEDITREASON}</IF></span></IF>
+   </td>
+  </tr>
+  <tr valign="bottom">
+   <td valign="bottom">
+<IF {COMMENTNUMATTACHMENTS}>
+<br>{LANG_SHOWLINKS_ATTACHED}:<br>
+<table>
+<tr>
+<!-- BEGIN ATTACHMENTS -->
+<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_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}>
+<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<IF {LINKCANPOST}><p align="right"><a href="postreply.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/postreply.gif" border="0" alt="{LANG_COMMENTS_POSTREPLY}"></a></p></IF>
+
+<a name="commentarea"></a>
+
+<IF {LINKCANPOST}>
+<p>{LANG_COMMENTS_QUICKREPLY}:</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">{LANG_COMMENTS_YOURNAME}:</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">{LANG_COMMENTS_YOURCOMMENT}:</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>{LANG_COMMENTS_MESSAGEHELPWYSI}<ELSE>{LANG_COMMENTS_MESSAGEHELP}</IF>
+</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">{LANG_GENERAL_SECURITYIMAGE}:</span>
+<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
+ <td><img src="securityimage.php" class="bullet" alt="{LANG_ALT_SECIMAGE}"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<input type="hidden" name="linkid" value="{LINKID}">
+<input type="submit" value="{LANG_COMMENTS_POST}" class="button"> <input type="submit" name="preview" value="{LANG_COMMENTS_ADVANCED}" class="button">
+</form>
+<OTHERWISE>
+<IF {LINKTHREADCLOSED}>
+<p>{LANG_COMMENTS_THREADCLOSED}</p>
+<OTHERWISE>
+<p>{LANG_COMMENTS_CANTPOST}</p> 
+<IF {CATREQLINKS} or {CATREQCOMS}>
+<p>{LANG_COMMENTS_NOTENOUGH}</p>
+</IF>
+<IF {THISMEMBERISGUEST}>{LANG_COMMENTS_PLEASEREGISTER}</IF>
+</IF>
+</IF>
+</div>
+
+<IF {SWITCH_ONLINEUSERS}>
+<br><br>{LANG_COMMENTS_ONLINE}: 
+<!-- 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>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/details.tpl wsnlinks/templates/multilingual/details.tpl
--- 400/templates/multilingual/details.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/details.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,80 +1,80 @@
-<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"> {LINKTITLE}</div>
-
-<IF {LINKURL}><div class="details"><span class="labels">{LANG_SUGGESTLINK_URL}:</span> <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKURL}</a> </div></IF>
-
-<div class="details"><span class="labels">{LANG_SHOWLINKS_SUBMITTED}:</span>
-{LINKDATE} <IF {LINKLASTEDIT} is greater than {LINKTIME}> ({LANG_SHOWLINKS_EDITED} {LINKLASTEDITDATE}) </IF></div>
-
-<div class="details"><span class="labels">{LANG_GENERAL_DESCRIPTION}:</span>
-{LINKDESCRIPTION}</div>
-
-<IF {SWITCH_RATINGS}>
-<div class="details"><span class="labels">{LANG_DETAILS_RATING}:</span>
-{LINKSTARS} <br>{LINKRATING}/{MAXVOTE} {LANG_DETAILS_BASEDON} {LINKVOTES} {LANG_GENERAL_VOTES}
-<IF {THISMEMBERGROUPCANVIEWVOTES}><br><a href="showvotes.php?id={LINKID}">{LANG_SHOWLINKS_INDIVIDUAL}</a></IF>
-</div>
-</IF>
-
-<IF {SWITCH_HITS}>
-<div class="details"><span class="labels">{LANG_DETAILS_HITS}:</span>
-{LINKHITS} {LANG_DETAILS_TOSITE}, {LINKHITSIN} {LANG_DETAILS_FROMSITE}</div>
-</IF>
-
-<IF {SWITCH_COMMENTS}><div class="details"><span class="labels">{LANG_DETAILS_REVIEWS}:</span>
-<a href="comments.php?id={LINKID}">{LINKNUMCOMMENTS} {LANG_GENERAL_COMMENTS}</a></div></IF>
-
-<IF {LINKFILEFIELD}>
-<div class="details"><span class="labels">{LANG_SHOWLINKS_ATTACHED}:</span><br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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">{LANG_SUGGESTLINK_RELATED}:</span>
-<!-- BEGIN RELATED --> <a href="{TRACKLINKURL}">{LINKTITLE}</a>, <!-- END RELATED -->
-</div>
-</IF>
-
-<IF {SWITCH_SIMILAR} and {LINKNUMSIMILAR}>
-<div class="details"><span class="labels">{LANG_GENERAL_SIMILARLINKS}:</span><br>
-<!-- BEGIN SIMILAR --> <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a> <br> <!-- END SIMILAR -->
-</div>
-</IF>
-
-<IF {SWITCH_RATINGS}>
-<div class="details"><span class="labels">{LANG_VOTE_RATELINK}:</span>
-<form action="vote.php?action=vote&amp;id={LINKID}" method="post">
-<select name="votevalue">
-<option value="5">5 - {LANG_VOTE_BEST}</option>
-<option value="4">4</option>
-<option value="3">3</option>
-<option value="2">2</option>
-<option value="1">1 - {LANG_VOTE_WORST}</option>
-</select>
-<input type="submit" value="{LANG_SHOWCODE_RATETHIS}">
-</form>
-</div>
-</IF>
-
-<IF {THISMEMBERGROUPCANEMAIL}>
-<div class="details"><span class="labels">{LANG_GENERAL_EMAIL}:</span>
-<form action="email.php?filled=1" method="post">
-{LANG_DETAILS_EMAILFROM} <input type="text" name="fromemail" size="{STANDARDSIZE}"> {LANG_DETAILS_EMAILTO} <input type="text" name="toemail" size="{STANDARDSIZE}"> <input type="hidden" name="id" value="{LINKID}"><input type="submit" value="{LANG_EMAILLINK_SENDLINK}">
-</form></div>
-</div>
-</IF>
-
-<IF {THISMEMBERUSERGROUP} is greater than 1 and {THISMEMBERID} is {LINKOWNERID}> 
-<IF {SWITCH_RATINGS}>
-<br>[<a href="index.php?action=getvotingcode&amp;id={LINKID}">{LANG_SHOWLINKS_GETCODE}</a>]
-</IF>
-<IF {SPONSORUSELINK} is yes>
-<br>[<a href="link.php?action=sponsor&amp;id={LINKID}">{LANG_SHOWLINKS_SPONSOR}</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"> {LINKTITLE}</div>
+
+<IF {LINKURL}><div class="details"><span class="labels">{LANG_SUGGESTLINK_URL}:</span> <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKURL}</a> </div></IF>
+
+<div class="details"><span class="labels">{LANG_SHOWLINKS_SUBMITTED}:</span>
+{LINKDATE} <IF {LINKLASTEDIT} is greater than {LINKTIME}> ({LANG_SHOWLINKS_EDITED} {LINKLASTEDITDATE}) </IF></div>
+
+<div class="details"><span class="labels">{LANG_GENERAL_DESCRIPTION}:</span>
+{LINKDESCRIPTION}</div>
+
+<IF {SWITCH_RATINGS}>
+<div class="details"><span class="labels">{LANG_DETAILS_RATING}:</span>
+{LINKSTARS} <br>{LINKRATING}/{MAXVOTE} {LANG_DETAILS_BASEDON} {LINKVOTES} {LANG_GENERAL_VOTES}
+<IF {THISMEMBERGROUPCANVIEWVOTES}><br><a href="showvotes.php?id={LINKID}">{LANG_SHOWLINKS_INDIVIDUAL}</a></IF>
+</div>
+</IF>
+
+<IF {SWITCH_HITS}>
+<div class="details"><span class="labels">{LANG_DETAILS_HITS}:</span>
+{LINKHITS} {LANG_DETAILS_TOSITE}, {LINKHITSIN} {LANG_DETAILS_FROMSITE}</div>
+</IF>
+
+<IF {SWITCH_COMMENTS}><div class="details"><span class="labels">{LANG_DETAILS_REVIEWS}:</span>
+<a href="comments.php?id={LINKID}">{LINKNUMCOMMENTS} {LANG_GENERAL_COMMENTS}</a></div></IF>
+
+<IF {LINKFILEFIELD}>
+<div class="details"><span class="labels">{LANG_SHOWLINKS_ATTACHED}:</span><br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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">{LANG_SUGGESTLINK_RELATED}:</span>
+<!-- BEGIN RELATED --> <a href="{TRACKLINKURL}">{LINKTITLE}</a>, <!-- END RELATED -->
+</div>
+</IF>
+
+<IF {SWITCH_SIMILAR} and {LINKNUMSIMILAR}>
+<div class="details"><span class="labels">{LANG_GENERAL_SIMILARLINKS}:</span><br>
+<!-- BEGIN SIMILAR --> <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a> <br> <!-- END SIMILAR -->
+</div>
+</IF>
+
+<IF {SWITCH_RATINGS}>
+<div class="details"><span class="labels">{LANG_VOTE_RATELINK}:</span>
+<form action="vote.php?action=vote&amp;id={LINKID}" method="post">
+<select name="votevalue">
+<option value="5">5 - {LANG_VOTE_BEST}</option>
+<option value="4">4</option>
+<option value="3">3</option>
+<option value="2">2</option>
+<option value="1">1 - {LANG_VOTE_WORST}</option>
+</select>
+<input type="submit" value="{LANG_SHOWCODE_RATETHIS}">
+</form>
+</div>
+</IF>
+
+<IF {THISMEMBERGROUPCANEMAIL}>
+<div class="details"><span class="labels">{LANG_GENERAL_EMAIL}:</span>
+<form action="email.php?filled=1" method="post">
+{LANG_DETAILS_EMAILFROM} <input type="text" name="fromemail" size="{STANDARDSIZE}"> {LANG_DETAILS_EMAILTO} <input type="text" name="toemail" size="{STANDARDSIZE}"> <input type="hidden" name="id" value="{LINKID}"><input type="submit" value="{LANG_EMAILLINK_SENDLINK}">
+</form></div>
+</div>
+</IF>
+
+<IF {THISMEMBERUSERGROUP} is greater than 1 and {THISMEMBERID} is {LINKOWNERID}> 
+<IF {SWITCH_RATINGS}>
+<br>[<a href="index.php?action=getvotingcode&amp;id={LINKID}">{LANG_SHOWLINKS_GETCODE}</a>]
+</IF>
+<IF {SPONSORUSELINK} is yes>
+<br>[<a href="link.php?action=sponsor&amp;id={LINKID}">{LANG_SHOWLINKS_SPONSOR}</a>]<br>
+</IF>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/displaylinks.tpl wsnlinks/templates/multilingual/displaylinks.tpl
--- 400/templates/multilingual/displaylinks.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/displaylinks.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,240 +1,240 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {NAVIGATION} </div><br>
-
-<center>
-<h2>{CATNAME} {CATADMIN}</h2>
-</center>
-
-<IF {SWITCH_SORTCATS}>
-<IF {CATNUMSUB}>
-<div class="sort">
-<form action="index.php?action=displaycat&amp;catid={CATID}&amp;todo=ordercats" method="post">
-{LANG_MAIN_SORTCATSBY}
-<select name="catfield">
- <option value="name">{LANG_GENERAL_NAME_LOWER}</option>
- <option value="numlinks">{LANG_SEARCH_NUMLINKS}</option>
- <option value="numsub">{LANG_SEARCH_NUMSUB}</option>
- <option value="time">{L_LANG_SEARCH_DATE}</option>
-</select>
-{LANG_MISC_IN} 
-<select name="catascdesc">
- <option value="asc">{LANG_GENERAL_ASC}</option>
- <option value="desc">{LANG_GENERAL_DESC}</option>
-</select>
-{LANG_MAIN_ORDER}
-<input type="submit" value="{LANG_GENERAL_SORT}" class="button">
-</form>
-</div>
-</IF>
-</IF>
-
-<IF {CATNUMBERRELATED}>
-{CATNUMBERRELATED} {LANG_SHOWLINKS_RELATEDCATEGORIES}: </IF>
-<!-- BEGIN RELATED -->
-[ <a href="index.php?action=displaycat&amp;catid={CATID}" class="categoryname">{CATNAME}</a> ({CATNUMLINKS}) {CATHASNEW} {CATADMIN} ]    
-<!-- END RELATED -->
-
-<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>
-<!-- BEGIN SUBSUB -->
-<a href="index.php?action=displaycat&amp;catid={CATID}">{CATNAME}</a>, 
-<!-- END SUBSUB -->
-</td>
-<!-- END REGULAR -->
-<!-- END SUBCATEGORIES -->
-</table>
-
-<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}">
-{P_LANG_GENERAL_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>
-{LANG_GENERAL_LINKS}, {LANG_GENERAL_ORDEREDBY} 
-<select name="orderlinks">
- <option value="id">{LANG_MAIN_NEWEST}</option>
- <option value="lastedit">{LANG_SHOWLINKS_LASTEDITED}</option>
- <option value="title">{LANG_GENERAL_TITLE}</option>
-<IF {SWITCH_RATINGS}>
- <option value="rating">{LANG_GENERAL_RATING}</option>
- <option value="votes">{LANG_GENERAL_VOTES}</option>
-</IF>
-<IF {SWITCH_HITS}>
- <option value="hits">{LANG_GENERAL_HITSOUT}</option>
- <option value="hitsin">{LANG_GENERAL_HITSIN}</option>
-</IF>
-<IF {SWITCH_COMMENTS}>
- <option value="numcomments">{LANG_GENERAL_COMMENTS}</option>
-</IF>
-<IF {SWITCH_PAGERANK}><option value="pagerank">{LANG_GENERAL_PAGERANK}</option></IF>
-</select>
-<select name="ascdesc">
- <option value="ASC">{LANG_GENERAL_ASC}</option>
- <option value="DESC">{LANG_GENERAL_DESC}</option>
-</select>
-<input type="submit" value="{LANG_GENERAL_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="{LANG_GENERAL_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="{LANG_GENERAL_ALREADYVIEWED}" title="{LANG_GENERAL_ALREADYVIEWED}"></IF> {LINKADMIN}
-<IF {SWITCH_RATINGS} and {LINKRATING}><br><img src="{TEMPLATESDIR}/images/stars{LINKNUMSTARS}.gif" alt="{LINKRATING}/{MAXVOTE}" title="{LINKRATING}/{MAXVOTE}"> ({LINKVOTES} {LANG_GENERAL_VOTES})</IF>
-<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}" title="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}"></IF>
-<br>{LINKDESCRIPTION} 
-
-<div class="linktools">
-<br>{LANG_SHOWLINKS_SUBMITTED} {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, {L_LANG_SHOWLINKS_EDITED} {LINKLASTEDITDATE}</IF>. <br>
-<IF {SWITCH_HITS}>{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}.<br></IF> 
-<br>
-<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="{LANG_GENERAL_DETAILS}"> {LANG_GENERAL_DETAILS}</a> 
-<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="{LANG_GENERAL_RATE}"> {LANG_GENERAL_RATE}</a></IF> 
-<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="{LANG_GENERAL_REPORT}"> {LANG_GENERAL_REPORT}</a></IF> 
-<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="{LANG_GENERAL_EMAIL}"> {LANG_GENERAL_EMAIL}</a></IF> 
-<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="{LANG_GENERAL_EMAILSUBMITTER}"> {LANG_GENERAL_EMAILSUBMITTER}</a></IF> 
-<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="{LANG_SHOWLINKS_BOOKMARK}"> {LANG_SHOWLINKS_BOOKMARK}</a> 
-<IF {SWITCH_ALBUMS} and {THISMEMBERISREGISTERED}><a href="albums.php?add={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_save.gif" border="0" alt="{LANG_SHOWLINKS_ADDTOLIST}"> {LANG_SHOWLINKS_ADDTOLIST}</a></IF> 
-<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="{P_LANG_GENERAL_COMMENTS}"> {P_LANG_GENERAL_COMMENTS} (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
-
-</div>
-
-<IF {LINKFILEFIELD}><br>{LANG_SHOWLINKS_ATTACHED}:<br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_ALREADYVIEWED}" title="{LANG_GENERAL_ALREADYVIEWED}"></IF> {LINKADMIN}
-<IF {SWITCH_RATINGS} and {LINKRATING}><br><img src="{TEMPLATESDIR}/images/stars{LINKNUMSTARS}.gif" alt="{LINKRATING}/{MAXVOTE}" title="{LINKRATING}/{MAXVOTE}"> ({LINKVOTES} {LANG_GENERAL_VOTES})</IF>
-<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}" title="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}"></IF>
-<br>{LINKDESCRIPTION} 
-
-<div class="linktools">
-<br>{LANG_SHOWLINKS_SUBMITTED} {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, {L_LANG_SHOWLINKS_EDITED} {LINKLASTEDITDATE}</IF>. <br>
-<IF {SWITCH_HITS}>{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}.<br></IF> 
-<br>
-<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="{LANG_GENERAL_DETAILS}"> {LANG_GENERAL_DETAILS}</a> 
-<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="{LANG_GENERAL_RATE}"> {LANG_GENERAL_RATE}</a></IF> 
-<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="{LANG_GENERAL_REPORT}"> {LANG_GENERAL_REPORT}</a></IF> 
-<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="{LANG_GENERAL_EMAIL}"> {LANG_GENERAL_EMAIL}</a></IF> 
-<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="{LANG_GENERAL_EMAILSUBMITTER}"> {LANG_GENERAL_EMAILSUBMITTER}</a></IF> 
-<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="{LANG_SHOWLINKS_BOOKMARK}"> {LANG_SHOWLINKS_BOOKMARK}</a> 
-<IF {SWITCH_ALBUMS} and {THISMEMBERISREGISTERED}><a href="albums.php?add={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_save.gif" border="0" alt="{LANG_SHOWLINKS_ADDTOLIST}"> {LANG_SHOWLINKS_ADDTOLIST}</a></IF> 
-<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="{P_LANG_GENERAL_COMMENTS}"> {P_LANG_GENERAL_COMMENTS} (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
-
-</div>
-
-<IF {LINKFILEFIELD}><br>{LANG_SHOWLINKS_ATTACHED}:<br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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}>
-{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
-</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">
-{LANG_SHOWLINKS_SEARCHFOR} <input type="text" name="search" size="{STANDARDSIZE}">
-{LANG_MISC_IN} <select name="incat"><option value="">{LANG_SHOWLINKS_ALLCATEGORIES}</option>{CATOPTIONS}</select>
-<input type="submit" value="{LANG_MAIN_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"> {LANG_DISPLAYLINKS_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">{LANG_SHOWLINKS_UNSUBSCRIBECAT}</a>
-<OTHERWISE>
-<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="index.php?action=displaycat&amp;catid={CATID}&amp;todo=subscribe">{LANG_SHOWLINKS_SUBSCRIBECAT}</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}">{LANG_SHOWLINKS_SUGGESTSUBCAT}</a><br></IF> 
-<IF {CATCANSUBMITLINKS}><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="suggest.php?action=addlink&amp;catid={CATID}">{LANG_TITLE_SUGGESTNEWLINK}</a><br></IF>
-</div>
-</div>
-
-<div class="box">
-<div class="boxtitle" onClick="minmax('infobox')"><img src="{TEMPLATESDIR}/images/icon_info.gif" alt="submit"> {LANG_DISPLAYLINKS_CATSTATS}</div>
-<div id="infobox" class="boxbody">
-<IF {CATNUMSUBCATS}><span class="minilabels">{P_LANG_GENERAL_SUBCATEGORIES}:</span> {CATNUMSUBCATS}<br></IF> 
-<span class="minilabels">{P_LANG_GENERAL_LINKS}:</span> {CATLINKSHERE} 
-<IF {CATNUMLINKS} is greater than {CATLINKSHERE}>({CATNUMLINKS} {LANG_DISPLAYLINKS_COUNTINGSUB})</IF> 
-<IF {CATLASTLINKTIME}><br><span class="minilabels">{LANG_SHOWLINKS_LASTLINK}:</span> {CATLASTLINKDATE}</IF>
-
-<IF {SWITCH_ONLINEUSERS}>
-<IF {TOPLISTTOTAL3}><br><br><span class="minilabels">{LANG_MAIN_ONLINE}</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"> {LANG_DISPLAYLINKS_EDITORIAL}</div>
-<div id="modbox" class="boxbody">
-<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="modcp.php">{LANG_TITLE_MODCP}</a> 
-<br>({CATUNVALIDATEDLINKS} {LANG_GENERAL_LINKS}, {CATUNVALIDATEDCOMMENTS} {LANG_GENERAL_COMMENTS} {LANG_MODCP_PENDINGVALIDATION})
-<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=bulkedit">{LANG_BULK_DOIT}</a>
-<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=showdeleted">{LANG_GENERAL_UNDELETELINKS}</a>
-</div>
-</div>
-</IF>
-
-
-</div>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {NAVIGATION} </div><br>
+
+<center>
+<h2>{CATNAME} {CATADMIN}</h2>
+</center>
+
+<IF {SWITCH_SORTCATS}>
+<IF {CATNUMSUB}>
+<div class="sort">
+<form action="index.php?action=displaycat&amp;catid={CATID}&amp;todo=ordercats" method="post">
+{LANG_MAIN_SORTCATSBY}
+<select name="catfield">
+ <option value="name">{LANG_GENERAL_NAME_LOWER}</option>
+ <option value="numlinks">{LANG_SEARCH_NUMLINKS}</option>
+ <option value="numsub">{LANG_SEARCH_NUMSUB}</option>
+ <option value="time">{L_LANG_SEARCH_DATE}</option>
+</select>
+{LANG_MISC_IN} 
+<select name="catascdesc">
+ <option value="asc">{LANG_GENERAL_ASC}</option>
+ <option value="desc">{LANG_GENERAL_DESC}</option>
+</select>
+{LANG_MAIN_ORDER}
+<input type="submit" value="{LANG_GENERAL_SORT}" class="button">
+</form>
+</div>
+</IF>
+</IF>
+
+<IF {CATNUMBERRELATED}>
+{CATNUMBERRELATED} {LANG_SHOWLINKS_RELATEDCATEGORIES}: </IF>
+<!-- BEGIN RELATED -->
+[ <a href="index.php?action=displaycat&amp;catid={CATID}" class="categoryname">{CATNAME}</a> ({CATNUMLINKS}) {CATHASNEW} {CATADMIN} ]    
+<!-- END RELATED -->
+
+<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>
+<!-- BEGIN SUBSUB -->
+<a href="{CATURL}">{CATNAME}</a>, 
+<!-- END SUBSUB -->
+</td>
+<!-- END REGULAR -->
+<!-- END SUBCATEGORIES -->
+</table>
+
+<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}">
+{P_LANG_GENERAL_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>
+{LANG_GENERAL_LINKS}, {LANG_GENERAL_ORDEREDBY} 
+<select name="orderlinks">
+ <option value="id">{LANG_MAIN_NEWEST}</option>
+ <option value="lastedit">{LANG_SHOWLINKS_LASTEDITED}</option>
+ <option value="title">{LANG_GENERAL_TITLE}</option>
+<IF {SWITCH_RATINGS}>
+ <option value="rating">{LANG_GENERAL_RATING}</option>
+ <option value="votes">{LANG_GENERAL_VOTES}</option>
+</IF>
+<IF {SWITCH_HITS}>
+ <option value="hits">{LANG_GENERAL_HITSOUT}</option>
+ <option value="hitsin">{LANG_GENERAL_HITSIN}</option>
+</IF>
+<IF {SWITCH_COMMENTS}>
+ <option value="numcomments">{LANG_GENERAL_COMMENTS}</option>
+</IF>
+<IF {SWITCH_PAGERANK}><option value="pagerank">{LANG_GENERAL_PAGERANK}</option></IF>
+</select>
+<select name="ascdesc">
+ <option value="ASC">{LANG_GENERAL_ASC}</option>
+ <option value="DESC">{LANG_GENERAL_DESC}</option>
+</select>
+<input type="submit" value="{LANG_GENERAL_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="{LANG_GENERAL_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="{LANG_GENERAL_ALREADYVIEWED}" title="{LANG_GENERAL_ALREADYVIEWED}"></IF> {LINKADMIN}
+<IF {SWITCH_RATINGS} and {LINKRATING}><br><img src="{TEMPLATESDIR}/images/stars{LINKNUMSTARS}.gif" alt="{LINKRATING}/{MAXVOTE}" title="{LINKRATING}/{MAXVOTE}"> ({LINKVOTES} {LANG_GENERAL_VOTES})</IF>
+<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}" title="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}"></IF>
+<br>{LINKDESCRIPTION} 
+
+<div class="linktools">
+<br>{LANG_SHOWLINKS_SUBMITTED} {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, {L_LANG_SHOWLINKS_EDITED} {LINKLASTEDITDATE}</IF>. <br>
+<IF {SWITCH_HITS}>{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}.<br></IF> 
+<br>
+<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="{LANG_GENERAL_DETAILS}"> {LANG_GENERAL_DETAILS}</a> 
+<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="{LANG_GENERAL_RATE}"> {LANG_GENERAL_RATE}</a></IF> 
+<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="{LANG_GENERAL_REPORT}"> {LANG_GENERAL_REPORT}</a></IF> 
+<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="{LANG_GENERAL_EMAIL}"> {LANG_GENERAL_EMAIL}</a></IF> 
+<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="{LANG_GENERAL_EMAILSUBMITTER}"> {LANG_GENERAL_EMAILSUBMITTER}</a></IF> 
+<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="{LANG_SHOWLINKS_BOOKMARK}"> {LANG_SHOWLINKS_BOOKMARK}</a> 
+<IF {SWITCH_ALBUMS} and {THISMEMBERISREGISTERED}><a href="albums.php?add={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_save.gif" border="0" alt="{LANG_SHOWLINKS_ADDTOLIST}"> {LANG_SHOWLINKS_ADDTOLIST}</a></IF> 
+<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="{P_LANG_GENERAL_COMMENTS}"> {P_LANG_GENERAL_COMMENTS} (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
+
+</div>
+
+<IF {LINKFILEFIELD}><br>{LANG_SHOWLINKS_ATTACHED}:<br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_ALREADYVIEWED}" title="{LANG_GENERAL_ALREADYVIEWED}"></IF> {LINKADMIN}
+<IF {SWITCH_RATINGS} and {LINKRATING}><br><img src="{TEMPLATESDIR}/images/stars{LINKNUMSTARS}.gif" alt="{LINKRATING}/{MAXVOTE}" title="{LINKRATING}/{MAXVOTE}"> ({LINKVOTES} {LANG_GENERAL_VOTES})</IF>
+<IF {SWITCH_PAGERANK}><br><img src="{TEMPLATESDIR}/images/pagerank/{LINKPAGERANK}.gif" alt="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}" title="{LANG_GENERAL_PAGERANK} {LINKPAGERANK}"></IF>
+<br>{LINKDESCRIPTION} 
+
+<div class="linktools">
+<br>{LANG_SHOWLINKS_SUBMITTED} {LINKDATE}<IF {LINKLASTEDIT} is greater than {LINKTIME}>, {L_LANG_SHOWLINKS_EDITED} {LINKLASTEDITDATE}</IF>. <br>
+<IF {SWITCH_HITS}>{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}.<br></IF> 
+<br>
+<a href="{LINKDETAILSURL}"><img src="{TEMPLATESDIR}/images/linktools_details.gif" border="0" alt="{LANG_GENERAL_DETAILS}"> {LANG_GENERAL_DETAILS}</a> 
+<IF {SWITCH_RATINGS}><a href="vote.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_rate.gif" border="0" alt="{LANG_GENERAL_RATE}"> {LANG_GENERAL_RATE}</a></IF> 
+<IF {SWITCH_REPORTS}><a href="report.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_report.gif" border="0" alt="{LANG_GENERAL_REPORT}"> {LANG_GENERAL_REPORT}</a></IF> 
+<IF {THISMEMBERGROUPCANEMAIL}><a href="email.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emaillink.gif" border="0" alt="{LANG_GENERAL_EMAIL}"> {LANG_GENERAL_EMAIL}</a></IF> 
+<IF {THISMEMBERGROUPCANEMAILMEMBERS} and {LINKHASEMAIL}><a href="emailsubmitter.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_emailsubmitter.gif" border="0" alt="{LANG_GENERAL_EMAILSUBMITTER}"> {LANG_GENERAL_EMAILSUBMITTER}</a></IF> 
+<a href="javascript:window.external.AddFavorite('{LINKURL}', '{LINKBOOKMARKTITLE}')"><img src="{TEMPLATESDIR}/images/linktools_bookmark.gif" border="0" alt="{LANG_SHOWLINKS_BOOKMARK}"> {LANG_SHOWLINKS_BOOKMARK}</a> 
+<IF {SWITCH_ALBUMS} and {THISMEMBERISREGISTERED}><a href="albums.php?add={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_save.gif" border="0" alt="{LANG_SHOWLINKS_ADDTOLIST}"> {LANG_SHOWLINKS_ADDTOLIST}</a></IF> 
+<IF {SWITCH_COMMENTS}><a href="comments.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/linktools_comments.gif" border="0" alt="{P_LANG_GENERAL_COMMENTS}"> {P_LANG_GENERAL_COMMENTS} (<IF {LINKCOMMENTSREAD}>{LINKNUMCOMMENTS}<OTHERWISE><b>{LINKNUMCOMMENTS}</b></IF>)</a></IF> 
+
+</div>
+
+<IF {LINKFILEFIELD}><br>{LANG_SHOWLINKS_ATTACHED}:<br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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}>
+{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
+</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">
+{LANG_SHOWLINKS_SEARCHFOR} <input type="text" name="search" size="{STANDARDSIZE}">
+{LANG_MISC_IN} <select name="incat"><option value="">{LANG_SHOWLINKS_ALLCATEGORIES}</option>{CATOPTIONS}</select>
+<input type="submit" value="{LANG_MAIN_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"> {LANG_DISPLAYLINKS_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">{LANG_SHOWLINKS_UNSUBSCRIBECAT}</a>
+<OTHERWISE>
+<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="index.php?action=displaycat&amp;catid={CATID}&amp;todo=subscribe">{LANG_SHOWLINKS_SUBSCRIBECAT}</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}">{LANG_SHOWLINKS_SUGGESTSUBCAT}</a><br></IF> 
+<IF {CATCANSUBMITLINKS}><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="suggest.php?action=addlink&amp;catid={CATID}">{LANG_TITLE_SUGGESTNEWLINK}</a><br></IF>
+</div>
+</div>
+
+<div class="box">
+<div class="boxtitle" onClick="minmax('infobox')"><img src="{TEMPLATESDIR}/images/icon_info.gif" alt="submit"> {LANG_DISPLAYLINKS_CATSTATS}</div>
+<div id="infobox" class="boxbody">
+<IF {CATNUMSUBCATS}><span class="minilabels">{P_LANG_GENERAL_SUBCATEGORIES}:</span> {CATNUMSUBCATS}<br></IF> 
+<span class="minilabels">{P_LANG_GENERAL_LINKS}:</span> {CATLINKSHERE} 
+<IF {CATNUMLINKS} is greater than {CATLINKSHERE}>({CATNUMLINKS} {LANG_DISPLAYLINKS_COUNTINGSUB})</IF> 
+<IF {CATLASTLINKTIME}><br><span class="minilabels">{LANG_SHOWLINKS_LASTLINK}:</span> {CATLASTLINKDATE}</IF>
+
+<IF {SWITCH_ONLINEUSERS}>
+<IF {TOPLISTTOTAL3}><br><br><span class="minilabels">{LANG_MAIN_ONLINE}</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"> {LANG_DISPLAYLINKS_EDITORIAL}</div>
+<div id="modbox" class="boxbody">
+<img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="modcp.php">{LANG_TITLE_MODCP}</a> 
+<br>({CATUNVALIDATEDLINKS} {LANG_GENERAL_LINKS}, {CATUNVALIDATEDCOMMENTS} {LANG_GENERAL_COMMENTS} {LANG_MODCP_PENDINGVALIDATION})
+<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=bulkedit">{LANG_BULK_DOIT}</a>
+<br><img src="{TEMPLATESDIR}/images/bullet.gif" alt="bullet" class="bullet"> <a href="bulkedit.php?catid={CATID}&amp;type=showdeleted">{LANG_GENERAL_UNDELETELINKS}</a>
+</div>
+</div>
+</IF>
+
+
+</div>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/editcat.tpl wsnlinks/templates/multilingual/editcat.tpl
--- 400/templates/multilingual/editcat.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/editcat.tpl	2006-09-17 18:43:48.000000000 -0700
@@ -1,4 +1,4 @@
-<div class="nav"><a href="[IFADMIN../]index.php">{LANG_NAVORIGIN}</a>{CATNAV} > {LANG_EDITCAT_EDIT}</div>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{CATNAV} > {LANG_EDITCAT_EDIT}</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">{LANG_GENERAL_DESCRIPTION}:</span>
-<IF {SWITCH_WYSIWYGDESCRIP}>
+<IF {SWITCH_WYSIDESCRIP}>
 <p align="center">
 <IF {THISMEMBERPOSTEDITOR} is WYSIWYG><input type="submit" name="switcheditor" value="{LANG_EDITCOM_SWITCHPLAIN}" class="button"></IF>
 <IF {THISMEMBERPOSTEDITOR} is plain><input type="submit" name="switcheditor" value="{LANG_EDITCOM_SWITCHWYSI}" class="button"></IF>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/editcomments.tpl wsnlinks/templates/multilingual/editcomments.tpl
--- 400/templates/multilingual/editcomments.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/editcomments.tpl	2006-09-13 09:32:22.000000000 -0700
@@ -1,125 +1,125 @@
-<div class="nav"><a href="[IFADMIN../]index.php">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="[IFADMIN../]comments.php?id={LINKID}">{LINKTITLE}</a> > {LANG_EDITCOM_EDIT}</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">{LANG_EDITCOM_DELETE}</span>
-<br>{LANG_EDITCOM_REASONDEL}: <input type="text" name="deletionreason" size="{STANDARDSIZE}" value="{COMMENTDELETIONREASON}"><br>
-<IF {COMMENTDELETED}>
-<input type="submit" name="delete" value="{LANG_EDITCOM_RESTOREDEL}" class="button">
-<OTHERWISE>
-<IF {THISMEMBERGROUPCANHARDDELETE}><input type="checkbox" name="harddelete" value="1"> {LANG_EDITCOM_HARDDELETE}<br></IF>
-<input type="submit" name="delete" value="{LANG_EDITCOM_DELCOM}" 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"> {LANG_EDITCOM_EDIT}</td></tr>
-<IF {THISMEMBERGROUPCANDOFULLEDIT}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITCOM_POSTER}:</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">{LANG_EDITCOM_TYPE}:</span></td>
- <td class="optionscolumn"><select name="type">{COMMENTTYPEOPTIONS}</select></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITCOM_RATING}:</span></td>
- <td class="optionscolumn"><input type="text" name="approved" value="{COMMENTAPPROVED}" size="5"> {LANG_MISC_OF} <input type="text" name="votes" value="{COMMENTVOTES}" size="5"> {LANG_COMMENTS_FOUNDHELPFUL}</td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_GENERAL_SUBJECT}:</span></td>
- <td class="optionscolumn"><input type="text" name="title" value="{COMMENTTITLE}" size="{STANDARDSIZE}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITCOM_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>{LANG_COMMENTS_MESSAGEHELPWYSI}<ELSE>{LANG_COMMENTS_MESSAGEHELP}</IF>
-</IF>
-
-<br>
-<IF {SWITCH_WSNCODES} and {SWITCH_WYSI}>
-<p align="center">
-<IF {THISMEMBERPOSTEDITOR} is WYSIWYG><input type="submit" name="switcheditor" value="{LANG_EDITCOM_SWITCHPLAIN}" class="button"></IF>
-<IF {THISMEMBERPOSTEDITOR} is plain><input type="submit" name="switcheditor" value="{LANG_EDITCOM_SWITCHWYSI}" 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>
-<br>{LANG_EDITCOM_REASON}: <input type="text" name="editreason" size="{STANDARDSIZE}" value="{COMMENTEDITREASON}">
-<IF {THISMEMBERID} is not {COMMENTOWNERID}><br><input type="hidden" name="preventedit[123]" value=""><input type="checkbox" name="preventedit" value="1" {COMMENTPREVENTEDIT}> {LANG_COMMENTS_PREVENTEDIT}
-</IF>
-</td> 
-</tr>
-<IF {THISMEMBERGROUPCANUPLOAD}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_SUGGESTLINK_ATTACH}:</span></td>
- <td class="optionscolumn">
-<IF {COMMENTNUMATTACHMENTS} is less than {THISMEMBERGROUPATTACHPERPOST}><input type="file" name="filefield"> <input type="submit" name="uploadattachment" value="{LANG_SUGGESTLINK_ATTACHBUTTON}" class="button"></IF>
-<IF {COMMENTNUMATTACHMENTS}>
-<br>{LANG_SUGGESTLINK_CURRENTATTACH}:<br>
-<!-- BEGIN ATTACHMENTS -->
-<input type="checkbox" name="attachdelete[]" value="{ATTACHID}"> {ATTACHFILETITLE} ({ATTACHKB} {LANG_GENERAL_KB})<br>
-<!-- END ATTACHMENTS -->
-<input type="submit" name="attachdeletion" value="{LANG_GENERAL_DELETESELECTED}" class="button">
-</IF>
-</td>
-</tr>
-</IF>
-
-<!-- INSERT NEW FIELDS HERE -->
-
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITCOM_OPTIONS}:</span></td>
- <td class="optionscolumn">
-<IF {SWITCH_SMILIES}?<input type="checkbox" name="disablesmilies" value="1" {POSTCHECKED[disablesmilies]}> {LANG_EDITCOM_DISABLESMILIES} <br> </IF>
-<input type="checkbox" name="disablesig" value="1" {POSTCHECKED[disablesig]}> {LANG_EDITCOM_DISABLESIG} <br>
-<IF {THISMEMBERGROUPCANUSEHTML}><input type="checkbox" name="disablehtml" value="1" {POSTCHECKED[disablehtml]}> {LANG_EDITCOM_DISABLEHTML} <br></IF>
-<IF {SWITCH_WSNCODES}><input type="checkbox" name="disablewsn" value="1" {POSTCHECKED[disablewsn]}> {LANG_EDITCOM_DISABLEWSN}</IF>
- </td>
-</tr>
-<IF {COMMENTCANHIDE}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITCOM_HIDE}</span></td>
- <td class="optionscolumn"><select name="hide">{HIDEYESNO}</select></td>
-</tr>
-</IF>
-</table>
-<input type="submit" value="{LANG_EDITCOM_EDIT}" class="button"> <input type="submit" name="preview" value="{LANG_EDITCOM_PREVIEW}" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="[IFADMIN../]comments.php?id={LINKID}">{LINKTITLE}</a> > {LANG_EDITCOM_EDIT}</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">{LANG_EDITCOM_DELETE}</span>
+<br>{LANG_EDITCOM_REASONDEL}: <input type="text" name="deletionreason" size="{STANDARDSIZE}" value="{COMMENTDELETIONREASON}"><br>
+<IF {COMMENTDELETED}>
+<input type="submit" name="delete" value="{LANG_EDITCOM_RESTOREDEL}" class="button">
+<OTHERWISE>
+<IF {THISMEMBERGROUPCANHARDDELETE}><input type="checkbox" name="harddelete" value="1"> {LANG_EDITCOM_HARDDELETE}<br></IF>
+<input type="submit" name="delete" value="{LANG_EDITCOM_DELCOM}" 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"> {LANG_EDITCOM_EDIT}</td></tr>
+<IF {THISMEMBERGROUPCANDOFULLEDIT}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITCOM_POSTER}:</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">{LANG_EDITCOM_TYPE}:</span></td>
+ <td class="optionscolumn"><select name="type">{COMMENTTYPEOPTIONS}</select></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITCOM_RATING}:</span></td>
+ <td class="optionscolumn"><input type="text" name="approved" value="{COMMENTAPPROVED}" size="5"> {LANG_MISC_OF} <input type="text" name="votes" value="{COMMENTVOTES}" size="5"> {LANG_COMMENTS_FOUNDHELPFUL}</td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_GENERAL_SUBJECT}:</span></td>
+ <td class="optionscolumn"><input type="text" name="title" value="{COMMENTTITLE}" size="{STANDARDSIZE}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITCOM_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>{LANG_COMMENTS_MESSAGEHELPWYSI}<ELSE>{LANG_COMMENTS_MESSAGEHELP}</IF>
+</IF>
+
+<br>
+<IF {SWITCH_WSNCODES} and {SWITCH_WYSI}>
+<p align="center">
+<IF {THISMEMBERPOSTEDITOR} is WYSIWYG><input type="submit" name="switcheditor" value="{LANG_EDITCOM_SWITCHPLAIN}" class="button"></IF>
+<IF {THISMEMBERPOSTEDITOR} is plain><input type="submit" name="switcheditor" value="{LANG_EDITCOM_SWITCHWYSI}" 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>
+<br>{LANG_EDITCOM_REASON}: <input type="text" name="editreason" size="{STANDARDSIZE}" value="{COMMENTEDITREASON}">
+<IF {THISMEMBERID} is not {COMMENTOWNERID}><br><input type="hidden" name="preventedit[123]" value=""><input type="checkbox" name="preventedit" value="1" {COMMENTPREVENTEDIT}> {LANG_COMMENTS_PREVENTEDIT}
+</IF>
+</td> 
+</tr>
+<IF {THISMEMBERGROUPCANUPLOAD}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_SUGGESTLINK_ATTACH}:</span></td>
+ <td class="optionscolumn">
+<IF {COMMENTNUMATTACHMENTS} is less than {THISMEMBERGROUPATTACHPERPOST}><input type="file" name="filefield"> <input type="submit" name="uploadattachment" value="{LANG_SUGGESTLINK_ATTACHBUTTON}" class="button"></IF>
+<IF {COMMENTNUMATTACHMENTS}>
+<br>{LANG_SUGGESTLINK_CURRENTATTACH}:<br>
+<!-- BEGIN ATTACHMENTS -->
+<input type="checkbox" name="attachdelete[]" value="{ATTACHID}"> {ATTACHFILETITLE} ({ATTACHKB} {LANG_GENERAL_KB})<br>
+<!-- END ATTACHMENTS -->
+<input type="submit" name="attachdeletion" value="{LANG_GENERAL_DELETESELECTED}" class="button">
+</IF>
+</td>
+</tr>
+</IF>
+
+<!-- INSERT NEW FIELDS HERE -->
+
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITCOM_OPTIONS}:</span></td>
+ <td class="optionscolumn">
+<IF {SWITCH_SMILIES}?<input type="checkbox" name="disablesmilies" value="1" {POSTCHECKED[disablesmilies]}> {LANG_EDITCOM_DISABLESMILIES} <br> </IF>
+<input type="checkbox" name="disablesig" value="1" {POSTCHECKED[disablesig]}> {LANG_EDITCOM_DISABLESIG} <br>
+<IF {THISMEMBERGROUPCANUSEHTML}><input type="checkbox" name="disablehtml" value="1" {POSTCHECKED[disablehtml]}> {LANG_EDITCOM_DISABLEHTML} <br></IF>
+<IF {SWITCH_WSNCODES}><input type="checkbox" name="disablewsn" value="1" {POSTCHECKED[disablewsn]}> {LANG_EDITCOM_DISABLEWSN}</IF>
+ </td>
+</tr>
+<IF {COMMENTCANHIDE}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITCOM_HIDE}</span></td>
+ <td class="optionscolumn"><select name="hide">{HIDEYESNO}</select></td>
+</tr>
+</IF>
+</table>
+<input type="submit" value="{LANG_EDITCOM_EDIT}" class="button"> <input type="submit" name="preview" value="{LANG_EDITCOM_PREVIEW}" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/editmembers.tpl wsnlinks/templates/multilingual/editmembers.tpl
--- 400/templates/multilingual/editmembers.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/editmembers.tpl	2006-09-13 09:32:22.000000000 -0700
@@ -1,277 +1,277 @@
-<IF {THISMEMBERISADMIN}>
-<br>
-<form action="redirecttourl.php">
-{LANG_PROFILE_ADMINOPS}: 
-<select name="destination">
-<IF {THISMEMBERGROUPCANEDITALLPROFILES}>
- <option value="edit.php?action=member&amp;field=id&amp;condition=equals&amp;fieldvalue={MEMBERID}">{LANG_PROFILE_EDIT}</option></IF>
-<IF {THISMEMBERISADMIN}>
- <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}">{LANG_PROFILE_BAN}</option>
- <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}&amp;partial=1">{LANG_PROFILE_PARTIALBAN}</option>
- <option value="[IFADMINadmin/]useradmin.php?action=suspend&amp;id={MEMBERID}">{LANG_PROFILE_SUSPEND}</option>
-</IF>
-<option value="usernotes.php?id={MEMBERID}&amp;modnote=1">{LANG_PROFILE_MODNOTES} ({MEMBERMODNOTES})</option>
-<IF {THISMEMBERGROUPCANVIEWMODLOG}>
- <option value="modlog.php?action=modlogon&amp;id={MEMBERID}">{LANG_PROFILE_MODHISTORY}</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">{LANG_PROFILE_DELLIN}</option>
- <option value="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;deletedonly=1">{LANG_PROFILE_DELCOM}</option>
-</IF>
-<IF {THISMEMBERISADMIN}>
- <option value="[IFADMINadmin/]updatecounters.php?filled=1&amp;regenone=1&amp;action=members&amp;id={MEMBERID}">{LANG_PROFILE_REGEN}</option>
-</IF>
-</select>
-<input type="submit" value="{LANG_GENERAL_GO}" class="button">
-</form>
-<br>
-</IF>
-
-<div class="nav"><a href="[IFADMIN../]index.php">{LANG_NAVORIGIN}</a> > <a href="[IFADMIN../]memberlist.php">{LANG_TITLE_MEMBERLIST}</a> > <a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > {LANG_PROFILE_EDIT}</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"> {LANG_PROFILE_EDIT}</td></tr>
-<IF {THISMEMBERGROUPCANDOFULLEDIT}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_USERNAME}:</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">{LANG_GENERAL_EMAIL}:</span><br><IF {REGISTRATION} is email>{LANG_EDITPROFILE_EMAILACTIVATE}<ELSE>{LANG_EDITPROFILE_EMAILPASS}</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">{LANG_LOGIN_CHANGEPASS}:</span><br>{LANG_EDITPROFILE_CHANGEPASS}</td>
- <td class="optionscolumn"><input type="text" name="replacepassword" size="{STANDARDSIZE}"></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_AVATAR}:</span><br>{LANG_EDITPROFILE_AVATARHELP}</td>
- <td class="optionscolumn"><input type="file" name="newavatar"> <input type="submit" value="{LANG_EDITPROFILE_UPLOADAVATAR}" class="button"> 
-<IF {MEMBERSHOWAVATAR[1]}><br>{LANG_EDITPROFILE_CURRENTAVATAR}:<br><img src="{MEMBERAVATARURL}">
-<br><input type="submit" name="removeavatar" value="{LANG_EDITPROFILE_REMOVEAVATAR}" class="button">
-</IF>
-</td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SIGNATURE}:</span></td>
- <td class="optionscolumn"><textarea name="signature" rows="2" cols="45">{MEMBERSIGNATURE}</textarea></td>
-</tr>
-<IF {THISMEMBERGROUPCUSTOMTITLE}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_CUSTOMTITLE}:</span><br>{LANG_EDITPROFILE_CUSTOMTITLEHELP}</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">{LANG_REGISTRATION_STYLE}:</span></td>
- <td class="optionscolumn"><select name="stylesheet">{STYLEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_TEMPLATESET}:</span></td>
- <td class="optionscolumn"><select name="thetemplate">{MEMBERTEMPOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_LANGUAGE}:</span></td>
- <td class="optionscolumn"><select name="thelanguage">{LANGUAGEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_ALLOWEMAIL}</span></td>
- <td class="optionscolumn"><select name="allowemail">{MEMBERALLOWEMAILYESNO}</select></td> 
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_ALLOWUSEREMAIL}</span></td>
- <td class="optionscolumn"><select name="allowuseremail">{MEMBERALLOWUSEREMAILYESNO}</select></td> 
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_RECEIVENOTIFICATION}</span></td>
- <td class="optionscolumn"><select name="notifyoflinks">{MEMBERNOTIFYOFLINKSYESNO}</select></td>
-</tr>
-<IF {SWITCH_PM}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_ACCEPTPMS}</span></td>
- <td class="optionscolumn"><select name="acceptpms">{MEMBERACCEPTPMSYESNO}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_NOTIFYOFPMS}</span></td>
- <td class="optionscolumn"><select name="notifyofpms">{MEMBERNOTIFYOFPMSYESNO}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_PMPOP}</span></td>
- <td class="optionscolumn"><select name="pmnotify">{MEMBERPMNOTIFYYESNO}</select></td>
-</tr>
-<IF {SWITCH_MODNOTIFY}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_PMMOD}</span></td>
- <td class="optionscolumn"><select name="moderationpm">{MEMBERMODERATIONPMYESNO}</select></td>
-</tr>
-</IF>
-</IF>
-<IF {SWITCH_COMMENTS}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_AUTOSUB}</span></td>
- <td class="optionscolumn"><select name="autosubscribe">{MEMBERAUTOSUBSCRIBEYESNO}</select></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SUBFREQ}:</span></td>
- <td class="optionscolumn"><select name="notifymethod">{MEMBERNOTIFYMETHODOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_TIMEZONE}</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">{LANG_REGISTER_FORCELOGIN}</span></td>
- <td class="optionscolumn">
- <select name="cookieduration">{MEMBERCOOKIEOPTIONS}</select>
- </td>
-</tr>
-<IF {SWITCH_IMS}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_ACCEPTIMS}:</span></td>
- <td class="optionscolumn"><select name="acceptims">{MEMBERACCEPTIMSOPTIONS}</select></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_POSTSPERPAGE}:</span></td>
- <td class="optionscolumn"><select name="commentsperpage">{MEMBERCOMMENTSPERPAGEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_LINKSPERPAGE}:</span></td>
- <td class="optionscolumn"><select name="linksperpage">{MEMBERLINKSPERPAGEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span></td>
- <td class="optionscolumn"><input type="text" name="location" size="{STANDARDSIZE}" value="{MEMBERLOCATION}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_HOMEPAGE}:</span></td>
- <td class="optionscolumn"><input type="text" name="homepage" size="{STANDARDSIZE}" value="{MEMBERHOMEPAGE}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_OCCUPATION}:</span></td>
- <td class="optionscolumn"><input type="text" name="occupation" size="{STANDARDSIZE}" value="{MEMBEROCCUPATION}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_BIO}:</span></td>
- <td class="optionscolumn"><textarea name="bio" rows="5" cols="45">{MEMBERBIO}</textarea></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_INTERESTS}:</span></td>
- <td class="optionscolumn"><input type="text" name="interests" size="{STANDARDSIZE}" value="{MEMBERINTERESTS}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_IMHANDLES}:</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">{LANG_EDITPROFILE_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">{LANG_EDITPROFILE_SHOWSTATUSTO}:</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">{LANG_EDITPROFILE_POSTEDITOR}:</span></td>
- <td class="optionscolumn"><select name="posteditor">{MEMBERPOSTEDITOROPTIONS}</select></td>
-</tr>
-</IF>
-<IF {SWITCH_COMMENTS}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SHOWAVATARS}</span></td>
- <td class="optionscolumn"><select name="showavatars">{MEMBERSHOWAVATARSYESNO}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SHOWSIGS}</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">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_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">{PALL_LANG_GENERAL_HITSOUT}:</span></td>
- <td class="optionscolumn"><input type="text" size="5" name="totalhits" value="{MEMBERTOTALHITS}"></td> 
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{PALL_LANG_GENERAL_HITSIN}:</span></td>
- <td class="optionscolumn"><input type="text" name="totalhitsin" size="5" value="{MEMBERTOTALHITSIN}"></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_CHANGEDATE}:</span>
-<br>{LANG_EDITPROFILE_CHANGEDATEHELP}</td>
- <td class="optionscolumn"><input type="text" name="changeregdate" size="20"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_CATACCESS}:</span>
-<br>{LANG_EDITPROFILE_CATACCESSHELP}</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">{LANG_EDITPROFILE_FUNDS}:</span><br>{LANG_EDITPROFILE_FUNDSHELP}</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">{LANG_PROFILE_USERGROUP}:</span></td>
- <td class="optionscolumn"><select name="usergroup">{MEMBERUSERGROUPOPTIONS}</select>
-</td> 
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SECONDARYGROUPS}:</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 {THISMEMBERCANDELETE}>
-<tr>
- <td colspan="2"><span class="labels">{LANG_PROFILE_DELETE}</span> <input type="checkbox" name="delete"><br></td>
-</tr>
-</IF>
-</table>
-<input type="submit" value="{LANG_PROFILE_EDIT}" class="button">
-</form>
+<IF {THISMEMBERISADMIN}>
+<br>
+<form action="redirecttourl.php">
+{LANG_PROFILE_ADMINOPS}: 
+<select name="destination">
+<IF {THISMEMBERGROUPCANEDITALLPROFILES}>
+ <option value="edit.php?action=member&amp;field=id&amp;condition=equals&amp;fieldvalue={MEMBERID}">{LANG_PROFILE_EDIT}</option></IF>
+<IF {THISMEMBERISADMIN}>
+ <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}">{LANG_PROFILE_BAN}</option>
+ <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}&amp;partial=1">{LANG_PROFILE_PARTIALBAN}</option>
+ <option value="[IFADMINadmin/]useradmin.php?action=suspend&amp;id={MEMBERID}">{LANG_PROFILE_SUSPEND}</option>
+</IF>
+<option value="usernotes.php?id={MEMBERID}&amp;modnote=1">{LANG_PROFILE_MODNOTES} ({MEMBERMODNOTES})</option>
+<IF {THISMEMBERGROUPCANVIEWMODLOG}>
+ <option value="modlog.php?action=modlogon&amp;id={MEMBERID}">{LANG_PROFILE_MODHISTORY}</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">{LANG_PROFILE_DELLIN}</option>
+ <option value="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;deletedonly=1">{LANG_PROFILE_DELCOM}</option>
+</IF>
+<IF {THISMEMBERISADMIN}>
+ <option value="[IFADMINadmin/]updatecounters.php?filled=1&amp;regenone=1&amp;action=members&amp;id={MEMBERID}">{LANG_PROFILE_REGEN}</option>
+</IF>
+</select>
+<input type="submit" value="{LANG_GENERAL_GO}" class="button">
+</form>
+<br>
+</IF>
+
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="[IFADMIN../]memberlist.php">{LANG_TITLE_MEMBERLIST}</a> > <a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > {LANG_PROFILE_EDIT}</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"> {LANG_PROFILE_EDIT}</td></tr>
+<IF {THISMEMBERGROUPCANDOFULLEDIT}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_USERNAME}:</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">{LANG_GENERAL_EMAIL}:</span><br><IF {REGISTRATION} is email>{LANG_EDITPROFILE_EMAILACTIVATE}<ELSE>{LANG_EDITPROFILE_EMAILPASS}</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">{LANG_LOGIN_CHANGEPASS}:</span><br>{LANG_EDITPROFILE_CHANGEPASS}</td>
+ <td class="optionscolumn"><input type="text" name="replacepassword" size="{STANDARDSIZE}"></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_AVATAR}:</span><br>{LANG_EDITPROFILE_AVATARHELP}</td>
+ <td class="optionscolumn"><input type="file" name="newavatar"> <input type="submit" value="{LANG_EDITPROFILE_UPLOADAVATAR}" class="button"> 
+<IF {MEMBERSHOWAVATAR[1]}><br>{LANG_EDITPROFILE_CURRENTAVATAR}:<br><img src="{MEMBERAVATARURL}">
+<br><input type="submit" name="removeavatar" value="{LANG_EDITPROFILE_REMOVEAVATAR}" class="button">
+</IF>
+</td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SIGNATURE}:</span></td>
+ <td class="optionscolumn"><textarea name="signature" rows="2" cols="45">{MEMBERSIGNATURE}</textarea></td>
+</tr>
+<IF {THISMEMBERGROUPCUSTOMTITLE}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_CUSTOMTITLE}:</span><br>{LANG_EDITPROFILE_CUSTOMTITLEHELP}</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">{LANG_REGISTRATION_STYLE}:</span></td>
+ <td class="optionscolumn"><select name="stylesheet">{STYLEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_TEMPLATESET}:</span></td>
+ <td class="optionscolumn"><select name="thetemplate">{MEMBERTEMPOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_LANGUAGE}:</span></td>
+ <td class="optionscolumn"><select name="thelanguage">{LANGUAGEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_ALLOWEMAIL}</span></td>
+ <td class="optionscolumn"><select name="allowemail">{MEMBERALLOWEMAILYESNO}</select></td> 
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_ALLOWUSEREMAIL}</span></td>
+ <td class="optionscolumn"><select name="allowuseremail">{MEMBERALLOWUSEREMAILYESNO}</select></td> 
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_RECEIVENOTIFICATION}</span></td>
+ <td class="optionscolumn"><select name="notifyoflinks">{MEMBERNOTIFYOFLINKSYESNO}</select></td>
+</tr>
+<IF {SWITCH_PM}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_ACCEPTPMS}</span></td>
+ <td class="optionscolumn"><select name="acceptpms">{MEMBERACCEPTPMSYESNO}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_NOTIFYOFPMS}</span></td>
+ <td class="optionscolumn"><select name="notifyofpms">{MEMBERNOTIFYOFPMSYESNO}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_PMPOP}</span></td>
+ <td class="optionscolumn"><select name="pmnotify">{MEMBERPMNOTIFYYESNO}</select></td>
+</tr>
+<IF {SWITCH_MODNOTIFY}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_PMMOD}</span></td>
+ <td class="optionscolumn"><select name="moderationpm">{MEMBERMODERATIONPMYESNO}</select></td>
+</tr>
+</IF>
+</IF>
+<IF {SWITCH_COMMENTS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_AUTOSUB}</span></td>
+ <td class="optionscolumn"><select name="autosubscribe">{MEMBERAUTOSUBSCRIBEYESNO}</select></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SUBFREQ}:</span></td>
+ <td class="optionscolumn"><select name="notifymethod">{MEMBERNOTIFYMETHODOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_TIMEZONE}</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">{LANG_REGISTER_FORCELOGIN}</span></td>
+ <td class="optionscolumn">
+ <select name="cookieduration">{MEMBERCOOKIEOPTIONS}</select>
+ </td>
+</tr>
+<IF {SWITCH_IMS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_ACCEPTIMS}:</span></td>
+ <td class="optionscolumn"><select name="acceptims">{MEMBERACCEPTIMSOPTIONS}</select></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_POSTSPERPAGE}:</span></td>
+ <td class="optionscolumn"><select name="commentsperpage">{MEMBERCOMMENTSPERPAGEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_LINKSPERPAGE}:</span></td>
+ <td class="optionscolumn"><select name="linksperpage">{MEMBERLINKSPERPAGEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span></td>
+ <td class="optionscolumn"><input type="text" name="location" size="{STANDARDSIZE}" value="{MEMBERLOCATION}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_HOMEPAGE}:</span></td>
+ <td class="optionscolumn"><input type="text" name="homepage" size="{STANDARDSIZE}" value="{MEMBERHOMEPAGE}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_OCCUPATION}:</span></td>
+ <td class="optionscolumn"><input type="text" name="occupation" size="{STANDARDSIZE}" value="{MEMBEROCCUPATION}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_BIO}:</span></td>
+ <td class="optionscolumn"><textarea name="bio" rows="5" cols="45">{MEMBERBIO}</textarea></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_INTERESTS}:</span></td>
+ <td class="optionscolumn"><input type="text" name="interests" size="{STANDARDSIZE}" value="{MEMBERINTERESTS}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_IMHANDLES}:</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">{LANG_EDITPROFILE_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">{LANG_EDITPROFILE_SHOWSTATUSTO}:</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">{LANG_EDITPROFILE_POSTEDITOR}:</span></td>
+ <td class="optionscolumn"><select name="posteditor">{MEMBERPOSTEDITOROPTIONS}</select></td>
+</tr>
+</IF>
+<IF {SWITCH_COMMENTS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SHOWAVATARS}</span></td>
+ <td class="optionscolumn"><select name="showavatars">{MEMBERSHOWAVATARSYESNO}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SHOWSIGS}</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">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_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">{PALL_LANG_GENERAL_HITSOUT}:</span></td>
+ <td class="optionscolumn"><input type="text" size="5" name="totalhits" value="{MEMBERTOTALHITS}"></td> 
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{PALL_LANG_GENERAL_HITSIN}:</span></td>
+ <td class="optionscolumn"><input type="text" name="totalhitsin" size="5" value="{MEMBERTOTALHITSIN}"></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_CHANGEDATE}:</span>
+<br>{LANG_EDITPROFILE_CHANGEDATEHELP}</td>
+ <td class="optionscolumn"><input type="text" name="changeregdate" size="20"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_CATACCESS}:</span>
+<br>{LANG_EDITPROFILE_CATACCESSHELP}</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">{LANG_EDITPROFILE_FUNDS}:</span><br>{LANG_EDITPROFILE_FUNDSHELP}</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">{LANG_PROFILE_USERGROUP}:</span></td>
+ <td class="optionscolumn"><select name="usergroup">{MEMBERUSERGROUPOPTIONS}</select>
+</td> 
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SECONDARYGROUPS}:</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 {THISMEMBERCANDELETE}>
+<tr>
+ <td colspan="2"><span class="labels">{LANG_PROFILE_DELETE}</span> <input type="checkbox" name="delete"><br></td>
+</tr>
+</IF>
+</table>
+<input type="submit" value="{LANG_PROFILE_EDIT}" class="button">
+</form>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/edit.tpl wsnlinks/templates/multilingual/edit.tpl
--- 400/templates/multilingual/edit.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/edit.tpl	2006-09-17 18:45:11.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> > {LANG_EDITLINK_EDIT}</div>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="[IFADMIN../]{LINKDETAILSURL}">{LINKTITLE}</a> > {LANG_EDITLINK_EDIT}</div>
 
 <IF {PREVIEWING}>
 <div class="comment">{PREVIEW}</div>
@@ -67,7 +67,7 @@
 <tr>
  <td class="labelscolumn"><span class="labels">{LANG_GENERAL_DESCRIPTION}:</span></td>
  <td class="optionscolumn">
-<IF {THISMEMBERWYSIWYGDESCRIP}>
+<IF {SWITCH_WYSIDESCRIP}>
 <script language="JavaScript" type="text/javascript" src="{TEMPLATESDIR}/richtext.js"></script>
 <script language="JavaScript" type="text/javascript">
 function submitForm() {	updateRTEs(); return true; }
diff -U 3 -H -d -r -N -- 400/templates/multilingual/emailmember.tpl wsnlinks/templates/multilingual/emailmember.tpl
--- 400/templates/multilingual/emailmember.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/emailmember.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,28 +1,28 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">{LANG_TITLE_MEMBERLIST}</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > {LANG_TITLE_EMAILMEMBER}</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"> {LANG_TITLE_EMAILMEMBER}</td></tr>
-<IF {THISMEMBERISGUEST}>
-<tr>
- <td class="labelscolumn">{LANG_EMAILLINK_YOUREMAIL}:</td>
- <td class="optionscolumn"><input type="text" name="senderemail" size="{STANDARDSIZE}"></td> 
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn">{LANG_EMAILMEMBER_SUBJECT}:</td>
- <td class="optionscolumn"><input type="text" name="subject" size="{STANDARDSIZE}"></td> 
-</tr>
-<tr>
- <td class="labelscolumn">{LANG_EMAILLINK_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">{LANG_GENERAL_SECURITYIMAGE}:</span>
-<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
- <td class="optionscolumn"><img src="securityimage.php" alt="{LANG_ALT_SECIMAGE}" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-<input type="submit" value="{LANG_EMAILMEMBER_SEND}" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">{LANG_TITLE_MEMBERLIST}</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > {LANG_TITLE_EMAILMEMBER}</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"> {LANG_TITLE_EMAILMEMBER}</td></tr>
+<IF {THISMEMBERISGUEST}>
+<tr>
+ <td class="labelscolumn">{LANG_EMAILLINK_YOUREMAIL}:</td>
+ <td class="optionscolumn"><input type="text" name="senderemail" size="{STANDARDSIZE}"></td> 
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn">{LANG_EMAILMEMBER_SUBJECT}:</td>
+ <td class="optionscolumn"><input type="text" name="subject" size="{STANDARDSIZE}"></td> 
+</tr>
+<tr>
+ <td class="labelscolumn">{LANG_EMAILLINK_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">{LANG_GENERAL_SECURITYIMAGE}:</span>
+<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
+ <td class="optionscolumn"><img src="securityimage.php" alt="{LANG_ALT_SECIMAGE}" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+<input type="submit" value="{LANG_EMAILMEMBER_SEND}" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/emailsubmitter.tpl wsnlinks/templates/multilingual/emailsubmitter.tpl
--- 400/templates/multilingual/emailsubmitter.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/emailsubmitter.tpl	2006-09-13 09:35:26.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"> {LANG_TITLE_EMAILSUBMITTER}</td></tr>
-<IF {THISMEMBERISGUEST}>
-<tr>
- <td class="labelscolumn">{LANG_EMAILLINK_YOUREMAIL}:</td>
- <td class="optionscolumn"><input type="text" name="senderemail" size="{STANDARDSIZE}"></td> 
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn">{LANG_EMAILMEMBER_SUBJECT}:</td>
- <td class="optionscolumn"><input type="text" name="subject" size="{STANDARDSIZE}"></td> 
-</tr>
-<tr>
- <td class="labelscolumn">{LANG_EMAILLINK_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">{LANG_GENERAL_SECURITYIMAGE}:</span>
-<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
- <td class="optionscolumn"><img src="securityimage.php" alt="{LANG_ALT_SECIMAGE}" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<input type="submit" value="{LANG_EMAILMEMBER_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"> {LANG_TITLE_EMAILSUBMITTER}</td></tr>
+<IF {THISMEMBERISGUEST}>
+<tr>
+ <td class="labelscolumn">{LANG_EMAILLINK_YOUREMAIL}:</td>
+ <td class="optionscolumn"><input type="text" name="senderemail" size="{STANDARDSIZE}"></td> 
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn">{LANG_EMAILMEMBER_SUBJECT}:</td>
+ <td class="optionscolumn"><input type="text" name="subject" size="{STANDARDSIZE}"></td> 
+</tr>
+<tr>
+ <td class="labelscolumn">{LANG_EMAILLINK_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">{LANG_GENERAL_SECURITYIMAGE}:</span>
+<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
+ <td class="optionscolumn"><img src="securityimage.php" alt="{LANG_ALT_SECIMAGE}" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<input type="submit" value="{LANG_EMAILMEMBER_SEND}" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/email.tpl wsnlinks/templates/multilingual/email.tpl
--- 400/templates/multilingual/email.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/email.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,42 +1,42 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{NAVIGATION} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > {LANG_GENERAL_EMAIL}</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"> {LANG_GENERAL_EMAIL}</td></tr>
-<IF not {MEMBEREMAIL}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EMAILLINK_YOUREMAIL}:</span>
-<br>{LANG_EMAILLINK_NOTICE} {SENDERIP}
-</td>
- <td class="optionscolumn"><input type="text" name="fromemail" size="{STANDARDSIZE}"><td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EMAILLINK_SENDTO}:</span></td>
- <td class="optionscolumn"><input type="text" name="toemail" size="{STANDARDSIZE}"><td>
-</tr>
-<OTHERWISE>
-<tr>
-<td colspan="2">
-<input type="hidden" name="fromemail" value="{MEMBEREMAIL}">
-{LANG_EMAILLINK_NOTICE} {SENDERIP}
-</td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EMAILLINK_SENDTO}:</span></td>
- <td class="optionscolumn"><input type="text" name="toemail" size="{STANDARDSIZE}"><td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EMAILLINK_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">{LANG_GENERAL_SECURITYIMAGE}:</span>
-<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
- <td class="optionscolumn"><img src="securityimage.php" class="bullet" alt="{LANG_ALT_SECIMAGE}"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<input type="hidden" name="id" value="{LINKID}"><input type="submit" value="{LANG_EMAILLINK_SENDLINK}" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{NAVIGATION} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > {LANG_GENERAL_EMAIL}</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"> {LANG_GENERAL_EMAIL}</td></tr>
+<IF not {MEMBEREMAIL}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EMAILLINK_YOUREMAIL}:</span>
+<br>{LANG_EMAILLINK_NOTICE} {SENDERIP}
+</td>
+ <td class="optionscolumn"><input type="text" name="fromemail" size="{STANDARDSIZE}"><td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EMAILLINK_SENDTO}:</span></td>
+ <td class="optionscolumn"><input type="text" name="toemail" size="{STANDARDSIZE}"><td>
+</tr>
+<OTHERWISE>
+<tr>
+<td colspan="2">
+<input type="hidden" name="fromemail" value="{MEMBEREMAIL}">
+{LANG_EMAILLINK_NOTICE} {SENDERIP}
+</td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EMAILLINK_SENDTO}:</span></td>
+ <td class="optionscolumn"><input type="text" name="toemail" size="{STANDARDSIZE}"><td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EMAILLINK_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">{LANG_GENERAL_SECURITYIMAGE}:</span>
+<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
+ <td class="optionscolumn"><img src="securityimage.php" class="bullet" alt="{LANG_ALT_SECIMAGE}"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<input type="hidden" name="id" value="{LINKID}"><input type="submit" value="{LANG_EMAILLINK_SENDLINK}" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/guestbook.tpl wsnlinks/templates/multilingual/guestbook.tpl
--- 400/templates/multilingual/guestbook.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/guestbook.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,140 +1,140 @@
-<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> > {LANG_TITLE_GUESTBOOK}</div><br>
-
-<p>{LANG_GUESTBOOK_OF} <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a>:</p>
-
-<table>
-<!-- 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="{LANG_MEMBERLIST_AVATAR}"> <br> </IF>
-
-<br><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}
-<br><span class="labels">{LANG_COMMENTS_JOINED}:</span> {MEMBERREGDATE}
-<IF {MEMBERLOCATION}><br><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</IF>
-<br>
-
-<IF {THISMEMBERISREGISTERED}>
-<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_TOTAL}:</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">{LANG_COMMENTS_LINKSTOTAL}:</span> {MEMBERLINKS}
-<br><span class="labels">{LANG_COMMENTS_TOTAL}:</span> {MEMBERCOMMENTS}
-</IF>
-
-</IF>
-
-<IF {THISMEMBERGROUPCANVIEWIP}><br><br>{LANG_SUGGESTLINK_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">
-{LANG_COMMENTS_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="{LANG_COMMENTS_QUOTEPOST}"></a> <br>#{COMMENTNUMBER}</td>
-  </tr>
-  <tr valign="middle">
-   <td height="100%" valign="top">{COMMENTMESSAGE}
-   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">{COMMENTS_EDITEDBY} {COMMENTLASTEDITBY} {LANG_MISC_ON} {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. {LANG_GENERAL_REASON}: {COMMENTEDITREASON}</IF></span></IF>
-   </td>
-  </tr>
-  <tr valign="bottom">
-   <td valign="bottom">
-<IF {COMMENTNUMATTACHMENTS}>
-<br>{LANG_SHOWLINKS_ATTACHED}:<br>
-<table>
-<tr>
-<!-- BEGIN ATTACHMENTS -->
-<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_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}>
-<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<span class="important">{INCOMPLETE}</span>
-
-<p>{LANG_GUESTBOOK_NEW}:</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">
-<input type="hidden" name="type" value="regular">
-<table>
-<IF {THISMEMBERUSERGROUP} is 1>
-<tr>
- <td valign="top"><span class="labels">{LANG_COMMENTS_YOURNAME}:</span></td>
- <td valign="top"><input type=text name="postername" value="{COMMENTPOSTERNAME}"></td>
-</tr>
-</IF>
-<tr>
- <td>
-<span class="labels">{LANG_GUESTBOOK_MESSAGE}:</span>
-<br><br>
-<center>
-<div class="smiliebox">
-<!-- BEGIN SMILIES -->
-<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
-<!-- END SMILIES -->
-</div>
-</center>
-<br>{LANG_COMMENTS_MESSAGEHELP}
- </td>
- <td> 
-<textarea name="message" rows="10" cols="70">{COMMENTMESSAGE}</textarea>
- </td>
-</tr>
-<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
-<tr>
- <td><span class="labels">{LANG_GENERAL_SECURITYIMAGE}:</span>
-<br>{LANG_GENERAL_SECURITYIMAGEHELP}</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="{LANG_COMMENTS_POST}" class="button"></td>
-</tr>
-</table>
-</form>
-<OTHERWISE>
-{LANG_COMMENTS_CANTPOST} <IF {THISMEMBERISGUEST}>{LANG_COMMENTS_PLEASEREGISTER}</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> > {LANG_TITLE_GUESTBOOK}</div><br>
+
+<p>{LANG_GUESTBOOK_OF} <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a>:</p>
+
+<table>
+<!-- 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="{LANG_MEMBERLIST_AVATAR}"> <br> </IF>
+
+<br><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}
+<br><span class="labels">{LANG_COMMENTS_JOINED}:</span> {MEMBERREGDATE}
+<IF {MEMBERLOCATION}><br><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</IF>
+<br>
+
+<IF {THISMEMBERISREGISTERED}>
+<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_TOTAL}:</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">{LANG_COMMENTS_LINKSTOTAL}:</span> {MEMBERLINKS}
+<br><span class="labels">{LANG_COMMENTS_TOTAL}:</span> {MEMBERCOMMENTS}
+</IF>
+
+</IF>
+
+<IF {THISMEMBERGROUPCANVIEWIP}><br><br>{LANG_SUGGESTLINK_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">
+{LANG_COMMENTS_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="{LANG_COMMENTS_QUOTEPOST}"></a> <br>#{COMMENTNUMBER}</td>
+  </tr>
+  <tr valign="middle">
+   <td height="100%" valign="top">{COMMENTMESSAGE}
+   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">{COMMENTS_EDITEDBY} {COMMENTLASTEDITBY} {LANG_MISC_ON} {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. {LANG_GENERAL_REASON}: {COMMENTEDITREASON}</IF></span></IF>
+   </td>
+  </tr>
+  <tr valign="bottom">
+   <td valign="bottom">
+<IF {COMMENTNUMATTACHMENTS}>
+<br>{LANG_SHOWLINKS_ATTACHED}:<br>
+<table>
+<tr>
+<!-- BEGIN ATTACHMENTS -->
+<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_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}>
+<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<span class="important">{INCOMPLETE}</span>
+
+<p>{LANG_GUESTBOOK_NEW}:</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">
+<input type="hidden" name="type" value="regular">
+<table>
+<IF {THISMEMBERUSERGROUP} is 1>
+<tr>
+ <td valign="top"><span class="labels">{LANG_COMMENTS_YOURNAME}:</span></td>
+ <td valign="top"><input type=text name="postername" value="{COMMENTPOSTERNAME}"></td>
+</tr>
+</IF>
+<tr>
+ <td>
+<span class="labels">{LANG_GUESTBOOK_MESSAGE}:</span>
+<br><br>
+<center>
+<div class="smiliebox">
+<!-- BEGIN SMILIES -->
+<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
+<!-- END SMILIES -->
+</div>
+</center>
+<br>{LANG_COMMENTS_MESSAGEHELP}
+ </td>
+ <td> 
+<textarea name="message" rows="10" cols="70">{COMMENTMESSAGE}</textarea>
+ </td>
+</tr>
+<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
+<tr>
+ <td><span class="labels">{LANG_GENERAL_SECURITYIMAGE}:</span>
+<br>{LANG_GENERAL_SECURITYIMAGEHELP}</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="{LANG_COMMENTS_POST}" class="button"></td>
+</tr>
+</table>
+</form>
+<OTHERWISE>
+{LANG_COMMENTS_CANTPOST} <IF {THISMEMBERISGUEST}>{LANG_COMMENTS_PLEASEREGISTER}</IF>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/helpcatcontents.tpl wsnlinks/templates/multilingual/helpcatcontents.tpl
--- 400/templates/multilingual/helpcatcontents.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/helpcatcontents.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,9 +1,9 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="help.php">{LANG_TITLE_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">{LANG_TITLE_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/multilingual/helpitem.tpl wsnlinks/templates/multilingual/helpitem.tpl
--- 400/templates/multilingual/helpitem.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/helpitem.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,5 +1,5 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="help.php">{LANG_TITLE_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">{LANG_TITLE_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/multilingual/helpmain.tpl wsnlinks/templates/multilingual/helpmain.tpl
--- 400/templates/multilingual/helpmain.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/helpmain.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,7 +1,7 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_HELP}</div>
-
-<p><span class="labels">{LANG_HELP_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> > {LANG_TITLE_HELP}</div>
+
+<p><span class="labels">{LANG_HELP_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/multilingual/home.tpl wsnlinks/templates/multilingual/home.tpl
--- 400/templates/multilingual/home.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/home.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,153 +1,153 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="profile.php">{LANG_HOME_MEMHOME}</a></div>
-
-<IF {SWITCH_INVITES}>
-<p>{THISMEMBERINVITES} {LANG_INVITES_LEFT}</p>
-<IF {THISMEMBERINVITES}>
-<form action="invites.php" method="post">
-{LANG_INVITES_SENDTO} <input type="text" name="inviteemail" size="15">
-<IF {THISMEMBERGROUPALLOWUGSPEC}> {LANG_INVITES_TOUG} <select name="invitegroup">{INVITEGROUPS}</select></IF>
-<br>{LANG_INVITES_MSG}
-<br><textarea name="invitemessage" rows="4" cols="55"></textarea>
-<br><input type="submit" value="{LANG_INVITES_SEND}" class="button">
-</form>
-</IF>
-</IF>
-
-<IF {SWITCH_GUESTBOOK}><p><a href="usernotes.php?id={THISMEMBERID}">{LANG_HOME_NEWGUEST}</p></IF>
-
-<IF {TOPLISTTOTAL1}>
-<p><span class="labels">{LANG_HOME_YOURLINKS}:</span></p>
-<table width="96%" cellpadding="3" cellspacing="1" border="0">
-<tr>
- <td {COLUMNHEADER}>{PALL_LANG_GENERAL_TITLE}</td>
- <td {COLUMNHEADER}>{LANG_GENERAL_CATEGORY}</td>
- <IF {SWITCH_HITS}><td {COLUMNHEADER}>{LANG_DETAILS_HITS}</td></IF>
- <IF {SWITCH_RATINGS}><td {COLUMNHEADER}>{LANG_DETAILS_RATING}</td></IF>
- <td {COLUMNHEADER}>{LANG_HOME_CODES}</td>
- <IF {SPONSORUSELINK} is yes><td {COLUMNHEADER}>{LANG_HOME_SPONSOR}</td></IF>
- <td {COLUMNHEADER}>{LANG_GENERAL_UPDATE}</td>
-</tr>
-<!-- BEGIN TOPLIST 1 -->
-<CONFIG>links,time,20,descending,ownerid={THISMEMBERID}</CONFIG>
-<tr>
- <td class="evencolumns"><a href="{LINKDETAILSURL}">{LINKTITLE}</a></td>
- <td class="oddcolumns"><a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a></td>
- <IF {SWITCH_HITS}><td class="evencolumns">{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}</td></IF>
- <IF {SWITCH_RATINGS}><td class="oddcolumns">{LINKSTARS}</td></IF>
- <td class="oddcolumns"><a href="index.php?action=getvotingcode&amp;id={LINKID}">{LANG_SHOWLINKS_GETCODE}</a></td>
- <IF {SPONSORUSELINK} is yes>
-<td class="evencolumns">
-<IF {LINKSPONSORFUNDS}>{LANG_SPONSOR_REMAINING}: ${LINKSPONSORFUNDS}
-<br><a href="link.php?action=sponsor&amp;id={LINKID}">{LANG_HOME_ADDFUNDS}</a>
-<ELSE>
-<a href="link.php?action=sponsor&amp;id={LINKID}">{LANG_HOME_SPONSORLINK}</a>
-</IF>
-</td></IF>
- <td class="oddcolumns">{LINKADMIN}</td>
-</tr>
-<!-- END TOPLIST 1 -->
-</table>
-<IF {TOPLIST1MULTIPAGE}>
-<p>{LANG_GENERAL_PAGE}: {TOPLIST1PREVIOUS} <b>{TOPLIST1CURRENTPAGE}</b> {TOPLIST1NEXT}</p>
-</IF>
-</IF>
-
-<IF {TOPLISTTOTAL2}>
-<p><span class="labels">{LANG_HOME_YOURPENDINGLINKS}:</span></p>
-<table width="96%" cellpadding="3" cellspacing="1" border="0">
-<tr>
- <td {COLUMNHEADER}>{PALL_LANG_GENERAL_TITLE}</td>
- <td {COLUMNHEADER}>{LANG_GENERAL_CATEGORY}</td>
- <IF {SWITCH_HITS}><td {COLUMNHEADER}>{LANG_DETAILS_HITS}</td></IF>
- <IF {SWITCH_RATINGS}><td {COLUMNHEADER}>{LANG_DETAILS_RATING}</td></IF>
- <td {COLUMNHEADER}>{LANG_HOME_CODES}</td>
- <IF {SPONSORUSELINK} is yes><td {COLUMNHEADER}>{LANG_HOME_SPONSOR}</td></IF>
- <td {COLUMNHEADER}>{LANG_GENERAL_UPDATE}</td>
-</tr>
-<!-- BEGIN TOPLIST 2 -->
-<CONFIG>links,time,20,descending,ownerid={THISMEMBERID} AND validated=0,,,1</CONFIG>
-<tr>
- <td class="evencolumns"><a href="{LINKDETAILSURL}">{LINKTITLE}</a></td>
- <td class="oddcolumns"><a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a></td>
- <IF {SWITCH_HITS}><td class="evencolumns">{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}</td></IF>
- <IF {SWITCH_RATINGS}><td class="oddcolumns">{LINKSTARS}</td></IF>
- <td class="oddcolumns"><a href="index.php?action=getvotingcode&amp;id={LINKID}">{LANG_SHOWLINKS_GETCODE}</a></td>
- <IF {SPONSORUSELINK} is yes>
-<td class="evencolumns">
-<IF {LINKSPONSORFUNDS}>{LANG_SPONSOR_REMAINING}: ${LINKSPONSORFUNDS}
-<br><a href="link.php?action=sponsor&amp;id={LINKID}">{LANG_HOME_ADDFUNDS}</a>
-<ELSE>
-<a href="link.php?action=sponsor&amp;id={LINKID}">{LANG_HOME_SPONSORLINK}</a>
-</IF>
-</td></IF>
- <td class="oddcolumns">{LINKADMIN}</td>
-</tr>
-<!-- END TOPLIST 2 -->
-</table>
-<IF {TOPLIST2MULTIPAGE}>
-<p>{LANG_GENERAL_PAGE}: {TOPLIST2PREVIOUS} <b>{TOPLIST2CURRENTPAGE}</b> {TOPLIST2NEXT}</p>
-</IF>
-</IF>
-
-<IF {TOPLISTTOTAL3}>
-<p><span class="labels">{LANG_HOME_YOUREXPIREDLINKS}:</span></p>
-<table width="96%" cellpadding="3" cellspacing="1" border="0">
-<tr>
- <td {COLUMNHEADER}>{PALL_LANG_GENERAL_TITLE}</td>
- <td {COLUMNHEADER}>{LANG_GENERAL_CATEGORY}</td>
- <IF {SWITCH_HITS}><td {COLUMNHEADER}>{LANG_DETAILS_HITS}</td></IF>
- <IF {SWITCH_RATINGS}><td {COLUMNHEADER}>{LANG_DETAILS_RATING}</td></IF>
- <td {COLUMNHEADER}>{LANG_GENERAL_UPDATE}</td>
-</tr>
-<!-- BEGIN TOPLIST 3 -->
-<CONFIG>links,time,20,descending,ownerid={THISMEMBERID} AND expire > 0 AND expire < {UNIXTIMESTAMP}</CONFIG>
-<tr>
- <td class="evencolumns"><a href="{LINKDETAILSURL}">{LINKTITLE}</a></td>
- <td class="oddcolumns"><a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a></td>
- <IF {SWITCH_HITS}><td class="evencolumns">{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}</td></IF>
- <IF {SWITCH_RATINGS}><td class="oddcolumns">{LINKSTARS}</td></IF>
- <td class="oddcolumns">{LINKADMIN}</td>
-</tr>
-<!-- END TOPLIST 3 -->
-</table>
-<IF {TOPLIST3MULTIPAGE}>
-<p>{LANG_GENERAL_PAGE}: {TOPLIST3PREVIOUS} <b>{TOPLIST3CURRENTPAGE}</b> {TOPLIST3NEXT}</p>
-</IF>
-</IF>
-
-<IF {TOPLISTTOTAL4}>
-<p><span class="labels">{LANG_HOME_YOURHIDDENLINKS}:</span></p>
-<table width="96%" cellpadding="3" cellspacing="1" border="0">
-<tr>
- <td {COLUMNHEADER}>{PALL_LANG_GENERAL_TITLE}</td>
- <td {COLUMNHEADER}>{LANG_GENERAL_CATEGORY}</td>
- <IF {SWITCH_HITS}><td {COLUMNHEADER}>{LANG_DETAILS_HITS}</td></IF>
- <IF {SWITCH_RATINGS}><td {COLUMNHEADER}>{LANG_DETAILS_RATING}</td></IF>
- <td {COLUMNHEADER}>{LANG_HOME_CODES}</td>
- <IF {SPONSORUSELINK} is yes><td {COLUMNHEADER}>{LANG_HOME_SPONSOR}</td></IF>
- <td {COLUMNHEADER}>{LANG_GENERAL_UPDATE}</td>
-</tr>
-<!-- BEGIN TOPLIST 4 -->
-<CONFIG>links,time,20,descending,ownerid={THISMEMBERID} AND hide=1,,,0,1</CONFIG>
-<tr>
- <td class="evencolumns"><a href="{LINKDETAILSURL}">{LINKTITLE}</a></td>
- <td class="oddcolumns"><a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a></td>
- <IF {SWITCH_HITS}><td class="evencolumns">{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}</td></IF>
- <IF {SWITCH_RATINGS}><td class="oddcolumns">{LINKSTARS}</td></IF>
- <td class="oddcolumns"><a href="index.php?action=getvotingcode&amp;id={LINKID}">{LANG_SHOWLINKS_GETCODE}</a></td>
- <IF {SPONSORUSELINK} is yes>
-<td class="evencolumns">
-<IF {LINKSPONSORFUNDS}>{LANG_SPONSOR_REMAINING}: ${LINKSPONSORFUNDS}
-<br><a href="link.php?action=sponsor&amp;id={LINKID}">{LANG_HOME_ADDFUNDS}</a>
-<ELSE>
-<a href="link.php?action=sponsor&amp;id={LINKID}">{LANG_HOME_SPONSORLINK}</a>
-</IF>
-</td></IF>
- <td class="oddcolumns">{LINKADMIN}</td>
-</tr>
-<!-- END TOPLIST 4 -->
-</table>
-<IF {TOPLIST4MULTIPAGE}>
-<p>{LANG_GENERAL_PAGE}: {TOPLIST4PREVIOUS} <b>{TOPLIST4CURRENTPAGE}</b> {TOPLIST4NEXT}</p>
-</IF>
-</IF>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="profile.php">{LANG_HOME_MEMHOME}</a></div>
+
+<IF {SWITCH_INVITES}>
+<p>{THISMEMBERINVITES} {LANG_INVITES_LEFT}</p>
+<IF {THISMEMBERINVITES}>
+<form action="invites.php" method="post">
+{LANG_INVITES_SENDTO} <input type="text" name="inviteemail" size="15">
+<IF {THISMEMBERGROUPALLOWUGSPEC}> {LANG_INVITES_TOUG} <select name="invitegroup">{INVITEGROUPS}</select></IF>
+<br>{LANG_INVITES_MSG}
+<br><textarea name="invitemessage" rows="4" cols="55"></textarea>
+<br><input type="submit" value="{LANG_INVITES_SEND}" class="button">
+</form>
+</IF>
+</IF>
+
+<IF {SWITCH_GUESTBOOK}><p><a href="usernotes.php?id={THISMEMBERID}">{LANG_HOME_NEWGUEST}</p></IF>
+
+<IF {TOPLISTTOTAL1}>
+<p><span class="labels">{LANG_HOME_YOURLINKS}:</span></p>
+<table width="96%" cellpadding="3" cellspacing="1" border="0">
+<tr>
+ <td {COLUMNHEADER}>{PALL_LANG_GENERAL_TITLE}</td>
+ <td {COLUMNHEADER}>{LANG_GENERAL_CATEGORY}</td>
+ <IF {SWITCH_HITS}><td {COLUMNHEADER}>{LANG_DETAILS_HITS}</td></IF>
+ <IF {SWITCH_RATINGS}><td {COLUMNHEADER}>{LANG_DETAILS_RATING}</td></IF>
+ <td {COLUMNHEADER}>{LANG_HOME_CODES}</td>
+ <IF {SPONSORUSELINK} is yes><td {COLUMNHEADER}>{LANG_HOME_SPONSOR}</td></IF>
+ <td {COLUMNHEADER}>{LANG_GENERAL_UPDATE}</td>
+</tr>
+<!-- BEGIN TOPLIST 1 -->
+<CONFIG>links,time,20,descending,ownerid={THISMEMBERID}</CONFIG>
+<tr>
+ <td class="evencolumns"><a href="{LINKDETAILSURL}">{LINKTITLE}</a></td>
+ <td class="oddcolumns"><a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a></td>
+ <IF {SWITCH_HITS}><td class="evencolumns">{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}</td></IF>
+ <IF {SWITCH_RATINGS}><td class="oddcolumns">{LINKSTARS}</td></IF>
+ <td class="oddcolumns"><a href="index.php?action=getvotingcode&amp;id={LINKID}">{LANG_SHOWLINKS_GETCODE}</a></td>
+ <IF {SPONSORUSELINK} is yes>
+<td class="evencolumns">
+<IF {LINKSPONSORFUNDS}>{LANG_SPONSOR_REMAINING}: ${LINKSPONSORFUNDS}
+<br><a href="link.php?action=sponsor&amp;id={LINKID}">{LANG_HOME_ADDFUNDS}</a>
+<ELSE>
+<a href="link.php?action=sponsor&amp;id={LINKID}">{LANG_HOME_SPONSORLINK}</a>
+</IF>
+</td></IF>
+ <td class="oddcolumns">{LINKADMIN}</td>
+</tr>
+<!-- END TOPLIST 1 -->
+</table>
+<IF {TOPLIST1MULTIPAGE}>
+<p>{LANG_GENERAL_PAGE}: {TOPLIST1PREVIOUS} <b>{TOPLIST1CURRENTPAGE}</b> {TOPLIST1NEXT}</p>
+</IF>
+</IF>
+
+<IF {TOPLISTTOTAL2}>
+<p><span class="labels">{LANG_HOME_YOURPENDINGLINKS}:</span></p>
+<table width="96%" cellpadding="3" cellspacing="1" border="0">
+<tr>
+ <td {COLUMNHEADER}>{PALL_LANG_GENERAL_TITLE}</td>
+ <td {COLUMNHEADER}>{LANG_GENERAL_CATEGORY}</td>
+ <IF {SWITCH_HITS}><td {COLUMNHEADER}>{LANG_DETAILS_HITS}</td></IF>
+ <IF {SWITCH_RATINGS}><td {COLUMNHEADER}>{LANG_DETAILS_RATING}</td></IF>
+ <td {COLUMNHEADER}>{LANG_HOME_CODES}</td>
+ <IF {SPONSORUSELINK} is yes><td {COLUMNHEADER}>{LANG_HOME_SPONSOR}</td></IF>
+ <td {COLUMNHEADER}>{LANG_GENERAL_UPDATE}</td>
+</tr>
+<!-- BEGIN TOPLIST 2 -->
+<CONFIG>links,time,20,descending,ownerid={THISMEMBERID} AND validated=0,,,1</CONFIG>
+<tr>
+ <td class="evencolumns"><a href="{LINKDETAILSURL}">{LINKTITLE}</a></td>
+ <td class="oddcolumns"><a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a></td>
+ <IF {SWITCH_HITS}><td class="evencolumns">{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}</td></IF>
+ <IF {SWITCH_RATINGS}><td class="oddcolumns">{LINKSTARS}</td></IF>
+ <td class="oddcolumns"><a href="index.php?action=getvotingcode&amp;id={LINKID}">{LANG_SHOWLINKS_GETCODE}</a></td>
+ <IF {SPONSORUSELINK} is yes>
+<td class="evencolumns">
+<IF {LINKSPONSORFUNDS}>{LANG_SPONSOR_REMAINING}: ${LINKSPONSORFUNDS}
+<br><a href="link.php?action=sponsor&amp;id={LINKID}">{LANG_HOME_ADDFUNDS}</a>
+<ELSE>
+<a href="link.php?action=sponsor&amp;id={LINKID}">{LANG_HOME_SPONSORLINK}</a>
+</IF>
+</td></IF>
+ <td class="oddcolumns">{LINKADMIN}</td>
+</tr>
+<!-- END TOPLIST 2 -->
+</table>
+<IF {TOPLIST2MULTIPAGE}>
+<p>{LANG_GENERAL_PAGE}: {TOPLIST2PREVIOUS} <b>{TOPLIST2CURRENTPAGE}</b> {TOPLIST2NEXT}</p>
+</IF>
+</IF>
+
+<IF {TOPLISTTOTAL3}>
+<p><span class="labels">{LANG_HOME_YOUREXPIREDLINKS}:</span></p>
+<table width="96%" cellpadding="3" cellspacing="1" border="0">
+<tr>
+ <td {COLUMNHEADER}>{PALL_LANG_GENERAL_TITLE}</td>
+ <td {COLUMNHEADER}>{LANG_GENERAL_CATEGORY}</td>
+ <IF {SWITCH_HITS}><td {COLUMNHEADER}>{LANG_DETAILS_HITS}</td></IF>
+ <IF {SWITCH_RATINGS}><td {COLUMNHEADER}>{LANG_DETAILS_RATING}</td></IF>
+ <td {COLUMNHEADER}>{LANG_GENERAL_UPDATE}</td>
+</tr>
+<!-- BEGIN TOPLIST 3 -->
+<CONFIG>links,time,20,descending,ownerid={THISMEMBERID} AND expire > 0 AND expire < {UNIXTIMESTAMP}</CONFIG>
+<tr>
+ <td class="evencolumns"><a href="{LINKDETAILSURL}">{LINKTITLE}</a></td>
+ <td class="oddcolumns"><a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a></td>
+ <IF {SWITCH_HITS}><td class="evencolumns">{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}</td></IF>
+ <IF {SWITCH_RATINGS}><td class="oddcolumns">{LINKSTARS}</td></IF>
+ <td class="oddcolumns">{LINKADMIN}</td>
+</tr>
+<!-- END TOPLIST 3 -->
+</table>
+<IF {TOPLIST3MULTIPAGE}>
+<p>{LANG_GENERAL_PAGE}: {TOPLIST3PREVIOUS} <b>{TOPLIST3CURRENTPAGE}</b> {TOPLIST3NEXT}</p>
+</IF>
+</IF>
+
+<IF {TOPLISTTOTAL4}>
+<p><span class="labels">{LANG_HOME_YOURHIDDENLINKS}:</span></p>
+<table width="96%" cellpadding="3" cellspacing="1" border="0">
+<tr>
+ <td {COLUMNHEADER}>{PALL_LANG_GENERAL_TITLE}</td>
+ <td {COLUMNHEADER}>{LANG_GENERAL_CATEGORY}</td>
+ <IF {SWITCH_HITS}><td {COLUMNHEADER}>{LANG_DETAILS_HITS}</td></IF>
+ <IF {SWITCH_RATINGS}><td {COLUMNHEADER}>{LANG_DETAILS_RATING}</td></IF>
+ <td {COLUMNHEADER}>{LANG_HOME_CODES}</td>
+ <IF {SPONSORUSELINK} is yes><td {COLUMNHEADER}>{LANG_HOME_SPONSOR}</td></IF>
+ <td {COLUMNHEADER}>{LANG_GENERAL_UPDATE}</td>
+</tr>
+<!-- BEGIN TOPLIST 4 -->
+<CONFIG>links,time,20,descending,ownerid={THISMEMBERID} AND hide=1,,,0,1</CONFIG>
+<tr>
+ <td class="evencolumns"><a href="{LINKDETAILSURL}">{LINKTITLE}</a></td>
+ <td class="oddcolumns"><a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a></td>
+ <IF {SWITCH_HITS}><td class="evencolumns">{LINKHITS} {LANG_GENERAL_HITSOUT}, {LINKHITSIN} {LANG_GENERAL_HITSIN}</td></IF>
+ <IF {SWITCH_RATINGS}><td class="oddcolumns">{LINKSTARS}</td></IF>
+ <td class="oddcolumns"><a href="index.php?action=getvotingcode&amp;id={LINKID}">{LANG_SHOWLINKS_GETCODE}</a></td>
+ <IF {SPONSORUSELINK} is yes>
+<td class="evencolumns">
+<IF {LINKSPONSORFUNDS}>{LANG_SPONSOR_REMAINING}: ${LINKSPONSORFUNDS}
+<br><a href="link.php?action=sponsor&amp;id={LINKID}">{LANG_HOME_ADDFUNDS}</a>
+<ELSE>
+<a href="link.php?action=sponsor&amp;id={LINKID}">{LANG_HOME_SPONSORLINK}</a>
+</IF>
+</td></IF>
+ <td class="oddcolumns">{LINKADMIN}</td>
+</tr>
+<!-- END TOPLIST 4 -->
+</table>
+<IF {TOPLIST4MULTIPAGE}>
+<p>{LANG_GENERAL_PAGE}: {TOPLIST4PREVIOUS} <b>{TOPLIST4CURRENTPAGE}</b> {TOPLIST4NEXT}</p>
+</IF>
+</IF>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/leaders.tpl wsnlinks/templates/multilingual/leaders.tpl
--- 400/templates/multilingual/leaders.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/leaders.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,44 +1,44 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_FORUMLEADERS}</div>
-
-<!-- BEGIN GROUP -->
-<p><span class="important">{TITLE}</span></p>
-<table>
- <tr>
-  <td {COLUMNHEADER}>{LANG_GENERAL_NAME}</td>
-  <IF {ID} is {MODUSERGROUP}><td {COLUMNHEADER}>{PALL_LANG_GENERAL_CATEGORIES}</td></IF>
-  <td {COLUMNHEADER}>{LANG_PROFILE_CONTACTINFO}</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}');">{LANG_PROFILE_IMTHEM}</a><br></IF>
-<IF {SWITCH_PM} and {MEMBERACCEPTPMS}><a href="privatemessaging.php?action=send&amp;sendto={MEMBERID}">{LANG_PROFILE_SENDPM}</a><br></IF>
-<IF {MEMBERALLOWUSEREMAIL} and {THISMEMBERGROUPCANEMAILMEMBERS} and {MEMBERHASEMAIL}><a href="emailmember.php?id={MEMBERID}">{LANG_EMAILMEMBER_LINK}</a></IF>
-</td>
- </tr>
-<!-- END ROW -->
-</table>
-<!-- END GROUP -->
-
-<IF {SPONSORUSEUG} is yes>
-<p>{LANG_LEADERS_SPONSORS}</p>
-<table>
- <tr>
-  <td {COLUMNHEADER}>{LANG_GENERAL_NAME}</td>
-  <td {COLUMNHEADER}>{LANG_COMMENTS_JOINED}</td>
-  <td {COLUMNHEADER}>{LANG_EDITPROFILE_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>{LANG_LEADERS_YOUTOO}</p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_TITLE_FORUMLEADERS}</div>
+
+<!-- BEGIN GROUP -->
+<p><span class="important">{TITLE}</span></p>
+<table>
+ <tr>
+  <td {COLUMNHEADER}>{LANG_GENERAL_NAME}</td>
+  <IF {ID} is {MODUSERGROUP}><td {COLUMNHEADER}>{PALL_LANG_GENERAL_CATEGORIES}</td></IF>
+  <td {COLUMNHEADER}>{LANG_PROFILE_CONTACTINFO}</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}');">{LANG_PROFILE_IMTHEM}</a><br></IF>
+<IF {SWITCH_PM} and {MEMBERACCEPTPMS}><a href="privatemessaging.php?action=send&amp;sendto={MEMBERID}">{LANG_PROFILE_SENDPM}</a><br></IF>
+<IF {MEMBERALLOWUSEREMAIL} and {THISMEMBERGROUPCANEMAILMEMBERS} and {MEMBERHASEMAIL}><a href="emailmember.php?id={MEMBERID}">{LANG_EMAILMEMBER_LINK}</a></IF>
+</td>
+ </tr>
+<!-- END ROW -->
+</table>
+<!-- END GROUP -->
+
+<IF {SPONSORUSEUG} is yes>
+<p>{LANG_LEADERS_SPONSORS}</p>
+<table>
+ <tr>
+  <td {COLUMNHEADER}>{LANG_GENERAL_NAME}</td>
+  <td {COLUMNHEADER}>{LANG_COMMENTS_JOINED}</td>
+  <td {COLUMNHEADER}>{LANG_EDITPROFILE_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>{LANG_LEADERS_YOUTOO}</p>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/login.tpl wsnlinks/templates/multilingual/login.tpl
--- 400/templates/multilingual/login.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/login.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,32 +1,32 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_LOGIN}</div><br>
-
-<p>{LANG_LOGIN_PROMPT}:</p>
-
-<form action="index.php?action=userlogin&filled=1" method="post">
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> {LANG_LOGIN_LOGIN}</td></tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_USERNAME}:</span></td>
- <td class="optionscolumn"><input type="text" name="username" size="{STANDARDSIZE}"> </td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_PASSWORD}:</span></td> 
- <td class="optionscolumn"><input type="password" name="userpassword" size="{STANDARDSIZE}"> </td>
-</tr>
-</table>
-<input type="submit" value="{LANG_LOGIN_LOGIN}" class="button">
-</form>
-
-<br><br><br>
-
-<form action="index.php?action=lostpw" method="post">
-{LANG_LOGIN_LOST}:<br><input type="text" size="{STANDARDSIZE}" name="email">
-<input type="submit" value="{LANG_LOGIN_SENDPASS}" class="button">
-</form>
-<IF {REGISTRATION} is email>
-<form action="index.php?action=resendconf" method="post">
-<br><br>{LANG_LOGIN_RESENDCONF}
-<br><input type="text" name="email" size="{STANDARDSIZE}">
-<input type="submit" value="{LANG_LOGIN_RESENDBUTTON}" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_TITLE_LOGIN}</div><br>
+
+<p>{LANG_LOGIN_PROMPT}:</p>
+
+<form action="index.php?action=userlogin&filled=1" method="post">
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> {LANG_LOGIN_LOGIN}</td></tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_USERNAME}:</span></td>
+ <td class="optionscolumn"><input type="text" name="username" size="{STANDARDSIZE}"> </td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_PASSWORD}:</span></td> 
+ <td class="optionscolumn"><input type="password" name="userpassword" size="{STANDARDSIZE}"> </td>
+</tr>
+</table>
+<input type="submit" value="{LANG_LOGIN_LOGIN}" class="button">
+</form>
+
+<br><br><br>
+
+<form action="index.php?action=lostpw" method="post">
+{LANG_LOGIN_LOST}:<br><input type="text" size="{STANDARDSIZE}" name="email">
+<input type="submit" value="{LANG_LOGIN_SENDPASS}" class="button">
+</form>
+<IF {REGISTRATION} is email>
+<form action="index.php?action=resendconf" method="post">
+<br><br>{LANG_LOGIN_RESENDCONF}
+<br><input type="text" name="email" size="{STANDARDSIZE}">
+<input type="submit" value="{LANG_LOGIN_RESENDBUTTON}" class="button">
+</form>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/main.tpl wsnlinks/templates/multilingual/main.tpl
--- 400/templates/multilingual/main.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/main.tpl	2006-09-22 04:07:37.000000000 -0700
@@ -33,7 +33,7 @@
 <!-- BEGIN CATSBODY -->
 <!-- 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>
 {CATDESCRIPTION} <br>
 <!-- BEGIN SUBSUB -->
 <a href="index.php?action=displaycat&amp;catid={CATID}">{CATNAME}</a>, 
@@ -73,8 +73,19 @@
 <div class="box">
 <div class="boxtitle" onClick="minmax('topbox')"><img src="{TEMPLATESDIR}/images/icon_show.gif" alt="show"> {LANG_MISC_ARTICLE_PLURAL} {LANG_MAIN_TOPLINKS}</div>
 <div class="boxbody" id="topbox">
-<form action="index.php" style="margin: 0px; padding: 0px;">
-{P_LANG_GENERAL_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">{LANG_MAIN_NEWEST}</option><option value="rating">{LANG_MAIN_TOPRATED}/option><option value="hits">{LANG_MAIN_MOSTVISITED}</option></select> <input type="submit" value="{LANG_GENERAL_GO}" class="button"> 
+<form action="{DIRURL}" style="margin: 0px; padding: 0px;">
+{P_LANG_GENERAL_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">{LANG_MAIN_NEWEST}</option>
+ <option value="rating">{LANG_MAIN_TOPRATED}</option>
+ <option value="hits">{LANG_MAIN_MOSTVISITED}</option>
+</select> 
+<input type="submit" value="{LANG_GENERAL_GO}" class="button"> 
 <br>
 <!-- BEGIN TOPLIST 1 -->
 <CONFIG>links,id,5,descending</CONFIG>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/memberlist.tpl wsnlinks/templates/multilingual/memberlist.tpl
--- 400/templates/multilingual/memberlist.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/memberlist.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,64 +1,64 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_MEMBERLIST}</div><br>
-
-<div align="center">
-<form action="memberlist.php">
-{LANG_MEMBERLIST_SORT}
-<select name="field">
- <option value="time">{LANG_PROFILE_JOINDATE}</option>
- <option value="name">{LANG_GENERAL_NAME}</option>
- <option value="links">{LANG_SEARCH_NUMLINKS}</option>
-<IF {SWITCH_COMMENTS}>
- <option value="comments">{LANG_SEARCH_NUMCOMMENTS}</option>
-</IF>
- <option value="birthdate">{LANG_GENERAL_BIRTHDATE}</option>
- <IF {SWITCH_TIMEONLINE}><option value="timeonline">{LANG_GENERAL_TOTALTIME}</option></IF>
-</select> 
-{LANG_MISC_IN}
-<select name="ascdesc">
- <option value="asc">{LANG_GENERAL_ASC}</option>
- <option value="desc">{LANG_GENERAL_DESC}</option>
-</select> 
-{LANG_MEMBERLIST_ORDER}
-<select name="perpage">
- <option value="{MEMBERSPERPAGE}">{MEMBERSPERPAGE}</option>
- <option value="15">15</option>
- <option value="25">25</option>
- <option value="40">40</option>
- <option value="80">80</option>
-</select>
-{LANG_MEMBERLIST_PERPAGE} 
-<input type="submit" value="{LANG_GENERAL_SORT}" class="button">
-</form>
-</div>
-
-<table width="100%">
-<tr>
- <td {COLUMNHEADER}>{LANG_GENERAL_NAME}</span></td>
- <td {COLUMNHEADER}>{LANG_PROFILE_JOINDATE}</span></td>
- <td {COLUMNHEADER}>{LANG_COMMENTS_LINKSTOTAL}</span></td>
- <IF {SWITCH_COMMENTS}><td {COLUMNHEADER}>{LANG_COMMENTS_TOTAL}</span></td></IF>
- <td {COLUMNHEADER}>{LANG_EDITPROFILE_LOCATION}</td>
- <td {COLUMNHEADER}>{LANG_MEMBERLIST_AVATAR}</span></td>
- <IF {SWITCH_TIMEONLINE}><td {COLUMNHEADER}>{PALL_LANG_GENERAL_TOTALTIME}</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="evencolumns" width="20%">{MEMBERLOCATION}</td>
- <td class="oddcolumns"><IF {MEMBERAVATARNAME}><img src="{MEMBERAVATARURL}" alt=""></IF></td>
- <IF {SWITCH_TIMEONLINE}><td class="evencolumns">{MEMBERTOTALTIMEONLINE}</td></IF>
-</tr>
-<!-- END MEMBERS -->
-</table>
-
-<IF {MULTIPAGE}>
-<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<br>
-<form action="search.php?action=filter&amp;filled=1&amp;whichtype=members" method="post">
-{LANG_MEMBERLIST_FINDMEM} <input type="hidden" name="namecondition" value="="> <input type="text" size="{STANDARDSIZE}" name="namesearch"> <input type="submit" value="{LANG_GENERAL_GO}" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_TITLE_MEMBERLIST}</div><br>
+
+<div align="center">
+<form action="memberlist.php">
+{LANG_MEMBERLIST_SORT}
+<select name="field">
+ <option value="time">{LANG_PROFILE_JOINDATE}</option>
+ <option value="name">{LANG_GENERAL_NAME}</option>
+ <option value="links">{LANG_SEARCH_NUMLINKS}</option>
+<IF {SWITCH_COMMENTS}>
+ <option value="comments">{LANG_SEARCH_NUMCOMMENTS}</option>
+</IF>
+ <option value="birthdate">{LANG_GENERAL_BIRTHDATE}</option>
+ <IF {SWITCH_TIMEONLINE}><option value="timeonline">{LANG_GENERAL_TOTALTIME}</option></IF>
+</select> 
+{LANG_MISC_IN}
+<select name="ascdesc">
+ <option value="asc">{LANG_GENERAL_ASC}</option>
+ <option value="desc">{LANG_GENERAL_DESC}</option>
+</select> 
+{LANG_MEMBERLIST_ORDER}
+<select name="perpage">
+ <option value="{MEMBERSPERPAGE}">{MEMBERSPERPAGE}</option>
+ <option value="15">15</option>
+ <option value="25">25</option>
+ <option value="40">40</option>
+ <option value="80">80</option>
+</select>
+{LANG_MEMBERLIST_PERPAGE} 
+<input type="submit" value="{LANG_GENERAL_SORT}" class="button">
+</form>
+</div>
+
+<table width="100%">
+<tr>
+ <td {COLUMNHEADER}>{LANG_GENERAL_NAME}</span></td>
+ <td {COLUMNHEADER}>{LANG_PROFILE_JOINDATE}</span></td>
+ <td {COLUMNHEADER}>{LANG_COMMENTS_LINKSTOTAL}</span></td>
+ <IF {SWITCH_COMMENTS}><td {COLUMNHEADER}>{LANG_COMMENTS_TOTAL}</span></td></IF>
+ <td {COLUMNHEADER}>{LANG_EDITPROFILE_LOCATION}</td>
+ <td {COLUMNHEADER}>{LANG_MEMBERLIST_AVATAR}</span></td>
+ <IF {SWITCH_TIMEONLINE}><td {COLUMNHEADER}>{PALL_LANG_GENERAL_TOTALTIME}</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="evencolumns" width="20%">{MEMBERLOCATION}</td>
+ <td class="oddcolumns"><IF {MEMBERAVATARNAME}><img src="{MEMBERAVATARURL}" alt=""></IF></td>
+ <IF {SWITCH_TIMEONLINE}><td class="evencolumns">{MEMBERTOTALTIMEONLINE}</td></IF>
+</tr>
+<!-- END MEMBERS -->
+</table>
+
+<IF {MULTIPAGE}>
+<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<br>
+<form action="search.php?action=filter&amp;filled=1&amp;whichtype=members" method="post">
+{LANG_MEMBERLIST_FINDMEM} <input type="hidden" name="namecondition" value="="> <input type="text" size="{STANDARDSIZE}" name="namesearch"> <input type="submit" value="{LANG_GENERAL_GO}" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/modcpsubwrapper.tpl wsnlinks/templates/multilingual/modcpsubwrapper.tpl
--- 400/templates/multilingual/modcpsubwrapper.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/modcpsubwrapper.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,25 +1,25 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_MODCP}</div>
-
-<table cellspacing="5" width="100%">
-<tr>
-<td width="20%" valign="top">
-
-<a href="modcp.php" class="homenav">{LANG_MODCP_MAIN}</a>
-<a href="modcp.php?action=modnotes" class="homenav">{LANG_TITLE_MODNOTES}</a>
-<IF {THISMEMBERGROUPCANVIEWMODLOG}><a href="modlog.php" class="homenav">{LANG_TITLE_MODLOGS}</a></IF>
-<IF {THISMEMBERGROUPCANVIEWIP}><a href="searchips.php" class="homenav">{LANG_TITLE_SEARCHIPS}</a></IF>
-<div class="homenav">{LANG_TITLE_BULKEDIT}
-<!-- 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> > {LANG_TITLE_MODCP}</div>
+
+<table cellspacing="5" width="100%">
+<tr>
+<td width="20%" valign="top">
+
+<a href="modcp.php" class="homenav">{LANG_MODCP_MAIN}</a>
+<a href="modcp.php?action=modnotes" class="homenav">{LANG_TITLE_MODNOTES}</a>
+<IF {THISMEMBERGROUPCANVIEWMODLOG}><a href="modlog.php" class="homenav">{LANG_TITLE_MODLOGS}</a></IF>
+<IF {THISMEMBERGROUPCANVIEWIP}><a href="searchips.php" class="homenav">{LANG_TITLE_SEARCHIPS}</a></IF>
+<div class="homenav">{LANG_TITLE_BULKEDIT}
+<!-- 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/multilingual/modcp.tpl wsnlinks/templates/multilingual/modcp.tpl
--- 400/templates/multilingual/modcp.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/modcp.tpl	2006-09-13 09:35:26.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> > {LANG_TITLE_MODCP}</div>
-
-<IF {PENDING}>
-<p>{LANG_MODCP_PENDING}</p>
-
-<p><a onclick="checkall()" style="cursor: pointer">{P_LANG_GENERAL_SELECT}</a> / <a onclick="uncheckall()" style="cursor: pointer">{P_LANG_GENERAL_UNSELECT}</a> {LANG_GENERAL_ALL}</p>
-
-<form action="modcp.php?filled=1" method="post">
-<table>
-<tr>
- <td {COLUMNHEADER}>{LANG_MODCP_PENDINGLINKS}</td>
- <td {COLUMNHEADER}>{LANG_MODCP_PENDINGEDITS}</td>
- <td {COLUMNHEADER}>{LANG_MODCP_PENDINGCOMMENTS}</td>
-</tr>
-<tr>
- <td valign="top" class="oddcolumns">
-<!-- BEGIN LINK LIST -->
-<input type="checkbox" name="linklist[]" value="{LINKID}"> {LINKTITLE} {LINKADMIN}
-<br>{LANG_GENERAL_URL}: <a href="{LINKURL}" {EXTERNALLINKS}>{LINKURL}</a>
-<br>{LANG_GENERAL_DESCRIPTION}: {LINKDESCRIPTION}
-<br>{LANG_GENERAL_CATEGORY}: <a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a>
-<br>{LANG_SUGGESTLINK_TYPEOFLINK}: {LINKTYPE}
-<br>{LANG_SUGGESTLINK_RECIPROCALLINK}: <a href="{LINKRECIPURL}">{LINKRECIPURL}</a>
-<br>{LANG_SUGGESTLINK_RECIPWITH}: {LINKRECIPWITH}
-<IF {LINKFILEFIELD}><br>{LANG_SHOWLINKS_ATTACHED}:<br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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>{LANG_GENERAL_URL}: <a href="{LINKURL}" {EXTERNALLINKS}>{LINKURL}</a>
-<br>{LANG_GENERAL_DESCRIPTION}: {LINKDESCRIPTION}
-<br>{LANG_GENERAL_CATEGORY}: <a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a>
-<br>{LANG_SUGGESTLINK_TYPEOFLINK}: {LINKTYPE}
-<br>{LANG_SUGGESTLINK_RECIPROCALLINK}: <a href="{LINKRECIPURL}">{LINKRECIPURL}</a>
-<br>{LANG_SUGGESTLINK_RECIPWITH}: {LINKRECIPWITH}
-<IF {LINKFILEFIELD}><br>{LANG_SHOWLINKS_ATTACHED}:<br>
-<!-- BEGIN LINK ATTACHMENTS -->
-<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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}"> {LANG_MODCP_COMMENTON} {COMMENTLINKNAME}
-<br>{LANG_SEARCH_ASSOCIATEDLINK}: <a href="link.php?action=detail&amp;id={COMMENTLINKID}">{COMMENTLINKNAME}</a>
-<IF {SWITCH_POSTTYPES}><br>{LANG_EDITCOM_TYPE}: {COMMENTTYPE}</IF>
-<br>{LANG_EDITCOM_TEXT}: {COMMENTTEXT}
-<!-- END COMMENT LIST -->
-</td>
-</tr>
-</table>
-<select name="action">
-<option value="approve">{LANG_GENERAL_APPROVE}</option>
-<option value="reject">{LANG_GENERAL_REJECT}</option>
-</select> {LANG_MODCP_NOTIFICATIONFROM} <select name="fromemail">{FUNC_ALTERNATEEMAILSELECTOR[]}</select> 
-<input type="submit" value="{LANG_GENERAL_GO}" class="button">
-</form>
-<OTHERWISE>
-{LANG_MODCP_NOPENDING}
+<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> > {LANG_TITLE_MODCP}</div>
+
+<IF {PENDING}>
+<p>{LANG_MODCP_PENDING}</p>
+
+<p><a onclick="checkall()" style="cursor: pointer">{P_LANG_GENERAL_SELECT}</a> / <a onclick="uncheckall()" style="cursor: pointer">{P_LANG_GENERAL_UNSELECT}</a> {LANG_GENERAL_ALL}</p>
+
+<form action="modcp.php?filled=1" method="post">
+<table>
+<tr>
+ <td {COLUMNHEADER}>{LANG_MODCP_PENDINGLINKS}</td>
+ <td {COLUMNHEADER}>{LANG_MODCP_PENDINGEDITS}</td>
+ <td {COLUMNHEADER}>{LANG_MODCP_PENDINGCOMMENTS}</td>
+</tr>
+<tr>
+ <td valign="top" class="oddcolumns">
+<!-- BEGIN LINK LIST -->
+<input type="checkbox" name="linklist[]" value="{LINKID}"> {LINKTITLE} {LINKADMIN}
+<br>{LANG_GENERAL_URL}: <a href="{LINKURL}" {EXTERNALLINKS}>{LINKURL}</a>
+<br>{LANG_GENERAL_DESCRIPTION}: {LINKDESCRIPTION}
+<br>{LANG_GENERAL_CATEGORY}: <a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a>
+<br>{LANG_SUGGESTLINK_TYPEOFLINK}: {LINKTYPE}
+<br>{LANG_SUGGESTLINK_RECIPROCALLINK}: <a href="{LINKRECIPURL}">{LINKRECIPURL}</a>
+<br>{LANG_SUGGESTLINK_RECIPWITH}: {LINKRECIPWITH}
+<IF {LINKFILEFIELD}><br>{LANG_SHOWLINKS_ATTACHED}:<br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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>{LANG_GENERAL_URL}: <a href="{LINKURL}" {EXTERNALLINKS}>{LINKURL}</a>
+<br>{LANG_GENERAL_DESCRIPTION}: {LINKDESCRIPTION}
+<br>{LANG_GENERAL_CATEGORY}: <a href="index.php?action=displaycat&amp;catid={LINKCATID}">{LINKCATNAME}</a>
+<br>{LANG_SUGGESTLINK_TYPEOFLINK}: {LINKTYPE}
+<br>{LANG_SUGGESTLINK_RECIPROCALLINK}: <a href="{LINKRECIPURL}">{LINKRECIPURL}</a>
+<br>{LANG_SUGGESTLINK_RECIPWITH}: {LINKRECIPWITH}
+<IF {LINKFILEFIELD}><br>{LANG_SHOWLINKS_ATTACHED}:<br>
+<!-- BEGIN LINK ATTACHMENTS -->
+<a href="download.php?id={LINKID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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}"> {LANG_MODCP_COMMENTON} {COMMENTLINKNAME}
+<br>{LANG_SEARCH_ASSOCIATEDLINK}: <a href="link.php?action=detail&amp;id={COMMENTLINKID}">{COMMENTLINKNAME}</a>
+<IF {SWITCH_POSTTYPES}><br>{LANG_EDITCOM_TYPE}: {COMMENTTYPE}</IF>
+<br>{LANG_EDITCOM_TEXT}: {COMMENTTEXT}
+<!-- END COMMENT LIST -->
+</td>
+</tr>
+</table>
+<select name="action">
+<option value="approve">{LANG_GENERAL_APPROVE}</option>
+<option value="reject">{LANG_GENERAL_REJECT}</option>
+</select> {LANG_MODCP_NOTIFICATIONFROM} <select name="fromemail">{FUNC_ALTERNATEEMAILSELECTOR[]}</select> 
+<input type="submit" value="{LANG_GENERAL_GO}" class="button">
+</form>
+<OTHERWISE>
+{LANG_MODCP_NOPENDING}
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/onepost.tpl wsnlinks/templates/multilingual/onepost.tpl
--- 400/templates/multilingual/onepost.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/onepost.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,86 +1,86 @@
-<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"> #{COMMENTNUMBER}</td></tr>
-<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="{LANG_MEMBERLIST_AVATAR}"> <br> </IF>
-
-<br><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}
-<br><span class="labels">{LANG_COMMENTS_JOINED}:</span> {MEMBERREGDATE}
-<IF {MEMBERLOCATION}><br><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</IF>
-<br>
-
-<IF {THISMEMBERISREGISTERED}>
-<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_TOTAL}:</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">{LANG_COMMENTS_LINKSTOTAL}:</span> {MEMBERLINKS}
-<br><span class="labels">{LANG_COMMENTS_TOTAL}:</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="{LANG_COMMENTS_REPORT}"></a></IF>
-
-<IF {SWITCH_RATINGS} and {THISMEMBERGROUPCANRATECOMMENTS}>
-<br><br>{COMMENTS_RATE}: <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="{LANG_GENERAL_APPROVE}"></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="{LANG_GENERAL_DISAPPROVE}"></a>
-</IF>
-
-<IF {THISMEMBERGROUPCANVIEWIP}><br><br>{LANG_SUGGESTLINK_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} {LANG_MISC_OF}  {COMMENTVOTES} {LANG_COMMENTS_FOUNDHELPFUL}<br></IF>
-{LANG_COMMENTS_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="{LANG_EDITCOM_EDIT}"></a></IF> 
-<IF {COMMENTTITLE}><br>{COMMENTICONIMAGE} {LANG_GENERAL_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="{LANG_COMMENTS_QUOTEPOST}"></a> <br>#{COMMENTNUMBER}</td>
-  </tr>
-  <tr valign="middle">
-   <td height="100%" valign="top">{COMMENTMESSAGE}
-   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">{COMMENTS_EDITEDBY} {COMMENTLASTEDITBY} {LANG_MISC_ON} {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. {LANG_GENERAL_REASON}: {COMMENTEDITREASON}</IF></span></IF>
-   </td>
-  </tr>
-  <tr valign="bottom">
-   <td valign="bottom">
-<IF {COMMENTNUMATTACHMENTS}>
-<br>{LANG_SHOWLINKS_ATTACHED}:<br>
-<table>
-<tr>
-<!-- BEGIN ATTACHMENTS -->
-<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_ATTACHMENT}"></a>
-</IF>
-</td>
-<!-- END ATTACHMENTS -->
-</tr>
-</table>
-</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"> #{COMMENTNUMBER}</td></tr>
+<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="{LANG_MEMBERLIST_AVATAR}"> <br> </IF>
+
+<br><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}
+<br><span class="labels">{LANG_COMMENTS_JOINED}:</span> {MEMBERREGDATE}
+<IF {MEMBERLOCATION}><br><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</IF>
+<br>
+
+<IF {THISMEMBERISREGISTERED}>
+<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_TOTAL}:</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">{LANG_COMMENTS_LINKSTOTAL}:</span> {MEMBERLINKS}
+<br><span class="labels">{LANG_COMMENTS_TOTAL}:</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="{LANG_COMMENTS_REPORT}"></a></IF>
+
+<IF {SWITCH_RATINGS} and {THISMEMBERGROUPCANRATECOMMENTS}>
+<br><br>{COMMENTS_RATE}: <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="{LANG_GENERAL_APPROVE}"></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="{LANG_GENERAL_DISAPPROVE}"></a>
+</IF>
+
+<IF {THISMEMBERGROUPCANVIEWIP}><br><br>{LANG_SUGGESTLINK_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} {LANG_MISC_OF}  {COMMENTVOTES} {LANG_COMMENTS_FOUNDHELPFUL}<br></IF>
+{LANG_COMMENTS_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="{LANG_EDITCOM_EDIT}"></a></IF> 
+<IF {COMMENTTITLE}><br>{COMMENTICONIMAGE} {LANG_GENERAL_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="{LANG_COMMENTS_QUOTEPOST}"></a> <br>#{COMMENTNUMBER}</td>
+  </tr>
+  <tr valign="middle">
+   <td height="100%" valign="top">{COMMENTMESSAGE}
+   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">{COMMENTS_EDITEDBY} {COMMENTLASTEDITBY} {LANG_MISC_ON} {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. {LANG_GENERAL_REASON}: {COMMENTEDITREASON}</IF></span></IF>
+   </td>
+  </tr>
+  <tr valign="bottom">
+   <td valign="bottom">
+<IF {COMMENTNUMATTACHMENTS}>
+<br>{LANG_SHOWLINKS_ATTACHED}:<br>
+<table>
+<tr>
+<!-- BEGIN ATTACHMENTS -->
+<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_ATTACHMENT}"></a>
+</IF>
+</td>
+<!-- END ATTACHMENTS -->
+</tr>
+</table>
+</IF>
+  <IF {COMMENTSHOWSIG}>
+     <br>_____________________
+     <br>{MEMBERSIGNATURE}
+  </IF>
+   </td>
+  </tr>
+</table>
+</td> 
+</tr>
+</table>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/onlineusers.tpl wsnlinks/templates/multilingual/onlineusers.tpl
--- 400/templates/multilingual/onlineusers.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/onlineusers.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,36 +1,36 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_ONLINEUSERS} </div>
-<br>
-
-<p>{LANG_ONLINE_NOWONLINE}:</p>
-<table width="100%">
-<tr>
- <td {COLUMNHEADER}>{LANG_GENERAL_NAME}</td>
- <td {COLUMNHEADER}>{LANG_EDITPROFILE_LOCATION}</td>
- <td {COLUMNHEADER}>{PALL_LANG_PROFILE_LASTSEEN}</td>
- <IF {THISMEMBERGROUPCANVIEWIP}><td {COLUMNHEADER}>{LANG_ONLINE_IPUSER}</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>({P_LANG_MISC_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">{P_LANG_ONLINE_GUEST}</td>
- <td class="evencolumns"><a href="{ONLINELOCATION}">{ONLINEAREANAME}</a>
-<IF {ONLINETHREADID} and {ONLINECATID}><br>({LANG_MISC_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>{LANG_GENERAL_PAGE}: {TOPLIST5PREVIOUS} <b>{TOPLIST5CURRENTPAGE}</b> {TOPLIST5NEXT}</p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_TITLE_ONLINEUSERS} </div>
+<br>
+
+<p>{LANG_ONLINE_NOWONLINE}:</p>
+<table width="100%">
+<tr>
+ <td {COLUMNHEADER}>{LANG_GENERAL_NAME}</td>
+ <td {COLUMNHEADER}>{LANG_EDITPROFILE_LOCATION}</td>
+ <td {COLUMNHEADER}>{PALL_LANG_PROFILE_LASTSEEN}</td>
+ <IF {THISMEMBERGROUPCANVIEWIP}><td {COLUMNHEADER}>{LANG_ONLINE_IPUSER}</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>({P_LANG_MISC_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">{P_LANG_ONLINE_GUEST}</td>
+ <td class="evencolumns"><a href="{ONLINELOCATION}">{ONLINEAREANAME}</a>
+<IF {ONLINETHREADID} and {ONLINECATID}><br>({LANG_MISC_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>{LANG_GENERAL_PAGE}: {TOPLIST5PREVIOUS} <b>{TOPLIST5CURRENTPAGE}</b> {TOPLIST5NEXT}</p>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/outgoingframe.tpl wsnlinks/templates/multilingual/outgoingframe.tpl
--- 400/templates/multilingual/outgoingframe.tpl	1969-12-31 16:00:00.000000000 -0800
+++ wsnlinks/templates/multilingual/outgoingframe.tpl	2006-07-05 14:35:47.000000000 -0700
@@ -0,0 +1,12 @@
+<html>
+<head>
+<title>{PAGETITLE}</title>
+</head>
+<frameset frameborder="1" border="1" rows="10%,90%">
+<frame src="link.php?action=detail&amp;id={LINKID}&amp;custom=yes&amp;TID=outgoingtop&amp;usewrapper=no" name="frametop">
+<frame src="{LINKURL}" name="framebotton">
+<noframes>
+This page requires that your browser support frames.
+</noframes>
+</frameset>
+</html>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/outgoingtop.tpl wsnlinks/templates/multilingual/outgoingtop.tpl
--- 400/templates/multilingual/outgoingtop.tpl	1969-12-31 16:00:00.000000000 -0800
+++ wsnlinks/templates/multilingual/outgoingtop.tpl	2006-09-21 17:25:43.000000000 -0700
@@ -0,0 +1 @@
+<a href="{DIRURL}" target="_top">{LANG_FRAME_RETURN}</a>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/pmdrafts.tpl wsnlinks/templates/multilingual/pmdrafts.tpl
--- 400/templates/multilingual/pmdrafts.tpl	2006-09-07 12:27:00.000000000 -0700
+++ wsnlinks/templates/multilingual/pmdrafts.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,37 +1,37 @@
-<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="{LANG_GENERAL_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}>&nbsp;</td>
- <td {COLUMNHEADER}>{LANG_PM_SENDINGTO}</span></td>
- <td {COLUMNHEADER}>{LANG_EMAILMEMBER_SUBJECT}</span></td>
- <td {COLUMNHEADER}>{LANG_PM_PREVIEW}</span></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}>
-<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<p>{LANG_BULK_WITHSELECTED} <select name="action"><option value="delete">{LANG_GENERAL_DELETE}</option></select> <input type="submit" value="{LANG_GENERAL_GO}" class="button"></p>
-</form>
-
-<OTHERWISE>
-<p>{LANG_PM_EMPTYDRAFTS}</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="{LANG_GENERAL_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}>&nbsp;</td>
+ <td {COLUMNHEADER}>{LANG_PM_SENDINGTO}</span></td>
+ <td {COLUMNHEADER}>{LANG_EMAILMEMBER_SUBJECT}</span></td>
+ <td {COLUMNHEADER}>{LANG_PM_PREVIEW}</span></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}>
+<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<p>{LANG_BULK_WITHSELECTED} <select name="action"><option value="delete">{LANG_GENERAL_DELETE}</option></select> <input type="submit" value="{LANG_GENERAL_GO}" class="button"></p>
+</form>
+
+<OTHERWISE>
+<p>{LANG_PM_EMPTYDRAFTS}</p>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/pmedit.tpl wsnlinks/templates/multilingual/pmedit.tpl
--- 400/templates/multilingual/pmedit.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/pmedit.tpl	2006-09-18 14:34:43.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,7 @@
 
 <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}>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> {LANG_TITLE_EDITPM}</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/multilingual/pmlist.tpl wsnlinks/templates/multilingual/pmlist.tpl
--- 400/templates/multilingual/pmlist.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/pmlist.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,70 +1,70 @@
-<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">{LANG_PM_COMPOSE}</a></p>
-
-<form action="privatemessaging.php">
-<select name="folder">{FOLDEROPTIONS}</select>
-<input type="submit" value="{LANG_GENERAL_GO}" class="button">
-</form>
-
-<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}>{LANG_EMAILMEMBER_SUBJECT}</span></td>
- <td {COLUMNHEADER}>{LANG_PM_PREVIEW}</span></td>
- <td {COLUMNHEADER}>{LANG_SEARCH_DATE}</span></td>
- <td {COLUMNHEADER}>{LANG_PM_FROM}</span></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"><ELSE><img src="{TEMPLATESDIR}/images/pmread.gif"></IF>
-<ELSE>
- <img src="{TEMPLATESDIR}/images/pmunread.gif">
-</IF>
-</td>
- <td class="oddcolumns"><IF {PMFLAG}><img src="{TEMPLATESDIR}/images/flag.gif">  </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}>
-<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<p>{LANG_BULK_WITHSELECTED} 
-<select name="action">
-<option value="delete">{LANG_GENERAL_DELETE}</option>
-<option value="flag">{LANG_PM_FLAGUNFLAG}</option>
-<option value="move">{LANG_PM_MOVETO}</option>
-</select> <input type="submit" value="{LANG_GENERAL_GO}" class="button"></p>
-</form>
-
-<p><a href="privatemessaging.php?filled=1&amp;action=download&amp;folder={FOLDER}">{LANG_PM_DOWNLOADALL}</a></p>
-
-<form action="privatemessaging.php?folder={FOLDER}" method="post">
-<center>{LANG_PM_NARROWTO} <input type="text" name="searchterm" size="15"> <input type="submit" value="{LANG_MAIN_SEARCH}" class="button"></center>
-</form>
-
-<form action="privatemessaging.php?filled=1&amp;action=createfolder" method="post">
-<p>{LANG_PM_CREATEFOLDER} <input type="text" name="foldername" size="15"> <input type="submit" value="{LANG_PM_CREATEFOLDERBUTTON}" class="button">
-</form>
-
-<OTHERWISE>
-<p>{LANG_PM_EMPTY}</p>
-</IF>
-
-<div class="legend">
-<img src="{TEMPLATESDIR}/images/pmunread.gif" alt="{LANG_PM_UNREADPM}"> {LANG_PM_UNREADPM}<br>
-<img src="{TEMPLATESDIR}/images/pmread.gif" alt="{LANG_PM_READPM}"> {LANG_PM_READPM}<br>
-<img src="{TEMPLATESDIR}/images/pmreplied.gif" alt="{LANG_PM_REPLIEDPM}"> {LANG_PM_REPLIEDPM} <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">{LANG_PM_COMPOSE}</a></p>
+
+<form action="privatemessaging.php">
+<select name="folder">{FOLDEROPTIONS}</select>
+<input type="submit" value="{LANG_GENERAL_GO}" class="button">
+</form>
+
+<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}>{LANG_EMAILMEMBER_SUBJECT}</span></td>
+ <td {COLUMNHEADER}>{LANG_PM_PREVIEW}</span></td>
+ <td {COLUMNHEADER}>{LANG_SEARCH_DATE}</span></td>
+ <td {COLUMNHEADER}>{LANG_PM_FROM}</span></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"><ELSE><img src="{TEMPLATESDIR}/images/pmread.gif"></IF>
+<ELSE>
+ <img src="{TEMPLATESDIR}/images/pmunread.gif">
+</IF>
+</td>
+ <td class="oddcolumns"><IF {PMFLAG}><img src="{TEMPLATESDIR}/images/flag.gif">  </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}>
+<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<p>{LANG_BULK_WITHSELECTED} 
+<select name="action">
+<option value="delete">{LANG_GENERAL_DELETE}</option>
+<option value="flag">{LANG_PM_FLAGUNFLAG}</option>
+<option value="move">{LANG_PM_MOVETO}</option>
+</select> <input type="submit" value="{LANG_GENERAL_GO}" class="button"></p>
+</form>
+
+<p><a href="privatemessaging.php?filled=1&amp;action=download&amp;folder={FOLDER}">{LANG_PM_DOWNLOADALL}</a></p>
+
+<form action="privatemessaging.php?folder={FOLDER}" method="post">
+<center>{LANG_PM_NARROWTO} <input type="text" name="searchterm" size="15"> <input type="submit" value="{LANG_MAIN_SEARCH}" class="button"></center>
+</form>
+
+<form action="privatemessaging.php?filled=1&amp;action=createfolder" method="post">
+<p>{LANG_PM_CREATEFOLDER} <input type="text" name="foldername" size="15"> <input type="submit" value="{LANG_PM_CREATEFOLDERBUTTON}" class="button">
+</form>
+
+<OTHERWISE>
+<p>{LANG_PM_EMPTY}</p>
+</IF>
+
+<div class="legend">
+<img src="{TEMPLATESDIR}/images/pmunread.gif" alt="{LANG_PM_UNREADPM}"> {LANG_PM_UNREADPM}<br>
+<img src="{TEMPLATESDIR}/images/pmread.gif" alt="{LANG_PM_READPM}"> {LANG_PM_READPM}<br>
+<img src="{TEMPLATESDIR}/images/pmreplied.gif" alt="{LANG_PM_REPLIEDPM}"> {LANG_PM_REPLIEDPM} <br>
 </div>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/pmsend.tpl wsnlinks/templates/multilingual/pmsend.tpl
--- 400/templates/multilingual/pmsend.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/pmsend.tpl	2006-09-18 14:30:12.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"> {LANG_TITLE_SENDPM}</td></tr>
 <tr>
  <td class="labelscolumn"><span class="labels">{LANG_PM_SENDINGTO}:</span></td>
  <td class="optionscolumn"><input type="text" name="sendto" size="{STANDARDSIZE}" value="{PMSENDTO}"></td>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/pmsentitems.tpl wsnlinks/templates/multilingual/pmsentitems.tpl
--- 400/templates/multilingual/pmsentitems.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/pmsentitems.tpl	2006-09-13 09:35:26.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="{LANG_GENERAL_GO}" class="button">
-</form>
-
-<IF {FOLDERTOTAL}>
-<form action="privatemessaging.php?filled=1" method="post">
-<table width="100%">
-<tr>
- <td {COLUMNHEADER}>&nbsp;</td>
- <td {COLUMNHEADER}>&nbsp;</td>
- <td {COLUMNHEADER}>{LANG_PM_SENTTO}</td>
- <td {COLUMNHEADER}>{LANG_EMAILMEMBER_SUBJECT}</td>
- <td {COLUMNHEADER}>{LANG_PM_PREVIEW}</td>
- <td {COLUMNHEADER}>{LANG_PM_DATESENT}</td>
- <td {COLUMNHEADER}>{LANG_PM_DATEREAD}</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> {LANG_PM_UNREAD}</IF></td>
-</tr>
-<!-- END PMS -->
-</table>
-
-<IF {MULTIPAGE}>
-<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<p><input type="submit" name="deletesent" value="{LANG_GENERAL_DELETESELECTED}" class="button"></p>
-</form>
-
-<OTHERWISE>
-<p>{LANG_PM_EMPTY}</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="{LANG_GENERAL_GO}" class="button">
+</form>
+
+<IF {FOLDERTOTAL}>
+<form action="privatemessaging.php?filled=1" method="post">
+<table width="100%">
+<tr>
+ <td {COLUMNHEADER}>&nbsp;</td>
+ <td {COLUMNHEADER}>&nbsp;</td>
+ <td {COLUMNHEADER}>{LANG_PM_SENTTO}</td>
+ <td {COLUMNHEADER}>{LANG_EMAILMEMBER_SUBJECT}</td>
+ <td {COLUMNHEADER}>{LANG_PM_PREVIEW}</td>
+ <td {COLUMNHEADER}>{LANG_PM_DATESENT}</td>
+ <td {COLUMNHEADER}>{LANG_PM_DATEREAD}</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> {LANG_PM_UNREAD}</IF></td>
+</tr>
+<!-- END PMS -->
+</table>
+
+<IF {MULTIPAGE}>
+<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<p><input type="submit" name="deletesent" value="{LANG_GENERAL_DELETESELECTED}" class="button"></p>
+</form>
+
+<OTHERWISE>
+<p>{LANG_PM_EMPTY}</p>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/pmview.tpl wsnlinks/templates/multilingual/pmview.tpl
--- 400/templates/multilingual/pmview.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/pmview.tpl	2006-09-18 14:55:16.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}">{LANG_PM_SHOWHISTORY}</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,7 +23,7 @@
 <br><span class="labels">{LANG_COMMENTS_TOTAL}:</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">{LANG_PM_DATESENT}: {PMDATE}</span></td>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/postreply.tpl wsnlinks/templates/multilingual/postreply.tpl
--- 400/templates/multilingual/postreply.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/postreply.tpl	2006-09-13 09:35:26.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> > {LANG_COMMENTS_POSTREPLY}</div><br>
-
-<IF {PREVIEWING}>
-<div class="comment">{PREVIEW}</div>
-</IF>
-
-<span class="important">{INCOMPLETE}</span>
-
-<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>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> {LANG_COMMENTS_POSTREPLY}</td></tr>
-<IF {THISMEMBERUSERGROUP} is 1>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_COMMENTS_YOURNAME}:</span></td>
- <td class="optionscolumn"><input type="text" name="postername" value="{COMMENTPOSTERNAME}" size="{STANDARDSIZE}"></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_GENERAL_SUBJECT}:</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">{LANG_EDITCOM_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">{LANG_EDITCOM_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>{LANG_COMMENTS_MESSAGEHELPWYSI}<ELSE>{LANG_COMMENTS_MESSAGEHELP}</IF>
-</IF>
-
-<br>
-<IF {SWITCH_WSNCODES} and {SWITCH_WYSI}>
-<p align="center">
-<IF {THISMEMBERPOSTEDITOR} is WYSIWYG><input type="submit" name="switcheditor" value="{LANG_EDITCOM_SWITCHPLAIN}" class="button"></IF>
-<IF {THISMEMBERPOSTEDITOR} is plain><input type="submit" name="switcheditor" value="{LANG_EDITCOM_SWITCHWYSI}" 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">{LANG_SUGGESTLINK_ATTACH}:</span></td>
- <td class="optionscolumn" width="80%">
-<IF {COMMENTNUMATTACHMENTS} is less than {THISMEMBERGROUPATTACHPERPOST}><input type="file" name="filefield"> <input type="submit" name="uploadattachment" value="{LANG_SUGGESTLINK_ATTACHBUTTON}" class="button"></IF>
-
-<IF {COMMENTNUMATTACHMENTS}>
-<br>{LANG_SUGGESTLINK_CURRENTATTACH}:<br>
-<!-- BEGIN ATTACHMENTS -->
-<input type="checkbox" name="attachdelete[]" value="{ATTACHID}"> {ATTACHFILETITLE} ({ATTACHKB} {LANG_GENERAL_KB})<br>
-<!-- END ATTACHMENTS -->
-<input type="submit" name="attachdeletion" value="{LANG_GENERAL_DELETESELECTED}" class="button">
-</IF>
-</td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITCOM_OPTIONS}:</span></td>
- <td class="optionscolumn">
-<IF {SWITCH_SMILIES}><input type="checkbox" name="disablesmilies" value="1" {COMMENTCHECKED[disablesmilies]}> {LANG_EDITCOM_DISABLESMILIES}<br> </IF>
-<input type="checkbox" name="disablesig" value="1" {COMMENTCHECKED[disablesig]}> {LANG_EDITCOM_DISABLESIG} <br>
-<IF {THISMEMBERGROUPCANUSEHTML}><input type="checkbox" name="disablehtml" value="1" {POSTCHECKED[disablehtml]}> {LANG_EDITCOM_DISABLEHTML} <br></IF>
-<IF {SWITCH_WSNCODES}><input type="checkbox" name="disablewsn" value="1" {POSTCHECKED[disablewsn]}> {LANG_EDITCOM_DISABLEWSN}</IF>
-</td>
-</tr>
-<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_GENERAL_SECURITYIMAGE}:</span>
-<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
- <td class="optionscolumn"><img src="securityimage.php" class="bullet" alt="{LANG_ALT_SECIMAGE}"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<input type="hidden" name="linkid" value="{LINKID}">
-<input type="submit" value="{LANG_COMMENTS_POST}" class="button"> <input type="submit" name="preview" value="{LANG_PM_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"> {LANG_POSTREPLY_HISTORY}</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">{LANG_COMMENTS_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> > {LANG_COMMENTS_POSTREPLY}</div><br>
+
+<IF {PREVIEWING}>
+<div class="comment">{PREVIEW}</div>
+</IF>
+
+<span class="important">{INCOMPLETE}</span>
+
+<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>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> {LANG_COMMENTS_POSTREPLY}</td></tr>
+<IF {THISMEMBERUSERGROUP} is 1>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_COMMENTS_YOURNAME}:</span></td>
+ <td class="optionscolumn"><input type="text" name="postername" value="{COMMENTPOSTERNAME}" size="{STANDARDSIZE}"></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_GENERAL_SUBJECT}:</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">{LANG_EDITCOM_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">{LANG_EDITCOM_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>{LANG_COMMENTS_MESSAGEHELPWYSI}<ELSE>{LANG_COMMENTS_MESSAGEHELP}</IF>
+</IF>
+
+<br>
+<IF {SWITCH_WSNCODES} and {SWITCH_WYSI}>
+<p align="center">
+<IF {THISMEMBERPOSTEDITOR} is WYSIWYG><input type="submit" name="switcheditor" value="{LANG_EDITCOM_SWITCHPLAIN}" class="button"></IF>
+<IF {THISMEMBERPOSTEDITOR} is plain><input type="submit" name="switcheditor" value="{LANG_EDITCOM_SWITCHWYSI}" 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">{LANG_SUGGESTLINK_ATTACH}:</span></td>
+ <td class="optionscolumn" width="80%">
+<IF {COMMENTNUMATTACHMENTS} is less than {THISMEMBERGROUPATTACHPERPOST}><input type="file" name="filefield"> <input type="submit" name="uploadattachment" value="{LANG_SUGGESTLINK_ATTACHBUTTON}" class="button"></IF>
+
+<IF {COMMENTNUMATTACHMENTS}>
+<br>{LANG_SUGGESTLINK_CURRENTATTACH}:<br>
+<!-- BEGIN ATTACHMENTS -->
+<input type="checkbox" name="attachdelete[]" value="{ATTACHID}"> {ATTACHFILETITLE} ({ATTACHKB} {LANG_GENERAL_KB})<br>
+<!-- END ATTACHMENTS -->
+<input type="submit" name="attachdeletion" value="{LANG_GENERAL_DELETESELECTED}" class="button">
+</IF>
+</td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITCOM_OPTIONS}:</span></td>
+ <td class="optionscolumn">
+<IF {SWITCH_SMILIES}><input type="checkbox" name="disablesmilies" value="1" {COMMENTCHECKED[disablesmilies]}> {LANG_EDITCOM_DISABLESMILIES}<br> </IF>
+<input type="checkbox" name="disablesig" value="1" {COMMENTCHECKED[disablesig]}> {LANG_EDITCOM_DISABLESIG} <br>
+<IF {THISMEMBERGROUPCANUSEHTML}><input type="checkbox" name="disablehtml" value="1" {POSTCHECKED[disablehtml]}> {LANG_EDITCOM_DISABLEHTML} <br></IF>
+<IF {SWITCH_WSNCODES}><input type="checkbox" name="disablewsn" value="1" {POSTCHECKED[disablewsn]}> {LANG_EDITCOM_DISABLEWSN}</IF>
+</td>
+</tr>
+<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_GENERAL_SECURITYIMAGE}:</span>
+<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
+ <td class="optionscolumn"><img src="securityimage.php" class="bullet" alt="{LANG_ALT_SECIMAGE}"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<input type="hidden" name="linkid" value="{LINKID}">
+<input type="submit" value="{LANG_COMMENTS_POST}" class="button"> <input type="submit" name="preview" value="{LANG_PM_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"> {LANG_POSTREPLY_HISTORY}</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">{LANG_COMMENTS_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/multilingual/print.tpl wsnlinks/templates/multilingual/print.tpl
--- 400/templates/multilingual/print.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/print.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,100 +1,100 @@
-<!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> > {LANG_PRINT_PRINTABLE}</div><br>
-
-<p><span class="title">{LINKTITLE}</span>
-<br><a href="{LINKURL}">{LINKURL}</a>
-<br>{LINKDESCRIPTION}
-</p>
-
-<p><a href="comments.php?id={LINKID}">{LANG_PRINT_BACK}</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><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}
-<br><span class="labels">{LANG_COMMENTS_JOINED}:</span> {MEMBERREGDATE}
-<IF {MEMBERLOCATION}><br><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</IF>
-<br>
-<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</span> {MEMBERLINKS}
-<br><span class="labels">{LANG_COMMENTS_TOTAL}:</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} {LANG_MISC_OF} {COMMENTVOTES} {LANG_COMMENTS_FOUNDHELPFUL}<br></IF>
-{LANG_COMMENTS_POSTED} {COMMENTDATE}:</span>  
-<IF {COMMENTTITLE}><br>{LANG_GENERAL_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">{LANG_COMMENTS_EDITEDBY} {COMMENTLASTEDITBY} {LANG_MISC_ON} {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. {LANG_GENERAL_REASON}: {COMMENTEDITREASON}</IF></span></IF>
-   </td>
-  </tr>
-  <tr valign="bottom" width="100%">
-   <td valign="bottom">
-<IF {COMMENTNUMATTACHMENTS}>
-<br>{LANG_SHOWLINKS_ATTACHED}:<br>
-<!-- BEGIN ATTACHMENTS -->
-<a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_ATTACHMENT}"></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>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</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>
+<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> > {LANG_PRINT_PRINTABLE}</div><br>
+
+<p><span class="title">{LINKTITLE}</span>
+<br><a href="{LINKURL}">{LINKURL}</a>
+<br>{LINKDESCRIPTION}
+</p>
+
+<p><a href="comments.php?id={LINKID}">{LANG_PRINT_BACK}</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><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}
+<br><span class="labels">{LANG_COMMENTS_JOINED}:</span> {MEMBERREGDATE}
+<IF {MEMBERLOCATION}><br><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</IF>
+<br>
+<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</span> {MEMBERLINKS}
+<br><span class="labels">{LANG_COMMENTS_TOTAL}:</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} {LANG_MISC_OF} {COMMENTVOTES} {LANG_COMMENTS_FOUNDHELPFUL}<br></IF>
+{LANG_COMMENTS_POSTED} {COMMENTDATE}:</span>  
+<IF {COMMENTTITLE}><br>{LANG_GENERAL_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">{LANG_COMMENTS_EDITEDBY} {COMMENTLASTEDITBY} {LANG_MISC_ON} {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. {LANG_GENERAL_REASON}: {COMMENTEDITREASON}</IF></span></IF>
+   </td>
+  </tr>
+  <tr valign="bottom" width="100%">
+   <td valign="bottom">
+<IF {COMMENTNUMATTACHMENTS}>
+<br>{LANG_SHOWLINKS_ATTACHED}:<br>
+<!-- BEGIN ATTACHMENTS -->
+<a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_ATTACHMENT}"></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>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+</body>
 </html>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/promote.tpl wsnlinks/templates/multilingual/promote.tpl
--- 400/templates/multilingual/promote.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/promote.tpl	2006-09-13 09:35:26.000000000 -0700
@@ -1,34 +1,34 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SPONSOR}</div><br>
-
-<IF {MEMBERFUNDS}><p>{LANG_SPONSOR_REMAINING}: ${MEMBERFUNDS}</p></IF>
-
-<p>{LANG_SPONSOR_USERGROUPDETAIL}</p>
-
-<IF {SPONSORBONUSCUTOFF}><p>{LANG_SPONSOR_BONUS}</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}">
-<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"> {LANG_SPONSOR_DAYSOF} <INPUT type="submit" value="{LANG_SPONSOR_2COPAY}"> 
-</form> 
-2CheckOut.com Inc (Ohio, USA) is an authorized reseller for [your name here]. 
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SPONSOR}</div><br>
+
+<IF {MEMBERFUNDS}><p>{LANG_SPONSOR_REMAINING}: ${MEMBERFUNDS}</p></IF>
+
+<p>{LANG_SPONSOR_USERGROUPDETAIL}</p>
+
+<IF {SPONSORBONUSCUTOFF}><p>{LANG_SPONSOR_BONUS}</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}">
+<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"> {LANG_SPONSOR_DAYSOF} <INPUT type="submit" value="{LANG_SPONSOR_2COPAY}"> 
+</form> 
+2CheckOut.com Inc (Ohio, USA) is an authorized reseller for [your name here]. 
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/register.tpl wsnlinks/templates/multilingual/register.tpl
--- 400/templates/multilingual/register.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/register.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,191 +1,191 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_REGISTER}</div>
-
-<p><span class="important">{INCOMPLETE}</span></p>
-
-<p>{LANG_REGISTRATION_PROMPT}:</p>
-
-<form action="register.php?filled=1" method="post">
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> {LANG_TITLE_REGISTER}</td></tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_USERNAME}:</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">{LANG_GENERAL_EMAIL}:</span></td>
- <td class="optionscolumn"><input type="text" name="email" size="{STANDARDSIZE}" value="{MEMBEREMAIL}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_PASSWORD}:</span></td>
- <td class="optionscolumn"><input type="password" name="password" size="{STANDARDSIZE}" value="{MEMBERPASSWORD}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_CONFIRMPASS}:</span></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">{LANG_REGISTRATION_STYLE}:</span></td>
- <td class="optionscolumn"><select name="stylesheet">{STYLEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_TEMPLATESET}:</span></td>
- <td class="optionscolumn"><select name="thetemplate">{TEMPLATEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_LANGUAGE}:</span></td>
- <td class="optionscolumn"><select name="thelanguage">{LANGUAGEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_ALLOWEMAIL}:</span></td>
- <td class="optionscolumn"><select name="allowemail">{MEMBERALLOWEMAILYESNO}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_ALLOWUSEREMAIL}</span></td>
- <td class="optionscolumn"><select name="allowuseremail">{MEMBERALLOWUSEREMAILYESNO}</select></td> 
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_RECEIVENOTIFICATION}</span></td>
- <td class="optionscolumn"><select name="notifyoflinks">{MEMBERNOTIFYOFLINKSYESNO}</select></td>
-</tr>
-<IF {SWITCH_PM}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_ACCEPTPMS}</span></td>
- <td class="optionscolumn"><select name="acceptpms">{MEMBERACCEPTPMSYESNO}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_NOTIFYOFPMS}</span></td>
- <td class="optionscolumn"><select name="notifyofpms">{MEMBERNOTIFYOFPMSYESNO}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_PMPOP}</span></td>
- <td class="optionscolumn"><select name="pmnotify">{MEMBERPMNOTIFYYESNO}</select></td>
-</tr>
-<IF {SWITCH_MODNOTIFY}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_PMMOD}</span></td>
- <td class="optionscolumn"><select name="moderationpm">{MEMBERMODERATIONPMYESNO}</select></td>
-</tr>
-</IF>
-</IF>
-<IF {SWITCH_COMMENTS}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_AUTOSUB}</span></td>
- <td class="optionscolumn"><select name="autosubscribe">{MEMBERAUTOSUBSCRIBEYESNO}</select></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SUBFREQ}:</span></td>
- <td class="optionscolumn"><select name="notifymethod">{MEMBERNOTIFYMETHODOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_TIMEZONE}</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">{LANG_REGISTER_FORCELOGIN}</span></td>
- <td class="optionscolumn">
- <select name="cookieduration">{MEMBERCOOKIEOPTIONS}</select>
- </td>
-</tr>
-<IF {SWITCH_IMS}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_ACCEPTIMS}:</span></td>
- <td class="optionscolumn"><select name="acceptims">{MEMBERACCEPTIMSOPTIONS}</select></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_POSTSPERPAGE}:</span></td>
- <td class="optionscolumn"><select name="commentsperpage">{MEMBERCOMMENTSPERPAGEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_LINKSPERPAGE}:</span></td>
- <td class="optionscolumn"><select name="linksperpage">{MEMBERLINKSPERPAGEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span></td>
- <td class="optionscolumn"><input type="text" name="location" size="{STANDARDSIZE}" value="{MEMBERLOCATION}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_HOMEPAGE}:</span></td>
- <td class="optionscolumn"><input type="text" name="homepage" size="{STANDARDSIZE}" value="{MEMBERHOMEPAGE}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_OCCUPATION}:</span></td>
- <td class="optionscolumn"><input type="text" name="occupation" size="{STANDARDSIZE}" value="{MEMBEROCCUPATION}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_BIO}:</span></td>
- <td class="optionscolumn"><textarea name="bio" rows="5" cols="45">{MEMBERBIO}</textarea></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_INTERESTS}:</span></td>
- <td class="optionscolumn"><input type="text" name="interests" size="{STANDARDSIZE}" value="{MEMBERINTERESTS}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_IMHANDLES}:</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">{LANG_EDITPROFILE_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">{LANG_EDITPROFILE_SHOWSTATUSTO}:</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">{LANG_EDITPROFILE_POSTEDITOR}:</span></td>
- <td class="optionscolumn"><select name="posteditor">{MEMBERPOSTEDITOROPTIONS}</select></td>
-</tr>
-</IF>
-<IF {SWITCH_COMMENTS}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SHOWAVATARS}</span></td>
- <td class="optionscolumn"><select name="showavatars">{MEMBERSHOWAVATARSYESNO}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SHOWSIGS}</span></td>
- <td class="optionscolumn"><select name="showsigs">{MEMBERSHOWSIGSYESNO}</select></td>
-</tr>
-</IF>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_REF}:</span>
-<br>{LANG_REGISTRATION_REFHELP}</td>
- <td class="optionscolumn"><input type="text" name="referrer" size="{STANDARDSIZE}"></td>
-</tr>
-
-<!-- INSERT NEW FIELDS HERE -->
-
-<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_GENERAL_SECURITYIMAGE}:</span>
-<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
- <td class="optionscolumn"><img src="securityimage.php" alt="{LANG_ALT_SECIMAGE}" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<IF {SWITCH_TOS}><input type="checkbox" name="tos" value="1"> {LANG_REGISTRATION_TOS}<br></IF>
-<input type="hidden" name="customwrapper" value="{CUSTOMWRAPPER}">
-<input type="hidden" name="redirectto" value="{REDIRECTTO}">
-<input type="submit" value="{LANG_REGISTRATION_REGISTER}" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_TITLE_REGISTER}</div>
+
+<p><span class="important">{INCOMPLETE}</span></p>
+
+<p>{LANG_REGISTRATION_PROMPT}:</p>
+
+<form action="register.php?filled=1" method="post">
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> {LANG_TITLE_REGISTER}</td></tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_USERNAME}:</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">{LANG_GENERAL_EMAIL}:</span></td>
+ <td class="optionscolumn"><input type="text" name="email" size="{STANDARDSIZE}" value="{MEMBEREMAIL}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_PASSWORD}:</span></td>
+ <td class="optionscolumn"><input type="password" name="password" size="{STANDARDSIZE}" value="{MEMBERPASSWORD}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_CONFIRMPASS}:</span></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">{LANG_REGISTRATION_STYLE}:</span></td>
+ <td class="optionscolumn"><select name="stylesheet">{STYLEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_TEMPLATESET}:</span></td>
+ <td class="optionscolumn"><select name="thetemplate">{TEMPLATEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_LANGUAGE}:</span></td>
+ <td class="optionscolumn"><select name="thelanguage">{LANGUAGEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_ALLOWEMAIL}:</span></td>
+ <td class="optionscolumn"><select name="allowemail">{MEMBERALLOWEMAILYESNO}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_ALLOWUSEREMAIL}</span></td>
+ <td class="optionscolumn"><select name="allowuseremail">{MEMBERALLOWUSEREMAILYESNO}</select></td> 
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_RECEIVENOTIFICATION}</span></td>
+ <td class="optionscolumn"><select name="notifyoflinks">{MEMBERNOTIFYOFLINKSYESNO}</select></td>
+</tr>
+<IF {SWITCH_PM}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_ACCEPTPMS}</span></td>
+ <td class="optionscolumn"><select name="acceptpms">{MEMBERACCEPTPMSYESNO}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_NOTIFYOFPMS}</span></td>
+ <td class="optionscolumn"><select name="notifyofpms">{MEMBERNOTIFYOFPMSYESNO}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_PMPOP}</span></td>
+ <td class="optionscolumn"><select name="pmnotify">{MEMBERPMNOTIFYYESNO}</select></td>
+</tr>
+<IF {SWITCH_MODNOTIFY}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_PMMOD}</span></td>
+ <td class="optionscolumn"><select name="moderationpm">{MEMBERMODERATIONPMYESNO}</select></td>
+</tr>
+</IF>
+</IF>
+<IF {SWITCH_COMMENTS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_AUTOSUB}</span></td>
+ <td class="optionscolumn"><select name="autosubscribe">{MEMBERAUTOSUBSCRIBEYESNO}</select></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SUBFREQ}:</span></td>
+ <td class="optionscolumn"><select name="notifymethod">{MEMBERNOTIFYMETHODOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_TIMEZONE}</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">{LANG_REGISTER_FORCELOGIN}</span></td>
+ <td class="optionscolumn">
+ <select name="cookieduration">{MEMBERCOOKIEOPTIONS}</select>
+ </td>
+</tr>
+<IF {SWITCH_IMS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_ACCEPTIMS}:</span></td>
+ <td class="optionscolumn"><select name="acceptims">{MEMBERACCEPTIMSOPTIONS}</select></td>
+</tr>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_POSTSPERPAGE}:</span></td>
+ <td class="optionscolumn"><select name="commentsperpage">{MEMBERCOMMENTSPERPAGEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_LINKSPERPAGE}:</span></td>
+ <td class="optionscolumn"><select name="linksperpage">{MEMBERLINKSPERPAGEOPTIONS}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span></td>
+ <td class="optionscolumn"><input type="text" name="location" size="{STANDARDSIZE}" value="{MEMBERLOCATION}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_HOMEPAGE}:</span></td>
+ <td class="optionscolumn"><input type="text" name="homepage" size="{STANDARDSIZE}" value="{MEMBERHOMEPAGE}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_OCCUPATION}:</span></td>
+ <td class="optionscolumn"><input type="text" name="occupation" size="{STANDARDSIZE}" value="{MEMBEROCCUPATION}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_BIO}:</span></td>
+ <td class="optionscolumn"><textarea name="bio" rows="5" cols="45">{MEMBERBIO}</textarea></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_INTERESTS}:</span></td>
+ <td class="optionscolumn"><input type="text" name="interests" size="{STANDARDSIZE}" value="{MEMBERINTERESTS}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_IMHANDLES}:</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">{LANG_EDITPROFILE_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">{LANG_EDITPROFILE_SHOWSTATUSTO}:</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">{LANG_EDITPROFILE_POSTEDITOR}:</span></td>
+ <td class="optionscolumn"><select name="posteditor">{MEMBERPOSTEDITOROPTIONS}</select></td>
+</tr>
+</IF>
+<IF {SWITCH_COMMENTS}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SHOWAVATARS}</span></td>
+ <td class="optionscolumn"><select name="showavatars">{MEMBERSHOWAVATARSYESNO}</select></td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_EDITPROFILE_SHOWSIGS}</span></td>
+ <td class="optionscolumn"><select name="showsigs">{MEMBERSHOWSIGSYESNO}</select></td>
+</tr>
+</IF>
+</IF>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REGISTRATION_REF}:</span>
+<br>{LANG_REGISTRATION_REFHELP}</td>
+ <td class="optionscolumn"><input type="text" name="referrer" size="{STANDARDSIZE}"></td>
+</tr>
+
+<!-- INSERT NEW FIELDS HERE -->
+
+<IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_GENERAL_SECURITYIMAGE}:</span>
+<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
+ <td class="optionscolumn"><img src="securityimage.php" alt="{LANG_ALT_SECIMAGE}" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<IF {SWITCH_TOS}><input type="checkbox" name="tos" value="1"> {LANG_REGISTRATION_TOS}<br></IF>
+<input type="hidden" name="customwrapper" value="{CUSTOMWRAPPER}">
+<input type="hidden" name="redirectto" value="{REDIRECTTO}">
+<input type="submit" value="{LANG_REGISTRATION_REGISTER}" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/reportcomment.tpl wsnlinks/templates/multilingual/reportcomment.tpl
--- 400/templates/multilingual/reportcomment.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/reportcomment.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,32 +1,32 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="comments.php?id={LINKID}">{LINKTITLE}</a> > {LANG_TITLE_REPORTCOMMENT}</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"> {LANG_TITLE_REPORTCOMMENT}</td></tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REPORT_TYPE}:</span></td>
- <td class="optionscolumn">
-  <select name="problemtype">
-   <option value=""></option>
-   <option value="spam">{LANG_REPORT_SPAM}</option>
-   <option value="flaming">{LANG_REPORT_FLAMING}</option>
-   <option value="low quality">{LANG_REPORT_LOWQUALITY}</option>
-   <option value="other">{LANG_REPORT_OTHER}</option>
-  </select>
- <td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REPORT_DETAILS}:</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">{LANG_GENERAL_SECURITYIMAGE}:</span>
-<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
- <td class="optionscolumn"><img src="securityimage.php" alt="{LANG_ALT_SECIMAGE}" 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="{LANG_REPORT_SEND}" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="comments.php?id={LINKID}">{LINKTITLE}</a> > {LANG_TITLE_REPORTCOMMENT}</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"> {LANG_TITLE_REPORTCOMMENT}</td></tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REPORT_TYPE}:</span></td>
+ <td class="optionscolumn">
+  <select name="problemtype">
+   <option value=""></option>
+   <option value="spam">{LANG_REPORT_SPAM}</option>
+   <option value="flaming">{LANG_REPORT_FLAMING}</option>
+   <option value="low quality">{LANG_REPORT_LOWQUALITY}</option>
+   <option value="other">{LANG_REPORT_OTHER}</option>
+  </select>
+ <td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REPORT_DETAILS}:</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">{LANG_GENERAL_SECURITYIMAGE}:</span>
+<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
+ <td class="optionscolumn"><img src="securityimage.php" alt="{LANG_ALT_SECIMAGE}" 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="{LANG_REPORT_SEND}" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/report.tpl wsnlinks/templates/multilingual/report.tpl
--- 400/templates/multilingual/report.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/report.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,33 +1,33 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{NAVIGATION} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > {LANG_TITLE_REPORTLINK}</div>
-
-<p>{LANG_REPORT_REPORT} <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a>:</p>
-
-<form action="report.php?filled=1" method="post">
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> {LANG_TITLE_REPORTLINK}</td></tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REPORT_TYPE}:</span></td>
- <td class="optionscolumn">
-  <select name="problemtype">
-   <option value="{LANG_REPORT_DEAD}">{LANG_REPORT_DEAD}</option>
-   <option value="{LANG_REPORT_BLANK}">{LANG_REPORT_BLANK}</option>
-   <option value="{LANG_REPORT_CHANGED}">{LANG_REPORT_CHANGED}</option>
-   <option value="{LANG_REPORT_OTHER}">{LANG_REPORT_OTHER}</option>
-  </select>
- </td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_REPORT_COMMENTS}:</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">{LANG_GENERAL_SECURITYIMAGE}:</span>
-<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
- <td class="optionscolumn"><img src="securityimage.php" class="bullet" alt="{LANG_ALT_SECIMAGE}"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<input type="hidden" name="id" value="{LINKID}">
-<input type="submit" value="{LANG_REPORT_SEND}" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{NAVIGATION} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > {LANG_TITLE_REPORTLINK}</div>
+
+<p>{LANG_REPORT_REPORT} <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a>:</p>
+
+<form action="report.php?filled=1" method="post">
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> {LANG_TITLE_REPORTLINK}</td></tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REPORT_TYPE}:</span></td>
+ <td class="optionscolumn">
+  <select name="problemtype">
+   <option value="{LANG_REPORT_DEAD}">{LANG_REPORT_DEAD}</option>
+   <option value="{LANG_REPORT_BLANK}">{LANG_REPORT_BLANK}</option>
+   <option value="{LANG_REPORT_CHANGED}">{LANG_REPORT_CHANGED}</option>
+   <option value="{LANG_REPORT_OTHER}">{LANG_REPORT_OTHER}</option>
+  </select>
+ </td>
+</tr>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_REPORT_COMMENTS}:</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">{LANG_GENERAL_SECURITYIMAGE}:</span>
+<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
+ <td class="optionscolumn"><img src="securityimage.php" class="bullet" alt="{LANG_ALT_SECIMAGE}"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<input type="hidden" name="id" value="{LINKID}">
+<input type="submit" value="{LANG_REPORT_SEND}" class="button">
+</form>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/rssfeed.tpl wsnlinks/templates/multilingual/rssfeed.tpl
--- 400/templates/multilingual/rssfeed.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/rssfeed.tpl	2006-09-17 15:33:19.000000000 -0700
@@ -2,7 +2,7 @@
 <rss version="2.0">
 <channel>
 <title>{SITETITLE}</title>
-<link>{MYURL}</link>
+<link>{DIRURL}</link>
 <description>{SITEDESCRIPTION}</description>
 <language>{LANG_RSSLANGUAGE}</language>
 <!-- BEGIN ROW -->
@@ -10,6 +10,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/multilingual/searchadvanced.tpl wsnlinks/templates/multilingual/searchadvanced.tpl
--- 400/templates/multilingual/searchadvanced.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/searchadvanced.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,320 +1,320 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_MAIN_ADVANCEDSEARCH}</div><br>
-
-<div class="box" style="width: 70%;">
-<div class="boxtitle" onClick="minmax('quickbox')"><img src="{TEMPLATESDIR}/images/icon_search.gif" alt="search"> {LANG_SEARCH_QUICKSEARCH}</div>
-<div id="quickbox" class="boxbody">
-<form action="search.php?filled=1&amp;condition={DEFAULTSEARCHTYPE}" method="post">
-<input type="text" name="search" size="{STANDARDSIZE}">
-<select name="whichtype">
- <option value="links">{L_LANG_MAIN_SEARCHLINKS}</option>
- <option value="all">{L_LANG_MAIN_SEARCHALL}</option>
-</select>
-<input type="submit" value="{LANG_MAIN_SEARCH}" class="button"></form>
-</div>
-</div>
-
-<p><span class="labels">{LANG_MAIN_ADVANCEDSEARCH}</span></p>
-
-<p>{LANG_SEARCH_HELP}</p>
-
-<div class="box" style="width: 70%;">
-<div class="boxtitle" onClick="minmax('linksbox')"><img src="{TEMPLATESDIR}/images/icon_search.gif" alt="search"> {LANG_SEARCH_FINDLINKS}</div>
-<div id="linksbox" class="boxbody">
-<form action="search.php?action=filter&amp;filled=1&amp;whichtype=links" method="post">
-{LANG_SEARCH_FINDLINKS}
-<br>{LANG_MISC_THE} {LANG_GENERAL_TITLE} 
-<select name="titlecondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select> 
-<input type="text" size="{STANDARDSIZE}" name="titlesearch">
-<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_DESCRIPTION}
-<select name="descriptioncondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select> 
-<input type="text" size="{STANDARDSIZE}" name="descriptionsearch">
-<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SUGGESTLINK_URL}
-<select name="urlcondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select> 
-<input type="text" size="{STANDARDSIZE}" name="urlsearch">
-<IF {SWITCH_HITS}>
-<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_GENERAL_HITSOUT} <select name="hitscondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value=">">{LANG_SEARCH_GREATER}</option>
- <option value="<">{LANG_SEARCH_LESS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="between">{LANG_SEARCH_BETWEEN}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select> 
-<input type="text" name="hitssearch" size="5">
-<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_GENERAL_HITSIN} 
-<select name="hitsincondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value=">">{LANG_SEARCH_GREATER}</option>
- <option value="<">{LANG_SEARCH_LESS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="between">{LANG_SEARCH_BETWEEN}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select> 
-<input type="text" name="hitsinsearch" size="5">
-</IF>
-<IF {SWITCH_RATINGS}>
-<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_GENERAL_RATING} <select name="ratingcondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value=">">{LANG_SEARCH_GREATER}</option>
- <option value="<">{LANG_SEARCH_LESS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="between">{LANG_SEARCH_BETWEEN}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select> 
-<input type="text" name="ratingsearch" size="5">
-<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_VOTES} 
-<select name="votescondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value=">">{LANG_SEARCH_GREATER}</option>
- <option value="<">{LANG_SEARCH_LESS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="between">{LANG_SEARCH_BETWEEN}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select> 
-<input type="text" name="votessearch" size="5">
-</IF>
-<IF SWITCH_COMMENTS}>
-<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_NUMCOMMENTS} <select name="numcommentscondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value=">">{LANG_SEARCH_GREATER}</option>
- <option value="<">{LANG_SEARCH_LESS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="between">{LANG_SEARCH_BETWEEN}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select> 
-<input type="text" name="numcommentssearch" size="5">
-</IF>
-<br>
-<input type="submit" value="{LANG_SEARCH_FIND}" class="button">
-</form>
-</div>
-</div>
-
-<b>{LANG_MISC_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"> {LANG_SEARCH_FINDCATS}</div>
-<div id="catsbox" class="boxbody">
-<form action="search.php?action=filter&amp;filled=1&amp;whichtype=categories" method="post">
-{LANG_SEARCH_FINDCATS}
-<br>{LANG_MISC_THE} {LANG_GENERAL_TITLE} <select name="namecondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="namesearch">
-<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_DESCRIPTION}
-<select name="descriptioncondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="descriptionsearch">
-<br>{LANG_MISC_AND} {LANG_SEARCH_PARENT}
-<select name="parentnamescondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="parentnamessearch">
-<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_NUMLINKS} 
-<select name="numlinkscondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value=">">{LANG_SEARCH_GREATER}</option>
- <option value="<">{LANG_SEARCH_LESS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="between">{LANG_SEARCH_BETWEEN}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select>
-<input type="text" name="numlinkssearch" size="5">
-<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_NUMSUB}
-<select name="numsubcondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value=">">{LANG_SEARCH_GREATER}</option>
- <option value="<">{LANG_SEARCH_LESS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="between">{LANG_SEARCH_BETWEEN}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select>
-<input type="text" name="numsubsearch" size="5">
-<br>
-<input type="submit" value="{LANG_SEARCH_FIND}" class="button">
-</form>
-</div>
-</div>
-
-<IF {SWITCH_COMMENTS}>
-<b>{LANG_MISC_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"> {LANG_SEARCH_FINDCOMS}</div>
-<div id="comsbox" class="boxbody">
-<form action="search.php?action=filter&amp;filled=1&amp;whichtype=comments" method="post">
-{LANG_SEARCH_FINDCOMMENTS}
-<br>{LANG_MISC_THE} {LANG_SEARCH_POSTERNAME}
-<select name="posternamecondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="posternamesearch">
-<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_MESSAGE}
-<select name="messagecondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="messagesearch">
-<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_LINKNAME}
-<select name="linknamecondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="linknamesearch">
-<br>
-<input type="submit" value="{LANG_SEARCH_FIND}" class="button">
-</form>
-</div>
-</div>
-</IF>
-
-<IF {SWITCH_MEMBERS}>
-<b>{LANG_MISC_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"> {LANG_SEARCH_FINDMEMS}</div>
-<div id="memsbox" class="boxbody">
-<form action="search.php?action=filter&amp;filled=1&amp;whichtype=members" method="post">
-{LANG_SEARCH_FINDMEMBERS}
-<br>{LANG_MISC_THE} {LANG_SEARCH_MEMBERNAME}
-<select name="namecondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="namesearch">
-<br>{LANG_SEARCH_LOCATION} <select name="locationcondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="locationsearch">
-<br>{LANG_SEARCH_INTERESTS} <select name="interestscondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="interestssearch">
-<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_GENERAL_EMAIL}
-<select name="emailcondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="emailsearch">
-<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_NUMLINKS}
-<select name="linkscondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value=">">{LANG_SEARCH_GREATER}</option>
- <option value="<">{LANG_SEARCH_LESS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="between">{LANG_SEARCH_BETWEEN}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select>
-<input type="text" name="linkssearch" size="5">
-<IF {SWITCH_COMMENTS}>
-<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_NUMCOMMENTS}
-<select name="commentscondition">
- <option value="like">{LANG_SEARCH_CONTAINS}</option>
- <option value="=">{LANG_SEARCH_EQUALS}</option>
- <option value=">">{LANG_SEARCH_GREATER}</option>
- <option value="<">{LANG_SEARCH_LESS}</option>
- <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
- <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
- <option value="between">{LANG_SEARCH_BETWEEN}</option>
- <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
- <option value="bool">{LANG_SEARCH_BOOL}</option>
-</select>
-<input type="text" name="commentssearch" size="5">
-</IF>
-<br>
-<input type="submit" value="{LANG_SEARCH_FIND}" class="button">
-</form>
-</div>
-</div>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_MAIN_ADVANCEDSEARCH}</div><br>
+
+<div class="box" style="width: 70%;">
+<div class="boxtitle" onClick="minmax('quickbox')"><img src="{TEMPLATESDIR}/images/icon_search.gif" alt="search"> {LANG_SEARCH_QUICKSEARCH}</div>
+<div id="quickbox" class="boxbody">
+<form action="search.php?filled=1&amp;condition={DEFAULTSEARCHTYPE}" method="post">
+<input type="text" name="search" size="{STANDARDSIZE}">
+<select name="whichtype">
+ <option value="links">{L_LANG_MAIN_SEARCHLINKS}</option>
+ <option value="all">{L_LANG_MAIN_SEARCHALL}</option>
+</select>
+<input type="submit" value="{LANG_MAIN_SEARCH}" class="button"></form>
+</div>
+</div>
+
+<p><span class="labels">{LANG_MAIN_ADVANCEDSEARCH}</span></p>
+
+<p>{LANG_SEARCH_HELP}</p>
+
+<div class="box" style="width: 70%;">
+<div class="boxtitle" onClick="minmax('linksbox')"><img src="{TEMPLATESDIR}/images/icon_search.gif" alt="search"> {LANG_SEARCH_FINDLINKS}</div>
+<div id="linksbox" class="boxbody">
+<form action="search.php?action=filter&amp;filled=1&amp;whichtype=links" method="post">
+{LANG_SEARCH_FINDLINKS}
+<br>{LANG_MISC_THE} {LANG_GENERAL_TITLE} 
+<select name="titlecondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select> 
+<input type="text" size="{STANDARDSIZE}" name="titlesearch">
+<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_DESCRIPTION}
+<select name="descriptioncondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select> 
+<input type="text" size="{STANDARDSIZE}" name="descriptionsearch">
+<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SUGGESTLINK_URL}
+<select name="urlcondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select> 
+<input type="text" size="{STANDARDSIZE}" name="urlsearch">
+<IF {SWITCH_HITS}>
+<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_GENERAL_HITSOUT} <select name="hitscondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value=">">{LANG_SEARCH_GREATER}</option>
+ <option value="<">{LANG_SEARCH_LESS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="between">{LANG_SEARCH_BETWEEN}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select> 
+<input type="text" name="hitssearch" size="5">
+<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_GENERAL_HITSIN} 
+<select name="hitsincondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value=">">{LANG_SEARCH_GREATER}</option>
+ <option value="<">{LANG_SEARCH_LESS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="between">{LANG_SEARCH_BETWEEN}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select> 
+<input type="text" name="hitsinsearch" size="5">
+</IF>
+<IF {SWITCH_RATINGS}>
+<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_GENERAL_RATING} <select name="ratingcondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value=">">{LANG_SEARCH_GREATER}</option>
+ <option value="<">{LANG_SEARCH_LESS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="between">{LANG_SEARCH_BETWEEN}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select> 
+<input type="text" name="ratingsearch" size="5">
+<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_VOTES} 
+<select name="votescondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value=">">{LANG_SEARCH_GREATER}</option>
+ <option value="<">{LANG_SEARCH_LESS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="between">{LANG_SEARCH_BETWEEN}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select> 
+<input type="text" name="votessearch" size="5">
+</IF>
+<IF SWITCH_COMMENTS}>
+<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_NUMCOMMENTS} <select name="numcommentscondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value=">">{LANG_SEARCH_GREATER}</option>
+ <option value="<">{LANG_SEARCH_LESS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="between">{LANG_SEARCH_BETWEEN}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select> 
+<input type="text" name="numcommentssearch" size="5">
+</IF>
+<br>
+<input type="submit" value="{LANG_SEARCH_FIND}" class="button">
+</form>
+</div>
+</div>
+
+<b>{LANG_MISC_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"> {LANG_SEARCH_FINDCATS}</div>
+<div id="catsbox" class="boxbody">
+<form action="search.php?action=filter&amp;filled=1&amp;whichtype=categories" method="post">
+{LANG_SEARCH_FINDCATS}
+<br>{LANG_MISC_THE} {LANG_GENERAL_TITLE} <select name="namecondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="namesearch">
+<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_DESCRIPTION}
+<select name="descriptioncondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="descriptionsearch">
+<br>{LANG_MISC_AND} {LANG_SEARCH_PARENT}
+<select name="parentnamescondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="parentnamessearch">
+<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_NUMLINKS} 
+<select name="numlinkscondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value=">">{LANG_SEARCH_GREATER}</option>
+ <option value="<">{LANG_SEARCH_LESS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="between">{LANG_SEARCH_BETWEEN}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select>
+<input type="text" name="numlinkssearch" size="5">
+<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_NUMSUB}
+<select name="numsubcondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value=">">{LANG_SEARCH_GREATER}</option>
+ <option value="<">{LANG_SEARCH_LESS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="between">{LANG_SEARCH_BETWEEN}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select>
+<input type="text" name="numsubsearch" size="5">
+<br>
+<input type="submit" value="{LANG_SEARCH_FIND}" class="button">
+</form>
+</div>
+</div>
+
+<IF {SWITCH_COMMENTS}>
+<b>{LANG_MISC_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"> {LANG_SEARCH_FINDCOMS}</div>
+<div id="comsbox" class="boxbody">
+<form action="search.php?action=filter&amp;filled=1&amp;whichtype=comments" method="post">
+{LANG_SEARCH_FINDCOMMENTS}
+<br>{LANG_MISC_THE} {LANG_SEARCH_POSTERNAME}
+<select name="posternamecondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="posternamesearch">
+<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_MESSAGE}
+<select name="messagecondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="messagesearch">
+<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_LINKNAME}
+<select name="linknamecondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="linknamesearch">
+<br>
+<input type="submit" value="{LANG_SEARCH_FIND}" class="button">
+</form>
+</div>
+</div>
+</IF>
+
+<IF {SWITCH_MEMBERS}>
+<b>{LANG_MISC_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"> {LANG_SEARCH_FINDMEMS}</div>
+<div id="memsbox" class="boxbody">
+<form action="search.php?action=filter&amp;filled=1&amp;whichtype=members" method="post">
+{LANG_SEARCH_FINDMEMBERS}
+<br>{LANG_MISC_THE} {LANG_SEARCH_MEMBERNAME}
+<select name="namecondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="namesearch">
+<br>{LANG_SEARCH_LOCATION} <select name="locationcondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="locationsearch">
+<br>{LANG_SEARCH_INTERESTS} <select name="interestscondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="interestssearch">
+<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_GENERAL_EMAIL}
+<select name="emailcondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select>
+<input type="text" size="{STANDARDSIZE}" name="emailsearch">
+<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_NUMLINKS}
+<select name="linkscondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value=">">{LANG_SEARCH_GREATER}</option>
+ <option value="<">{LANG_SEARCH_LESS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="between">{LANG_SEARCH_BETWEEN}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select>
+<input type="text" name="linkssearch" size="5">
+<IF {SWITCH_COMMENTS}>
+<br>{LANG_MISC_AND} {LANG_MISC_THE} {LANG_SEARCH_NUMCOMMENTS}
+<select name="commentscondition">
+ <option value="like">{LANG_SEARCH_CONTAINS}</option>
+ <option value="=">{LANG_SEARCH_EQUALS}</option>
+ <option value=">">{LANG_SEARCH_GREATER}</option>
+ <option value="<">{LANG_SEARCH_LESS}</option>
+ <option value="or">{LANG_SEARCH_CONTAINSANY}</option>
+ <option value="and">{LANG_SEARCH_CONTAINSALL}</option>
+ <option value="between">{LANG_SEARCH_BETWEEN}</option>
+ <option value="!=">{LANG_SEARCH_NOTEQUALS}</option>
+ <option value="bool">{LANG_SEARCH_BOOL}</option>
+</select>
+<input type="text" name="commentssearch" size="5">
+</IF>
+<br>
+<input type="submit" value="{LANG_SEARCH_FIND}" class="button">
+</form>
+</div>
+</div>
 </IF>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/searchall.tpl wsnlinks/templates/multilingual/searchall.tpl
--- 400/templates/multilingual/searchall.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/searchall.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,104 +1,104 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SEARCH} </div><br>
-
-<p>{NUMRESULTS} {LANG_SEARCH_MATCHINGALL} "{SEARCHTERM}":</p>
-
-<table>
-<tr>
-<IF {CATEGORYTOTAL}><td><u>{CATEGORYTOTAL} {LANG_GENERAL_CATEGORIES}</u></td></IF>
-<IF {LINKTOTAL}><td><u>{LINKTOTAL} {LANG_GENERAL_LINKS}</u></td></IF>
-<IF {COMMENTTOTAL} and {SWITCH_COMMENTS}><td><u>{COMMENTTOTAL} {LANG_GENERAL_COMMENTS}</u></td></IF>
-<IF {MEMBERTOTAL} and {SWITCH_MEMBERS}><td><u>{MEMBERTOTAL} {LANG_GENERAL_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></span> {CATADMIN} <br>
-<span class="labels">{LANG_GENERAL_DESCRIPTION}:</span> {CATDESCRIPTION} <br>
-<span class="labels">{LANG_EDITCAT_PARENT}:</span> <a href="[IFADMIN../]index.php?action=displaycat&amp;catid={CATPARENT}">{CATPARENTNAME}</a> <br>
-<span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</span> {CATNUMLINKS} <br>
-<span class="labels">{LANG_SEARCH_SUBCATS}:</span> {CATNUMSUB}
-</p>
-<!-- END SEARCH categories RESULTS -->
-<IF {CATEGORYMULTIPAGE}>
-{LANG_GENERAL_PAGE}: {CATEGORYPREVIOUS} <b>{CATEGORYCURRENTPAGE}</b> {CATEGORYNEXT}
-</IF>
-</td>
-</IF>
-
-<IF {LINKTOTAL}>
-<td valign="top" width="25%">
-<!-- BEGIN SEARCH links RESULTS -->
-<!-- BEGIN RECIP -->
-<p>
-<span class="title"><a href="{TRACKLINKURL}" class="reciplink" {EXTERNALLINKS}>{LINKTITLE}</a> {LINKNEW} {LINKUPDATED} {LINKADMIN}</span><br>
-<span class="labels">{LANG_GENERAL_DESCRIPTION}:</span> {LINKDESCRIPTION} <br>
-<IF {SWITCH_RATINGS}><span class="labels">{PALL_LANG_GENERAL_RATING}:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE}, {L_LANG_GENERAL_VOTES} {LINKVOTES})</IF>
-<IF {SWITCH_HITS}><br><span class="labels">{PALL_LANG_GENERAL_HITSOUT}:</span> {LINKHITS} | <span class="labels">{PALL_LANG_GENERAL_HITSIN}:</span> {LINKHITSIN}</IF>
-<IF {SWITCH_COMMENTS}><br><span class="labels">{P_LANG_GENERAL_COMMENTS}:</span> <a href="comments.php?id={LINKID}">{LINKNUMCOMMENTS}</a></IF>
-<br><span class="labels">{LANG_GENERAL_CATEGORY}:</span> {LINKNAV[trim]}
-</p>
-<!-- END RECIP -->
-<!-- BEGIN REGULAR -->
-<p>
-<span class="title"><a href="{TRACKLINKURL}">{LINKTITLE}</a></span> {LINKNEW} {LINKUPDATED} {LINKADMIN}<br>
-<span class="labels">{LANG_GENERAL_DESCRIPTION}:</span> {LINKDESCRIPTION} <br>
-<IF {SWITCH_RATINGS}><span class="labels">{PALL_LANG_GENERAL_RATING}:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE}, {L_LANG_GENERAL_VOTES} {LINKVOTES})</IF>
-<IF {SWITCH_HITS}><br><span class="labels">{PALL_LANG_GENERAL_HITSOUT}:</span> {LINKHITS} | <span class="labels">{PALL_LANG_GENERAL_HITSIN}:</span> {LINKHITSIN}</IF>
-<IF {SWITCH_COMMENTS}><br><span class="labels">{P_LANG_GENERAL_COMMENTS}:</span> <a href="comments.php?id={LINKID}">{LINKNUMCOMMENTS}</a></IF>
-<br><span class="labels">{LANG_GENERAL_CATEGORY}:</span> {LINKNAV[trim]}
-</p>
-<!-- END REGULAR -->
-<!-- END SEARCH links RESULTS -->
-<IF {LINKMULTIPAGE}>
-{LANG_GENERAL_PAGE}: {LINKPREVIOUS} <b>{LINKCURRENTPAGE}</b> {LINKNEXT}
-</IF>
-</td>
-</IF>
-
-<IF {COMMENTTOTAL} and {SWITCH_COMMENTS}>
-<td valign="top" width="25%">
-<!-- BEGIN SEARCH comments RESULTS -->
-<p>
-<span class="labels">{LANG_SEARCH_ASSOCIATEDLINK}:</span> <a href="[IFADMIN../]link.php?id={COMMENTLINKID}">{COMMENTLINKNAME}</a> <br>
-<span class="labels">{LANG_SEARCH_THREAD}:</span> <a href="[IFADMIN../]comments.php?id={COMMENTLINKID}">{LANG_COMMENTS_ABOUT} {COMMENTLINKNAME}</a> <br>
-{LANG_EDITCOM_POSTER}: {COMMENTPOSTERNAME} <br>
-{LANG_EDITCOM_TEXT}: <br>
-{COMMENTMESSAGE} <br>
-{LANG_SEARCH_DATE}: {COMMENTDATE} {COMMENTISNEW} {COMMENTISUPDATED}<br>
-{COMMENTADMIN}
-</p>
-<!-- END SEARCH comments RESULTS -->
-<IF {COMMENTMULTIPAGE}>
-{LANG_GENERAL_PAGE}: {COMMENTPREVIOUS} <b>{COMMENTCURRENTPAGE}</b> {COMMENTNEXT}
-</IF>
-</td>
-</IF>
-
-<IF {MEMBERTOTAL} and {SWITCH_MEMBERS}>
-<td valign="top" width="25%">
-<!-- BEGIN SEARCH members RESULTS -->
-<p>
-<span class="labels">{LANG_REGISTRATION_USERNAME}:</span> {MEMBERNAME} {MEMBERADMIN}<br>
-<span class="labels">{LANG_PROFILE_JOINDATE}:</span> {MEMBERREGDATE} <br>
-<span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</span> <a href="[IFADMIN../]search.php?filled=1&amp;whichtype=links&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;condition==">{MEMBERLINKS}</a> <br>
-<IF {SWITCH_COMMENTS}><span class="labels">{LANG_COMMENTS_TOTAL}:</span> <a href="[IFADMIN../]search.php?filled=1&whichtype=comments&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;condition==">{MEMBERCOMMENTS}</a> <br></IF>
-<IF {SWITCH_COMMENTS}>{MEMBERTOTALHITSIN} {LANG_GENERAL_HITSIN}, {MEMBERTOTALHITS} {LANG_GENERAL_HITSOUT} <br></IF>
-[<a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">{LANG_TITLE_PROFILE}</a>]<br>
-</p>
-<!-- END SEARCH members RESULTS -->
-<IF {MEMBERMULTIPAGE}>
-{LANG_GENERAL_PAGE}: {MEMBERPREVIOUS} <b>{MEMBERCURRENTPAGE}</b> {MEMBERNEXT}
-</IF>
-</td>
-</IF>
-</tr>
-</table>
-
-<div align="center">
-<form action="search.php?{ALLVARS}" method="post">
-{LANG_SEARCH_NARROWTO} <input type="text" name="refine" size="15"> <input type="submit" value="{LANG_SEARCH_REFINE}" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SEARCH} </div><br>
+
+<p>{NUMRESULTS} {LANG_SEARCH_MATCHINGALL} "{SEARCHTERM}":</p>
+
+<table>
+<tr>
+<IF {CATEGORYTOTAL}><td><u>{CATEGORYTOTAL} {LANG_GENERAL_CATEGORIES}</u></td></IF>
+<IF {LINKTOTAL}><td><u>{LINKTOTAL} {LANG_GENERAL_LINKS}</u></td></IF>
+<IF {COMMENTTOTAL} and {SWITCH_COMMENTS}><td><u>{COMMENTTOTAL} {LANG_GENERAL_COMMENTS}</u></td></IF>
+<IF {MEMBERTOTAL} and {SWITCH_MEMBERS}><td><u>{MEMBERTOTAL} {LANG_GENERAL_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></span> {CATADMIN} <br>
+<span class="labels">{LANG_GENERAL_DESCRIPTION}:</span> {CATDESCRIPTION} <br>
+<span class="labels">{LANG_EDITCAT_PARENT}:</span> <a href="[IFADMIN../]index.php?action=displaycat&amp;catid={CATPARENT}">{CATPARENTNAME}</a> <br>
+<span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</span> {CATNUMLINKS} <br>
+<span class="labels">{LANG_SEARCH_SUBCATS}:</span> {CATNUMSUB}
+</p>
+<!-- END SEARCH categories RESULTS -->
+<IF {CATEGORYMULTIPAGE}>
+{LANG_GENERAL_PAGE}: {CATEGORYPREVIOUS} <b>{CATEGORYCURRENTPAGE}</b> {CATEGORYNEXT}
+</IF>
+</td>
+</IF>
+
+<IF {LINKTOTAL}>
+<td valign="top" width="25%">
+<!-- BEGIN SEARCH links RESULTS -->
+<!-- BEGIN RECIP -->
+<p>
+<span class="title"><a href="{TRACKLINKURL}" class="reciplink" {EXTERNALLINKS}>{LINKTITLE}</a> {LINKNEW} {LINKUPDATED} {LINKADMIN}</span><br>
+<span class="labels">{LANG_GENERAL_DESCRIPTION}:</span> {LINKDESCRIPTION} <br>
+<IF {SWITCH_RATINGS}><span class="labels">{PALL_LANG_GENERAL_RATING}:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE}, {L_LANG_GENERAL_VOTES} {LINKVOTES})</IF>
+<IF {SWITCH_HITS}><br><span class="labels">{PALL_LANG_GENERAL_HITSOUT}:</span> {LINKHITS} | <span class="labels">{PALL_LANG_GENERAL_HITSIN}:</span> {LINKHITSIN}</IF>
+<IF {SWITCH_COMMENTS}><br><span class="labels">{P_LANG_GENERAL_COMMENTS}:</span> <a href="comments.php?id={LINKID}">{LINKNUMCOMMENTS}</a></IF>
+<br><span class="labels">{LANG_GENERAL_CATEGORY}:</span> {LINKNAV[trim]}
+</p>
+<!-- END RECIP -->
+<!-- BEGIN REGULAR -->
+<p>
+<span class="title"><a href="{TRACKLINKURL}">{LINKTITLE}</a></span> {LINKNEW} {LINKUPDATED} {LINKADMIN}<br>
+<span class="labels">{LANG_GENERAL_DESCRIPTION}:</span> {LINKDESCRIPTION} <br>
+<IF {SWITCH_RATINGS}><span class="labels">{PALL_LANG_GENERAL_RATING}:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE}, {L_LANG_GENERAL_VOTES} {LINKVOTES})</IF>
+<IF {SWITCH_HITS}><br><span class="labels">{PALL_LANG_GENERAL_HITSOUT}:</span> {LINKHITS} | <span class="labels">{PALL_LANG_GENERAL_HITSIN}:</span> {LINKHITSIN}</IF>
+<IF {SWITCH_COMMENTS}><br><span class="labels">{P_LANG_GENERAL_COMMENTS}:</span> <a href="comments.php?id={LINKID}">{LINKNUMCOMMENTS}</a></IF>
+<br><span class="labels">{LANG_GENERAL_CATEGORY}:</span> {LINKNAV[trim]}
+</p>
+<!-- END REGULAR -->
+<!-- END SEARCH links RESULTS -->
+<IF {LINKMULTIPAGE}>
+{LANG_GENERAL_PAGE}: {LINKPREVIOUS} <b>{LINKCURRENTPAGE}</b> {LINKNEXT}
+</IF>
+</td>
+</IF>
+
+<IF {COMMENTTOTAL} and {SWITCH_COMMENTS}>
+<td valign="top" width="25%">
+<!-- BEGIN SEARCH comments RESULTS -->
+<p>
+<span class="labels">{LANG_SEARCH_ASSOCIATEDLINK}:</span> <a href="[IFADMIN../]link.php?id={COMMENTLINKID}">{COMMENTLINKNAME}</a> <br>
+<span class="labels">{LANG_SEARCH_THREAD}:</span> <a href="[IFADMIN../]comments.php?id={COMMENTLINKID}">{LANG_COMMENTS_ABOUT} {COMMENTLINKNAME}</a> <br>
+{LANG_EDITCOM_POSTER}: {COMMENTPOSTERNAME} <br>
+{LANG_EDITCOM_TEXT}: <br>
+{COMMENTMESSAGE} <br>
+{LANG_SEARCH_DATE}: {COMMENTDATE} {COMMENTISNEW} {COMMENTISUPDATED}<br>
+{COMMENTADMIN}
+</p>
+<!-- END SEARCH comments RESULTS -->
+<IF {COMMENTMULTIPAGE}>
+{LANG_GENERAL_PAGE}: {COMMENTPREVIOUS} <b>{COMMENTCURRENTPAGE}</b> {COMMENTNEXT}
+</IF>
+</td>
+</IF>
+
+<IF {MEMBERTOTAL} and {SWITCH_MEMBERS}>
+<td valign="top" width="25%">
+<!-- BEGIN SEARCH members RESULTS -->
+<p>
+<span class="labels">{LANG_REGISTRATION_USERNAME}:</span> {MEMBERNAME} {MEMBERADMIN}<br>
+<span class="labels">{LANG_PROFILE_JOINDATE}:</span> {MEMBERREGDATE} <br>
+<span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</span> <a href="[IFADMIN../]search.php?filled=1&amp;whichtype=links&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;condition==">{MEMBERLINKS}</a> <br>
+<IF {SWITCH_COMMENTS}><span class="labels">{LANG_COMMENTS_TOTAL}:</span> <a href="[IFADMIN../]search.php?filled=1&whichtype=comments&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;condition==">{MEMBERCOMMENTS}</a> <br></IF>
+<IF {SWITCH_COMMENTS}>{MEMBERTOTALHITSIN} {LANG_GENERAL_HITSIN}, {MEMBERTOTALHITS} {LANG_GENERAL_HITSOUT} <br></IF>
+[<a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">{LANG_TITLE_PROFILE}</a>]<br>
+</p>
+<!-- END SEARCH members RESULTS -->
+<IF {MEMBERMULTIPAGE}>
+{LANG_GENERAL_PAGE}: {MEMBERPREVIOUS} <b>{MEMBERCURRENTPAGE}</b> {MEMBERNEXT}
+</IF>
+</td>
+</IF>
+</tr>
+</table>
+
+<div align="center">
+<form action="search.php?{ALLVARS}" method="post">
+{LANG_SEARCH_NARROWTO} <input type="text" name="refine" size="15"> <input type="submit" value="{LANG_SEARCH_REFINE}" class="button">
+</form>
 </div>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/searchcats.tpl wsnlinks/templates/multilingual/searchcats.tpl
--- 400/templates/multilingual/searchcats.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/searchcats.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,44 +1,44 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SEARCH}</div><br>
-
-<IF {NUMRESULTS} is greater than 0>
-<p>{NUMRESULTS} {LANG_SEARCH_MATCHINGCATS} "{SEARCHTERM}":</p>
-
-<form action="search.php?{ALLVARS}" method="post">
-<div class="sort">
-{LANG_GENERAL_SORTBY}
-<select name="orderfield">
- <option value="name">{LANG_GENERAL_NAME_LOWER}</option>
- <option value="numlinks">{LANG_SEARCH_NUMLINKS}</option>
- <option value="numsub">{LANG_SEARCH_NUMSUB}</option>
- <option value="time">{L_LANG_SEARCH_DATE}</option>
-</select>
-<select name="orderascdesc">
- <option value="asc">{LANG_GENERAL_ASC}</option>
- <option value="desc">{LANG_GENERAL_DESC}</option>
-</select>
- <input type="submit" value="{LANG_GENERAL_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></span> {CATADMIN} <br>
-<span class="labels">{LANG_GENERAL_DESCRIPTION}:</span> {CATDESCRIPTION} <br>
-<span class="labels">{LANG_EDITCAT_PARENT}:</span> <a href="[IFADMIN../]index.php?action=displaycat&amp;catid={CATPARENT}">{CATPARENTNAME}</a> <br>
-<span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</span> {CATNUMLINKS} <br>
-<span class="labels">{LANG_SEARCH_SUBCATS}:</span> {CATNUMSUB}
-</td>
-<!-- END SEARCH categories RESULTS -->
-</table>
-
-<IF {MULTIPAGE}>
-<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT} </p>
-</IF>
-
-<div align="center">
-<form action="search.php?{ALLVARS}" method="post">
-{LANG_SEARCH_NARROWTO} <input type="text" name="refine" size="15"> <input type="submit" value="{LANG_SEARCH_REFINE}" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SEARCH}</div><br>
+
+<IF {NUMRESULTS} is greater than 0>
+<p>{NUMRESULTS} {LANG_SEARCH_MATCHINGCATS} "{SEARCHTERM}":</p>
+
+<form action="search.php?{ALLVARS}" method="post">
+<div class="sort">
+{LANG_GENERAL_SORTBY}
+<select name="orderfield">
+ <option value="name">{LANG_GENERAL_NAME_LOWER}</option>
+ <option value="numlinks">{LANG_SEARCH_NUMLINKS}</option>
+ <option value="numsub">{LANG_SEARCH_NUMSUB}</option>
+ <option value="time">{L_LANG_SEARCH_DATE}</option>
+</select>
+<select name="orderascdesc">
+ <option value="asc">{LANG_GENERAL_ASC}</option>
+ <option value="desc">{LANG_GENERAL_DESC}</option>
+</select>
+ <input type="submit" value="{LANG_GENERAL_SORT}" class="button">
+</div>
+</form>
+</IF>
+
+<table>
+<!-- BEGIN SEARCH categories RESULTS -->
+<td>
+<span class="title"><a href="{CATURL}">{CATNAME}</a></span> {CATADMIN} <br>
+<span class="labels">{LANG_GENERAL_DESCRIPTION}:</span> {CATDESCRIPTION} <br>
+<span class="labels">{LANG_EDITCAT_PARENT}:</span> <a href="[IFADMIN../]index.php?action=displaycat&amp;catid={CATPARENT}">{CATPARENTNAME}</a> <br>
+<span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</span> {CATNUMLINKS} <br>
+<span class="labels">{LANG_SEARCH_SUBCATS}:</span> {CATNUMSUB}
+</td>
+<!-- END SEARCH categories RESULTS -->
+</table>
+
+<IF {MULTIPAGE}>
+<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT} </p>
+</IF>
+
+<div align="center">
+<form action="search.php?{ALLVARS}" method="post">
+{LANG_SEARCH_NARROWTO} <input type="text" name="refine" size="15"> <input type="submit" value="{LANG_SEARCH_REFINE}" class="button">
+</form>
 </div>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/searchcomments.tpl wsnlinks/templates/multilingual/searchcomments.tpl
--- 400/templates/multilingual/searchcomments.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/searchcomments.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,45 +1,45 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SEARCH}</div><br>
-
-<IF {NUMRESULTS} is greater than 0>
-<p>{NUMRESULTS} {LANG_SEARCH_MATCHINGCOMMENTS} "{SEARCHTERM}":</p>
-
-<form action="search.php?{ALLVARS}" method="post">
-<div class="sort">
-{LANG_GENERAL_SORTBY}
-<select name="orderfield">
- <option value="approved / votes">{LANG_GENERAL_RATING}</option>
- <option value="time">{LANG_MAIN_NEWEST}</option>
- <option value="postername">{LANG_SEARCH_POSTERNAME}</option>
-</select>
-<select name="orderascdesc">
- <option value="asc">{LANG_GENERAL_ASC}</option>
- <option value="desc">{LANG_GENERAL_DESC}</option>
-</select>
- <input type="submit" value="{LANG_GENERAL_SORT}" class="button">
-</div>
-</form>
-</IF>
-
-<table>
-<!-- BEGIN SEARCH comments RESULTS -->
-<td>
-<span class="labels">{LANG_SEARCH_ASSOCIATEDLINK}:</span> <a href="[IFADMIN../]link.php?action=detail&amp;id={COMMENTLINKID}">{COMMENTLINKNAME}</a> <br>
-<span class="labels">{LANG_SEARCH_THREAD}:</span> <a href="[IFADMIN../]comments.php?id={COMMENTLINKID}">{LANG_COMMENTS_ABOUT} {COMMENTLINKNAME}</a> <br>
-{LANG_EDITCOM_POSTER}: {COMMENTPOSTERNAME} <br>
-{LANG_EDITCOM_TEXT}: <br>
-{COMMENTMESSAGE} <br>
-{LANG_SEARCH_DATE}: {COMMENTDATE} {COMMENTISNEW} {COMMENTISUPDATED} <br>
-{COMMENTADMIN}
-</td>
-<!-- END SEARCH comments RESULTS -->
-</table>
-
-<IF {MULTIPAGE}>
-<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT} </p>
-</IF>
-
-<div align="center">
-<form action="search.php?{ALLVARS}" method="post">
-{LANG_SEARCH_NARROWTO} <input type="text" name="refine" size="15"> <input type="submit" value="{LANG_SEARCH_REFINE}" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SEARCH}</div><br>
+
+<IF {NUMRESULTS} is greater than 0>
+<p>{NUMRESULTS} {LANG_SEARCH_MATCHINGCOMMENTS} "{SEARCHTERM}":</p>
+
+<form action="search.php?{ALLVARS}" method="post">
+<div class="sort">
+{LANG_GENERAL_SORTBY}
+<select name="orderfield">
+ <option value="approved / votes">{LANG_GENERAL_RATING}</option>
+ <option value="time">{LANG_MAIN_NEWEST}</option>
+ <option value="postername">{LANG_SEARCH_POSTERNAME}</option>
+</select>
+<select name="orderascdesc">
+ <option value="asc">{LANG_GENERAL_ASC}</option>
+ <option value="desc">{LANG_GENERAL_DESC}</option>
+</select>
+ <input type="submit" value="{LANG_GENERAL_SORT}" class="button">
+</div>
+</form>
+</IF>
+
+<table>
+<!-- BEGIN SEARCH comments RESULTS -->
+<td>
+<span class="labels">{LANG_SEARCH_ASSOCIATEDLINK}:</span> <a href="[IFADMIN../]link.php?action=detail&amp;id={COMMENTLINKID}">{COMMENTLINKNAME}</a> <br>
+<span class="labels">{LANG_SEARCH_THREAD}:</span> <a href="[IFADMIN../]comments.php?id={COMMENTLINKID}">{LANG_COMMENTS_ABOUT} {COMMENTLINKNAME}</a> <br>
+{LANG_EDITCOM_POSTER}: {COMMENTPOSTERNAME} <br>
+{LANG_EDITCOM_TEXT}: <br>
+{COMMENTMESSAGE} <br>
+{LANG_SEARCH_DATE}: {COMMENTDATE} {COMMENTISNEW} {COMMENTISUPDATED} <br>
+{COMMENTADMIN}
+</td>
+<!-- END SEARCH comments RESULTS -->
+</table>
+
+<IF {MULTIPAGE}>
+<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT} </p>
+</IF>
+
+<div align="center">
+<form action="search.php?{ALLVARS}" method="post">
+{LANG_SEARCH_NARROWTO} <input type="text" name="refine" size="15"> <input type="submit" value="{LANG_SEARCH_REFINE}" class="button">
+</form>
 </div>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/searchmembers.tpl wsnlinks/templates/multilingual/searchmembers.tpl
--- 400/templates/multilingual/searchmembers.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/searchmembers.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,48 +1,48 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SEARCH}</div><br>
-
-<IF {NUMRESULTS} is greater than 0>
-<p>{NUMRESULTS} {LANG_SEARCH_MATCHINGMEMBERS} "{SEARCHTERM}":</p>
-
-<form action="search.php?{ALLVARS}" method="post">
-<div class="sort">
-{LANG_GENERAL_SORTBY}
-<select name="orderfield">
- <option value="time">{LANG_PROFILE_JOINDATE}</option>
- <option value="name">{LANG_GENERAL_NAME}</option>
- <option value="links">{LANG_SEARCH_NUMLINKS}</option>
-<IF {SWITCH_COMMENTS}>
- <option value="comments">{LANG_SEARCH_NUMCOMMENTS}</option>
-</IF>
-</select>
-<select name="orderascdesc">
- <option value="asc">{LANG_GENERAL_ASC}</option>
- <option value="desc">{LANG_GENERAL_DESC}</option>
-</select>
- <input type="submit" value="{LANG_GENERAL_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">{LANG_PROFILE_JOINDATE}:</span> {MEMBERREGDATE} <br>
-<span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_TOTAL}:</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">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}<br></IF>
-<IF {MEMBERINTERESTS}><span class="labels">{LANG_EDITPROFILE_INTERESTS}:</span> {MEMBERINTERESTS}<br></IF>
-<IF {SWITCH_MEMBERHITS}>{MEMBERTOTALHITSIN} {LANG_GENERAL_HITSIN}, {MEMBERTOTALHITS} {LANG_GENERAL_HITSOUT}<br></IF>
-</td>
-<!-- END SEARCH members RESULTS -->
-</table>
-
-<IF {MULTIPAGE}>
-<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT} </p>
-</IF>
-
-<div align="center">
-<form action="search.php?{ALLVARS}" method="post">
-{LANG_SEARCH_NARROWTO} <input type="text" name="refine" size="15"> <input type="submit" value="{LANG_SEARCH_REFINE}" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SEARCH}</div><br>
+
+<IF {NUMRESULTS} is greater than 0>
+<p>{NUMRESULTS} {LANG_SEARCH_MATCHINGMEMBERS} "{SEARCHTERM}":</p>
+
+<form action="search.php?{ALLVARS}" method="post">
+<div class="sort">
+{LANG_GENERAL_SORTBY}
+<select name="orderfield">
+ <option value="time">{LANG_PROFILE_JOINDATE}</option>
+ <option value="name">{LANG_GENERAL_NAME}</option>
+ <option value="links">{LANG_SEARCH_NUMLINKS}</option>
+<IF {SWITCH_COMMENTS}>
+ <option value="comments">{LANG_SEARCH_NUMCOMMENTS}</option>
+</IF>
+</select>
+<select name="orderascdesc">
+ <option value="asc">{LANG_GENERAL_ASC}</option>
+ <option value="desc">{LANG_GENERAL_DESC}</option>
+</select>
+ <input type="submit" value="{LANG_GENERAL_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">{LANG_PROFILE_JOINDATE}:</span> {MEMBERREGDATE} <br>
+<span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_TOTAL}:</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">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}<br></IF>
+<IF {MEMBERINTERESTS}><span class="labels">{LANG_EDITPROFILE_INTERESTS}:</span> {MEMBERINTERESTS}<br></IF>
+<IF {SWITCH_MEMBERHITS}>{MEMBERTOTALHITSIN} {LANG_GENERAL_HITSIN}, {MEMBERTOTALHITS} {LANG_GENERAL_HITSOUT}<br></IF>
+</td>
+<!-- END SEARCH members RESULTS -->
+</table>
+
+<IF {MULTIPAGE}>
+<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT} </p>
+</IF>
+
+<div align="center">
+<form action="search.php?{ALLVARS}" method="post">
+{LANG_SEARCH_NARROWTO} <input type="text" name="refine" size="15"> <input type="submit" value="{LANG_SEARCH_REFINE}" class="button">
+</form>
 </div>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/search.tpl wsnlinks/templates/multilingual/search.tpl
--- 400/templates/multilingual/search.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/search.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,81 +1,81 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SEARCH} </div><br>
-
-<IF {NUMRESULTS}>
-<p>{NUMRESULTS} {LANG_SEARCH_MATCHING} "{SEARCHTERM}":</p>
-
-<form action="search.php?{ALLVARS}" method="post">
-<div class="sort">
-{LANG_GENERAL_SORTBY}
-<select name="orderfield">
- <option value="id">{LANG_MAIN_NEWEST}</option>
- <option value="lastedit">{LANG_SHOWLINKS_LASTEDITED}</option>
- <option value="title">{LANG_GENERAL_TITLE}</option>
-<IF {SWITCH_RATINGS}>
- <option value="rating">{LANG_GENERAL_RATING}</option>
- <option value="votes">{LANG_GENERAL_VOTES}</option>
-</IF>
-<IF {SWITCH_HITS}>
- <option value="hits">{LANG_GENERAL_HITSOUT}</option>
- <option value="hitsin">{LANG_GENERAL_HITSIN}</option>
-</IF>
- <option value="numcomments">{LANG_GENERAL_COMMENTS}</option>
-<IF {SWITCH_PAGERANK}>
- <option value="pagerank">{LANG_GENERAL_PAGERANK}</option>
-</IF>
-</select>
-<select name="orderascdesc">
- <option value="asc">{LANG_GENERAL_ASC}</option>
- <option value="desc">{LANG_GENERAL_DESC}</option>
-</select>
- <input type="submit" value="{LANG_GENERAL_SORT}" class="button">
-</div>
-</form>
-</IF>
-
-<table>
-<!-- BEGIN SEARCH links RESULTS -->
-<!-- BEGIN RECIP -->
-<td valign="top"> 
-<img src="{TEMPLATESDIR}/images/star.gif" alt=""> 
-<IF  {LINKURL}> 
-<span class="title><a href="{TRACKLINKURL}" class="reciplink" {EXTERNALLINKS}>{LINKTITLE}</a></span<
-<OTHERWISE>
-<span class="title"><a href="{LINKDETAILSURL}" class="reciplink">{LINKTITLE}</a></span>
-</IF>
-{LINKNEW} {LINKISUPDATED} {LINKADMIN}<br>
-<span class="labels">{LANG_GENERAL_DESCRIPTION}:</span> {LINKDESCRIPTION} <br>
-<IF {SWITCH_RATINGS}><span class="labels">{PALL_LANG_GENERAL_RATING}:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE}, {L_LANG_GENERAL_VOTES} {LINKVOTES})</IF>
-<IF {SWITCH_HITS}><br><span class="labels">{PALL_LANG_GENERAL_HITSOUT}:</span> {LINKHITS} | <span class="labels">{PALL_LANG_GENERAL_HITSIN}:</span> {LINKHITSIN}</IF>
-<IF {SWITCH_COMMENTS}><br><span class="labels">{P_LANG_GENERAL_COMMENTS}:</span> <a href="comments.php?id={LINKID}">{LINKNUMCOMMENTS}</a></IF>
-<br><span class="labels">{LANG_GENERAL_CATEGORY}:</span> {LINKNAV[trim]}
-</td>
-<!-- END RECIP -->
-</table>
-<table>
-<!-- BEGIN REGULAR -->
-<td valign="top"> 
-<IF {LINKURL}> 
-<span class="title"><a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a></span>
-<OTHERWISE>
-<span class="title"><a href="{LINKDETAILSURL}">{LINKTITLE}</a></span>
-</IF>
- {LINKNEW} {LINKISUPDATED} {LINKADMIN}<br>
-<span class="labels">{LANG_GENERAL_DESCRIPTION}:</span> {LINKDESCRIPTION} <br>
-<IF {SWITCH_RATINGS}><span class="labels">{PALL_LANG_GENERAL_RATING}:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE}, {L_LANG_GENERAL_VOTES} {LINKVOTES})</IF>
-<IF {SWITCH_HITS}><br><span class="labels">{PALL_LANG_GENERAL_HITSOUT}:</span> {LINKHITS} | <span class="labels">{PALL_LANG_GENERAL_HITSIN}:</span> {LINKHITSIN}</IF>
-<IF {SWITCH_COMMENTS}><br><span class="labels">{P_LANG_GENERAL_COMMENTS}:</span> <a href="comments.php?id={LINKID}">{LINKNUMCOMMENTS}</a></IF>
-<br><span class="labels">{LANG_GENERAL_CATEGORY}:</span> {LINKNAV[trim]}
-</td>
-<!-- END REGULAR -->
-<!-- END SEARCH links RESULTS -->
-</table>
-
-<IF {MULTIPAGE}>
-<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<div align="center">
-<form action="search.php?{ALLVARS}" method="post">
-{LANG_SEARCH_NARROWTO} <input type="text" name="refine" size="15"> <input type="submit" value="{LANG_SEARCH_REFINE}" class="button">
-</form>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SEARCH} </div><br>
+
+<IF {NUMRESULTS}>
+<p>{NUMRESULTS} {LANG_SEARCH_MATCHING} "{SEARCHTERM}":</p>
+
+<form action="search.php?{ALLVARS}" method="post">
+<div class="sort">
+{LANG_GENERAL_SORTBY}
+<select name="orderfield">
+ <option value="id">{LANG_MAIN_NEWEST}</option>
+ <option value="lastedit">{LANG_SHOWLINKS_LASTEDITED}</option>
+ <option value="title">{LANG_GENERAL_TITLE}</option>
+<IF {SWITCH_RATINGS}>
+ <option value="rating">{LANG_GENERAL_RATING}</option>
+ <option value="votes">{LANG_GENERAL_VOTES}</option>
+</IF>
+<IF {SWITCH_HITS}>
+ <option value="hits">{LANG_GENERAL_HITSOUT}</option>
+ <option value="hitsin">{LANG_GENERAL_HITSIN}</option>
+</IF>
+ <option value="numcomments">{LANG_GENERAL_COMMENTS}</option>
+<IF {SWITCH_PAGERANK}>
+ <option value="pagerank">{LANG_GENERAL_PAGERANK}</option>
+</IF>
+</select>
+<select name="orderascdesc">
+ <option value="asc">{LANG_GENERAL_ASC}</option>
+ <option value="desc">{LANG_GENERAL_DESC}</option>
+</select>
+ <input type="submit" value="{LANG_GENERAL_SORT}" class="button">
+</div>
+</form>
+</IF>
+
+<table>
+<!-- BEGIN SEARCH links RESULTS -->
+<!-- BEGIN RECIP -->
+<td valign="top"> 
+<img src="{TEMPLATESDIR}/images/star.gif" alt=""> 
+<IF  {LINKURL}> 
+<span class="title><a href="{TRACKLINKURL}" class="reciplink" {EXTERNALLINKS}>{LINKTITLE}</a></span<
+<OTHERWISE>
+<span class="title"><a href="{LINKDETAILSURL}" class="reciplink">{LINKTITLE}</a></span>
+</IF>
+{LINKNEW} {LINKISUPDATED} {LINKADMIN}<br>
+<span class="labels">{LANG_GENERAL_DESCRIPTION}:</span> {LINKDESCRIPTION} <br>
+<IF {SWITCH_RATINGS}><span class="labels">{PALL_LANG_GENERAL_RATING}:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE}, {L_LANG_GENERAL_VOTES} {LINKVOTES})</IF>
+<IF {SWITCH_HITS}><br><span class="labels">{PALL_LANG_GENERAL_HITSOUT}:</span> {LINKHITS} | <span class="labels">{PALL_LANG_GENERAL_HITSIN}:</span> {LINKHITSIN}</IF>
+<IF {SWITCH_COMMENTS}><br><span class="labels">{P_LANG_GENERAL_COMMENTS}:</span> <a href="comments.php?id={LINKID}">{LINKNUMCOMMENTS}</a></IF>
+<br><span class="labels">{LANG_GENERAL_CATEGORY}:</span> {LINKNAV[trim]}
+</td>
+<!-- END RECIP -->
+</table>
+<table>
+<!-- BEGIN REGULAR -->
+<td valign="top"> 
+<IF {LINKURL}> 
+<span class="title"><a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a></span>
+<OTHERWISE>
+<span class="title"><a href="{LINKDETAILSURL}">{LINKTITLE}</a></span>
+</IF>
+ {LINKNEW} {LINKISUPDATED} {LINKADMIN}<br>
+<span class="labels">{LANG_GENERAL_DESCRIPTION}:</span> {LINKDESCRIPTION} <br>
+<IF {SWITCH_RATINGS}><span class="labels">{PALL_LANG_GENERAL_RATING}:</span> {LINKSTARS} ({LINKRATING}/{MAXVOTE}, {L_LANG_GENERAL_VOTES} {LINKVOTES})</IF>
+<IF {SWITCH_HITS}><br><span class="labels">{PALL_LANG_GENERAL_HITSOUT}:</span> {LINKHITS} | <span class="labels">{PALL_LANG_GENERAL_HITSIN}:</span> {LINKHITSIN}</IF>
+<IF {SWITCH_COMMENTS}><br><span class="labels">{P_LANG_GENERAL_COMMENTS}:</span> <a href="comments.php?id={LINKID}">{LINKNUMCOMMENTS}</a></IF>
+<br><span class="labels">{LANG_GENERAL_CATEGORY}:</span> {LINKNAV[trim]}
+</td>
+<!-- END REGULAR -->
+<!-- END SEARCH links RESULTS -->
+</table>
+
+<IF {MULTIPAGE}>
+<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<div align="center">
+<form action="search.php?{ALLVARS}" method="post">
+{LANG_SEARCH_NARROWTO} <input type="text" name="refine" size="15"> <input type="submit" value="{LANG_SEARCH_REFINE}" class="button">
+</form>
 </div>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/showvotecode.tpl wsnlinks/templates/multilingual/showvotecode.tpl
--- 400/templates/multilingual/showvotecode.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/showvotecode.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,24 +1,24 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > {LANG_TITLE_VOTINGCODE}</div><br>
-
-<p>{LANG_SHOWCODE}:</p>
-
-<p align="center">
-<textarea rows="15" cols="50">
-<form action="{DIRURL}/vote.php?action=vote&amp;id={LINKID}" method="post">
-{LANG_SHOWCODE_RATETHIS}:
-<select name="votevalue">
- <option value="5">5 - {LANG_VOTE_BEST}</option>
- <option value="4">4</option>
- <option value="3">3</option>
- <option value="2">2</option>
- <option value="1">1 - {LANG_VOTE_WORST}</option>
-</select>
-<input type="submit" value="{LANG_SHOWCODE_RATETHIS}">
-</form>
-</textarea>
-</p>
-
-<p>{LANG_SHOWCODE_LINKCODE}:</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> > {LANG_TITLE_VOTINGCODE}</div><br>
+
+<p>{LANG_SHOWCODE}:</p>
+
+<p align="center">
+<textarea rows="15" cols="50">
+<form action="{DIRURL}/vote.php?action=vote&amp;id={LINKID}" method="post">
+{LANG_SHOWCODE_RATETHIS}:
+<select name="votevalue">
+ <option value="5">5 - {LANG_VOTE_BEST}</option>
+ <option value="4">4</option>
+ <option value="3">3</option>
+ <option value="2">2</option>
+ <option value="1">1 - {LANG_VOTE_WORST}</option>
+</select>
+<input type="submit" value="{LANG_SHOWCODE_RATETHIS}">
+</form>
+</textarea>
+</p>
+
+<p>{LANG_SHOWCODE_LINKCODE}:</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/multilingual/showvotes.tpl wsnlinks/templates/multilingual/showvotes.tpl
--- 400/templates/multilingual/showvotes.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/showvotes.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,10 +1,10 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{LINKNAV} > {LINKTITLE}</div><br>
-
-<!-- BEGIN RATINGS -->
-<p>
-{MEMBERNAME} ({VOTEIP}): {P_LANG_GENERAL_RATING} {LANG_MISC_OF} {VOTEVALUE} {LANG_MISC_ON} {VOTEDATE}
-<IF {THISMEMBERGROUPCANEDITVOTES}>
-[<a href="showvotes.php?filled=1&amp;id={LINKID}&amp;action=delete&amp;voteid={VOTEID}">{LANG_VOTE_DELETEVOTE}</a>]
-</IF>
-</p>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{LINKNAV} > {LINKTITLE}</div><br>
+
+<!-- BEGIN RATINGS -->
+<p>
+{MEMBERNAME} ({VOTEIP}): {P_LANG_GENERAL_RATING} {LANG_MISC_OF} {VOTEVALUE} {LANG_MISC_ON} {VOTEDATE}
+<IF {THISMEMBERGROUPCANEDITVOTES}>
+[<a href="showvotes.php?filled=1&amp;id={LINKID}&amp;action=delete&amp;voteid={VOTEID}">{LANG_VOTE_DELETEVOTE}</a>]
+</IF>
+</p>
 <!-- END RATINGS -->
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/sitemap.tpl wsnlinks/templates/multilingual/sitemap.tpl
--- 400/templates/multilingual/sitemap.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/sitemap.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,10 +1,10 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SITEMAP}</div><br>
-
-<!-- BEGIN MAP LINE -->
-<!-- BEGIN REGULAR -->
-{INDENT} <a href="index.php?action=displaycat&catid={CATID}">{CATNAME}</a> 
-<br>
-<!-- END REGULAR -->
-<!-- END MAP LINE -->
-
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SITEMAP}</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/multilingual/sponsor.tpl wsnlinks/templates/multilingual/sponsor.tpl
--- 400/templates/multilingual/sponsor.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/sponsor.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,33 +1,33 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > {LANG_TITLE_SPONSOR}</div><br>
-
-<IF {LINKSPONSORFUNDS}><p>{LANG_SPONSOR_REMAINING}: ${LINKSPONSORFUNDS}</p></IF>
-
-<p>{LANG_SPONSOR_HELP}</p>
-
-<IF {SPONSORBONUSCUTOFF}><p>{LANG_SPONSOR_BONUS}</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="{LANG_NAVORIGIN} 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"> {LANG_SPONSOR_DAYSOF} <INPUT type="submit" value="{LANG_SPONSOR_2COPAY}"> 
-</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> > {LANG_TITLE_SPONSOR}</div><br>
+
+<IF {LINKSPONSORFUNDS}><p>{LANG_SPONSOR_REMAINING}: ${LINKSPONSORFUNDS}</p></IF>
+
+<p>{LANG_SPONSOR_HELP}</p>
+
+<IF {SPONSORBONUSCUTOFF}><p>{LANG_SPONSOR_BONUS}</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="{LANG_NAVORIGIN} 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"> {LANG_SPONSOR_DAYSOF} <INPUT type="submit" value="{LANG_SPONSOR_2COPAY}"> 
+</form> 
+2CheckOut.com Inc (Ohio, USA) is an authorized reseller for [your name here]. 
+</IF>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/subscriptions.tpl wsnlinks/templates/multilingual/subscriptions.tpl
--- 400/templates/multilingual/subscriptions.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/subscriptions.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,37 +1,37 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SUBSCRIPTIONS}</div>
-
-<form action="profile.php?filled=1&amp;id={MEMBERID}&amp;action=unsubscribe" method="post">
-<p>{LANG_SUBSCRIPTIONS_LINK}</p>
-<table width="96%" cellpadding="3" cellspacing="1" border="0">
-<tr>
- <td {COLUMNHEADER}>&nbsp;</td>
- <td {COLUMNHEADER}>{LANG_SEARCH_THREAD}</td>
- <td {COLUMNHEADER}>{LANG_GENERAL_DESCRIPTION}</td>
- <td {COLUMNHEADER}>{PALL_LANG_GENERAL_COMMENTS}</td>
- <td {COLUMNHEADER}>{PALL_LANG_GENERAL_CREATED}</td>
- <td {COLUMNHEADER}>{LANG_GENERAL_LASTPOST}</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>{P_LANG_MISC_BY} <IF {LINKLASTPOSTERID}><a href="memberlist.php?action=profile&amp;id={LINKLASTPOSTERID}">{LINKLASTPOSTERNAME}</a><ELSE>{LINKLASTPOSTERNAME}</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>{LANG_SUBSCRIPTIONS_CATEGORY}</p>
-<!-- BEGIN TOPLIST 2 -->
-<CONFIG>categories,id,500,descending,subscribers LIKE '%|||{MEMBERID}|||%'</CONFIG>
-<input type="checkbox" name="catids[]" value="{CATID}"> {CATNAME} ({CATNUMLINKS} {LANG_GENERAL_LINKS}) <br>
-<!-- END TOPLIST 2 -->
-<br>
-<input type="submit" value="{LANG_SUBSCRIPTIONS_CANCEL}" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > {LANG_TITLE_SUBSCRIPTIONS}</div>
+
+<form action="profile.php?filled=1&amp;id={MEMBERID}&amp;action=unsubscribe" method="post">
+<p>{LANG_SUBSCRIPTIONS_LINK}</p>
+<table width="96%" cellpadding="3" cellspacing="1" border="0">
+<tr>
+ <td {COLUMNHEADER}>&nbsp;</td>
+ <td {COLUMNHEADER}>{LANG_SEARCH_THREAD}</td>
+ <td {COLUMNHEADER}>{LANG_GENERAL_DESCRIPTION}</td>
+ <td {COLUMNHEADER}>{PALL_LANG_GENERAL_COMMENTS}</td>
+ <td {COLUMNHEADER}>{PALL_LANG_GENERAL_CREATED}</td>
+ <td {COLUMNHEADER}>{LANG_GENERAL_LASTPOST}</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>{P_LANG_MISC_BY} <IF {LINKLASTPOSTERID}><a href="memberlist.php?action=profile&amp;id={LINKLASTPOSTERID}">{LINKLASTPOSTERNAME}</a><ELSE>{LINKLASTPOSTERNAME}</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>{LANG_SUBSCRIPTIONS_CATEGORY}</p>
+<!-- BEGIN TOPLIST 2 -->
+<CONFIG>categories,id,500,descending,subscribers LIKE '%|||{MEMBERID}|||%'</CONFIG>
+<input type="checkbox" name="catids[]" value="{CATID}"> {CATNAME} ({CATNUMLINKS} {LANG_GENERAL_LINKS}) <br>
+<!-- END TOPLIST 2 -->
+<br>
+<input type="submit" value="{LANG_SUBSCRIPTIONS_CANCEL}" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/suggestcat.tpl wsnlinks/templates/multilingual/suggestcat.tpl
--- 400/templates/multilingual/suggestcat.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/suggestcat.tpl	2006-09-17 18:44:01.000000000 -0700
@@ -1,4 +1,4 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{NAVIGATION} > {LANG_TITLE_SUGGESTNEWCAT}</div>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{NAVIGATION} > {LANG_TITLE_SUGGESTNEWCAT}</div>
 
 <span class="important">{INCOMPLETE}</span>
 
@@ -27,7 +27,7 @@
 </tr>
 <tr>
  <td class="labelscolumn"><span class="labels">{LANG_GENERAL_DESCRIPTION}:</span>
-<IF {SWITCH_WYSIWYGDESCRIP}>
+<IF {SWITCH_WYSIDESCRIP}>
 <p align="center">
 <IF {THISMEMBERPOSTEDITOR} is WYSIWYG><input type="submit" name="switcheditor" value="{LANG_EDITCOM_SWITCHPLAIN}" class="button"></IF>
 <IF {THISMEMBERPOSTEDITOR} is plain><input type="submit" name="switcheditor" value="{LANG_EDITCOM_SWITCHWYSI}" class="button"></IF>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/suggestlink.tpl wsnlinks/templates/multilingual/suggestlink.tpl
--- 400/templates/multilingual/suggestlink.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/suggestlink.tpl	2006-09-17 18:44:27.000000000 -0700
@@ -18,7 +18,7 @@
 </script>
 
 
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{NAVIGATION} > {LANG_TITLE_SUGGESTNEWLINK}</div>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{NAVIGATION} > {LANG_TITLE_SUGGESTNEWLINK}</div>
 
 <IF {PREVIEWING}>
 <div class="comment">{PREVIEW}</div>
@@ -68,7 +68,7 @@
 </tr>
 <tr>
  <td class="labelscolumn"><span class="labels">{LANG_GENERAL_DESCRIPTION}:</span>
-<IF {SWITCH_WYSIWYGDESCRIP}>
+<IF {SWITCH_WYSIDESCRIP}>
 <p align="center">
 <IF {THISMEMBERPOSTEDITOR} is WYSIWYG><input type="submit" name="switcheditor" value="{LANG_EDITCOM_SWITCHPLAIN}" class="button"></IF>
 <IF {THISMEMBERPOSTEDITOR} is plain><input type="submit" name="switcheditor" value="{LANG_EDITCOM_SWITCHWYSI}" class="button"></IF>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/traderedit.tpl wsnlinks/templates/multilingual/traderedit.tpl
--- 400/templates/multilingual/traderedit.tpl	1969-12-31 16:00:00.000000000 -0800
+++ wsnlinks/templates/multilingual/traderedit.tpl	2006-09-21 19:21:35.000000000 -0700
@@ -0,0 +1,35 @@
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">{LANG_TITLE_MEMBERLIST}</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > <a href="trader.php?id={MEMBERID}">{LANG_TRADER_PROFILE}</a> > {LANG_TRADER_EDITFEEDBACK}</div><br>
+
+<form action="trader.php?action=edit&amp;filled=1&amp;id={RATINGID}&amp;mid={MEMBERID}" method="post">
+<table>
+<tr>
+ <td class="labelscolumn">{LANG_TRADER_DEALID}:</td>
+ <td class="optionscolumn"><input type="text" name="linkid" size="{STANDARDSIZE}" value="{RATINGLINKID}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn">{LANG_TRADER_WERETHE}:</td>
+ <td class="optionscolumn"><select name="type"><option value="buyer">{LANG_TRADER_BUYER}</option><option value="seller">{LANG_TRADER_SELLER}</option><option value="trader">{LANG_TRADER_TRADER}</option></select></td>
+</tr>
+<tr>
+ <td class="labelscolumn">{LANG_TRADER_EXPERIENCE}</td>
+ <td class="optionscolumn">
+<input type="radio" name="rating" value="0" {RATINGNEUCHECK}>  {LANG_TRADER_NEUTRAL}
+<input type="radio" name="rating" value="1" {RATINGPOSCHECK}> {LANG_TRADER_POSITIVE}
+<input type="radio" name="rating" value="-1" {RATINGNEGCHECK}> {LANG_TRADER_NEGATIVE}
+ </td>
+</tr>
+<tr>
+ <td class="labelscolumn">{LANG_TRADER_SUMMARYCOMMENTS}:</td>
+ <td class="optionscolumn"><input type="text" name="summary" size="{STANDARDSIZE}" maxlength="80" value="{RATINGSUMMARY}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn">{LANG_TRADER_ADDITIONALCOMMENTS}: <br><br>{LANG_TRADER_ADDITIONALCOMMENTSHELP}</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"> {LANG_TRADER_DELETE}
+<br><input type="submit" value="{LANG_TRADER_SUBMITRATING}" class="button"></td>
+</tr>
+</table>
+</form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/tradermain.tpl wsnlinks/templates/multilingual/tradermain.tpl
--- 400/templates/multilingual/tradermain.tpl	1969-12-31 16:00:00.000000000 -0800
+++ wsnlinks/templates/multilingual/tradermain.tpl	2006-09-21 18:48:34.000000000 -0700
@@ -0,0 +1,117 @@
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">{LANG_TITLE_MEMBERLIST}</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > {LANG_TRADER_PROFILE}</div><br>
+
+<p><span class="title">{LANG_TRADER_PROFILEOF} {MEMBERNAME}</span></p>
+
+<table width="100%">
+<tr>
+<td width="33%" valign="top" class="oddcolumns">
+<p align="center"><span class="labels">{LANG_TRADER_INFO}</span></p>
+
+<b>
+<br>{LANG_TRADER_SCORE}: {MEMBERTRADERRATING}
+<br>{LANG_TRADER_POS}: {POSITIVEPCT}%
+</b>
+<br>
+<br>{LANG_TRADER_LEFTPOS}: {POSITIVE}
+<br>{LANG_TRADER_LEFTNEG}: {NEGATIVE}
+<br>
+<p align="center"><a href="trader.php?action=add&amp;id={MEMBERID}">{LANG_TRADER_SUBMITFOR} {MEMBERNAME}</a></p>
+</td>
+
+<td width="33%" valign="top" class="evencolumns">
+<p align="center"><span class="labels">{LANG_TRADER_RECENT}</span></p>
+
+<table>
+<tr>
+ <td>&nbsp;</td>
+ <td>{LANG_TRADER_1MON}</td>
+ <td>{LANG_TRADER_6MON}</td>
+ <td>{LANG_TRADER_12MON}</td>
+</tr>
+<tr>
+ <td>{LANG_TRADER_POSITIVE}</td>
+ <td>{POSMON}</td>
+ <td>{POS6MON}</td>
+ <td>{POS12MON}</td>
+</tr>
+<tr>
+ <td>{LANG_TADER_NEUTRAL}</td>
+ <td>{NEUMON}</td>
+ <td>{NEU6MON}</td>
+ <td>{NEU12MON}</td>
+</tr>
+<tr>
+ <td>{LANG_TRADER_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">{LANG_PROFILE_CONTACTINFO}</span></p>
+
+<p><span class="labels">{LANG_PROFILE_JOINDATE}:</span> {MEMBERREGDATE}</p>
+
+<IF {MEMBERCANBEVIEWED}>
+<p>
+<span class="labels">{LANG_PROFILE_LASTSEEN}:</span> {MEMBERLASTVISITDATE}
+<IF {MEMBERISONLINE}>
+<!-- BEGIN TOPLIST 3 -->
+<CONFIG>online,time,1,descending,memberid={MEMBERID}</CONFIG>
+<br>{LANG_PROFILE_CURRENTLOCATION}: <a href="{ONLINELOCATION}">{ONLINEAREANAME}</a>
+<!-- END TOPLIST 3 -->
+</IF>
+</p>
+</IF>
+
+<IF {MEMBERALLOWUSEREMAIL} and {THISMEMBERGROUPCANEMAILMEMBERS} and {MEMBERHASEMAIL}>
+<p><span class="labels">{LANG_GENERAL_EMAIL}:</span> <a href="emailmember.php?id={MEMBERID}">{LANG_EMAILMEMBER_LINK}</a></p>
+</IF>
+
+<IF {SWITCH_PM} and {MEMBERACCEPTPMS}><p><span class="labels">{LANG_PROFILE_PM}:</span> <a href="privatemessaging.php?action=send&amp;sendto={MEMBERID}">{LANG_PROFILE_SENDPM}</a></p></IF>
+
+<IF {MEMBERREADYTOCHAT}>
+<p><span class="labels">{LANG_PROFILE_IMING}:</span> <a href="im.php?with={MEMBERID}" target="win" onClick="window.open('','win','{IMDIMENSIONS}');">{LANG_PROFILE_IMTHEM}</a></p></IF>
+
+<p><IF {MEMBERAIM}>{LANG_PROFILE_AIM}: {MEMBERAIM}<br></IF>
+<IF {MEMBERICQ}>{LANG_PROFILE_ICQ}: {MEMBERICQ}<br></IF>
+<IF {MEMBERMSN}>{LANG_PROFILE_MSN}: {MEMBERMSN}<br></IF>
+<IF {MEMBERYAHOO}>{LANG_PROFILE_YIM}: {MEMBERYAHOO}</IF></p>
+
+</td>
+</tr>
+</table>
+
+<IF {TOTAL}>
+<p><IF {VTYPE}><a href="trader.php?id={MEMBERID}">{LANG_TRADER_ALLFEEDBACK}</a><ELSE>{LANG_TRADER_ALLFEEDBACK}</IF> | <IF {VTYPE} is buyer>{LANG_TRADER_FROMBUYERS}<ELSE><a href="trader.php?id={MEMBERID}&amp;vtype=buyer">{LANG_TRADER_FROMBUYERS}</a></IF> | <IF {VTYPE} is seller>{LANG_TRADER_FROMSELLERS}<ELSE><a href="trader.php?id={MEMBERID}&amp;vtype=seller">{LANG_TRADER_FROMSELLERS}</a></IF> | <IF {VTYPE} is trader>{LANG_TRADER_FROMTRADES}<ELSE><a href="trader.php?id={MEMBERID}&amp;vtype=trader">{LANG_TRADER_FROMTRADES}</a></IF> | <IF {VTYPE} is left>{LANG_TRADER_LEFT}<ELSE><a href="trader.php?id={MEMBERID}&amp;vtype=left">{LANG_TRADER_LEFT}</a></IF></p>
+<table width="100%">
+<tr>
+ <td {COLUMNHEADER}> &nbsp; </td>
+ <td {COLUMNHEADER}>{LANG_TRADER_SUMMARY}</td>
+ <td {COLUMNHEADER}>{LANG_TRADER_OPTIONS}</td>
+ <td {COLUMNHEADER}>{LANG_TRADER_FROM}</td>
+ <td {COLUMNHEADER}>{LANG_TRADER_DATE}</td>
+ <IF {RATINGCANVIEWFULL}><td {COLUMNHEADER}>{LANG_TRADER_FULL}</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="{LANG_TRADER_EDITRATING}"></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="{LANG_TRADER_REPORTRATING}"></a>
+</IF>
+ </td>
+ <td class="evencolumns"><IF {RATINGTYPE} is buyer>{LANG_TRADER_BUYER}<ELSE IF {RATINGTYPE} is seller>{LANG_TRADER_SELLER}<ELSE IF {RATINGTYPE} is trader>{LANG_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/multilingual/traderreport.tpl wsnlinks/templates/multilingual/traderreport.tpl
--- 400/templates/multilingual/traderreport.tpl	1969-12-31 16:00:00.000000000 -0800
+++ wsnlinks/templates/multilingual/traderreport.tpl	2006-09-21 19:23:38.000000000 -0700
@@ -0,0 +1,6 @@
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">{LANG_TITLE_MEMBERLIST}</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > <a href="trader.php?id={MEMBERID}">{LANG_TRADER_PROFILE}</a> > {LANG_TRADER_REPORTBAD}</div><br>
+
+<form action="trader.php?action=report&amp;filled=1&amp;id={RATINGID}" method="post">
+<br>{LANG_TRADER_DESCRIBE}: <br><textarea name="reportproblem" rows="3" cols="60"></textarea>
+<br><input type="submit" value="{LANG_TRADER_SUBMITREPORT}" class="button">
+</form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/tradersubmit.tpl wsnlinks/templates/multilingual/tradersubmit.tpl
--- 400/templates/multilingual/tradersubmit.tpl	1969-12-31 16:00:00.000000000 -0800
+++ wsnlinks/templates/multilingual/tradersubmit.tpl	2006-09-21 19:21:41.000000000 -0700
@@ -0,0 +1,34 @@
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">{LANG_TITLE_MEMBERLIST}</a> > <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > <a href="trader.php?id={MEMBERID}">{LANG_TRADER_PROFILE}</a> > {LANG_TRADER_ADDFEEDBACK}</div><br>
+
+<form action="trader.php?action=add&amp;filled=1&amp;id={MEMBERID}" method="post">
+<table>
+<tr>
+ <td class="labelscolumn">{LANG_TRADER_DETAILSURL}:</td>
+ <td class="optionscolumn"><input type="text" name="linkurl" size="{STANDARDSIZE}"></td>
+</tr>
+<tr>
+ <td class="labelscolumn">{LANG_TRADER_WERETHE}:</td>
+ <td class="optionscolumn"><select name="type"><option value="buyer">{LANG_TRADER_BUYER}</option><option value="seller">{LANG_TRADER_SELLER}</option><option value="trader">{LANG_TRADER_TRADER}</option></select></td>
+</tr>
+<tr>
+ <td class="labelscolumn">{LANG_TRADER_EXPERIENCE}</td>
+ <td class="optionscolumn">
+<input type="radio" name="rating" value="0" checked> {LANG_TRADER_NEUTRAL}
+<input type="radio" name="rating" value="1"> {LANG_TRADER_POSITIVE}
+<input type="radio" name="rating" value="-1"> {LANG_TRADER_NEGATIVE}
+ </td>
+</tr>
+<tr>
+ <td class="labelscolumn">{LANG_TRADER_SUMMARYCOMMENTS}:</td>
+ <td class="optionscolumn"><input type="text" name="summary" size="{STANDARDSIZE}" maxlength="80"></td>
+</tr>
+<tr>
+ <td class="labelscolumn">{LANG_TRADER_ADDITIONALCOMMENTS}: <br><br>{LANG_TRADER_ADDITIONALCOMMENTSHELP}</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="{LANG_TRADER_SUBMITRATING}" class="button"></td>
+</tr>
+</table>
+</form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/usernotes.tpl wsnlinks/templates/multilingual/usernotes.tpl
--- 400/templates/multilingual/usernotes.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/usernotes.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,120 +1,120 @@
-<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> > {LANG_TITLE_MODNOTES}</div><br>
-
-<p>{LANG_USERNOTES_ON} <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a>:</p>
-
-<table width="100%">
-<!-- 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="{LANG_MEMBERLIST_AVATAR}"> <br> </IF>
-
-<br><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}
-<br><span class="labels">{LANG_COMMENTS_JOINED}:</span> {MEMBERREGDATE}
-<IF {MEMBERLOCATION}><br><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</IF>
-<br>
-
-<IF {THISMEMBERISREGISTERED}>
-<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_TOTAL}:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERPOSTS}</a>
-<ELSE>
-<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</span> {MEMBERTOPICS}
-<br><span class="labels">{LANG_COMMENTS_TOTAL}:</span> {MEMBERPOSTS}
-</IF>
-
-</IF>
-
-<IF {THISMEMBERGROUPCANVIEWIP}><br><br>{LANG_SUGGESTLINK_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">
-{LANG_COMMENTS_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="{LANG_COMMENTS_QUOTEPOST}"></a> <br>#{COMMENTNUMBER}</td>
-  </tr>
-  <tr valign="middle">
-   <td height="100%" valign="top">{COMMENTMESSAGE}
-   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">{COMMENTS_EDITEDBY} {COMMENTLASTEDITBY} {LANG_MISC_ON} {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. {LANG_GENERAL_REASON}: {COMMENTEDITREASON}</IF></span></IF>
-   </td>
-  </tr>
-  <tr valign="bottom">
-   <td valign="bottom">
-<IF {COMMENTNUMATTACHMENTS}>
-<br>{LANG_SHOWLINKS_ATTACHED}:<br>
-<table>
-<tr>
-<!-- BEGIN ATTACHMENTS -->
-<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_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}>
-<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<span class="important">{INCOMPLETE}</span>
-
-<p>{LANG_USERNOTES_NEW}:</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">{LANG_USERNOTES_YOURNOTE}:</span>
-<br><br>
-<center>
-<div class="smiliebox">
-<!-- BEGIN SMILIES -->
-<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
-<!-- END SMILIES -->
-</div>
-</center>
-<br>{LANG_COMMENTS_MESSAGEHELP}</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="{LANG_USERNOTES_POST}" 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> > {LANG_TITLE_MODNOTES}</div><br>
+
+<p>{LANG_USERNOTES_ON} <a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a>:</p>
+
+<table width="100%">
+<!-- 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="{LANG_MEMBERLIST_AVATAR}"> <br> </IF>
+
+<br><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}
+<br><span class="labels">{LANG_COMMENTS_JOINED}:</span> {MEMBERREGDATE}
+<IF {MEMBERLOCATION}><br><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</IF>
+<br>
+
+<IF {THISMEMBERISREGISTERED}>
+<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_TOTAL}:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERPOSTS}</a>
+<ELSE>
+<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</span> {MEMBERTOPICS}
+<br><span class="labels">{LANG_COMMENTS_TOTAL}:</span> {MEMBERPOSTS}
+</IF>
+
+</IF>
+
+<IF {THISMEMBERGROUPCANVIEWIP}><br><br>{LANG_SUGGESTLINK_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">
+{LANG_COMMENTS_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="{LANG_COMMENTS_QUOTEPOST}"></a> <br>#{COMMENTNUMBER}</td>
+  </tr>
+  <tr valign="middle">
+   <td height="100%" valign="top">{COMMENTMESSAGE}
+   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">{COMMENTS_EDITEDBY} {COMMENTLASTEDITBY} {LANG_MISC_ON} {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. {LANG_GENERAL_REASON}: {COMMENTEDITREASON}</IF></span></IF>
+   </td>
+  </tr>
+  <tr valign="bottom">
+   <td valign="bottom">
+<IF {COMMENTNUMATTACHMENTS}>
+<br>{LANG_SHOWLINKS_ATTACHED}:<br>
+<table>
+<tr>
+<!-- BEGIN ATTACHMENTS -->
+<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_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}>
+<p>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<span class="important">{INCOMPLETE}</span>
+
+<p>{LANG_USERNOTES_NEW}:</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">{LANG_USERNOTES_YOURNOTE}:</span>
+<br><br>
+<center>
+<div class="smiliebox">
+<!-- BEGIN SMILIES -->
+<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
+<!-- END SMILIES -->
+</div>
+</center>
+<br>{LANG_COMMENTS_MESSAGEHELP}</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="{LANG_USERNOTES_POST}" class="button"></td>
+</tr>
+</table>
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/viewcomments.tpl wsnlinks/templates/multilingual/viewcomments.tpl
--- 400/templates/multilingual/viewcomments.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/viewcomments.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,223 +1,223 @@
-<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="{LINKDETAILSURL}">{LINKTITLE}</a> > {LANG_TITLE_COMMENTS}</div><br>
-
-<p>{LANG_COMMENTS_ABOUT} <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a>:</p>
-
-<IF {LINKDELETED}><div class="details">{LANG_COMMENTS_THREADDELETED}</div></IF>
-
-<IF {LINKCANEDIT}>
-<br><form action="threadadmin.php">
-<input type="hidden" name="id" value="{LINKID}">
-{LANG_COMMENTS_THREADTOOLS}:<br> <select name="action">
-<IF {THISMEMBERISADMIN} or {CATISMODERATOR}>
-<option value="close"><IF {LINKTHREADCLOSED}>{LANG_MISC_OPEN}<ELSE>{LANG_MISC_CLOSE}</IF> {LANG_SEARCH_THREAD}</option>
-<option value="bulkedit">{LANG_COMMENTS_EMD}</option>
-</IF>
-<IF {THISMEMBERGROUPCANVIEWDELETED}>
-<option value="showdeleted">{LANG_COMMENTS_SHOWDELETED} ({LINKDELETEDPOSTS})</option>
-</IF>
-<IF {THISMEMBERISADMIN}>
-<option value="regeneratethread">{LANG_COMMENTS_REGEN}</option>
-</IF>
-</select>
-<input type="submit" value="{LANG_GENERAL_GO}" class="button">
-</form>
-</IF>
-
-<table width="100%">
-<tr>
- <td align="left">
-| <a href="printthread.php?id={LINKID}">{LANG_COMMENTS_PRINT}</a> | <IF {SWITCH_ALBUMS} and {THISMEMBERISREGISTERED}><a href="albums.php?add={LINKID}">{LANG_SHOWLINKS_ADDTOLIST}</a> | </IF>
-<IF {THISMEMBERISREGISTERED} and {SWITCH_SUBSCRIPTIONS}>
-<IF {THISMEMBERSUBSCRIBEDTO[{LINKID}]}><a href="comments.php?id={LINKID}&amp;action=subscribe">{LANG_COMMENTS_UNSUBSCRIBELINK}</a><OTHERWISE>
-<a href="comments.php?id={LINKID}&amp;action=subscribe">{LANG_COMMENTS_SUBSCRIBELINK}</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="{LANG_COMMENTS_POSTREPLY}"></a></p></IF>
- </td>
-</tr>
-</table>
-
-<IF {MULTIPAGE}>
-<p>{LANG_GENERAL_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"> {LANG_TITLE_COMMENTS}"</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="{LANG_MEMBERLIST_AVATAR}"> <br> </IF>
-
-<br><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}
-<br><span class="labels">{LANG_COMMENTS_JOINED}:</span> {MEMBERREGDATE}
-<IF {MEMBERLOCATION}><br><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</IF>
-<br>
-
-<IF {THISMEMBERISREGISTERED}>
-<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_TOTAL}:</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">{LANG_COMMENTS_LINKSTOTAL}:</span> {MEMBERLINKS}
-<br><span class="labels">{LANG_COMMENTS_TOTAL}:</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="{LANG_COMMENTS_REPORT}"></a></IF>
-
-<IF {SWITCH_RATINGS} and {THISMEMBERGROUPCANRATECOMMENTS}>
-<br><br>{LANG_COMMENTS_RATE}: <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="{LANG_GENERAL_APPROVE}"></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="{LANG_GENERAL_DISAPPROVE}"></a>
-</IF>
-
-<IF {THISMEMBERGROUPCANVIEWIP}><br><br>{LANG_SUGGESTLINK_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} {LANG_MISC_OF}  {COMMENTVOTES} {LANG_COMMENTS_FOUNDHELPFUL}<br></IF>
-{LANG_COMMENTS_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="{LANG_EDITCOM_EDIT}"></a></IF> 
-<IF {COMMENTTITLE}><br>{COMMENTICONIMAGE} {LANG_GENERAL_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="{LANG_COMMENTS_QUOTEPOST}"></a> <br>#{COMMENTNUMBER}</td>
-  </tr>
-  <tr valign="middle">
-   <td height="100%" valign="top">{COMMENTMESSAGE}
-   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">{LANG_COMMENTS_EDITEDBY} {COMMENTLASTEDITBY} {LANG_MISC_ON} {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. {LANG_GENERAL_REASON}: {COMMENTEDITREASON}</IF></span></IF>
-   </td>
-  </tr>
-  <tr valign="bottom">
-   <td valign="bottom">
-<IF {COMMENTNUMATTACHMENTS}>
-<br>{LANG_SHOWLINKS_ATTACHED}:<br>
-<table>
-<tr>
-<!-- BEGIN ATTACHMENTS -->
-<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_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>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
-</IF>
-
-<a name="commentarea"></a>
-
-<IF {LINKCANPOST}>
-<p>{LANG_COMMENTS_QUICKREPLY}:</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">
-<input type="hidden" name="type" value="regular">
-<table>
-<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> {LANG_COMMENTS_QUICKREPLY}</td></tr>
-<IF {THISMEMBERUSERGROUP} is 1>
-<tr>
- <td class="labelscolumn"><span class="labels">{LANG_COMMENTS_YOURNAME}:</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">{LANG_COMMENTS_YOURCOMMENT}:</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>{LANG_COMMENTS_MESSAGEHELPWYSI}<ELSE>{LANG_COMMENTS_MESSAGEHELP}</IF>
-</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">{LANG_GENERAL_SECURITYIMAGE}:</span>
-<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
- <td class="optionscolumn"><img src="securityimage.php" alt="{LANG_ALT_SECIMAGE}" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
-</tr>
-</IF>
-</table>
-<input type="hidden" name="linkid" value="{LINKID}">
-<input type="submit" value="{LANG_COMMENTS_POST}" class="button"> <input type="submit" name="preview" value="{LANG_COMMENTS_ADVANCED}" class="button">
-</form>
-<OTHERWISE>
-<IF {LINKTHREADCLOSED}>
-<p>{LANG_COMMENTS_THREADCLOSED}</p>
-<OTHERWISE>
-<p>{LANG_COMMENTS_CANTPOST}</p> 
-<IF {CATREQLINKS} or {CATREQCOMS}>
-<p>{LANG_COMMENTS_NOTENOUGH}</p>
-</IF>
-<IF {THISMEMBERISGUEST}>{LANG_COMMENTS_PLEASEREGISTER}</IF>
-</IF>
-</IF>
-
-<IF {SWITCH_ONLINEUSERS}>
-<br><br>{LANG_COMMENTS_ONLINE}: 
-<!-- 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 -->
+<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="{LINKDETAILSURL}">{LINKTITLE}</a> > {LANG_TITLE_COMMENTS}</div><br>
+
+<p>{LANG_COMMENTS_ABOUT} <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a>:</p>
+
+<IF {LINKDELETED}><div class="details">{LANG_COMMENTS_THREADDELETED}</div></IF>
+
+<IF {LINKCANEDIT}>
+<br><form action="threadadmin.php">
+<input type="hidden" name="id" value="{LINKID}">
+{LANG_COMMENTS_THREADTOOLS}:<br> <select name="action">
+<IF {THISMEMBERISADMIN} or {CATISMODERATOR}>
+<option value="close"><IF {LINKTHREADCLOSED}>{LANG_MISC_OPEN}<ELSE>{LANG_MISC_CLOSE}</IF> {LANG_SEARCH_THREAD}</option>
+<option value="bulkedit">{LANG_COMMENTS_EMD}</option>
+</IF>
+<IF {THISMEMBERGROUPCANVIEWDELETED}>
+<option value="showdeleted">{LANG_COMMENTS_SHOWDELETED} ({LINKDELETEDPOSTS})</option>
+</IF>
+<IF {THISMEMBERISADMIN}>
+<option value="regeneratethread">{LANG_COMMENTS_REGEN}</option>
+</IF>
+</select>
+<input type="submit" value="{LANG_GENERAL_GO}" class="button">
+</form>
+</IF>
+
+<table width="100%">
+<tr>
+ <td align="left">
+| <a href="printthread.php?id={LINKID}">{LANG_COMMENTS_PRINT}</a> | <IF {SWITCH_ALBUMS} and {THISMEMBERISREGISTERED}><a href="albums.php?add={LINKID}">{LANG_SHOWLINKS_ADDTOLIST}</a> | </IF>
+<IF {THISMEMBERISREGISTERED} and {SWITCH_SUBSCRIPTIONS}>
+<IF {THISMEMBERSUBSCRIBEDTO[{LINKID}]}><a href="comments.php?id={LINKID}&amp;action=subscribe">{LANG_COMMENTS_UNSUBSCRIBELINK}</a><OTHERWISE>
+<a href="comments.php?id={LINKID}&amp;action=subscribe">{LANG_COMMENTS_SUBSCRIBELINK}</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="{LANG_COMMENTS_POSTREPLY}"></a></p></IF>
+ </td>
+</tr>
+</table>
+
+<IF {MULTIPAGE}>
+<p>{LANG_GENERAL_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"> {LANG_TITLE_COMMENTS}"</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="{LANG_MEMBERLIST_AVATAR}"> <br> </IF>
+
+<br><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}
+<br><span class="labels">{LANG_COMMENTS_JOINED}:</span> {MEMBERREGDATE}
+<IF {MEMBERLOCATION}><br><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</IF>
+<br>
+
+<IF {THISMEMBERISREGISTERED}>
+<br><span class="labels">{LANG_COMMENTS_LINKSTOTAL}:</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">{LANG_COMMENTS_TOTAL}:</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">{LANG_COMMENTS_LINKSTOTAL}:</span> {MEMBERLINKS}
+<br><span class="labels">{LANG_COMMENTS_TOTAL}:</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="{LANG_COMMENTS_REPORT}"></a></IF>
+
+<IF {SWITCH_RATINGS} and {THISMEMBERGROUPCANRATECOMMENTS}>
+<br><br>{LANG_COMMENTS_RATE}: <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="{LANG_GENERAL_APPROVE}"></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="{LANG_GENERAL_DISAPPROVE}"></a>
+</IF>
+
+<IF {THISMEMBERGROUPCANVIEWIP}><br><br>{LANG_SUGGESTLINK_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} {LANG_MISC_OF}  {COMMENTVOTES} {LANG_COMMENTS_FOUNDHELPFUL}<br></IF>
+{LANG_COMMENTS_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="{LANG_EDITCOM_EDIT}"></a></IF> 
+<IF {COMMENTTITLE}><br>{COMMENTICONIMAGE} {LANG_GENERAL_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="{LANG_COMMENTS_QUOTEPOST}"></a> <br>#{COMMENTNUMBER}</td>
+  </tr>
+  <tr valign="middle">
+   <td height="100%" valign="top">{COMMENTMESSAGE}
+   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">{LANG_COMMENTS_EDITEDBY} {COMMENTLASTEDITBY} {LANG_MISC_ON} {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. {LANG_GENERAL_REASON}: {COMMENTEDITREASON}</IF></span></IF>
+   </td>
+  </tr>
+  <tr valign="bottom">
+   <td valign="bottom">
+<IF {COMMENTNUMATTACHMENTS}>
+<br>{LANG_SHOWLINKS_ATTACHED}:<br>
+<table>
+<tr>
+<!-- BEGIN ATTACHMENTS -->
+<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} {LANG_GENERAL_KB}, {ATTACHDOWNLOADS} {LANG_DETAILS_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="{LANG_GENERAL_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>{LANG_GENERAL_PAGE}: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}</p>
+</IF>
+
+<a name="commentarea"></a>
+
+<IF {LINKCANPOST}>
+<p>{LANG_COMMENTS_QUICKREPLY}:</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">
+<input type="hidden" name="type" value="regular">
+<table>
+<tr><td colspan="2" class="tableheader"><img src="{TEMPLATESDIR}/images/icon_general.gif" alt="options"> {LANG_COMMENTS_QUICKREPLY}</td></tr>
+<IF {THISMEMBERUSERGROUP} is 1>
+<tr>
+ <td class="labelscolumn"><span class="labels">{LANG_COMMENTS_YOURNAME}:</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">{LANG_COMMENTS_YOURCOMMENT}:</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>{LANG_COMMENTS_MESSAGEHELPWYSI}<ELSE>{LANG_COMMENTS_MESSAGEHELP}</IF>
+</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">{LANG_GENERAL_SECURITYIMAGE}:</span>
+<br>{LANG_GENERAL_SECURITYIMAGEHELP}</td>
+ <td class="optionscolumn"><img src="securityimage.php" alt="{LANG_ALT_SECIMAGE}" class="bullet"> <input type="text" name="securityimage" size="4" maxlength="4"> </td>
+</tr>
+</IF>
+</table>
+<input type="hidden" name="linkid" value="{LINKID}">
+<input type="submit" value="{LANG_COMMENTS_POST}" class="button"> <input type="submit" name="preview" value="{LANG_COMMENTS_ADVANCED}" class="button">
+</form>
+<OTHERWISE>
+<IF {LINKTHREADCLOSED}>
+<p>{LANG_COMMENTS_THREADCLOSED}</p>
+<OTHERWISE>
+<p>{LANG_COMMENTS_CANTPOST}</p> 
+<IF {CATREQLINKS} or {CATREQCOMS}>
+<p>{LANG_COMMENTS_NOTENOUGH}</p>
+</IF>
+<IF {THISMEMBERISGUEST}>{LANG_COMMENTS_PLEASEREGISTER}</IF>
+</IF>
+</IF>
+
+<IF {SWITCH_ONLINEUSERS}>
+<br><br>{LANG_COMMENTS_ONLINE}: 
+<!-- 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>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/viewprofile.tpl wsnlinks/templates/multilingual/viewprofile.tpl
--- 400/templates/multilingual/viewprofile.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/viewprofile.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,132 +1,132 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">{LANG_TITLE_MEMBERLIST}</a> > {MEMBERNAME}</div><br>
-
-<p><span class="title">{LANG_PROFILE_OF} {MEMBERNAME}</span></p>
-
-<IF {MEMBERBANNED}><b><i>{LANG_PROFILE_BANNED}</i></b></IF>
-
-<IF {THISMEMBERISADMIN} or {THISMEMBERGROUPCANVIEWDELETED} or {THISMEMBERGROUPCANVIEWMODLOG}>
-<br>
-<form action="redirecttourl.php">
-{LANG_PROFILE_ADMINOPS}: 
-<select name="destination">
-<IF {THISMEMBERGROUPCANEDITALLPROFILES}>
- <option value="edit.php?action=member&amp;field=id&amp;condition=equals&amp;fieldvalue={MEMBERID}">{LANG_PROFILE_EDIT}</option></IF>
-<IF {THISMEMBERISADMIN}>
- <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}">{LANG_PROFILE_BAN}</option>
- <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}&amp;partial=1">{LANG_PROFILE_PARTIALBAN}</option>
- <option value="[IFADMINadmin/]useradmin.php?action=suspend&amp;id={MEMBERID}">{LANG_PROFILE_SUSPEND}</option>
-</IF>
-<option value="usernotes.php?id={MEMBERID}&amp;modnote=1">{LANG_PROFILE_MODNOTES} ({MEMBERMODNOTES})</option>
-<IF {THISMEMBERGROUPCANVIEWMODLOG}>
- <option value="modlog.php?action=modlogon&amp;id={MEMBERID}">{LANG_PROFILE_MODHISTORY}</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">{LANG_PROFILE_DELLIN}</option>
- <option value="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;deletedonly=1">{LANG_PROFILE_DELCOM}</option>
-</IF>
-<IF {THISMEMBERISADMIN}>
- <option value="[IFADMINadmin/]updatecounters.php?filled=1&amp;regenone=1&amp;action=members&amp;id={MEMBERID}">{LANG_PROFILE_REGEN}</option>
-</IF>
-</select>
-<input type="submit" value="{LANG_GENERAL_GO}" class="button">
-</form>
-<br>
-</IF>
-
-<IF {MEMBERCANBEVIEWED}>
-<p>
-{LANG_PROFILE_LASTSEEN}: {MEMBERLASTVISITDATE}
-<IF {MEMBERISONLINE}>
-<!-- BEGIN TOPLIST 3 -->
-<CONFIG>online,time,1,descending,memberid={MEMBERID}</CONFIG>
-<br>{LANG_PROFILE_CURRENTLOCATION}: <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">{LANG_PROFILE_CONTACTINFO}</span></p>
-
-
-<IF {MEMBERALLOWUSEREMAIL} and {THISMEMBERGROUPCANEMAILMEMBERS} and {MEMBERHASEMAIL}>
-<p><span class="labels">{LANG_GENERAL_EMAIL}:</span> <a href="emailmember.php?id={MEMBERID}">{LANG_EMAILMEMBER_LINK}</a></p>
-</IF>
-
-<IF {SWITCH_GUESTBOOK}><p><span class="labels">{LANG_PROFILE_GUESTBOOK}:</span> <a href="usernotes.php?id={MEMBERID}">{LANG_PROFILE_GUESTBOOKVIEW} ({MEMBERGUESTNOTES})</a></p></IF>
-
-<IF {SWITCH_PM} and {MEMBERACCEPTPMS}><p><span class="labels">{LANG_PROFILE_PM}:</span> <a href="privatemessaging.php?action=send&amp;sendto={MEMBERID}">{LANG_PROFILE_SENDPM}</a></p></IF>
-
-<IF {MEMBERREADYTOCHAT}>
-<p><span class="labels">{LANG_PROFILE_IMING}:</span> <a href="im.php?with={MEMBERID}" target="win" onClick="window.open('','win','{IMDIMENSIONS}');">{LANG_PROFILE_IMTHEM}</a></p></IF>
-
-<p><IF {MEMBERAIM}>{LANG_PROFILE_AIM}: {MEMBERAIM}<br></IF>
-<IF {MEMBERICQ}>{LANG_PROFILE_ICQ}: {MEMBERICQ}<br></IF>
-<IF {MEMBERMSN}>{LANG_PROFILE_MSN}: {MEMBERMSN}<br></IF>
-<IF {MEMBERYAHOO}>{LANG_PROFILE_YIM}: {MEMBERYAHOO}</IF></p>
-
-</td>
-<td width="50%" valign="top" class="evencolumns">
-<p align="center"><span class="labels">{LANG_PROFILE_BIOINFO}</span></p>
-
-<IF {MEMBERLOCATION}><p><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</p></IF>
-
-<IF {MEMBERHOMEPAGE}><p><span class="labels">{LANG_EDITPROFILE_HOMEPAGE}:</span> <a href="{MEMBERHOMEPAGE}">{MEMBERHOMEPAGE}</a></p></IF>
-
-<IF {MEMBEROCCUPATION}><p><span class="labels">{LANG_EDITPROFILE_OCCUPATION}:</span> {MEMBEROCCUPATION}</p></IF>
-
-<IF {MEMBERBIRTHDAY}><p><span class="labels">{LANG_EDITPROFILE_BIRTHDATE}:</span> {MEMBERBIRTHMONTHNAME} {MEMBERBIRTHDAY}<IF {MEMBERBIRTHYEAR}>, {MEMBERBIRTHYEAR} ({MEMBERAGE} {LANG_PROFILE_YEARSOLD})</IF></p></IF>
-
-<IF {MEMBERHASBIO}><p><span class="labels">{LANG_EDITPROFILE_BIO}:</span> {MEMBERBIO}</p></IF>
-
-</td>
-</tr>
-<tr>
-<td width="50%" valign="top" class="evencolumns">
-<p align="center"><span class="labels">{LANG_PROFILE_STATUS}</span></p>
-
-<p><span class="labels">{LANG_PROFILE_JOINDATE}:</span> {MEMBERREGDATE}</p>
-
-<p><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}</p>
-
-<IF {SWITCH_MEMBERRATINGS}><p><span class="labels">{PALL_LANG_GENERAL_RATING}:</span> {MEMBERRATING}</p></IF>
-
-<p><span class="labels">{LANG_PROFILE_LINKS}:</span> {MEMBERLINKS} {LANG_GENERAL_LINKS}<IF {SWITCH_MEMBERHITS}>, {LANG_MISC_WITH} {MEMBERTOTALHITSIN} {LANG_GENERAL_HITSIN} {LANG_MISC_AND} {MEMBERTOTALHITS} {LANG_GENERAL_HITSOUT}</IF>
-
-<IF {SWITCH_COMMENTS}><p><span class="labels">{LANG_COMMENTS_TOTAL}:</span> {MEMBERCOMMENTS} ({MEMBERCOMMENTSPERDAY} {LANG_GENERAL_PERDAY})</p></IF>
-
-<IF {SWITCH_TIMEONLINE}><p><span class="labels">{PALL_LANG_GENERAL_TOTALTIME}:</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">{LANG_PROFILE_HISTORY}</span></p>
-
-<IF {TOPLISTTOTAL1}><p><span class="labels">{LANG_PROFILE_RECENTLINKS}:</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}">{LANG_PROFILE_FINDLINKS} {MEMBERNAME}</a><br>
-</IF>
-
-<IF {TOPLISTTOTAL2}><p><span class="labels">{LANG_PROFILE_RECENTCOMMENTS}:</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}">{LANG_PROFILE_FINDCOMMENTS} {MEMBERNAME}</a>
-</IF>
-
-<IF {THISMEMBERGROUPCANVIEWIP}><p>{LANG_PROFILE_IP}: {MEMBERIP}</p></IF>
-
-</td>
-</tr>
-</table>
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">{LANG_TITLE_MEMBERLIST}</a> > {MEMBERNAME}</div><br>
+
+<p><span class="title">{LANG_PROFILE_OF} {MEMBERNAME}</span></p>
+
+<IF {MEMBERBANNED}><b><i>{LANG_PROFILE_BANNED}</i></b></IF>
+
+<IF {THISMEMBERISADMIN} or {THISMEMBERGROUPCANVIEWDELETED} or {THISMEMBERGROUPCANVIEWMODLOG}>
+<br>
+<form action="redirecttourl.php">
+{LANG_PROFILE_ADMINOPS}: 
+<select name="destination">
+<IF {THISMEMBERGROUPCANEDITALLPROFILES}>
+ <option value="edit.php?action=member&amp;field=id&amp;condition=equals&amp;fieldvalue={MEMBERID}">{LANG_PROFILE_EDIT}</option></IF>
+<IF {THISMEMBERISADMIN}>
+ <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}">{LANG_PROFILE_BAN}</option>
+ <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}&amp;partial=1">{LANG_PROFILE_PARTIALBAN}</option>
+ <option value="[IFADMINadmin/]useradmin.php?action=suspend&amp;id={MEMBERID}">{LANG_PROFILE_SUSPEND}</option>
+</IF>
+<option value="usernotes.php?id={MEMBERID}&amp;modnote=1">{LANG_PROFILE_MODNOTES} ({MEMBERMODNOTES})</option>
+<IF {THISMEMBERGROUPCANVIEWMODLOG}>
+ <option value="modlog.php?action=modlogon&amp;id={MEMBERID}">{LANG_PROFILE_MODHISTORY}</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">{LANG_PROFILE_DELLIN}</option>
+ <option value="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;deletedonly=1">{LANG_PROFILE_DELCOM}</option>
+</IF>
+<IF {THISMEMBERISADMIN}>
+ <option value="[IFADMINadmin/]updatecounters.php?filled=1&amp;regenone=1&amp;action=members&amp;id={MEMBERID}">{LANG_PROFILE_REGEN}</option>
+</IF>
+</select>
+<input type="submit" value="{LANG_GENERAL_GO}" class="button">
+</form>
+<br>
+</IF>
+
+<IF {MEMBERCANBEVIEWED}>
+<p>
+{LANG_PROFILE_LASTSEEN}: {MEMBERLASTVISITDATE}
+<IF {MEMBERISONLINE}>
+<!-- BEGIN TOPLIST 3 -->
+<CONFIG>online,time,1,descending,memberid={MEMBERID}</CONFIG>
+<br>{LANG_PROFILE_CURRENTLOCATION}: <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">{LANG_PROFILE_CONTACTINFO}</span></p>
+
+
+<IF {MEMBERALLOWUSEREMAIL} and {THISMEMBERGROUPCANEMAILMEMBERS} and {MEMBERHASEMAIL}>
+<p><span class="labels">{LANG_GENERAL_EMAIL}:</span> <a href="emailmember.php?id={MEMBERID}">{LANG_EMAILMEMBER_LINK}</a></p>
+</IF>
+
+<IF {SWITCH_GUESTBOOK}><p><span class="labels">{LANG_PROFILE_GUESTBOOK}:</span> <a href="usernotes.php?id={MEMBERID}">{LANG_PROFILE_GUESTBOOKVIEW} ({MEMBERGUESTNOTES})</a></p></IF>
+
+<IF {SWITCH_PM} and {MEMBERACCEPTPMS}><p><span class="labels">{LANG_PROFILE_PM}:</span> <a href="privatemessaging.php?action=send&amp;sendto={MEMBERID}">{LANG_PROFILE_SENDPM}</a></p></IF>
+
+<IF {MEMBERREADYTOCHAT}>
+<p><span class="labels">{LANG_PROFILE_IMING}:</span> <a href="im.php?with={MEMBERID}" target="win" onClick="window.open('','win','{IMDIMENSIONS}');">{LANG_PROFILE_IMTHEM}</a></p></IF>
+
+<p><IF {MEMBERAIM}>{LANG_PROFILE_AIM}: {MEMBERAIM}<br></IF>
+<IF {MEMBERICQ}>{LANG_PROFILE_ICQ}: {MEMBERICQ}<br></IF>
+<IF {MEMBERMSN}>{LANG_PROFILE_MSN}: {MEMBERMSN}<br></IF>
+<IF {MEMBERYAHOO}>{LANG_PROFILE_YIM}: {MEMBERYAHOO}</IF></p>
+
+</td>
+<td width="50%" valign="top" class="evencolumns">
+<p align="center"><span class="labels">{LANG_PROFILE_BIOINFO}</span></p>
+
+<IF {MEMBERLOCATION}><p><span class="labels">{LANG_EDITPROFILE_LOCATION}:</span> {MEMBERLOCATION}</p></IF>
+
+<IF {MEMBERHOMEPAGE}><p><span class="labels">{LANG_EDITPROFILE_HOMEPAGE}:</span> <a href="{MEMBERHOMEPAGE}">{MEMBERHOMEPAGE}</a></p></IF>
+
+<IF {MEMBEROCCUPATION}><p><span class="labels">{LANG_EDITPROFILE_OCCUPATION}:</span> {MEMBEROCCUPATION}</p></IF>
+
+<IF {MEMBERBIRTHDAY}><p><span class="labels">{LANG_EDITPROFILE_BIRTHDATE}:</span> {MEMBERBIRTHMONTHNAME} {MEMBERBIRTHDAY}<IF {MEMBERBIRTHYEAR}>, {MEMBERBIRTHYEAR} ({MEMBERAGE} {LANG_PROFILE_YEARSOLD})</IF></p></IF>
+
+<IF {MEMBERHASBIO}><p><span class="labels">{LANG_EDITPROFILE_BIO}:</span> {MEMBERBIO}</p></IF>
+
+</td>
+</tr>
+<tr>
+<td width="50%" valign="top" class="evencolumns">
+<p align="center"><span class="labels">{LANG_PROFILE_STATUS}</span></p>
+
+<p><span class="labels">{LANG_PROFILE_JOINDATE}:</span> {MEMBERREGDATE}</p>
+
+<p><span class="labels">{LANG_PROFILE_USERGROUP}:</span> {MEMBERGROUPTITLE}</p>
+
+<IF {SWITCH_MEMBERRATINGS}><p><span class="labels">{PALL_LANG_GENERAL_RATING}:</span> {MEMBERRATING}</p></IF>
+
+<p><span class="labels">{LANG_PROFILE_LINKS}:</span> {MEMBERLINKS} {LANG_GENERAL_LINKS}<IF {SWITCH_MEMBERHITS}>, {LANG_MISC_WITH} {MEMBERTOTALHITSIN} {LANG_GENERAL_HITSIN} {LANG_MISC_AND} {MEMBERTOTALHITS} {LANG_GENERAL_HITSOUT}</IF>
+
+<IF {SWITCH_COMMENTS}><p><span class="labels">{LANG_COMMENTS_TOTAL}:</span> {MEMBERCOMMENTS} ({MEMBERCOMMENTSPERDAY} {LANG_GENERAL_PERDAY})</p></IF>
+
+<IF {SWITCH_TIMEONLINE}><p><span class="labels">{PALL_LANG_GENERAL_TOTALTIME}:</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">{LANG_PROFILE_HISTORY}</span></p>
+
+<IF {TOPLISTTOTAL1}><p><span class="labels">{LANG_PROFILE_RECENTLINKS}:</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}">{LANG_PROFILE_FINDLINKS} {MEMBERNAME}</a><br>
+</IF>
+
+<IF {TOPLISTTOTAL2}><p><span class="labels">{LANG_PROFILE_RECENTCOMMENTS}:</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}">{LANG_PROFILE_FINDCOMMENTS} {MEMBERNAME}</a>
+</IF>
+
+<IF {THISMEMBERGROUPCANVIEWIP}><p>{LANG_PROFILE_IP}: {MEMBERIP}</p></IF>
+
+</td>
+</tr>
+</table>
diff -U 3 -H -d -r -N -- 400/templates/multilingual/vote.tpl wsnlinks/templates/multilingual/vote.tpl
--- 400/templates/multilingual/vote.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/vote.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,21 +1,21 @@
-<div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > {LANG_TITLE_VOTE}</div><br>
-
-<p>{LANG_VOTE_CHOOSERATING}</p>
-
-<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"> {LANG_TITLE_VOTE}</td></tr>
-<tr>
- <td>
-  <select name="votevalue">
-   <option value="5">5 - {LANG_VOTE_BEST}</option>
-   <option value="4">4</option>
-   <option value="3">3</option>
-   <option value="2">2</option>
-   <option value="1">1 - {LANG_VOTE_WORST}</option>
-  </select>
- </td>
-</tr>
-</table>
-<input type="submit" value="{LANG_VOTE_RATELINK}" class="button">
+<div class="nav"><a href="{DIRURL}">{LANG_NAVORIGIN}</a>{LINKNAV} > <a href="{LINKDETAILSURL}">{LINKTITLE}</a> > {LANG_TITLE_VOTE}</div><br>
+
+<p>{LANG_VOTE_CHOOSERATING}</p>
+
+<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"> {LANG_TITLE_VOTE}</td></tr>
+<tr>
+ <td>
+  <select name="votevalue">
+   <option value="5">5 - {LANG_VOTE_BEST}</option>
+   <option value="4">4</option>
+   <option value="3">3</option>
+   <option value="2">2</option>
+   <option value="1">1 - {LANG_VOTE_WORST}</option>
+  </select>
+ </td>
+</tr>
+</table>
+<input type="submit" value="{LANG_VOTE_RATELINK}" class="button">
 </form>
\ No newline at end of file
diff -U 3 -H -d -r -N -- 400/templates/multilingual/wrapper.tpl wsnlinks/templates/multilingual/wrapper.tpl
--- 400/templates/multilingual/wrapper.tpl	2006-09-07 12:28:00.000000000 -0700
+++ wsnlinks/templates/multilingual/wrapper.tpl	2006-09-13 09:35:27.000000000 -0700
@@ -1,93 +1,93 @@
-<!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>
-<meta http-equiv="Content-Type" content="text/html; charset={LANG_CHARSET}">
-<link rel="stylesheet" href="[IFADMIN../]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">
- <IF {SWITCH_STYLESELECT}><form action="[IFADMIN../]index.php?action=setstyle" method="post">
- <input type="hidden" name="returnto" value="{CURRENTHTMLURL}">
- <select name="style">{STYLEOPTIONS}</select>
- <input type="submit" value="{LANG_GENERAL_GO}" class="button">
- </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="{LANG_GENERAL_GO}" class="button"></form></IF>
- <IF {SWITCH_LANGUAGESELECTOR}>
- <form action="[IFADMIN../]index.php?action=setlanguage" method="post">
- <input type="hidden" name="returnto" value="{CURRENTHTMLURL}">
- <select name="languagegroup">{LANGOPTIONS}</select> <input type="submit" value="{LANG_GENERAL_GO}" 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">
-<input type="text" name="username" size="10" value="{LANG_REGISTRATION_USERNAME}" onfocus="this.value=''"> <input type="password" name="userpassword" size="10" value="" onfocus="this.value=''"> <input type="submit" value="{LANG_LOGIN_LOGIN}" class="button">
-<br><a href="register.php">{LANG_REGISTRATION_REGISTER}</a> | <a href="index.php?action=userlogin">{LANG_LOGIN_FORGOTPASS}</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}">{LANG_NAV_OPTIONS}</a> | <IF {SWITCH_PM}><a href="privatemessaging.php">{LANG_PROFILE_PM}</a> | </IF> <IF {THISMEMBERGROUPCANUSESEARCH}><a href="search.php">{LANG_MAIN_SEARCH}</a> | </IF> <IF {SWITCH_MEMBERS}><a href="memberlist.php">{P_LANG_GENERAL_MEMBERS}</a> | </IF> <a href="newposts.php">{LANG_NAV_NEWLINKS}</a> | <IF {SWITCH_HELP}><a href="help.php">{LANG_NAV_HELP}</a> | </IF> <a href="index.php?action=userlogout">{LANG_NAV_LOGOUT}</a>
-</div>
-<IF {SWITCH_PM}><br><br>{LANG_NAV_PENDINGPMS}</IF>
-</IF>
-</IF>
- </td>
-</tr>
-</table>
-
-<IF {SWITCH_IMS} and {THISMEMBERNEWIMS}>
-<p align="center"><span class="important">{LANG_MAIN_NEWIMS}</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">{LANG_HEADER_CHOOSECATEGORY}</option>
- {CATOPTIONS}
-</select>
-<input type="submit" value="{LANG_GENERAL_GO}" class="button">
-</p>
-</form>
-
-</div>
-
-<IF {SWITCH_CONTACT}><p align="center"><a href="contactform.php">{LANG_CONTACT_LINK}</a></p></IF>
-
-<IF {THISMEMBERISREGISTERED} and {SPONSORUSEUG} is yes><p align="center"><a href="membersponsor.php">{LANG_SPONSOR_UGAD}</a></p></IF>
-
-<IF {THISMEMBERISREGISTERED}>
-<p align="center"><b><IF {THISMEMBERISADMIN}><a href="[IFADMINadmin/]index.php">{LANG_ADMINPANEL}</a> | <a href="[IFADMIN../]modcp.php">{LANG_TITLE_MODCP}</a></IF><IF {THISMEMBERUSERGROUP} is {MODUSERGROUP}><a href="[IFADMIN../]modcp.php">{LANG_TITLE_MODCP}</a></IF></b></p>
-</IF>
-
-<p align="center"><a href="sitemap.php">{LANG_TITLE_SITEMAP}</a></p>
-
-{LOADSTATS}
-
-<IF {SWITCH_IMS} and {THISMEMBERNEWIMS}>
-<script language="JavaScript"> alert("{LANG_IM_NEWALERT}") </script>
-</IF>
-<IF {THISMEMBERPMPOPUP}><script language="JavaScript">alert("{LANG_PM_NEWALERT}");</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>
+<meta http-equiv="Content-Type" content="text/html; charset={LANG_CHARSET}">
+<link rel="stylesheet" href="[IFADMIN../]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">
+ <IF {SWITCH_STYLESELECT}><form action="[IFADMIN../]index.php?action=setstyle" method="post">
+ <input type="hidden" name="returnto" value="{CURRENTHTMLURL}">
+ <select name="style">{STYLEOPTIONS}</select>
+ <input type="submit" value="{LANG_GENERAL_GO}" class="button">
+ </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="{LANG_GENERAL_GO}" class="button"></form></IF>
+ <IF {SWITCH_LANGUAGESELECTOR}>
+ <form action="[IFADMIN../]index.php?action=setlanguage" method="post">
+ <input type="hidden" name="returnto" value="{CURRENTHTMLURL}">
+ <select name="languagegroup">{LANGOPTIONS}</select> <input type="submit" value="{LANG_GENERAL_GO}" 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">
+<input type="text" name="username" size="10" value="{LANG_REGISTRATION_USERNAME}" onfocus="this.value=''"> <input type="password" name="userpassword" size="10" value="" onfocus="this.value=''"> <input type="submit" value="{LANG_LOGIN_LOGIN}" class="button">
+<br><a href="register.php">{LANG_REGISTRATION_REGISTER}</a> | <a href="index.php?action=userlogin">{LANG_LOGIN_FORGOTPASS}</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}">{LANG_NAV_OPTIONS}</a> | <IF {SWITCH_PM}><a href="privatemessaging.php">{LANG_PROFILE_PM}</a> | </IF> <IF {THISMEMBERGROUPCANUSESEARCH}><a href="search.php">{LANG_MAIN_SEARCH}</a> | </IF> <IF {SWITCH_MEMBERS}><a href="memberlist.php">{P_LANG_GENERAL_MEMBERS}</a> | </IF> <a href="newposts.php">{LANG_NAV_NEWLINKS}</a> | <IF {SWITCH_HELP}><a href="help.php">{LANG_NAV_HELP}</a> | </IF> <a href="index.php?action=userlogout">{LANG_NAV_LOGOUT}</a>
+</div>
+<IF {SWITCH_PM}><br><br>{LANG_NAV_PENDINGPMS}</IF>
+</IF>
+</IF>
+ </td>
+</tr>
+</table>
+
+<IF {SWITCH_IMS} and {THISMEMBERNEWIMS}>
+<p align="center"><span class="important">{LANG_MAIN_NEWIMS}</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">{LANG_HEADER_CHOOSECATEGORY}</option>
+ {CATOPTIONS}
+</select>
+<input type="submit" value="{LANG_GENERAL_GO}" class="button">
+</p>
+</form>
+
+</div>
+
+<IF {SWITCH_CONTACT}><p align="center"><a href="contactform.php">{LANG_CONTACT_LINK}</a></p></IF>
+
+<IF {THISMEMBERISREGISTERED} and {SPONSORUSEUG} is yes><p align="center"><a href="membersponsor.php">{LANG_SPONSOR_UGAD}</a></p></IF>
+
+<IF {THISMEMBERISREGISTERED}>
+<p align="center"><b><IF {THISMEMBERISADMIN}><a href="[IFADMINadmin/]index.php">{LANG_ADMINPANEL}</a> | <a href="[IFADMIN../]modcp.php">{LANG_TITLE_MODCP}</a></IF><IF {THISMEMBERUSERGROUP} is {MODUSERGROUP}><a href="[IFADMIN../]modcp.php">{LANG_TITLE_MODCP}</a></IF></b></p>
+</IF>
+
+<p align="center"><a href="sitemap.php">{LANG_TITLE_SITEMAP}</a></p>
+
+{LOADSTATS}
+
+<IF {SWITCH_IMS} and {THISMEMBERNEWIMS}>
+<script language="JavaScript"> alert("{LANG_IM_NEWALERT}") </script>
+</IF>
+<IF {THISMEMBERPMPOPUP}><script language="JavaScript">alert("{LANG_PM_NEWALERT}");</script></IF>
+</body>
 </html>
\ No newline at end of file
