@@ -73,6 +73,17 @@ else {

 		dbquery("UPDATE " . $settingsprefix . "fanfiction_settings SET version = '3.5.6' WHERE sitekey = '" . SITEKEY . "'");

 		$settings['version'] = '3.5.6';

 	}

+ 

+	else {

+		$set_359 = do_version_check_359();

+	

+		if ($set_359)

+		{

+			$output .= write_message("Table <b>" . $set_359 . "</b> needs a update.");

+			dbquery("UPDATE " . $settingsprefix . "fanfiction_settings SET version = '3.5.8' WHERE sitekey = '" . SITEKEY . "'");

+			$settings['version'] = '3.5.8';

+		}

+	}

 }

 $oldVersion = explode(".", $settings['version']);

@@ -271,6 +282,30 @@ elseif ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 8))  //3.

 }

+elseif ($oldVersion[0] == 3 && $oldVersion[1] == 5 && $oldVersion[2] < 9)  // 3.5.8 -> 3.5.9

+{

+	if ($confirm == "yes")

+	{

+		if (!dbassoc(dbquery("SHOW COLUMNS FROM ".TABLEPREFIX."fanfiction_settings LIKE 'smtp_port'")))

+			dbquery("ALTER TABLE `".TABLEPREFIX."fanfiction_settings` ADD `smtp_port` varchar(5) NOT NULL DEFAULT ''");

+		if (!dbassoc(dbquery("SHOW COLUMNS FROM ".TABLEPREFIX."fanfiction_settings LIKE 'smtp_secure'")))

+			dbquery("ALTER TABLE `".TABLEPREFIX."fanfiction_settings` ADD `smtp_secure` varchar(3) NOT NULL DEFAULT ''");

+

+		$set_359 = do_version_check_359();

+		if ($set_359)

+		{

+			$output .= write_error(_ERROR);   // migration not confirmed -> DO NOT bump version

+		}

+		else

+		{

+			$update = dbquery("UPDATE ".$settingsprefix."fanfiction_settings SET version = '".$version."' WHERE sitekey = '".SITEKEY."'");

+			if ($update) $output .= write_message(_ACTIONSUCCESSFUL);

+		}

+	}

+	else if ($confirm == "no") $output .= write_message(_ACTIONCANCELLED);

+	else $output .= write_message("Are you ready to update? <a href='update.php?confirm=yes'>"._YES."</a> "._OR." <a href='update.php?confirm=no'>"._NO."</a>");

+}

+

 else $output .= write_message(_ALREADYUPDATED);

 /* until database is fully fixed, not update efiction version */

@@ -381,6 +416,23 @@ function do_version_check_356()

 	return $check_356;

 }

+function do_version_check_359()

+{

+	$check_359 = false;

+

+	$required = array('smtp_port', 'smtp_secure');

+	foreach ($required as $f)

+	{

+		if (!dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_settings LIKE '{$f}'")))

+		{

+			$check_359 = "fanfiction_settings - field: " . $f;

+			return $check_359;

+		}

+	}

+

+	return $check_359;

+}

+

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

 $tpl->printToScreen();

 dbclose();

@@ -150,8 +150,16 @@ if ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 6))  //3.5.5

 								dbquery("ALTER TABLE `" . TABLEPREFIX . $t .  "` ADD `{$f}_tmp` int(10) unsigned NOT NULL default '0' ");

 							}

+							$updated = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . $t . " LIKE '{$f}_backup'"));

+							if (!$updated)

+							{

+								dbquery("ALTER TABLE `" . TABLEPREFIX . $t .  "` ADD `{$f}_backup` datetime  ");

+							}

+

+							dbquery("UPDATE `" . TABLEPREFIX . $t .  "` SET `{$f}_backup` =  `{$f}`  ");

 							dbquery("UPDATE `" . TABLEPREFIX . $t .  "` SET `{$f}_tmp` = UNIX_TIMESTAMP( `{$f}` )");

-							dbquery("ALTER TABLE `" . TABLEPREFIX . $t .  "` CHANGE `{$f}` `{$f}` DATETIME NOT NULL)");

+							dbquery("UPDATE `" . TABLEPREFIX . $t .  "` SET `{$f}` =  '' ");

+						//	dbquery("ALTER TABLE `" . TABLEPREFIX . $t .  "` CHANGE `{$f}` `{$f}` DATETIME NOT NULL)");  this is needed on some servers

 							dbquery("ALTER TABLE `" . TABLEPREFIX . $t .  "` CHANGE `{$f}` `{$f}` INT NOT NULL"); 

 							dbquery("UPDATE  `" . TABLEPREFIX . $t .  "` set {$f} = {$f}_tmp");

 							dbquery("ALTER TABLE  `" . TABLEPREFIX . $t .  "` DROP `{$f}_tmp`");

