From 90771fc0946ef04afc8682deac5f5eafe62cd251 Mon Sep 17 00:00:00 2001 From: seek3r Date: Wed, 27 Dec 2000 22:04:44 +0000 Subject: [PATCH] its mostly working now, will continue tonight --- setup/config.php | 2 +- setup/inc/phpgw_setup.inc.php | 12 ++++++------ setup/index.php | 16 +++++++++++----- setup/setup_demo.php | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/setup/config.php b/setup/config.php index 1ff2258279..7f3d32dcf3 100644 --- a/setup/config.php +++ b/setup/config.php @@ -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; } diff --git a/setup/inc/phpgw_setup.inc.php b/setup/inc/phpgw_setup.inc.php index 5a7cc0f1cc..872e7c24c3 100644 --- a/setup/inc/phpgw_setup.inc.php +++ b/setup/inc/phpgw_setup.inc.php @@ -54,8 +54,8 @@ echo " \n"; echo "
\n"; if (count($phpgw_domain) > 1){ - echo " \n"; - echo "
Domain:
Password:
\n"; + echo " \n"; + echo "
Domain:
Password:
\n"; }else{ reset($phpgw_domain); $default_domain = each($phpgw_domain); @@ -73,7 +73,7 @@ echo " ".$phpgw_info["setup"]["HeaderLoginMSG"]."\n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo "
\n"; echo " \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; } } } diff --git a/setup/index.php b/setup/index.php index f777a409f4..3044814479 100644 --- a/setup/index.php +++ b/setup/index.php @@ -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 ''; - echo ' '; + +/* + echo ' '; if ($phpgw_info["setup"]["stage"]["header"] <= 1) { echo ''; }elseif ($phpgw_info["setup"]["stage"]["header"] == 2 || $phpgw_info["setup"]["stage"] == 3) { @@ -93,7 +98,8 @@ echo ''; } - echo ' '; +*/ + echo ' '; if ($phpgw_info["setup"]["stage"]["header"] < 10) { echo ''; }elseif ($phpgw_info["setup"]["stage"]["db"] <= 1) { @@ -185,7 +191,7 @@ echo ''; echo ''; } - echo ' '; + echo ' '; if ($phpgw_info["setup"]["stage"]["db"] < 10) { echo ''; }elseif ($phpgw_info["setup"]["stage"]["config"] <= 1) { @@ -197,7 +203,7 @@ echo ""; echo ''; } - echo ' '; + echo ' '; if ($phpgw_info["setup"]["stage"]["config"] < 10) { echo ''; }elseif ($phpgw_info["setup"]["stage"]["lang"] <= 1) { @@ -205,7 +211,7 @@ }elseif ($phpgw_info["setup"]["stage"]["lang"] == 10) { echo ''; } - echo ' '; + echo ' '; if ($phpgw_info["setup"]["stage"]["lang"] < 10) { echo ''; }elseif ($phpgw_info["setup"]["stage"]["apps"] <= 1) { diff --git a/setup/setup_demo.php b/setup/setup_demo.php index bc6f1d6abf..096fad4203 100644 --- a/setup/setup_demo.php +++ b/setup/setup_demo.php @@ -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; }
Step 1 - header.inc.php 
Step 0 - header.inc.php 
O
You have not created your header.inc.php yet.
X
Your header.inc.php is in place and current.
Step 2 - database management 
Step 1 - database management 
ONot ready for this stage yet.
Step 3 - Configuration 
Step 2 - Configuration 
ONot ready for this stage yet.
Step 4 - language management 
Step 3 - language management 
ONot ready for this stage yet.
OThis stage is completed
Step 5 - Add-on Application Installation 
Step 4 - Add-on Application Installation 
ONot ready for this stage yet.