holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

corrected problem with db updates

Browse Source
This commit is contained in:
seek3r 2001-01-01 10:36:58 +00:00
parent 6e828646fa
commit 2683bc556c
4 changed files with 4 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
setup/inc/phpgw_setup.inc.php
View File

@ -313,45 +313,5 @@
} }
*/ */
} }
function setup_header($title = "",$nologoutbutton = False) {
global $phpgw_info, $PHP_SELF;
// Ok, so it isn't the greatest idea, but it works for now. Setup needs to be rewritten.
if ($phpgw_info["setup"]["dontshowtheheaderagain"]) {
return False;
}
$phpgw_info["setup"]["dontshowtheheaderagain"] = True;
?>
<head>
<title>phpGroupWare setup <?php echo $title; ?></title>
<style type="text/css">
<!--
.link
{
color: #FFFFFF;
}
-->
</style>
</head>
<BODY BGCOLOR="FFFFFF" margintop="0" marginleft="0" marginright="0" marginbottom="0">
<table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
<td align="left" bgcolor="486591">&nbsp;<font color="fefefe">phpGroupWare version <?php
echo $phpgw_info["server"]["versions"]["phpgwapi"]; ?> setup</font>
</td>
<td align="right" bgcolor="486591">
<?php
if ($nologoutbutton) {
echo "&nbsp;";
} else {
echo '<a href="' . $PHP_SELF . '?FormLogout=True" class="link">Logout</a>&nbsp;';
}
echo "</td></tr></table>";
}
} }
?> ?>

5
setup/index.php
View File

@ -27,11 +27,11 @@
$phpgw_setup->show_header("Please login",True); $phpgw_setup->show_header("Please login",True);
$phpgw_setup->login_form(); $phpgw_setup->login_form();
exit; exit;
}else{ /* If authentication is sucessful, we load the database. */
$phpgw_setup->loaddb();
} }
/* Database actions */ /* Database actions */
$phpgw_setup->loaddb();
$phpgw_info["setup"]["stage"]["db"] = $phpgw_setup->check_db();
switch($action){ switch($action){
case "Delete all my tables and data": case "Delete all my tables and data":
$subtitle = "Deleting Tables"; $subtitle = "Deleting Tables";
@ -69,7 +69,6 @@
echo "<table border=\"1\" width=\"100%\" cellspacing=\"0\" cellpadding=\"2\">"; echo "<table border=\"1\" width=\"100%\" cellspacing=\"0\" cellpadding=\"2\">";
echo ' <tr><td align="left" bgcolor="486591"><font color="fefefe">Step 1 - database management</td><td align="right" bgcolor="486591">&nbsp;</td></tr>'; echo ' <tr><td align="left" bgcolor="486591"><font color="fefefe">Step 1 - database management</td><td align="right" bgcolor="486591">&nbsp;</td></tr>';
$phpgw_info["setup"]["stage"]["db"] = $phpgw_setup->check_db();
switch($phpgw_info["setup"]["stage"]["db"]){ switch($phpgw_info["setup"]["stage"]["db"]){
case 1: case 1:
echo '<tr><td align="center"><img src="'.$phpgw_info["server"]["app_images"].'/incomplete.gif" alt="O" border="0"></td><td><form action="index.php" method=post>Your database does not exist.<br> <input type=submit value="Create one now"></form></td></tr>'; echo '<tr><td align="center"><img src="'.$phpgw_info["server"]["app_images"].'/incomplete.gif" alt="O" border="0"></td><td><form action="index.php" method=post>Your database does not exist.<br> <input type=submit value="Create one now"></form></td></tr>';

2
setup/lang.php
View File

@ -91,7 +91,7 @@
} else { } else {
if (! $included) { if (! $included) {
$phpgw_setup->setup_header(); $phpgw_setup->show_header();
?> ?>
<p><table border="0" align="center" width="<?php echo ($newinstall?"60%":"80%"); ?>"> <p><table border="0" align="center" width="<?php echo ($newinstall?"60%":"80%"); ?>">
<tr bgcolor="486591"> <tr bgcolor="486591">

2
setup/ldap.php
View File

@ -108,7 +108,7 @@
// Add a check to see if there is no users in LDAP, if not create a default user. // Add a check to see if there is no users in LDAP, if not create a default user.
$phpgw_setup->setup_header(); $phpgw_setup->show_header();
if ($error) { if ($error) {
echo "<br><center><b>Error:</b> $error</center>"; echo "<br><center><b>Error:</b> $error</center>";