@@ -97,7 +97,7 @@ else

 		$news->assign("newsdate", date("$dateformat $timeformat", $stories['date']));

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

 		if ($newscomments == "1")

-			$news->assign("newscomments", "<a href=\"news.php?action=newsstory&amp;nid=" . $stories['nid'] . "\">" . $stories['comments'] . " " . _COMMENTS . "</a>");

+			$news->assign("newscomments", "<a href=\"ffnews.php?action=newsstory&amp;nid=" . $stories['nid'] . "\">" . $stories['comments'] . " " . _COMMENTS . "</a>");

 		if (isADMIN)

 			$news->assign("adminoptions", "<a href=\"admin.php?action=news&amp;form=" . $stories['nid'] . "\">" . _EDIT . "</a> | <a href=\"admin.php?action=news&amp;delete=" . $stories['nid'] . "\">" . _DELETE . "</a>");

 		$count++;

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

 <?php

 if(!defined("_CHARSET")) exit( );

-	$content = "<form method=\"POST\" id=\"searchblock\" enctype=\"multipart/form-data\" action=\""._BASEDIR."search.php?action=advanced\">

+	$content = "<form method=\"POST\" id=\"searchblock\" enctype=\"multipart/form-data\" action=\""._BASEDIR."searching.php?action=advanced\">

 			<INPUT type=\"text\" class=\"textbox\" name=\"searchterm\" id=\"searchterm\" size=\"15\"> 

 			<INPUT type=\"hidden\" name=\"searchtype\" value=\"advanced\">

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