@@ -151,6 +151,7 @@ if ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 6))  //3.5.5

 							}

 							dbquery("UPDATE `" . TABLEPREFIX . $t .  "` SET `{$f}_tmp` = UNIX_TIMESTAMP( `{$f}` )");

+							dbquery("ALTER TABLE `" . TABLEPREFIX . $t .  "` CHANGE `{$f}` `{$f}` DATETIME NOT NULL)");

 							dbquery("ALTER TABLE `" . TABLEPREFIX . $t .  "` CHANGE `{$f}` `{$f}` INT NOT NULL"); 

 							dbquery("UPDATE  `" . TABLEPREFIX . $t .  "` set {$f} = {$f}_tmp");

 							dbquery("ALTER TABLE  `" . TABLEPREFIX . $t .  "` DROP `{$f}_tmp`");

@@ -202,7 +202,7 @@ if ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 6))  //3.5.5

 		else $output .= write_message("Are you ready to update? <a href='update.php?confirm=yes'>" . _YES . "</a> " . _OR . " <a href='update.php?confirm=no'>" . _NO . "</a>");

 	}

 }

-elseif ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 7))  //3.5.6

+elseif ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 8))  //3.5.6 + 3.5.7

 {

 	if ($confirm == "yes")

 	{

@@ -261,6 +261,7 @@ elseif ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 7))  //3.

 	}

 }

+

 else $output .= write_message(_ALREADYUPDATED);

 /* until database is fully fixed, not update efiction version */

