mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-12 08:58:30 +01:00
its mostly working now, will continue tonight
This commit is contained in:
parent
22feaafc29
commit
90771fc094
@ -17,7 +17,7 @@
|
||||
|
||||
// Authorize the user to use setup app and load the database
|
||||
// Does not return unless user is authorized
|
||||
if (!$phpgw_setup->auth()){
|
||||
if (!$phpgw_setup->auth("Config")){
|
||||
Header("Location: index.php");
|
||||
exit;
|
||||
}
|
||||
|
@ -54,8 +54,8 @@
|
||||
echo " <tr bgcolor=\"e6e6e6\">\n";
|
||||
echo " <td><form action='index.php' method='POST'>\n";
|
||||
if (count($phpgw_domain) > 1){
|
||||
echo " <table><tr><td>Domain: </td><td><input type='text' name='FormDomain' value='phpgroupware.org'></td></tr>\n";
|
||||
echo " <tr><td>Password: </td><td><input type='password' name='FormPW' value='changeme'></td></tr></table>\n";
|
||||
echo " <table><tr><td>Domain: </td><td><input type='text' name='FormDomain' value=''></td></tr>\n";
|
||||
echo " <tr><td>Password: </td><td><input type='password' name='FormPW' value=''></td></tr></table>\n";
|
||||
}else{
|
||||
reset($phpgw_domain);
|
||||
$default_domain = each($phpgw_domain);
|
||||
@ -73,7 +73,7 @@
|
||||
echo " <tr bgcolor='#e6e6e6'><td colspan='2'><font color='#ff0000'>".$phpgw_info["setup"]["HeaderLoginMSG"]."</font></td></tr>\n";
|
||||
echo " <tr bgcolor=\"e6e6e6\">\n";
|
||||
echo " <td><form action='manageheader.php' method='POST'>\n";
|
||||
echo " <input type='password' name='FormPW' value='changethis'>\n";
|
||||
echo " <input type='password' name='FormPW' value=''>\n";
|
||||
echo " <input type='submit' name='HeaderLogin' value='Login'>\n";
|
||||
echo " </form></td>\n";
|
||||
echo " </tr>\n";
|
||||
@ -243,11 +243,11 @@
|
||||
$this->db->next_record();
|
||||
$configed = $this->db->f("config_value");
|
||||
if ($configed){
|
||||
$phpgw_info["setup"]["header_msg"] = "Stage 3 (Configuration OK)";
|
||||
return 10;
|
||||
}else{
|
||||
$phpgw_info["setup"]["header_msg"] = "Stage 3 (Needs Configuration)";
|
||||
return 1;
|
||||
}else{
|
||||
$phpgw_info["setup"]["header_msg"] = "Stage 3 (Configuration OK)";
|
||||
return 10;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -29,6 +29,9 @@
|
||||
$phpgw_info["setup"]["stage"]["db"] = $phpgw_setup->check_db();
|
||||
$phpgw_info["setup"]["stage"]["config"] = $phpgw_setup->check_config();
|
||||
}
|
||||
}else{
|
||||
Header("Location: manageheader.php");
|
||||
exit;
|
||||
}
|
||||
|
||||
switch($action){
|
||||
@ -84,7 +87,9 @@
|
||||
$phpgw_info["server"]["app_images"] = "templates/default/images";
|
||||
|
||||
echo '<table border="1" width="100%" cellspacing="0" cellpadding="2">';
|
||||
echo ' <tr><td align="left" WIDTH="20%" bgcolor="486591"><font color="fefefe">Step 1 - header.inc.php</td><td align="right" bgcolor="486591"> </td></tr>';
|
||||
|
||||
/*
|
||||
echo ' <tr><td align="left" WIDTH="20%" bgcolor="486591"><font color="fefefe">Step 0 - header.inc.php</td><td align="right" bgcolor="486591"> </td></tr>';
|
||||
if ($phpgw_info["setup"]["stage"]["header"] <= 1) {
|
||||
echo '<tr><td align="center"><img src="'.$phpgw_info["server"]["app_images"].'/incomplete.gif" alt="O" border="0"></td><td><form action="./manageheader.php" method=post>You have not created your header.inc.php yet.<br> <input type=submit value="Create one now"></form></td></tr>';
|
||||
}elseif ($phpgw_info["setup"]["stage"]["header"] == 2 || $phpgw_info["setup"]["stage"] == 3) {
|
||||
@ -93,7 +98,8 @@
|
||||
echo '<tr><td align="center"><img src="'.$phpgw_info["server"]["app_images"].'/completed.gif" alt="X" border="0"></td><td><form action="./manageheader.php" method=post>
|
||||
Your header.inc.php is in place and current.<br> <input type=submit value="Edit existing header.inc.php"></form></td></tr>';
|
||||
}
|
||||
echo ' <tr><td align="left" bgcolor="486591"><font color="fefefe">Step 2 - database management</td><td align="right" bgcolor="486591"> </td></tr>';
|
||||
*/
|
||||
echo ' <tr><td align="left" bgcolor="486591"><font color="fefefe">Step 1 - database management</td><td align="right" bgcolor="486591"> </td></tr>';
|
||||
if ($phpgw_info["setup"]["stage"]["header"] < 10) {
|
||||
echo '<tr><td align="center"><img src="'.$phpgw_info["server"]["app_images"].'/incomplete.gif" alt="O" border="0"></td><td>Not ready for this stage yet.</td></tr>';
|
||||
}elseif ($phpgw_info["setup"]["stage"]["db"] <= 1) {
|
||||
@ -185,7 +191,7 @@
|
||||
echo '</form>';
|
||||
echo '</td></tr>';
|
||||
}
|
||||
echo ' <tr><td align="left" bgcolor="486591"><font color="fefefe">Step 3 - Configuration</td><td align="right" bgcolor="486591"> </td></tr>';
|
||||
echo ' <tr><td align="left" bgcolor="486591"><font color="fefefe">Step 2 - Configuration</td><td align="right" bgcolor="486591"> </td></tr>';
|
||||
if ($phpgw_info["setup"]["stage"]["db"] < 10) {
|
||||
echo '<tr><td align="center"><img src="'.$phpgw_info["server"]["app_images"].'/incomplete.gif" alt="O" border="0"></td><td>Not ready for this stage yet.</td></tr>';
|
||||
}elseif ($phpgw_info["setup"]["stage"]["config"] <= 1) {
|
||||
@ -197,7 +203,7 @@
|
||||
echo "<form method=\"POST\" action=\"config.php\"><input type=\"submit\" value=\"Edit Current Configuration\"></form>";
|
||||
echo '</td></tr>';
|
||||
}
|
||||
echo ' <tr><td align="left" bgcolor="486591"><font color="fefefe">Step 4 - language management</td><td align="right" bgcolor="486591"> </td></tr>';
|
||||
echo ' <tr><td align="left" bgcolor="486591"><font color="fefefe">Step 3 - language management</td><td align="right" bgcolor="486591"> </td></tr>';
|
||||
if ($phpgw_info["setup"]["stage"]["config"] < 10) {
|
||||
echo '<tr><td align="center"><img src="'.$phpgw_info["server"]["app_images"].'/incomplete.gif" alt="O" border="0"></td><td>Not ready for this stage yet.</td></tr>';
|
||||
}elseif ($phpgw_info["setup"]["stage"]["lang"] <= 1) {
|
||||
@ -205,7 +211,7 @@
|
||||
}elseif ($phpgw_info["setup"]["stage"]["lang"] == 10) {
|
||||
echo '<tr><td align="center"><img src="'.$phpgw_info["server"]["app_images"].'/completed.gif" alt="O" border="0"></td><td>This stage is completed<br></td></tr>';
|
||||
}
|
||||
echo ' <tr><td align="left" bgcolor="486591"><font color="fefefe">Step 5 - Add-on Application Installation</td><td align="right" bgcolor="486591"> </td></tr>';
|
||||
echo ' <tr><td align="left" bgcolor="486591"><font color="fefefe">Step 4 - Add-on Application Installation</td><td align="right" bgcolor="486591"> </td></tr>';
|
||||
if ($phpgw_info["setup"]["stage"]["lang"] < 10) {
|
||||
echo '<tr><td align="center"><img src="'.$phpgw_info["server"]["app_images"].'/incomplete.gif" alt="O" border="0"></td><td>Not ready for this stage yet.</td></tr>';
|
||||
}elseif ($phpgw_info["setup"]["stage"]["apps"] <= 1) {
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
// Authorize the user to use setup app and load the database
|
||||
// Does not return unless user is authorized
|
||||
if (!auth()){
|
||||
if (!$phpgw_setup->auth("Config")){
|
||||
Header("Location: index.php");
|
||||
exit;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user