diff --git a/setup/inc/core_setup.inc.php b/setup/inc/core_setup.inc.php index 77a695e223..10f5dab6ae 100644 --- a/setup/inc/core_setup.inc.php +++ b/setup/inc/core_setup.inc.php @@ -31,6 +31,11 @@ @$db->next_record(); $oldversion = $db->f("app_version"); } + + if ($action != "Delete my old tables" && ! isset($oldversion)) { + setup_header(); + echo "
"; + } if (PHP_VERSION < "3.0.16") { echo "You appear to be running an old version of PHP. It its recommend that you upgrade " @@ -173,10 +178,10 @@ break; default: if (isset($oldversion)){ - if ($phpgw_info["server"]["version"] != $oldversion){ - Header("Location: $PHP_SELF?action=regularversion"); - $ok = false; - } + if ($phpgw_info["server"]["version"] != $oldversion){ + Header("Location: $PHP_SELF?action=regularversion"); + $ok = false; + } }else{ @$db->query("select * from config"); if (@$db->num_rows() == 0){ @@ -204,7 +209,7 @@ echo "\n"; }else{ Header("Location: $PHP_SELF?action=prebetaversion"); - $ok = false; + $ok = false; } }else{ echo "\n"; diff --git a/setup/index.php b/setup/index.php index e33c08d7d8..5b55f3d1c6 100644 --- a/setup/index.php +++ b/setup/index.php @@ -56,8 +56,6 @@ $oldversion = $db->f("app_version"); } - - /**********************************************************************\ * First order of business is to upgrade or install the core. * * if $ok is set to false after this include, the setup stops here * @@ -66,8 +64,6 @@ * for applications to inteact with the user, this is how it is. * * * \**********************************************************************/ - setup_header(); - echo "
"; $ok = true; $baseDir = $phpgw_info["server"]["server_root"]; diff --git a/setup/sql/common_default_records.inc.php b/setup/sql/common_default_records.inc.php index 8c57e4bc80..b84c7618b6 100644 --- a/setup/sql/common_default_records.inc.php +++ b/setup/sql/common_default_records.inc.php @@ -97,21 +97,8 @@ }else{ add_default_server_config(); } - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('admin', 'Administration', 1, 1, NULL, '".$currentver."')"); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('tts', 'Trouble Ticket System', 0, 2, NULL, '0.0.0')"); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('inv', 'Inventory', 0, 3, NULL, '0.0.0')"); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('chat', 'Chat', 0, 4, NULL, '0.0.0')"); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('headlines', 'Headlines', 0, 5, 'news_sites,news_headlines', '0.0.0')"); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('filemanager', 'File manager', 1, 6, NULL, '".$currentver."')"); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('addressbook', 'Address Book', 1, 7, 'addressbook', '".$currentver."')"); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('todo', 'ToDo List', 1, 8, 'todo', '".$currentver."')"); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('calendar', 'Calendar', 1, 9, 'webcal_entry,webcal_entry_users,webcal_entry_groups,webcal_repeats', '".$currentver."')"); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('email', 'Email', 1, 10,NULL, '".$currentver."')"); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('nntp', 'NNTP', 1, 11, 'newsgroups', '".$currentver."')"); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('cron_apps', 'cron_apps', 0, 0, NULL, '".$currentver."')"); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('weather', 'Weather', 1, 12, NULL, '".$currentver."')"); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('transy', 'Translation Management', 1, 13, NULL, '".$currentver."')"); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('notes', 'Notes', 1, 13, NULL, '".$phpgw_info["server"]["version"]."')"); + + include($phpgw_info["server"]["server_root"] . "/setup/inc/default_applications.inc.php"); $db->query("insert into groups (group_name) values ('Default')"); $db->query("insert into accounts (account_lid,account_pwd,account_firstname,account_lastname,account_permissions,account_groups,account_status) values ('demo','81dc9bdb52d04dc20036dbd8313ed055','Demo','Account',':admin:email:todo:addressbook:calendar:',',1:0,','A')"); diff --git a/setup/sql/common_main.inc.php b/setup/sql/common_main.inc.php index bc83999dd9..b19c91fd01 100644 --- a/setup/sql/common_main.inc.php +++ b/setup/sql/common_main.inc.php @@ -14,7 +14,7 @@ function update_version_table($tableschanged = True){ global $currentver, $phpgw_info, $db, $tablechanges; if ($tableschanged == True){$tablechanges = True;} - $db->query("update applications set app_version='".$currentver."' where (app_name='admin' or app_name='filemanager' or app_name='addressbook' or app_name='todo' or app_name='calendar' or app_name='email' or app_name='nntp' or app_name='cron_apps')"); + $db->query("update applications set app_version='".$currentver."' where (app_name='admin' or app_name='filemanager' or app_name='addressbook' or app_name='todo' or app_name='calendar' or app_name='email' or app_name='nntp' or app_name='cron_apps' or app_name='notes')"); } if ($currentver == "drop"){ diff --git a/setup/sql/default_applications.inc.php b/setup/sql/default_applications.inc.php new file mode 100644 index 0000000000..ca37f7576b --- /dev/null +++ b/setup/sql/default_applications.inc.php @@ -0,0 +1,30 @@ +query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('admin', 'Administration', 1, 1, NULL, '".$currentver."')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('tts', 'Trouble Ticket System', 0, 2, NULL, '0.0.0')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('inv', 'Inventory', 0, 3, NULL, '0.0.0')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('chat', 'Chat', 0, 4, NULL, '0.0.0')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('headlines', 'Headlines', 0, 5, 'news_sites,news_headlines', '0.0.0')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('filemanager', 'File manager', 1, 6, NULL, '".$currentver."')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('addressbook', 'Address Book', 1, 7, 'addressbook', '".$currentver."')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('todo', 'ToDo List', 1, 8, 'todo', '".$currentver."')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('calendar', 'Calendar', 1, 9, 'webcal_entry,webcal_entry_users,webcal_entry_groups,webcal_repeats', '".$currentver."')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('email', 'Email', 1, 10,NULL, '".$currentver."')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('nntp', 'NNTP', 1, 11, 'newsgroups', '".$currentver."')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('cron_apps', 'cron_apps', 0, 0, NULL, '".$currentver."')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('weather', 'Weather', 1, 12, NULL, '".$currentver."')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('transy', 'Translation Management', 1, 13, NULL, '".$currentver."')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('notes', 'Notes', 1, 14, NULL, '$currentver')"); +?> \ No newline at end of file diff --git a/setup/sql/mysql_newtables.inc.php b/setup/sql/mysql_newtables.inc.php index d2535cb055..0b739b06b1 100644 --- a/setup/sql/mysql_newtables.inc.php +++ b/setup/sql/mysql_newtables.inc.php @@ -280,14 +280,13 @@ $db->query($sql); $sql = "CREATE TABLE notes ( - accountid int(11), - date int(11), - note text, - noteid int(20) auto_increment, - PRIMARY KEY (noteid) - )"; + note_id int(20) NOT NULL auto_increment, + note_owner int(11), + note_date int(11), + note_content text, + PRIMARY KEY (note_id) + )"; $db->query($sql); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('notes', 'Notes', 0, 13, NULL, '".$phpgw_info["server"]["version"]."')"); $currentver = "0.9.3"; update_version_table(); diff --git a/setup/sql/mysql_upgrade_beta.inc.php b/setup/sql/mysql_upgrade_beta.inc.php index 4a07fbf0b1..07d7b13504 100644 --- a/setup/sql/mysql_upgrade_beta.inc.php +++ b/setup/sql/mysql_upgrade_beta.inc.php @@ -313,14 +313,14 @@ } if ($currentver == "0.9.4pre1") { $sql = "CREATE TABLE notes ( - accountid int(11), - date int(11), - note text, - noteid int(20) auto_increment, - PRIMARY KEY (noteid) - )"; + note_id int(20) NOT NULL auto_increment, + note_owner int(11), + note_date int(11), + note_content text, + PRIMARY KEY (note_id) + )"; $db->query($sql); - $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('notes', 'Notes', 1, 13, NULL, '".$phpgw_info["server"]["version"]."')"); + $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('notes', 'Notes', 1, 14, NULL, '".$phpgw_info["server"]["version"]."')"); $currentver = "0.9.4pre2"; update_version_table(); } diff --git a/setup/sql/pgsql_newtables.inc.php b/setup/sql/pgsql_newtables.inc.php index bc04421ea7..a8acf6c630 100644 --- a/setup/sql/pgsql_newtables.inc.php +++ b/setup/sql/pgsql_newtables.inc.php @@ -252,12 +252,11 @@ $db->query($sql); $sql = "CREATE TABLE notes ( - accountid int(11), - date int(11), - note text, - noteid int(20) auto_increment, - PRIMARY KEY (noteid) - )"; + note_id serial, + note_owner int, + note_date int, + note_content text + )"; $db->query($sql); $currentver = "0.9.3"; diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php index 09a7ac6684..4fc7b75bb0 100644 --- a/setup/sql/pgsql_upgrade_beta.inc.php +++ b/setup/sql/pgsql_upgrade_beta.inc.php @@ -314,13 +314,12 @@ update_version_table(); } if ($currentver == "0.9.4pre1") { - $sql = "CREATE TABLE notes ( - accountid int(11), - date int(11), - note text, - noteid int(20) auto_increment, - PRIMARY KEY (noteid) - )"; + $sql = "CREATE TABLE notes ( + note_id serial, + note_owner int, + note_date int, + note_content text + )"; $db->query($sql); $db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('notes', 'Notes', 1, 13, NULL, '".$phpgw_info["server"]["version"]."')"); $currentver = "0.9.4pre2";