@@ -94,27 +94,53 @@ if ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 6))  //3.5.5

 		{

 			// List of DB tables (key) and field (value) which need changing to accommodate datetime field

+			// List of DB tables (key) and field (value) which need changing date from datetime/timestamp to int

 			$date_upgrade = array(

-				'fanfiction_authors' => 'date',

-				'fanfiction_comments'  => 'time',

-				'fanfiction_reviews' => 'date',

-				'fanfiction_stories'  => 'date',

-				'fanfiction_stories' => 'updated',

-				'fanfiction_news' => 'time',

-				'fanfiction_poll' => 'poll_start',

-				'fanfiction_poll' => 'poll_end',

+				array('table' => 'fanfiction_authors', 'field' => 'date'),

+				array(

+					'table' =>

+					'fanfiction_comments', 'field'  => 'time'

+				),

+				array(

+					'table' =>

+					'fanfiction_reviews', 'field' => 'date'

+				),

+				array(

+					'table' =>

+					'fanfiction_stories', 'field'  => 'date'

+				),

+				array(

+					'table' =>

+					'fanfiction_stories', 'field' => 'updated'

+				),

+				array(

+					'table' =>

+					'fanfiction_news', 'field' => 'time'

+				),

+				array(

+					'table' =>

+					'fanfiction_poll', 'field' => 'poll_start'

+				),

+				array(

+					'table' =>

+					'fanfiction_poll', 'field' => 'poll_end'

+				),

 			);

 			// Tables where IP address field needs updating to accommodate IPV6

 			// Set to varchar(45) - just in case something uses the IPV4 subnet (see http://en.wikipedia.org/wiki/IPV6#Notation)

-			foreach ($date_upgrade as $t => $f)

+			foreach ($date_upgrade as $tmp)

 			{

+

+				$t = $tmp['table'];

+				$f = $tmp['field'];

 				if (isTable($t))

 				{

 					// Check for table - might add some core plugin tables in here

 					if ($field_info =  dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . $t . " LIKE '{$f}'")))

 					{ 

+

 						if (strtolower($field_info['Type']) == 'datetime')

 						{

@@ -244,27 +270,46 @@ function do_version_check_355() {

 	$check_355 = false;

 	// List of DB tables (key) and field (value) which need changing date from datetime/timestamp to int

-	$date_upgrade = array(

-		'fanfiction_authors' => 'date',

-		'fanfiction_comments'  => 'time',

-		'fanfiction_reviews' => 'date',

-		'fanfiction_stories'  => 'date',

-		'fanfiction_stories' => 'updated',

-		'fanfiction_news' => 'time',

-		'fanfiction_poll' => 'poll_start',

-		'fanfiction_poll' => 'poll_end',

+	$date_upgrade = array(	

+		array('table'=>'fanfiction_authors', 'field' => 'date'),

+		array(

+			'table' =>

+			'fanfiction_comments', 'field'  => 'time'),

+			array(

+			'table' =>

+			'fanfiction_reviews', 'field' => 'date'),

+				array(

+			'table' =>

+			'fanfiction_stories', 'field'  => 'date'),

+					array(

+			'table' =>

+			'fanfiction_stories', 'field' => 'updated'),

+						array(

+			'table' =>

+			'fanfiction_news', 'field' => 'time'),

+							array(

+			'table' =>

+			'fanfiction_poll', 'field' => 'poll_start'),

+								array(

+			'table' =>

+			'fanfiction_poll', 'field' => 'poll_end'),

 	);

-	foreach ($date_upgrade as $t => $f)

+	foreach ($date_upgrade as $tmp)

 	{

+		$t = $tmp['table'];

+		$f = $tmp['field'];

 		if (isTable($t))

 		{

 			// Check for table - might add some core plugin tables in here

 			if ($field_info =  dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . $t . " LIKE '{$f}'")))

 			{

-

+				// echo "<pre>";

+				// print_r($t);

+				// print_r($field_info);

+				// echo "</pre>";

 				if (strtolower($field_info['Type']) != 'int' 

 				&& strtolower($field_info['Type']) != 'int(10)'

 				&& strtolower($field_info['Type']) != 'int(11)' 

@@ -202,7 +202,7 @@ elseif ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 7))  //3.

 						if (strtolower($field_info['Type']) != 'VARBINARY(16)')

 						{

-							dbquery("ALTER TABLE `" . TABLEPREFIX . $t .  "` MODIFY `$f` VARBINARY(16) NOT NULL DEFAULT '';");

+							dbquery("ALTER TABLE `" . TABLEPREFIX . $t .  "` MODIFY `$f` varbinary(16) DEFAULT NULL;");

 						}

 					}

@@ -47,61 +47,93 @@ location = \"maintenance.php\";

 	exit();

 }

 $oldVersion = explode(".", $settings['version']);

-

+ 

 if ($oldVersion[0] <= 3 && $oldVersion[1] <= 5 && $oldVersion[2] < 5)

 {

 	header("Location: update355.php");

 	exit();

 }

-

-$fanfiction_poll_exists = 0;  /* poll tables maybe be not installed */

-$fanfiction_poll_table = TABLEPREFIX . "fanfiction_poll";

-$fanfiction_poll_exists =  dbassoc(dbquery("

-			SELECT *

-			FROM information_schema.tables

-			WHERE table_schema = '{$dbname}'

-				AND table_name = '{$fanfiction_poll_table}'

-			;"));

-

+$set_355 = false;

+ 

 $set_355 = do_version_check_355();

+ 

 if($set_355) {

+	$output .= write_message("Table <b>" . $set_355 . "</b> needs a update.");

+

 	dbquery("UPDATE " . $settingsprefix . "fanfiction_settings SET version = '3.5.5' WHERE sitekey = '" . SITEKEY . "'");

+

 	$settings['version'] = '3.5.5';

 }

-$oldVersion = explode(".", $settings['version']);

+else {

+	$set_356 = do_version_check_356();

+ 

+	if ($set_356)

+	{

+		$output .= write_message("Table <b>" . $set_356 . "</b> needs a update.");

+		dbquery("UPDATE " . $settingsprefix . "fanfiction_settings SET version = '3.5.6' WHERE sitekey = '" . SITEKEY . "'");

+		$settings['version'] = '3.5.6';

+	}

+}

+$oldVersion = explode(".", $settings['version']);

+ 

 $confirm = isset($_GET['confirm']) ? $_GET['confirm'] : false;

-$oldconfirm = isset($_GET['oldconfirm']) ? $_GET['oldconfirm'] : false;

-

+ 

 if ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 3))

 {

 	write_message("This version is working only for 3.5.5 database. If you have only database, there is way how to do it.");

 	exit;

 }

-

-

-

+ 

+ 

 if ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 6))  //3.5.5

 {

 	if ($confirm == "yes")

 	{

 		if ($oldVersion[0] == 3 &&  $oldVersion[1] == 5 && $oldVersion[2] < 6)

 		{

-			/****************************************************************************************************************/

-			$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_authors LIKE 'date'"));

-			if ($tmp['Type'] == "datetime")

-			{ 

-				$updated = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_authors LIKE 'date_tmp'"));

-				if (!$updated)

+

+			// List of DB tables (key) and field (value) which need changing to accommodate datetime field

+			$date_upgrade = array(

+				'fanfiction_authors' => 'date',

+				'fanfiction_comments'  => 'time',

+				'fanfiction_reviews' => 'date',

+				'fanfiction_stories'  => 'date',

+				'fanfiction_stories' => 'updated',

+				'fanfiction_news' => 'time',

+				'fanfiction_poll' => 'poll_start',

+				'fanfiction_poll' => 'poll_end',

+			);

+

+			// Tables where IP address field needs updating to accommodate IPV6

+			// Set to varchar(45) - just in case something uses the IPV4 subnet (see http://en.wikipedia.org/wiki/IPV6#Notation)

+			foreach ($date_upgrade as $t => $f)

+			{

+				if (isTable($t))

 				{

-					dbquery("ALTER TABLE 	`" . TABLEPREFIX . "fanfiction_authors` ADD `date_tmp` int(10) unsigned NOT NULL default '0' ");

+

+					// Check for table - might add some core plugin tables in here

+					if ($field_info =  dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . $t . " LIKE '{$f}'")))

+					{ 

+						if (strtolower($field_info['Type']) == 'datetime')

+						{

+

+							$updated = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . $t . " LIKE '{$f}_tmp'"));

+							if (!$updated)

+							{

+								dbquery("ALTER TABLE `" . TABLEPREFIX . $t .  "` ADD `{$f}_tmp` int(10) unsigned NOT NULL default '0' ");

+							}

+

+							dbquery("UPDATE `" . TABLEPREFIX . $t .  "` SET `{$f}_tmp` = UNIX_TIMESTAMP( `{$f}` )");

+							dbquery("ALTER TABLE `" . TABLEPREFIX . $t .  "` CHANGE `{$f}` `{$f}` INT NOT NULL"); 

+							dbquery("UPDATE  `" . TABLEPREFIX . $t .  "` set {$f} = {$f}_tmp");

+							dbquery("ALTER TABLE  `" . TABLEPREFIX . $t .  "` DROP `{$f}_tmp`");

+						}

+					}

 				}

+			}	

-				dbquery("UPDATE 		`" . TABLEPREFIX . "fanfiction_authors` SET `date_tmp` = UNIX_TIMESTAMP( `date` )");

-				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_authors` CHANGE `date` `date` INT NOT NULL");

-				dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_authors` set date = date_tmp");

-				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_authors` DROP `date_tmp`");

-			}

+ 

 			/****************************************************************************************************************/

 			$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_log LIKE 'log_timestamp'"));

@@ -118,131 +150,78 @@ if ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 6))  //3.5.5

 				dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_log` set log_timestamp = log_timestamp_tmp");

 				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_log` DROP `log_timestamp_tmp`");

 			}

-			/****************************************************************************************************************/

-			/* fanfiction_comments   `time` datetime NOT NULL default '0000-00-00 00:00:00'  */

-			$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_comments LIKE 'time'"));

-			if ($tmp['Type'] == "datetime")

-			{

-				$updated = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_comments LIKE 'time_tmp'"));

-				if (!$updated)

-				{

-					dbquery("ALTER TABLE 	`" . TABLEPREFIX . "fanfiction_comments` ADD `time_tmp` int(10) unsigned NOT NULL default '0' ");

-				}

-				dbquery("UPDATE 		`" . TABLEPREFIX . "fanfiction_comments` SET `time_tmp` = UNIX_TIMESTAMP( `time` )");

-				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_comments` CHANGE `time` `time` INT NOT NULL");

-				dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_comments` set time = time_tmp");

-				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_comments` DROP `time_tmp`");

+			$set_355 = false;

+			$set_355 = do_version_check_355();

+			if($set_355) {

+				$output .= write_error(_ERROR);

 			}

-			/****************************************************************************************************************/

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

-			$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_reviews LIKE 'date'"));

-			if ($tmp['Type'] == "datetime")

-			{

-				$updated = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_reviews LIKE 'date_tmp'"));

-				if (!$updated)

-				{

-					dbquery("ALTER TABLE 	`" . TABLEPREFIX . "fanfiction_reviews` ADD `date_tmp` int(10) unsigned NOT NULL default '0' ");

-				}

-

-				dbquery("UPDATE 		`" . TABLEPREFIX . "fanfiction_reviews` SET `date_tmp` = UNIX_TIMESTAMP( `date` )");

-				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_reviews` CHANGE `date` `date` INT NOT NULL");

-				dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_reviews` set date = date_tmp");

-				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_reviews` DROP `date_tmp`");

-			}

-			/****************************************************************************************************************/

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

-			$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_stories LIKE 'date'"));

-			if($tmp['Type'] == "datetime") {

-				$updated = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_stories LIKE 'date_tmp'"));

-				if (!$updated)

-				{

-					dbquery("ALTER TABLE 	`" . TABLEPREFIX . "fanfiction_stories` ADD `date_tmp` int(10) unsigned NOT NULL default '0' ");

-				}

-

-				dbquery("UPDATE 		`" . TABLEPREFIX . "fanfiction_stories` SET `date_tmp` = UNIX_TIMESTAMP( `date` )");

-				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_stories` CHANGE `date` `date` INT NOT NULL");

-				dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_stories` set date = date_tmp");

-				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_stories` DROP `date_tmp`");

-			}

-

-			/****************************************************************************************************************/

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

-			$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_stories LIKE 'updated'"));

-			if ($tmp['Type'] == "datetime")

-			{				

-				$updated = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_stories LIKE 'updated_tmp'"));

-				if (!$updated)

-				{

-					dbquery("ALTER TABLE 	`" . TABLEPREFIX . "fanfiction_stories` ADD `updated_tmp` int(10) unsigned NOT NULL default '0' ");

-				}

-

-				dbquery("UPDATE 		`" . TABLEPREFIX . "fanfiction_stories` SET `updated_tmp` = UNIX_TIMESTAMP( `updated` )");

-				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_stories` CHANGE `updated` `updated` INT NOT NULL");

-				dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_stories` set updated = updated_tmp");

-				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_stories` DROP `updated_tmp`");

-			}

-

-			/****************************************************************************************************************/

-			/* fanfiction_news `time` datetime default NULL,  */

-			$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_news LIKE 'time'"));

-			

-			if ($tmp['Type'] == "datetime")

-			{		

-				$updated = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_news LIKE 'time_tmp'"));

-				if (!$updated)

-				{

-					dbquery("ALTER TABLE 	`" . TABLEPREFIX . "fanfiction_news` ADD `time_tmp` int(10) unsigned NOT NULL default '0' ");

-				}

-

-				dbquery("UPDATE 		`" . TABLEPREFIX . "fanfiction_news` SET `time_tmp` = UNIX_TIMESTAMP( `time` )");

-				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_news` CHANGE `time` `time` INT NOT NULL");

-				dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_news` set time = time_tmp");

-				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_news` DROP `time_tmp`");

+			else {

+				$update = dbquery("UPDATE " . $settingsprefix . "fanfiction_settings SET version = '" . $version . "' WHERE sitekey = '" . SITEKEY . "'");

+				if ($update) $output .= write_message(_ACTIONSUCCESSFUL);

 			}

+ 

+		}

+	

-			/****************************************************************************************************************/

-			if ($fanfiction_poll_exists)

+	}

