diff --git a/setup/index.php b/setup/index.php index 529b788237..35dc3f51a5 100644 --- a/setup/index.php +++ b/setup/index.php @@ -18,7 +18,7 @@ $phpgw_info["server"]["api_dir"] = $phpgw_info["server"]["include_root"]."/phpgwapi"; // Authorize the user to use setup app - include("inc/setup_auth.inc.php"); + include("./inc/setup_auth.inc.php"); // Does not return unless user is authorized /* Database setup */ @@ -64,7 +64,7 @@ \**********************************************************************/ $ok = true; $baseDir = $phpgw_info["server"]["server_root"]; - include("inc/core_setup.inc.php"); + include("./inc/core_setup.inc.php"); if (!$ok) { exit; } else { diff --git a/setup/sql/common_main.inc.php b/setup/sql/common_main.inc.php index 1448da04e2..ba17174a1d 100644 --- a/setup/sql/common_main.inc.php +++ b/setup/sql/common_main.inc.php @@ -18,13 +18,13 @@ } if ($currentver == "drop"){ - include("sql/".$phpgw_info["server"]["db_type"]."_droptables.inc.php"); + include("./sql/".$phpgw_info["server"]["db_type"]."_droptables.inc.php"); $currentver = "new"; } if ($currentver == "new") { - include("sql/".$phpgw_info["server"]["db_type"]."_newtables.inc.php"); - include("sql/common_default_records.inc.php"); - include("sql/common_lang_records.inc.php"); + include("./sql/".$phpgw_info["server"]["db_type"]."_newtables.inc.php"); + include("./sql/common_default_records.inc.php"); + include("./sql/common_lang_records.inc.php"); } echo "\n"; echo " \n"; @@ -32,10 +32,10 @@ echo " \n"; if ($currentver == "7122000" || $currentver == "8032000" || $currentver == "8072000" || $currentver == "8212000" || $currentver == "9052000" || $currentver == "9072000") { - include("sql/".$phpgw_info["server"]["db_type"]."_upgrade_prebeta.inc.php"); + include("./sql/".$phpgw_info["server"]["db_type"]."_upgrade_prebeta.inc.php"); } - include("sql/".$phpgw_info["server"]["db_type"]."_upgrade_beta.inc.php"); + include("./sql/".$phpgw_info["server"]["db_type"]."_upgrade_beta.inc.php"); if (!$tablechanges == True){ echo " \n"; diff --git a/setup/sql/mysql_newtables.inc.php b/setup/sql/mysql_newtables.inc.php index 760dd17764..31f59ace9e 100644 --- a/setup/sql/mysql_newtables.inc.php +++ b/setup/sql/mysql_newtables.inc.php @@ -216,6 +216,42 @@ )"; $db->query($sql); + $sql = "CREATE TABLE news_msg ( + con int(11) NOT NULL, + msg int(11) NOT NULL, + uid varchar(255) DEFAULT '', + udate int(11) DEFAULT 0, + path varchar(255) DEFAULT '', + fromadd varchar(255) DEFAULT '', + toadd varchar(255) DEFAULT '', + ccadd varchar(255) DEFAULT '', + bccadd varchar(255) DEFAULT '', + reply_to varchar(255) DEFAULT '', + sender varchar(255) DEFAULT '', + return_path varchar(255) DEFAULT '', + subject varchar(255) DEFAULT '', + message_id varchar(255) DEFAULT '', + reference varchar(255) DEFAULT '', + in_reply_to varchar(255) DEFAULT '', + follow_up_to varchar(255) DEFAULT '', + nntp_posting_host varchar(255) DEFAULT '', + nntp_posting_date varchar(255) DEFAULT '', + x_complaints_to varchar(255) DEFAULT '', + x_trace varchar(255) DEFAULT '', + x_abuse_info varchar(255) DEFAULT '', + x_mailer varchar(255) DEFAULT '', + organization varchar(255) DEFAULT '', + content_type varchar(255) DEFAULT '', + content_description varchar(255) DEFAULT '', + content_transfer_encoding varchar(255) DEFAULT '', + mime_version varchar(255) DEFAULT '', + msgsize int(11) DEFAULT 0, + msglines int(11) DEFAULT 0, + body longtext NOT NULL, + primary key(con,msg) + )"; + $db->query($sql); + $sql = "CREATE TABLE lang ( message_id varchar(150) DEFAULT '' NOT NULL, app_name varchar(100) DEFAULT 'common' NOT NULL, @@ -245,4 +281,4 @@ $currentver = "0.9.3pre8"; update_version_table(); -?> \ No newline at end of file +?> diff --git a/setup/sql/pgsql_newtables.inc.php b/setup/sql/pgsql_newtables.inc.php index a28fae0b69..a8d4ab3282 100644 --- a/setup/sql/pgsql_newtables.inc.php +++ b/setup/sql/pgsql_newtables.inc.php @@ -190,6 +190,42 @@ )"; $db->query($sql); + $sql = "CREATE TABLE news_msg ( + con int NOT NULL, + msg int NOT NULL, + uid varchar(255) DEFAULT '', + udate int DEFAULT 0, + path varchar(255) DEFAULT '', + fromadd varchar(255) DEFAULT '', + toadd varchar(255) DEFAULT '', + ccadd varchar(255) DEFAULT '', + bccadd varchar(255) DEFAULT '', + reply_to varchar(255) DEFAULT '', + sender varchar(255) DEFAULT '', + return_path varchar(255) DEFAULT '', + subject varchar(255) DEFAULT '', + message_id varchar(255) DEFAULT '', + reference varchar(255) DEFAULT '', + in_reply_to varchar(255) DEFAULT '', + follow_up_to varchar(255) DEFAULT '', + nntp_posting_host varchar(255) DEFAULT '', + nntp_posting_date varchar(255) DEFAULT '', + x_complaints_to varchar(255) DEFAULT '', + x_trace varchar(255) DEFAULT '', + x_abuse_info varchar(255) DEFAULT '', + x_mailer varchar(255) DEFAULT '', + organization varchar(255) DEFAULT '', + content_type varchar(255) DEFAULT '', + content_description varchar(255) DEFAULT '', + content_transfer_encoding varchar(255) DEFAULT '', + mime_version varchar(255) DEFAULT '', + msgsize int(11) DEFAULT 0, + msglines int(11) DEFAULT 0, + body text NOT NULL, + unique(con,msg) + )"; + $db->query($sql); + $sql = "CREATE TABLE lang ( message_id varchar(150) DEFAULT '' NOT NULL, app_name varchar(100) DEFAULT 'common' NOT NULL, @@ -219,4 +255,4 @@ $currentver = "0.9.3pre8"; update_version_table(); -?> \ No newline at end of file +?> diff --git a/setup/upgradetables_mysql.inc.php b/setup/upgradetables_mysql.inc.php index 9b626d7a84..34e938f4cd 100644 --- a/setup/upgradetables_mysql.inc.php +++ b/setup/upgradetables_mysql.inc.php @@ -259,7 +259,7 @@ global $currentver, $phpgw_info, $db; // The 0.9.3pre1 is only temp until release - if ($currentver == "0.9.2" || $currentver == "0.9.3pre1" || $currentver == "0.9.3pre2" || $currentver == "0.9.3pre3" || $currentver == "0.9.3pre4" || $currentver == "0.9.3pre5" || $currentver == "0.9.3pre6") { + if ($currentver == "0.9.2" || $currentver == "0.9.3pre1" || $currentver == "0.9.3pre2" || $currentver == "0.9.3pre3" || $currentver == "0.9.3pre4" || $currentver == "0.9.3pre5" || $currentver == "0.9.3pre6" || $currentver == "0.9.3pre7" || $currentver = "0.9.3pre8") { if ($currentver == "0.9.2" || $currentver == "0.9.3pre1") { v0_9_2to0_9_3update_owner("addressbook","ab_owner"); v0_9_2to0_9_3update_owner("todo","todo_owner"); @@ -327,6 +327,45 @@ update_version_table(); } + if ($currentver == "0.9.3pre9") { + $sql = "CREATE TABLE news_msg ( + con int(11) NOT NULL, + msg int(11) NOT NULL, + uid varchar(255) DEFAULT '', + udate int(11) DEFAULT 0, + path varchar(255) DEFAULT '', + fromadd varchar(255) DEFAULT '', + toadd varchar(255) DEFAULT '', + ccadd varchar(255) DEFAULT '', + bccadd varchar(255) DEFAULT '', + reply_to varchar(255) DEFAULT '', + sender varchar(255) DEFAULT '', + return_path varchar(255) DEFAULT '', + subject varchar(255) DEFAULT '', + message_id varchar(255) DEFAULT '', + reference varchar(255) DEFAULT '', + in_reply_to varchar(255) DEFAULT '', + follow_up_to varchar(255) DEFAULT '', + nntp_posting_host varchar(255) DEFAULT '', + nntp_posting_date varchar(255) DEFAULT '', + x_complaints_to varchar(255) DEFAULT '', + x_trace varchar(255) DEFAULT '', + x_abuse_info varchar(255) DEFAULT '', + x_mailer varchar(255) DEFAULT '', + organization varchar(255) DEFAULT '', + content_type varchar(255) DEFAULT '', + content_description varchar(255) DEFAULT '', + content_transfer_encoding varchar(255) DEFAULT '', + mime_version varchar(255) DEFAULT '', + msgsize int(11) DEFAULT 0, + msglines int(11) DEFAULT 0, + body longtext NOT NULL, + primary key(con,msg) + )"; + $db->query($sql); + $currentver = "0.9.3pre10"; + update_version_table(); + } echo " \n"; echo " \n"; echo " \n"; diff --git a/setup/upgradetables_pgsql.inc.php b/setup/upgradetables_pgsql.inc.php index 2aec71359a..081ecf490f 100644 --- a/setup/upgradetables_pgsql.inc.php +++ b/setup/upgradetables_pgsql.inc.php @@ -251,7 +251,7 @@ $didupgrade = True; // The 0.9.3pre1 is only temp until release - if ($currentver == "0.9.2" || $currentver == "0.9.3pre1" || $currentver == "0.9.3pre2" || $currentver == "0.9.3pre3" || $currentver == "0.9.3pre4" || $currentver == "0.9.3pre5" || $currentver == "0.9.3pre6") { + if ($currentver == "0.9.2" || $currentver == "0.9.3pre1" || $currentver == "0.9.3pre2" || $currentver == "0.9.3pre3" || $currentver == "0.9.3pre4" || $currentver == "0.9.3pre5" || $currentver == "0.9.3pre6" || $currentver == "0.9.3pre7") { if ($currentver == "0.9.2" || $currentver == "0.9.3pre1") { update_owner("addressbook","ab_owner"); update_owner("todo","todo_owner"); @@ -316,6 +316,46 @@ $currentver = "0.9.3pre9"; update_version_table(); } + + if ($currentver == "0.9.3pre9") { + $sql = "CREATE TABLE news_msg ( + con int(11) NOT NULL, + msg int(11) NOT NULL, + uid varchar(255) DEFAULT '', + udate int(11) DEFAULT 0, + path varchar(255) DEFAULT '', + fromadd varchar(255) DEFAULT '', + toadd varchar(255) DEFAULT '', + ccadd varchar(255) DEFAULT '', + bccadd varchar(255) DEFAULT '', + reply_to varchar(255) DEFAULT '', + sender varchar(255) DEFAULT '', + return_path varchar(255) DEFAULT '', + subject varchar(255) DEFAULT '', + message_id varchar(255) DEFAULT '', + reference varchar(255) DEFAULT '', + in_reply_to varchar(255) DEFAULT '', + follow_up_to varchar(255) DEFAULT '', + nntp_posting_host varchar(255) DEFAULT '', + nntp_posting_date varchar(255) DEFAULT '', + x_complaints_to varchar(255) DEFAULT '', + x_trace varchar(255) DEFAULT '', + x_abuse_info varchar(255) DEFAULT '', + x_mailer varchar(255) DEFAULT '', + organization varchar(255) DEFAULT '', + content_type varchar(255) DEFAULT '', + content_description varchar(255) DEFAULT '', + content_transfer_encoding varchar(255) DEFAULT '', + mime_version varchar(255) DEFAULT '', + msgsize int(11) DEFAULT 0, + msglines int(11) DEFAULT 0, + body text NOT NULL, + primary key(con,msg) + )"; + $db->query($sql); + $currentver = "0.9.3pre10"; + update_version_table(); + } echo " \n"; echo " \n"; diff --git a/version.inc.php b/version.inc.php index 6344cd65ca..870654fb4d 100644 --- a/version.inc.php +++ b/version.inc.php @@ -1 +1 @@ - +
Upgrade from 0.9.2 to $currentver is completed.
Upgrade from 0.9.2 to $currentver is completed.