diff --git a/phpgwapi/inc/class.setup_process.inc.php b/phpgwapi/inc/class.setup_process.inc.php index 3f5373c4e8..fe885978a7 100644 --- a/phpgwapi/inc/class.setup_process.inc.php +++ b/phpgwapi/inc/class.setup_process.inc.php @@ -1,17 +1,16 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ + /**************************************************************************\ + * phpGroupWare - Setup * + * http://www.phpgroupware.org * + * -------------------------------------------- * + * This file written by Miles Lott * + * -------------------------------------------- * + * This program is free software; you can redistribute it and/or modify it * + * under the terms of the GNU General Public License as published by the * + * Free Software Foundation; either version 2 of the License, or (at your * + * option) any later version. * + \**************************************************************************/ + /* $Id$ */ /* app status values: U Upgrade required/available @@ -70,7 +69,9 @@ return False; } // Place api first - $pass['phpgwapi'] = $setup_info['phpgwapi']; + $pass['phpgwapi'] = $setup_info['phpgwapi']; + $pass['admin'] = $setup_info['admin']; + $pass['preferences'] = $setup_info['preferences']; @reset($setup_info); $setup_info = $GLOBALS['phpgw_setup']->detection->get_versions($setup_info); @reset($setup_info); diff --git a/setup/index.php b/setup/index.php index 5cfbcb1be3..7792f6e776 100644 --- a/setup/index.php +++ b/setup/index.php @@ -1,15 +1,14 @@ True, - 'nonavbar' => True, - 'currentapp' => 'home', - 'noapi' => True, - 'nocachecontrol' => True + $GLOBALS['phpgw_info']['flags'] = array + ( + 'noheader' => True, + 'nonavbar' => True, + 'currentapp' => 'home', + 'noapi' => True, + 'nocachecontrol' => True ); include('./inc/functions.inc.php'); @@ -32,14 +32,15 @@ $tpl_root = $GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup'); $setup_tpl = CreateObject('setup.Template',$tpl_root); - $setup_tpl->set_file(array( - 'T_head' => 'head.tpl', - 'T_footer' => 'footer.tpl', - 'T_alert_msg' => 'msg_alert_msg.tpl', - 'T_login_main' => 'login_main.tpl', - 'T_login_stage_header' => 'login_stage_header.tpl', - 'T_setup_main' => 'setup_main.tpl', - 'T_setup_db_blocks' => 'setup_db_blocks.tpl' + $setup_tpl->set_file(array + ( + 'T_head' => 'head.tpl', + 'T_footer' => 'footer.tpl', + 'T_alert_msg' => 'msg_alert_msg.tpl', + 'T_login_main' => 'login_main.tpl', + 'T_login_stage_header' => 'login_stage_header.tpl', + 'T_setup_main' => 'setup_main.tpl', + 'T_setup_db_blocks' => 'setup_db_blocks.tpl' )); $setup_tpl->set_block('T_login_stage_header','B_multi_domain','V_multi_domain'); @@ -127,7 +128,7 @@ break; case 'Install': $subtitle = lang('Creating Tables'); - $submsg = lang('At your request, this script is going to attempt to install all the applications for you').'.'; + $submsg = lang('At your request, this script is going to attempt to install the core tables and the admin and preferences applications for you').'.'; $subaction = 'installed'; $GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'new'; $GLOBALS['phpgw_info']['setup']['stage']['db'] = 6; @@ -191,7 +192,7 @@ $setup_tpl->set_var('dbexists',lang('Your database is working, but you dont have any applications installed')); $setup_tpl->set_var('install',lang('Install')); $setup_tpl->set_var('proceed',lang('We can proceed')); - $setup_tpl->set_var('allapps',lang('all applications')); + $setup_tpl->set_var('coreapps',lang('all core tables and the admin and preferences applications')); $setup_tpl->parse('V_db_stage_3','B_db_stage_3'); $db_filled_block = $setup_tpl->get_var('V_db_stage_3'); $setup_tpl->set_var('V_db_filled_block',$db_filled_block); diff --git a/setup/lang/phpgw_en.lang b/setup/lang/phpgw_en.lang index 568d818800..45e89ef020 100644 --- a/setup/lang/phpgw_en.lang +++ b/setup/lang/phpgw_en.lang @@ -13,7 +13,7 @@ admin password to header manager setup en Admin password to header manager admin username setup en Admin username admins setup en Admins after retrieving the file, put it into place as the header.inc.php. then, click "continue". setup en After retrieving the file, put it into place as the header.inc.php. Then, click "continue". -all applications setup en all applications +all core tables and the admin and preferences applications setup en all core tables and the admin and preferences applications all users setup en All Users analysis setup en Analysis app details setup en App details @@ -25,7 +25,7 @@ application name and status information setup en Application Name and Status Inf application title setup en Application Title are you sure? setup en ARE YOU SURE? at your request, this script is going to attempt to create the database and assign the db user rights to it setup en At your request, this script is going to attempt to create the database and assign the db user rights to it -at your request, this script is going to attempt to install all the applications for you setup en At your request, this script is going to attempt to install all the applications for you +at your request, this script is going to attempt to install the core tables and the admin and preferences applications for you setup en At your request, this script is going to attempt to install the core tables and the admin and preferences applications for you. at your request, this script is going to attempt to upgrade your old applications to the current versions setup en At your request, this script is going to attempt to upgrade your old applications to the current versions at your request, this script is going to attempt to upgrade your old tables to the new format setup en At your request, this script is going to attempt to upgrade your old tables to the new format at your request, this script is going to take the evil action of deleting your existing tables and re-creating them in the new format setup en At your request, this script is going to take the evil action of deleting your existing tables and re-creating them in the new format diff --git a/setup/templates/default/setup_db_blocks.tpl b/setup/templates/default/setup_db_blocks.tpl index b80afdf9d1..976e518cc1 100644 --- a/setup/templates/default/setup_db_blocks.tpl +++ b/setup/templates/default/setup_db_blocks.tpl @@ -50,10 +50,10 @@
- + {dbexists}
- {allapps} + {coreapps}