Index: /trunk/pstamp/web/authenticate.php
===================================================================
--- /trunk/pstamp/web/authenticate.php	(revision 25322)
+++ /trunk/pstamp/web/authenticate.php	(revision 25322)
@@ -0,0 +1,33 @@
+<?php
+
+// function check_login()
+
+session_start();
+
+// XXX TODO use mysql
+$auth_user="setme";
+$auth_passwd="setmetoo";
+
+$user   = $_SERVER['PHP_AUTH_USER'];
+$passwd = $_SERVER['PHP_AUTH_PW'];
+$did_login = isset($_SESSION['did_login']);
+
+if ($did_login && isset($user) && isset($passwd) &&
+    ($auth_user == $user) && ($auth_passwd == $passwd)) {
+
+    echo "Welcome:  " . $user;
+    echo "&nbsp;&nbsp;&nbsp; <a href=\"./logout.php\">Logout</a>";
+    echo "<br />";
+    echo "<br />";
+} else {
+    $_SESSION['did_login'] = true;
+    header('WWW-Authenticate: Basic realm="Restricted Section"');
+    header('HTTP/1.0 401 Unauthorized');
+    // The following will be output if the user hits the cancel button
+    echo "please enter username and password";
+    echo "&nbsp;&nbsp;&nbsp;<a href=\"./upload.php\">Login</a>";
+    exit;
+}
+
+?>
+
Index: /trunk/pstamp/web/logout.php
===================================================================
--- /trunk/pstamp/web/logout.php	(revision 25322)
+++ /trunk/pstamp/web/logout.php	(revision 25322)
@@ -0,0 +1,18 @@
+<?php
+
+// require_once "authenticate.php";
+
+// logout();
+session_start();
+$_SESSION = array();
+if (isset($_COOKIE[session_name()])) {
+    setcookie(session_name(), '', time()-42000, '/');
+}
+session_destroy();
+
+echo "You are now logged out<br /><br />";
+echo "<a href=\"./upload.php\">Upload</a>";
+
+// phpinfo(32);
+?>
+
Index: /trunk/pstamp/web/pstamp.php
===================================================================
--- /trunk/pstamp/web/pstamp.php	(revision 25322)
+++ /trunk/pstamp/web/pstamp.php	(revision 25322)
@@ -0,0 +1,6 @@
+<?php
+
+require_once "pstampconfig.php";
+require_once "authenticate.php";
+
+?>
Index: /trunk/pstamp/web/pstampconfig.php
===================================================================
--- /trunk/pstamp/web/pstampconfig.php	(revision 25322)
+++ /trunk/pstamp/web/pstampconfig.php	(revision 25322)
@@ -0,0 +1,19 @@
+<?php
+// BEGIN Local configuration
+
+$WORKDIR = "set to the location of pstamp working directory";
+$dsroot = "set to the root of the data store";
+$dbname = "set to the pstamp database name";
+$dbserver = "set to the pstamp database server";
+
+$PSCONFDIR = "";
+$PSCONFIG  = "";
+$PSBINDIR  = "$PSCONFDIR/$PSCONFIG.lin64/bin";
+
+// END Local configuration 
+
+# this script sets up the environment to run IPP commands with current directory
+# $WORKDIR
+$SCRIPT    = "$PSBINDIR/pstamp_runcommand.sh $PSCONFDIR $PSCONFIG $WORKDIR";
+
+?>
Index: /trunk/pstamp/web/request.php
===================================================================
--- /trunk/pstamp/web/request.php	(revision 25321)
+++ /trunk/pstamp/web/request.php	(revision 25322)
@@ -17,12 +17,15 @@
 
 
+// XXX: change to include pstampconfig.php
+
 // BEGIN Local configuration
 
-$WORKDIR = "XXXX/pstamp-work/web";
-$dsroot = "XXXX/datastore/dsroot";
-$dbname = "XXXX";
-
-$PSCONFDIR = "XXXX";
-$PSCONFIG  = "XXXX";
+$WORKDIR = "/data/ipp049.0/pstamp/work";
+$dsroot = "/data/ipp049.0/datastore/dsroot";
+$dbname = "ippRequestServer";
+$dbserver = "ipp049";
+
+$PSCONFDIR = "/data/ipp053.0/home/bills/psconfig";
+$PSCONFIG  = "debug";
 $PSBINDIR  = "$PSCONFDIR/$PSCONFIG.lin64/bin";
 
