Changeset 8241 for trunk/MagicSoft/Mars/datacenter/db/builddatasets.php

Timestamp:

01/11/07 12:04:11 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/db/builddatasets.php (modified) (8 diffs)

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

@@ -422 +422 @@
             printf("1000000000");
         printf("'>\n");
-        printf("<img id='allbutton'    src='../minus.png' alt='-' onclick='showhide(\"all\")'>                                  <b>Menu</b>\n");
-        printf("&nbsp;&nbsp;<img id='infobutton'   src='../plus.png'  alt='+' onClick='showhide(\"info\");showhide(\"info2\")'> SequInfo   \n");
-        printf("&nbsp;&nbsp;<img id='statbutton'   src='../plus.png'  alt='+' onClick='showhide(\"stat\");showhide(\"fail\")'>  StatusInfo \n");
-        printf("&nbsp;&nbsp;<img id='calbutton'    src='../plus.png'  alt='+' onClick='showhide(\"cal\")'>                      CalInfo    \n");
-        printf("&nbsp;&nbsp;<img id='starbutton'   src='../plus.png'  alt='+' onClick='showhide(\"star\")'>                     StarInfo   \n");
-        printf("&nbsp;&nbsp;<img id='rangesbutton' src='../plus.png'  alt='+' onClick='showhide(\"ranges\")'>                   Ranges     \n");
-        printf("&nbsp;&nbsp;<img id='limitsbutton' src='../plus.png'  alt='+' onClick='showhide(\"limits\")'>                   Limits     \n");
+        printf("<img id='allbutton' src='../minus.png' alt='-' onclick='showhide(\"all\")'> <b>Menu</b>&nbsp;&nbsp;&nbsp;&nbsp;\n");
+        printf("&nbsp;&nbsp;<img id='infobutton'   src='../plus.png' alt='+' onClick='showhide(\"info\");showhide(\"info2\")'> SequInfo   \n");
+        printf("&nbsp;&nbsp;<img id='statbutton'   src='../plus.png' alt='+' onClick='showhide(\"stat\");showhide(\"fail\")'>  StatusInfo \n");
+        printf("&nbsp;&nbsp;<img id='calbutton'    src='../plus.png' alt='+' onClick='showhide(\"cal\")'>                      CalInfo    \n");
+        printf("&nbsp;&nbsp;<img id='starbutton'   src='../plus.png' alt='+' onClick='showhide(\"star\")'>                     StarInfo   \n");
+        printf("&nbsp;&nbsp;<img id='limitsbutton' src='../plus.png' alt='+' onClick='showhide(\"limits\")'>                   Limits     \n");
+        printf("&nbsp;&nbsp;<img id='rangesbutton' src='../plus.png' alt='+' onClick='showhide(\"ranges\")'>                   Ranges     \n");
 
         printf(" <div id='all' style='display:block'>");
@@ -475 +475 @@
         printf("<input name='comment' type='hidden' value='%s'>\n", $_POST["comment"]);
         printf("<input name='obsmode' type='hidden' value='%s'>\n", $_POST["fObservationModeKEY"]);
+        printf("<input name='username' type='hidden' value='%s'>\n", $_POST["fUserKEY"]);
         printf("</form>\n");
         printf("</center>\n");
@@ -697 +698 @@
                         $numerr=$numerr+1;
                     }
+                    if (empty($_POST["fUserKEY"]))
+                    {
+                        printf("<li style='color:%s'>%s: You have to choose your username.",
+                               $color["ERROR"], "ERROR");
+                        $numerr=$numerr+1;
+                    }
                     if (empty($_POST["name"]))
                     {
@@ -715 +722 @@
                     printf("SequencesOn: %s<br>", $sequon);
                     printf("SequencesOff: %s<br>", $sequoff);
-                    $insquery[0]="INSERT DataSets SET fDataSetNumber=" . $dataset;
+                    $insquery[0]="INSERT DataSets SET fDataSetNumber=" . $dataset . ", fUserKEY=" . $_POST["fUserKEY"];
                     $insquery[0].=", fComment='" . $_POST["comment"] . "', fObservationModeKEY=" . $_POST["fObservationModeKEY"];
                     $insquery[0].=", fDataSetName='" . $_POST["name"] . "', fSourceKEY= " . $realsourcekey;
@@ -768 +775 @@
                     if (empty($_POST["fObservationModeKEY"]) && !empty($_GET["obsmode"]))
                         $_POST["fObservationModeKEY"]=$_GET["obsmode"];
+                    if (empty($_POST["fUserKEY"]) && !empty($_GET["username"]))
+                        $_POST["fUserKEY"]=$_GET["username"];
                     printf("Name: &nbsp;<input name='name' type='text' size='20' maxlength='20' value='%s'><br>\n", $_POST["name"]);
                     printf("Comment: &nbsp;<input name='comment' type='text' size='50' maxlength='255' value='%s'><br>\n", $_POST["comment"]);
@@ -782 +791 @@
                     {
                         if (!empty($_POST["fObservationModeKEY"]) && $_POST["fObservationModeKEY"]==$row[0])
+                            printf("<option value='%s' selected>%s</option>\n", $row[0], $row[1]);
+                        else
+                            printf("<option value='%s'>%s</option>\n", $row[0], $row[1]);
+                    }
+                    printf("</select><br>\n");
+                    mysql_free_result($result);
+
+                    $query   = "SELECT fUserKEY, fUserName FROM User ORDER BY fUserKEY";
+                    $result  = mysql_query($query);
+                    if (!$result)
+                        printf("-N/A-");
+
+                    $numrows = mysql_num_rows($result);
+
+                    printf("UserName&nbsp;<select name='fUserKEY' size='1' class='Width'>\n");
+                    while ($row = mysql_fetch_row($result))
+                    {
+                        if (!empty($_POST["fUserKEY"]) && $_POST["fUserKEY"]==$row[0])
                             printf("<option value='%s' selected>%s</option>\n", $row[0], $row[1]);
                         else
@@ -864 +891 @@
     $siteuser="dcdb";
 
-    if (!isset($_SERVER['PHP_AUTH_USER']) || $_SERVER['PHP_AUTH_USER']!=$siteuser)
+    if (!isset($_SERVER['PHP_AUTH_USER']) || crypt($_SERVER['PHP_AUTH_PW'], $sitepw)!=$sitepw || $_SERVER['PHP_AUTH_USER']!=$siteuser)
     {
         header('WWW-Authenticate: Basic realm="My Realm"');
@@ -876 +903 @@
 //    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)
         {