extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-24 15:49:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

- added check for odbc extension (used by MaxDB) to check_install

Browse Source 
- not offering to create the DB, if we dont support it for that DB
This commit is contained in:
Ralf Becker 2004-08-14 15:02:24 +00:00
parent f085648705
commit 8a1dacc95f
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
setup/check_install.php
View File

@ -62,15 +62,6 @@
lang('*** You have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get eGW fully working !!!')."\n".
lang('*** Do NOT update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your DB in an unrecoverable state (your data is lost) !!!')
),
/* not longer needed, as it gets set now on runtime (works even with safe_mode)
'error_reporting' => array(
'func' => 'php_ini_check',
'value' => E_NOTICE,
'verbose_value' => 'E_NOTICE',
'check' => 'not set',
'safe_mode' => 'error_reporting = E_ALL & ~E_NOTICE'
),
*/
'magic_quotes_runtime' => array(
'func' => 'php_ini_check',
'value' => 0,
@ -117,6 +108,10 @@
'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','mssql','MsSQL'),
'win_only' => True
),
'odbc' => array(
'func' => 'extension_check',
'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','odbc','MaxDB')
),
'mbstring' => array(
'func' => 'extension_check',
'warning' => lang('The mbstring extension is needed to fully support unicode (utf-8) or other multibyte-charsets.')

6
setup/index.php
View File

@ -41,6 +41,7 @@
$setup_tpl->set_block('T_login_stage_header','B_single_domain','V_single_domain');
$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_1','V_db_stage_1');
$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_1a','V_db_stage_1a');
$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_2','V_db_stage_2');
$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_3','V_db_stage_3');
$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_4','V_db_stage_4');
@ -182,6 +183,7 @@
. "<br><i>mysql> create database $info[db_name];</i>"
. "<br><i>mysql> grant all on " . $info['db_name']
. ".* to " . $info['db_user'] . "@localhost identified by '" . $info['db_pass'] . "';</i>");
$setup_tpl->parse('V_db_stage_1','B_db_stage_1');
break;
case 'pgsql':
$setup_tpl->set_var('instr',
@ -190,11 +192,11 @@
. "<br><i>[user@server user]# postmaster -i -D /home/[username]/[dataDir]</i><br>"
. lang('Create the empty database -')
. "<br><i>[user@server user]# createdb " . $info['db_name'] . "</i>");
$setup_tpl->parse('V_db_stage_1','B_db_stage_1');
break;
default:
$setup_tpl->set_var('instr','');
$setup_tpl->parse('V_db_stage_1','B_db_stage_1a');
}
$setup_tpl->parse('V_db_stage_1','B_db_stage_1');
$db_filled_block = $setup_tpl->get_var('V_db_stage_1');
$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
break;

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

@ -8,12 +8,12 @@
<img src="{img_incomplete}" alt="{notcomplete}" border="0">
</td>
<td>
{dbnotexist}<br>
{dbnotexist}<br>
{makesure}.<br>
<br>
{instr}<p>
<form action="index.php" method="post">
{createdb}<br>
{createdb}<br>
DB root username: <input type="text" name="db_root" value="root"><br>
DB root password: <input type="password" name="db_pass"><br>
<input type="hidden" name="action" value="Create Database">
@ -26,6 +26,21 @@
</tr>
<!-- END B_db_stage_1 -->
<!-- BEGIN B_db_stage_1a -->
<tr>
<td align="center">
<img src="{img_incomplete}" alt="{notcomplete}" border="0">
</td>
<td>
{dbnotexist}<p>
{makesure}.
<form method="POST" action="index.php">
<input type="submit" value="Re-Check my database">
</form><br>
</td>
</tr>
<!-- END B_db_stage_1a -->
&nbsp; <!-- ================================== --> &nbsp;
<!-- BEGIN B_db_stage_2 -->