Fix settings table column creation oversight with SMTP updates; also general consistency changes
Fix settings table column creation oversight with SMTP updates; also general consistency changes

--- a/docs/settingstable.sql
+++ b/docs/settingstable.sql
@@ -54,9 +54,10 @@
   `disablepopups` tinyint(1) NOT NULL default '0',
   `agestatement` tinyint(1) NOT NULL default '0',
   `words` text,
-  `version` varchar(10) NOT NULL default '3.3',
+  `version` varchar(10) NOT NULL default '3.5.9',
   `smtp_host` varchar(200) default NULL,
   `smtp_username` varchar(50) default NULL,
   `smtp_password` varchar(50) default NULL,
   PRIMARY KEY  (`sitekey`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+

--- a/docs/tables.sql
+++ b/docs/tables.sql
@@ -540,10 +540,12 @@
   `disablepopups` tinyint(1) NOT NULL default '0',
   `agestatement` tinyint(1) NOT NULL default '0',
   `words` text,
-  `version` varchar(10) NOT NULL default '3.0',
+  `version` varchar(10) NOT NULL default '3.5.9',
   `smtp_host` varchar(200) default NULL,
   `smtp_username` varchar(50) default NULL,
   `smtp_password` varchar(50) default NULL,
+  `smtp_port` varchar(5) NOT NULL default '',
+  `smtp_secure` varchar(3) NOT NULL default '',
   `anonchallenges` tinyint(1) NOT NULL default '0',
   `anonrecs` tinyint(1) NOT NULL default '0',
   `rectarget` tinyint(1) NOT NULL default '0',

--- a/install/install.php
+++ b/install/install.php
@@ -879,7 +879,9 @@
 				$smtp_host = $_POST['newsmtp_host'];
 				$smtp_username = $_POST['newsmtp_username'];
 				$smtp_password = $_POST['newsmtp_password'];
-				$result = dbquery("UPDATE " . $settingsprefix . "fanfiction_settings SET smtp_host = '$smtp_host', smtp_username = '$smtp_username', smtp_password = '$smtp_password' WHERE sitekey = '" . SITEKEY . "'");
+				$smtp_port = $_POST['newsmtp_port'];
+				$smtp_secure = $_POST['newsmtp_secure'];
+				$result = dbquery("UPDATE " . $settingsprefix . "fanfiction_settings SET smtp_host = '$smtp_host', smtp_username = '$smtp_username', smtp_password = '$smtp_password', smtp_port = '$smtp_port', smtp_secure = '$smtp_secure' WHERE sitekey = '" . SITEKEY . "'");
 				if ($result)
 				{
 					$output .= write_message(_ACTIONSUCCESSFUL);
@@ -952,6 +954,8 @@
   `smtp_host` varchar(200) default NULL,
   `smtp_username` varchar(50) default NULL,
   `smtp_password` varchar(50) default NULL,
+  `smtp_port` varchar(5) NOT NULL default '',
+  `smtp_secure` varchar(3) NOT NULL default '',
   PRIMARY KEY  (`sitekey`)
 ) ENGINE=MyISAM;");
 					if ($settings) $output .= write_message("<img src=\"../images/check.gif\"> " . _SETTINGSTABLESUCCESS . " <br /><a href='install.php?step=2'>" . _CONTINUE . "</a>");