+	else if ($confirm == "no")

+	{

+		$output .= write_message(_ACTIONCANCELLED);

+	}

+	else

+	{

+		if ($oldVersion[0] == 3 && ($oldVersion[1] < 4 || $oldVersion[1] == 4 && (!isset($oldVersion[2]) || $oldVersion[2] < 6)))

+			$output .= write_message(_CONFIRMUPDATE . "<br /> <a href='update.php?confirm=yes'>" . _YES . "</a> " . _OR . " <a href='update.php?confirm=no'>" . _NO . "</a>");

+		else $output .= write_message("Are you ready to update? <a href='update.php?confirm=yes'>" . _YES . "</a> " . _OR . " <a href='update.php?confirm=no'>" . _NO . "</a>");

+	}

+}

+elseif ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 7))  //3.5.6

+{

+	if ($confirm == "yes")

+	{

+		if ($oldVersion[0] == 3 &&  $oldVersion[1] == 5 && $oldVersion[2] < 7)

+		{

+			// List of DB tables (key) and field (value) which need changing to accommodate IPV6 addresses

+			$ip_upgrade = array(

+				'fanfiction_log' 	=> 'log_ip',

+				'fanfiction_online' => 'online_ip'

+			);

+

+			// Tables where IP address field needs updating to accommodate IPV6

+			// Set to varchar(45) - just in case something uses the IPV4 subnet (see http://en.wikipedia.org/wiki/IPV6#Notation)

+			foreach ($ip_upgrade as $t => $f)

 			{

-				$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_poll LIKE 'poll_start'"));

-

-				if ($tmp['Type'] == "datetime")

+				if (isTable($t))

 				{

-					$updated = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_poll LIKE 'poll_start_tmp'"));

-					if (!$updated)

+			 

+					// Check for table - might add some core plugin tables in here

+					if ($field_info =  dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . $t . " LIKE '{$f}'")))

 					{

-						dbquery("ALTER TABLE 	`" . TABLEPREFIX . "fanfiction_poll` ADD `poll_start_tmp` int(10) unsigned NOT NULL default '0' ");

-					}

+						//print_r($field_info);

+						if (strtolower($field_info['Type']) != 'VARBINARY(16)')

+						{

-					dbquery("UPDATE 		`" . TABLEPREFIX . "fanfiction_poll` SET `poll_start_tmp` = UNIX_TIMESTAMP( `poll_start` )");

-					dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_poll` CHANGE `poll_start` `poll_start` INT NOT NULL");

-					dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_poll` set poll_start = poll_start_tmp");

-					dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_poll` DROP `poll_start_tmp`");

-				}

-

-				$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_poll LIKE 'poll_end'"));

-

-				if ($tmp['Type'] == "datetime")

-				{

-					$updated = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_poll LIKE 'poll_end_tmp'"));

-					if (!$updated)

-					{

-						dbquery("ALTER TABLE 	`" . TABLEPREFIX . "fanfiction_poll` ADD `poll_end_tmp` int(10) unsigned NOT NULL default '0' ");

+							dbquery("ALTER TABLE `" . TABLEPREFIX . $t .  "` MODIFY `$f` VARBINARY(16) NOT NULL DEFAULT '';");

+ 

+						}

 					}

-					dbquery("UPDATE 		`" . TABLEPREFIX . "fanfiction_poll` SET `poll_end_tmp` = UNIX_TIMESTAMP( `poll_end` )");

-					dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_poll` CHANGE `poll_end` `poll_end` INT NOT NULL");

-					dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_poll` set poll_end = poll_end_tmp");

-					dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_poll` DROP `poll_end_tmp`");

 				}

+			}	 

+		}

-			}	