@@ -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="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="report.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>'),

 (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>'),

@@ -8,11 +8,11 @@ INSERT INTO `test3fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `l

 (8, 'members', 'Members', 'authors.php?action=list', '0', 0),

 (9, 'authors', 'Authors', 'authors.php?list=authors', '0', 0),

 (10, 'help', 'Help', 'viewpage.php?page=help', '0', 0),

-(11, 'search', 'Search', 'search.php', '0', 0),

+(11, 'search', 'Search', 'searching.php', '0', 0),

 (12, 'series', 'Series', 'browse.php?type=series', '0', 0),

 (13, 'tens', 'Top Tens', 'toplists.php', '0', 0),

 (14, 'challenges', 'Challenges', 'browse.php?type=challenges', '0', 0),

-(15, 'contactus', 'Contact Us', 'contact.php', '0', 0),

+(15, 'contactus', 'Contact Us', 'report.php', '0', 0),

 (16, 'rules', 'Rules', 'viewpage.php?page=rules', '0', 0),

 (17, 'tos', 'Terms of Service', 'viewpage.php?page=tos', '0', 0),

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

@@ -20,7 +20,7 @@ INSERT INTO `test3fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `l

 (20, 'titles', 'Titles', 'browse.php?type=titles', '0', 0),

 (21, 'register', 'Register', 'author.php?action=register', '0', 0),

 (22, 'lostpassword', 'Lost Password', 'author.php?action=lostpassword', '0', 0),

-(23, 'newsarchive', 'News Archive', 'news.php', '0', 0),

+(23, 'newsarchive', 'News Archive', 'ffnews.php', '0', 0),

 (24, 'browse', 'Browse', 'browse.php', '0', 0),

 (25, 'charslink', 'Characters', 'browse.php?type=characters', '0', 0),

 (26, 'ratings', 'Ratings', 'browse.php?type=ratings', '0', 0);

@@ -523,7 +523,7 @@ function charlist($characters) {

 }

 // Most of the pages that list stories and series use this fuction.  This handles showing the series and stories and pagination of the two together when needed

-function search($storyquery, $countquery, $pagelink = "search.php?", $pagetitle = 0) {

+function search($storyquery, $countquery, $pagelink = "searching.php?", $pagetitle = 0) {

 	global $tpl, $new, $ratingslist, $itemsperpage, $reviewsallowed, $output, $dateformat, $current, $featured, $favorites, $retired, $ageconsent, $classtypelist, $classlist, $offset, $recentdays;

 	$count = dbquery($countquery);

@@ -83,6 +83,6 @@ if(!defined("_CHARSET")) exit( );

 		$tpl->assign("adminoptions", "<div class=\"adminoptions\"><span class='label'>"._ADMINOPTIONS.":</span> [<a href=\""._BASEDIR."series.php?action=add&amp;add=stories&amp;seriesid=".$stories['seriesid']."\">"._ADD2SERIES."</a>] [<a href=\""._BASEDIR."series.php?action=edit&amp;seriesid=".$stories['seriesid']."\">"._EDIT."</a>] [<a href=\""._BASEDIR."series.php?action=delete&amp;seriesid=".$stories['seriesid']."\">"._DELETE."</a>]".(!empty($adminlinks) ? " ".$adminlinks : "")."</div>");

 	}

 	else if($stories['isopen'] == 2 && USERUID) $tpl->assign("adminoptions", "[<a href=\""._BASEDIR."series.php?action=add&amp;add=stories&amp;seriesid=".$stories['seriesid']."\">"._ADD2SERIES."</a>] ".(!empty($adminlinks) ? " ".$adminlinks : ""));

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

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

 	$count++;

 ?>

\ No newline at end of file

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

 	else if(isADMIN && uLEVEL < 4) $adminlinks .= " [<a href=\""._BASEDIR."admin.php?action=featured&amp;feature=".$stories['sid']."\">"._FEATURED."</a>]";

 	$tpl->assign("toc", "<a href=\""._BASEDIR."viewstory.php?sid=".$stories['sid']."&amp;index=1\">"._TOC."</a>");

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

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

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

 	if(isADMIN && uLEVEL < 4) $tpl->assign("adminlinks", "<div class=\"adminoptions\"><span class='label'>"._ADMINOPTIONS.":</span> ".$adminlinks."</div>");

 	else if(isMEMBER && (USERUID == $stories['uid'] || array_key_exists(USERUID, $stories['coauthors']))) $tpl->assign("adminlinks", "<div class=\"adminoptions\"><span class='label'>"._OPTIONS.":</span> ".$adminlinks."</div>");

 	$count++;

@@ -255,7 +255,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=\"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=\"report.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>');");

 				$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>";

@@ -324,25 +324,25 @@ switch ($_GET['step'])

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

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

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

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

+					array("logout", "Logout", "author.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"),

 					array("authors", "Authors", "authors.php?list=authors", "0", "0"),

 					array("help", "Help", "viewpage.php?page=help", "0", "0"),

-					array("search", "Search", "search.php", "0", "0"),

+					array("search", "Search", "searching.php", "0", "0"),

 					array("series", "Series", "browse.php?type=series", "0", "0"),

 					array("tens", "Top Tens", "toplists.php", "0", "0"),

 					array("challenges", "Challenges", "modules/challenges/challenges.php", "0", "0"),

-					array("contactus", "Contact Us", "contact.php", "0", "0"),

+					array("contactus", "Contact Us", "report.php", "0", "0"),

 					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", "author.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("newsarchive", "News Archive", "news.php", "0", "0"),

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

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

+					array("newsarchive", "News Archive", "ffnews.php", "0", "0"),

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

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

 					array("ratings", "Ratings", "browse.php?type=ratings", "0", "0"),

@@ -55,7 +55,7 @@ define ("_DOWN", "down arrow");

 define ("_EDIT", "Edit");

 define ("_EDITFAVORITES", "Edit Favorites");

 define ("_EMAIL", "E-mail");

-define ("_EMAILFAILED", "The email could not be sent.  Please <a href='"._BASEDIR."contact.php'>contact the administrator</a> to report this problem.");

+define ("_EMAILFAILED", "The email could not be sent.  Please <a href='"._BASEDIR."report.php'>contact the administrator</a> to report this problem.");

 define ("_ERROR", "<strong>Error!</strong>We encountered an error.  Please go back and try again.");

 define ("_FATALERROR", "<b>A fatal MySQL error was encountered.</b><br />");

 define ("_FSTORY", "Feature");

@@ -193,7 +193,7 @@ define ("_FULLTEXT", "Full Text");

 define ("_INCLUDE", "to Include");

 define ("_RESULTS", "Search Results");

 define ("_SEARCHTERM", "Search term");

-define ("_SEARCHTERMTOOSHORT", "Your search term was too short.  Your search term must be a minimum of three characters long. <a href='search.php'>Try again.</a>");

+define ("_SEARCHTERMTOOSHORT", "Your search term was too short.  Your search term must be a minimum of three characters long. <a href='searching.php'>Try again.</a>");

 define ("_SIMPLE", "Simple Search");

 define ("_WORDCOUNT", "Word count");

 define ("_SEARCH", "Search");

@@ -365,7 +365,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 ("_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 ("_ACCOUNTLOCKED", "This account has been locked by the adminstrators of this site.  Please <a href='report.php'>contact</a> the site adminstrators for more information.");

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

 // User - Review Response

@@ -380,7 +380,7 @@ define ("_ARCHIVEDAT", "This story archived at");

 define ("_BACK2INDEX", "Back to index");

 define ("_CONTINUE", "Continue");

 define ("_CONTRIBUTE2RR", "Contribute to Round Robin");

-define ("_INVALIDSTORY", "That story does not exist on this archive.  You may <a href='search.php'>search</a> for it or return to <a href='index.php'>the home page.</a>");

+define ("_INVALIDSTORY", "That story does not exist on this archive.  You may <a href='searching.php'>search</a> for it or return to <a href='index.php'>the home page.</a>");

 define ("_LOGINTOREVIEW", "You must %1\$s (%2\$s) to review.");

 define ("_SUBMITREVIEW", "Submit a Review");

 define ("_TEXTSIZE", "Text Size");

@@ -84,7 +84,7 @@ else include_once(_BASEDIR."modules/challenges/languages/en.php");

 			$challenges->assign("characters", $challenge['characters'] ? charlist($challenge['characters']) : _NONE);

 			$challenges->assign("category"   , ($challenge['catid'] > 0 ? catlist($challenge['catid']) : _NONE) );

 			if(isMEMBER) $challenges->assign("respond", "<div class=\"respond\"><a href=\"modules/challenges/challenges.php?action=respond&amp;chalid=".$challenge['chalid']."\">"._RESPOND2CHALLENGE."</a></div>");

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

+			$challenges->assign("reportthis", "[<a href=\""._BASEDIR."report.php?action=report&amp;url=modules/challenges/challenges.php?chalid=".$challenge['chalid']."\">"._REPORTTHIS."</a>]");

 			$codequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'challengeblock'");

 			while($code = dbassoc($codequery)) {

 				eval($code['code_text']);

@@ -292,7 +292,7 @@ else {

 		$challenges->assign("characters", $chars ? charlist($chars) : _NONE);

 		$challenges->assign("category", $cat > 0 ? catlist($cat) : _NONE);

 		$challenges->assign("respond", "<div class=\"respond\"><a href=\"challenges.php?action=respond&amp;chalid=$chalid\">"._RESPOND2CHALLENGE."</a></div>");

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

+		$challenges->assign("reportthis", "[<a href=\""._BASEDIR."report.php?action=report&amp;url=modules/challenges/challenges.php?chalid=".$chalid."\">"._REPORTTHIS."</a>]");

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

 		$tpl->gotoBlock( "_ROOT" );

 		$tpl->newBlock("listings");

@@ -53,7 +53,7 @@ if($numchal) {

 		$challenges->assign("characters", $challenge['characters'] ? charlist($challenge['characters']) : _NONE);

 		$challenges->assign("category"   , ($challenge['catid'] > 0 ? catlist($challenge['catid']) : _NONE) );

 		$challenges->assign("respond", "<div class=\"respond\"><a href=\""._BASEDIR."modules/challenges/challenges.php?action=respond&amp;chalid=".$challenge['chalid']."\">"._RESPOND2CHALLENGE."</a></div>");

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

+		$challenges->assign("reportthis", "[<a href=\""._BASEDIR."report.php?action=report&amp;url=modules/challenges/challenges.php?chalid=".$challenge['chalid']."\">"._REPORTTHIS."</a>]");

 		$codequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'challengeblock'");

 		while($code = dbassoc($codequery)) {

 			eval($code['code_text']);

@@ -45,7 +45,7 @@ include("includes/pagesetup.php");

 	}

 	else

 	{

-		$output .= "<form method='POST' enctype='multipart/form-data' action='contact.php'>

+		$output .= "<form method='POST' enctype='multipart/form-data' action='report.php'>

 		<table class='acp'><tr><td><label for='email'>"._YOUREMAIL.":</label></td><td><INPUT type='text' class='textbox' name='email'></td></tr>";

 		if(!$action) $output .= "<tr><td><label for='subject'>"._SUBJECT.":</label></td><td><INPUT  type='text' class='textbox' name='subject'></td></tr>";

 		else if($action == "report") $output .= "<tr><td><label for='subject'>"._REPORT.":</label></td><td><select class='textbox' name='subject'>

@@ -383,7 +383,7 @@ else {

 		if(empty($reviews['respond']) && (USERUID == $authoruid || (isset($array_coauthors) && in_array(USERUID, $array_coauthors)))) $adminlink .= " [<a href=\"user.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>]");

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

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

 		$tpl->assign("reviewdate", date("$dateformat $timeformat", $reviews['date']) );

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

@@ -252,7 +252,7 @@ if(isset($_POST['submit']) || isset($_GET['offset'])) {

 }

 else {

 	if($searchtype == "simple") {

-		$output .= "<div id=\"pagetitle\">"._SIMPLE."</div><div style='text-align: center;'><form method=\"post\" enctype=\"multipart/form-data\" action=\"search.php\">

+		$output .= "<div id=\"pagetitle\">"._SIMPLE."</div><div style='text-align: center;'><form method=\"post\" enctype=\"multipart/form-data\" action=\"searching.php\">

 		<div class=\"tblborder\" style=\"width: 320px; padding: 5px; margin: 0 auto;\">

 		<select name=\"searchtype\">

 		<option value=\"penname\">"._PENNAME."</option>

@@ -262,11 +262,11 @@ else {

 			$output .= "<option value=\"fulltext\">"._FULLTEXT."</option>";

 		$output .= "</select> <INPUT type=\"text\" class=\"textbox\" name=\"searchterm\" size=\"20\"> ";

 		$output .= "<INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\" size=\"20\">

-		<div style=\"font-size: 8pt; text-align: right;\"><a href=\"search.php?searchtype=advanced\">"._ADVANCED."</a></div></div></form></div>";

+		<div style=\"font-size: 8pt; text-align: right;\"><a href=\"searching.php?searchtype=advanced\">"._ADVANCED."</a></div></div></form></div>";

 	}

 	else {

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

-			<form method=\"POST\" name=\"form\" enctype=\"multipart/form-data\" action=\"search.php?searchtype=advanced\">

+			<form method=\"POST\" name=\"form\" enctype=\"multipart/form-data\" action=\"searching.php?searchtype=advanced\">

 			<div class=\"tblborder\" style=\"width: 90%; margin: 0 auto; padding: 10px;\">";

 		if($multiplecats) {

 			include("includes/categories.php");

@@ -79,7 +79,7 @@ while($code = dbassoc($codequery)) {

 }

 if(!empty($dynamicfields)) $tpl->assign("authorfields", $dynamicfields);

 /* End dynamic fields */

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

+$tpl->assign("reportthis", "[<a href=\""._BASEDIR."report.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=\"author.php?action=editbio&amp;uid=$uid\" class=\"vuadmin\">"._EDIT."</a>] [<a href=\"admin.php?action=members&amp;delete=$uid\" class=\"vuadmin\">"._DELETE."</a>]";

@@ -324,8 +324,8 @@ else {

 		}

 		else $reviewslink = write_message(sprintf(_LOGINTOREVIEW, strtolower($pagelinks['login']['link']), strtolower($pagelinks['register']['link'])));

 	}

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

-	$jumpmenu2 .= "<option value=\"contact.php?action=report&amp;url=viewstory.php?chapid=$chapid\">"._REPORTTHIS."</option>";

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

+	$jumpmenu2 .= "<option value=\"report.php?action=report&amp;url=viewstory.php?chapid=$chapid\">"._REPORTTHIS."</option>";

 	if($stories['rr']) {

 		$rr = "[<a href=\"stories.php?action=newchapter&amp;sid=".$sid."\">"._CONTRIBUTE2RR."</a>]";

 		$jumpmenu2 .= "<option value=\"stories.php?action=newchapter&amp;sid=".$sid."\">"._CONTRIBUTE2RR."</option>";