@@ -19,6 +19,13 @@ e107_fanfiction_xxx

 All e107 tables will look:

 e107_xxx

+

+## Update for fixed 3.3.6

+Changes:

+file user.php -  now author.php  (more logical than member)

+file index.php - no changes

+

+

 ## Files

 Only problem if you use e107 and efiction on the same level (what is the final goal):

@@ -78,7 +78,7 @@ function datadump ($table) {

 			datadump(current($table));

 	}

- 	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`) VALUES('".escapestring(sprintf(_LOG_BACKUP, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM')");

+ 	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_BACKUP, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM', " . time() . ")");

 	exit( );

 ?>

\ No newline at end of file

@@ -79,7 +79,7 @@ function datadump ($table) {

 			datadump(current($table));

 	}

- 	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`) VALUES('".escapestring(sprintf(_LOG_BACKUP, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM')");

+ 	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_BACKUP, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM', " . time() . ")");

 	exit( );

 ?>

\ No newline at end of file

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

 		dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET featured = 0 WHERE sid = ".$_GET['remove']);

 	if(isset($_GET['feature']))

 		dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET featured = 1 WHERE sid = ".$_GET['feature']);

-	$fresult = dbquery("SELECT stories.*, stories.title as title, "._PENNAMEFIELD." as penname, UNIX_TIMESTAMP(stories.updated) as updated, UNIX_TIMESTAMP(stories.date) as date FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories WHERE stories.featured > 0 AND stories.uid = "._UIDFIELD." ORDER BY stories.featured");

+	$fresult = dbquery("SELECT stories.*, stories.title as title, "._PENNAMEFIELD." as penname, stories.updated as updated, stories.date as date FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories WHERE stories.featured > 0 AND stories.uid = "._UIDFIELD." ORDER BY stories.featured");

 	$output .= "<div id='pagetitle'>"._FEATUREDSTORIES."</div>";

 	if(!dbnumrows($fresult)) $output .= write_message(_NORESULTS);

 	else {

@@ -59,7 +59,7 @@ if($maint == "reviews") {

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

 		$eval($code['code_text']);

 	}

-	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`) VALUES('".escapestring(sprintf(_LOG_RECALCREVIEWS, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM')");

+	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_RECALCREVIEWS, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM', " . time() . ")");

 	$output .= write_message(_ACTIONSUCCESSFUL);

 }

 else if($maint == "stories") {

@@ -97,7 +97,7 @@ else if($maint == "categories") {

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

 		dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET numitems = $count WHERE catid = $cat[0]");

 	}

-	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`) VALUES('".escapestring(sprintf(_LOG_CATCOUNTS, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM')");

+	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_CATCOUNTS, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM', " . time() . ")");

 	$output .= write_message(_CATCOUNTSUPDATED);

 }

 else if($maint == "categories2") {

@@ -192,7 +192,7 @@ else if($maint == "optimize") {

 			dbquery("OPTIMIZE TABLE `".$tablename."`");

 		}

 	}