-

+		$set_356 = false;

+		$set_356 = do_version_check_356();

+		if ($set_356)

+		{

+			$output .= write_error(_ERROR);

+		}

+		else

+		{

+			$update = dbquery("UPDATE " . $settingsprefix . "fanfiction_settings SET version = '" . $version . "' WHERE sitekey = '" . SITEKEY . "'");

+			if ($update) $output .= write_message(_ACTIONSUCCESSFUL);

 		}

-	

-		$update = dbquery("UPDATE " . $settingsprefix . "fanfiction_settings SET version = '" . $version . "' WHERE sitekey = '" . SITEKEY . "'");

-		if ($update) $output .= write_message(_ACTIONSUCCESSFUL);

-		else $output .= write_error(_ERROR);

 	}

 	else if ($confirm == "no")

 	{

@@ -250,10 +229,11 @@ if ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 6))  //3.5.5

 	}

 	else

 	{

-		if ($oldVersion[0] == 3 && ($oldVersion[1] < 4 || $oldVersion[1] == 4 && (!isset($oldVersion[2]) || $oldVersion[2] < 6)))

-			$output .= write_message(_CONFIRMUPDATE . "<br /> <a href='update.php?confirm=yes'>" . _YES . "</a> " . _OR . " <a href='update.php?confirm=no'>" . _NO . "</a>");

+		if ($oldVersion[0] == 3 && ($oldVersion[1] < 4 || $oldVersion[1] == 4 && (!isset($oldVersion[2]) || $oldVersion[2] < 7)))

+		$output .= write_message(_CONFIRMUPDATE . "<br /> <a href='update.php?confirm=yes'>" . _YES . "</a> " . _OR . " <a href='update.php?confirm=no'>" . _NO . "</a>");

 		else $output .= write_message("Are you ready to update? <a href='update.php?confirm=yes'>" . _YES . "</a> " . _OR . " <a href='update.php?confirm=no'>" . _NO . "</a>");

 	}