@@ -32,4 +35,6 @@
 # $WORKDIR
 $SCRIPT    = "$PSBINDIR/pstamp_runcommand.sh $PSCONFDIR $PSCONFIG $WORKDIR";
+
+// END of moved to pstampconfig.php
 
 // Initialize variables
@@ -95,5 +100,5 @@
 import_request_variables("gp", "rvar_");
 
-if ($rvar_project == "gpc1_rel_200901") {
+if ($rvar_project == "gpc1") {
     $gpc1_selected = "selected";
     $require_class_id = 1;
@@ -255,4 +260,5 @@
     global $command_line;
     global $dbname;
+    global $dbserver;
     global $require_class_id;
     global $PSCONFDIR, $PSCONFIG, $WORKDIR;
@@ -271,5 +277,5 @@
 
     if ($dbname) {
-        $cmd .= " --dbname $dbname";
+        $cmd .= " --dbname $dbname --dbserver $dbserver";
     }
 
@@ -281,5 +287,5 @@
     if ($making_stamps) {
         // TODO: put options on the GUI for these
-        $cmd .= " -mask -weight";
+//        $cmd .= " -mask -weight";
     }
 
@@ -406,5 +412,6 @@
                 global $dsroot;
                 $dirName  = "$dsroot/$product/$req_name";
-                $filesetURL = "/ds/$product/$req_name";
+                // XXX: TODO: make this a configuration parameter
+                $filesetURL = "http://datastore.ipp.ifa.hawaii.edu/$product/$req_name";
                 $fullpath = "$dirName/$fileName";
 // echo "<pre>fullpath: $fullpath filesetURL: $filesetURL\n</pre>";
@@ -412,5 +419,5 @@
                     // this job is done, list the url as a link
                     // echo "<a href=\"http:$path\" target=\"_blank\" type=\"image/fits\">";
-                    echo "<a href=\"http:$filesetURL\">";
+                    echo "<a href=\"$filesetURL\" TARGET=\"form_results_fileset\">";
 #                    echo $fileName;
                     $filesetName = basename($dirName);
@@ -463,6 +470,7 @@
     $command_line = "$SCRIPT pstamp_listjobs.pl $request_id";
     global $dbname;
+    global $dbserver;
     if ($dbname) {
-        $command_line .= " --dbname $dbname";
+        $command_line .= " --dbname $dbname --dbserver $dbserver";
     }
 
@@ -495,9 +503,10 @@
     global $outFileset;
     global $dbname;
+    global $dbserver;
     global $SCRIPT;
 
     $command_line = "$SCRIPT pstamptool -listreq -req_id $request_id -simple";
     if ($dbname) {
-        $command_line .= " -dbname $dbname";
+        $command_line .= " -dbname $dbname -dbserver $dbserver";
     }
     // echo "Running $command_line\n";
@@ -566,7 +575,9 @@
     <tr><td><b>Project:</b>&nbsp;&nbsp;&nbsp;</td>
         <td><select name="project">
-           <option <?php echo $gpc1_selected;?> >gpc1_rel_200901
+           <option <?php echo $gpc1_selected;?> >gpc1
+<!--
            <option <?php echo $mops_selected;?> >megacam-mops
            <option <?php echo $simtest_selected;?> >simtest
+-->
         </td>
     </tr>
@@ -596,9 +607,9 @@
     <td>
         <select name="img_type">" >
-            <option <?php echo $raw_selected;?>   >raw
             <option <?php echo $chip_selected;?>  >chip
             <option <?php echo $warp_selected ;?> >warp
             <option <?php echo $stack_selected;?> >stack   
             <option <?php echo $diff_selected;?>  >diff
+            <option <?php echo $raw_selected;?>   >raw
         </select>
     </td>
@@ -611,5 +622,5 @@
 &nbsp;&nbsp;&nbsp;&nbsp;
 <b>
-<?php if (0 && $rvar_project == "gpc1_rel_200901") {
+<?php if (0 && $rvar_project == "gpc1") {
         echo "Chip ID:";
       } else {
Index: /trunk/pstamp/web/upload.php
===================================================================
--- /trunk/pstamp/web/upload.php	(revision 25322)
+++ /trunk/pstamp/web/upload.php	(revision 25322)
@@ -0,0 +1,115 @@
+<?php // upload.php
+
+// get the locatl configuration variables
+include "pstamp.php";
+
+
+$user = $_SERVER['PHP_AUTH_USER'];
+$passwd = $_SERVER['PHP_AUTH_PW'];
+echo "<HTML>
+<head>
+    <title>
+        Upload Postage Stamp Request File
+    </title>
+<body>
+";
+
+// echo "Hello $user $passwd";
+
+echo <<<_END
+    <form method="post" enctype="multipart/form-data" action="">
+        <label>Postage Stamp Request File:
+        <input type="file" name='filename' accept='image/x-fits' /></label>
+    <br />
+    <br />
+    <input type="submit" value="Upload" />
+    &nbsp; &nbsp; &nbsp;
+    <input type="reset" name="cancel" value="Cancel"/>
+    <br />
+    </form>
+    <br />
+_END;
+
+$command = "";
+if ($_FILES) {
+    $name = $_FILES['filename']['name'];
+    $tmp_name = $_FILES['filename']['tmp_name'];
+    $type = $_FILES['filename']['type'];
+    $size = $_FILES['filename']['size'];
+
+    if ($name && ($size > 0)) {
+  //      echo "Uploaded $size bytes for '$type' file '$name' as '$tmp_name'<br />";
+        $command = "$SCRIPT pstamp_insert_request.pl --tmp_req_file $tmp_name --dbname $dbname --dbserver $dbserver --workdir $WORKDIR";
+    }
+}
+
+class Request
+{
+    public $id;
+    public $name;
+    function __construct($p1, $p2)
+    {
+        $this->id = $p1;
+        $this->name = $p2;
+    }
+}
+
+if (!isset($_SESSION['requests'])) {
+//    echo "initializing requests\n";
+//    echo "<br />";
+    $_SESSION['requests'] = array();
+}
+
+// echo "<br />SCRIPT is <br />$SCRIPT";
+$req_id = 0;
+$req_name = "";
+$new_request = 0;
+if ($command) {
+    $command = escapeshellcmd($command);
+   // echo "<br />command:<br />$command";
+    echo "<br />";
+    exec($command, $output, $command_status);
+    if ($command_status == 0) {
+        // it worked!
+        $req_id = $output[0];
+        // get rid of any whitespace in req_name
+        $req_name = trim($output[1]);
+        echo "Submitted Request ID:&nbsp; $req_id Request Name: &nbsp; $req_name<br \>";
+        $new_request = new Request($req_id, $req_name);
+        $num = count($_SESSION['requests']);
+//        echo "request array length: $num<br />";
+        $_SESSION['requests'][$num] = $new_request;
+        $num = count($_SESSION['requests']);
+//        echo "after request array length: $num<br />";
+    } else if ($command_status == 5) {
+        // PS_EXIT_DATA_ERROR
+        echo "Error:&nbsp;&nbsp;&nbsp;";
+        for ($i=0; $i < count($output); $i++) {
+            echo $output[$i];
+        }
+        echo "<br />\n";
+    } else {
+        echo "Unexpected Error.<br /> insert command returned $command_status<br \>";
+    }
+}
+echo "<br />";
+
+foreach ($_SESSION['requests'] as $req) {
+    echo "<br />";
+    echo $req->id;
+    echo "&nbsp;&nbsp";
+    $name = $req->name;
+    echo "&nbsp;&nbsp";
+    // XXX: get this data store product location a configuation
+    echo "<a href=\"http://datastore.ipp.ifa.hawaii.edu/pstampresults/$name\" TARGET=\"upload_results_fileset\">$name</a>\n";
+}
+echo "<br />";
+
+// print lots of information
+// phpinfo(-1);
+// print the most useful variables
+// phpinfo(32);
+
+echo "</body></html>";
+
+?>