extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

update to install admin/prefs/api at once during new install

Browse Source
This commit is contained in:
ceb 2002-12-19 23:33:44 +00:00
parent 06a871dd7c
commit a7adc68829
4 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
phpgwapi/inc/class.setup_process.inc.php
View File

@ -1,17 +1,16 @@
<?php
/**************************************************************************\
* phpGroupWare - Setup *
* http://www.phpgroupware.org *
* -------------------------------------------- *
* This file written by Miles Lott<milosch@phpgroupware.org> *
* -------------------------------------------- *
* 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<milosch@phpgroupware.org> *
* -------------------------------------------- *
* 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);

55
setup/index.php
View File

@ -1,15 +1,14 @@
<?php
/**************************************************************************\
* phpGroupWare *
* http://www.phpgroupware.org *
* -------------------------------------------- *
* 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 *
* http://www.phpgroupware.org *
* -------------------------------------------- *
* 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$ */
/*
Idea: This is so I don't forget. When they are performing a new install, after config,
@ -19,12 +18,13 @@
$GLOBALS['DEBUG'] = False;
$GLOBALS['phpgw_info'] = array();
$GLOBALS['phpgw_info']['flags'] = array(
'noheader' => 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);

4
setup/lang/phpgw_en.lang
View File

@ -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

4
setup/templates/default/setup_db_blocks.tpl
View File

@ -50,10 +50,10 @@
<td>
<form action="index.php" method="post">
<input type="hidden" name="oldversion" value="new">
{dbexists}<br>
<input type="hidden" name="action" value="Install">
<input type="submit" name="label" value="{install}"> {allapps}
<input type="submit" name="label" value="{install}"> {coreapps}
</form>
</td>
</tr>