Index: trunk/MagicSoft/Mars/datacenter/db/dbstatus.php
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/dbstatus.php	(revision 7527)
+++ trunk/MagicSoft/Mars/datacenter/db/dbstatus.php	(revision 7546)
@@ -222,5 +222,5 @@
 
         if (empty($_GET["fAllFilesAvailStatus"]))
-            $_GET["fAllFilesAvailStatus"]="4";
+            $_GET["fAllFilesAvailStatus"]="7";
 
         if (empty($_GET["fCallisto"]))
@@ -228,5 +228,5 @@
 
         if (empty($_GET["fCallistoStatus"]))
-            $_GET["fCallistoStatus"]="4";
+            $_GET["fCallistoStatus"]="7";
 
         if (empty($_GET["fFillCallisto"]))
@@ -240,5 +240,5 @@
 
         if (empty($_GET["fStarStatus"]))
-            $_GET["fStarStatus"]="4";
+            $_GET["fStarStatus"]="7";
 
         if (empty($_GET["fFillStar"]))
@@ -249,5 +249,5 @@
     }
 
-    function PrintForm($_GET, $db)
+    function PrintForm($_GET, $host, $user, $pw, $db)
     {
         printf("<center>\n");
@@ -272,5 +272,5 @@
         printf(" <table>\n");
         printf("  <tr><td>\n");
-        PrintPullDown($db, "Source",      "fSourceName",      "fSourceKEY", "Source Name");
+        PrintPullDown($host, $user, $pw, $db, "Source",      "fSourceName",      "fSourceKEY", "Source Name");
         printf("  </td><td>\n");
 
@@ -285,10 +285,10 @@
 
         if (empty($_GET["fStartDate"]))
-            $timemin = GetMin("fRunStart", "Sequences", $db);
+            $timemin = GetMin("fRunStart", "Sequences", $host, $user, $pw, $db);
         else
             $timemin = $_GET["fStartDate"];
 
         if (empty($_GET["fStopDate"]))
-            $timemax = GetMax("fRunStart", "Sequences", $db);
+            $timemax = GetMax("fRunStart", "Sequences", $host, $user, $pw, $db);
         else
             $timemax = $_GET["fStopDate"];
@@ -298,10 +298,10 @@
 
         if (empty($_GET["fRunMin"]))
-            $min = GetMin("fSequenceFirst", "Sequences", $db);
+            $min = GetMin("fSequenceFirst", "Sequences", $host, $user, $pw, $db);
         else
             $min = $_GET["fRunMin"];
 
         if (empty($_GET["fRunMax"]))
-            $max = GetMax("fSequenceFirst", "Sequences", $db);
+            $max = GetMax("fSequenceFirst", "Sequences", $host, $user, $pw, $db);
         else
             $max = $_GET["fRunMax"];
@@ -318,5 +318,5 @@
 
         printf("<input class='Width' type='submit' value='Query Table'>&nbsp;&nbsp;&nbsp;\n");
-        printf("<input class='Width' type='button' value='Reset' onClick='self.location.href=\"sequinfo.php\"'>&nbsp;&nbsp;&nbsp;\n");
+        printf("<input class='Width' type='button' value='Reset' onClick='self.location.href=\"dbstatus.php\"'>&nbsp;&nbsp;&nbsp;\n");
         if (strchr($_SERVER["REQUEST_URI"], '?')!=FALSE)
             printf("<input class='Width' type='button' value='Get .txt' onClick='self.location.href=\"%s&fSendTxt=1\"'>&nbsp;&nbsp;&nbsp;\n", $_SERVER["REQUEST_URI"]);
@@ -331,7 +331,7 @@
     }
 
-    function PrintPage($html, $db, $needs)
-    {
-        $db_id = mysql_connect("hercules.astro.uni-wuerzburg.de", "MAGIC", "d99swMT!");
+    function PrintPage($html, $host, $user, $pw, $db, $needs)
+    {
+        $db_id = mysql_connect($host, $user, $pw);
         if ($db_id==FALSE)
         {
@@ -375,4 +375,5 @@
     include ("include.php");
     include ("db.php");
+    include ("magicdefs.php");
 
     ini_set("display_errors", "On");
@@ -384,5 +385,5 @@
         header("Content-Disposition: attachment; filename=query-result.txt");
 
-        PrintPage("0", $db);
+        PrintPage("0", $host, $user, $pw, $db);
     }
     else
@@ -394,5 +395,5 @@
         InitGet($_GET);
         if (empty($_GET["fPrintTable"]))
-            PrintForm($_GET, $db);
+            PrintForm($_GET, $host, $user, $pw, $db);
 
         if ($environment==0)
@@ -401,7 +402,7 @@
         {
             if (empty($_GET["fPrintTable"]))
-                PrintPage("1", $db, $needs);
+                PrintPage("1", $host, $user, $pw, $db, $needs);
             else
-                PrintPage("2", $db, $needs);
+                PrintPage("2", $host, $user, $pw, $db, $needs);
         }