@@ -737,14 +737,14 @@ ADD `rating` TINYINT( 4 ) NOT NULL");

   `field_code_out` text,

   `field_on` tinyint(1) NOT NULL default '0',

   PRIMARY KEY  (`field_id`)

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

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

 				$authorinfo = dbquery("CREATE TABLE `".$tableprefix."fanfiction_authorinfo` (

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

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

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

   KEY `uid` (`uid`)

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

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

 				$authorprefs = dbquery("

 CREATE TABLE `".$tableprefix."fanfiction_authorprefs` (

@@ -763,7 +763,7 @@ CREATE TABLE `".$tableprefix."fanfiction_authorprefs` (

   `contact` tinyint(1) NOT NULL default '0',

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

    PRIMARY KEY  (`uid`)

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

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

 				$blocks = dbquery("CREATE TABLE `".$tableprefix."fanfiction_blocks` (

   `block_id` int(11) NOT NULL auto_increment,

@@ -774,7 +774,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_authorprefs</td><td align='center

   `block_variables` text NOT NULL,

   PRIMARY KEY  (`block_id`),

   KEY `block_name` (`block_name`)

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

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

 				$chapters = dbquery("CREATE TABLE `".$tableprefix."fanfiction_chapters` (

   `chapid` int(11) NOT NULL auto_increment,

@@ -796,14 +796,14 @@ $output .= "<tr><td>".$tableprefix."fanfiction_blocks</td><td align='center'>" .

   KEY `inorder` (`inorder`),

   KEY `title` (`title`),

   KEY `validated` (`validated`)

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

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

 				$classes = dbquery("CREATE TABLE `".$tableprefix."fanfiction_classes` (

   `class_id` int(11) NOT NULL auto_increment,

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

   `class_name` varchar(100) NOT NULL default '',

   PRIMARY KEY  (`class_id`)

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

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

 				$classtypes = dbquery("CREATE TABLE `".$tableprefix."fanfiction_classtypes` (

@@ -812,13 +812,13 @@ $output .= "<tr><td>".$tableprefix."fanfiction_classes</td><td align='center'>"

   `classtype_title` varchar(50) NOT NULL default '',

   PRIMARY KEY  (`classtype_id`),

   KEY `classtype_title` (`classtype_title`)

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

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

 $coauthors = dbquery("CREATE TABLE `".TABLEPREFIX."fanfiction_coauthors` (

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

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

   PRIMARY KEY  (`sid`,`uid`)

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

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

 				$codeblocks = dbquery("CREATE TABLE `".$tableprefix."fanfiction_codeblocks` (

   `code_id` int(11) NOT NULL auto_increment,

@@ -826,7 +826,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_coauthors</td><td align='center'>

   `code_type` varchar(20) default NULL,

   `code_module` varchar(60) default NULL,

   PRIMARY KEY  (`code_id`)

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

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

 				$favorites = dbquery("CREATE TABLE `".$tableprefix."fanfiction_favorites` (

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

@@ -834,7 +834,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_codeblocks</td><td align='center'

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

   `comments` text NULL,

   KEY `uid` (`uid`)

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

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

 				$inseries = dbquery("CREATE TABLE `".$tableprefix."fanfiction_inseries` (

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

@@ -844,7 +844,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_favorites</td><td align='center'>

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

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

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

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

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

 				$logs = dbquery("CREATE TABLE `".$tableprefix."fanfiction_log` (

   `log_id` int(11) NOT NULL auto_increment,

@@ -854,7 +854,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_inseries</td><td align='center'>"

   `log_timestamp` timestamp NOT NULL,

   `log_type` varchar(2) NOT NULL,

   PRIMARY KEY  (`log_id`)

-) TYPE=MyISAM");

+) ENGINE=MyISAM");

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

 				$messages = dbquery("CREATE TABLE `".$tableprefix."fanfiction_messages` (

   `message_id` int(11) NOT NULL auto_increment,

@@ -862,7 +862,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_log</td><td align='center'>" . ($

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

   `message_text` text NULL,

   PRIMARY KEY  (`message_id`)

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

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

 				$modules = dbquery("

 CREATE TABLE `".$tableprefix."fanfiction_modules` (

@@ -884,7 +884,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_modules</td><td align='center'>"

   PRIMARY KEY  (`link_id`),

   KEY `link_text` (`link_text`),

   KEY `link_name` (`link_name`)

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

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

 				$panels = dbquery("CREATE TABLE `".$tableprefix."fanfiction_panels` (

   `panel_id` int(11) NOT NULL auto_increment,

@@ -898,7 +898,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_pagelinks</td><td align='center'>

   PRIMARY KEY  (`panel_id`),

   KEY `panel_hidden` (`panel_hidden`),

   KEY `panel_type` (`panel_type`)

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

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

 				$series = dbquery("CREATE TABLE `".$tableprefix."fanfiction_series` (

   `seriesid` int(11) NOT NULL auto_increment,

@@ -917,7 +917,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_panels</td><td align='center'>" .

   KEY `characters` (`characters`),

   KEY `classes` (`classes`),

   KEY `owner` (`uid`,`title`)

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

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

 	$stats = dbquery("CREATE TABLE `".$tableprefix."fanfiction_stats` (

   `sitekey` varchar(50) NOT NULL default '0',

@@ -930,7 +930,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_series</td><td align='center'>" .

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

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

   `newestmember` int(11) NOT NULL default '0'

-) TYPE=MyISAM");

+) ENGINE=MyISAM");

 	dbquery("INSERT INTO ".$tableprefix."fanfiction_stats(`sitekey`) VALUES('".$sitekey."')");

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

 $output .= "</table>";

@@ -1109,7 +1109,7 @@ if(!empty(\$sitekey)) \$dbconnect = dbconnect(\$dbhost, \$dbuser,\$dbpass, \$dbn

   `smtp_username` varchar(50) default NULL,

   `smtp_password` varchar(50) default NULL,

   PRIMARY KEY  (`sitekey`)

-) TYPE=MyISAM;");

+) ENGINE=MyISAM;");

 if($settings) $output .= write_message("<img src=\"../images/check.gif\"> "._SETTINGSTABLESUCCESS." <br /><a href='upgrade11.php?step=2&amp;settingsprefix=".$_POST['settingsprefix']."'>"._CONTINUE."</a>");

 else $output .= write_message(_SETTINGSTABLEAUTOFAIL." <br /><a href='upgrade11.php?step=2&amp;settingsprefix=".$_POST['settingsprefix']."'>"._CONTINUE."</a> ");

 		}

new file mode 100644

@@ -0,0 +1,1138 @@

+<?php

+// ----------------------------------------------------------------------

+// Copyright (c) 2007 by Tammy Keefer

+// Based on eFiction 1.1

+// Copyright (C) 2003 by Rebecca Smallwood.

+// http://efiction.sourceforge.net/

+// ----------------------------------------------------------------------

+// LICENSE

+//

+// This program is free software; you can redistribute it and/or

+// modify it under the terms of the GNU General Public License (GPL)

+// as published by the Free Software Foundation; either version 2

+// of the License, or (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

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

+// ----------------------------------------------------------------------

+

+function random_char($string)

+{

+	$length = strlen($string);

+	$position = mt_rand(0, $length - 1);

+	 return $string[$position];

+}

+

+function random_string ($charset_string, $length)

+{

+	$return_string = random_char($charset_string);

+	for ($x = 1; $x < $length; $x++)

+	$return_string .= random_char($charset_string);

+	return $return_string;

+}

+

+

+$randomcharset = '23456789' . 'abcdefghijkmnpqrstuvwxyz' . 'ABCDEFGHJKLMNPQRSTUVWXYZ';

+

+// Strip out slashes if magic quotes isn't on.

+if(ini_get("magic_quotes_gpc")) {

+	foreach($_POST as $var => $val) {

+		$val = is_array( $val ) ? array_map( 'stripslashes', $val ) : stripslashes( $val );

+	}

+	foreach($_GET as $var => $val) {

+		$val = is_array( $val ) ? array_map( 'stripslashes', $val ) : stripslashes( $val );

+	}

+	foreach($_COOKIE as $var => $val) {

+		$val = is_array( $val ) ? array_map( 'stripslashes', $val ) : stripslashes( $val );

+	}

+}

+

+Header('Cache-Control: private, no-cache, must-revalidate, max_age=0, post-check=0, pre-check=0');

+header ("Pragma: no-cache"); 

+header ("Expires: 0"); 

+

+//make a new TemplatePower object

+echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">

+<html><head><title>eFiction 1.1 to $version Upgrade</title>

+<style>

+LABEL { float: left; display: block; width: 50%; text-align: right; padding-right: 10px; clear: left;}

+.row { float: left; width: 99%; }

+#settingsform FORM { width: 80%; margin; 0 auto; }

+#settingsform LABEL { float: left; display: block; width: 30%; text-align: right; padding-right: 10px; clear: left; }

+#settingsform .fieldset SPAN { float: left; display: block; width: 30%; text-align: right; padding-right: 10px; clear: left;}

+#settingsform .fieldset LABEL { float: none; width: auto; display: inline; text-align: left; clear: none; }

+#settingsform .tinytoggle { text-align: center; }

+#settingsform .tinytoggle LABEL { float: none; display: inline; width: auto; text-align: center; padding: 0; clear: none; }

+#settingsform #submit { display: block; margin: 1ex auto; }

+a.pophelp{

+    position: relative; /* this is the key*/

+    z-index:24;

+    vertical-align: super;

+    text-decoration: none;

+}

+

+a.pophelp:hover{z-index:100; border: none; text-decoration: none;}

+

+a.pophelp span{display: none; position: absolute; text-decoration: none;}

+

+a.pophelp:hover span{ /*the span will display just on :hover state*/

+    display:block;

+    position: absolute;

+    top: 0; left: 8em; width: 225px;

+    border:1px solid #000;

+    background-color:#CCC; color:#000;

+    text-decoration: none;

+    text-align: left;

+    padding: 5px;

+    font-weight: normal;

+}

+.required { color: red; }

+</style>

+<link rel=\"stylesheet\" type=\"text/css\" href='../default_tpls/style.css'></head>";

+

+$output = "";

+define("_BASEDIR", "../");

+include ("../includes/class.TemplatePower.inc.php");

+if(isset($_GET['step']) && $_GET['step'] > 2) {

+	include("../config.php");

+	$settings = dbquery("SELECT tableprefix, language FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+	list($tableprefix, $language) = dbrow($settings);

+	define("SITEKEY", $sitekey);

+	define("TABLEPREFIX", $tableprefix);

+}

+if(isset($language)) {

+if(file_exists("../languages/{$language}.php")) include ("../languages/{$language}.php");

+else include ("../languages/en.php");

+if(file_exists("../languages/{$language}_admin.php")) include ("../languages/{$language}_admin.php");

+else include ("../languages/en_admin.php");

+if(file_exists("languages/$language.php")) include ("languages/{$language}.php");

+else include("languages/en.php");

+}

+else {

+include ("../languages/en.php");

+include ("../languages/en_admin.php");

+include("languages/en.php");

+}

+include("../includes/corefunctions.php");

+

+

+//  So I don't have to keep updating the version number in 3 different files.

+include("../version.php");

+

+$tpl = new TemplatePower( "../default_tpls/default.tpl" );

+$tpl->assignInclude( "header", "./../default_tpls/header.tpl" );

+$tpl->assignInclude( "footer", "./../default_tpls/footer.tpl" );

+$tpl->prepare( );

+$tpl->newBlock("header");

+$tpl->assign("sitename", "Upgrade eFiction 1.1 to eFiction $version");

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

+$tpl->newBlock("footer");

+$tpl->assign( "footer", "eFiction $version &copy; 2006. <a href='http://efiction.org/'>http://efiction.org/</a>");

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

+

+switch($_GET['step']) {

+	case "18":

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

+		if(isset($_GET['install'])) {

+			if($_GET['install'] == "automatic") {

+				include("../config.php");

+				$settings = dbquery("SELECT tableprefix FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+				list($tableprefix) = dbrow($settings);

+				$alter1 = dbquery("ALTER TABLE `".$tableprefix."fanfiction_characters` ADD `bio` TEXT NULL, ADD `image` VARCHAR( 200 ) NOT NULL");

+				$output .= write_message(_ALTER11CHARACTERS.($alter1 ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+				$alter1 = dbquery("ALTER TABLE `".$tableprefix."fanfiction_categories` CHANGE `locked` `locked` CHAR( 1 ) DEFAULT '0' NOT NULL");

+				$output .= write_message(_ALTER11CATEGORIES.($alter1 ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+				$alter1 = dbquery("ALTER TABLE `".$tableprefix."fanfiction_ratings` CHANGE `ratingwarning` `ratingwarning` CHAR( 1 ) DEFAULT '0' NOT NULL ");

+				$output .= write_message(_ALTER11RATINGS.($alter1 ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+				$alter1 = dbquery("DROP TABLE IF EXISTS `".$tableprefix."fanfiction_settings_old`");

+				dbquery("alter table ".$tableprefix."fanfiction_categories drop index category;");

+				dbquery("alter table ".$tableprefix."fanfiction_categories drop index parentcatid;");

+				dbquery("create index byparent on ".$tableprefix."fanfiction_categories (parentcatid,displayorder);");

+				dbquery("create index forstoryblock on ".$tableprefix."fanfiction_chapters (sid,validated);");

+				dbquery("alter table ".$tableprefix."fanfiction_comments drop index nid;");

+				dbquery("alter table ".$tableprefix."fanfiction_comments add index commentlist (nid,time);");

+				dbquery("create index avgrating on ".$tableprefix."fanfiction_reviews(type,item,rating);");

+				dbquery("alter table ".$tableprefix."fanfiction_reviews drop index sid;");

+				dbquery("create index bychapter on ".$tableprefix."fanfiction_reviews (chapid,rating);");

+				dbquery("alter table ".$tableprefix."fanfiction_reviews add index byuid (uid,item,type);");

+				dbquery("alter table ".$tableprefix."fanfiction_stories drop index validated;");

+				dbquery("create index validateduid on ".$tableprefix."fanfiction_stories (validated,uid);");

+				dbquery("create index recent on ".$tableprefix."fanfiction_stories (updated,validated);");

+				$serieslist = dbquery("SELECT seriesid FROM ".$tableprefix."fanfiction_series");

+				$totalseries = dbnumrows($serieslist);

+				while($s = dbassoc($serieslist)) {

+					$numstories = count(storiesInSeries($s['seriesid']));

+					dbquery("UPDATE ".$tableprefix."fanfiction_series SET numstories = '$numstories' WHERE seriesid = ".$s['seriesid']." LIMIT 1");

+				}

+				$storiesquery =dbquery("SELECT COUNT(sid) as totals, COUNT(DISTINCT uid) as totala, SUM(wordcount) as totalwords FROM ".$tableprefix."fanfiction_stories WHERE validated > 0 ");

+				list($stories, $authors, $words) = dbrow($storiesquery);

+				dbquery("UPDATE ".$tableprefix."fanfiction_stats SET stories = '$stories', authors = '$authors', wordcount = '$words' WHERE sitekey = '".$sitekey."'"); 

+

+				$chapterquery = dbquery("SELECT COUNT(chapid) as chapters FROM ".$tableprefix."fanfiction_chapters where validated > 0");

+				list($chapters) = dbrow($chapterquery);

+

+				$authorquery = dbquery("SELECT COUNT(uid) as totalm FROM ".$tableprefix."fanfiction_authors");

+				list($members) = dbrow($authorquery);

+

+				list($newest) = dbrow(dbquery("SELECT uid as uid FROM ".$tableprefix."fanfiction_authors ORDER BY uid DESC LIMIT 1"));

+				$reviewquery = dbquery("SELECT COUNT(reviewid) as totalr FROM ".$tableprefix."fanfiction_reviews WHERE review != 'No Review'");

+				list($reviews) = dbrow($reviewquery);

+				$reviewquery = dbquery("SELECT COUNT(uid) FROM ".$tableprefix."fanfiction_reviews WHERE review != 'No Review' AND uid != 0");

+				list($reviewers) = dbrow($reviewquery);

+				dbquery("UPDATE ".$tableprefix."fanfiction_stats SET series = '$totalseries', chapters = '$chapters', members = '$members', newestmember = '$newest', reviews = '$reviews', reviewers = '$reviewers' WHERE sitekey = '".$sitekey."'"); 

+				$alltables = dbquery("SHOW TABLES");

+				while ($table = dbassoc($alltables)) {

+					foreach ($table as $db => $tablename) {

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

+					}

+				}

+				$output .= write_message(_UPGRADE11END);

+			}

+			else $output .= write_message(_MISCDBUPDATEMANUAL._UPGRADE11END);

+		}

+		else $output .= write_message(_MISCDBUPDATEINFO."<br /><br /><a href='upgrade11.php?step=18&amp;install=automatic'>"._AUTO."</a> "._OR." <a href='upgrade11.php?step=18&amp;install=manual'>"._MANUAL2."</a>");

+	break;

+	case "17":

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

+		if(isset($_GET['install'])) {

+			include("../config.php");

+

+			$settings = dbquery("SELECT tableprefix FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+			list($tableprefix) = dbrow($settings);

+			dbquery("ALTER TABLE `".$tableprefix."fanfiction_news` ADD `comments` INT NOT NULL DEFAULT '0'");

+			$newslist = dbquery("SELECT count(cid) as count, nid FROM ".$tableprefix."fanfiction_comments GROUP BY nid");

+			while($n = dbassoc($newslist)) {

+				dbquery("UPDATE ".$tableprefix."fanfiction_news SET comments = '".$n['count']."' WHERE nid = ".$n['nid']);

+			}

+			$comments = dbquery("SELECT uname FROM ".$tableprefix."fanfiction_comments GROUP BY uname");

+			while($uname = dbassoc($comments)) {

+				unset($uid);

+				$nameinfo = dbquery("SELECT uid FROM ".$tableprefix."fanfiction_authors WHERE penname = '".$uname['uname']."'");

+				list($uid) = dbrow($nameinfo);

+				if(empty($uid)) $uid = 0;

+				dbquery("UPDATE ".$tableprefix."fanfiction_comments SET uname = '$uid' WHERE uname = '".$uname['uname']."'");

+			}

+			$result2 = dbquery("ALTER TABLE `".$tableprefix."fanfiction_comments` CHANGE `uname` `uid` INT NOT NULL DEFAULT '0';");

+			$output .= write_message(_NEWSUPDATERESULT.($result2 ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));	

+			$output .= write_message("<a href='upgrade11.php?step=18'>"._CONTINUE."</a>");				

+

+		}

+		else $output .= write_message(_NEWSUPDATEINFO."<br /><a href='upgrade11.php?step=17&amp;install=automatic'>"._CONTINUE."</a>");

+

+	break;

+	case "16":

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

+		if(isset($_GET['install'])) {

+			include("../config.php");

+			define("_BASEDIR", "../");

+			$settings = dbquery("SELECT tableprefix, defaultsort, displayindex, tinyMCE, storiespath FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+			list($defaultsort, $displayindex, $tinyMCE, $storiespath) = dbrow($settings);

+			$result = dbquery("INSERT INTO ".$tableprefix."fanfiction_authorprefs(`uid`, `newreviews`, `validated`, `userskin`, `level`, `categories`, `contact`) SELECT uid, newreviews, validated, userskin, level, categories, contact FROM ".$tableprefix."fanfiction_authors");

+			$result2 = dbquery("UPDATE ".$tableprefix."fanfiction_authorprefs set sortby = '$defaultsort', storyindex = '$displayindex', tinyMCE = '$tinyMCE'");

+			$authors = dbquery("SELECT author.penname, author.uid, count(stories.uid) as count FROM ".$tableprefix."fanfiction_authors as author, ".$tableprefix."fanfiction_stories as stories WHERE author.uid = stories.uid GROUP BY stories.uid");

+			while($author = dbassoc($authors)) {

+				if( file_exists( _BASEDIR.STORIESPATH."/$author[penname]/") ) {

+					$moved = rename(_BASEDIR.STORIESPATH."/$author[penname]/", _BASEDIR.STORIESPATH."/$author[uid]/");

+					$output .= $author['penname'].($moved ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">")."<br />";

+				}

+			}

+			$output .= write_message(_AUTHORRESULT.($result ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+			$fields = dbquery("SELECT * FROM ".$tableprefix."fanfiction_authorfields WHERE field_on = 1");

+			while($f = dbassoc($fields)) {

+				$col = dbquery("SHOW COLUMNS FROM ".$tableprefix."fanfiction_authors LIKE '".$f['field_name']."'");

+				if(dbnumrows($col) > 0) {

+					$result = dbquery("INSERT INTO ".$tableprefix."fanfiction_authorinfo(`uid`, `info`) SELECT uid, ".$f['field_name']." FROM ".$tableprefix."fanfiction_authors WHERE ".$f['field_name']." IS NOT NULL AND ".$f['field_name']." != ''");

+					$result2 = dbquery("UPDATE ".$tableprefix."fanfiction_authorinfo SET field = ".$f['field_id']." WHERE field = 0");

+				}

+			}

+			$result2 = dbquery("ALTER TABLE `".$tableprefix."fanfiction_authors` DROP `validated`, DROP `userskin`, DROP `level`, DROP `contact`, DROP `categories`, DROP `carry`, CHANGE `admincreated` `admincreated` CHAR( 1 ) DEFAULT '0' NOT NULL;");

+			$output .= write_message(_AUTHORDROPRESULT.($result2 ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));	

+			$output .= write_message("<a href='upgrade11.php?step=17'>"._CONTINUE."</a>");				

+

+		}

+		else $output .= write_message(_AUTHORUPDATEINFO."<br /><a href='upgrade11.php?step=16&amp;install=automatic'>"._CONTINUE."</a>");

+	break;

+	case "15":

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

+		include("../config.php");

+		$settings = dbquery("SELECT tableprefix FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+		list($tableprefix) = dbrow($settings);

+		if(isset($_GET['install'])) {

+			if($_GET['install'] == "automatic") {

+				$fields[] = array('4','lj','Live Journal','http://{info}.livejournal.com','','','0');

+				$fields[] = array('1','website','Web Site','','','','1');

+				$fields[] = array('5','AOL','AIM','','$output .= "<div><label for=\'AOL\'>".$field[\'field_title\'].":</label><INPUT type=\'text\' class=\'textbox\'  name=\'af_".$field[\'field_name\']."\' maxlength=\'40\' value=\'".(!empty($user[\'af_\'.$field[\'field_id\']]) ? $user[\'af_\'.$field[\'field_id\']] : "")."\' size=\'20\'></div>";','$thisfield = "<img src=\"http://big.oscar.aol.com/".$field[\'info\']."?on_url=$url/images/aim.gif&off_url=$url/images/aim.gif\"> <a href=\"aim:goim?{aol}ScreenName=".$field[\'info\']."\">".format_email($field[\'info\'])."</a>";','1');

+				$fields[] = array('5','ICQ','ICQ','','$output .= "<div><label for=\'AOL\'>".$field[\'field_title\'].":</label><INPUT type=\'text\' class=\'textbox\'  name=\'af_".$field[\'field_name\']."\' maxlength=\'40\' value=\'".(!empty($user[\'af_\'.$field[\'field_id\']]) ? $user[\'af_\'.$field[\'field_id\']] : "")."\' size=\'20\'></div>";','$thisfield = "<img src=\"http://status.icq.com/online.gif?icq=".$field[\'info\']."&img=5\"> ".$field[\'info\'];','1');

+				$fields[] = array('5','MSN','MSN IM','','$output .= "<div><label for=\'AOL\'>".$field[\'field_title\'].":</label><INPUT type=\'text\' class=\'textbox\'  name=\'af_".$field[\'field_name\']."\' maxlength=\'40\' value=\'".(!empty($user[\'af_\'.$field[\'field_id\']]) ? $user[\'af_\'.$field[\'field_id\']] : "")."\' size=\'20\'></div>";','$thisfield = "<img src=\"images/msntalk.gif\" alt=\""._MSN."\"> ".format_email($field[\'info\']);','1');

+				$fields[] = array('5','Yahoo','Yahoo IM','','$output .= "<div><label for=\'AOL\'>".$field[\'field_title\'].":</label><INPUT type=\'text\' class=\'textbox\'  name=\'af_".$field[\'field_name\']."\' maxlength=\'40\' value=\'".(!empty($user[\'af_\'.$field[\'field_id\']]) ? $user[\'af_\'.$field[\'field_id\']] : "")."\' size=\'20\'></div>";','$thisfield = "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=".$field[\'info\']."&.src=pg\"><img border=\'0\' src=\"http://opi.yahoo.com/online?u=".$field[\'info\']."&m=g&t=1\"> ".format_email($field[\'info\'])."</a>";','1');

+				$fields[] = array('4','da','Deviant Art','http://{info}.deviantart.com','','','0');

+				$fields[] = array('3','betareader','Beta-reader','','','','1');

+				$fields[] = array('4','dj','DeadJournal','http://{info}.deadjournal.com/','','','0');

+				$fields[] = array('4','xanga','Xanga','http://www.xanga.com/{info}','','','0');

+				$fields[] = array('2', 'gender', 'Gender', 'male|#|female|#|undisclosed', '', '', '0');

+				$fields[] = array('4','myspace','MySpace','http://www.myspace.com/{info}','','','0');

+		

+				$settings = dbquery("SELECT tableprefix FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+				list($tableprefix) = dbrow($settings);

+

+				$output .= "<table class='tblborder' style='margin: 1em auto; padding: 1em;' cellpadding='5'><tr><th>"._FIELD."</th><th>"._RESULT."</th></tr>";

+				foreach($fields as $field) {

+					$f = dbquery("INSERT INTO `".$tableprefix."fanfiction_authorfields` (`field_type`, `field_name`, `field_title`, `field_options`, `field_code_in`, `field_code_out`, `field_on`) VALUES('".$field[0]."', '".$field[1]."','".$field[2]."','".escapestring($field[3])."','".escapestring($field[4])."','".escapestring($field[5])."','".$field[6]."');");

+					$output .= "<tr><td>".$field[2]."</td><td align='center'>" . ($f ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";

+				}

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

+				$output .= write_message(_FIELDAUTOFAIL." "._FIELDUPDATE."<br /><br /> <a href='upgrade11.php?step=16'>"._CONTINUE."</a>");

+			}

+			else {

+				$output .= write_message(_FIELDMANUAL," "._FIELDUPDATE."<br /><br /><a href='upgrade11.php?step=16'>"._CONTINUE."</a>");

+			}

+		}

+		else $output .= write_message(_FIELDDATAINFO."<br /><br /><a href='upgrade11.php?step=15&amp;install=automatic'>"._AUTO."</a> "._OR." <a href='upgrade11.php?step=15&amp;install=manual'>"._MANUAL2."</a>");

+	break;

+	case "14":

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

+		if(isset($_GET['install'])) {

+			if($_GET['install'] == "automatic") {

+				include("../config.php");

+				$settings = dbquery("SELECT tableprefix FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+				list($tableprefix) = dbrow($settings);

+				$selectA = "SELECT category, catid FROM ".$tableprefix."fanfiction_categories ORDER BY leveldown, displayorder";

+				$resultA = dbquery($selectA);

+				$countA = 1;

+				while($cat = dbassoc($resultA)) {

+					$count = 1;

+					if($cat[parentcatid] = -1) {

+						dbquery("UPDATE ".$tableprefix."fanfiction_categories SET displayorder = $countA WHERE catid = $cat[catid]");

+						$countA++;

+					}

+					$selectB = "SELECT category, catid FROM ".$tableprefix."fanfiction_categories WHERE parentcatid = '$cat[catid]' ORDER BY displayorder";

+					$resultB = dbquery($selectB) or die(_FATALERROR."Query: ".$selectB."<br />Error: (".mysql_errno( ).") ".mysql_error( ));

+					while($sub = dbassoc($resultB)) {

+						dbquery("UPDATE ".$tableprefix."fanfiction_categories SET displayorder = $count WHERE catid = $sub[catid]");

+						$count++;

+					}

+				}

+				$output .= write_message(_ACTIONSUCCESSFUL."<br /> <a href='upgrade11.php?step=15'>"._CONTINUE."</a>");

+			}

+		}

+		else {

+			include("../config.php");

+			$output .= write_message(_UPDATECATORDERINFO." <BR /><BR /><a href='upgrade11.php?step=14&amp;install=automatic'>"._CONTINUE."</a>");

+		}

+	break;

+	case "13":

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

+		if(isset($_GET['install'])) {

+			include("../config.php");

+			$settings = dbquery("SELECT tableprefix FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+			list($tableprefix) = dbrow($settings);

+			$favst = dbquery("INSERT INTO ".$tableprefix."fanfiction_favorites(uid, item, type) SELECT uid, sid, 'ST' FROM ".$tableprefix."fanfiction_favstor");

+			$output .= write_message(_FAV1.($favst ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+			$favau = dbquery("INSERT INTO ".$tableprefix."fanfiction_favorites(uid, item, type) SELECT uid, favuid, 'AU' FROM ".$tableprefix."fanfiction_favauth");

+			$output .= write_message(_FAV3.($favau ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+			$drop1 = dbquery("DROP TABLE `".$tableprefix."fanfiction_favstor`");

+			$output .= write_message(_FAV4.($drop1 ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+			$drop3 = dbquery("DROP TABLE `".$tableprefix."fanfiction_favauth`");

+			$output .= write_message(_FAV6.($drop3 ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+			$output .= write_message("<a href='upgrade11.php?step=14'>"._CONTINUE."</a>");		

+		}

+		else $output .= write_message(_FAVUPDATEINFO11."<br /><a href='upgrade11.php?step=13&amp;install=automatic'>"._CONTINUE."</a>");

+	break;

+	case "12":

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

+		if(isset($_GET['install'])) {

+			if($_GET['install'] == "automatic") {

+				include("../config.php");

+				$settings = dbquery("SELECT tableprefix FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+				list($tableprefix) = dbrow($settings);

+				$characters = dbquery("SELECT charid, charname FROM ".$tableprefix."fanfiction_characters");

+					while($char = dbassoc($characters)) {

+					$character[stripslashes($char[charname])] = $char[charid];

+				}

+				$ratlist = dbquery("SELECT * FROM ".$tableprefix."fanfiction_ratings");

+				while($rate = dbassoc($ratlist)) {

+					$ratingslist[$rate['rating']] = $rate['rid'];

+				}

+				$classresults = dbquery("SELECT * FROM ".$tableprefix."fanfiction_classes");

+				while($class = dbassoc($classresults)) {

+					$classlist[$class['class_name']] = array("id" => $class['class_id'], "type" => $class['class_type'], "name" => $class['class_name']);

+				}

+				$offset = isset($_GET['offset']) ? $_GET['offset'] : 0;

+				$stories = dbquery("SELECT s.*, AVG( re.rating ) AS rating, count( re.rating ) AS reviews FROM ".$tableprefix."fanfiction_stories AS s LEFT JOIN ".$tableprefix."fanfiction_reviews AS re ON s.sid = re.chapid GROUP BY s.sid LIMIT $offset, 200");

+				while($chapter = dbassoc($stories)) {

+					dbquery("INSERT INTO ".$tableprefix."fanfiction_chapters(`chapid` , `title` , `inorder` , `storytext` , `validated` , `wordcount` , `rating` , `reviews` , `sid` , `uid` ) VALUES('$chapter[sid]', '".addslashes($chapter[chapter])."', '".($chapter[inorder] + 1)."', '".addslashes($chapter[storytext])."', '$chapter[validated]', '$chapter[wordcount]', '".(empty($chapter[rating]) ? "0" : $chapter[rating])."', '$chapter[reviews]', '$chapter[psid]', '$chapter[uid]')");

+					if($chapter['sid'] == $chapter['psid']) {		

+						unset($genres, $warnings, $g, $w, $classes, $characters, $c, $clist, $rid);

+						$characters = explode(",", $chapter['charid']);

+						foreach($characters as $c) {

+							$clist[] = $character[$c];

+						}

+						$genres = explode(",", $chapter['gid']);

+						foreach($genres as $g) {

+							if($g && $g != " " && $classlist[$g]['type'] == 1) $classes[] = $classlist[$g]['id'];

+						}

+						$warnings = explode(",", $chapter['wid']);

+						foreach($warnings as $w) {

+							if($w && $w != " " && $classlist[$w]['type'] == 2) $classes[] = $classlist[$w]['id'];

+						}

+						$rid = $ratingslist[$chapter['rid']];

+						dbquery("UPDATE ".$tableprefix."fanfiction_stories SET rid = '$rid', classes = '".($classes ? implode(",", $classes) : "")."', charid = '".($clist ? implode(",", $clist) : "")."' WHERE sid = '$chapter[sid]'");

+					}

+				}

+				if(dbnumrows($stories)) $output .= write_message(_STORIES." ".($offset + 1)."-".($offset + dbnumrows($stories)).".<br /><a href='upgrade11.php?step=12&amp;install=automatic&amp;offset=".($offset+200)."'>"._CONTINUE."</a>");

+				else {

+					dbquery("DELETE FROM ".$tableprefix."fanfiction_stories WHERE sid != psid");

+					dbquery("ALTER TABLE `".$tableprefix."fanfiction_stories` CHANGE `featured` `featured` CHAR( 1 ) DEFAULT '0' NOT NULL ,

+CHANGE `validated` `validated` CHAR( 1 ) DEFAULT '0' NOT NULL ,

+CHANGE `rr` `rr` CHAR( 1 ) DEFAULT '0' NOT NULL, DROP `chapter`, 

+DROP `inorder`, 

+DROP `storytext`, 

+DROP `psid`,

+DROP `gid`,

+DROP `wid`,

+CHANGE `catid` `catid` VARCHAR( 100 ) DEFAULT '0' NOT NULL, 

+ADD `rating` TINYINT( 4 ) NOT NULL");

+	$stories = dbquery("SELECT AVG(rating) as average, item FROM ".TABLEPREFIX."fanfiction_reviews WHERE type = 'ST' AND rating != '-1' GROUP BY item");

+	while($s = dbassoc($stories)) {

+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET rating = '".round($s['average'])."' WHERE sid = '".$s['item']."'");

+	}

+	$stories = dbquery("SELECT COUNT(reviewid) as count, item FROM ".TABLEPREFIX."fanfiction_reviews WHERE type = 'ST' AND review != 'No Review' GROUP BY item");

+	while($s = dbassoc($stories)) {

+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET reviews = '".$s['count']."' WHERE sid = '".$s['item']."'");

+	}

+	dbquery("UPDATE ".TABLEPREFIX."fanfiction_chapters SET rating = '0', reviews = '0'");

+	$chapters = dbquery("SELECT AVG(rating) as average, chapid FROM ".TABLEPREFIX."fanfiction_reviews WHERE type = 'ST' AND rating != '-1' GROUP BY chapid");

+	while($c = dbassoc($chapters)) {

+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_chapters SET rating = '".round($c['average'])."' WHERE chapid = '".$c['chapid']."'");

+	}

+	$chapters = dbquery("SELECT COUNT(reviewid) as count, chapid FROM ".TABLEPREFIX."fanfiction_reviews WHERE type = 'ST' AND review != 'No Review' GROUP BY chapid");

+	while($c = dbassoc($chapters)) {

+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_chapters SET reviews = '".$c['count']."' WHERE chapid = '".$c['chapid']."'");

+	}					$output .= write_message(_STORIESUPDATED."<br /><br /><a href='upgrade11.php?step=13&amp;install=automatic'>"._CONTINUE."</a>");

+				}

+			}

+		}

+		else {

+			include("../config.php");

+			$output .= write_message(_UPDATESTORIES11INFO."<br /><br /> <a href='upgrade11.php?step=12&amp;install=automatic'>"._CONTINUE."</a>");

+		}

+	break;

+	case "11":

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

+		if(isset($_GET['install'])) {

+			include("../config.php");

+			$settings = dbquery("SELECT tableprefix FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+			list($tableprefix) = dbrow($settings);

+			$alter = dbquery("ALTER TABLE `".$tableprefix."fanfiction_reviews` CHANGE `psid` `item` INT( 11 ) NOT NULL DEFAULT '0'");

+			$output .= write_message(_REVIEWALTER7.($alter ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+			$alter2 = dbquery("ALTER TABLE `".$tableprefix."fanfiction_reviews` ADD `type` VARCHAR( 2 ) NOT NULL DEFAULT 'ST'");

+			$output .= write_message(_REVIEWALTER2.($alter2 ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+			$alter3 = dbquery("ALTER TABLE `".$tableprefix."fanfiction_reviews` CHANGE `member` `uid` INT( 11 ) NOT NULL DEFAULT '0'");

+			$output .= write_message(_REVIEWALTER3.($alter3 ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+			$alter4 = dbquery("ALTER TABLE `".$tableprefix."fanfiction_reviews` ADD `respond` CHAR( 1 ) DEFAULT '0' NOT NULL");

+			$output .= write_message(_REVIEWALTER5.($alter4 ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+			$update1 = dbquery("UPDATE ".$tableprefix."fanfiction_reviews SET type = 'ST' WHERE item > 0");

+			$alter5 = dbquery("ALTER TABLE `".$tableprefix."fanfiction_reviews` CHANGE `sid` `chapid` INT( 11 ) NOT NULL DEFAULT '0'");

+			$output .= write_message(_REVIEWALTER6.($alter5 ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+

+			$output .= write_message(_REVIEWUPDATE1.($update1 ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+			$update3 = dbquery("UPDATE ".$tableprefix."fanfiction_reviews SET respond = 1 WHERE review LIKE \"%Author's Response:%\"");

+			$output .= write_message(_REVIEWUPDATE3.($update3 ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+			$output .= write_message("<a href='upgrade11.php?step=12'>"._CONTINUE."</a>");

+		}

+		else $output .= write_message(_REVIEWUPDATEINFO."<br /><a href='upgrade11.php?step=11&amp;install=automatic'>"._CONTINUE."</a>");

+

+	break;

+	case "10":

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

+		if(isset($_GET['install'])) {

+			if($_GET['install'] == "automatic") {

+				include("../config.php");

+				$settings = dbquery("SELECT tableprefix FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+				list($tableprefix) = dbrow($settings);

+				$result = dbquery("ALTER TABLE ".$tableprefix."fanfiction_stories ADD `classes` VARCHAR( 200 ) NULL AFTER `catid`;");

+				if($result) $result = dbquery("ALTER TABLE ".$tableprefix."fanfiction_stories CHANGE `summary` `summary` TEXT NULL");

+				if($result) $result = dbquery("ALTER TABLE ".$tableprefix."fanfiction_stories ADD `coauthors` tinyint(1) NULL AFTER `uid`");

+				if($result) $result = dbquery("ALTER TABLE ".$tableprefix."fanfiction_stories CHANGE `numreviews` `reviews` SMALLINT( 6 ) DEFAULT '0' NOT NULL");

+				if($result) $result = dbquery("ALTER TABLE ".$tableprefix."fanfiction_stories CHANGE `counter` `count` INT( 11 ) NOT NULL DEFAULT '0' AFTER `reviews`;");

+				if($result) $result = dbquery("ALTER TABLE ".$tableprefix."fanfiction_stories ADD `storynotes` TEXT NULL AFTER `summary`;");

+				if($result) $output .= write_message(_ACTIONSUCCESSFUL."<br /> <a href='upgrade11.php?step=11'>"._CONTINUE."</a>");

+			}

+			else if($_GET['install'] == "manual") {

+				$output .= write_message(_UPDATESTORIESTABLEMANUAL11."<br /> <a href='upgrade11.php?step=11'>"._CONTINUE."</a>");

+			}

+		}

+		else {

+			include("../config.php");

+			$output .= write_message(_UPDATESTORIESTABLEINFO11." <a href='upgrade11.php?step=10&amp;install=automatic'>"._AUTO."</a> "._OR." <a href='upgrade11.php?step=10&amp;install=manual'>"._MANUAL2."</a>");

+		}

+	break;	case "9":

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

+		if(isset($_GET['install'])) {

+			include("../config.php");

+			$settings = dbquery("SELECT tableprefix FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+			list($tableprefix) = dbrow($settings);

+			$newclass = dbquery("INSERT INTO ".$tableprefix."fanfiction_classtypes (`classtype_name`, `classtype_title`) VALUES('genres', 'Genres');");

+			$genres = dbquery("SELECT * FROM ".$tableprefix."fanfiction_genres");

+			$output .= "<table class='tblborder' style='margin: 1em auto; padding: 1em;' cellpadding='5'><tr><th>Genres</th><th>Result</th></tr>";

+			while($g = dbassoc($genres)) {

+				$result = dbquery("INSERT INTO ".$tableprefix."fanfiction_classes (`class_type`, `class_name`) VALUES('1', '".$g['genre']."')");

+				$output .= "<tr><td>".$g['genre']."</td><td align='center'>" . ($result ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";

+			}

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

+			// Ditto with the warnings

+			$newclass = dbquery("INSERT INTO ".$tableprefix."fanfiction_classtypes (`classtype_name`, `classtype_title`) VALUES('warnings', 'Warnings');");

+			$output .= "<table class='tblborder' style='margin: 1em auto; padding: 1em;' cellpadding='5'><tr><th>Warnings</th><th>Result</th></tr>";

+			$warnings = dbquery("SELECT * FROM ".$tableprefix."fanfiction_warnings");

+			while($w = dbassoc($warnings)) {

+				$result = dbquery("INSERT INTO ".$tableprefix."fanfiction_classes (`class_type`, `class_name`) VALUES('2', '$w[warning]')");

+				$output .= "<tr><td>".$w['warning']."</td><td align='center'>" . ($result ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";

+			}

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

+			$drop1 = dbquery("DROP TABLE `".$tableprefix."fanfiction_genres`");

+			$output .= write_message(_DROPGENRES.($drop1 ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+			$drop2 = dbquery("DROP TABLE `".$tableprefix."fanfiction_warnings`");

+			$output .= write_message(_DROPWARNINGS.($drop2 ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">"));

+			

+			$output .= write_message(_MOVECLASSFAIL."<br /><a href='upgrade11.php?step=10'>continue</a>");

+		}

+		else $output .= write_message(_MOVECLASSESINFO."<br /><a href='upgrade11.php?step=9&amp;install=automatic'>"._CONTINUE."</a>");

+	break;

+	case "8":

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

+		if(isset($_GET['install'])) {

+			if($_GET['install'] == "automatic") {

+				include("../config.php");

+				$settings = dbquery("SELECT tableprefix FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+				list($tableprefix) = dbrow($settings);

+				$output .= "<table class='tblborder' style='margin: 1em auto; padding: 1em;' cellpadding='5'><tr><th>Message</th><th>Result</th></tr>";

+				$settings = dbquery("SELECT * FROM ".$tableprefix."fanfiction_settings_old");

+				if(!$settings) $settings = dbquery("SELECT * FROM ".$tableprefix."fanfiction_settings");

+				$messages = dbassoc($settings);

+				foreach($messages as $name => $text) {

+					

+					$msg = dbquery("INSERT INTO `".$tableprefix."fanfiction_messages` (`message_name`, `message_title`, `message_text`) VALUES ('$name', '".$defaulttitles[$name]."', '".addslashes($text)."');");

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

+				}

+				$msg = dbquery("INSERT INTO `".$tableprefix."fanfiction_messages`(`message_name`, `message_title`, `message_text`) VALUES ('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.');");

+				$output .= "<tr><td>Printable 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`(`message_name`, `message_title`, `message_text`) VALUES ('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>');");

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

+				$msg = dbquery("INSERT INTO `".$tableprefix."fanfiction_messages`(`message_name`, `message_title`, `message_text`) VALUES ('tos', 'Terms of Service', 'This is the Terms of Service for your site.  It will be displayed when a new member registers to the site.');");

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

+				$msg = dbquery("INSERT INTO `".$tableprefix."fanfiction_messages`(`message_name`, `message_title`, `message_text`) VALUES('maintenance', 'Site Maintenance', '<p style=\"text-align: center;\">This site is currently undergoing maintenance.  Please check back soon.  Thank you.</p>');");

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

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

+				$output .= write_message(_MESSAGEAUTOFAILUPGRADE."<br /><a href='upgrade11.php?step=9'>continue</a>");

+			}

+		}

+		else $output .= write_message(_MESSAGEDATAUPGRADE."<br /><a href='upgrade11.php?step=8&amp;install=automatic'>"._CONTINUE."</a>");

+

+	break;

+	case "7":

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

+		if(isset($_GET['install'])) {

+			if($_GET['install'] == "automatic") {

+				include("../config.php");

+				$settings = dbquery("SELECT tableprefix FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+				list($tableprefix) = dbrow($settings);

+				$blocklist = array(

+					array("categories","Categories","categories/categories.php","1",""),

+					array("featured","Featured Stories","featured/featured.php","1",""),

+					array("info","Site Info","info/info.php","2",""),

+					array("login","Log In","login/login.php","1",""),

+					array("menu","Main Menu","menu/menu.php","1",""),

+					array("random","Random Story","random/random.php","2",""),

+					array("recent","Most Recent","recent/recent.php","2","a:1:{s:3:\"num\";s:1:\"1\";}"),

+					array("skinchange","Skin Change","skinchange/skinchange.php","1",""),

+					array("news","Site News","news/news.php","1","a:1:{s:3:\"num\";s:1:\"1\";}")

+				);

+				$output .= "<table class='tblborder' style='margin: 1em auto; padding: 1em;' cellpadding='5'><tr><th>"._BLOCK."</th><th>"._RESULT."</th></tr>";

+				foreach($blocklist as $block) {

+					$b = dbquery("INSERT INTO `".$tableprefix."fanfiction_blocks` (`block_name`, `block_title`, `block_file`, `block_status`, `block_variables`) VALUES('".$block[0]."', '".$block[1]."', '".$block[2]."', '".$block[3]."', '".escapestring($block[4])."');");

+					$output .= "<tr><td>".$block[1]."</td><td align='center'>" . ($b ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";

+				}

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

+				$output .= write_message(_BLOCKDATAFAILUPGRADE."<br /><br /><a href='upgrade11.php?step=8'>"._CONTINUE."</a>");

+			}

+			else {

+				$output .= write_message(_BLOCKDATAMANUAL."<br /><br /><a href='upgrade11.php?step=7'>"._CONTINUE."</a>");

+			}

+		}

+		else $output .= write_message(_BLOCKDATANEW."<br /><br /><a href='upgrade11.php?step=7&amp;install=automatic'>"._AUTO."</a> "._OR." <a href='iupgrade11.php?step=7&amp;install=manual'>"._MANUAL2."</a>");

+	break;

+	case "6":

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

+		if(isset($_GET['install'])) {

+			if($_GET['install'] == "automatic") {

+				include("../config.php");

+				$settings = dbquery("SELECT tableprefix FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+				list($tableprefix) = dbrow($settings);

+				$pagelist = array(

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

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

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

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

+					array("logout","Logout","user.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("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("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("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("browse","Browse","browse.php","0","0"),

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

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

+					array("genres_link", "Genres", "browse.php?type=class&type_id=1", "0", "0"),

+					array("warnings_link", "Warnings", "browse.php?type=class&type_id=2", "0", "0")

+				);

+				$output .= "<table class='tblborder' style='margin: 1em auto; padding: 1em;' cellpadding='5'><tr><th>Pages</th><th>Result</th></tr>";

+				foreach($pagelist as $page) {

+					$pages = dbquery("INSERT INTO `".$tableprefix."fanfiction_pagelinks` (`link_name`, `link_text`, `link_url`, `link_target`, `link_access`) VALUES ('".$page[0]."', '".$page[1]."', '".$page[2]."', '".$page[3]."', '".$page[4]."');");

+					$output .= "<tr><td>".stripslashes($page[1])."</td><td align='center'>" . ($pages ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";

+				}

+

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

+				$output .= write_message(_LINKAUTOFAIL."<br /><a href='upgrade11.php?step=7'>"._CONTINUE."</a>");

+			}

+			else {

+				$output .= write_message(_LINKMANUAL."<br /><a href='upgrade11.php?step=7'>"._CONTINUE."</a>");

+			}

+		}

+		else $output .= write_message(_LINKDATAINFO." "._LINKSETUP." <a href='upgrade11.php?step=6&amp;install=automatic'>"._AUTO."</a> "._OR." <a href='upgrade11.php?step=6&amp;install=manual'>"._MANUAL2."</a>");

+	break;

+	case "5":

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

+		if(isset($_GET['install'])){

+			if($_GET['install'] == "automatic") {

+				include("../config.php");

+				$settings = dbquery("SELECT tableprefix FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '".$sitekey."'");

+				list($tableprefix) = dbrow($settings);

+				$panellist = array(

+					array("submitted","Submissions", "","3","5","0","A"),

+					array("versioncheck", "Version Check", "", "3", "7", "0", "A"),

+					array("newstory","Add New Story","stories.php?action=newstory&admin=1","3","3","0","A"),

+					array("addseries","Add New Series","series.php?action=add","3","3","0","A"),

+					array("news","News","","3","5","0","A"),

+					array("featured","Featured Stories","","3","5","0","A"),

+					array("characters","Characters","","2","2","0","A"),

+					array("ratings","Ratings","","2","3","0","A"),

+					array("members","Members","","2","5","0","A"),

+					array("mailusers","Mail Users","","2","6","0","A"),

+					array("settings","Settings","","1","2","0","A"),

+					array("blocks","Blocks","","1","3","0","A"),

+					array("censor","Censor","","1","0","1","A"),

+					array("admins","Admins","","1","6","0","A"),

+					array("classifications","Classifications","","2","4","0","A"),

+					array("categories","Categories","","2","1","0","A"),

+					array("custpages","Custom Pages","","1","4","0","A"),

+					array("validate","Validate Submission","","3","0","1","A"),

+					array("yesletter","Validation Letter","","3","0","1","A"),

+					array("noletter","Rejection Letter","","3","0","1","A"),

+					array("links","Page Links","","1","5","0","A"),

+					array("messages","Message Settings","","2","0","1","A"),

+					array("login","Login","","0","0","1","U"),

+					array("logout","Logout","","1","5","0","U"),

+					array("revreceived","Reviews Received","","1","0","1","U"),

+					array("editprefs","Edit Preferences","","1","2","0","U"),

+					array("lostpassword","Lost Password","","0","0","1","U"),

+					array("editbio","Edit Bio","","1","1","0","U"),

+					array("register","Register","","0","0","1","U"),

+					array("manageimages","Manage Images","","1","5","0","S"),

+					array("manfavs","Manage Favorites","","1","2","0","F"),

+					array("revres","Review Response","","1","0","1","U"),

+					array("stats","View Your Statistics","","1","3","0","U"),

+					array("newstory","Add New Story","stories.php?action=newstory","1","1","0","S"),

+					array("newseries","Add New Series","series.php?action=add","1","3","0","S"),

+					array("managestories","Manage Stories","stories.php?action=viewstories","1","2","0","S"),

+					array("manageseries","Manage Series","series.php?action=manage","1","4","0","S"),

+					array("reviewsby","Your Reviews","","1","0","1","U"),

+					array("storiesby","Stories by {author}","","0","1","0","P"),

+					array("seriesby","Series by {author}","","0","2","0","P"),

+					array("reviewsby","Reviews by {author}","","0","3","0","P"),

+					array("categories","Categories","","0","1","0","B"),

+					array("characters","Characters","","0","2","0","B"),

+					array("ratings","Ratings","","0","3","0","B"),

+					array("titles","Titles","","0","5","0","B"),

+					array("class","Classes","","0","0","1","B"),

+					array("recent","Most Recent","","0","0","1","B"),

+					array("featured","Featured Stories","","0","0","1","B"),

+					array("panels","Panels","","1","1","0","A"),

+					array("phpinfo","PHP Info","","1","7","0","A"),

+					array("contact","Contact","","0","0","1","P"),

+					array("series", "Series", "", "0", "4", "0", "B"),

+					array("viewlog", "Action Log", "", "1", "8", "0", "A"),

+					array("shortstories","10 Shortest Stories","toplists/default.php","0","6","0","L"), 

+					array("longstories","10 Longest Stories","toplists/default.php","0","5","0","L"), 

+					array("largeseries","10 Largest Series","toplists/default.php","0","1","0","L"), 

+					array("smallseries","10 Smallest Series","toplists/default.php","0","2","0","L"), 

+					array("reviewedseries","10 Most Reviewed Series","toplists/default.php","0","4","0","L"), 

+					array("prolificauthors","10 Most Prolific Authors","toplists/default.php","0","10","0","L"), 

+					array("prolificreviewers","10 Most Prolific Reviewers","toplists/default.php","0","12","0","L"), 

+					array("reviewedstories","10 Most Reviewed Stories","toplists/default.php","0","8","0","L"), 

+					array("readstories","10 Most Read Stories","toplists/default.php","0","9","0","L"),

+					array("favstories","10 Most Favorite Stories","toplists/default.php","0","7","0","L"), 

+					array("favauthors","10 Most Favorite Authors","toplists/default.php","0","11","0","L"), 

+					array("favseries","10 Most Favorite Series","toplists/default.php","0","3","0","L"), 

+					array("favst","Favorite Stories","","0","0","1","F"),

+					array("favse","Favorite Series","","0","0","1","F"),

+					array("favau","Favorite Authors","","0","0","1","F"),

+					array("favst","Favorite Stories","","0","0","1","U"),

+					array("favse","Favorite Series","","0","0","1","U"),

+					array("favau","Favorite Authors","","0","0","1","U"),

+					array("favlist","{author}\'s Favorites","viewuser.php?action=manfavs","0","5","0","F"),

+					array("skins", "Skins", "", "3", "6", "0", "A"),

+					array("authorfields", "Profile Information", "", "1", "9", "0", "A"),

+					array("maintenance", "Archive Maintenance", "", "1", "10", "0", "A"),

+					array("manual", "Admin Manual", "", "3", "6", "0", "A"),

+					array('modules', 'Modules', '', 1, "11", 0, 'A')

+

+				);

+				$output .= "<table class='tblborder' style='margin: 1em auto; padding: 1em;' cellpadding='5'><tr><th>Panel</th><th>Result</th></tr>";

+				foreach($panellist as $panel) {

+					unset($panels);

+					$panels = dbquery("INSERT INTO `".$tableprefix."fanfiction_panels` (`panel_name`, `panel_title`, `panel_url`, `panel_level`, `panel_order`, `panel_hidden`, `panel_type`) VALUES ('".$panel[0]."', '".$panel[1]."', '".$panel[2]."', '".$panel[3]."', '".$panel[4]."', '".$panel[5]."', '".$panel[6]."');");

+					$output .= "<tr><td>".stripslashes($panel[1])."</td><td align='center'>" . ($panels ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";

+				}

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

+				$output .= write_message(_PANELAUTOFAIL."<br /> <a href='upgrade11.php?step=6'>"._CONTINUE."</a>");

+			}

+			else {

+				$output .= write_message(_PANELMANUAL."<br /> <a href='upgrade11.php?step=6'>"._CONTINUE."</a>");

+			}

+		}

+		else $output .= write_message(_PANELDATAINFO." "._PANELSETUP." <a href='upgrade11.php?step=5&amp;install=automatic'>"._AUTO."</a> "._OR." <a href='upgrade11.php?step=5&amp;install=manual'>"._MANUAL2."</a>");

+	break;

+	case "4":

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

+		if(isset($_GET['install'])) {

+			if($_GET['install'] == "automatic") {