Only in 320/: albumlist.tpl
Only in 320/: atomfeed.tpl
Only in 320/: attachments.tpl
Only in 320/: blank.htm
Only in 320/: buddyignore.tpl
Only in 320/: buddylist.tpl
Only in 320/: bulkeditposts.tpl
diff -U 3 -H -b -B -E -d -- 320/bulkedit.tpl 315/bulkedit.tpl
--- 320/bulkedit.tpl	2005-04-30 09:48:26.000000000 -0700
+++ 315/bulkedit.tpl	2004-07-05 00:53:28.000000000 -0700
@@ -4,22 +4,20 @@
 <form action="bulkedit.php?catid={CATID}&amp;filled=1" method="post">
 <table>
 <tr>
-<td {COLUMNHEADER}>&nbsp;</td>
-<td {COLUMNHEADER}>Title</td>
-<td {COLUMNHEADER}>Description</td>
-<td {COLUMNHEADER}>URL</td>
+<td>&nbsp;</td>
+<td><b>Title</b></td>
+<td><b>Description</b></td>
 </tr>
 <!-- BEGIN LINKS -->
 <tr>
- <td class="oddcolumns"><input type="checkbox" name="selection[{LINKID}]" value="1"></td>
- <td valign="evencolumns"><input type="text" name="title[{LINKID}]" value="{LINKTITLE}" size="{STANDARDSIZE}"></td>
- <td valign="oddcolumns"><textarea name="description[{LINKID}]" rows="2" cols="50">{LINKDESCRIPTION}</textarea></td>
- <td valign="evencolumns"><input type="text" name="url[{LINKID}]" value="{LINKURL}" size="{STANDARDSIZE}"></td>
+ <td valign="top"><input type="checkbox" name="selection[{LINKID}]" value="1"></td>
+ <td valign="top"><input type="text" name="title[{LINKID}]" value="{LINKTITLE}" size="{STANDARDSIZE}"></td>
+ <td valign="top"><textarea name="description[{LINKID}]" rows="2" cols="50">{LINKDESCRIPTION}</textarea></td>
 </tr>
 <!-- END LINKS -->
 </table>
-<p>With selected, <select name="action"><option value="nothing">ignore selections, just edit</option><option value="delete">delete</option><option value="move">move to another category</option><option value="alias">alias to another category</option></select>
-<br>If moving or aliasing, select a category: <select name="newcategory"><option value="">not applicable</option>{CATOPTIONS}</select>
+<p>With selected, <select name="action"><option value="nothing">ignore selections, just edit</option><option value="delete">delete</option><option value="move">move to another category</option></select>
+<br>If moving, select a category: <select name="newcategory"><option value="">not applicable</option>{CATOPTIONS}</select>
 </p>
 <p><input type="submit" value="Save Changes" class="button"></p>
 </form>
\ No newline at end of file
Only in 320/: contactform.tpl
Only in 320/: contactreply.tpl
Only in 320/: deletedposts.tpl
Only in 320/: deletedpost.tpl
Only in 320/: deletedtopics.tpl
diff -U 3 -H -b -B -E -d -- 320/details.tpl 315/details.tpl
--- 320/details.tpl	2005-04-27 14:21:24.000000000 -0700
+++ 315/details.tpl	2005-01-13 17:33:24.000000000 -0800
@@ -43,12 +43,6 @@
 </div>
 </IF>
 
-<IF {SWITCH_SIMILAR} and {LINKNUMSIMILAR}>
-<div class="details"><span class="labels">Similar Links:</span><br>
-<!-- BEGIN SIMILAR --> <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a> <br> <!-- END SIMILAR -->
-</div>
-</IF>
-
 <IF {SWITCH_RATINGS}>
 <div class="details"><span class="labels">Rate this Link:</span>
 <form action="vote.php?action=vote&amp;id={LINKID}" method="post">
diff -U 3 -H -b -B -E -d -- 320/displaylinks.tpl 315/displaylinks.tpl
--- 320/displaylinks.tpl	2005-04-25 06:21:58.000000000 -0700
+++ 315/displaylinks.tpl	2005-03-19 08:31:42.000000000 -0800
@@ -184,26 +184,14 @@
 <input type="submit" value="Search" class="button"></form></div>   
 </IF>
 
-<IF {CATISMODERATOR} or {THISMEMBERISADMIN}>
-<p>
-<form action="bulkedit.php">
-<input type="hidden" name="catid" value="{CATID}">
-Category Administration: 
-<select name="type">
- <option value="bulkedit">Bulk edit/move/delete links</option>
- <option value="showdeleted">Show/undelete deleted links</option>
-</select>
-<input type="submit" value="Go" class="button">
-</form>
-</p>
-</IF>
+<IF {CATISMODERATOR} or {THISMEMBERISADMIN}><p>[<a href="bulkedit.php?catid={CATID}">Bulk edit/delete links from this category</a>]</p></IF>
 
-<IF {FORUMISMODERATOR}><p><a href="modcp.php">Moderator Control Panel</a> ({CATUNVALIDATEDLINKS} links and {CATUNVALIDATEDCOMMENTS} comments pending validation)</p></IF>
+<IF {CATISMODERATOR}><p><a href="modcp.php">Moderator Control Panel</a> ({CATUNVALIDATEDLINKS} links and {CATUNVALIDATEDCOMMENTS} comments pending validation)</p></IF>
 
 <IF {SWITCH_ONLINEUSERS}>
 Members currently browsing this category: 
 <!-- BEGIN TOPLIST 3 -->
 <CONFIG>online,time,100,descending,catid={CATID} AND memberid>0,,</CONFIG>
-<a href="memberlist.php?action=profile&amp;id={ONLINEID}">{ONLINENAME}</a>,  
+<a href="memberlist.php?action=profile&id={ONLINEID}">{ONLINENAME}</a>,  
 <!-- END TOPLIST 3 -->
 </IF>
\ No newline at end of file
diff -U 3 -H -b -B -E -d -- 320/editcat.tpl 315/editcat.tpl
--- 320/editcat.tpl	2005-05-01 17:19:59.000000000 -0700
+++ 315/editcat.tpl	2005-04-15 23:56:21.000000000 -0700
@@ -24,11 +24,6 @@
  <td class="optionscolumn"><textarea cols="45" rows="5" name="description">{CATDESCRIPTION}</textarea></td> 
 </tr>
 <tr>
- <td class="labelscolumn"><span class="labels">Act as Link:</span>
-<br>If this is filled in with a URL, clicking on the category will redirect people to the URL.</td>
- <td class="optionscolumn"><input type="text" name="actaslink" value="{CATACTASLINK}" size="{STANDARDSIZE}"></td>
-</tr>
-<tr>
  <td class="labelscolumn"><span class="labels">Moderators:</span><br>Separate the usernames of the moderators with a comma.</td>
  <td class="optionscolumn"><input type="text" name="moderators" size="{STANDARDSIZE}" value="{CATMODERATORS}"></td>
 </tr>
@@ -97,11 +92,6 @@
  <td class="optionscolumn"><input type="text" name="linkcols" size="2" value="{CATLINKCOLS}"></td>
 </tr>
 <tr>
- <td class="labelscolumn" valign="top"><span class="labels">Default to no access?</span>
-<br>Useful for a category where any future usergroups you may add shouldn't be defaulted to being able to view it.</td>
- <td class="optionscolumn"><select name="defaultnoaccess">{DEFAULTNOACCESSNOYES}</select></td>
-</tr>
-<tr>
  <td class="labelscolumn" valign="top"><span class="labels">Category usergroup permissions:</span></td>
  <td class="optionscolumn">{CATPERMISSIONSLIST}</td>
 </tr>
diff -U 3 -H -b -B -E -d -- 320/editcomments.tpl 315/editcomments.tpl
--- 320/editcomments.tpl	2005-04-29 09:13:54.000000000 -0700
+++ 315/editcomments.tpl	2004-07-09 18:52:06.000000000 -0700
@@ -1,109 +1,54 @@
 <div class="nav"><a href="[IFADMIN../]index.php">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="[IFADMIN../]comments.php?id={LINKID}">{LINKTITLE}</a> > Edit Comment</div>
 
-<IF {COMMENTCANDELETE}>
-<form action="edit.php?action=comment&amp;filled=1&amp;id={POSTID}" method="post">
-<input type="hidden" name="usernote" value="{USERNOTE}">
-<input type="hidden" name="modnote" value="{MODNOTE}">
-<div class="deletions"><span class="labels">Delete Comment</span>
-<br>Reason for deletion: <input type="text" name="deletionreason" size="{STANDARDSIZE}" value="{COMMENTDELETIONREASON}"><br>
-<IF {COMMENTDELETED}>
-<input type="submit" name="delete" value="Restore Deleted Comment" class="button">
-<OTHERWISE>
-<IF {THISMEMBERGROUPCANHARDDELETE}><input type="checkbox" name="harddelete" value="1"> Hard-delete? (This will be non-recoverable.)<br></IF>
-<input type="submit" name="delete" value="Delete Comment" class="button">
-</IF>
-</div>
-</form>
-</IF>
-
-<IF {PREVIEWING}><div class="post">{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}">
+<form enctype="multipart/form-data" action="edit.php?action=comment&amp;filled=1&amp;id={COMMENTID}" method="post">
 <table {STANDARDTABLE}>
 <IF {THISMEMBERGROUPCANDOFULLEDIT}>
+<IF not {COMMENTOWNERID}>
 <tr>
  <td class="labelscolumn"><span class="labels">Poster Name:</span></td>
  <td class="optionscolumn"><input type="text" name="postername" size="{STANDARDSIZE}" value="{COMMENTPOSTERNAME}"></td>
 </tr>
-<IF {SWITCH_POSTTYPES}>
+</IF>
 <tr>
  <td class="labelscolumn"><span class="labels">Comment Type:</span></td>
  <td class="optionscolumn"><select name="type">{COMMENTTYPEOPTIONS}</select></td>
 </tr>
-<IF>
 <tr>
  <td class="labelscolumn"><span class="labels">Comment Rating:</span></td>
  <td class="optionscolumn"><input type="text" name="approved" value="{COMMENTAPPROVED}" size="5"> approved out of <input type="text" name="votes" value="{COMMENTVOTES}" size="5"> votes</td>
 </tr>
 </IF>
 <tr>
- <td class="labelscolumn" valign="top"><span class="labels">Comment Text:</span>
-<br><br>
-<center>
-<div class="smiliebox">
-<!-- BEGIN SMILIES -->
-<a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
-<!-- END SMILIES -->
-</div>
-</center>
-<br><IF {THISMEMBERPOSTEDITOR} is WYSIWYG>Drag a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.<ELSE>Click a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.</IF> You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400,scrollbars=yes');">WSN Codes</a> in your message.
-</td>
- <td class="optionscolumn" valign="top">
-<IF {THISMEMBERPOSTEDITOR} is WYSIWYG>
-<script language="JavaScript" type="text/javascript" src="{TEMPLATESDIR}/richtext.js"></script>
-<script language="JavaScript" type="text/javascript">
-function submitForm() {	updateRTEs(); return true; }
-initRTE("{TEMPLATESDIR}/images/posteditor/", "{TEMPLATESDIR}/", "{DIRURL}/templates/styles/{STYLESHEET}.css");
-</script>
-<script language="JavaScript" type="text/javascript">
-writeRichText('message', '{COMMENTMESSAGEWYSIWYG}', 400, 200, true, false);
-</script>
-<OTHERWISE>
-<textarea name="message" rows="15" cols="80">{COMMENTMESSAGE}</textarea>
-</IF>
+ <td class="labelscolumn" valign="top"><span class="labels">Comment Text:</span></td>
+ <td class="optionscolumn" valign="top"><textarea cols="60" rows="10" name="message">{COMMENTMESSAGE}</textarea>
 <br>Reason for edit: <input type="text" name="editreason" size="{STANDARDSIZE}" value="{COMMENTEDITREASON}">
 <IF {THISMEMBERID} is not {COMMENTOWNERID}><br><input type="checkbox" name="preventedit" value="1" {COMMENTPREVENTEDITCHECK}> Prevent original poster from editing?</IF>
 </td> 
 </tr>
-<IF {THISMEMBERGROUPCANUPLOAD}>
-<tr>
- <td class="labelscolumn"><span class="labels">Attach Files:</span></td>
- <td class="optionscolumn"><input type="file" name="filefield"> <input type="submit" name="uploadattachment" value="Attach" class="button">
-<IF {COMMENTNUMATTACHMENTS}>
-<br>Current Attachments:<br>
-<!-- BEGIN ATTACHMENTS -->
-<input type="checkbox" name="attachdelete[]" value="{ATTACHID}"> {ATTACHFILETITLE} ({ATTACHKB} KB)<br>
-<!-- END ATTACHMENTS -->
-<input type="submit" name="attachdeletion" value="Delete Selected" class="button">
-</IF>
-</td>
-</tr>
-</IF>
-<IF {SWITCH_POSTICONS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Post Icon:</span></td>
- <td class="optionscolumn"><!-- BEGIN ICONS --> <input type="radio" name="icon" value="{ICONNAME}" {ICONCHECKED}> <img src="{TEMPLATESDIR}/images/posticons/{ICONNAME}" alt="icon"> <!-- END ICONS --></td>
-</tr>
-</IF>
 
 <!-- INSERT NEW FIELDS HERE -->
 
+<IF {THISMEMBERGROUPCANDOFULLEDIT}>
 <tr>
- <td class="labelscolumn"><span class="labels">Options:</span></td>
- <td class="optionscolumn"><input type="checkbox" name="disablesmilies" value="1" {POSTCHECKED[disablesmilies]}> Disable smilies? <br> <input type="checkbox" name="disablesig" value="1" {POSTCHECKED[disablesig]}> Disable signature?</td>
+ <td class="labelscolumn"><span class="labels">Comment owner member id:</span></td>
+ <td class="optionscolumn"><input type="text" name="ownerid" value="{COMMENTOWNERID}" size="5"></td>
 </tr>
+</IF>
 <IF {COMMENTCANHIDE}>
 <tr>
  <td class="labelscolumn"><span class="labels">Hide Comment?</span></td>
  <td class="optionscolumn"><select name="hide">{HIDEYESNO}</select></td>
 </tr>
 </IF>
+<IF {COMMENTCANDELETE}>
 <tr>
- <td colspan="2"><input type="submit" value="Edit Comment" class="button"> <input type="submit" name="preview" value="Preview Changes" class="button"></td>
+ <td colspan="2"><span class="labels">Delete this comment?</span> <input type="checkbox" name="delete"><br></td>
+</tr>
+</IF>
+<tr>
+ <td colspan="2"><input type="submit" value="Edit Comment" class="button"></td>
 </tr>
 </table>
 </form>
\ No newline at end of file
diff -U 3 -H -b -B -E -d -- 320/editmembers.tpl 315/editmembers.tpl
--- 320/editmembers.tpl	2005-04-30 05:23:29.000000000 -0700
+++ 315/editmembers.tpl	2004-09-12 17:10:00.000000000 -0700
@@ -1,22 +1,12 @@
 <IF not {INTEGRATION}>
 <IF {THISMEMBERISADMIN}>
-<p>
-<form action="redirecttourl.php">
-Admin Options: 
-<select name="destination">
- <option value="edit.php?action=member&amp;field=id&amp;condition=equals&amp;fieldvalue={MEMBERID}">Edit Profile</option>
- <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}">Ban</option>
- <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}&amp;partial=1">Partially Ban (from categories/threads)</option>
- <option value="[IFADMINadmin/]useradmin.php?action=suspend&id={MEMBERID}">Suspend Member</option>
-<option value="usernotes.php?id={MEMBERID}&amp;modnote=1">Moderator Notes ({MEMBERMODNOTES})</option>
- <option value="[IFADMINadmin/]useradmin.php?action=modlogon&id={MEMBERID}">Show Moderating History on Member</option>
-</select>
-<input type="submit" value="Go" class="button">
-</form>
-</p>
+<p>Admin Option: <a href="[IFADMINadmin/]useradmin.php?action=ban&id={MEMBERID}">Ban Member</a></p>
 </IF>
 </IF>
 
