Merge branch 'master' of http://nubati.net/git/e-DoKo

1 files changed, 6 insertions, 3 deletions

diff --git a/index.php b/index.php
index 76bbc29..9702800 100644
--- a/index.php
+++ b/index.php
@@ -8,13 +8,11 @@ error_reporting(E_ALL);
  */
 session_start();
 
-
 include_once("config.php");                /* needs to be first in list, since other includes use this */
 include_once("./include/output.php");      /* html output only */
 include_once("./include/db.php");          /* database only */
 include_once("./include/functions.php");   /* the rest */
 
-
 /* make sure that user has set all variables in config.php */
 config_check();
 
@@ -28,7 +26,7 @@ if(DB_open()<0)
     exit();
   }
 
-/* done major error checking, output header of HTML page */
+/* done major error checking, output5B header of HTML page */
 output_header();
 
 /* The rest of the file consists of handling user input.
@@ -81,6 +79,11 @@ switch($action)
       require './include/welcome.php';
   }
 
+/* ask for login or display login info, needs to go at the end, so that we have the
+ * session-variable already set.
+ */
+output_status();
+
 output_footer();
 
 DB_close();