mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 16:44:20 +01:00
corrected problem with db updates
This commit is contained in:
parent
6e828646fa
commit
2683bc556c
@ -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"> <font color="fefefe">phpGroupWare version <?php
|
||||
echo $phpgw_info["server"]["versions"]["phpgwapi"]; ?> setup</font>
|
||||
</td>
|
||||
<td align="right" bgcolor="486591">
|
||||
<?php
|
||||
if ($nologoutbutton) {
|
||||
echo " ";
|
||||
} else {
|
||||
echo '<a href="' . $PHP_SELF . '?FormLogout=True" class="link">Logout</a> ';
|
||||
}
|
||||
echo "</td></tr></table>";
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
?>
|
||||
|
@ -27,11 +27,11 @@
|
||||
$phpgw_setup->show_header("Please login",True);
|
||||
$phpgw_setup->login_form();
|
||||
exit;
|
||||
}else{ /* If authentication is sucessful, we load the database. */
|
||||
$phpgw_setup->loaddb();
|
||||
}
|
||||
|
||||
/* Database actions */
|
||||
$phpgw_setup->loaddb();
|
||||
$phpgw_info["setup"]["stage"]["db"] = $phpgw_setup->check_db();
|
||||
switch($action){
|
||||
case "Delete all my tables and data":
|
||||
$subtitle = "Deleting Tables";
|
||||
@ -69,7 +69,6 @@
|
||||
|
||||
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"> </td></tr>';
|
||||
$phpgw_info["setup"]["stage"]["db"] = $phpgw_setup->check_db();
|
||||
switch($phpgw_info["setup"]["stage"]["db"]){
|
||||
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>';
|
||||
|
@ -91,7 +91,7 @@
|
||||
|
||||
} else {
|
||||
if (! $included) {
|
||||
$phpgw_setup->setup_header();
|
||||
$phpgw_setup->show_header();
|
||||
?>
|
||||
<p><table border="0" align="center" width="<?php echo ($newinstall?"60%":"80%"); ?>">
|
||||
<tr bgcolor="486591">
|
||||
|
@ -108,7 +108,7 @@
|
||||
|
||||
// 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) {
|
||||
echo "<br><center><b>Error:</b> $error</center>";
|
||||
|
Loading…
Reference in New Issue
Block a user