+<IF {SWITCH_SUBSCRIPTIONS}><p><a href="[IFADMIN../]profile.php?id={MEMBERID}">Manage Subscriptions</a></p>
+</IF>
+
 <div class="nav"><a href="[IFADMIN../]index.php">{LANG_NAVORIGIN}</a> > <a href="[IFADMIN../]memberlist.php">Member List</a> > <a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> > Edit Profile</div>
 
 <span class="important">{INCOMPLETE}</span>
@@ -29,8 +19,9 @@
  <td class="optionscolumn"><input type="text" name="name" size="{STANDARDSIZE}" value="{MEMBERNAME}" maxlength="{MAXUSERNAMELENGTH}"></td>
 </tr>
 </IF>
+
 <tr>
- <td class="labelscolumn"><span class="labels">E-mail:</span><br><IF {REGISTRATION} is email>Needed to activate your account.<ELSE>Needed if you lose your password.</IF></td>
+ <td class="labelscolumn"><span class="labels">E-mail:</span></td>
  <td class="optionscolumn"><input type="text" name="email" size="{STANDARDSIZE}" value="{MEMBEREMAIL}"></td>
 </tr>
 <IF not {INTEGRATION}>
@@ -40,23 +31,13 @@
 </tr>
 </IF>
 <tr>
- <td class="labelscolumn"><span class="labels">Change Avatar:</span><br>Leave blank to keep current avatar. Must be {AVATARWIDTH} by {AVATARHEIGHT} pixels or smaller and no more than {AVATARSIZE} bytes, and one of these file types: {AVATARTYPES}</td>
- <td class="optionscolumn"><input type="file" name="newavatar"> <input type="submit" value="Upload Avatar" class="button"> 
-<IF {MEMBERSHOWAVATAR[1]}><br>Current avatar:<br><img src="attachments/avatars/{MEMBERAVATARNAME}">
-<br><input type="submit" name="removeavatar" value="Remove Avatar" class="button">
-</IF>
-</td>
+ <td class="labelscolumn"><span class="labels">Change Avatar:</span><br>Leave blank to keep current avatar. Must be smaller than than {AVATARWIDTH} by {AVATARHEIGHT} pixels and {AVATARSIZE} bytes, and one of these file types: {AVATARTYPES}</td>
+ <td class="optionscolumn"><input type="file" name="newavatar"></td>
 </tr>
 <tr>
  <td class="labelscolumn"><span class="labels">Signature:</span></td>
- <td class="optionscolumn"><textarea name="signature" rows="3" cols="60">{MEMBERSIGNATURE}</textarea></td>
-</tr>
-<IF {THISMEMBERGROUPCUSTOMTITLE}>
-<tr>
- <td class="labelscolumn"><span class="labels">Custom Title:</span><br>If you wish, you may choose text to appear under your name that will override your default rank title.</td>
- <td class="optionscolumn"><input type="text" name="customtitle" size="{CUSTOMTITLELENGTH}" maxlength="{CUSTOMTITLELENGTH}" value="{MEMBERCUSTOMTITLE}"></td>
+ <td class="optionscolumn"><textarea name="signature" rows="2" cols="45">{MEMBERSIGNATURE}</textarea></td>
 </tr>
-</IF>
 <tr>
  <td class="labelscolumn"><span class="labels">Style:</span></td>
  <td class="optionscolumn"><select name="stylesheet">{STYLEOPTIONS}</select></td>
@@ -87,28 +68,8 @@
  <td class="labelscolumn"><span class="labels">Receive email notification of new private messages?</span></td>
  <td class="optionscolumn"><select name="notifyofpms">{MEMBERNOTIFYOFPMSYESNO}</select></td>
 </tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Show popup alert notification of new PMs?</span></td>
