Changeset 8235 for trunk/MagicSoft/Mars

Timestamp:

12/14/06 15:44:46 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter/db

Files:

• magicdefs.php (modified) (4 diffs)
• opticaldata.php (modified) (5 diffs)

trunk/MagicSoft/Mars/datacenter/db/magicdefs.php

@@ -81 +81 @@
      "fObjectName"                       => CheckWhere("fObjectKEY",                       $_GET),
      "fStatusName"                       => CheckWhere("fStatusKEY",                       $_GET),
+     "fTelescopeName"                    => CheckWhere("fTelescopeKEY",                    $_GET),
+     "fBandName"                         => CheckWhere("fBandKEY",                         $_GET),
     );
 
@@ -104 +106 @@
      "fObjectName"                       => CheckGroup("fObjectKEY",                       $_GET),
      "fStatusName"                       => CheckGroup("fStatusKEY",                       $_GET),
+     "fBandName"                         => CheckGroup("fBandKEY",                         $_GET),
+     "fTelescopeName"                    => CheckGroup("fTelescopeKEY",                    $_GET),
     );
 
@@ -318 +322 @@
      "fInstrumentalMagErr"              => "Instr.Mag.Err.",
      "fStatusName"                      => "StatusCode",
+     "fTelescopeName"                   => "Telescope",
+     "fBandName"                        => "Band",
 //     "COUNT(*)"                         => "# Runs",
 //     "COUNT(*)"                         => "Sequence",
@@ -625 +631 @@
          "fObjectName"                       => " LEFT JOIN Object                       ON " . $fromtable . ".fObjectKEY=Object.fObjectKEY ",
          "fStatusName"                       => " LEFT JOIN Status                       ON " . $fromtable . ".fStatusKEY=Status.fStatusKEY ",
+         "fBandName"                         => " LEFT JOIN Band                         ON " . $fromtable . ".fBandKEY=Band.fBandKEY ",
+         "fTelescopeName"                    => " LEFT JOIN Telescope                    ON " . $fromtable . ".fTelescopeKEY=Telescope.fTelescopeKEY ",
         );
 

trunk/MagicSoft/Mars/datacenter/db/opticaldata.php

@@ -133 +133 @@
 
         if (empty($_GET["fFitsFileName"]))
-            $_GET["fFitsFileName"]=$first?"On":"";
+            $_GET["fFitsFileName"]="Off";
 
         if (empty($_GET["fObjectName"]))
@@ -139 +139 @@
 
         if (empty($_GET["fStatusName"]))
-            $_GET["fStatusName"]=$first?"On":"";
+            $_GET["fStatusName"]="Off";
+
+        if (empty($_GET["fBandName"]))
+            $_GET["fBandName"]=$first?"On":"";
+
+        if (empty($_GET["fTelescopeName"]))
+            $_GET["fTelescopeName"]=$first?"On":"";
 
 //        if (empty($_GET["fRunStop"]))
@@ -166 +172 @@
         printf("  </tr>\n");
         printf(" </table>\n");
-         printf(" <p>\n");
+        printf(" <p>\n");
 
         // pull down boxes
@@ -172 +178 @@
         printf(" <table>\n");
         printf("  <tr><td>\n");
-        PrintPullDown($host, $user, $pw, $db, "FitsFile",     "fFitsFileName",     "fFitsFileKEY", "Fits File");
+        PrintPullDown($host, $user, $pw, $db, "Telescope",  "fTelescopeName",  "fTelescopeKEY", "Telescope");
         printf("  </td><td>\n");
         PrintPullDown($host, $user, $pw, $db, "Object",      "fObjectName",      "fObjectKEY", "Object Name");
+        printf("  </td><td>\n");
+        PrintPullDown($host, $user, $pw, $db, "Band",     "fBandName",     "fBandKEY", "Band");
+        printf("  </td></tr><tr><td>\n");
+        PrintPullDown($host, $user, $pw, $db, "FitsFile",     "fFitsFileName",     "fFitsFileKEY", "Fits File");
         printf("  </td><td>\n");
         PrintPullDown($host, $user, $pw, $db, "Status",  "fStatusName",  "fStatusKEY", "Status Code");
@@ -259 +269 @@
     ini_set("mysql.trace_mode", "On");
 
+    $sitepw="\$1\$jfBkkHx1\$WmxNVaOWPCBC8asfKDfBZ/";
+    $siteuser="optical";
+
+    if (!isset($_SERVER['PHP_AUTH_USER']) || $_SERVER['PHP_AUTH_USER']!=$siteuser)
+    {
+        header('WWW-Authenticate: Basic realm="Optical Data - Tuorla Observatory"');
+        header('HTTP/1.0 401 Unauthorized');
+        echo 'Action cancelled.';
+        return;
+    }
+    else
+    {
+//    echo "<p>Hello {$_SERVER['PHP_AUTH_USER']}.</p>";
+//    echo "<p>You entered {$_SERVER['PHP_AUTH_PW']} as your password.</p>";
+//    printf("pw: %s", crypt($_SERVER['PHP_AUTH_PW']));
+        if (crypt($_SERVER['PHP_AUTH_PW'], $sitepw)!=$sitepw || $_SERVER['PHP_AUTH_USER']!=$siteuser)
+        {
+            printf("<br>pw or user incorrect<br>");
+            return;
+        }
+    }
+
     if (!empty($_GET["fSendTxt"]))
     {