- 	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`) VALUES('".escapestring(sprintf(_LOG_OPTIMIZE, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM')");

+ 	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_OPTIMIZE, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM', " . time() . ")");

 	$output .= write_message(_ACTIONSUCCESSFUL);

 }

 else if($maint == "backup") {

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

 			if(preg_match("!^[a-z0-9_ ]{3,30}$!i", $_POST['penname'])) {

 				dbquery("INSERT INTO ".substr(_AUTHORTABLE, 0, strpos(_AUTHORTABLE, "as author"))."(penname, realname, email, admincreated, date) VALUES ('".escapestring(descript($_POST['penname']))."', '".escapestring(descript($_POST['realname']))."', '".escapestring(descript($_POST['email']))."', '1', now())");

 				$newuid = dbinsertid( );

-				if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`) VALUES('".escapestring(sprintf(_LOG_ADMIN_REG, descript($_POST['penname']), $newuid, USERPENNAME, USERUID, $_SERVER['REMOTE_ADDR']))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'RG')");

+				if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_ADMIN_REG, descript($_POST['penname']), $newuid, USERPENNAME, USERUID, $_SERVER['REMOTE_ADDR']))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'RG', " . time() . ")");

 				if(!$skin) {

 					$skinquery = dbquery("SELECT skin FROM ".$settingsprefix."fanfiction_settings WHERE sitekey ='".SITEKEY."'");

 					list($skin) = dbrow($skinquery);

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

 		}

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

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

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

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

 			$output .= _AUTHORS;

 		}

 		else {

 			$where = "";

 			$do = "members";

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

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

 			$output .= _MEMBERS;

 		}

 		if($let == _OTHER) {

@@ -23,76 +23,86 @@

 // To read the license please visit http://www.gnu.org/copyleft/gpl.html

 // ----------------------------------------------------------------------

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

-if(uLEVEL > 3) accessDenied();

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

-		if(isset($_POST['submit'])) {

-			$title = addslashes(strip_tags(descript($_POST['title']), $allowed_tags));

-			$author = addslashes(strip_tags(descript($_POST['author']), $allowed_tags));

-			$story = addslashes(strip_tags(descript($_POST['story']), $allowed_tags));

-			if($_GET['form'] == "new") $result = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_news (title, author, story, time) VALUES ('$title', '$author', '$story', now())");

-			else $result = dbquery("UPDATE ".TABLEPREFIX."fanfiction_news SET title = '$title', author = '$author', story = '$story' WHERE nid = '$_POST[nid]'");

-			if($result) {

-				$output .= write_message(_ACTIONSUCCESSFUL);

-				unset($_GET['form']);

-			}

-			else $output .= write_error(_ERROR." ".TRYAGAIN);

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

+if (uLEVEL > 3) accessDenied();

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

+if (isset($_POST['submit']))

+{

+	$title = addslashes(strip_tags(descript($_POST['title']), $allowed_tags));

+	$author = addslashes(strip_tags(descript($_POST['author']), $allowed_tags));

+	$story = addslashes(strip_tags(descript($_POST['story']), $allowed_tags));

+	if ($_GET['form'] == "new") $result = dbquery("INSERT INTO " . TABLEPREFIX . "fanfiction_news (title, author, story, time) VALUES ('$title', '$author', '$story', now())");

+	else $result = dbquery("UPDATE " . TABLEPREFIX . "fanfiction_news SET title = '$title', author = '$author', story = '$story' WHERE nid = '$_POST[nid]'");

+	if ($result)

+	{

+		$output .= write_message(_ACTIONSUCCESSFUL);

+		unset($_GET['form']);

+	}

+	else $output .= write_error(_ERROR . " " . TRYAGAIN);

+}

+if (isset($_GET['delete']) && isNumber($_GET['delete']))

+{

+	if (isset($_GET['confirm']))

+	{

+		if ($_GET['confirm'] == "yes")

+		{

+			dbquery("DELETE FROM " . TABLEPREFIX . "fanfiction_news where nid = '" . $_GET['delete'] . "'");

+			$output .= write_message(_ACTIONSUCCESSFUL);

 		}

-		if(isset($_GET['delete']) && isNumber($_GET['delete'])) {

-			if($_GET['confirm'] == "yes") {

-				dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_news where nid = '".$_GET['delete']."'");

-				$output .= write_message(_ACTIONSUCCESSFUL);

-			}

-			else if ($_GET['confirm'] == "no") $output .= write_message(_ACTIONCANCELLED);

-			else {

-			$output .= write_message(_CONFIRMDELETE."<br /><br />

-[ <a href=\"admin.php?action=news&confirm=yes&delete=$_GET[delete]\">"._YES."</a> | <a href=\"admin.php?action=news&confirm=no&delete=$_GET[delete]\">"._NO."</a> ]");

-			}

-		}

-		else if(isset($_GET["form"])) {

-			if($_GET["form"] != "new" && isNumber($_GET["form"])) {

-				$result = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_news WHERE nid = '".$_GET['form']."' LIMIT 1");

-				$newsitem = dbassoc($result);

-			}

-			else $newsitem = array("title" => "", "author" => "", "story" => "");

-			$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=news&form=$_GET[form]\">

-				<table align=\"center\"><tr><td colspan=\"2\" align=\"center\"><b>".($_GET["form"] == "new" ? _ADDNEWS : _EDITNEWS)."</b></td></tr>

-			<tr><td>"._AUTHOR.": </td><td><INPUT  type=\"text\" class=\"textbox=\" name=\"author\" value=\"".stripslashes($newsitem['author'])."\"></td></tr>

-			<tr><td>"._TITLE.": </td><td><INPUT  type=\"text\" class=\"textbox=\" name=\"title\" value=\"".stripslashes($newsitem['title'])."\"></td></tr>

-			<tr><td>"._TEXT.": </td><td><textarea class=\"textbox\" name=\"story\" id=\"story\" COLS=\"45\" ROWS=\"6\">".stripslashes($newsitem['story'])."</TEXTAREA>";

-			if($tinyMCE) 

-				$output .= "<div class='tinytoggle'><input type='checkbox' name='toggle' onclick=\"toogleEditorMode('story');\" checked><label for='toggle'>"._TINYMCETOGGLE."</label></div>";

+		else if ($_GET['confirm'] == "no") $output .= write_message(_ACTIONCANCELLED);

+	}

+	else

+	{

+		$output .= write_message(_CONFIRMDELETE . "<br /><br />

+	[ <a href=\"admin.php?action=news&confirm=yes&delete=$_GET[delete]\">" . _YES . "</a> | <a href=\"admin.php?action=news&confirm=no&delete=$_GET[delete]\">" . _NO . "</a> ]");

+	}

+}

+else if (isset($_GET["form"]))

+{

+	if ($_GET["form"] != "new" && isNumber($_GET["form"]))

+	{

+		$result = dbquery("SELECT * FROM " . TABLEPREFIX . "fanfiction_news WHERE nid = '" . $_GET['form'] . "' LIMIT 1");

+		$newsitem = dbassoc($result);

+	}

+	else $newsitem = array("title" => "", "author" => "", "story" => "");

+	$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=news&form=$_GET[form]\">

+				<table align=\"center\"><tr><td colspan=\"2\" align=\"center\"><b>" . ($_GET["form"] == "new" ? _ADDNEWS : _EDITNEWS) . "</b></td></tr>

+			<tr><td>" . _AUTHOR . ": </td><td><INPUT  type=\"text\" class=\"textbox=\" name=\"author\" value=\"" . stripslashes($newsitem['author']) . "\"></td></tr>

+			<tr><td>" . _TITLE . ": </td><td><INPUT  type=\"text\" class=\"textbox=\" name=\"title\" value=\"" . stripslashes($newsitem['title']) . "\"></td></tr>

+			<tr><td>" . _TEXT . ": </td><td><textarea class=\"textbox\" name=\"story\" id=\"story\" COLS=\"45\" ROWS=\"6\">" . stripslashes($newsitem['story']) . "</TEXTAREA>";

+	if ($tinyMCE)

+		$output .= "<div class='tinytoggle'><input type='checkbox' name='toggle' onclick=\"toogleEditorMode('story');\" checked><label for='toggle'>" . _TINYMCETOGGLE . "</label></div>";

-			$output .= "</td></tr><tr><td colspan=\"2\" align=\"center\">".($_GET["form"] != "new" ? "<INPUT type=\"hidden\" name=\"nid\" value=\"".$_GET['form']."\">" : "")."<INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></td></tr></table></form>";

-		}

-		else {

-			$output .= "<p align=\"center\"><a href=\"admin.php?action=news&form=new\">"._ADDNEWS."</a></p>";

-			$count = dbquery("SELECT COUNT(nid) FROM ".TABLEPREFIX."fanfiction_news");

-			list($numrows)= dbrow($count);

-	

-			$result = dbquery("SELECT n.*, UNIX_TIMESTAMP(n.time) as date, count(c.cid) as comments FROM ".TABLEPREFIX."fanfiction_news as n LEFT JOIN ".TABLEPREFIX."fanfiction_comments as c ON  n.nid = c.nid GROUP BY n.nid ORDER BY time DESC LIMIT $offset, $itemsperpage");

-			if(file_exists("$skindir/newsbox.tpl")) $news = new TemplatePower( "$skindir/newsbox.tpl" );

-			else $news = new TemplatePower( "default_tpls/newsbox.tpl" );

-			$news->prepare();

-			$count = 0;

-			while($stories = dbassoc($result)) {

-				$news->newBlock("newsbox");

-		

-				//assign values

-				$news->assign("newstitle"   , $stories['title'] );

-				$news->assign("newsstory"   , $stories['story'] );

-				$news->assign("newsauthor", $stories['author'] );

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

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

-				if($newscomments == "1")

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

-			}

-			$news->gotoBlock("_ROOT");

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

-			if($numrows > $itemsperpage) $output .= build_pagelinks("admin.php?action=news&", $numrows, $offset);

-		}

+	$output .= "</td></tr><tr><td colspan=\"2\" align=\"center\">" . ($_GET["form"] != "new" ? "<INPUT type=\"hidden\" name=\"nid\" value=\"" . $_GET['form'] . "\">" : "") . "<INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\"" . _SUBMIT . "\"></td></tr></table></form>";

+}

+else

+{

+	$output .= "<p align=\"center\"><a href=\"admin.php?action=news&form=new\">" . _ADDNEWS . "</a></p>";

+	$count = dbquery("SELECT COUNT(nid) FROM " . TABLEPREFIX . "fanfiction_news");

+	list($numrows) = dbrow($count);

+

+	$result = dbquery("SELECT n.*, n.time as date, count(c.cid) as comments FROM " . TABLEPREFIX . "fanfiction_news as n LEFT JOIN " . TABLEPREFIX . "fanfiction_comments as c ON  n.nid = c.nid GROUP BY n.nid ORDER BY time DESC LIMIT $offset, $itemsperpage");

+	if (file_exists("$skindir/newsbox.tpl")) $news = new TemplatePower("$skindir/newsbox.tpl");

+	else $news = new TemplatePower("default_tpls/newsbox.tpl");

+	$news->prepare();

+	$count = 0;

+	while ($stories = dbassoc($result))

+	{

+		$news->newBlock("newsbox");

-?>

\ No newline at end of file

+		//assign values

+		$news->assign("newstitle", $stories['title']);

+		$news->assign("newsstory", $stories['story']);

+		$news->assign("newsauthor", $stories['author']);

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

+		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++;

+	}

+	$news->gotoBlock("_ROOT");

+	$output .= $news->getOutputContent();

+	if ($numrows > $itemsperpage) $output .= build_pagelinks("admin.php?action=news&", $numrows, $offset);

+}

@@ -42,7 +42,7 @@ $chapid = isset($_GET['chapid']) && isNumber($_GET['chapid']) ? $_GET['chapid']

 		if($logging) {

 			$storyquery = dbquery("SELECT story.title, chapter.title as chapter, author.email, author.penname, chapter.uid, chapter.inorder FROM ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters as chapter, ".TABLEPREFIX."fanfiction_authors as author WHERE chapter.uid = author.uid AND chapter.chapid = '$chapid' AND chapter.sid = story.sid LIMIT 1");

 			$story = dbassoc($storyquery);

-			dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`) VALUES('".escapestring(sprintf(_LOG_REJECTION, USERPENNAME, USERUID, $title, $sid, $uid, $penname, $inorder, $letter))."', '".USERUID."', INET_ATON('".$_ENV['REMOTE_ADDR']."'), 'RJ')");

+			dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_REJECTION, USERPENNAME, USERUID, $title, $sid, $uid, $penname, $inorder, $letter))."', '".USERUID."', INET_ATON('".$_ENV['REMOTE_ADDR']."'), 'RJ', ". time() . ")");

 		}

 	}

@@ -49,7 +49,7 @@ function updatePanelOrder( ) {

 	}

 }

-if(isset($action) && $action == "settings") {

+if($action == "settings") {

 $output .= "<h1>"._SETTINGS."</h1><div style='text-align: center;'>

 	<a href='admin.php?action=settings&amp;sect=main'>"._MAINSETTINGS."</a> |

 	<a href='admin.php?action=settings&amp;sect=submissions'>"._SUBMISSIONSETTINGS."</a> |

@@ -105,7 +105,7 @@ if(isset($_POST['submit'])) {

 		$submissionsoff = $_POST['newsubmissionsoff'] == 1 ? 1 : 0;

 		$autovalidate = $_POST['newautovalidate'] == 1 ? 1 : 0;

 		$coauthallowed = $_POST['newcoauthallowed'] == 1 ? 1 : 0;

-		$store = !empty($_POST['newstore']) ? $_POST['newstore'] == "files" ? "files" : "mysql" : $store;

+		$store = !empty($_POST['newstore']) ? ($_POST['newstore'] == "files" ? "files" : "mysql" ) : $store;

 		$storiespath = descript($_POST['newstoriespath']);

 		$minwords = isNumber($_POST['newminwords']) ? $_POST['newminwords'] : 0;

 		$maxwords = isNumber($_POST['newmaxwords']) ? $_POST['newmaxwords'] : 0;

@@ -178,11 +178,13 @@ if(isset($_POST['submit'])) {

 }

 	$settingsresults = dbquery("SELECT * FROM ".$settingsprefix."fanfiction_settings WHERE sitekey ='".SITEKEY."'");

 	$settings = dbassoc($settingsresults);

+ 

 	foreach($settings as $var => $val) {

-		$$var = stripslashes($val);

+		if(is_NULL($val)) $val = '';

+		$$var = stripslashes($val );

 	}

-	$output .= "<form method='POST' class='tblborder' style='' enctype='multipart/form-data' action='".(isset($action) &&  $action == "settings" ? "admin.php?action=settings" : $_SERVER['PHP_SELF']."?step=".$_GET['step'])."&amp;sect=$sect'>";

+	$output .= "<form method='POST' class='tblborder' style='' enctype='multipart/form-data' action='".($action == "settings" ? "admin.php?action=settings" : $_SERVER['PHP_SELF']."?step=".$_GET['step'])."&amp;sect=$sect'>";

 	if($sect == "main") {

 		$output .= "<h2>"._SITEINFO."</h2>

 		<table class='acp'>

@@ -25,17 +25,17 @@

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

 function featured( ) {

-	global $tableprefix;

+	global $tableprefix, $dbconnect;

 	if($_GET['retire'])

-		mysql_query("UPDATE ".TABLEPREFIX."fanfiction_stories SET featured = 2 WHERE sid = ".$_GET['retire']);

+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET featured = 2 WHERE sid = ".$_GET['retire']);

 	if($_GET['feature'])

-		mysql_query("UPDATE ".TABLEPREFIX."fanfiction_stories SET featured = 1 WHERE sid = ".$_GET['feature']);

-	$fquery = "SELECT stories.*, stories.title as title, author.penname, DATE_FORMAT(stories.updated, '%Y.%m.%d') as updatesort, DATE_FORMAT(stories.date, '$datim') as date, DATE_FORMAT(stories.updated, '$datim') as updated FROM ".TABLEPREFIX."fanfiction_authors as author, ".TABLEPREFIX."fanfiction_stories as stories WHERE stories.featured > 0 AND stories.uid = author.uid ORDER BY stories.featured";

-	$fresult = mysql_query($fquery) or die(_FATALERROR."Query: ".$fquery."<br />Error: (".mysql_errno( ).") ".mysql_error( ));

-	$output .= "<center><table class=\"tblborder\" cellpadding=\"5\"><tr><th colspan=\"2\" align=\"center\">"._FEATUREDSTORIES."</th></tr>";

-	if(!mysql_num_rows($fresult)) $output .= "<tr><td colspan=\"2\" align=\"center\">"._NOSTORIES."</td><tr>";

-	while($story = mysql_fetch_array($fresult)) {

+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET featured = 1 WHERE sid = ".$_GET['feature']);

+	$fquery = "SELECT stories.*, stories.title as title, author.penname, DATE_FORMAT(FROM_UNIXTIME(stories.updated), '%Y.%m.%d') as updatesort, DATE_FORMAT(stories.date, '$datim') as date, DATE_FORMAT(FROM_UNIXTIME(stories.updated), '$datim') as updated FROM ".TABLEPREFIX."fanfiction_authors as author, ".TABLEPREFIX."fanfiction_stories as stories WHERE stories.featured > 0 AND stories.uid = author.uid ORDER BY stories.featured";

+	$fresult = dbquery($fquery) or die(_FATALERROR."Query: ".$fquery."<br />Error: (". $dbconnect->errno.") ". $dbconnect->error);

+	$output = "<center><table class=\"tblborder\" cellpadding=\"5\"><tr><th colspan=\"2\" align=\"center\">"._FEATUREDSTORIES."</th></tr>";

+	if(!dbnumrows($fresult)) $output .= "<tr><td colspan=\"2\" align=\"center\">"._NOSTORIES."</td><tr>";

+	while($story = dbassoc($fresult)) {

 		$output .= "<tr><td class=\"tblborder\"><a href=\"viewstory.php?sid=".$story['sid']."\">$story[title]</a> "._BY." <a href=\"viewuser.php?uid=".$story['uid']."\">".$story['penname']."</a></td><td class=\"tblborder\" align=\"center\">".($story['featured'] == 1 ? "<a href=\"admin.php?action=featured&retire=".$story['sid']."\">"._CURRENT."</a>" : "<b>"._RETIRED."</b>")."</td></tr>";

 	}

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

@@ -45,17 +45,17 @@ function featured( ) {

 function submitted()

 {

-	global $tableprefix, $admincats, $allowed_tags;

-		$output .= "<center><h4>"._SUBMITTED."</h4></center>";

+	global $tableprefix, $admincats, $allowed_tags, $dbconnect;

+		$output = "<center><h4>"._SUBMITTED."</h4></center>";

 		$query = "SELECT story.title as storytitle, chapter.uid, chapter.sid, story.catid, chapter.chapid, chapter.inorder, chapter.title, author.penname FROM (".TABLEPREFIX."fanfiction_chapters as chapter, ".TABLEPREFIX."fanfiction_authors as author) LEFT JOIN ".TABLEPREFIX."fanfiction_stories as story ON story.sid = chapter.sid WHERE chapter.validated = '0' AND chapter.uid = author.uid ORDER BY story.title ASC, chapter.inorder ASC";

-		$result = mysql_query($query) or die(_FATALERROR."Query: ".$query."<br />Error: (".mysql_errno( ).") ".mysql_error( ));

+		$result = dbquery($query) or die(_FATALERROR."Query: ".$query."<br />Error: (". $dbconnect->errno.") ". $dbconnect->error);

 		$output .= "<table class=\"tblborder\" cellspacing=\"0\" cellpadding=\"3\" align=\"center\"><tr class=\"tblborder\"><th>"._TITLE."</th><th>"._AUTHOR."</th><th>"._CATEGORY."</th><th>"._OPTIONS."</th></tr>";

 		$array = explode(",", $admincats);

-		while ($story = mysql_fetch_assoc($result))

+		while ($story = dbassoc($result))

 		{

 			unset($catstring);

-			$result3 = mysql_query("SELECT catid, category FROM ".TABLEPREFIX."fanfiction_categories WHERE FIND_IN_SET(catid, '".$story['catid']."')");

-			while($cats = mysql_fetch_array($result3)) {

+			$result3 = dbquery("SELECT catid, category FROM ".TABLEPREFIX."fanfiction_categories WHERE FIND_IN_SET(catid, '".$story['catid']."')");

+			while($cats = dbassoc($result3)) {

 				$catstring[] = "<a href=\"categories.php?catid=".$cats['catid']."\">".$cats['category']."</a>";

 			}

 			if(!$admincats || sizeof(array_intersect(explode(",", $story['catid']), explode(",", $admincats)))) {

@@ -76,14 +76,14 @@ function submitted()

 function validate( ) {

 	global $tableprefix, $level, $store, $storiespath, $allowed_tags, $admincats, $sitename, $siteemail, $url, $alertson;

-	$output .= "<center><h4>"._VIEWSUBMITTED."</h4></center>";

+	$output  = "<center><h4>"._VIEWSUBMITTED."</h4></center>";

 	if($_GET['validate'] == "yes") {

-		$storyquery = mysql_query("SELECT story.validated, story.catid, story.sid, story.title, story.summary, story.uid, author.penname, chapter.inorder FROM ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters  as chapter, ".TABLEPREFIX."fanfiction_authors as author WHERE author.uid = story.uid AND chapter.sid = story.sid AND chapter.chapid ='".$_GET['chapid']."' LIMIT 1");

-		list($validated, $catid, $sid, $title, $summary, $authoruid, $author, $inorder) = mysql_fetch_array($storyquery);

+		$storyquery = dbquery("SELECT story.validated, story.catid, story.sid, story.title, story.summary, story.uid, author.penname, chapter.inorder FROM ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters  as chapter, ".TABLEPREFIX."fanfiction_authors as author WHERE author.uid = story.uid AND chapter.sid = story.sid AND chapter.chapid ='".$_GET['chapid']."' LIMIT 1");

+		list($validated, $catid, $sid, $title, $summary, $authoruid, $author, $inorder) = dbassoc($storyquery);

 		if($admincats == "0" || sizeof(array_intersect(explode(",", $catid), explode(",", $admincats)))) {

 			include("includes/emailer.php");

 			if($validated != "1") {

-				mysql_query("UPDATE ".TABLEPREFIX."fanfiction_stories SET validated = '1', updated = NOW() WHERE sid = '".$_GET['sid']."'");

+				dbquery("UPDATE ".TABLEPREFIX. "fanfiction_stories SET validated = '1', updated = '".time()."' WHERE sid = '".$_GET['sid']."'");

 				$categories = explode(",", $catid);

 				include("functions.php");

 				foreach($categories as $cat) {

@@ -92,8 +92,8 @@ function validate( ) {

 				if($alertson) {

 					$subject = _NEWSTORYAT;

 					$mailtext = sprintf(_AUTHORALERTNOTE, $title, $author, $summary, $sid);

-					$favorites = mysql_query("SELECT author.uid, email, penname FROM ".TABLEPREFIX."fanfiction_favauth as fav, ".TABLEPREFIX."fanfiction_authors as author WHERE fav.favuid = $authoruid AND fav.uid = author.uid");

-					while($favuser = mysql_fetch_array($favorites)) { 

+					$favorites = dbquery("SELECT author.uid, email, penname FROM ".TABLEPREFIX."fanfiction_favauth as fav, ".TABLEPREFIX."fanfiction_authors as author WHERE fav.favuid = $authoruid AND fav.uid = author.uid");

+					while($favuser = dbassoc($favorites)) { 

 						sendemail($favuser['penname'], $favuser['email'], $sitename, $siteemail, $subject, $mailtext, "html");

 					}				

 				}

@@ -101,28 +101,28 @@ function validate( ) {

 			else if($alertson) {

 				$subject = _STORYALERT;

 				$mailtext = sprintf(_STORYALERTNOTE, $title, $author, $sid, $inorder);

-				$favorites = mysql_query("SELECT author.uid, penname, email FROM ".TABLEPREFIX."fanfiction_favstor as fav, ".TABLEPREFIX."fanfiction_authors as author WHERE sid = '$sid' AND fav.uid = author.uid");

-				while($favuser = mysql_fetch_array($favorites)) { 

+				$favorites = dbquery("SELECT author.uid, penname, email FROM ".TABLEPREFIX."fanfiction_favstor as fav, ".TABLEPREFIX."fanfiction_authors as author WHERE sid = '$sid' AND fav.uid = author.uid");

+				while($favuser = dbassoc($favorites)) { 

 					sendemail($favuser['penname'], $favuser['email'], $sitename, $siteemail, $subject, $mailtext, "html");

 				}

 			}

-			mysql_query("UPDATE ".TABLEPREFIX."fanfiction_chapters SET validated = '1' WHERE chapid = '".$_GET['chapid']."'");

-			mysql_query("UPDATE ".TABLEPREFIX."fanfiction_stories SET updated = NOW( ) WHERE sid = '$sid'");

+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_chapters SET validated = '1' WHERE chapid = '".$_GET['chapid']."'");

+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET updated = '" . time() . "' WHERE sid = '$sid'");

 			$output .= "<center><b>"._STORYVALIDATED."</b></center>";

 		}

 		else

 			$output .= "<br /><br /><center>"._NOTAUTHORIZEDADMIN."  "._TRYAGAIN."</center><br /><br />";

 	}

 	else {

-			$result = mysql_query("SELECT story.title as storytitle, story.sid, story.catid, story.rid, story.gid, story.charid, story.wid, story.summary as storysummary, chapter.chapid, chapter.title, chapter.storytext, author.penname, chapter.uid as uid FROM ".TABLEPREFIX."fanfiction_authors as author, ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '".$_GET['chapid']."' AND chapter.sid = story.sid AND chapter.uid = author.uid");

-			$story = mysql_fetch_array($result);

+			$result = dbquery("SELECT story.title as storytitle, story.sid, story.catid, story.rid, story.gid, story.charid, story.wid, story.summary as storysummary, chapter.chapid, chapter.title, chapter.storytext, author.penname, chapter.uid as uid FROM ".TABLEPREFIX."fanfiction_authors as author, ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '".$_GET['chapid']."' AND chapter.sid = story.sid AND chapter.uid = author.uid");

+			$story = dbassoc($result);

 			$output .= "<b>"._AUTHOR.":</b> ".$story['penname']."<br />";

 			$output .= "<b>"._TITLE.":</b> ".$story['storytitle'].": ".$story['title'];

 			$output .= "<br />";

-			$result3 = mysql_query("SELECT catid, category FROM ".TABLEPREFIX."fanfiction_categories WHERE FIND_IN_SET(catid, '".$story['catid']."')");

+			$result3 = dbquery("SELECT catid, category FROM ".TABLEPREFIX."fanfiction_categories WHERE FIND_IN_SET(catid, '".$story['catid']."')");

 			$catstring = "";

 			$count = 0;

-			while($cats = mysql_fetch_array($result3)) {

+			while($cats = dbassoc($result3)) {

 				if($count > 0) $catstring .= ", ";

 				$catstring .= "<a href=\"categories.php?catid=".$cats['catid']."\">".$cats['category']."</a>";

 				$categories[] = $cats['catid'];

@@ -183,10 +183,10 @@ function yesletter( ) {

 		else echo "<div style='text-align: center;'>"._ERROR."</div>";

 	}

 	else {

-			$authorquery = mysql_query("SELECT email,penname FROM ".TABLEPREFIX."fanfiction_authors WHERE uid = '".$_GET['uid']."' LIMIT 1");

-			$author = mysql_fetch_array($authorquery);

-			$storyquery = mysql_query("SELECT story.title, chapter.title as chapter FROM ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '".$_GET['chapid']."' AND chapter.sid = story.sid LIMIT 1");

-			$story = mysql_fetch_array($storyquery);

+			$authorquery = dbquery("SELECT email,penname FROM ".TABLEPREFIX."fanfiction_authors WHERE uid = '".$_GET['uid']."' LIMIT 1");

+			$author = dbassoc($authorquery);

+			$storyquery = dbquery("SELECT story.title, chapter.title as chapter FROM ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '".$_GET['chapid']."' AND chapter.sid = story.sid LIMIT 1");

+			$story = dbassoc($storyquery);

 			$letter = file_get_contents("messages/thankyou.txt");

 			echo "<body>";

 			echo "<table><tr><td>Story:</td><td>".$story['title'].": ".$story['chapter']."</td></tr>";

@@ -220,10 +220,10 @@ function noletter( ) {

 	}

 	else

 	{

-		$authorquery = mysql_query("SELECT email,penname FROM ".TABLEPREFIX."fanfiction_authors WHERE uid = '".$_GET['uid']."' LIMIT 1");

-		$author = mysql_fetch_array($authorquery);

-		$storyquery = mysql_query("SELECT story.title, chapter.title as chapter FROM ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '".$_GET['chapid']."' AND chapter.sid = story.sid LIMIT 1");

-		$story = mysql_fetch_array($storyquery);

+		$authorquery = dbquery("SELECT email,penname FROM ".TABLEPREFIX."fanfiction_authors WHERE uid = '".$_GET['uid']."' LIMIT 1");

+		$author = dbassoc($authorquery);

+		$storyquery = dbquery("SELECT story.title, chapter.title as chapter FROM ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '".$_GET['chapid']."' AND chapter.sid = story.sid LIMIT 1");

+		$story = dbassoc($storyquery);

 		$letter = file_get_contents("messages/nothankyou.txt");

 		echo "<body>";

 		echo "<table><tr><td>Story:</td><td>".$story['title'].": ".$story['chapter']."</td></tr>";

@@ -80,7 +80,7 @@ function preview_story($stories) {

 		if(uLEVEL == 1 || (empty($admincats) || sizeof(array_intersect(explode(",", $catid), explode(",", $admincats))))) {

 			include("includes/emailer.php");

 			if(!$storyvalid) {

-				dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET validated = '1', updated = NOW() WHERE sid = '$_GET[sid]'");

+				dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET validated = '1', updated = '" . time() . "' WHERE sid = '$_GET[sid]'");

 				foreach(explode(",", $catid) as $cat) {

 					categoryitems($cat, 1);

 				}

@@ -108,7 +108,7 @@ function preview_story($stories) {

 						sendemail($favuser['penname'], $favuser['email'], $sitename, $siteemail, $subject, $mailtext, "html");

 					}				

 				}

-				if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`) VALUES('".escapestring(sprintf(_LOG_VALIDATE_STORY, USERPENNAME, USERUID, $title, $sid, $author, $authoruid))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'VS')");

+				if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_VALIDATE_STORY, USERPENNAME, USERUID, $title, $sid, $author, $authoruid))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'VS', " . time() . ")");

 				dbquery("UPDATE ".TABLEPREFIX."fanfiction_stats SET stories = stories + 1");

 			}

 			else if($alertson) {

@@ -122,10 +122,10 @@ function preview_story($stories) {

 				while($favuser = dbassoc($favorites)) { 

 					sendemail($favuser['penname'], $favuser['email'], $sitename, $siteemail, $subject, $mailtext, "html");

 				}

-				if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`) VALUES('".escapestring(sprintf(_LOG_VALIDATE_CHAPTER, USERPENNAME, USERUID, $title, $sid, $author, $authoruid, $inorder))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'VS')");

+				if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_VALIDATE_CHAPTER, USERPENNAME, USERUID, $title, $sid, $author, $authoruid, $inorder))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'VS', " . time() . ")");

 			}

 			dbquery("UPDATE ".TABLEPREFIX."fanfiction_chapters SET validated = '1' WHERE chapid = '$_GET[chapid]'");

-			dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET updated = NOW( ) WHERE sid = '$sid'");

+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET updated = '" . time() . "' WHERE sid = '$sid'");

 			$count =  dbquery("SELECT SUM(wordcount) as totalcount FROM ".TABLEPREFIX."fanfiction_chapters WHERE sid = '$sid' and validated = 1");

 			list($totalcount) = dbrow($count);

 			if($totalcount) {

@@ -142,7 +142,7 @@ function preview_story($stories) {

 	}

 	else {

 		if(isNumber($_GET['chapid'])) {

-			$result = dbquery("SELECT stories.*, stories.title as title, "._PENNAMEFIELD." as penname, UNIX_TIMESTAMP(stories.updated) as updated, UNIX_TIMESTAMP(stories.date) as date, chapter.uid as uid, chapter.inorder, chapter.title as chaptertitle, chapter.storytext, chapter.chapid, chapter.notes, chapter.endnotes FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '$_GET[chapid]' AND chapter.sid = stories.sid AND chapter.uid = "._UIDFIELD);

+			$result = dbquery("SELECT stories.*, stories.title as title, "._PENNAMEFIELD." as penname, stories.updated as updated, stories.date as date, chapter.uid as uid, chapter.inorder, chapter.title as chaptertitle, chapter.storytext, chapter.chapid, chapter.notes, chapter.endnotes FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '$_GET[chapid]' AND chapter.sid = stories.sid AND chapter.uid = "._UIDFIELD);

 			$stories = dbassoc($result);

 			$output .= preview_story($stories);

@@ -26,62 +26,17 @@

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

+	$currentversion = "3.5.6";

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

-	// make sure curl is installed

-	if (function_exists('curl_init')) {

-		$output .= write_message(_RUNNINGVERSION);

-	   // initialize a new curl resource

-	   $ch = curl_init();

+ 

+	 $output .= write_message(_CURRENTVERSION. "$currentversion");

-	   // set the url to fetch

-	   curl_setopt($ch, CURLOPT_URL, 'https://www.efiction.org/version.txt');

-

-	   // don't give me the headers just the content

-	   curl_setopt($ch, CURLOPT_HEADER, 0);

-

-	   // return the value instead of printing the response to browser

-	   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

-

-	   // use a user agent to mimic a browser

-	   curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20041107 Firefox/1.0');

-

-	   $content = curl_exec($ch);

-	   $currentversion = $content;

-				$output .= write_message(_CURRENTVERSION. "$currentversion");

-

-				if ($currentversion != $version) {

-				$output .= write_message (_UPDATEVERSION);

-				}

-				else $output .= write_message (_UPTODATE);

-

-	   // remember to always close the session and free all resources

-	   curl_close($ch);

-	}

-

-	else if(ini_get("allow_url_fopen")) {

-		$output .= write_message(_RUNNINGVERSION);

-

-		$location = fopen ("https://efiction.org/version.txt", "r");

-		$buffer = '';

-		while (!feof ($location)) {

-			$buffer .= fgets($location, 4096);

-		}

-		fclose ($location);

-

-		if ($buffer != '') {

-			$currentversion = $buffer;

-			$output .= write_message(_CURRENTVERSION. "$currentversion");

-

-			if ($currentversion != $version) {

-			$output .= write_message (_UPDATEVERSION);

-			}

-			else $output .= write_message (_UPTODATE);

-		}

-	}

-	else {	

-		$output .= write_message(_VERSIONNOTALLOWED);

+	if ($currentversion != $version) {

+	$output .= write_message (_UPDATEVERSION);

 	}

+	else $output .= write_message (_UPTODATE);

+ 

 ?>

\ No newline at end of file

@@ -46,7 +46,7 @@ $output .= "</select></form></div>";

 $countquery = dbquery("SELECT COUNT(log_id) FROM ".TABLEPREFIX."fanfiction_log".($type ? " WHERE log_type = '$type'" : ""));

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

 if($count > 0) {

-	$result = dbquery("SELECT log_action, INET_NTOA(log_ip) as log_ip, UNIX_TIMESTAMP(log_timestamp) as log_timestamp FROM ".TABLEPREFIX."fanfiction_log".($type ? " WHERE log_type = '$type'" : "")." ORDER BY log_timestamp DESC LIMIT $offset, $itemsperpage");

+	$result = dbquery("SELECT log_action, INET_NTOA(log_ip) as log_ip,  log_timestamp as log_timestamp FROM ".TABLEPREFIX."fanfiction_log".($type ? " WHERE log_type = '$type'" : "")." ORDER BY log_timestamp DESC LIMIT $offset, $itemsperpage");

 	$output .= "<table class=\"tblborder\" cellspacing=\"0\" cellpadding=\"3\" style=\"width: 90%; margin: 0 auto;\"><tr class=\"tblborder\"><th>"._ACTION."</th><th>"._IP."</th><th>"._DATE."</th></tr>";

 	while ($item = dbassoc($result)) {

 			$output .= "<tr class=\"tblborder\">

@@ -26,9 +26,9 @@

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

 function warnings( ) {

-	global $allowed_tags;

+	global $allowed_tags, $dbconnect;

-	$output .= "<center><h4>"._WARNINGS."</h4></center>";

+	$output = "<center><h4>"._WARNINGS."</h4></center>";

 	if($_GET["delete"]) {

 		$wid = $_GET["delete"];

 		if($_GET["confirm"] == "yes")

@@ -68,14 +68,14 @@ function warnings( ) {

 		}

 	}

 	if ($_POST['submit']) {

-		if($_GET['warning'] == "new") dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_warnings (warning) VALUES ('".addslashes(stripinput(strip_tags($_POST['warning'])))."')") or die(_FATALERROR."Query: INSERT INTO ".TABLEPREFIX."fanfiction_warnings (warning) VALUES ('".addslashes(strip_tags($_POST['warning']))."')<br />Error: (".mysql_errno( ).") ".mysql_error( ));

-		else dbquery("UPDATE ".TABLEPREFIX."fanfiction_warnings set warning = '".addslashes(stripinput(strip_tags($_POST['warning'])))."' WHERE wid = '".$_GET['warning']."'") or die(_FATALERROR."Query: UPDATE ".TABLEPREFIX."fanfiction_warnings set warning = '".addslashes(strip_tags($_POST['warnings']))."' WHERE wid = '".$_GET['warning']."'<br />Error: (".mysql_errno( ).") ".mysql_error( ));

+		if($_GET['warning'] == "new") dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_warnings (warning) VALUES ('".addslashes(stripinput(strip_tags($_POST['warning'])))."')") or die(_FATALERROR."Query: INSERT INTO ".TABLEPREFIX."fanfiction_warnings (warning) VALUES ('".addslashes(strip_tags($_POST['warning']))."')<br />Error: (". $dbconnect->errno.") ".$dbconnect->error);

+		else dbquery("UPDATE ".TABLEPREFIX."fanfiction_warnings set warning = '".addslashes(stripinput(strip_tags($_POST['warning'])))."' WHERE wid = '".$_GET['warning']."'") or die(_FATALERROR."Query: UPDATE ".TABLEPREFIX."fanfiction_warnings set warning = '".addslashes(strip_tags($_POST['warnings']))."' WHERE wid = '".$_GET['warning']."'<br />Error: (". $dbconnect->errno.") ". $dbconnect->error);

 			$output .= "<center>"._ACTIONSUCCESSFUL."</center>";

 	}

 	else {

 		if(isset($_GET['warning'])) {

 			if($_GET['warning'] != "new") {

-				$warnquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_warnings WHERE wid = '".$_GET['warning']."' LIMIT 1") or die(_FATALERROR."Query: SELECT * FROM ".TABLEPREFIX."fanfiction_warnings WHERE wid = '".$_GET['warning']."' LIMIT 1<br />Error: (".mysql_errno( ).") ".mysql_error( ));

+				$warnquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_warnings WHERE wid = '".$_GET['warning']."' LIMIT 1") or die(_FATALERROR."Query: SELECT * FROM ".TABLEPREFIX."fanfiction_warnings WHERE wid = '".$_GET['warning']."' LIMIT 1<br />Error: (". $dbconnect->errno.") ". $dbconnect->error);

 				$warning = dbassoc($warnquery);

 			}

 			$output .=  "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=warnings&warning=".$_GET['warning']."\">

similarity index 98%

rename from member.php

rename to author.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=\"member.php?action=".$panel['panel_name']."\">".$panel['panel_title']."</a><br />\n";

+		if(!$panel['panel_url']) $output .=  "<a href=\"author.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";

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

 	if($multiplecats) {

 		$displaycolumns = $displaycolumns ? $displaycolumns : 1;

 		$query = "SELECT * FROM ".TABLEPREFIX."fanfiction_categories WHERE parentcatid = '-1' ORDER BY displayorder";

-		$result4 = dbquery($query) or die(_FATALERROR."Query: ".$query."<br />Error: (".mysql_errno( ).") ".mysql_error( ));

+		$result4 = dbquery($query) or die(_FATALERROR."Query: ".$query."<br />Error: (". $dbconnect->errno.") ". $dbconnect->error);

 		$total = dbnumrows($result4);

 		$count = 0;

 		$collist = array( );

@@ -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."member.php?action=login\">";

+	$content = "<form method=\"POST\" id=\"loginblock\" enctype=\"multipart/form-data\" action=\""._BASEDIR."author.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>",

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

 	else include_once(_BASEDIR."blocks/news/en.php");

 	$news->prepare();

-	$newsquery = dbquery("SELECT nid, author, title, story, UNIX_TIMESTAMP(time) as date, comments FROM ".TABLEPREFIX."fanfiction_news ORDER BY time DESC LIMIT $numupdated");

+	$newsquery = dbquery("SELECT nid, author, title, story, time as date, comments FROM ".TABLEPREFIX."fanfiction_news ORDER BY time DESC LIMIT $numupdated");

 	$count = 0;

 	while($stories = dbassoc($newsquery)) {

@@ -24,7 +24,7 @@ include("blocks/".$blocks['poll']['file']);

 			$n = $num + 1;

 			$final .= (isset($results[$n]) ? $results[$n] : "0");

 		}

-		$closepoll =dbquery("UPDATE ".TABLEPREFIX."fanfiction_poll SET poll_results = '$final', poll_end = NOW( ) WHERE poll_id = '".$currentpoll['poll_id']."'");

+		$closepoll =dbquery("UPDATE ".TABLEPREFIX."fanfiction_poll SET poll_results = '$final', poll_end = '" . time() . "' WHERE poll_id = '".$currentpoll['poll_id']."'");

 		if($closepoll) $emptyvotes = dbquery("TRUNCATE TABLE `".TABLEPREFIX."fanfiction_poll_votes`");

 		$output .= write_message(_ACTIONSUCCESSFUL);

 	}

@@ -36,7 +36,7 @@ include("blocks/".$blocks['poll']['file']);

 			if(strlen(trim(preg_replace("! !", " ", $opt))) > 0) $new_opts[] = $opt;

 		}

 		$new_opts = escapestring(implode("|#|", $new_opts));

-		$newpoll = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_poll(`poll_question`, `poll_opts`, `poll_start`) VALUES('$poll_question', '$new_opts', NOW( ))");

+		$newpoll = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_poll(`poll_question`, `poll_opts`, `poll_start`) VALUES('$poll_question', '$new_opts', '" . time() . "')");

 		include("blocks/".$blocks['poll']['file']);

 		$output .= "<div style='text-align: center;'><b>"._CURRENT.":</b><br /><div class=\"tblborder\" style=\"width: 200px; margin: 0 auto; text-align: left;\">$content</div><br /></div>";

 	}

@@ -63,7 +63,7 @@ if($poll) {

 }

 else {

 	$output .= "<div id='pagetitle'>"._POLLARCHIVE."</div>";

-	$listquery = dbquery("SELECT poll_id, poll_question, UNIX_TIMESTAMP(poll_start) as start, UNIX_TIMESTAMP(poll_end) as end FROM ".TABLEPREFIX."fanfiction_poll WHERE poll_end IS NOT NULL OR poll_end != '0000-00-00 00:00:00' ORDER BY poll_id DESC");

+	$listquery = dbquery("SELECT poll_id, poll_question, poll_startas start, poll_end as end FROM ".TABLEPREFIX."fanfiction_poll WHERE poll_end IS NOT NULL OR poll_end != '0000-00-00 00:00:00' ORDER BY poll_id DESC");

 	if(dbnumrows($listquery) > 0) {

 		$output .= "<table class='tblborder' style='margin: 1em auto;'><tr><th class='tblborder'>"._POLLARCHQUESTION."</th><th class='tblborder'>"._START."</th><th class='tblborder'>"._END."</th></tr>";

 		while($poll = dbassoc($listquery)) {

@@ -1,8 +1,8 @@

 <?php

-if (!defined('_CHARSET')) {

-    exit();

-}

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

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

+	$content = "<form method=\"POST\" id=\"searchblock\" enctype=\"multipart/form-data\" action=\""._BASEDIR."search.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>";

+

+?>

\ No newline at end of file

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

 if(file_exists(_BASEDIR."blocks/shoutbox/{$language}.php")) include_once(_BASEDIR."blocks/shoutbox/{$language}.php");

 else include_once(_BASEDIR."blocks/shoutbox/en.php");

 $content = "";

-if(isset($_POST['shout']) && (isMEMBER || !empty($blocks['shoutbox']['guestshouts']))) {

+if(isset($_POST['shouthidden']) && (isMEMBER || !empty($blocks['shoutbox']['guestshouts']))) {

+	http_response_code(202);

 	if(isMEMBER) $shout_name = USERUID;

 	else {

 		$shout_name = trim(descript($_POST['shoutname']));

@@ -24,7 +25,23 @@ if(isset($_POST['shout']) && (isMEMBER || !empty($blocks['shoutbox']['guestshout

 }

 if(isMEMBER || !empty($blocks['shoutbox']['guestshouts'])) {

-	$content = "<script language=\"javascript\" type=\"text/javascript\">

+	$content = "<script src=\"https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js\"></script>

+	<script language=\"javascript\" type=\"text/javascript\">

+	$(document).ready(function() {

+		$(function () {

+		  $('#shout').click( function () {

+			$.ajax({

+			  type: 'post',

+			  url: $('#shoutbox').attr('action'),

+			  data: $('#shoutbox').serialize(),

+			  success: function () {

+				location.reload();

+				$('#shout_message').val(\"\");

+			  }

+			});

+		  });

+		});

+	});

 var shoutend = '"._SHOUTEND."';

 function ismaxlength(obj){

 var mlength = 200

@@ -40,7 +57,8 @@ if (document.shoutbox.shout_message.value.length >= mlength) {

 	if(!isMEMBER) $content .= "<div><label for='shoutname'>"._NAME.":</label> <input type='text' name='shoutname' value='' style='display: block; width: 90%; margin: 0 auto;' maxlength='30'></div>";

 	else $content .= "<div><span class='label'>"._NAME.":</span> ".USERPENNAME."</div>";

 	if(!isMEMBER && $captcha) $content .= "<div><label for='userdigit'>"._CAPTCHANOTE."</label><input MAXLENGTH=5 SIZE=5 name=\"userdigit\" type=\"text\" value=\"\"><div style='text-align: center;'><img width=120 height=40 src=\""._BASEDIR."includes/button.php\" style=\"border: 1px solid #111;\"></div></div>";

-	$content .= "<div><label for='shout_MESSAGE'>"._SHOUT.":</label> <textarea name='shout_message' class='mceNoEditor' id='shout_message' rows='4' cols='15' maxlength='200' style='display: block; width: 90%; margin: 0 auto;' onkeyDown='return ismaxlength(this)'></textarea></div> <input type='submit' name='shout' id='shout' value='"._SHOUT."'> <input size='1' class='small' type='text' id='counter' value='200'></form></div>";

+	$content .= "<div><label for='shout_MESSAGE'>"._SHOUT.":</label> <textarea name='shout_message' class='mceNoEditor' id='shout_message' rows='4' cols='15' maxlength='200' style='display: block; width: 90%; margin: 0 auto;' onkeyDown='return ismaxlength(this)'></textarea></div> <input type='button' name='shout' id='shout' value='"._SHOUT."'> <input size='1' class='small' type='text' id='counter' value='200'> <input type='hidden' name='shouthidden' id='shouthidden' value='"._SHOUT."'>

+	</form></div>";

 }

 if(isset($blocks['shoutbox']['shoutlimit'])) $shoutlimit = $blocks['shoutbox']['shoutlimit'];

 else $shoutlimit = 10;

@@ -63,4 +81,4 @@ if(dbnumrows($shouts) != 0) {

 else $content .= write_message(_NOSHOUTS);

 $content .= "</div>";

 if($totalshouts > $shoutlimit) $content .= write_message("<a href='"._BASEDIR."blocks/shoutbox/archive.php'>"._SHOUTARCHIVE."</a>");

-?>

\ No newline at end of file

+?>

@@ -30,7 +30,7 @@ if($uid > 0) {

 	$query = dbquery("SELECT "._PENNAMEFIELD." as penname FROM "._AUTHORTABLE." WHERE "._UIDFIELD." = '$uid' LIMIT 1");

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

 	$output = "<div id='pagetitle'>".stripslashes($penname)."</div>\n";

-	$squery = "SELECT stories.*, "._PENNAMEFIELD." as penname, UNIX_TIMESTAMP(stories.date) as date, UNIX_TIMESTAMP(stories.updated) as updated FROM ("._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories) LEFT JOIN ".TABLEPREFIX."fanfiction_coauthors as coauth ON coauth.sid = stories.sid WHERE "._UIDFIELD." = stories.uid AND stories.validated > 0 $squery AND (stories.uid = '$uid' OR coauth.uid = '$uid') "._ORDERBY;

+	$squery = "SELECT stories.*, "._PENNAMEFIELD." as penname, stories.date as date, stories.updated as updated FROM ("._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories) LEFT JOIN ".TABLEPREFIX."fanfiction_coauthors as coauth ON coauth.sid = stories.sid WHERE "._UIDFIELD." = stories.uid AND stories.validated > 0 $squery AND (stories.uid = '$uid' OR coauth.uid = '$uid') "._ORDERBY;

 	$cquery = "SELECT count(stories.sid) FROM ".TABLEPREFIX."fanfiction_stories as stories LEFT JOIN ".TABLEPREFIX."fanfiction_coauthors as coauth ON stories.sid = coauth.sid WHERE validated > 0 $countquery AND (stories.uid = '$uid' OR coauth.uid = '$uid')";

 	$numrows = search($squery, $cquery, "browse.php?");

 }

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

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

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

@@ -1,14 +1,14 @@

-INSERT INTO `e107_fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `link_url`, `link_target`, `link_access`) VALUES (1, 'home', 'Home', 'index.php', '0', 0),

+INSERT INTO `test3fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `link_url`, `link_target`, `link_access`) VALUES (1, 'home', 'Home', 'index.php', '0', 0),

 (2, 'recent', 'Most Recent', 'browse.php?type=recent', '0', 0),

-(3, 'login', 'Login', 'member.php?action=login', '0', 0),

+(3, 'login', 'Login', 'author.php?action=login', '0', 0),

 (4, 'adminarea', 'Admin', 'admin.php', '0', 2),

-(5, 'logout', 'Logout', 'member.php?action=logout', '0', 1),

+(5, 'logout', 'Logout', 'author.php?action=logout', '0', 1),

 (6, 'featured', 'Featured Stories', 'browse.php?type=featured', '0', 0),

 (7, 'catslink', 'Categories', 'browse.php?type=categories', '0', 0),

 (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', 'searching.php', '0', 0),

+(11, 'search', 'Search', 'search.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),

@@ -16,11 +16,11 @@ INSERT INTO `e107_fanfiction_pagelinks` (`link_id`, `link_name`, `link_text`, `l

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

-(19, 'login', 'Account Info', 'member.php', '0', 1),

+(19, 'login', 'Account Info', 'author.php', '0', 1),

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

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

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

-(23, 'newsarchive', 'News Archive', 'ffnews.php', '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),

 (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);

@@ -26,7 +26,7 @@ CREATE TABLE `fanfiction_authorinfo` (

   `info` varchar(255) NOT NULL default '',

   PRIMARY KEY  (`uid`,`field`),

   KEY `uid` (`uid`)

-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;

+) REPLACE=MyISAM;

 -- --------------------------------------------------------

@@ -66,7 +66,7 @@ CREATE TABLE `fanfiction_authors` (

   `website` varchar(200) NOT NULL default '',

   `bio` text NOT NULL,

   `image` varchar(200) NOT NULL default '',

-  `date` datetime NOT NULL default '0000-00-00 00:00:00',

+  `date`  int(11) NOT NULL default '0',

   `admincreated` int(11) NOT NULL default '0',

   `password` varchar(40) NOT NULL default '0',

   PRIMARY KEY  (`uid`),

@@ -222,7 +222,7 @@ CREATE TABLE `fanfiction_comments` (

   `nid` int(11) NOT NULL default '0',

   `uid` int(11) NOT NULL default '0',

   `comment` text NOT NULL,

-  `time` datetime NOT NULL default '0000-00-00 00:00:00',

+  `time` int(11) NOT NULL default '0',

   PRIMARY KEY  (`cid`),

   KEY `commentlist` (`nid`,`time`)

 ) REPLACE=MyISAM;

@@ -254,7 +254,6 @@ CREATE TABLE `fanfiction_inseries` (

   `subseriesid` int(11) NOT NULL default '0',

   `confirmed` int(11) NOT NULL default '0',

   `inorder` int(11) NOT NULL default '0',

-  `updated` datetime NOT NULL default '0000-00-00 00:00:00',

   PRIMARY KEY  (`sid`,`seriesid`),

   KEY `seriesid` (`seriesid`,`inorder`)

 ) REPLACE=MyISAM;

@@ -270,7 +269,7 @@ CREATE TABLE `fanfiction_log` (

   `log_action` varchar(255) default NULL,

   `log_uid` int(11) NOT NULL default '0',

   `log_ip` int(11) default NULL,

-  `log_timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,

+  `log_timestamp` int(11) NOT NULL default '0',

   `log_type` char(2) NOT NULL default '',

   PRIMARY KEY  (`log_id`)

 ) REPLACE=MyISAM;

@@ -384,7 +383,7 @@ CREATE TABLE `fanfiction_reviews` (

   `reviewer` varchar(60) NOT NULL default '0',

   `uid` int(11) NOT NULL default '0',

   `review` text NOT NULL,

-  `date` datetime NOT NULL default '0000-00-00 00:00:00',

+  `date` int(11) NOT NULL default '0',

   `rating` int(11) NOT NULL default '0',

   `respond` char(1) NOT NULL default '0',

   `type` char(2) NOT NULL default 'ST',

@@ -456,8 +455,8 @@ CREATE TABLE `fanfiction_stories` (