+

 }

 else $output .= write_message(_ALREADYUPDATED);

@@ -262,82 +242,115 @@ function do_version_check_355() {

 	global $fanfiction_poll_exists;

 	$check_355 = false;

- 

-	/* do double check or return version back if it is needed */

-	$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_authors LIKE 'date'"));

-	if ($tmp['Type'] == "datetime")

-	{

-		$check_355 = true;

-		return $check_355;

-	}

-	$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_log LIKE 'log_timestamp'"));

-	if ($tmp['Type'] == "timestamp")

+	// List of DB tables (key) and field (value) which need changing date from datetime/timestamp to int

+	$date_upgrade = array(

+		'fanfiction_authors' => 'date',

+		'fanfiction_comments'  => 'time',

+		'fanfiction_reviews' => 'date',

+		'fanfiction_stories'  => 'date',

+		'fanfiction_stories' => 'updated',

+		'fanfiction_news' => 'time',

+		'fanfiction_poll' => 'poll_start',

+		'fanfiction_poll' => 'poll_end',

+	);

+

+	foreach ($date_upgrade as $t => $f)

 	{

-		$check_355 = true;

-		return $check_355;

-	}

-	$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_comments LIKE 'time'"));

-	if ($tmp['Type'] == "datetime")

-	{

-		$check_355 = true;

-		return $check_355;

-	}

+		if (isTable($t))

+		{

-	$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_reviews LIKE 'date'"));

-	if ($tmp['Type'] == "datetime")

-	{

-		$check_355 = true;

-		return $check_355;

-	}

+			// Check for table - might add some core plugin tables in here

+			if ($field_info =  dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . $t . " LIKE '{$f}'")))

