Changeset 8241 for trunk/MagicSoft
- Timestamp:
- 01/11/07 12:04:11 (18 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 6 edited
-
Changelog (modified) (1 diff)
-
datacenter/db/builddatasets.php (modified) (8 diffs)
-
datacenter/db/datasetinfo-aio.php (modified) (1 diff)
-
datacenter/db/menu.js (modified) (3 diffs)
-
datacenter/db/runinfo-aio.php (modified) (1 diff)
-
datacenter/db/sequinfo-aio.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r8238 r8241 19 19 -*-*- END OF LINE -*-*- 20 20 21 2007/01/11 Daniela Dorner 22 23 * datacenter/db/builddatasets.php: 24 - implemented username (the one who inserts the dataset has to give 25 his/her username now) 26 - fixed password query in case user inserted something wrong 27 28 * datacenter/db/builddatasets.php, datasetinfo-aio.php, 29 runinfo-aio.php, sequinfo-aio.php: 30 - minor changes in formatting 31 - added 'alt' for +/- images 32 33 * datacenter/db/menu.js: 34 - added 'alt' for +/- images 35 36 37 21 38 2007/01/10 Thomas Bretz 22 39 -
trunk/MagicSoft/Mars/datacenter/db/builddatasets.php
r8201 r8241 422 422 printf("1000000000"); 423 423 printf("'>\n"); 424 printf("<img id='allbutton' src='../minus.png' alt='-' onclick='showhide(\"all\")'> <b>Menu</b>\n");425 printf(" <img id='infobutton' src='../plus.png' 426 printf(" <img id='statbutton' src='../plus.png' 427 printf(" <img id='calbutton' src='../plus.png' 428 printf(" <img id='starbutton' src='../plus.png' 429 printf(" <img id=' rangesbutton' src='../plus.png' alt='+' onClick='showhide(\"ranges\")'> Ranges \n");430 printf(" <img id=' limitsbutton' src='../plus.png' alt='+' onClick='showhide(\"limits\")'> Limits \n");424 printf("<img id='allbutton' src='../minus.png' alt='-' onclick='showhide(\"all\")'> <b>Menu</b> \n"); 425 printf(" <img id='infobutton' src='../plus.png' alt='+' onClick='showhide(\"info\");showhide(\"info2\")'> SequInfo \n"); 426 printf(" <img id='statbutton' src='../plus.png' alt='+' onClick='showhide(\"stat\");showhide(\"fail\")'> StatusInfo \n"); 427 printf(" <img id='calbutton' src='../plus.png' alt='+' onClick='showhide(\"cal\")'> CalInfo \n"); 428 printf(" <img id='starbutton' src='../plus.png' alt='+' onClick='showhide(\"star\")'> StarInfo \n"); 429 printf(" <img id='limitsbutton' src='../plus.png' alt='+' onClick='showhide(\"limits\")'> Limits \n"); 430 printf(" <img id='rangesbutton' src='../plus.png' alt='+' onClick='showhide(\"ranges\")'> Ranges \n"); 431 431 432 432 printf(" <div id='all' style='display:block'>"); … … 475 475 printf("<input name='comment' type='hidden' value='%s'>\n", $_POST["comment"]); 476 476 printf("<input name='obsmode' type='hidden' value='%s'>\n", $_POST["fObservationModeKEY"]); 477 printf("<input name='username' type='hidden' value='%s'>\n", $_POST["fUserKEY"]); 477 478 printf("</form>\n"); 478 479 printf("</center>\n"); … … 697 698 $numerr=$numerr+1; 698 699 } 700 if (empty($_POST["fUserKEY"])) 701 { 702 printf("<li style='color:%s'>%s: You have to choose your username.", 703 $color["ERROR"], "ERROR"); 704 $numerr=$numerr+1; 705 } 699 706 if (empty($_POST["name"])) 700 707 { … … 715 722 printf("SequencesOn: %s<br>", $sequon); 716 723 printf("SequencesOff: %s<br>", $sequoff); 717 $insquery[0]="INSERT DataSets SET fDataSetNumber=" . $dataset ;724 $insquery[0]="INSERT DataSets SET fDataSetNumber=" . $dataset . ", fUserKEY=" . $_POST["fUserKEY"]; 718 725 $insquery[0].=", fComment='" . $_POST["comment"] . "', fObservationModeKEY=" . $_POST["fObservationModeKEY"]; 719 726 $insquery[0].=", fDataSetName='" . $_POST["name"] . "', fSourceKEY= " . $realsourcekey; … … 768 775 if (empty($_POST["fObservationModeKEY"]) && !empty($_GET["obsmode"])) 769 776 $_POST["fObservationModeKEY"]=$_GET["obsmode"]; 777 if (empty($_POST["fUserKEY"]) && !empty($_GET["username"])) 778 $_POST["fUserKEY"]=$_GET["username"]; 770 779 printf("Name: <input name='name' type='text' size='20' maxlength='20' value='%s'><br>\n", $_POST["name"]); 771 780 printf("Comment: <input name='comment' type='text' size='50' maxlength='255' value='%s'><br>\n", $_POST["comment"]); … … 782 791 { 783 792 if (!empty($_POST["fObservationModeKEY"]) && $_POST["fObservationModeKEY"]==$row[0]) 793 printf("<option value='%s' selected>%s</option>\n", $row[0], $row[1]); 794 else 795 printf("<option value='%s'>%s</option>\n", $row[0], $row[1]); 796 } 797 printf("</select><br>\n"); 798 mysql_free_result($result); 799 800 $query = "SELECT fUserKEY, fUserName FROM User ORDER BY fUserKEY"; 801 $result = mysql_query($query); 802 if (!$result) 803 printf("-N/A-"); 804 805 $numrows = mysql_num_rows($result); 806 807 printf("UserName <select name='fUserKEY' size='1' class='Width'>\n"); 808 while ($row = mysql_fetch_row($result)) 809 { 810 if (!empty($_POST["fUserKEY"]) && $_POST["fUserKEY"]==$row[0]) 784 811 printf("<option value='%s' selected>%s</option>\n", $row[0], $row[1]); 785 812 else … … 864 891 $siteuser="dcdb"; 865 892 866 if (!isset($_SERVER['PHP_AUTH_USER']) || $_SERVER['PHP_AUTH_USER']!=$siteuser)893 if (!isset($_SERVER['PHP_AUTH_USER']) || crypt($_SERVER['PHP_AUTH_PW'], $sitepw)!=$sitepw || $_SERVER['PHP_AUTH_USER']!=$siteuser) 867 894 { 868 895 header('WWW-Authenticate: Basic realm="My Realm"'); … … 876 903 // echo "<p>You entered {$_SERVER['PHP_AUTH_PW']} as your password.</p>"; 877 904 // printf("pw: %s", crypt($_SERVER['PHP_AUTH_PW'])); 905 878 906 if (crypt($_SERVER['PHP_AUTH_PW'], $sitepw)!=$sitepw || $_SERVER['PHP_AUTH_USER']!=$siteuser) 879 907 { -
trunk/MagicSoft/Mars/datacenter/db/datasetinfo-aio.php
r8195 r8241 201 201 printf("1000000000"); 202 202 printf("'>\n"); 203 printf("<img id='allbutton' src='../minus.png' onclick=showhide('all')> <b>Menu</b>\n");204 printf(" <img id='infobutton' src='../plus.png' onClick=showhide('info');showhide('info2')>DataSetInfo\n");205 printf(" <img id='statbutton' src='../plus.png' onClick=showhide('stat');showhide('fail')>StatusInfo \n");206 printf(" <img id='rangesbutton' src='../plus.png' onClick=showhide('ranges')>Ranges \n");203 printf("<img id='allbutton' src='../minus.png' alt='-' onclick=showhide('all')> <b>Menu</b> \n"); 204 printf(" <img id='infobutton' src='../plus.png' alt='+' onClick=showhide('info');showhide('info2')> DataSetInfo\n"); 205 printf(" <img id='statbutton' src='../plus.png' alt='+' onClick=showhide('stat');showhide('fail')> StatusInfo \n"); 206 printf(" <img id='rangesbutton' src='../plus.png' alt='+' onClick=showhide('ranges')> Ranges \n"); 207 207 208 208 printf(" <div id='all' style='display:block'>"); -
trunk/MagicSoft/Mars/datacenter/db/menu.js
r8175 r8241 1 1 2 2 //functions and arrays needed for showing and hiding the menu on the db websites 3 ids = new Array( "all", "info", "info2", "stat", "fail", "cal", "star", " ranges", "limits", "showquery");3 ids = new Array( "all", "info", "info2", "stat", "fail", "cal", "star", "limits", "ranges", "showquery"); 4 4 statarr = new Array( 1, 0, 0, 0, 0, 0, 0, 0, 0, 0); 5 5 … … 23 23 el.style.display="none"; 24 24 if (img) 25 { 25 26 img.src='../plus.png'; 27 img.alt='+'; 28 } 26 29 } 27 30 … … 30 33 el.style.display="block"; 31 34 if (img) 35 { 32 36 img.src='../minus.png'; 37 img.alt='-'; 38 } 33 39 } 34 40 -
trunk/MagicSoft/Mars/datacenter/db/runinfo-aio.php
r8195 r8241 236 236 printf("1000000000"); 237 237 printf("'>\n"); 238 printf("<img id='allbutton' src='../minus.png' onclick=showhide('all')> <b>Menu</b>\n");239 printf(" <img id='infobutton' src='../plus.png' onClick=showhide('info');showhide('info2')>RunInfo \n");240 printf(" <img id='statbutton' src='../plus.png' onClick=showhide('stat');showhide('fail')>StatusInfo \n");241 printf(" <img id='rangesbutton' src='../plus.png' onClick=showhide('ranges')>Ranges \n");238 printf("<img id='allbutton' src='../minus.png' alt='-' onclick=\"showhide('all')\"> <b>Menu</b> \n"); 239 printf(" <img id='infobutton' src='../plus.png' alt='+' onClick=\"showhide('info');showhide('info2')\"> RunInfo \n"); 240 printf(" <img id='statbutton' src='../plus.png' alt='+' onClick=\"showhide('stat');showhide('fail')\"> StatusInfo \n"); 241 printf(" <img id='rangesbutton' src='../plus.png' alt='+' onClick=\"showhide('ranges')\"> Ranges \n"); 242 242 243 243 printf(" <div id='all' style='display:block'>"); -
trunk/MagicSoft/Mars/datacenter/db/sequinfo-aio.php
r8195 r8241 285 285 printf("1000000000"); 286 286 printf("'>\n"); 287 printf("<img id='allbutton' src='../minus.png' alt='-' onclick='showhide(\"all\")'> <b>Menu</b>\n");288 printf(" <img id='infobutton' src='../plus.png' alt='+' onClick='showhide(\"info\");showhide(\"info2\")'>SequInfo \n");289 printf(" <img id='statbutton' src='../plus.png' alt='+' onClick='showhide(\"stat\");showhide(\"fail\")'>StatusInfo \n");290 printf(" <img id='calbutton' src='../plus.png' alt='+' onClick='showhide(\"cal\")'>CalInfo \n");291 printf(" <img id='starbutton' src='../plus.png' alt='+' onClick='showhide(\"star\")'>StarInfo \n");292 printf(" <img id=' rangesbutton' src='../plus.png' alt='+' onClick='showhide(\"ranges\")'> Ranges \n");293 printf(" <img id=' limitsbutton' src='../plus.png' alt='+' onClick='showhide(\"limits\")'> Limits \n");287 printf("<img id='allbutton' src='../minus.png' alt='-' onclick='showhide(\"all\")'> <b>Menu</b> \n"); 288 printf(" <img id='infobutton' src='../plus.png' alt='+' onClick='showhide(\"info\");showhide(\"info2\")'> SequInfo \n"); 289 printf(" <img id='statbutton' src='../plus.png' alt='+' onClick='showhide(\"stat\");showhide(\"fail\")'> StatusInfo \n"); 290 printf(" <img id='calbutton' src='../plus.png' alt='+' onClick='showhide(\"cal\")'> CalInfo \n"); 291 printf(" <img id='starbutton' src='../plus.png' alt='+' onClick='showhide(\"star\")'> StarInfo \n"); 292 printf(" <img id='limitsbutton' src='../plus.png' alt='+' onClick='showhide(\"limits\")'> Limits \n"); 293 printf(" <img id='rangesbutton' src='../plus.png' alt='+' onClick='showhide(\"ranges\")'> Ranges \n"); 294 294 295 295 printf(" <div id='all' style='display:block'>");
Note:
See TracChangeset
for help on using the changeset viewer.
