@@ -233,13 +233,13 @@ $confirm = isset($_GET['confirm']) ? $_GET['confirm'] : false;

 		}

 		else if($list == "authors") {

 			$where = " WHERE ap.stories > 0";

-			$authorlink = "<a href=\"user.php?action=editbio&amp;uid=";

+			$authorlink = "<a href=\"member.php?action=editbio&amp;uid=";

 			$output .= _AUTHORS;

 		}

 		else {

 			$where = "";

 			$do = "members";

-			$authorlink = "<a href=\"user.php?action=editbio&amp;uid=";

+			$authorlink = "<a href=\"member.php?action=editbio&amp;uid=";

 			$output .= _MEMBERS;

 		}

 		if($let == _OTHER) {

@@ -4,7 +4,7 @@ if(!defined("_CHARSET")) exit( );

 	$longform = "{penname} {password} {rememberme} {go} <div id='loginlinks'>{register} | {lostpwd}</div>";

 	$shortform = "{penname} {password} {rememberme} {go}";

 if(!isMEMBER) {

-	$content = "<form method=\"POST\" id=\"loginblock\" enctype=\"multipart/form-data\" action=\""._BASEDIR."user.php?action=login\">";

+	$content = "<form method=\"POST\" id=\"loginblock\" enctype=\"multipart/form-data\" action=\""._BASEDIR."member.php?action=login\">";

 	$replace = array("<label for=\"penname=\">"._PENNAME.":</label><INPUT type=\"text\" class=\"textbox\" name=\"penname\" id=\"penname\" size=\"15\">", 

 			"<label for=\"password\">"._PASSWORD.":</label><INPUT type=\"password\" class=\"textbox\" name=\"password\" id=\"password\" size=\"15\">",

 			"<span id='rememberme'><INPUT type=\"checkbox\" class=\"checkbox\" name=\"cookiecheck\" id=\"cookiecheck\" value=\"1\"><label for=\"cookiecheck=\">"._REMEMBERME."</label></span>",

@@ -1,6 +1,6 @@

 INSERT INTO `fanfiction_messages` (`message_id`, `message_name`, `message_title`, `message_text`) VALUES (1, 'welcome', '', 'This is your welcome message. It appears on the index page. Include it in your .tpl files with {welcome}.'),

 (2, 'copyright', '', 'This is your sample copyright footer.  Include it in your footer.tpl with <b>{footer}</b><br />\r\n<u>Disclaimer:</u>  All publicly recognizable characters, settings, etc. are the property of their respective owners.  The original characters and plot are the property of the author.  No money is being made from this work.  No copyright infringement is intended.\r\n'),

-(3, 'help', 'Help', '<h3>FAQ</h3><p><strong>I forgot my password!&nbsp; What do I do now?</strong></p><p>To recover a lost password, <a href="user.php?action=lostpassword">click here</a> and enter the e-mail address with which you registered.&nbsp; Your password will be sent to you shortly.</p><p><strong>What kinds of stories are allowed?</strong></p><p>See our <a href="submission.php">Submission Rules.</a></p><p><strong>How do I contact the site administrators?</strong></p><p>You can e-mail us via our <a href="contact.php">contact form.</a></p><p><strong>How do I submit stories?</strong></p><p>If you have not already done so, please <a href="user.php?action=newaccount">register for an account</a>. Once you''ve logged in, click on <a href="user.php">Account Information</a> and choose <a href="stories.php?action=newstory">Add Story</a>.&nbsp; The form presented there will allow you to submit your story.</p><p><strong>What are the ratings used on the site?</strong></p><p>We use the ratings system from <a href="http://www.fictionratings.com/">www.fictionratings.com</a>.</p><p><strong>What are the story classifications?</strong></p><p>Stories are classified by categories, genres, and warnings.</p>'),

+(3, 'help', 'Help', '<h3>FAQ</h3><p><strong>I forgot my password!&nbsp; What do I do now?</strong></p><p>To recover a lost password, <a href="member.php?action=lostpassword">click here</a> and enter the e-mail address with which you registered.&nbsp; Your password will be sent to you shortly.</p><p><strong>What kinds of stories are allowed?</strong></p><p>See our <a href="submission.php">Submission Rules.</a></p><p><strong>How do I contact the site administrators?</strong></p><p>You can e-mail us via our <a href="contact.php">contact form.</a></p><p><strong>How do I submit stories?</strong></p><p>If you have not already done so, please <a href="member.php?action=newaccount">register for an account</a>. Once you''ve logged in, click on <a href="member.php">Account Information</a> and choose <a href="stories.php?action=newstory">Add Story</a>.&nbsp; The form presented there will allow you to submit your story.</p><p><strong>What are the ratings used on the site?</strong></p><p>We use the ratings system from <a href="http://www.fictionratings.com/">www.fictionratings.com</a>.</p><p><strong>What are the story classifications?</strong></p><p>Stories are classified by categories, genres, and warnings.</p>'),

 (4, 'nothankyou', '{sitename} Submission Rejection', 'Your recent submission of "{storytitle} : {chaptertitle}" to {sitename} did not meet our requirements for submission.  Please review our {rules}.<br /><br />\r\n\r\n{adminname}'),

 (5, 'printercopyright', '', '<u>Disclaimer:</u> All publicly recognizable characters and settings are the property of their respective owners. The original characters and plot are the property of the author. No money is being made from this work. No copyright infringement is intended.'),

 (6, 'rules', 'Submission Rules', '<p align="center"><strong>Submission Rules</strong></p>\r\n<ol>\r\n  <li>All submissions must be accompanied by a complete disclaimer. If a \r\n  suitable disclaimer is not included, the site administrators reserve the right \r\n  to add a disclaimer.&nbsp; Repeat offenders may be subject to further action \r\n  up to and including removal of stories and account.\r\n<div class="tblborder" style="width: 400px; margin: 1em auto;">\r\n<div style="background: #000; color: #FFF; padding: 5px; text-align: center; font-weight: bold;">Sample Disclaimer</div>\r\n<div class="tblborder" style="padding: 5px;"><span style="text-decoration: underline;">Disclaimer:</span>  All publicly recognizable characters, settings, etc. are the property of their respective owners.  The original characters and plot are the property of the author.&nbsp; \r\n        The author is in no way associated with the owners, creators, or producers of any media franchise.&nbsp;  No copyright infringement is intended.</div>\r\n  </div>\r\n  </li>\r\n  <li>Stories must be submitted to the proper category. &nbsp;If there is an appropriate sub-category, <strong>DO NOT</strong> add your story to the main category.&nbsp; The submission \r\n  form allows you to choose multiple categories for your story, and we worked very hard to add that functionality for you.&nbsp;&nbsp; <u><strong>So please \r\n  do NOT add your story multiple times!</strong></u></li>\r\n  <li>Titles and summaries must be kid friendly.&nbsp; No exceptions.&nbsp; </li>\r\n  <li>&quot;Please read&quot;, &quot;Untitled&quot;, etc. are not acceptable titles or summaries.</li>\r\n  <li>A number of authors have requested that fans refrain from writing fan \r\n  fiction based on their work.&nbsp; Therefore submissions will not be \r\n  accepted based on the works of P.N. Elrod, Raymond Feist, Terry Goodkind, \r\n  Laurell K. Hamilton, Anne McCaffrey, Robin McKinley, Irene Radford, Anne Rice, \r\n  and Nora Roberts/J.D. Robb.&nbsp; </li>\r\n  <li>Actor/actress stories are not permitted...not even if they''re visiting an \r\n  alternate reality.</li>\r\n  <li>Correct grammar and spelling are expected of all stories submitted to this \r\n  site.&nbsp; The site administrators are not grammar Nazis.&nbsp; However, the \r\n  site administrators reserve the right to request corrections in submissions \r\n  with a multitude of grammar and/or spelling errors.&nbsp; If such a request is \r\n  ignored, the story will be deleted.</li>\r\n  <li>All stories must be rated correctly and have the appropriate warnings.&nbsp; \r\n  All adult rated stories are expected to have warnings.&nbsp; After all, they \r\n  wouldn''t have that rating if there wasn''t something to be warned about!&nbsp; The site administrators recognize \r\n  that there is an audience for these stories, but please respect those who do \r\n  not wish to read them by labeling them appropriately.&nbsp;\r\n  <u><strong>Please note: Stories containing adults having sex with minors are strictly forbidden.</strong></u>&nbsp; </li>\r\n  <li>Stories with multiple chapters should be archived as such and <span style="font-weight: bold; text-decoration: underline;">NEVER</span> as \r\n  separate stories.&nbsp; Upload the first chapter of your story, then go to <a href="stories.php?action=viewstories">Manage Stories</a> in \r\nyour account to add additional chapters.  If you have trouble with this, please contact the site administrator or ask a \r\n  friend to help you.</li>\r\n  <li>As much as possible, spoiler warnings are expected on all stories.  For categories with serialized content, such as series of books or television series, \r\n  spoilers are <strong>mandatory</strong> for the current season and/or most recent part.  An appropriate spoiler warning to place in your summary would be: Spoilers for <u>Star Trek II: The Wrath of Khan.</u> \r\n  <strong>DO NOT</strong> do anything like this: <u>Spoilers for the one where Spock dies.</u></li>\r\n</ol>\r\n  <p>Submissions found to be in violation of these rules may be removed and the \r\n  author''s account suspended at the discretion of the site administrators and/or \r\n  moderators.&nbsp; The site administrators reserve the right to modify these \r\n  rules as needed.</p>'),

@@ -252,7 +252,7 @@ function title_link($stories) {

 				$warning = _AGECHECK." - "._AGECONSENT." ".$warningtext." -- 1";

 			}

 			if($warninglevel[0] && !isMEMBER) {

-				$location = "user.php?action=login&sid=".$stories['sid'];

+				$location = "member.php?action=login&sid=".$stories['sid'];

 				$warning = _RUSERSONLY." - $warningtext";		

 			}

 			if(!empty($warning)) {

@@ -73,7 +73,7 @@ if(!defined("_CHARSET")) exit( );

 	if(count($seriescode)) foreach($seriescode as $c) { eval($c); } 

 	$tpl->assign("classifications", $allclasslist);

 	if(isMEMBER && $favorites) {

-		$addtofaves = "[<a href=\"user.php?action=favse&amp;uid=".USERUID."&amp;add=".$stories['seriesid']."\">"._ADDSERIES2FAVES."</a>]";

+		$addtofaves = "[<a href=\"member.php?action=favse&amp;uid=".USERUID."&amp;add=".$stories['seriesid']."\">"._ADDSERIES2FAVES."</a>]";

 		if($stories['isopen'] < 2) {

 			$addtofaves .= " [<a href=\"viewuser.php?action=favau&amp;uid=".USERUID."&amp;author=".$stories['uid']."\">"._ADDAUTHOR2FAVES."</a>]";

 		}

@@ -86,7 +86,7 @@ if(!defined("_CHARSET")) exit( );

 	$tpl->assign("ratingpics"   , ratingpics($stories['rating']) );

 	$tpl->assign("reviews"   , ($reviewsallowed ? "<a href=\""._BASEDIR."reviews.php?type=ST&amp;item=".$stories['sid']."\">"._REVIEWS."</a>" : "") );

 	if(isMEMBER && !empty($favorites)) 

-		$tpl->assign("addtofaves", "[<a href=\""._BASEDIR."user.php?action=favst&amp;add=1&amp;sid=".$stories['sid']."\">"._ADDSTORY2FAVES."</a>] [<a href=\""._BASEDIR."user.php?action=favau&amp;add=".$stories['uid'].(count($stories['coauthors']) ? ",".implode(",", array_keys($stories['coauthors'])) : "")."\">"._ADDAUTHOR2FAVES."</a>]");

+		$tpl->assign("addtofaves", "[<a href=\""._BASEDIR."member.php?action=favst&amp;add=1&amp;sid=".$stories['sid']."\">"._ADDSTORY2FAVES."</a>] [<a href=\""._BASEDIR."member.php?action=favau&amp;add=".$stories['uid'].(count($stories['coauthors']) ? ",".implode(",", array_keys($stories['coauthors'])) : "")."\">"._ADDAUTHOR2FAVES."</a>]");

 	$numchapsquery = dbquery("SELECT count(sid) FROM ".TABLEPREFIX."fanfiction_chapters WHERE sid = '".$stories['sid']."' AND validated > 0");

 	list($chapters) = dbrow($numchapsquery);

@@ -215,7 +215,7 @@ switch($_GET['step']) {

 				$output .= "<tr><td>Welcome</td><td align='center'>" . ($msg ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";

 				$msg = dbquery("INSERT INTO `".$tableprefix."fanfiction_messages` VALUES (2, 'copyright', '', 'This is your sample copyright footer.  Include it in your footer.tpl with <b>{footer}</b><br />\r\n<u>Disclaimer:</u>  All publicly recognizable characters, settings, etc. are the property of their respective owners.  The original characters and plot are the property of the author.  No money is being made from this work.  No copyright infringement is intended.\r\n');");

 				$output .= "<tr><td>Copyright</td><td align='center'>" . ($msg ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";

-				$msg = dbquery("INSERT INTO `".$tableprefix."fanfiction_messages` VALUES (3, 'help', 'Help', '<h3>FAQ</h3><p><strong>I forgot my password!&nbsp; What do I do now?</strong></p><p>To recover a lost password, <a href=\"user.php?action=lostpassword\">click here</a> and enter the e-mail address with which you registered.&nbsp; Your password will be sent to you shortly.</p><p><strong>What kinds of stories are allowed?</strong></p><p>See our <a href=\"submission.php\">Submission Rules.</a></p><p><strong>How do I contact the site administrators?</strong></p><p>You can e-mail us via our <a href=\"contact.php\">contact form.</a></p><p><strong>How do I submit stories?</strong></p><p>If you have not already done so, please <a href=\"user.php?action=newaccount\">register for an account</a>. Once you\'ve logged in, click on <a href=\"user.php\">Account Information</a> and choose <a href=\"stories.php?action=newstory\">Add Story</a>.&nbsp; The form presented there will allow you to submit your story.</p><p><strong>What are the ratings used on the site?</strong></p><p>We use the ratings system from <a href=\"http://www.fictionratings.com/\">www.fictionratings.com</a>.</p><p><strong>What are the story classifications?</strong></p><p>Stories are classified by categories, genres, and warnings.</p>');");

+				$msg = dbquery("INSERT INTO `".$tableprefix."fanfiction_messages` VALUES (3, 'help', 'Help', '<h3>FAQ</h3><p><strong>I forgot my password!&nbsp; What do I do now?</strong></p><p>To recover a lost password, <a href=\"member.php?action=lostpassword\">click here</a> and enter the e-mail address with which you registered.&nbsp; Your password will be sent to you shortly.</p><p><strong>What kinds of stories are allowed?</strong></p><p>See our <a href=\"submission.php\">Submission Rules.</a></p><p><strong>How do I contact the site administrators?</strong></p><p>You can e-mail us via our <a href=\"contact.php\">contact form.</a></p><p><strong>How do I submit stories?</strong></p><p>If you have not already done so, please <a href=\"member.php?action=newaccount\">register for an account</a>. Once you\'ve logged in, click on <a href=\"member.php\">Account Information</a> and choose <a href=\"stories.php?action=newstory\">Add Story</a>.&nbsp; The form presented there will allow you to submit your story.</p><p><strong>What are the ratings used on the site?</strong></p><p>We use the ratings system from <a href=\"http://www.fictionratings.com/\">www.fictionratings.com</a>.</p><p><strong>What are the story classifications?</strong></p><p>Stories are classified by categories, genres, and warnings.</p>');");

 				$output .= "<tr><td>Help</td><td align='center'>" . ($msg ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";

 				$msg = dbquery("INSERT INTO `".$tableprefix."fanfiction_messages` VALUES (4, 'nothankyou', 'Submission Rejection', 'Your recent submission of \"{storytitle} : {chaptertitle}\" to {sitename} did not meet our requirements for submission.  Please review our {rules}.<br /><br />\r\n\r\n{adminname}');");

 				$output .= "<tr><td>Rejection Letter</td><td align='center'>" . ($msg ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";

@@ -275,9 +275,9 @@ switch($_GET['step']) {

 				$pagelist = array(

 					array("home","Home","index.php","0","0"),

 					array("recent","Most Recent","browse.php?type=recent","0","0"),

-					array("login","Login","user.php?action=login","0","0"),

+					array("login","Login","member.php?action=login","0","0"),

 					array("adminarea","Admin","admin.php","0","2"),

-					array("logout","Logout","user.php?action=logout","0","1"),

+					array("logout","Logout","member.php?action=logout","0","1"),

 					array("featured","Featured Stories","browse.php?type=featured","0","0"),

 					array("catslink","Categories","browse.php?type=categories","0","0"),

 					array("members","Members","authors.php?action=list","0","0"),

@@ -291,10 +291,10 @@ switch($_GET['step']) {

 					array("rules","Rules","viewpage.php?page=rules","0","0"),

 					array("tos","Terms of Service","viewpage.php?page=tos","0","0"),

 					array("rss","<img src=\'images/xml.gif\' alt=\'RSS\' border=\'0\'>","rss.php","0","0"),

-					array("login","Account Info","user.php","0","1"),

+					array("login","Account Info","member.php","0","1"),

 					array("titles","Titles","browse.php?type=titles","0","0"),

-					array("register","Register","user.php?action=register","0","0"),

-					array("lostpassword","Lost Password","user.php?action=lostpassword","0","0"),

+					array("register","Register","member.php?action=register","0","0"),

+					array("lostpassword","Lost Password","member.php?action=lostpassword","0","0"),

 					array("newsarchive","News Archive","news.php","0","0"),

 					array("browse","Browse","browse.php","0","0"),

 					array("charslink", "Characters", "browse.php?type=characters","0","0"),

@@ -662,9 +662,9 @@ switch($_GET['step']) {

 				$pagelist = array(

 					array("home","Home","index.php","0","0"),

 					array("recent","Most Recent","browse.php?type=recent","0","0"),

-					array("login","Login","user.php?action=login","0","0"),

+					array("login","Login","member.php?action=login","0","0"),

 					array("adminarea","Admin","admin.php","0","2"),

-					array("logout","Logout","user.php?action=logout","0","1"),

+					array("logout","Logout","member.php?action=logout","0","1"),

 					array("featured","Featured Stories","browse.php?type=featured","0","0"),

 					array("catslink","Categories","browse.php?type=categories","0","0"),

 					array("members","Members","authors.php?action=list","0","0"),

@@ -678,10 +678,10 @@ switch($_GET['step']) {

 					array("rules","Rules","viewpage.php?page=rules","0","0"),

 					array("tos","Terms of Service","viewpage.php?page=tos","0","0"),

 					array("rss","<img src=\'images/xml.gif\' alt=\'RSS\' border=\'0\'>","rss.php","0","0"),

-					array("login","Account Info","user.php","0","1"),

+					array("login","Account Info","member.php","0","1"),

 					array("titles","Titles","browse.php?type=titles","0","0"),

-					array("register","Register","user.php?action=register","0","0"),

-					array("lostpassword","Lost Password","user.php?action=lostpassword","0","0"),

+					array("register","Register","member.php?action=register","0","0"),

+					array("lostpassword","Lost Password","member.php?action=lostpassword","0","0"),

 					array("newsarchive","News Archive","news.php","0","0"),

 					array("browse","Browse","browse.php","0","0"),

 					array("charslink", "Characters", "browse.php?type=characters","0","0"),

@@ -28,7 +28,7 @@ define ("_ALLSTORIES", "All Stories");

 define ("_ALPHA", "Alphabetically");

 define ("_ANONYMOUS", "Anonymous");

 define ("_AUTHORSNOTES", "Author's Notes");

-define ("_BACK2ACCT", "Back to <a href=\"user.php\">your account</a> area.");

+define ("_BACK2ACCT", "Back to <a href=\"member.php\">your account</a> area.");

 define ("_BACK2ADMIN", "Back to <a href=\"admin.php\">Admin</a> area.");

 define ("_BACK2CATS", "Back to Main Categories");

 define ("_BACK2PREVIOUS", "Back to Previous.");

@@ -284,11 +284,11 @@ define ("_USETINYMCE", "Use tinyMCE WYSWYG editor");

 // User - Edit Bio/Registration (default)

 define ("_AOL", "AOL IM");

-define ("_BADEMAIL", "That address doesn't appear to be in our database. Please <a href=\"user.php?action=lostpassword\">try again.</a>");

+define ("_BADEMAIL", "That address doesn't appear to be in our database. Please <a href=\"member.php?action=lostpassword\">try again.</a>");

 define ("_BADUSERNAME", "Sorry! Usernames can only contain letters, numbers, underscores, hyphens, or spaces, and must be between 3 and 20 characters long.");

 define ("_BIO", "Bio");

 define ("_EDITPERSONAL", "Edit Personal Information");

-define ("_EMAILINUSE", "This email address has already been used to sign up for an account. If you've lost your password, please generate a new one by using the <a href=\"user.php?action=lostpassword\">lost password</a> feature.");

+define ("_EMAILINUSE", "This email address has already been used to sign up for an account. If you've lost your password, please generate a new one by using the <a href=\"member.php?action=lostpassword\">lost password</a> feature.");

 define ("_ICQ", "ICQ");

 define ("_INVALIDEMAIL", "The e-mail address you supplied is an invalid format.");

 define ("_NEWACCOUNT", "New Account");

@@ -296,9 +296,9 @@ define ("_NEWPEN", "%1\$s ( %2\$d ) changed penname %3\$s ( %4\$d ) to %5\$s.");

 define ("_MSN", "MSN IM");

 define ("_PASSWORD", "Password");

 define ("_PASSWORD2", "Confirm Password");

-define ("_PASSWORDTWICE", "You must enter your new password twice. Please <a href=\"user.php?action=".$action."\">try again</a>.");

+define ("_PASSWORDTWICE", "You must enter your new password twice. Please <a href=\"member.php?action=".$action."\">try again</a>.");

 define ("_PWDREQUIRED", "A password is required to access this function.");

-define ("_PENEMAILREQUIRED", "You must fill out the penname and email fields. Please <a href=\"user.php?action=newaccount\">try again</a>.");

+define ("_PENEMAILREQUIRED", "You must fill out the penname and email fields. Please <a href=\"member.php?action=newaccount\">try again</a>.");

 define ("_PENNAMEINUSE", "This penname is already in use.");

 define ("_REALNAME", "Real name");

 define ("_REGISTER", "Register");

@@ -320,7 +320,7 @@ define ("_FILENAME", "Filename");

 define ("_FILENOTEXISTS", "The file <strong>%s</strong> does not exist.");

 define ("_IMAGE", "Image");

 define ("_IMAGECODE", "HTML code to use image in story");

-define ("_IMAGETOOBIG", "This image is too big. Images may only be $imagewidth wide by $imageheight high. Please <a href=\"user.php?action=manageimages&upload=upload\">try again</a>.");

+define ("_IMAGETOOBIG", "This image is too big. Images may only be $imagewidth wide by $imageheight high. Please <a href=\"member.php?action=manageimages&upload=upload\">try again</a>.");

 define ("_INVALIDNAME", "Sorry, the filename contains invalid characters. Use only alphanumerical chars and separate parts of the name (if needed) with an underscore. <br>A valid filename ends with one dot followed by the extension.");

 define ("_MANAGEIMAGES", "Manage Images");

 define ("_MAXFILENAME", "The filename exceeds the maximum length of %s characters.");

@@ -364,7 +364,7 @@ define ("_REMOVEFAV", "Remove Favorite");

 // User - Login

-define ("_WRONGPASSWORD", "That password doesn't match the one in our database. Please <a href=\"user.php?action=login\">try again</a> or retrieve a <a href=\"user.php?action=lostpassword\">new password</a> if you can't remember yours.");

+define ("_WRONGPASSWORD", "That password doesn't match the one in our database. Please <a href=\"member.php?action=login\">try again</a> or retrieve a <a href=\"member.php?action=lostpassword\">new password</a> if you can't remember yours.");

 define ("_ACCOUNTLOCKED", "This account has been locked by the adminstrators of this site.  Please <a href='contact.php'>contact</a> the site adminstrators for more information.");

 define ("_NOSUCHACCOUNT", "There is no such account on our website."); // Added 6-18-2008

similarity index 96%

rename from user.php

rename to member.php

@@ -50,7 +50,7 @@ if((empty($action) || $action == "login") && isMEMBER) {

 	$panelquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_panels WHERE panel_hidden != '1' AND panel_level = '1' AND (panel_type = 'U' ".(!$submissionsoff || isADMIN ? " OR panel_type = 'S'" : "").($favorites ? " OR panel_type = 'F'" : "").") ORDER BY panel_type, panel_order, panel_title ASC");

 	if(!dbnumrows($panelquery)) $output .= _FATALERROR;

 	while($panel = dbassoc($panelquery)) {

-		if(!$panel['panel_url']) $output .=  "<a href=\"user.php?action=".$panel['panel_name']."\">".$panel['panel_title']."</a><br />\n";

+		if(!$panel['panel_url']) $output .=  "<a href=\"member.php?action=".$panel['panel_name']."\">".$panel['panel_title']."</a><br />\n";

 		else $output .= "<a href=\"".$panel['panel_url']."\">".$panel['panel_title']."</a><br />\n";

 	}

 	$output .= "</div>\n";

@@ -379,7 +379,7 @@ else {

 			$reviewer = $reviews['reviewer'];

 			$member = _ANONYMOUS;

 		}

-		if(empty($reviews['respond']) && (USERUID == $authoruid || (isset($coauthors) && in_array(USERUID, $coauthors)))) $adminlink .= " [<a href=\"user.php?action=revres&amp;reviewid=".$reviews['reviewid']."\">"._RESPOND."</a>]";

+		if(empty($reviews['respond']) && (USERUID == $authoruid || (isset($coauthors) && in_array(USERUID, $coauthors)))) $adminlink .= " [<a href=\"member.php?action=revres&amp;reviewid=".$reviews['reviewid']."\">"._RESPOND."</a>]";

 		$tpl->newBlock("reviewsblock");

 		$tpl->assign("reviewer"   , $reviewer );

 		$tpl->assign("reportthis", "[<a href=\""._BASEDIR."contact.php?action=report&amp;url=reviews.php?reviewid=".$reviews['reviewid']."\">"._REPORTTHIS."</a>]");

@@ -167,7 +167,7 @@ function random_string ($charset_string, $length)

 			list($tos) = dbrow($query);

 			$output .= "<div class='tblborder' style='width: 90%; margin: 1em auto;'>$tos</div>";

 		}

-		$output .= "<div id='settingsform'><form method=\"POST\" id=\"editbio\" name=\"editbio\" enctype=\"multipart/form-data\" style='margin: 0 auto;' action=\"user.php?action=$action".($uid != USERUID ? "&uid=".$uid : "")."\">

+		$output .= "<div id='settingsform'><form method=\"POST\" id=\"editbio\" name=\"editbio\" enctype=\"multipart/form-data\" style='margin: 0 auto;' action=\"member.php?action=$action".($uid != USERUID ? "&uid=".$uid : "")."\">

 		<div><label for='newpenname'>"._PENNAME.":</label>";

 		if((isADMIN && uLEVEL == 1) || $action == "register")

 			$output .= "<INPUT name=\"newpenname\" type=\"text\" class=\"textbox\" maxlength=\"200\" value=\"".(isset($user) ? $user['penname'] : "")."\"><INPUT name=\"oldpenname\" type=\"hidden\" value=\"".(isset($user) ? $user['penname'] : "")."\"><font color=\"red\">*</font> ";

@@ -45,7 +45,7 @@ if(!defined("_CHARSET")) exit( );

 			$result = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_authorprefs WHERE uid = '".USERUID."' LIMIT 1");

 		}

 		$user = dbassoc($result);

-		$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" style='width: 425px; margin: 0 auto;' action=\"user.php?action=editprefs\">

+		$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" style='width: 425px; margin: 0 auto;' action=\"member.php?action=editprefs\">

 		<label for='newreviews'>"._CONTACTREVIEWS.":</label> <INPUT name=\"newreviews\" type=\"checkbox\" class=\"checkbox\"".($user['newreviews'] ? " checked" : "")."> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_NEWREV."</span></A><br />

 		<label for='newrespond'>"._CONTACTRESPOND.":</label> <INPUT name=\"newrespond\" type=\"checkbox\" class=\"checkbox\"".($user['newrespond'] ? " checked" : "")."><A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_NEWRESP."</span></A><br />";

 		if($alertson) 

@@ -93,7 +93,7 @@ if(empty($favorites)) accessDenied( );

 				}

 			}

 			$author = implode(",", $author);

-			$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"user.php?action=favau&amp;".( $add ? "add=$author" : "edit=$edit")."\">\n

+			$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"member.php?action=favau&amp;".( $add ? "add=$author" : "edit=$edit")."\">\n

 				<div style=\"width: 350px; margin: 0 auto; text-align: left;\"><label for=\"comments\">"._COMMENTS.":</label><br />

 				<textarea class=\"textbox\" name=\"comments\" id=\"comments\" cols=\"40\" rows=\"5\">".(isset($info['comments']) ? $info['comments'] : "")."</textarea><br />

 				<INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></div></form>";

@@ -114,7 +114,7 @@ if(empty($favorites)) accessDenied( );

 					$cmt->newBlock("comment");

 					$cmt->assign("comment", format_story($author['comments']));

 					if(USERUID == $uid) 

-					$cmt->assign("commentoptions", "<div class='adminoptions'><span class='label'>"._OPTIONS.":</span> <a href=\"user.php?action=favau&amp;edit=".$author['uid']."\">"._EDIT."</a> | <a href=\"user.php?action=favau&amp;delete=".$author['uid']."\">"._REMOVEFAV."</a></div>");

+					$cmt->assign("commentoptions", "<div class='adminoptions'><span class='label'>"._OPTIONS.":</span> <a href=\"member.php?action=favau&amp;edit=".$author['uid']."\">"._EDIT."</a> | <a href=\"member.php?action=favau&amp;delete=".$author['uid']."\">"._REMOVEFAV."</a></div>");

 					$cmt->assign("oddeven", ($x % 2 ? "odd" : "even"));

 					$output .= $cmt->getOutputContent( );

 					$x++;

@@ -70,7 +70,7 @@ if(empty($favorites)) accessDenied( );

 			$query = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_favorites WHERE uid = '".USERUID."' AND type = 'SE' AND item = '$edit' LIMIT 1");

 			$info = dbassoc($query);

 		}			

-		$tpl->assign("pagelinks", "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"user.php?action=favse&amp;add=1&amp;seriesid=".($add ? $add : $edit)."\">\n

+		$tpl->assign("pagelinks", "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"member.php?action=favse&amp;add=1&amp;seriesid=".($add ? $add : $edit)."\">\n

 			<div style=\"width: 350px; margin: 0 auto; text-align: left;\"><label for=\"comments\">"._COMMENTS.":</label><br />

 			<textarea class=\"textbox\" name=\"comments\" id=\"comments\" cols=\"40\" rows=\"5\">".(isset($info['comments']) ? $info['comments'] : "")."</textarea><br />

 			<INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></div></form>");

@@ -93,7 +93,7 @@ if(empty($favorites)) accessDenied( );

 			$cmt->newBlock("comment");

 			$cmt->assign("comment", $stories['comments'] ? "<div class='comments'><span class='label'>"._COMMENTS.": </span>".strip_tags($stories['comments'])."</div>" : "");

 			if(USERUID == $uid) 

-				$cmt->assign("commentoptions", "<div class='adminoptions'><span class='label'>"._OPTIONS.":</span> <a href=\"user.php?action=favse&amp;edit=".$stories['seriesid']."\">"._EDIT."</a> | <a href=\"user.php?action=favse&amp;delete=".$stories['seriesid']."\">"._REMOVEFAV."</a></div>");

+				$cmt->assign("commentoptions", "<div class='adminoptions'><span class='label'>"._OPTIONS.":</span> <a href=\"member.php?action=favse&amp;edit=".$stories['seriesid']."\">"._EDIT."</a> | <a href=\"member.php?action=favse&amp;delete=".$stories['seriesid']."\">"._REMOVEFAV."</a></div>");

 			$cmt->assign("oddeven", ($count % 2 ? "odd" : "even"));

 			$tpl->assign("comment", $cmt->getOutputContent( ));

 			$count++;

@@ -73,7 +73,7 @@ if(empty($favorites)) accessDenied( );

 			$tpl->newBlock("storyblock");

 			include("includes/storyblock.php");

 			$tpl->gotoBlock("listings");

-			$tpl->assign("pagelinks", "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"user.php?action=favst&amp;".($edit? "edit=$edit" : "add=1")."&amp;sid=".(isset($sid) ? $sid : $edit)."\">\n

+			$tpl->assign("pagelinks", "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"member.php?action=favst&amp;".($edit? "edit=$edit" : "add=1")."&amp;sid=".(isset($sid) ? $sid : $edit)."\">\n

 				<div style=\"width: 350px; margin: 0 auto; text-align: left;\"><label for=\"comments\">"._COMMENTS.":</label><br />

 				<textarea class=\"textbox\" name=\"comments\" id=\"comments\" cols=\"40\" rows=\"5\">".(isset($info['comments']) ? $info['comments'] : "")."</textarea><br />

 				<INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></div></form>");

@@ -98,7 +98,7 @@ if(empty($favorites)) accessDenied( );

 				$cmt->newBlock("comment");

 				$cmt->assign("comment", $stories['comments'] ? "<div class='comments'><span class='label'>"._COMMENTS.": </span>".strip_tags($stories['comments'])."</div>" : "");

 				if(USERUID == $uid) 

-				$cmt->assign("commentoptions", "<div class='adminoptions'><span class='label'>"._OPTIONS.":</span> <a href=\"user.php?action=favst&amp;edit=".$stories['sid']."\">"._EDIT."</a> | <a href=\"user.php?action=favst&amp;delete=".$stories['sid']."\">"._REMOVEFAV."</a></div>");

+				$cmt->assign("commentoptions", "<div class='adminoptions'><span class='label'>"._OPTIONS.":</span> <a href=\"member.php?action=favst&amp;edit=".$stories['sid']."\">"._EDIT."</a> | <a href=\"member.php?action=favst&amp;delete=".$stories['sid']."\">"._REMOVEFAV."</a></div>");

 				$cmt->assign("oddeven", ($count % 2 ? "odd" : "even"));

 				$tpl->assign("comment", $cmt->getOutputContent( ));

 				$tpl->gotoBlock( "listings" );

@@ -95,7 +95,7 @@

 	}

 	else if(!isMEMBER) {

 		$output .= "<div id=\"pagetitle\">"._MEMBERLOGIN."</div>";

-		$output .= "<div style=\"width: 250px; margin: 0 auto; text-align: center;\"><form method=\"POST\" enctype=\"multipart/form-data\" action=\"user.php?action=login".(isset($_GET['sid']) && isNumber($_GET['sid']) ? "&amp;sid=".$_GET['sid'] : "")."\">

+		$output .= "<div style=\"width: 250px; margin: 0 auto; text-align: center;\"><form method=\"POST\" enctype=\"multipart/form-data\" action=\"member.php?action=login".(isset($_GET['sid']) && isNumber($_GET['sid']) ? "&amp;sid=".$_GET['sid'] : "")."\">

 		<div class=\"label\" style=\"float: left;  width: 30%; text-align: right;\"><label for=\"penname\">"._PENNAME.":</label></div><INPUT type=\"text\" class=\"textbox\" name=\"penname\" id=\"penname\"><br />

 		<div class=\"label\" style=\"float: left; width: 30%; text-align: right;\"><label for=\"pswd\">"._PASSWORD.":</label></div><INPUT type=\"password\" class=\"textbox\" id=\"pswd\" name=\"password\"><br />

 		<INPUT type=\"checkbox\" class=\"checkbox\" name=\"cookiecheck\" id=\"cookiecheck\" value=\"1\"><label for=\"cookiecheck\">"._REMEMBERME."</label><br />

@@ -73,7 +73,7 @@ if(isMEMBER) accessDenied( );

 		else $output .= write_message(_BADEMAIL);

 	}

 	else {

-		$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"user.php?action=lostpassword\">

+		$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"member.php?action=lostpassword\">

 		<table align=\"center\" width=\"300\">

 		<tr><td>"._ENTEREMAIL."</td></tr>

 		<tr><td><INPUT  type=\"text\" class=\"textbox=\" name=\"email\"> <INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></form>

@@ -166,7 +166,7 @@ if($imageupload) {

 		buildImageList( );

 	}

 	if(isset($_GET['upload']) && !isset($_POST['submit'])) {

-			$output .= "<form method=\"post\" action=\"user.php?action=manageimages&upload=upload\" ENCTYPE=\"multipart/form-data\">

+			$output .= "<form method=\"post\" action=\"member.php?action=manageimages&upload=upload\" ENCTYPE=\"multipart/form-data\">

 					<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"$max_size\">";

 			for($x = 1; $x < 6; $x++) {

 				$output .= "<div style='width: 300px; margin: 0 auto;'><label for='upfile$x'>"._IMAGE." $x:</label><input id=\"upfile$x\" type=\"file\" class=\"textbox\" name=\"upfile[]\"></div>";

@@ -206,12 +206,12 @@ if($imageupload) {

 		while($filename = readdir($directory)) {

 			if($filename=="." || $filename==".." || $filename == "imagelist.js") continue;

 			list($imght, $imgwth, $type, $attr) = getimagesize("$folder/$filename");

-			$output .= "<tr><td class='tblborder'>$filename</td><td class='tblborder'>&#60;img src=\"$folder/$filename\"&#62;</td><td class='tblborder' style='text-align: center;'><a href=\"javascript:pop('$folder/$filename', $imgwth, $imght, 'yes')\">"._VIEW."</a> | <a href=\"user.php?action=manageimages&amp;delete=$filename\" onclick=\"return confirm('"._CONFIRMDELETE."')\">"._DELETE."</a></td></tr>";

+			$output .= "<tr><td class='tblborder'>$filename</td><td class='tblborder'>&#60;img src=\"$folder/$filename\"&#62;</td><td class='tblborder' style='text-align: center;'><a href=\"javascript:pop('$folder/$filename', $imgwth, $imght, 'yes')\">"._VIEW."</a> | <a href=\"member.php?action=manageimages&amp;delete=$filename\" onclick=\"return confirm('"._CONFIRMDELETE."')\">"._DELETE."</a></td></tr>";

 			$count++;

 		}

 		if($count == 0) $output .= "<tr><td colspan='3' style='text-align: center;'>"._NORESULTS."</td></tr>";

 		$output .= "</table></div>";

-		$output .= write_message("<a href=\"user.php?action=manageimages&amp;upload=upload\">"._UPLOADIMAGE."</a>");

+		$output .= write_message("<a href=\"member.php?action=manageimages&amp;upload=upload\">"._UPLOADIMAGE."</a>");

 	}

 }

@@ -45,7 +45,7 @@ else {

 			$itemcount = 0;

 			$countquery = dbquery("SELECT COUNT(item) FROM ".TABLEPREFIX."fanfiction_favorites WHERE uid = '$uid' AND type = '$type'");

 			list($itemcount) = dbrow($countquery);

-			if(empty($panel['panel_url'])) $output .=  "<a href=\"user.php?action=".$panel['panel_name']."\">".$panel['panel_title']." [$itemcount]</a><br />\n";

+			if(empty($panel['panel_url'])) $output .=  "<a href=\"member.php?action=".$panel['panel_name']."\">".$panel['panel_title']." [$itemcount]</a><br />\n";

 			else $output .= "<a href=\"".$panel['panel_url']."\">".$panel['panel_title']." [$itemcount]</a><br />\n";

 		}

 	}

@@ -33,7 +33,7 @@ if($userinfo['email'])

 	$nameinfo .= " [<a href=\"viewuser.php?action=contact&amp;uid=".$userinfo['uid']."\">"._CONTACT."</a>]";

 if(!empty($favorites) && isMEMBER && $userinfo['uid'] != USERUID) {

 	$fav = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_favorites WHERE uid = '".USERUID."' AND type = 'AU' AND item = '".$userinfo['uid']."'");

-	if(dbnumrows($fav) == 0) $nameinfo .= " [<a href=\"user.php?action=favau&amp;uid=".USERUID."&amp;add=".$userinfo['uid']."\">"._ADDAUTHOR2FAVES."</a>]";

+	if(dbnumrows($fav) == 0) $nameinfo .= " [<a href=\"member.php?action=favau&amp;uid=".USERUID."&amp;add=".$userinfo['uid']."\">"._ADDAUTHOR2FAVES."</a>]";

 }

 $tpl->assign("userpenname", $userinfo['penname']." ".$nameinfo);

 $tpl->assign("membersince", date("$dateformat", $userinfo['date']));

@@ -81,7 +81,7 @@ if(!empty($dynamicfields)) $tpl->assign("authorfields", $dynamicfields);

 $tpl->assign("reportthis", "[<a href=\""._BASEDIR."contact.php?action=report&amp;url=viewuser.php?uid=".$uid."\">"._REPORTTHIS."</a>]");

 $adminopts = "";

 if(isADMIN && uLEVEL < 3) {

-	$adminopts .= "<div class=\"adminoptions\"><span class='label'>"._ADMINOPTIONS.":</span> ".(isset($userinfo['validated']) && $userinfo['validated'] ? "[<a href=\"admin.php?action=members&amp;revoke=$uid\" class=\"vuadmin\">"._REVOKEVAL."</a>] " : "[<a href=\"admin.php?action=members&amp;validate=$uid\" class=\"vuadmin\">"._VALIDATE."</a>] ")."[<a href=\"user.php?action=editbio&amp;uid=$uid\" class=\"vuadmin\">"._EDIT."</a>] [<a href=\"admin.php?action=members&amp;delete=$uid\" class=\"vuadmin\">"._DELETE."</a>]";

+	$adminopts .= "<div class=\"adminoptions\"><span class='label'>"._ADMINOPTIONS.":</span> ".(isset($userinfo['validated']) && $userinfo['validated'] ? "[<a href=\"admin.php?action=members&amp;revoke=$uid\" class=\"vuadmin\">"._REVOKEVAL."</a>] " : "[<a href=\"admin.php?action=members&amp;validate=$uid\" class=\"vuadmin\">"._VALIDATE."</a>] ")."[<a href=\"member.php?action=editbio&amp;uid=$uid\" class=\"vuadmin\">"._EDIT."</a>] [<a href=\"admin.php?action=members&amp;delete=$uid\" class=\"vuadmin\">"._DELETE."</a>]";

 	$adminopts .= " [<a href=\"admin.php?action=members&amp;".($userinfo['level'] < 0 ? "unlock=".$userinfo['uid']."\" class=\"vuadmin\">"._UNLOCKMEM : "lock=".$userinfo['uid']."\" class=\"vuadmin\">"._LOCKMEM)."</a>]";

 	$adminopts .= " [<a href=\"admin.php?action=admins&amp;".(isset($userinfo['level']) && $userinfo['level'] > 0 ? "revoke=$uid\" class=\"vuadmin\">"._REVOKEADMIN."</a>] [<a href=\"admin.php?action=admins&amp;do=edit&amp;uid=$uid\" class=\"vuadmin\">"._EDITADMIN : "do=new&amp;uid=$uid\" class=\"vuadmin\">"._MAKEADMIN)."</a>]</div>";

 	$tpl->assign("adminoptions", $adminopts);

@@ -84,7 +84,7 @@ if($reviewcount) {

 			$reviewer = $reviews['reviewer'];

 			$member = _ANONYMOUS;

 		}

-		if(!empty($authoruid) && USERUID == $authoruid) $adminlink .= " [<a href=\"user.php?action=revres&amp;reviewid=".$reviews['reviewid']."\">"._RESPOND."</a>]";

+		if(!empty($authoruid) && USERUID == $authoruid) $adminlink .= " [<a href=\"member.php?action=revres&amp;reviewid=".$reviews['reviewid']."\">"._RESPOND."</a>]";

 		$revlist->newBlock("reviewsblock");

 		$revlist->assign("reviewer"   , $reviewer );

 		$revlist->assign("review"   , $reviews['review']);

@@ -113,7 +113,7 @@ if(!defined("_CHARSET")) exit( );

 			$revlist->assign("member", $member );

 			$revlist->assign("oddeven", "odd");

 			$output .= $revlist->getOutputContent( );

-			$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"user.php?action=revres\">";

+			$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"member.php?action=revres\">";

 			$output .= "<INPUT type=\"hidden\" name=\"rid\" value=\"$reviewid\">

 				<div style=\"text-align: center;\"><label for=\"response\">"._AUTHORSRESPONSE.":</label><span style='clear: left;'>&nbsp;</span></div>

 				<div class='shorttextarea'><textarea class=\"textbox\" name=\"response\" id=\"response\" style='width: 100%;' rows=\"5\"></TEXTAREA></div>";

@@ -70,7 +70,7 @@ $authorof[] =  "<a href='".$thislink."action=stats&amp;stat=series'>$seriescount

 if($stat == "series" && dbnumrows($seriesquery)) {

 	$output .= "<center><h4>"._SERIES."</h4></center><table class=\"tblborder\"  width=\"90%\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\"><tr><th>"._TITLE."</th>".($reviewsallowed ? "<th>"._REVIEWS."</th>" : "").($favorites ? "<th>"._FAVORITE."</th>" : "")."</tr>";

 	while($series = dbassoc($seriesquery)) {

-		$output .= "<tr><td class=\"tblborder\"><a href=\"series.php?seriesid=$series[seriesid]\">".stripslashes($series['title'])."</a> ".ratingpics($series['rating'])."</td>".($reviewsallowed ? "<td class=\"tblborder\" align=\"center\"><a href=\"reviews.php?type=SE&amp;item=$series[seriesid]\">$series[reviews]</a></td>" : "").($favorites ? "<td class=\"tblborder\" align=\"center\">".($series['count'] ? "<a href=\"user.php?action=stats&amp;favseries=$series[seriesid]\">$series[count]</a>" : "0")."</td>" : "")."</td></tr>";

+		$output .= "<tr><td class=\"tblborder\"><a href=\"series.php?seriesid=$series[seriesid]\">".stripslashes($series['title'])."</a> ".ratingpics($series['rating'])."</td>".($reviewsallowed ? "<td class=\"tblborder\" align=\"center\"><a href=\"reviews.php?type=SE&amp;item=$series[seriesid]\">$series[reviews]</a></td>" : "").($favorites ? "<td class=\"tblborder\" align=\"center\">".($series['count'] ? "<a href=\"member.php?action=stats&amp;favseries=$series[seriesid]\">$series[count]</a>" : "0")."</td>" : "")."</td></tr>";

 		$serieslist[] = $series['seriesid'];

 	}

 	$output .= "</table>";

@@ -82,11 +82,11 @@ if($reviewsallowed && (isMEMBER || $anonreviews)) {

 	$jumpmenu .= "<option value=\"reviews.php?action=add&amp;type=SE&amp;item=$seriesid\">"._SUBMITREVIEW."</option>";

 }

 if(isMEMBER && $favorites) {

-	$addtofaves = "[<a href=\"user.php?action=favse&amp;uid=".USERUID."&amp;add=$seriesid\">"._ADDSERIES2FAVES."</a>]";

-	$jumpmenu .= "<option value=\"user.php?action=favse&amp;uid=".USERUID."&amp;add=$seriesid\">"._ADDSERIES2FAVES."</option>";

+	$addtofaves = "[<a href=\"member.php?action=favse&amp;uid=".USERUID."&amp;add=$seriesid\">"._ADDSERIES2FAVES."</a>]";

+	$jumpmenu .= "<option value=\"member.php?action=favse&amp;uid=".USERUID."&amp;add=$seriesid\">"._ADDSERIES2FAVES."</option>";

 	if($series['isopen'] == 0) { // Only closed series.

-		$addtofaves .= " [<a href=\"user.php?action=favau&amp;uid=".USERUID."&amp;add=".$series['uid']."\">"._ADDAUTHOR2FAVES."</a>]";

-		$jumpmenu .= "<option value=\"user.php?action=favau&amp;uid=".USERUID."&amp;add=".$series['uid']."\">"._ADDAUTHOR2FAVES."</option>";

+		$addtofaves .= " [<a href=\"member.php?action=favau&amp;uid=".USERUID."&amp;add=".$series['uid']."\">"._ADDAUTHOR2FAVES."</a>]";

+		$jumpmenu .= "<option value=\"member.php?action=favau&amp;uid=".USERUID."&amp;add=".$series['uid']."\">"._ADDAUTHOR2FAVES."</option>";

 	}

 }

 if($series['isopen'] && isMEMBER) {

@@ -315,7 +315,7 @@ else {

 	if(isADMIN && uLEVEL < 3) 

 		$adminlinks = "<div class=\"adminoptions\"><span class='label'>"._ADMINOPTIONS.":</span> "._EDIT." - <a href=\"stories.php?action=editstory&amp;sid=$sid&amp;admin=1\">"._STORY."</a> "._OR." <a href=\"stories.php?action=editchapter&amp;chapid=$chapid&amp;admin=1\">"._CHAPTER."</a> | "._DELETE." - <a href=\"stories.php?action=delete&amp;sid=$sid&amp;admin=1\">"._STORY."</a> "._OR." <a href=\"stories.php?action=delete&amp;chapid=$chapid&amp;sid=$sid&amp;admin=1\">"._CHAPTER."</a></div>";

 	if(isMEMBER && $favorites) {

-		$jumpmenu2 .= "<option value=\"user.php?action=favst&amp;add=1&amp;sid=$sid\">"._ADDSTORY2FAVES."</option><option value=\"user.php?action=favau&amp;add=1&amp;author=".$stories['uid'].(count($storyinfo['coauthors']) ? ",".implode(",", array_keys($storyinfo['coauthors'])) : "")."\">"._ADDAUTHOR2FAVES."</option>";

+		$jumpmenu2 .= "<option value=\"member.php?action=favst&amp;add=1&amp;sid=$sid\">"._ADDSTORY2FAVES."</option><option value=\"member.php?action=favau&amp;add=1&amp;author=".$stories['uid'].(count($storyinfo['coauthors']) ? ",".implode(",", array_keys($storyinfo['coauthors'])) : "")."\">"._ADDAUTHOR2FAVES."</option>";

 	}

 	if($reviewsallowed ) {

 		if(isMEMBER || $anonreviews) {

@@ -46,7 +46,7 @@ if($displayprofile) include("user/profile.php");

 else if(isADMIN && uLEVEL < 3) {

 	$result2 = dbquery("SELECT * FROM "._AUTHORTABLE." LEFT JOIN ".TABLEPREFIX."fanfiction_authorprefs as ap ON ap.uid = "._UIDFIELD." WHERE "._UIDFIELD." = '$uid' LIMIT 1");

 	$userinfo = dbassoc($result2);

-	$adminopts = "<div class=\"adminoptions\"><span class='label'>"._ADMINOPTIONS.":</span> ".(isset($userinfo['validated']) && $userinfo['validated'] ? "[<a href=\"admin.php?action=members&amp;revoke=$uid\" class=\"vuadmin\">"._REVOKEVAL."</a>] " : "[<a href=\"admin.php?action=members&amp;validate=$uid\" class=\"vuadmin\">"._VALIDATE."</a>] ")."[<a href=\"user.php?action=editbio&amp;uid=$uid\" class=\"vuadmin\">"._EDIT."</a>] [<a href=\"admin.php?action=members&amp;delete=$uid\" class=\"vuadmin\">"._DELETE."</a>]";

+	$adminopts = "<div class=\"adminoptions\"><span class='label'>"._ADMINOPTIONS.":</span> ".(isset($userinfo['validated']) && $userinfo['validated'] ? "[<a href=\"admin.php?action=members&amp;revoke=$uid\" class=\"vuadmin\">"._REVOKEVAL."</a>] " : "[<a href=\"admin.php?action=members&amp;validate=$uid\" class=\"vuadmin\">"._VALIDATE."</a>] ")."[<a href=\"member.php?action=editbio&amp;uid=$uid\" class=\"vuadmin\">"._EDIT."</a>] [<a href=\"admin.php?action=members&amp;delete=$uid\" class=\"vuadmin\">"._DELETE."</a>]";

 	$adminopts .= " [<a href=\"admin.php?action=members&amp;".($userinfo['level'] < 0 ? "unlock=".$userinfo['uid']."\" class=\"vuadmin\">"._UNLOCKMEM : "lock=".$userinfo['uid']."\" class=\"vuadmin\">"._LOCKMEM)."</a>]";

 	$adminopts .= " [<a href=\"admin.php?action=admins&amp;".(isset($userinfo['level']) && $userinfo['level'] > 0 ? "revoke=$uid\" class=\"vuadmin\">"._REVOKEADMIN."</a>] [<a href=\"admin.php?action=admins&amp;do=edit&amp;uid=$uid\" class=\"vuadmin\">"._EDITADMIN : "do=new&amp;uid=$uid\" class=\"vuadmin\">"._MAKEADMIN)."</a>]</div>";

 	$tpl->assign("adminoptions", $adminopts);