+			{

-	$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_stories LIKE 'date'"));

-	if ($tmp['Type'] == "datetime")

-	{

-		$check_355 = true;

-		return $check_355;

+				if (strtolower($field_info['Type']) != 'int' 

+				&& strtolower($field_info['Type']) != 'int(10)'

+				&& strtolower($field_info['Type']) != 'int(11)' 

+				&& strtolower($field_info['Type']) != 'int unsigned'

+				&& strtolower($field_info['Type']) != 'int(10) unsigned')

+				{

+					// echo "<pre>"; print_r($field_info); echo "</pre>";

+					$check_355 = $t . " - field:  " . $f;

+					return $check_355;

+				}

+			}

+		}

+		

 	}

-	$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_stories LIKE 'updated'"));

-	if ($tmp['Type'] == "datetime")

+	$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_log LIKE 'log_timestamp'"));

+

+	if ($tmp['Type'] == "timestamp")

 	{

-		$check_355 = true;

+		$check_355 = $t . " - field:  " . $f;;

 		return $check_355;

 	}

-	$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_news LIKE 'time'"));

+	return $check_355;

+}

-	if ($tmp['Type'] == "datetime")

-	{

-			$check_355 = true;

-			return $check_355;

-	}

+function do_version_check_356()

+{

+	$check_356 = false;

+ 

+	// List of DB tables (key) and field (value) which need changing to accommodate IPV6 addresses

+	$ip_upgrade = array(

+		'fanfiction_log' 	=> 'log_ip',

+		'fanfiction_online' => 'online_ip'

+	);

-	if ($fanfiction_poll_exists)

+	foreach ($ip_upgrade as $t => $f)

 	{

-		$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_poll LIKE 'poll_start'"));

-

-		if ($tmp['Type'] == "datetime")

+ 

+		if (isTable($t))

 		{

-			$update = dbquery("UPDATE " . $settingsprefix . "fanfiction_settings SET version = '3.5.5' WHERE sitekey = '" . SITEKEY . "'");

-		}

-

-

-		$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_poll LIKE 'poll_end'"));

+			// Check for table - might add some core plugin tables in here

+			if ($field_info =  dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . $t ." LIKE '{$f}'")) )

+			{

-		if ($tmp['Type'] == "datetime")

-		{

-			$update = dbquery("UPDATE " . $settingsprefix . "fanfiction_settings SET version = '3.5.5' WHERE sitekey = '" . SITEKEY . "'");

+			

+				if (strtolower($field_info['Type']) != 'varbinary(16)')

+				{

+					$check_356 = $t . " - field:  " . $f;;

+			 

+					return $check_356;	 

+				}

+			}

+	 

 		}

+		

 	}

-	

-

-	return $check_355;

-}

-

+	return $check_356;

+}

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

 $tpl->printToScreen();

 dbclose();

+

+

+// new functions for easier db manipulation 3.6. 

+function db_mySQLtableList()

+{

+	global  $debug, $dbconnect, $dbname, $settingsprefix;

+

+	$table = array();

+

+	if ($res = dbquery("SHOW TABLES FROM " . $dbname . " LIKE '" . $settingsprefix . "%' "))

+

+		$length = strlen($settingsprefix);

+	while ($rows = dbrow($res))

+	{

+		$t = substr($rows[0], $length);

+		$table[] = $t;

+	}

+	return  $table;

+}

+