- <td class="optionscolumn"><select name="pmnotify">{MEMBERPMNOTIFYYESNO}</select></td>
-</tr>
-<IF {SWITCH_MODNOTIFY}>
-<tr>
- <td class="labelscolumn"><span class="labels">Notify me via PM of moderator actions taken on my links and comments?</span></td>
- <td class="optionscolumn"><select name="moderationpm">{MEMBERMODERATIONPMYESNO}</select></td>
-</tr>
-</IF>
-</IF>
-<IF {SWITCH_COMMENTS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Automatically subscribe to comments thread of all links you submit?</span></td>
- <td class="optionscolumn"><select name="autosubscribe">{MEMBERAUTOSUBSCRIBEYESNO}</select></td>
-</tr>
 </IF>
 <tr>
- <td class="labelscolumn"><span class="labels">Subscription Notification Frequency:</span></td>
- <td class="optionscolumn"><select name="notifymethod">{MEMBERNOTIFYMETHODOPTIONS}</select></td>
-</tr>
-<tr>
  <td class="labelscolumn"><span class="labels">Time Zone:</span></td>
  <td class="optionscolumn"><select name="timezone">
 {FUNC_SELECTOPTIONS[-12,-11,-10,-9,-8,-7,-6,-5,-4,-3.5,-3,-2,-1,0,1,2,3,3.5,4,4.5,5,5.5,5.75,6,6.5,7,8,9,9.5,10,11,12,13 <,> GMT-12,GMT-11,GMT-10,GMT-9,GMT-8,GMT-7,GMT-6,GMT-5,GMT-4,GMT-3.5,GMT-3,GMT-2,GMT-1,GMT,GMT+1,GMT+2,GMT+3,GMT+3.5,GMT+4,GMT+4.5,GMT+5,GMT+5.5,GMT+5.75,GMT+6,GMT+6.5,GMT+7,GMT+8,GMT+9,GMT+9.5,GMT+10,GMT+11,GMT+12,GMT+13 <,> {MEMBERTIMEZONE}]}
@@ -118,107 +79,28 @@
  <td class="labelscolumn"><span class="labels">Make me login again every:</span></td>
  <td class="optionscolumn"><select name="cookieduration">{MEMBERCOOKIEOPTIONS}</select></td>
 </tr>
-<IF {SWITCH_IMS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Accept instant messages from:</span></td>
- <td class="optionscolumn"><select name="acceptims">{MEMBERACCEPTIMSOPTIONS}</select></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Posts per page:</span></td>
- <td class="optionscolumn"><select name="commentsperpage">{MEMBERCOMMENTSPERPAGEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Links per page:</span></td>
- <td class="optionscolumn"><select name="linksperpage">{MEMBERLINKSPERPAGEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Location:</span></td>
- <td class="optionscolumn"><input type="text" name="location" size="{STANDARDSIZE}" value="{MEMBERLOCATION}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Homepage:</span></td>
- <td class="optionscolumn"><input type="text" name="homepage" size="{STANDARDSIZE}" value="{MEMBERHOMEPAGE}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Occupation:</span></td>
- <td class="optionscolumn"><input type="text" name="occupation" size="{STANDARDSIZE}" value="{MEMBEROCCUPATION}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Biography:</span></td>
- <td class="optionscolumn"><textarea name="bio" rows="5" cols="45">{MEMBERBIO}</textarea></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Interests:</span></td>
- <td class="optionscolumn"><input type="text" name="interests" size="{STANDARDSIZE}" value="{MEMBERINTERESTS}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Instant Messanger Handles:</span></td>
- <td class="optionscolumn">
-AIM: <input type="text" name="aim" size="15" value="{MEMBERAIM}"><br>
-ICQ: <input type="text" name="icq" size="15" value="{MEMBERICQ}"><br>
-MSN: <input type="text" name="msn" size="15" value="{MEMBERMSN}"><br>
-YIM: <input type="text" name="yahoo" size="15" value="{MEMBERYAHOO}">
-</td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Birthdate:</span></td>
- <td class="optionscolumn">
-<select name="birthmonth"><option value=""></option>{MEMBERBIRTHMONTHOPTIONS}</select>
-<select name="birthday"><option value=""></option>{MEMBERBIRTHDAYOPTIONS}</select>
-<select name="birthyear"><option value=""></option>{MEMBERBIRTHYEAROPTIONS}</select>
-</td>
-</tr>
-<IF {SWITCH_ONLINEUSERS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Show my online status to:</span></td>
- <td class="optionscolumn">
-  <select name="visibility">
-  {MEMBERVISIBILITYOPTIONS}
-  </select>
- </td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Post Editor:</span></td>
- <td class="optionscolumn"><select name="posteditor">{MEMBERPOSTEDITOROPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Show avatars by posts?</span></td>
- <td class="optionscolumn"><select name="showavatars">{MEMBERSHOWAVATARSYESNO}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Show signatures below posts?</span></td>
- <td class="optionscolumn"><select name="showsigs">{MEMBERSHOWSIGSYESNO}</select></td>
-</tr>
 
 <!-- INSERT NEW FIELDS HERE -->
 
 <IF {THISMEMBERGROUPCANDOFULLEDIT}>
 <tr>
  <td class="labelscolumn"><span class="labels">Link Total:</span></td>
- <td class="optionscolumn"><input type="text" name="topics" size="5" value="{MEMBERTOPICS}"></td> 
+ <td class="optionscolumn"><input type="text" name="links" size="5" value="{MEMBERLINKS}"></td> 
 </tr>
 <IF {SWITCH_COMMENTS}>
 <tr>
  <td class="labelscolumn"><span class="labels">Comment Total:</span></td>
- <td class="optionscolumn"><input type="text" size="5" name="posts" value="{MEMBERPOSTS}"></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">Link Views Total:</span></td>
+ <td class="labelscolumn"><span class="labels">Hits Out Total:</span></td>
  <td class="optionscolumn"><input type="text" size="5" name="totalhits" value="{MEMBERTOTALHITS}"></td> 
 </tr>
 <tr>
- <td class="labelscolumn"><span class="labels">Change Registration Date:</span>
-<br>Currently {MEMBERREGDATE}. To change, type a new date in a common format such as  August 31, 2004 or 5/7/2004.</td>
- <td class="optionscolumn"><input type="text" name="changeregdate" size="20"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Category Access:</span>
-<br>Select any categories which this user's usergroup doesn't normally have access to which you would like to give this user special access to.</td>
- <td class="optionscolumn"><select multiple name="forumaccess[]" size="5">{MEMBERFORUMACCESSOPS}</select><input type="hidden" name="forumaccess[123]" value=""></td>
+ <td class="labelscolumn"><span class="labels">Hits In Total:</span></td>
+ <td class="optionscolumn"><input type="text" name="totalhitsin" size="5" value="{MEMBERTOTALHITSIN}"></td>
 </tr>
 </IF>
 <IF {SPONSORUSEUG} is yes>
@@ -229,13 +111,8 @@
 </IF>
 <IF not {INTEGRATION}>
 <tr>
- <td class="labelscolumn"><span class="labels">Primary Usergroup:</span></td>
- <td class="optionscolumn"><select name="usergroup">{MEMBERUSERGROUPOPTIONS}</select></td> 
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Secondary Usergroups:</span></td>
- <td class="optionscolumn"><select multiple size="5" name="secondarygroups[]">{MEMBERSECONDARYUSERGROUPOPTIONS}</select>
-<input type="hidden" name="secondarygroups[123]" value="">
+ <td class="labelscolumn"><span class="labels">Usergroup:</span></td>
+ <td class="optionscolumn"><select name="usergroup">{MEMBERUSERGROUPOPTIONS}</select>
 </td> 
 </tr>
 </IF>
diff -U 3 -H -b -B -E -d -- 320/edit.tpl 315/edit.tpl
--- 320/edit.tpl	2005-04-27 13:22:08.000000000 -0700
+++ 315/edit.tpl	2005-05-23 17:44:29.000000000 -0700
@@ -11,20 +11,6 @@
 
 <div class="nav"><a href="[IFADMIN../]index.php">{LANG_NAVORIGIN}</a> {LINKNAV} > <a href="[IFADMIN../]link.php?action=detail&amp;id={LINKID}">{LINKTITLE}</a> > Edit Link</div>
 
-<IF {LINKCANDELETE}>
-<form action="edit.php?action=link&amp;filled=1&amp;delete=1&amp;id={LINKID}" method="post">
-<div class="deletions"><span class="labels">Delete Link</span>
-<br>Reason for deletion: <input type="text" name="deletionreason" size="{STANDARDSIZE}" value="{LINKDELETIONREASON}"><br>
-<IF {LINKDELETED}>
-<input type="submit" name="delete" value="Restore Deleted Link" class="button">
-<OTHERWISE>
-<IF {THISMEMBERGROUPCANHARDDELETE}><input type="checkbox" name="harddelete" value="1"> Hard-delete? (This will be non-recoverable.)<br></IF>
-<input type="submit" name="delete" value="Delete Link" class="button">
-</IF>
-</div>
-</form>
-</IF>
-
 <p><span class="important">{INCOMPLETE}</span></p>
 
 <IF {THISMEMBERGROUPCANCOPY}><a href="edit.php?action=copylink&amp;id={LINKID}">Copy this link to another category</a><br></IF>
@@ -108,12 +94,10 @@
  <td class="optionscolumn"><input type="text" name="hitsintemp" size="5" value="{LINKHITSINTEMP}"></td>
 </tr>
 </IF>
-<IF {SWITCH_TOPICTYPES}>
 <tr>
  <td class="labelscolumn"><span class="labels">Link Type:</span></td>
  <td class="optionscolumn"><select name="type">{LINKTYPESELECTOR}</select></td>
 </tr>
-</IF>
 <tr>
  <td class="labelscolumn"><span class="labels">Owner ID#:</span><br>Current owner is {MEMBERNAME}.</td>
  <td class="optionscolumn"><input type="text" name="ownerid" size="5" value="{LINKOWNERID}"></td>
@@ -152,11 +136,6 @@
  <td class="labelscolumn"><span class="labels">Allow further comments?</span></td>
  <td class="optionscolumn"><select name="threadclosed"><option value="0">yes (open thread)</option><option value="1">no (closed thread)</option></select></td>
 </tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Change Link Submission Time:</span>
-<br>Currently {LINKDATE}. To change, type a new date and time in a common format such as  August 31, 2004 12:15 PM.</td>
- <td class="optionscolumn"><input type="text" name="changetime" size="{STANDARDSIZE}"></td>
-</tr>
 </IF>
 
 <!-- INSERT NEW FIELDS HERE -->
@@ -167,6 +146,11 @@
  <td class="optionscolumn"><select name="hide">{LINKHIDESELECTOR}</select></td>
 </tr>
 </IF>
+<IF {LINKCANDELETE}>
+<tr>
+ <td colspan="2"><span class="labels">Delete this link?</span> <input type="checkbox" name="delete"></td>
+</tr>
+</IF>
 <tr>
  <td colspan="2"><input type="hidden" name="isalbum" value="{LINKINALBUM}"><input type="submit" value="Edit Link" class="button"></td>
 </tr>
Only in 320/: guestbook.tpl
Only in 320/: helpcatcontents.tpl
Only in 320/: helpitem.tpl
Only in 320/: helpmain.tpl
Only in 320/: homesubwrapper.tpl
Only in 320/: home.tpl
Only in 320/: ignored.tpl
Only in 320/: imchat.tpl
Only in 320/: immain.tpl
Only in 320/: leaders.tpl
diff -U 3 -H -b -B -E -d -- 320/login.tpl 315/login.tpl
--- 320/login.tpl	2005-04-30 05:24:33.000000000 -0700
+++ 315/login.tpl	2004-03-07 16:28:34.000000000 -0800
@@ -23,9 +23,3 @@
 <br><input type="text" name="email" size="{STANDARDSIZE}">
 <input type="submit" value="Send Password" class="button">
 </form>
-
-<form action="index.php?action=resendconf" method="post">
-<br><br>Trying to confirm your email and need the activation email re-sent? Type in the email address you registered under in order to have another copy sent to you:
-<br><input type="text" name="email" size="{STANDARDSIZE}">
-<input type="submit" value="Resend Activation E-Mail" class="button">
-</form>
\ No newline at end of file
diff -U 3 -H -b -B -E -d -- 320/main.tpl 315/main.tpl
--- 320/main.tpl	2005-05-02 11:06:22.000000000 -0700
+++ 315/main.tpl	2004-12-06 11:04:50.000000000 -0800
@@ -3,7 +3,6 @@
 <br>
 <p align="left">
 {TOTALLINKS} links in {TOTALCATS} categories<IF {SWITCH_HITS}>, with {TOTALHITS} clicks</IF><IF {SWITCH_COMMENTS}> and {TOTALCOMMENTS} comments</IF><IF {SWITCH_MEMBERS}> by <a href="memberlist.php">{TOTALMEMBERS} members</a></IF>. Directory last updated {LASTUPDATE}.
-<IF {SWITCH_MEMBERS}><br>Welcome <a href="memberlist.php?action=profile&amp;id={NEWESTMEMBERID}">{NEWESTMEMBERNAME}</a>, the newest member.</IF>
 </p>
 
 <table width="100%">
@@ -51,28 +50,24 @@
 
 </td>
 
-<IF {SWITCH_MAINTOPLIST}>
 <td width="20%" valign="top">
 <div align="center">
-<span class="title">{TOPLISTTOTAL1} newest links</span><br><br>
-<!-- BEGIN TOPLIST 1 -->
+<span class="title">{TOPLISTTOTAL2} newest links</span><br><br>
+<!-- BEGIN TOPLIST 2 -->
 <CONFIG>links,id,5,descending</CONFIG>
 <div class="newlinks"><a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a>  {LINKADMIN} 
 </div>
-<!-- END TOPLIST 1 -->
+<!-- END TOPLIST 2 -->
 </div>
 </td>
-</IF>
 </tr>
 </table>
 
 <IF {SWITCH_ONLINEUSERS}>
-<div class="onlineusers">
-<a href="online.php">Currently online</a> ({TOTALMEMBERSONLINE} members, {TOTALGUESTSONLINE} guests): 
+Currently online: 
 <!-- BEGIN TOPLIST 3 -->
 <CONFIG>online,time,100,descending,memberid>0,,</CONFIG>
-{ONLINEREADYTOCHATICON} <a href="memberlist.php?action=profile&amp;id={ONLINEID}" class="{ONLINEGROUPNAMESTYLE}">{ONLINENAME}</a>{ONLINEINVISMARKER},  
+<a href="memberlist.php?action=profile&id={ONLINEID}">{ONLINENAME}</a>,  
 <!-- END TOPLIST 3 -->
-<br><br>Most ever online: {MAXMEMBERSONLINE} members on {MAXMEMBERSONLINEDATE} ({MAXTOTALONLINE} total members and guests, on {MAXTOTALONLINEDATE})
-</div>
+<br>Most ever online: {MAXTOTALONLINE}, on {MAXTOTALONLINEDATE}
 </IF>
\ No newline at end of file
diff -U 3 -H -b -B -E -d -- 320/memberlist.tpl 315/memberlist.tpl
--- 320/memberlist.tpl	2005-04-30 06:14:01.000000000 -0700
+++ 315/memberlist.tpl	2004-08-23 22:29:54.000000000 -0700
@@ -7,9 +7,9 @@
  <option value="time">registration date</option>
  <option value="name">name</option>
  <option value="links">links submitted</option>
- <IF {SWITCH_COMMENTS}><option value="comments">comments posted</option></IF>
- <option value="birthdate">birthdate</option>
- <IF {SWITCH_TIMEONLINE}><option value="timeonline">total time online</option></IF>
+<IF {SWITCH_COMMENTS}>
+ <option value="comments">comments posted</option>
+</IF>
 </select> 
 in
 <select name="ascdesc">
@@ -18,8 +18,9 @@
 </select> 
 order, and show
 <select name="perpage">
- <option value="15">15</option>
- <option value="25">25</option>
+ <option value="{MEMBERSPERPAGE}">{MEMBERSPERPAGE}</option>
+ <option value="10">10</option>
+ <option value="25">20</option>
  <option value="40">40</option>
  <option value="80">80</option>
 </select>
@@ -30,24 +31,24 @@
 
 <table width="100%">
 <tr>
- <td {COLUMNHEADER}>Name</td>
- <td {COLUMNHEADER}>Registration Date</td>
- <td {COLUMNHEADER}>Links</td>
- <IF {SWITCH_COMMENTS}><td {COLUMNHEADER}>Comments</td></IF>
- <td {COLUMNHEADER}>Location</td>
- <td {COLUMNHEADER}>Avatar</td>
- <IF {SWITCH_TIMEONLINE}><td {COLUMNHEADER}>Total Time Online</td></IF>
+ <td width="20%"><span class="columnheader">Name</span></td>
+ <td width="20%"><span class="columnheader">Registration Date</span></td>
+ <td width="20%"><span class="columnheader">Links</span></td>
+<IF {SWITCH_COMMENTS}>
+ <td width="20%"><span class="columnheader">Comments</span></td>
+</IF>
+ <td width="20%"><span class="columnheader">Avatar</span></td>
 </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 {MEMBERSHOWAVATAR}><img src="attachments/avatars/{MEMBERAVATARNAME}" alt=""></IF></td>
- <IF {SWITCH_TIMEONLINE}><td class="evencolumns">{MEMBERTOTALTIMEONLINE}</td></IF>
+ <td width="20%"><a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a> {MEMBERADMIN} </td>
+ <td width="20%">{MEMBERREGDATE}</td>
+ <td width="20%">{MEMBERLINKS}</td>
+<IF {SWITCH_COMMENTS}>
+ <td width="20%">{MEMBERCOMMENTS}</td>
+</IF>
+ <td width="20%"><IF {MEMBERAVATAR}><img src="attachments/{MEMBERAVATARNAME}" alt=""></IF></td>
 </tr>
 <!-- END MEMBERS -->
 </table>
@@ -55,8 +56,3 @@
 <IF {MULTIPAGE}>
 Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
 </IF>
-
-<br><br>
-<form action="search.php?action=filter&filled=1&whichtype=members" method="post">
-Find the member named <input type="hidden" name="namecondition" value="="> <input type="text" size="{STANDARDSIZE}" name="namesearch"> <input type="submit" value="Find Member" class="button">
-</form>
\ No newline at end of file
Only in 320/: modcpsubwrapper.tpl
diff -U 3 -H -b -B -E -d -- 320/modcp.tpl 315/modcp.tpl
--- 320/modcp.tpl	2005-04-30 09:42:20.000000000 -0700
+++ 315/modcp.tpl	2004-07-08 06:20:40.000000000 -0700
@@ -37,7 +37,7 @@
 <br>URL: <a href="{LINKURL}" {EXTERNALLINKS}>{LINKURL}</a>
 <br>Description: {LINKDESCRIPTION}
 <br>Link Type: {LINKTYPE}
-<br>Reciprocal URL: <a href="{LINKRECIPURL}">{LINKRECIPURL}</a>
+<br>Reciprocal URL: {LINKRECIPURL}
 <br>Reciprocated With: {LINKRECIPWITH}
 <IF {LINKFILENAME}><br>Attached File: <a href="attachments/{LINKFILENAME}">{LINKFILETITLE}</a></IF>
 <!-- END LINK LIST -->
@@ -48,7 +48,7 @@
 <br>URL: <a href="{LINKURL}" {EXTERNALLINKS}>{LINKURL}</a>
 <br>Description: {LINKDESCRIPTION}
 <br>Link Type: {LINKTYPE}
-<br>Reciprocal URL: <a href="{LINKRECIPURL}">{LINKRECIPURL}</a>
+<br>Reciprocal URL: {LINKRECIPURL}
 <br>Reciprocated With: {LINKRECIPWITH}
 <IF {LINKFILENAME}><br>Attached File: <a href="attachments/{LINKFILENAME}">{LINKFILETITLE}</a></IF>
 <!-- END EDIT LIST -->
@@ -57,7 +57,7 @@
 <!-- BEGIN COMMENT LIST -->
 <input type="checkbox" name="commentlist[]" value="{COMMENTID}"> Comment on {COMMENTLINKNAME}
 <br>Associated Link: <a href="link.php?action=detail&amp;id={COMMENTLINKID}">{COMMENTLINKNAME}</a>
-<IF {SWITCH_POSTTYPES}><br>Comment Type: {COMMENTTYPE}</IF>
+<br>Comment Type: {COMMENTTYPE}
 <br>Text: {COMMENTTEXT}
 <!-- END COMMENT LIST -->
 </td>
Only in 320/: modlog.tpl
Only in 320/: modnotes.tpl
Only in 320/: newposts.tpl
diff -U 3 -H -b -B -E -d -- 320/noaccess.tpl 315/noaccess.tpl
--- 320/noaccess.tpl	2005-04-28 15:54:16.000000000 -0700
+++ 315/noaccess.tpl	2004-08-29 05:16:22.000000000 -0700
@@ -3,6 +3,7 @@
 <p>Please supply your username and password in order to log in:</p>
 
 <form action="index.php?action=userlogin&amp;filled=1" method="post">
+<input type="hidden" name="returnto" value="{CURRENTURL}">
 <table {STANDARDTABLE}>
 <tr>
  <td class="labelscolumn"><span class="labels">Username:</span></td>
@@ -23,8 +24,3 @@
 <br><input type="text" name="email" size="{STANDARDSIZE}">
 <input type="submit" value="Send Password" class="button">
 </form>
-<form action="index.php?action=resendconf" method="post">
-<br><br>Trying to confirm your email and need the activation email re-sent? Type in the email address you registered under in order to have another copy sent to you:
-<br><input type="text" name="email" size="{STANDARDSIZE}">
-<input type="submit" value="Resend Activation E-Mail" class="button">
-</form>
\ No newline at end of file
Only in 320/: onepost.tpl
Only in 320/: onlineusers.tpl
Only in 320/: pagination.tpl
Only in 320/: palette.htm
diff -U 3 -H -b -B -E -d -- 320/pmdrafts.tpl 315/pmdrafts.tpl
--- 320/pmdrafts.tpl	2005-04-24 18:15:25.000000000 -0700
+++ 315/pmdrafts.tpl	2004-07-03 23:42:12.000000000 -0700
@@ -9,17 +9,19 @@
 <form action="privatemessaging.php?filled=1&amp;folder={FOLDER}" method="post">
 <table width="100%">
 <tr>
- <td {COLUMNHEADER}>&nbsp;</td>
- <td {COLUMNHEADER}>Sending To</td>
- <td {COLUMNHEADER}>Subject</td>
- <td {COLUMNHEADER}>Preview</td>
+ <td>&nbsp;</td>
+ <td>&nbsp;</td>
+ <td><span class="columnheader">Sending To</span></td>
+ <td><span class="columnheader">Subject</span></td>
+ <td><span class="columnheader">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>
+ <td><input type="checkbox" name="selectedpms[]" value="{PMID}"></td>
+ <td><IF {PMTIMEREAD}><img src="{TEMPLATESDIR}/images/pmread.gif"><ELSE><img src="{TEMPLATESDIR}/images/pmunread.gif"></IF></td>
+ <td><IF {PMTOID}><a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a></IF></td>
+ <td><a href="privatemessaging.php?action=send&amp;draftid={PMID}">{PMSUBJECT}</a></td>
+ <td><a href="privatemessaging.php?action=send&amp;draftid={PMID}">{PMMESSAGE[50 <,> remove]}</a></td>
 </tr>
 <!-- END PMS -->
 </table>
Only in 320/: pmedit.tpl
diff -U 3 -H -b -B -E -d -- 320/pmlist.tpl 315/pmlist.tpl
--- 320/pmlist.tpl	2005-04-24 18:15:25.000000000 -0700
+++ 315/pmlist.tpl	2004-07-02 14:34:28.000000000 -0700
@@ -1,6 +1,6 @@
 <div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="privatemessaging.php">{LANG_TITLE_PM}</a> > {FOLDERNAME}</div><br>
 
-<p><a href="privatemessaging.php?action=send"><img src="{TEMPLATESDIR}/images/pmsend.gif" border="0" alt="Send PM"></a></p>
+<p><a href="privatemessaging.php?action=send">Compose a new PM</a></p>
 
 <form action="privatemessaging.php">
 <select name="folder">{FOLDEROPTIONS}</select>
@@ -11,28 +11,21 @@
 <form action="privatemessaging.php?filled=1&amp;folder={FOLDER}" method="post">
 <table width="100%">
 <tr>
- <td width="3%" {COLUMNHEADER}>&nbsp;</td>
- <td width="3%" {COLUMNHEADER}>&nbsp;</td>
- <td {COLUMNHEADER}>Subject</td>
- <td {COLUMNHEADER}>Preview</td>
- <td {COLUMNHEADER}>Date</td>
- <td {COLUMNHEADER}>From</td>
+ <td>&nbsp;</td>
+ <td>&nbsp;</td>
+ <td><span class="columnheader">Subject</span></td>
+ <td><span class="columnheader">Preview</span></td>
+ <td><span class="columnheader">Date</span></td>
+ <td><span class="columnheader">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" alt="replied"><ELSE><img src="{TEMPLATESDIR}/images/pmread.gif" alt="read"></IF>
-<ELSE>
- <img src="{TEMPLATESDIR}/images/pmunread.gif" alt="unread">
-</IF>
-</td>
- <td class="oddcolumns"><IF {PMFLAG}><img src="{TEMPLATESDIR}/images/flag.gif" alt="flagged">  </IF>
-<a href="privatemessaging.php?action=view&amp;id={PMID}">{PMSUBJECT}</a></td>
- <td class="evencolumns"><a href="privatemessaging.php?action=view&amp;id={PMID}">{PMMESSAGE[50 <,> remove]}</a></td>
- <td class="oddcolumns">{PMDATE}</td>
- <td class="evencolumns"><a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a></td>
+ <td><input type="checkbox" name="selectedpms[]" value="{PMID}"></td>
+ <td><IF {PMTIMEREAD}><img src="{TEMPLATESDIR}/images/pmread.gif"><ELSE><img src="{TEMPLATESDIR}/images/pmunread.gif"></IF></td>
+ <td><a href="privatemessaging.php?action=view&amp;id={PMID}">{PMSUBJECT}</a></td>
+ <td><a href="privatemessaging.php?action=view&amp;id={PMID}">{PMMESSAGE[50 <,> remove]}</a></td>
+ <td>{PMDATE}</td>
+ <td><a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a></td>
 </tr>
 <!-- END PMS -->
 </table>
@@ -41,28 +34,9 @@
 Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
 </IF>
 
-<p>With selected, 
-<select name="action">
-<option value="delete">delete</option>
-<option value="flag">flag/unflag</option>
-<option value="move">move to folder...</option>
-</select> <input type="submit" value="Go" class="button"></p>
-</form>
-
-<form action="privatemessaging.php?filled=1&amp;action=createfolder" method="post">
-<p>Create a new folder named <input type="text" name="foldername" size="15"> <input type="submit" value="Create" class="button">
-</form>
-
-<form action="privatemessaging.php?folder={FOLDER}" method="post">
-<center>Narrow to PMs containing <input type="text" name="searchterm" size="15"> <input type="submit" value="Search" class="button"></center>
+<p>With selected, <select name="action"><option value="delete">delete</option></select> <input type="submit" value="Go" class="button"></p>
 </form>
 
 <OTHERWISE>
 <p>You don't currently have any private messages in this folder.</p>
 </IF>
-
-<div class="legend">
-<img src="{TEMPLATESDIR}/images/pmunread.gif" alt="unread"> Unread PM <br>
-<img src="{TEMPLATESDIR}/images/pmread.gif" alt="read"> Read PM <br>
-<img src="{TEMPLATESDIR}/images/pmreplied.gif" alt="replied"> Replied to PM <br>
-</div>
\ No newline at end of file
Only in 320/: pmmove.tpl
diff -U 3 -H -b -B -E -d -- 320/pmsend.tpl 315/pmsend.tpl
--- 320/pmsend.tpl	2005-04-24 18:15:25.000000000 -0700
+++ 315/pmsend.tpl	2004-07-12 23:53:00.000000000 -0700
@@ -7,76 +7,47 @@
 <div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="privatemessaging.php">{LANG_TITLE_PM}</a> > {LANG_TITLE_SENDPM}</div><br>
 
 <IF {PREVIEWING}>
-<div class="post">{PREVIEW}</div>
+<div class="comment">{PREVIEW}</div>
 </IF>
 
 <p>{INCOMPLETEMESSAGE}</p>
 
-<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}">
+<form name="pmform" enctype="multipart/form-data" action="privatemessaging.php?filled=1&amp;action=send" method="post">
 <table {STANDARDTABLE}>
 <tr>
- <td class="labelscolumn"><span class="labels">Send to:</span></td>
- <td class="optionscolumn"><input type="text" name="sendto" value="{PMSENDTO}" size="{STANDARDSIZE}"></td>
+ <td valign="top" width="15%"><span class="labels">Send to:</span></td>
+ <td valign="top" width="85%"><input type="text" name="sendto" value="{PMSENDTO}"></td>
 </tr>
 <tr>
- <td class="labelscolumn"><span class="labels">Subject:</span></td>
- <td class="optionscolumn"><input type="text" name="subject" value="{PMSUBJECT}" size="{STANDARDSIZE}"></td>
+ <td valign="top" width="15%"><span class="labels">Subject:</span></td>
+ <td valign="top" width="85%"><input type="text" name="subject" value="{PMSUBJECT}"></td>
 </tr>
 <tr>
- <td class="labelscolumn"><span class="labels">Message: </span>
+ <td valign="top" width="15%"><span class="labels">Message: </span>
 <br><br>
-<center>
-<div class="smiliebox">
 <!-- BEGIN SMILIES -->
 <a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
 <!-- END SMILIES -->
-</div>
-</center>
-<br><IF {THISMEMBERPOSTEDITOR} is WYSIWYG>Drag a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.<ELSE>Click a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.</IF> You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400,scrollbars=yes');">WSN Codes</a> in your message.
+<br>Click a smilie to insert it into your message. You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400');">WSN Codes</a> in your message.
 </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', '{PMMESSAGEWYSIWYG}', 400, 200, true, false);
-</script>
-<OTHERWISE>
-<textarea name="message" rows="15" cols="80">{PMMESSAGE}</textarea>
-</IF>
- </td>
+ <td valign="top" width="85%"><textarea name="message" rows="20" cols="70">{PMMESSAGE}</textarea></td>
 </tr>
-<IF {THISMEMBERGROUPCANUPLOAD}>
 <tr>
- <td class="labelscolumn" width="20%"><span class="labels">Attach Files:</span></td>
- <td class="optionscolumn" width="80%"><input type="file" name="filefield"> <input type="submit" name="uploadattachment" value="Attach" class="button">
-<IF {PMNUMATTACHMENTS}>
-<br>Current Attachments:<br>
-<!-- BEGIN ATTACHMENTS -->
-<input type="checkbox" name="attachdelete[]" value="{ATTACHID}"> {ATTACHFILETITLE} ({ATTACHKB} KB)<br>
-<!-- END ATTACHMENTS -->
-<input type="submit" name="attachdeletion" value="Delete Selected" class="button">
-</IF>
-</td>
+ <td valign="top" width="15%"><span class="labels">Attach File:</span></td>
+ <td valign="top" width="85%">
+<IF {CURRENTATTACHMENT}>Currently attached: {PMATTACHMENTFILETITLE}<br>You may replace this by uploading a new file if you wish. <br><input type="hidden" name="oldattachment" value="{OLDATTACHMENT}"></IF>
+<input type="file" name="attachment"></td>
 </tr>
-</IF>
 
 <!-- INSERT NEW FIELDS HERE -->
 
-<IF {THISMEMBERGROUPCANPMIMPORTANT}>
 <tr>
- <td class="labelscolumn">&nbsp;</td>
- <td class="optionscolumn"><input type="checkbox" name="important" value="1"> Mark as important?
- <td>
+ <td>&nbsp;</td>
+ <td><input type="checkbox" name="preview" value="1"> Preview?<td>
 </tr>
-</IF>
 <tr>
- <td class="labelscolumn">&nbsp;<input type="hidden" name="draftid" value="{DRAFTID}"></td>
- <td class="optionscolumn"><input type="submit" value="Send" class="button"> or <input type="submit" name="preview" value="Preview" class="button"> or <input type="submit" name="draft" value="Save Draft" class="button"></td>
+ <td valign="top" width="15%">&nbsp;<input type="hidden" name="draftid" value="{DRAFTID}"></td>
+ <td valign="top" width="85%"><input type="submit" value="Send" class="button"> or <input type="submit" name="draft" value="Save Draft" class="button"></td>
 </tr>
 </table>
 </form>
\ No newline at end of file
diff -U 3 -H -b -B -E -d -- 320/pmsentitems.tpl 315/pmsentitems.tpl
--- 320/pmsentitems.tpl	2005-04-24 18:15:25.000000000 -0700
+++ 315/pmsentitems.tpl	2004-07-02 15:37:18.000000000 -0700
@@ -6,31 +6,24 @@
 </form>
 
 <IF {FOLDERTOTAL}>
-<form action="privatemessaging.php?filled=1&amp;sentitems=1&amp;folder=sent" method="post">
+<form action="privatemessaging.php?filled=1" method="post">
 <table width="100%">
 <tr>
- <td {COLUMNHEADER}>&nbsp;</td>
- <td {COLUMNHEADER}>&nbsp;</td>
- <td {COLUMNHEADER}>Sent To</td>
- <td {COLUMNHEADER}>Subject</td>
- <td {COLUMNHEADER}>Preview</td>
- <td {COLUMNHEADER}>Date Sent</td>
- <td {COLUMNHEADER}>Date Read</td>
+ <td>&nbsp;</td>
+ <td><span class="columnheader">Sent To</span></td>
+ <td><span class="columnheader">Subject</span></td>
+ <td><span class="columnheader">Preview</span></td>
+ <td><span class="columnheader">Date Sent</span></td>
+ <td><span class="columnheader">Date Read</span></td>
 </tr>
 <!-- BEGIN PMS -->
 <tr>
-  <td class="oddcolumns"><input type="checkbox" name="selectedpms[]" value="{PMID}"></td>
-  <td class="oddcolumns"><IF {PMTIMEREAD}><img src="{TEMPLATESDIR}/images/pmread.gif"><ELSE><img src="{TEMPLATESDIR}/images/pmunread.gif"></IF></td>
- <td class="evencolumns"><a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a></td>
-<IF {PMTIMEREAD}>
- <td class="oddcolumns"><a href="privatemessaging.php?action=view&amp;id={PMID}">{PMSUBJECT}</a></td>
- <td class="evencolumns"><a href="privatemessaging.php?action=view&amp;id={PMID}">{PMMESSAGE[50 <,> remove]}</a></td>
-<ELSE>
- <td class="oddcolumns"><a href="privatemessaging.php?action=edit&amp;id={PMID}">{PMSUBJECT}</a></td>
- <td class="evencolumns"><a href="privatemessaging.php?action=edit&amp;id={PMID}">{PMMESSAGE[50 <,> remove]}</a></td>
-</IF>
- <td class="oddcolumns">{PMDATE}</td>
- <td class="evencolumns"><IF {PMTIMEREAD}>{PMDATEREAD} <ELSE> unread</IF></td>
+  <td><IF {PMTIMEREAD}><img src="{TEMPLATESDIR}/images/pmread.gif"><ELSE><img src="{TEMPLATESDIR}/images/pmunread.gif"></IF></td>
+ <td><a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a></td>
+ <td><a href="privatemessaging.php?action=view&amp;id={PMID}">{PMSUBJECT}</a></td>
+ <td><a href="privatemessaging.php?action=view&amp;id={PMID}">{PMMESSAGE[50 <,> remove]}</a></td>
+ <td>{PMDATE}</td>
+ <td><IF {PMTIMEREAD}>{PMDATEREAD} <ELSE> unread</IF></td>
 </tr>
 <!-- END PMS -->
 </table>
@@ -38,10 +31,6 @@
 <IF {MULTIPAGE}>
 Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
 </IF>
-
-<p><input type="submit" name="deletesent" value="Delete Selected" class="button"></p>
-</form>
-
 <OTHERWISE>
 <p>You don't currently have any private messages in this folder.</p>
 </IF>
\ No newline at end of file
diff -U 3 -H -b -B -E -d -- 320/pmview.tpl 315/pmview.tpl
--- 320/pmview.tpl	2005-04-24 18:15:25.000000000 -0700
+++ 315/pmview.tpl	2004-07-04 00:28:00.000000000 -0700
@@ -1,52 +1,30 @@
 <div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="privatemessaging.php">{LANG_TITLE_PM}</a> > {PMSUBJECT}</div><br>
 
-<p><a href="privatemessaging.php?action=view&amp;id={PMID}&amp;historywith={MEMBERID}">Show Conversation History</a></p>
-
-<p><a href="privatemessaging.php?action=send&forwardpm={PMID}">Forward PM</a></p>
-
-<!-- BEGIN PM -->
 <table width="100%">
 <tr>
-<td width="20%" class="postauthor" 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>
-{MEMBERRANK}
-<br>
-<IF {MEMBERSHOWAVATAR}> <img src="attachments/avatars/{MEMBERAVATARNAME}" alt="avatar"> <br> </IF>
-
-<br><span class="labels">Group:</span> {MEMBERGROUPTITLE}
-<br><span class="labels">Joined:</span> {MEMBERREGDATE}
-<IF {MEMBERLOCATION}><br><span class="labels">Location:</span> {MEMBERLOCATION}</IF>
-<br>
-<br><span class="labels">Topics:</span> <a href="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERTOPICS}</a>
-<br><span class="labels">Posts:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERPOSTS}</a>
+<td width="20%" class="commentposter" valign="top">
+<span class="title"><a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a></span>  <br> <br>
+<IF {MEMBERAVATAR}> <img src="attachments/{MEMBERAVATARNAME}" alt=""> <br> </IF>
+<br><span class="labels">Total Links:</span> <a href="search.php?filled=1&whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERLINKS}</a>
+<br><span class="labels">Total Comments:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERCOMMENTS}</a>
 </td>
 
-<td width="80%" class="post" valign="top" height="100%">
+<td width="80%" class="comment" valign="top" height="100%">
 <table width="100%" height="100%">
 <tr valign="top">
- <td><span class="postdate">Sent: {PMDATE}</span></td>
+ <td><span class="commentdate">Sent: {PMDATE}</span></td>
 </tr>
   <tr valign="middle">
    <td height="100%" valign="top">{PMMESSAGE}
-<IF {PMNUMATTACHMENTS}>
-<br><br>Attached Files:<br>
-<table>
-<tr>
-<!-- BEGIN ATTACHMENTS -->
- <td>
-<a href="download.php?pmid={PMID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
-<IF {ATTACHISIMAGE}>
-<a href="download.php?pmid={PMID}&amp;attachid={ATTACHID}"><img src="thumbnail.php?pmid={PMID}&amp;attachid={ATTACHID}" border="0"></a><br>
-</IF>
-</td>
-<!-- END ATTACHMENTS -->
-</tr>
-</table>
-</IF>
    </td>
   </tr>
+  <IF {PMATTACHMENTFILENAME}>
+  <tr valign="bottom" width="100%">
+   <td valign="bottom"><br>Attached file: <a href="download.php?pmid={PMID}&amp;field=attachment">{PMATTACHMENTFILETITLE}</a>
+   <IF {PMATTACHMENTISIMAGE}><br> <a href="download.php?pmid={PMID}&amp;field=attachment"><img src="thumbnail.php?pmid={PMID}&amp;field=attachment" border="0"></a></IF>
+   </td>
+  </tr>
+  </IF>
   <IF {MEMBERUSERGROUP} is greater than 1 and {MEMBERHASSIG}>
   <tr valign="bottom" width="100%">
    <td valign="bottom">
@@ -59,6 +37,6 @@
 </td> 
 </tr>
 </table>
-<!-- END PM -->
 
-<p><a href="privatemessaging.php?action=send&sendto={MEMBERID}&quotepm={PMID}"><img src="{TEMPLATESDIR}/images/pmreply.gif" border="0"></a></p>
\ No newline at end of file
+
+<p><a href="privatemessaging.php?action=send&sendto={MEMBERID}&quotepm={PMID}">Reply to this PM</a></p>
\ No newline at end of file
Only in 320/: postreply.tpl
Only in 320/: printable.css
Only in 320/: print.tpl
diff -U 3 -H -b -B -E -d -- 320/promote.tpl 315/promote.tpl
--- 320/promote.tpl	2005-04-30 17:10:28.000000000 -0700
+++ 315/promote.tpl	2004-07-13 15:50:26.000000000 -0700
@@ -2,7 +2,7 @@
 
 <IF {MEMBERFUNDS}><p>You have ${MEMBERFUNDS} in funds remaining.</p></IF>
 
-<p>You may purchase promotion to the user group {SPONSORUSERGROUP1} at a rate of USD ${SPONSORCHARGE1} per <IF {SPONSORDURATION} is 1>day<ELSE>{SPONSORDURATION} days</IF>. Click the 'buy now' button to purchase however many days you wish.</p>
+<p>You may purchase promotion to the user group {SPONSORUSERGROUP1} at a rate of USD ${SPONSORCHARGE1} per day. Click the 'buy now' button to purchase however many days you wish.</p>
 
 <IF {SPONSORBONUSCUTOFF}><p>If your sponsorship purchase totals more than ${SPONSORBONUSCUTOFF}, you will be credited with an additional bonus of {SPONSORBONUSPERCENT}% of your deposit.</p></IF> 
 
@@ -24,12 +24,12 @@
 </IF>
 
 <IF {CHECKOUTNUM}>
-<form method="post" action="https://www.2checkout.com/2co/buyer/purchase"> 
+<form method="post" action="https://www.2checkout.com/cgi-bin/ccbuyers/purchase.2c"> 
 <input type="hidden" name="sid" value="{CHECKOUTNUM}"> 
 <input type="hidden" name="product_id" value="{SPONSORUGITEM1}"> 
-Purchase <input type="text" size="3" maxsize="4" name="quantity" value="1"> <IF {SPONSORDURATION} is 1>days<ELSE>group of {SPONSORDURATION} days</IF> of sponsorship <INPUT type="submit" value="Click to pay through 2CheckOut"> 
+Purchase <input type="text" size="3" maxsize="4" name="quantity" value="1"> days of sponsorship <INPUT type="submit" value="Click to pay through 2CheckOut"> 
 </form> 
-2CheckOut.com Inc (Ohio, USA) is an authorized reseller for [your name here]. 
+Goods and services provided by yourname here (XX, United States).<br> Sold by 2CheckOut.com Inc. (Ohio, USA). 
 </IF>
 
 <p>Thank you for sponsoring the directory.</p>
\ No newline at end of file
diff -U 3 -H -b -B -E -d -- 320/register.tpl 315/register.tpl
--- 320/register.tpl	2005-04-30 05:23:55.000000000 -0700
+++ 315/register.tpl	2004-08-27 22:02:30.000000000 -0700
@@ -11,8 +11,8 @@
  <td class="optionscolumn"><input type="text" name="name" size="{STANDARDSIZE}" value="{MEMBERNAME}" maxlength="{MAXUSERNAMELENGTH}"></td>
 </tr>
 <tr>
- <td class="labelscolumn"><span class="labels">E-mail:</span><br><IF {REGISTRATION} is email>Needed to activate your account.<ELSE>Needed if you lose your password.</IF></td>
- <td class="optionscolumn"><input type="text" name="email" size="{STANDARDSIZE}" value="{MEMBEREMAIL}"></td>
+ <td><span class="labels">E-mail:</span><br>Needed if you lose your password.</td>
+ <td><input type="text" name="email" size="{STANDARDSIZE}" value="{MEMBEREMAIL}"></td>
 </tr>
 <tr>
  <td width="20%"><span class="labels">Password:</span></td>
@@ -22,18 +22,17 @@
  <td width="20%"><span class="labels">Confirm password:</span><br>Retype above to confirm.</td>
  <td width="80%"><input type="password" name="passconfirm" size="{STANDARDSIZE}" value="{MEMBERPASSWORD}"></td>
 </tr>
-<IF not {SWITCH_QUICKREGISTRATION}>
 <tr>
  <td class="labelscolumn"><span class="labels">Style:</span></td>
  <td class="optionscolumn"><select name="stylesheet">{STYLEOPTIONS}</select></td>
 </tr>
 <tr>
- <td class="labelscolumn"><span class="labels">Template Set:</span></td>
- <td class="optionscolumn"><select name="thetemplate">{TEMPLATEOPTIONS}</select></td>
+ <td><span class="labels">Template Set:</span></td>
+ <td><select name="thetemplate">{TEMPLATEOPTIONS}</select></td>
 </tr>
 <tr>
- <td class="labelscolumn"><span class="labels">Allow e-mails from site administrator?</span></td>
- <td class="optionscolumn"><select name="allowemail">{MEMBERALLOWEMAILYESNO}</select></td> 
+ <td><span class="labels">Accept e-mails from site administrator?</span></td>
+ <td><select name="allowemail">{MEMBERALLOWEMAILYESNO}</select></td> 
 </tr>
 <tr>
  <td class="labelscolumn"><span class="labels">Allow e-mails from other users?</span></td>
@@ -41,7 +40,7 @@
 </tr>
 <tr>
  <td class="labelscolumn"><span class="labels">Receive email notification of every new link added to the directory?</span></td>
- <td class="optionscolumn"><select name="notifyoflinks">{MEMBERNOTIFYOFLINKSYESNO}</select></td>
+ <td class="optionscolumn"><select name="notifyoflinks"><option value="yes">{LANG_YES}</option><option value="no" selected>{LANG_NO}</option></select></td>
 </tr>
 <IF {SWITCH_PM}>
 <tr>
@@ -52,28 +51,8 @@
  <td class="labelscolumn"><span class="labels">Receive email notification of new private messages?</span></td>
  <td class="optionscolumn"><select name="notifyofpms">{MEMBERNOTIFYOFPMSYESNO}</select></td>
 </tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Show popup alert notification of new PMs?</span></td>
- <td class="optionscolumn"><select name="pmnotify">{MEMBERPMNOTIFYYESNO}</select></td>
-</tr>
-<IF {SWITCH_MODNOTIFY}>
-<tr>
- <td class="labelscolumn"><span class="labels">Notify me via PM of moderator actions taken on my links and comments?</span></td>
- <td class="optionscolumn"><select name="moderationpm">{MEMBERMODERATIONPMYESNO}</select></td>
-</tr>
-</IF>
-</IF>
-<IF {SWITCH_COMMENTS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Automatically subscribe to the comments thread of all links you submit?</span></td>
- <td class="optionscolumn"><select name="autosubscribe">{MEMBERAUTOSUBSCRIBEYESNO}</select></td>
-</tr>
 </IF>
 <tr>
- <td class="labelscolumn"><span class="labels">Subscription Notification Frequency:</span></td>
- <td class="optionscolumn"><select name="notifymethod">{MEMBERNOTIFYMETHODOPTIONS}</select></td>
-</tr>
-<tr>
  <td class="labelscolumn"><span class="labels">Time Zone:</span></td>
  <td class="optionscolumn"><select name="timezone">
 {FUNC_SELECTOPTIONS[-12,-11,-10,-9,-8,-7,-6,-5,-4,-3.5,-3,-2,-1,0,1,2,3,3.5,4,4.5,5,5.5,5.75,6,6.5,7,8,9,9.5,10,11,12,13 <,> GMT-12,GMT-11,GMT-10,GMT-9,GMT-8,GMT-7,GMT-6,GMT-5,GMT-4,GMT-3.5,GMT-3,GMT-2,GMT-1,GMT,GMT+1,GMT+2,GMT+3,GMT+3.5,GMT+4,GMT+4.5,GMT+5,GMT+5.5,GMT+5.75,GMT+6,GMT+6.5,GMT+7,GMT+8,GMT+9,GMT+9.5,GMT+10,GMT+11,GMT+12,GMT+13 <,> {MEMBERTIMEZONE}]}
@@ -87,110 +66,35 @@
   <option value="86400">{LANG_REGISTER_DAY}</option>
   <option value="604800">{LANG_REGISTER_WEEK}</option>
   <option value="2592000">{LANG_REGISTER_MONTH}</option>
-  <option value="31536000">{LANG_REGISTER_YEAR}</option>
- </select>
- </td>
-</tr>
-<IF {SWITCH_IMS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Accept instant messages from:</span></td>
- <td class="optionscolumn"><select name="acceptims"><option value="none">no one</option><option value="buddies">buddies only</option><option value="all" selected>everyone</option></select></td>
-</tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Comments per page:</span></td>
- <td class="optionscolumn"><select name="commentsperpage">{MEMBERCOMMENTSPERPAGEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Links per page:</span></td>
- <td class="optionscolumn"><select name="linksperpage">{MEMBERLINKSPERPAGEOPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Location:</span></td>
- <td class="optionscolumn"><input type="text" name="location" size="{STANDARDSIZE}" value="{MEMBERLOCATION}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Homepage:</span></td>
- <td class="optionscolumn"><input type="text" name="homepage" size="{STANDARDSIZE}" value="{MEMBERHOMEPAGE}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Occupation:</span></td>
- <td class="optionscolumn"><input type="text" name="occupation" size="{STANDARDSIZE}" value="{MEMBEROCCUPATION}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Biography:</span></td>
- <td class="optionscolumn"><textarea name="bio" rows="5" cols="45">{MEMBERBIO}</textarea></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Interests:</span></td>
- <td class="optionscolumn"><input type="text" name="interests" size="{STANDARDSIZE}" value="{MEMBERINTERESTS}"></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Instant Messanger Handles:</span></td>
- <td class="optionscolumn">
-AIM: <input type="text" name="aim" size="15" value="{MEMBERAIM}"><br>
-ICQ: <input type="text" name="icq" size="15" value="{MEMBERICQ}"><br>
-MSN: <input type="text" name="msn" size="15" value="{MEMBERMSN}"><br>
-YIM: <input type="text" name="yahoo" size="15" value="{MEMBERYAHOO}">
-</td>
-</tr>
-<IF {SWITCH_ONLINEUSERS}>
-<tr>
- <td class="labelscolumn"><span class="labels">Show my online status to:</span></td>
- <td class="optionscolumn">
-  <select name="visibility">
-   <option value="everyone">everyone</option>
-   <option value="buddies">buddies only</option>
-   <option value="nobody">nobody</option>
+  <option value="31536000" selected>{LANG_REGISTER_YEAR}</option>
   </select>
  </td>
 </tr>
-</IF>
-<tr>
- <td class="labelscolumn"><span class="labels">Birthdate:</span></td>
- <td class="optionscolumn">
-<select name="birthmonth"><option value=""></option>{MEMBERBIRTHMONTHOPTIONS}</select>
-<select name="birthday"><option value=""></option>{MEMBERBIRTHDAYOPTIONS}</select>
-<select name="birthyear"><option value=""></option>{MEMBERBIRTHYEAROPTIONS}</select>
-</td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Post Editor:</span></td>
- <td class="optionscolumn"><select name="posteditor">{MEMBERPOSTEDITOROPTIONS}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Show avatars by posts?</span></td>
- <td class="optionscolumn"><select name="showavatars">{MEMBERSHOWAVATARSYESNO}</select></td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Show signatures below posts?</span></td>
- <td class="optionscolumn"><select name="showsigs">{MEMBERSHOWSIGSYESNO}</select></td>
-</tr>
 
 <!-- INSERT NEW FIELDS HERE -->
 
 <IF {THISMEMBERGROUPISADMIN}>
 <tr>
  <td class="labelscolumn"><span class="labels">Link Total:</span></td>
- <td class="optionscolumn"><input type="text" name="topics" size="5" value="{MEMBERTOPICS}"></td> 
+ <td class="optionscolumn"><input type="text" name="links" size="5" value="{MEMBERLINKS}"></td> 
 </tr>
+<IF {SWITCH_COMMENTS}>
 <tr>
  <td class="labelscolumn"><span class="labels">Comment Total:</span></td>
- <td class="optionscolumn"><input type="text" size="5" name="posts" value="{MEMBERPOSTS}"></td> 
+ <td class="optionscolumn"><input type="text" size="5" name="comments" value="{MEMBERCOMMENTS}"></td> 
 </tr>
-<IF {SWITCH_MEMBERHITS}>
+</IF>
+<IF {SWITCH_HITS}>
 <tr>
- <td class="labelscolumn"><span class="labels">Link Views Total:</span></td>
+ <td class="labelscolumn"><span class="labels">Hits Out Total:</span></td>
  <td class="optionscolumn"><input type="text" size="5" name="totalhits" value="{MEMBERTOTALHITS}"></td> 
 </tr>
-</IF>
-</IF>
 <tr>
- <td class="labelscolumn"><span class="labels">Referring Member:</span>
-<br>If a current member of this forum recommended that you come here, type their username.</td>
- <td class="optionscolumn"><input type="text" name="referrer" size="{STANDARDSIZE}"></td>
+ <td class="labelscolumn"><span class="labels">Hits In Total:</span></td>
+ <td class="optionscolumn"><input type="text" name="totalhitsin" size="5" value="{MEMBERTOTALHITSIN}"></td>
 </tr>
 </IF>
+</IF>
 <IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
 <tr>
  <td><span class="labels">Security Image:</span>
diff -U 3 -H -b -B -E -d -- 320/reportcomment.tpl 315/reportcomment.tpl
--- 320/reportcomment.tpl	2005-04-29 11:44:25.000000000 -0700
+++ 315/reportcomment.tpl	2004-04-14 02:12:18.000000000 -0700
@@ -3,19 +3,7 @@
 <form action="reportcomment.php?filled=1" method="post">
 <table {STANDARDTABLE}>
 <tr>
- <td class="labelscolumn"><span class="labels">Type of Problem:</span></td>
- <td class="optionscolumn">
-  <select name="problemtype">
-   <option value=""></option>
-   <option value="spam">spam</option>
-   <option value="flaming">flaming</option>
-   <option value="low quality">low post quality</option>
-   <option value="other">other (describe below)</option>
-  </select>
- <td>
-</tr>
-<tr>
- <td class="labelscolumn"><span class="labels">Details of Problem:</span></td>
+ <td class="labelscolumn"><span class="labels">Explain the nature of the problem:</span></td>
  <td class="optionscolumn"><textarea cols="45" rows="5" name="comment"></textarea><td>
 </tr>
 <IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
Only in 320/: richtext.js
Only in 320/: rssfeed.tpl
diff -U 3 -H -b -B -E -d -- 320/searchadvanced.tpl 315/searchadvanced.tpl
--- 320/searchadvanced.tpl	2005-04-30 09:39:06.000000000 -0700
+++ 315/searchadvanced.tpl	2004-06-29 04:27:54.000000000 -0700
@@ -1,17 +1,5 @@
 <div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Advanced Search</div><br>
 
-<p><span class="labels">Quick Search</span></p>
-
-<form action="search.php?filled=1&amp;condition={DEFAULTSEARCHTYPE}" method="post">
-<input type="text" name="search" size="{STANDARDSIZE}">
-<select name="whichtype">
-<option value="links">search links</option>
-<option value="comments">search comments</option>
-</select>
-<input type="submit" value="Search" class="button"></form>
-
-<p><span class="labels">Advanced Search</span></p>
-
 <p>Leave fields blank where you don't wish to filter by that field.</p>
 
 <form action="search.php?action=filter&filled=1&amp;whichtype=links" method="post">
@@ -174,7 +162,7 @@
 
 <form action="search.php?action=filter&filled=1&whichtype=comments" method="post">
 Find all comments where 
-<br>the commenter name <select name="posternamecondition">
+<br>the poster name <select name="posternamecondition">
  <option value="like">contains</option>
  <option value="=">is exactly</option>
  <option value="!=">is not</option>
@@ -220,25 +208,6 @@
  <option value="bool">boolean</option>
 </select>
 <input type="text" size="{STANDARDSIZE}" name="namesearch">
-<input type="text" size="{STANDARDSIZE}" name="namesearch">
-<br>and the member's location <select name="locationcondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value="or">has any of the words</option>
- <option value="and">has all of the words</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="locationsearch">
-<br>and the member's interests <select name="interestscondition">
- <option value="like">contains</option>
- <option value="=">is exactly</option>
- <option value="!=">is not</option>
- <option value="or">has any of the words</option>
- <option value="and">has all of the words</option>
- <option value="bool">boolean</option>
-</select>
-<input type="text" size="{STANDARDSIZE}" name="interestssearch">
 <br>and the number of links submitted <select name="linkscondition">
  <option value="like">contains</option>
  <option value="=">is exactly</option>
Only in 320/: searchips.tpl
diff -U 3 -H -b -B -E -d -- 320/searchmembers.tpl 315/searchmembers.tpl
--- 320/searchmembers.tpl	2005-04-24 18:15:25.000000000 -0700
+++ 315/searchmembers.tpl	2004-08-05 22:38:08.000000000 -0700
@@ -10,7 +10,7 @@
  <option value="name">name</option>
  <option value="links">links submitted</option>
 <IF {SWITCH_COMMENTS}>
- <option value="comments">comments commented</option>
+ <option value="comments">comments posted</option>
 </IF>
  <option value="time">registration date</option>
 </select>
Only in 320/: shoutedit.tpl
Only in 320/: shoutframe.tpl
diff -U 3 -H -b -B -E -d -- 320/showvotecode.tpl 315/showvotecode.tpl
--- 320/showvotecode.tpl	2005-04-26 01:35:06.000000000 -0700
+++ 315/showvotecode.tpl	2003-12-04 13:32:34.000000000 -0800
@@ -17,8 +17,3 @@
 </form>
 </textarea>
 </center>
-
-<p>If you prefer a simple link, you can get credit for people you send to {SITETITLE} by using this linking code:</p>
-<center>
-<textarea rows="5" cols="70"><a href="{DIRURL}/in.php?id={LINKID}">{SITETITLE}</a></textarea>
-</center>
\ No newline at end of file
Only in 320/: smilies.tpl
diff -U 3 -H -b -B -E -d -- 320/sponsor.tpl 315/sponsor.tpl
--- 320/sponsor.tpl	2005-04-30 17:12:19.000000000 -0700
+++ 315/sponsor.tpl	2004-07-13 01:56:26.000000000 -0700
@@ -2,7 +2,7 @@
 
 <IF {LINKFUNDS}><p>You have ${LINKFUNDS} in funds remaining.</p></IF>
 
-<p>You may purchase priority positioning for "{LINKTITLE}" at a rate of USD ${SPONSORCHARGE1} per <IF {SPONSORUSEPPC} is yes>click<ELSE><IF {SPONSORDURATION} is 1>day<ELSE>{SPONSORDURATION} days</IF></IF>. Click the 'buy now' button to purchase however many days of sponsorship you wish.</p>
+<p>You may purchase priority positioning for "{LINKTITLE}" at a rate of USD ${SPONSORCHARGE1} per <IF {SPONSORUSEPPC} is yes>click<ELSE>day</IF>. Click the 'buy now' button to purchase however many days of sponsorship you wish.</p>
 
 <IF {SPONSORBONUSCUTOFF}><p>If your sponsorship purchase totals more than ${SPONSORBONUSCUTOFF}, you will be credited with an additional bonus of {SPONSORBONUSPERCENT}% of your deposit.</p></IF> 
 
@@ -24,12 +24,12 @@
 </IF>
 
 <IF {CHECKOUTNUM}>
-<form method="post" action="https://www.2checkout.com/2co/buyer/purchase"> 
+<form method="post" action="https://www.2checkout.com/cgi-bin/ccbuyers/purchase.2c"> 
 <input type="hidden" name="sid" value="{CHECKOUTNUM}"> 
 <input type="hidden" name="product_id" value="{SPONSORITEM1}"> 
-Purchase <input type="text" size="3" maxsize="4" name="quantity" value="1"> <IF {SPONSORDURATION} is 1>days<ELSE>group of {SPONSORDURATION} days</IF> of sponsorship <INPUT type="submit" value="Click to pay thru 2CheckOut"> 
+Purchase <input type="text" size="3" maxsize="4" name="quantity" value="1"> days of sponsorship <INPUT type="submit" value="Click to pay thru 2CheckOut"> 
 </form> 
-2CheckOut.com Inc (Ohio, USA) is an authorized reseller for [your name here]. 
+Goods and services provided by yourname here (your state, your country).<br> Sold by 2CheckOut.com Inc. (Ohio, USA). 
 </IF>
 
 <p>Thank you for sponsoring the directory.</p>
\ No newline at end of file
diff -U 3 -H -b -B -E -d -- 320/subscriptions.tpl 315/subscriptions.tpl
--- 320/subscriptions.tpl	2005-04-30 06:24:48.000000000 -0700
+++ 315/subscriptions.tpl	2004-06-23 21:12:18.000000000 -0700
@@ -1,31 +1,11 @@
 <div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > Manage Subscriptions</div>
 
 <form action="profile.php?filled=1&amp;id={MEMBERID}&amp;action=unsubscribe" method="post">
-<p>Link thread subscriptions:</p>
-<table width="96%" cellpadding="3" cellspacing="1" border="0">
-<tr>
- <td {COLUMNHEADER}>&nbsp;</td>
- <td {COLUMNHEADER}>Thread</td>
- <td {COLUMNHEADER}>Description</td>
- <td {COLUMNHEADER}>Comments</td>
- <td {COLUMNHEADER}>Created</td>
- <td {COLUMNHEADER}>Last Post</td>
-</tr>
+<p>Link subscriptions:</p>
 <!-- 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">{TOPICLASTCOMMENTDATE} <br>By <IF {TOPICLASTPOSTERID}><a href="memberlist.php?action=profile&amp;id={TOPICLASTPOSTERID}">{TOPICLASTPOSTERNAME}</a><ELSE>{TOPICLASTPOSTERNAME}</IF>
-<a href="comments.php?id={TOPICID}&amp;page=last#lastpost"><img src="{TEMPLATESDIR}/images/lastpost.gif" border="0" alt="last post"></a>
-</td>
-</tr>
 <!-- END TOPLIST 1 -->
-</table>
 
 <p>Category subscriptions:</p>
 <!-- BEGIN TOPLIST 2 -->
diff -U 3 -H -b -B -E -d -- 320/suggestcat.tpl 315/suggestcat.tpl
--- 320/suggestcat.tpl	2005-05-01 17:36:49.000000000 -0700
+++ 315/suggestcat.tpl	2005-04-15 23:56:12.000000000 -0700
@@ -24,11 +24,6 @@
 </tr>
 <IF {THISMEMBERGROUPCANDOFULLEDIT}>
 <tr>
- <td class="labelscolumn"><span class="labels">Act as Link:</span>
-<br>If this is filled in with a URL, clicking on the category will redirect people to the URL.</td>
- <td class="optionscolumn"><input type="text" name="actaslink" value="{CATACTASLINK}" size="{STANDARDSIZE}"></td>
-</tr>
-<tr>
  <td class="labelscolumn"><span class="labels">Moderators:</span>
 <br>Separate the usernames of the moderators with a comma.</td>
  <td class="optionscolumn"><input type="text" name="moderators" size="{STANDARDSIZE}" value="{CATMODERATORS}"></td>
@@ -93,11 +88,6 @@
  <td class="optionscolumn"><input type="text" name="linkcols" size="2" value="{CATLINKCOLS}"></td>
 </tr>
 <tr>
- <td class="labelscolumn" valign="top"><span class="labels">Default to no access?</span>
-<br>Useful for a category where any future usergroups you may add shouldn't be defaulted to being able to view it.</td>
- <td class="optionscolumn"><select name="defaultnoaccess">{DEFAULTNOACCESSNOYES}</select></td>
-</tr>
-<tr>
  <td class="labelscolumn" valign="top"><span class="labels">Category usergroup permissions:</span></td>
  <td class="optionscolumn">{CATPERMISSIONSLIST}</td>
 </tr>
diff -U 3 -H -b -B -E -d -- 320/suggestlink.tpl 315/suggestlink.tpl
--- 320/suggestlink.tpl	2005-04-27 13:19:38.000000000 -0700
+++ 315/suggestlink.tpl	2005-05-23 17:44:11.000000000 -0700
@@ -38,12 +38,10 @@
  <td class="optionscolumn"><textarea name="description" rows="5" cols="45" onKeyDown="textCounter(submitform.description,submitform.remLen,{DESCRIPLENGTH});" onKeyUp="textCounter(submitform.description,submitform.remLen,{DESCRIPLENGTH});">{LINKDESCRIPTION}</textarea>
 <br><input readonly type="text" name="remLen" size="4" maxlength="4" value="{DESCRIPLENGTH}"> characters remaining</td>
 </tr>
-<IF {SWITCH_TOPICTYPES}>
 <tr>
  <td class="labelscolumn"><span class="labels">Type of Link:</span></td>
  <td class="optionscolumn"><select name="type">{TYPEOPTIONS}</select></td>
 </tr>
-</IF>
 <IF not {ISALBUM}>
 <tr>
  <td class="labelscolumn"><span class="labels">Reciprocal Link URL:</span><br>(If reciprocal was chosen above... otherwise leave blank.)</td>
diff -U 3 -H -b -B -E -d -- 320/tos.tpl 315/tos.tpl
--- 320/tos.tpl	2005-04-24 18:15:25.000000000 -0700
+++ 315/tos.tpl	2004-08-27 01:57:00.000000000 -0700
@@ -9,7 +9,19 @@
 <body>
 <p>In using this website you agree to the following terms:</p>
 
-<p>{TERMSOFSERVICE}</p>
+<p align="center">
+<textarea rows="15" cols="50">
+- The site administrators reserve the right to edit or remove any content you submit. Your content may also be reused in different places in different contexts around the site.
+
+- You may not submit illegal content.
+
+- Attempting to flood with many submissions is not allowed, nor are automated submissions are allowed.
+
+- Comment posts may not be abusive, and must remain related to the link.
+
+- Usage of the email features (if enabled) may not be abused to attempt to send spam.
+</textarea>
+</p>
 
 </body>
 </html>
\ No newline at end of file
Only in 320/: usernotes.tpl
diff -U 3 -H -b -B -E -d -- 320/viewcomments.tpl 315/viewcomments.tpl
--- 320/viewcomments.tpl	2005-04-25 05:19:31.000000000 -0700
+++ 315/viewcomments.tpl	2004-08-31 15:16:46.000000000 -0700
@@ -7,128 +7,70 @@
 <div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> {NAVIGATION} > <a href="link.php?action=detail&amp;id={LINKID}">{LINKTITLE}</a> > Comments</div><br>
 
 <p>Comments about <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a>:</p>
-
-<IF {LINKDELETED}><div class="details">This thread has been deleted.</div></IF>
-
-<IF {LINKCANEDIT}>
-<br><form action="threadadmin.php">
-<input type="hidden" name="id" value="{LINKID}">
-Thread Tools:<br> <select name="action">
-<IF {THISMEMBERISADMIN} or {CATISMODERATOR}>
-<option value="close"><IF {LINKTHREADCLOSED}>Open<ELSE>Close</IF> Thread</option>
-<option value="bulkedit">Edit/Move/Delete Posts</option>
-</IF>
-<IF {THISMEMBERGROUPCANVIEWDELETED}>
-<option value="showdeleted">Show Deleted Posts ({LINKDELETEDPOSTS})</option>
-</IF>
-<IF {THISMEMBERISADMIN}>
-<option value="regeneratethread">Regenerate Thread</option>
-</IF>
-</select>
-<input type="submit" value="Go" class="button">
-</form>
-</IF>
-
-<table width="100%">
-<tr>
- <td align="left">
-| <a href="printthread.php?id={LINKID}">Print</a> | <IF {SWITCH_ALBUMS} and {THISMEMBERISREGISTERED}><a href="albums.php?add={LINKID}">Add to List</a> | </IF>
 <IF {THISMEMBERISREGISTERED} and {SWITCH_SUBSCRIPTIONS}>
-<IF {THISMEMBERSUBSCRIBEDTO[{LINKID}]}><a href="comments.php?id={LINKID}&amp;action=subscribe">Unsubscribe</a><OTHERWISE>
-<a href="comments.php?id={LINKID}&amp;action=subscribe">Subscribe</a></IF>
-</IF> <IF {THISMEMBERISREGISTERED}>|</IF>
- </td>
- <td align="right">
-<IF {LINKCANPOST}><p align="right"><a href="postreply.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/postreply.gif" border="0" alt="Post Reply"></a></p></IF>
- </td>
-</tr>
-</table>
-
-<IF {MULTIPAGE}>
-Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
+<IF {THISMEMBERSUBSCRIBEDTO[{LINKID}]}>
+<p align="right">
+<a href="comments.php?id={LINKID}&amp;action=subscribe">Unsubscribe</a>
+</p>
+<OTHERWISE>
+<p align="right">
+<a href="comments.php?id={LINKID}&amp;action=subscribe">Subscribe</a>
+</p>
+</IF>
 </IF>
 
 <table width="100%">
 <!-- BEGIN POST -->
 <!-- BEGIN REGULAR -->
 <tr>
-<td height="100%" class="commentposter" valign="top">
-
-<a name="comment{COMMENTID}"></a>
+<td width="20%" class="commentposter" valign="top">
+<a name="post{COMMENTID}">
 <IF {MEMBERUSERGROUP} is 1>
-<span class="{MEMBERGROUPNAMESTYLE}">{COMMENTPOSTERNAME}</span><br>
+<span class="title">{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="attachments/avatars/{MEMBERAVATARNAME}" alt="avatar"> <br> </IF>
-
-<br><span class="labels">Group:</span> {MEMBERGROUPTITLE}
-<br><span class="labels">Joined:</span> {MEMBERREGDATE}
-<IF {MEMBERLOCATION}><br><span class="labels">Location:</span> {MEMBERLOCATION}</IF>
-<br>
-
-<IF {THISMEMBERISREGISTERED}>
-<br><span class="labels">Topics:</span> <a href="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERTOPICS}</a>
-<br><span class="labels">Posts:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERPOSTS}</a>
-<ELSE>
-<br><span class="labels">Topics:</span> {MEMBERTOPICS}
-<br><span class="labels">Posts:</span> {MEMBERPOSTS}
-</IF>
-
-</IF>
-
-<IF {SWITCH_REPORTS} and {THISMEMBERGROUPCANREPORT}><br><br><a href="reportcomment.php?id={COMMENTID}"><img src="{TEMPLATESDIR}/images/report.gif" border="0" alt="report bad post"></a></IF>
-
-<IF {SWITCH_RATINGS} and {THISMEMBERGROUPCANRATECOMMENTS}>
-<br><br>Rate this post: <a href="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}&amp;votevalue=plus&amp;voteplus=1">
-<img src="{TEMPLATESDIR}/images/plus.gif" border="0" alt="rate post up"></a> <a href="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}&amp;votevalue=minus&amp;voteminus=1">
-<img src="{TEMPLATESDIR}/images/minus.gif" border="0" alt="rate post down"></a>
+<span class="title"><a href="memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a></span> {MEMBERADMIN} <br> <br>
+<IF {MEMBERAVATAR}> <img src="attachments/{MEMBERAVATARNAME}" alt=""> <br> </IF>
+<br><span class="labels">Total Links:</span> <a href="search.php?filled=1&whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERLINKS}</a>
+<br><span class="labels">Total Comments:</span> <a href="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">{MEMBERCOMMENTS}</a>
 </IF>
+<IF {SWITCH_REPORTS}><br><br>[<a href="reportcomment.php?id={COMMENTID}">Report Comment</a>]</IF>
 
-<IF {THISMEMBERGROUPCANVIEWIP}><br><br>IP: <a href="searchips.php?filled=1&getmembers=1&ip={COMMENTIP}">{COMMENTIP}</a></IF>
+<table>
+<tr>
+<td valign="top">
+<form action="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}" method="post" style="margin-bottom:0;"> <input type="hidden" name="votevalue" value="plus">
+<input type="image" src="{TEMPLATESDIR}/images/plus.gif" name="voteplus" style="border:0px"></form> 
+</td>
+<td valign="top">
+<form action="comments.php?action=rate&amp;id={LINKID}&amp;commentid={COMMENTID}" method="post" style="margin-bottom:0;"> <input type="hidden" name="votevalue" value="minus">
+<input type="image" src="{TEMPLATESDIR}/images/minus.gif" name="voteminus" style="border:0px"></form> 
+</td>
+</tr>
+</table>
 
 </td>
 
 <td width="80%" class="comment" valign="top" height="100%">
-<table width="100%">
+<table width="100%" height="100%">
 <tr valign="top">
 <td align="left"><span class="commentdate">
-<IF {COMMENTVOTES} is greater than 0>{COMMENTAPPROVED} of {COMMENTVOTES} people found this post helpful <br></IF>
-Posted {COMMENTDATE}:</span> <IF {COMMENTCANEDIT}><a href="edit.php?action=comment&amp;field=id&amp;condition=equals&amp;fieldvalue={COMMENTID}"><img src="{TEMPLATESDIR}/images/editpost.gif" border="0" alt="edit"></a></IF> 
-<IF {COMMENTTITLE}><br>{COMMENTICONIMAGE} Subject: <span class="important">{COMMENTTITLE}</span> <ELSE><br>{COMMENTICONIMAGE} </IF>
-</td>
-<td align="right"><a href="postreply.php?id={LINKID}&amp;quotepost={COMMENTID}#postarea"><img src="{TEMPLATESDIR}/images/quote.gif" border="0" alt="quote post"></a> <br>#{COMMENTNUMBER}</td>
+<IF {COMMENTVOTES} is greater than 0>{COMMENTAPPROVED} of {COMMENTVOTES} people found this comment helpful <br></IF>
+Posted {COMMENTDATE}:</span> {COMMENTADMIN} </td>
+<td align="right"><a href="comments.php?id={LINKID}&amp;quotepost={COMMENTID}#postarea"><img src="{TEMPLATESDIR}/images/quote.gif" border="0"></a></td>
   </tr>
   <tr valign="middle">
    <td height="100%" valign="top">{COMMENTMESSAGE}
-   <IF {COMMENTLASTEDITDATE}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
+   <IF {COMMENTLASTEDITBY}><br><br><span class="editedby">Edited by {COMMENTLASTEDITBY} on {COMMENTLASTEDITDATE}<IF {COMMENTEDITREASON}>. Reason: {COMMENTEDITREASON}</IF></span></IF>
    </td>
   </tr>
-  <tr valign="bottom">
+  <IF {MEMBERUSERGROUP} is greater than 1 and {MEMBERHASSIG}>
+  <tr valign="bottom" width="100%">
    <td valign="bottom">
-<IF {COMMENTNUMATTACHMENTS}>
-<br>Attached Files:<br>
-<table>
-<tr>
-<!-- BEGIN ATTACHMENTS -->
-<td valign="top"><a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}">{ATTACHFILETITLE}</a> ({ATTACHKB} KB, {ATTACHDOWNLOADS} downloads)<br>
-<IF {ATTACHISIMAGE}>
-<a href="download.php?comid={COMMENTID}&amp;attachid={ATTACHID}"><img src="thumbnail.php?comid={COMMENTID}&amp;attachid={ATTACHID}" border="0" alt="attachment"></a>
-</IF>
-</td>
-<!-- END ATTACHMENTS -->
-</tr>
-</table>
-</IF>
-  <IF {COMMENTSHOWSIG}>
      <br>_____________________
      <br>{MEMBERSIGNATURE}
-  </IF>
    </td>
   </tr>
+  </IF>
 </table>
 </td> 
 </tr>
@@ -140,19 +82,19 @@
 Page: {PREVIOUS} <b>{CURRENTPAGE}</b> {NEXT}
 </IF>
 
-<IF {LINKCANPOST}><p align="right"><a href="postreply.php?id={LINKID}"><img src="{TEMPLATESDIR}/images/postreply.gif" border="0" alt="Post Reply"></a></p></IF>
+<span class="important">{INCOMPLETE}</span>
 
+<p>Post a new comment about <a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a>:</p>
 
-<a name="commentarea"></a>
+<a name="postarea"></a>
 
-<IF {LINKCANPOST}>
-<p>Post a quick reply:</p>
-<form <IF {THISMEMBERPOSTEDITOR} is WYSIWYG>onsubmit="return submitForm();"</IF> enctype="multipart/form-data" name="commentform" action="postreply.php?filled=1&amp;id={LINKID}" method="comment">
+<IF {THISMEMBERGROUPCANSUBMITCOMMENTS}>
+<form enctype="multipart/form-data" name="commentform" action="comments.php?action=post&amp;filled=1" method="post">
 <table>
 <IF {THISMEMBERUSERGROUP} is 1>
 <tr>
  <td valign="top"><span class="labels">Your Name:</span></td>
- <td valign="top"><input type=text name="commentername" value="{COMMENTPOSTERNAME}"></td>
+ <td valign="top"><input type=text name="postername" value="{COMMENTPOSTERNAME}"></td>
 </tr>
 </IF>
 <input type="hidden" name="type" value="regular">
@@ -160,31 +102,15 @@
 <!-- INSERT NEW FIELDS HERE -->
 
 <tr>
- <td valign="top" width="25%"><span class="labels">Your post:</span>
+ <td valign="top" width="25%"><span class="labels">Your comment:</span>
 <br><br>
-<center>
-<div class="smiliebox">
 <!-- BEGIN SMILIES -->
 <a onclick="javascript:update('{ORIGINAL}')">{REPLACEMENT}</a>
 <!-- END SMILIES -->
-</div>
-</center>
-<br><IF {THISMEMBERPOSTEDITOR} is WYSIWYG>Drag a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.<ELSE>Click a <a href="index.php?custom=yes&amp;TID=smilies&amp;usewrapper=no" target="win" onClick="window.open('','win','width=400,height=350,scrollbars=yes');">smilie</a> to insert it into your message.</IF> You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400,scrollbars=yes');">WSN Codes</a> in your message.</td>
+<br>Click a smilie to insert it into your message. You may also use <a href="index.php?custom=yes&amp;TID=codes&amp;headerfooter=no&amp;trimhtmlto=10" target="win" onClick="window.open('','win','width=610,height=400');">WSN Codes</a> in your message.</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>
+ <td valign="top" width="75%"><textarea name="message" rows="8" cols="70">{COMMENTMESSAGE}</textarea></td>
+</tr>
 <IF {SECURITYIMAGE} and {THISMEMBERISGUEST}>
 <tr>
  <td><span class="labels">Security Image:</span>
@@ -194,26 +120,18 @@
 </IF>
 <tr>
  <td>&nbsp;<input type="hidden" name="linkid" value="{LINKID}"><input type="hidden" name="linkname" value="{LINKTITLE}"></td>
- <td><input type="submit" value="Submit" class="button"> <input type="submit" name="preview" value="Advanced" class="button"></td>
+ <td><input type="submit" value="Post Comment" class="button"></td>
 </tr>
 </table>
 </form>
 <OTHERWISE>
-<IF {LINKTHREADCLOSED}>
-<p>This thread is closed, so you cannot post a reply.</p>
-<OTHERWISE>
-<p>You don't have permission to post replies.</p> 
-<IF {CATREQLINKS} or {CATREQCOMS}>
-<p>You must have at least {CATREQLINKS} topics and {CATREQCOMS} posts elsewhere before you can post in this forum.</p>
-</IF>
-<IF {THISMEMBERISGUEST}>Please <a href="index.php?action=userlogin">login</a> or <a href="register.php">register</a>.</IF>
-</IF>
+You don't have permission to post comments. Please <a href="index.php?action=userlogin">login</a> or <a href="register.php">register</a>.
 </IF>
 
 <IF {SWITCH_ONLINEUSERS}>
-<br><br>Members currently reading this topic: 
+<br>Members currently reading this thread: 
 <!-- BEGIN TOPLIST 3 -->
 <CONFIG>online,time,100,descending,threadid={LINKID} AND memberid>0,,</CONFIG>
-<a href="memberlist.php?action=profile&amp;id={ONLINEID}">{ONLINENAME}</a>,  
+<a href="memberlist.php?action=profile&id={ONLINEID}">{ONLINENAME}</a>,  
 <!-- END TOPLIST 3 -->
 </IF>
diff -U 3 -H -b -B -E -d -- 320/viewprofile.tpl 315/viewprofile.tpl
--- 320/viewprofile.tpl	2005-04-30 06:01:13.000000000 -0700
+++ 315/viewprofile.tpl	2004-08-22 16:50:52.000000000 -0700
@@ -1,131 +1,47 @@
 <div class="nav"><a href="index.php">{LANG_NAVORIGIN}</a> > <a href="memberlist.php">Member List</a> > {MEMBERNAME}</div><br>
 
-<p><span class="title">Profile of {MEMBERNAME}</span></p>
-
-<IF {MEMBERBANNED}><b><i>This member has been banned.</i></b></IF>
-
-<IF {THISMEMBERISADMIN} or {THISMEMBERGROUPCANVIEWDELETED} or {THISMEMBERGROUPCANVIEWMODLOG}>
-<p>
-<form action="redirecttourl.php">
-Admin Options: 
-<select name="destination">
-<IF {THISMEMBERGROUPCANEDITALLPROFILES}>
- <option value="edit.php?action=member&amp;field=id&amp;condition=equals&amp;fieldvalue={MEMBERID}">Edit Profile</option></IF>
-<IF {THISMEMBERISADMIN}>
- <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}">Ban</option>
- <option value="[IFADMINadmin/]useradmin.php?action=ban&amp;id={MEMBERID}&partial=1">Partially Ban (from categories/threads)</option>
- <option value="[IFADMINadmin/]useradmin.php?action=suspend&amp;id={MEMBERID}">Suspend Member</option>
-</IF>
-<option value="usernotes.php?id={MEMBERID}&amp;modnote=1">Moderator Notes ({MEMBERMODNOTES})</option>
-<IF {THISMEMBERGROUPCANVIEWMODLOG}>
- <option value="modlog.php?action=modlogon&amp;id={MEMBERID}">Show Moderating History on Member</option>
-</IF>
-<IF {THISMEMBERGROUPCANVIEWDELETED}>
- <option value="search.php?filled=1&amp;whichtype=links&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;deletedonly=1">Show Deleted Links by member</option>
- <option value="search.php?filled=1&amp;whichtype=comments&amp;condition==&amp;searchfields[0]=ownerid&amp;search={MEMBERID}&amp;deletedonly=1">Show Deleted Comments by Member</option>
-</IF>
-<IF {THISMEMBERISADMIN}>
- <option value="[IFADMINadmin/]updatecounters.php?filled=1&amp;regenone=1&amp;action=members&amp;id={MEMBERID}">Regenerate Member Counters</option>
-</IF>
-</select>
-<input type="submit" value="Go" class="button">
-</form>
-</p>
-</IF>
-
-<IF {MEMBERCANBEVIEWED}>
-<p>
-Last seen: {MEMBERLASTVISITDATE}
-<IF {MEMBERISONLINE}>
-<!-- BEGIN TOPLIST 3 -->
-<CONFIG>online,time,1,descending,memberid={MEMBERID}</CONFIG>
-<br>Current Location: <a href="{ONLINELOCATION}">{ONLINEAREANAME}</a>
-<!-- END TOPLIST 3 -->
-</IF>
-</p>
-</IF>
+<p><span class="title">Profile of {MEMBERNAME}</span> {MEMBERADMIN}</p>
 
-<table width="100%">
-<tr>
-<td width="50%" valign="top" class="evencolumns">
-<p align="center"><span class="labels">Contact Information</span></p>
+<IF {MEMBERAVATAR}> <img src="attachments/{MEMBERAVATARNAME}" alt=""> <br> </IF>
 
 <IF {MEMBERALLOWUSEREMAIL} and {THISMEMBERGROUPCANEMAILMEMBERS} and {MEMBERHASEMAIL}>
 <p><span class="labels">E-Mail:</span> <a href="emailmember.php?id={MEMBERID}">Send an E-mail to {MEMBERNAME}</a></p>
 </IF>
 
-<IF {SWITCH_GUESTBOOK}><p><span class="labels">Guestbook:</span> <a href="usernotes.php?id={MEMBERID}">View or sign {MEMBERNAME}'s guestbook ({MEMBERGUESTNOTES})</a></p></IF>
-
-<IF {SWITCH_PM} and {MEMBERACCEPTPMS}><p><span class="labels">Private Messaging:</span> <a href="privatemessaging.php?action=send&amp;sendto={MEMBERID}">Send a PM to {MEMBERNAME}</a></p></IF>
-
-<IF {MEMBERREADYTOCHAT}>
-<p><span class="labels">Instant Messaging:</span> <a href="im.php?with={MEMBERID}" target="win" onClick="window.open('','win','{IMDIMENSIONS}');">Send an instant message to {MEMBERNAME}</a></p></IF>
-
-<p><IF {MEMBERAIM}>AIM: {MEMBERAIM}<br></IF>
-<IF {MEMBERICQ}>ICQ: {MEMBERICQ}<br></IF>
-<IF {MEMBERMSN}>MSN: {MEMBERMSN}<br></IF>
-<IF {MEMBERYAHOO}>YIM: {MEMBERYAHOO}</IF></p>
-
-</td>
-<td width="50%" valign="top" class="evencolumns">
-<p align="center"><span class="labels">Biographical Information</span></p>
-
-<IF {MEMBERLOCATION}><p><span class="labels">Location:</span> {MEMBERLOCATION}</p></IF>
-
-<IF {MEMBERHOMEPAGE}><p><span class="labels">Homepage:</span> <a href="{MEMBERHOMEPAGE}">{MEMBERHOMEPAGE}</a></p></IF>
-
-<IF {MEMBEROCCUPATION}><p><span class="labels">Occupation:</span> {MEMBEROCCUPATION}</p></IF>
-
-<IF {MEMBERBIRTHDAY}><p><span class="labels">Birthday:</span> {MEMBERBIRTHMONTHNAME} {MEMBERBIRTHDAY}<IF {MEMBERBIRTHYEAR}>, {MEMBERBIRTHYEAR} ({MEMBERAGE} years old)</IF></p></IF>
-
-<IF {MEMBERHASBIO}><p><span class="labels">Biography:</span> {MEMBERBIO}</p></IF>
-
-</td>
-</tr>
-<tr>
-<td width="50%" valign="top" class="evencolumns">
-<p align="center"><span class="labels">Membership Status</span></p>
+<IF {SWITCH_PM} and {MEMBERACCEPTPMS}><p><span class="labels">Private Messaging:</span> <a href="privatemessaging.php?action=send&sendto={MEMBERID}">Send a PM to {MEMBERNAME}</a></p></IF>
 
 <p><span class="labels">Registered:</span> {MEMBERREGDATE}</p>
 
 <p><span class="labels">Usergroup:</span> {MEMBERGROUPTITLE}</p>
 
-<IF {SWITCH_MEMBERRATINGS}><p><span class="labels">Rating:</span> {MEMBERRATING}</p></IF>
-
-<p><span class="labels">Links Submitted:</span> {MEMBERTOPICS} links<IF {SWITCH_MEMBERHITS}>, with {MEMBERTOTALHITS} views</IF></p>
-
-<p><span class="labels">Total Comments:</span> {MEMBERPOSTS} comment posts ({MEMBERCOMMENTSPERDAY} per day)</p>
-
-<IF {SWITCH_TIMEONLINE}><p><span class="labels">Total Time Online:</span> {MEMBERTOTALTIMEONLINE}</p></IF>
+<p><span class="labels">Rating:</span> {MEMBERRATING}</p>
 
-<IF {MEMBERSHOWAVATAR}> <img src="attachments/avatars/{MEMBERAVATARNAME}" alt=""> <br> </IF>
+<p><span class="labels">Links Submitted:</span> {MEMBERLINKS} links<IF {SWITCH_HITS}>, with {MEMBERTOTALHITSIN} hits in and {MEMBERTOTALHITS} hits out.</IF></p>
 
-</td>
-<td width="50%" valign="top" class="evencolumns">
-<p align="center"><span class="labels">Submission History</span></p>
+<IF {SWITCH_COMMENTS}><p><span class="labels">Comments Posted:</span> {MEMBERCOMMENTS}</p></IF>
 
 <IF {TOPLISTTOTAL1}><p><span class="labels">Most recent links:</span></p></IF>
 <!-- BEGIN TOPLIST 1 -->
 <CONFIG>links,time,5,descending,ownerid={MEMBERID}</CONFIG>
-<a href="link.php?id={LINKID}&amp;action=detail">{LINKTITLE}</a> <br>
+<a href="{TRACKLINKURL}" {EXTERNALLINKS}>{LINKTITLE}</a> {LINKADMIN} <br>
 <!-- END TOPLIST 1 -->
 <br>
 <IF {TOPLIST1MULTIPAGE}>
-<a href="search.php?filled=1&amp;condition==&amp;whichtype=links&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">Show all links submitted by {MEMBERNAME}</a><br>
+Page: {TOPLIST1PREVIOUS} <b>{TOPLIST1CURRENTPAGE}</b> {TOPLIST1NEXT}
+<br>
+[<a href="search.php?filled=1&amp;condition==&amp;whichtype=links&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">Find all links submitted by {MEMBERNAME}</a>]<br>
 </IF>
 
-<IF {TOPLISTTOTAL2}><p><span class="labels">Most recent comment posts:</span></p></IF>
+<IF {SWITCH_COMMENTS}>
+<IF {TOPLISTTOTAL2}><p><span class="labels">Most recent comments:</span></p></IF>
 <!-- BEGIN TOPLIST 2 -->
 <CONFIG>comments,time,5,descending,ownerid={MEMBERID}</CONFIG>
-<a href="comments.php?id={POSTLINKID}&amp;findpost={POSTID}#post{POSTID}">{POSTMESSAGE[50 <,> remove]}</a> <br>
+<a href="comments.php?id={COMMENTLINKID}">{COMMENTMESSAGE[50 <,> remove]}</a> {COMMENTADMIN} <br>
 <!-- END TOPLIST 2 -->
 <br>
 <IF {TOPLIST2MULTIPAGE}>
-<a href="search.php?filled=1&amp;condition==&amp;whichtype=comments&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">Show all comments by {MEMBERNAME}</a>
+Page: {TOPLIST2PREVIOUS} <b>{TOPLIST2CURRENTPAGE}</b> {TOPLIST2NEXT}
+<br>
+[<a href="search.php?filled=1&amp;condition==&amp;whichtype=comments&amp;searchfields[0]=ownerid&amp;search={MEMBERID}">Find all comments posted by {MEMBERNAME}</a>]
+</IF>
 </IF>
-
-<IF {THISMEMBERGROUPCANVIEWIPS}><p>Registration IP: {MEMBERIP}</p></IF>
-
-</td>
-</tr>
-</table>
\ No newline at end of file
diff -U 3 -H -b -B -E -d -- 320/wrapper.tpl 315/wrapper.tpl
--- 320/wrapper.tpl	2005-04-29 11:48:11.000000000 -0700
+++ 315/wrapper.tpl	2005-04-09 16:34:40.000000000 -0700
@@ -2,65 +2,73 @@
         "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<title>{PAGETITLE}</title>
+<title>{LANG_NAVORIGIN}{AREA}</title>
 <link rel="stylesheet" href="{DIRURL}/templates/styles/{STYLESHEET}.css" type="text/css">
 {MAINMETA}
 {CATHEADERINFO}
 </head>
 
 <body>
-
-<a href="{DIRURL}"><img src="{TEMPLATESDIR}/images/logo.jpg" border="0" alt="{SITETITLE}"></a>
-
-
-<div class="main">
 <table width="100%">
 <tr>
  <td align="left" valign="top">
-  <IF {SWITCH_STYLESELECT}><form action="[IFADMIN../]index.php?action=setstyle" method="post">Style: <select name="style">{STYLEOPTIONS}</select> <input type="submit" value="Select" class="button"> <input type="hidden" name="returnto" value="{CURRENTHTMLURL}"></form>
-  </IF>
+
+<IF {SWITCH_STYLESELECT}><form action="[IFADMIN../]index.php?action=setstyle" method="post">Style: <select name="style">{STYLEOPTIONS}</select> <input type="submit" value="Select" class="button"> <input type="hidden" name="returnto" value="{CURRENTURL}"></form>
+</IF>
+
+<IF {SWITCH_TEMPLATESELECT}><form action="index.php?action=settemplatesdir" method="post">Template Set: <select name="templatesdir">{TEMPOPTIONS}</select> <input type="submit" value="Select" class="button"> <input type="hidden" name="returnto" value="{CURRENTURL}"></form></IF>
+ 
  </td>
  <td align="right" valign="top">
-<IF {THISMEMBERISGUEST}>
-<form action="index.php?action=userlogin&amp;filled=1" method="post">
-<input type="text" name="username" size="10" value="user name"> <input type="password" name="userpassword" size="10" value="password"> <input type="submit" value="Login" class="button">
-<br><a href="register.php">Not Yet Registered</a> | <a href="index.php?action=userlogin">Forgot Password</a>
-</form>
-<OTHERWISE>
-<a href="profile.php?action=memberhome&amp;id={MEMBERID}"><img src="{TEMPLATESDIR}/images/nav_options.gif" border="0" alt="Options"></a> <IF {SWITCH_PM}><a href="privatemessaging.php"><img src="{TEMPLATESDIR}/images/nav_pms.gif" border="0" alt="Private Messages"></a></IF> <IF {THISMEMBERGROUPCANUSESEARCH}><a href="search.php"><img src="{TEMPLATESDIR}/images/nav_search.gif" border="0" alt="Search"></a></IF> <a href="newposts.php"><img src="{TEMPLATESDIR}/images/nav_new.gif" border="0" alt="New Links"></a> <IF {SWITCH_HELP}><a href="help.php"><img src="{TEMPLATESDIR}/images/nav_help.gif" border="0" alt="Help"></a></IF> <a href="index.php?action=userlogout"><img src="{TEMPLATESDIR}/images/nav_logout.gif" border="0" alt="Logout"></a> 
-<IF {SWITCH_PM}><br>You have <a href="privatemessaging.php">{THISMEMBERNEWPMS[highlight]} new PMs</a>, {THISMEMBERTOTALPMS} total.</IF>
-</IF>
+  <form action="[IFADMIN../]index.php">
+  <input type="hidden" name="action" value="displaycat">
+  <select name="catid">
+   <option value="0">Choose Category</option>
+   {CATOPTIONS}
+  </select>
+  <input type="submit" value="Go" class="button">
+  </form>
  </td>
 </tr>
 </table>
 
-<IF {SWITCH_IMS} and {THISMEMBERNEWIMS}>
-<p align="center"><span class="important">You have new IMs. Click the username to open the conversation: {THISMEMBERNEWIMLIST}</span></p>
-</IF>
+<center><span class="title">Welcome to {VERSION}</span><br>This text is in your wrapper template. Visit your <a href="[IFADMINadmin/]index.php?context=templates.php">admin panel</a> to edit it.</center>
+<br>
+<div class="main">
 
 <!-- BODY GOES HERE -->
 
-<form action="index.php">
-<p align="right"><input type="hidden" name="action" value="displaycat">
-<select name="catid"><option value="0">Category List</option>{CATOPTIONS}</select>
-<input type="submit" value="Go" class="button">
-</p>
-</form>
 </div>
 
-<p align="center"><a href="rssfeed.php"><img src="{TEMPLATESDIR}/images/rss.gif" border="0" alt="RSS Feed"></a></p>
+<IF {SWITCH_MEMBERS}>
+<p align="center">
+<IF {THISMEMBERUSERGROUP} is 1>
 
-<IF {SWITCH_CONTACT}><p align="center"><a href="contactform.php">Contact the Administration</a></p></IF>
+[<a href="index.php?action=userlogin">Login</a>] [<a href="register.php">Register</a>]
 
-<IF {THISMEMBERISREGISTERED} and {SPONSORUSEUG} is yes><p align="center"><a href="membersponsor.php">Sponsor {SITETITLE}</a></p></IF>
+<OTHERWISE> 
 
-<p align="center"><b><IF {THISMEMBERISADMIN}><a href="[IFADMINadmin/]index.php">Admin Control Panel</a> | <a href="[IFADMIN../]modcp.php">Moderator Control Panel</a></IF><IF {THISMEMBERUSERGROUP} is 4><a href="[IFADMIN../]modcp.php">Moderator Control Panel</a></IF></b></p>
+You're logged in as <a href="[IFADMIN../]memberlist.php?action=profile&amp;id={MEMBERID}">{MEMBERNAME}</a>.<br>
 
-{LOADSTATS}
+<IF {SWITCH_PM}>
+You have <a href="privatemessaging.php">{THISMEMBERNEWPMS[highlight]} new PMs</a>, {THISMEMBERTOTALPMS} total <br>
+</IF>
 
-<IF {SWITCH_IMS} and {THISMEMBERNEWIMS}>
-<script language="JavaScript"> alert("You have a new instant message. Click the sender's name in the IM notification area near the top of the page to join the conversation.") </script>
+[<a href="[IFADMIN../]memberlist.php?action=profile&id={MEMBERID}">View Profile</a>] [<a href="edit.php?action=member&field=id&condition=equals&amp;fieldvalue={MEMBERID}">Edit Profile</a>] [<a href="[IFADMIN../]index.php?action=userlogout">Logout</a>]
+<br>
+<IF {SWITCH_ALBUMS}>
+<IF {THISMEMBERALBUMID}>
+<a href="[IFADMIN../]albums.php">View your personal links list</a>
+<OTHERWISE>
+<a href="[IFADMIN../]albums.php?action=createalbum">Create your personal link list</a>
 </IF>
-<IF {THISMEMBERPMPOPUP}><script language="JavaScript">alert("You have a new private message.");</script></IF>
+</IF>
+</IF>
+</p>
+</IF>
+
+<p align="center"><b><a href="[IFADMINadmin/]index.php">Admin Control Panel</a></b></p>
+
+{LOADSTATS}
 </body>
 </html>
\ No newline at end of file
