Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8240)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8241)
@@ -19,4 +19,21 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2007/01/11 Daniela Dorner
+
+   * datacenter/db/builddatasets.php:
+     - implemented username (the one who inserts the dataset has to give
+       his/her username now)
+     - fixed password query in case user inserted something wrong
+
+   * datacenter/db/builddatasets.php, datasetinfo-aio.php, 
+     runinfo-aio.php, sequinfo-aio.php:
+     - minor changes in formatting
+     - added 'alt' for +/- images
+
+   * datacenter/db/menu.js:
+     - added 'alt' for +/- images
+
+
+
  2007/01/10 Thomas Bretz
 
Index: trunk/MagicSoft/Mars/datacenter/db/builddatasets.php
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/builddatasets.php	(revision 8240)
+++ trunk/MagicSoft/Mars/datacenter/db/builddatasets.php	(revision 8241)
@@ -422,11 +422,11 @@
             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,4 +475,5 @@
         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,4 +698,10 @@
                         $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,5 +722,5 @@
                     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,4 +775,6 @@
                     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,4 +791,22 @@
                     {
                         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,5 +891,5 @@
     $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,4 +903,5 @@
 //    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)
         {
Index: trunk/MagicSoft/Mars/datacenter/db/datasetinfo-aio.php
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/datasetinfo-aio.php	(revision 8240)
+++ trunk/MagicSoft/Mars/datacenter/db/datasetinfo-aio.php	(revision 8241)
@@ -201,8 +201,8 @@
             printf("1000000000");
         printf("'>\n");
-        printf("<img id='allbutton'    src='../minus.png' onclick=showhide('all')>                               <b>Menu</b>\n");
-        printf("&nbsp;&nbsp;<img id='infobutton'   src='../plus.png'  onClick=showhide('info');showhide('info2')>DataSetInfo\n");
-        printf("&nbsp;&nbsp;<img id='statbutton'   src='../plus.png'  onClick=showhide('stat');showhide('fail')> StatusInfo \n");
-        printf("&nbsp;&nbsp;<img id='rangesbutton' src='../plus.png'  onClick=showhide('ranges')>                Ranges     \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')> DataSetInfo\n");
+        printf("&nbsp;&nbsp;<img id='statbutton'   src='../plus.png' alt='+' onClick=showhide('stat');showhide('fail')>  StatusInfo \n");
+        printf("&nbsp;&nbsp;<img id='rangesbutton' src='../plus.png' alt='+' onClick=showhide('ranges')>                 Ranges     \n");
 
         printf(" <div id='all' style='display:block'>");
Index: trunk/MagicSoft/Mars/datacenter/db/menu.js
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/menu.js	(revision 8240)
+++ trunk/MagicSoft/Mars/datacenter/db/menu.js	(revision 8241)
@@ -1,5 +1,5 @@
 
 //functions and arrays needed for showing and hiding the menu on the db websites
-ids = new Array( "all", "info", "info2", "stat", "fail", "cal", "star", "ranges", "limits", "showquery");
+ids = new Array( "all", "info", "info2", "stat", "fail", "cal", "star", "limits", "ranges", "showquery");
 statarr = new Array( 1, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 
@@ -23,5 +23,8 @@
     el.style.display="none";
     if (img)
+    {
         img.src='../plus.png';
+        img.alt='+';
+    }
 }
 
@@ -30,5 +33,8 @@
     el.style.display="block";
     if (img)
+    {
         img.src='../minus.png';
+        img.alt='-';
+    }
 }
 
Index: trunk/MagicSoft/Mars/datacenter/db/runinfo-aio.php
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/runinfo-aio.php	(revision 8240)
+++ trunk/MagicSoft/Mars/datacenter/db/runinfo-aio.php	(revision 8241)
@@ -236,8 +236,8 @@
             printf("1000000000");
         printf("'>\n");
-        printf("<img id='allbutton'    src='../minus.png' onclick=showhide('all')>                               <b>Menu</b>\n");
-        printf("&nbsp;&nbsp;<img id='infobutton'   src='../plus.png'  onClick=showhide('info');showhide('info2')>RunInfo    \n");
-        printf("&nbsp;&nbsp;<img id='statbutton'   src='../plus.png'  onClick=showhide('stat');showhide('fail')> StatusInfo \n");
-        printf("&nbsp;&nbsp;<img id='rangesbutton' src='../plus.png'  onClick=showhide('ranges')>                Ranges     \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')\"> RunInfo    \n");
+        printf("&nbsp;&nbsp;<img id='statbutton'   src='../plus.png' alt='+' onClick=\"showhide('stat');showhide('fail')\">  StatusInfo \n");
+        printf("&nbsp;&nbsp;<img id='rangesbutton' src='../plus.png' alt='+' onClick=\"showhide('ranges')\">                 Ranges     \n");
 
         printf(" <div id='all' style='display:block'>");
Index: trunk/MagicSoft/Mars/datacenter/db/sequinfo-aio.php
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/sequinfo-aio.php	(revision 8240)
+++ trunk/MagicSoft/Mars/datacenter/db/sequinfo-aio.php	(revision 8241)
@@ -285,11 +285,11 @@
             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'>");