+function isTable($table)

+{

+	$mySQLtableList = db_mySQLtableList();

+	return in_array($table, $mySQLtableList);

+}

new file mode 100644

@@ -0,0 +1,343 @@

+<?php

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

+// eFiction 3.0

+// Copyright (c) 2007 by Tammy Keefer

+// Valid HTML 4.01 Transitional

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

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

+$current = "update";

+

+include("header.php");

+

+$blocks['news']['status'] = 0;

+$blocks['info']['status'] = 0;

+

+//make a new TemplatePower object

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

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

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

+if (file_exists("languages/" . $language . "_admin.php")) include_once("languages/" . $language . "_admin.php");

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

+// end basic page setup

+

+if (!isADMIN)

+{

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

+location = \"maintenance.php\";

+</script>";

+	$tpl->assign("output", $output);

+	$tpl->printToScreen();

+	dbclose();

+	exit();

+}

+$oldVersion = explode(".", $settings['version']);

+

+if ($oldVersion[0] <= 3 && $oldVersion[1] <= 5 && $oldVersion[2] < 5)

+{

+	header("Location: update355.php");

+	exit();

+}

+

+$fanfiction_poll_exists = 0;  /* poll tables maybe be not installed */

+$fanfiction_poll_table = TABLEPREFIX . "fanfiction_poll";

+$fanfiction_poll_exists =  dbassoc(dbquery("

+			SELECT *

+			FROM information_schema.tables

+			WHERE table_schema = '{$dbname}'

+				AND table_name = '{$fanfiction_poll_table}'

+			;"));

+

+$set_355 = do_version_check_355();

+if($set_355) {

+	dbquery("UPDATE " . $settingsprefix . "fanfiction_settings SET version = '3.5.5' WHERE sitekey = '" . SITEKEY . "'");

+	$settings['version'] = '3.5.5';

+}

+$oldVersion = explode(".", $settings['version']);

+

+$confirm = isset($_GET['confirm']) ? $_GET['confirm'] : false;

+$oldconfirm = isset($_GET['oldconfirm']) ? $_GET['oldconfirm'] : false;

+

+if ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 3))

+{

+	write_message("This version is working only for 3.5.5 database. If you have only database, there is way how to do it.");

+	exit;

+}

+

+

+

+if ($oldVersion[0] == 3 && ($oldVersion[1] < 5 || $oldVersion[2] < 6))  //3.5.5

+{

+	if ($confirm == "yes")

+	{

+		if ($oldVersion[0] == 3 &&  $oldVersion[1] == 5 && $oldVersion[2] < 6)

+		{

+			/****************************************************************************************************************/

+			$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_authors LIKE 'date'"));

+			if ($tmp['Type'] == "datetime")

+			{ 

+				$updated = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_authors LIKE 'date_tmp'"));

+				if (!$updated)

+				{

+					dbquery("ALTER TABLE 	`" . TABLEPREFIX . "fanfiction_authors` ADD `date_tmp` int(10) unsigned NOT NULL default '0' ");

+				}

+

+				dbquery("UPDATE 		`" . TABLEPREFIX . "fanfiction_authors` SET `date_tmp` = UNIX_TIMESTAMP( `date` )");

+				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_authors` CHANGE `date` `date` INT NOT NULL");

+				dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_authors` set date = date_tmp");

+				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_authors` DROP `date_tmp`");

+			}

+			/****************************************************************************************************************/

+			$tmp = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_log LIKE 'log_timestamp'"));

+

+			if ($tmp['Type'] == "timestamp")

+			{ 

+				$updated = dbassoc(dbquery("SHOW COLUMNS FROM " . TABLEPREFIX . "fanfiction_log LIKE 'log_timestamp_tmp'"));

+				if (!$updated)

+				{

+					dbquery("ALTER TABLE 	`" . TABLEPREFIX . "fanfiction_log` ADD `log_timestamp_tmp` int(10) unsigned NOT NULL default '0' ");

+				}

+

+				dbquery("UPDATE 		`" . TABLEPREFIX . "fanfiction_log` SET `log_timestamp_tmp` = UNIX_TIMESTAMP( `log_timestamp` )");

+				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_log` CHANGE `log_timestamp` `log_timestamp` INT NOT NULL");

+				dbquery("UPDATE `" . TABLEPREFIX . "fanfiction_log` set log_timestamp = log_timestamp_tmp");

+				dbquery("ALTER TABLE `" . TABLEPREFIX . "fanfiction_log` DROP `log_timestamp_tmp`");

+			}