Changeset 42996 for branches/eam_branches/ipp-pstamp-20260421/pstamp/web/request.php

Timestamp:

Apr 22, 2026, 5:16:15 PM (3 months ago)

Author:

eugene

Message:

fixing for modern PHP

File:

• branches/eam_branches/ipp-pstamp-20260421/pstamp/web/request.php (modified) (9 diffs)

branches/eam_branches/ipp-pstamp-20260421/pstamp/web/request.php

@@ -22 +22 @@
 # this script sets up the environment to run IPP commands with current directory
 # $WORKDIR
-$SCRIPT    = "$PSBINDIR/pstamp_runcommand.sh $PSCONFDIR $PSCONFIG $WORKDIR";
+// $SCRIPT    = "$PSBINDIR/pstamp_runcommand.sh $PSCONFDIR $PSCONFIG $WORKDIR";
 
 // END of moved to pstampconfig.php
@@ -57 +57 @@
 $outFileset = "";
 
-// Initialize the request variables that we depend upon
-$rvar_project="";
-
 $gpc1_selected="";
 $gpc2_selected="";
@@ -67 +64 @@
 $require_component = 0;
 
-$rvar_email = "";
-$rvar_select_by = "";
-$rvar_img_type = "";
-$rvar_id = "";
-$rvar_component = "";
-$rvar_survey = "bypass";
-$rvar_release = "";
-$rvar_data_group = "";
-$rvar_filter = "";
-
-$rvar_center_type = "";
-$rvar_range_type  = "";
-
-$rvar_RA = "";
-$rvar_DEC = "";
-$rvar_dRA = "";
-$rvar_dDEC = "";
-$rvar_X = "";
-$rvar_Y = "";
-$rvar_W = "";
-$rvar_H = "";
-
-$rvar_make_jpeg = "";
-$rvar_getall_roi = "";
-
-$rvar_cmd_mode = "";
-$rvar_last_cmd_mode = "";
-$rvar_request_id = 0;
-$rvar_last_request_id = 0;
+// Initialize the request variables that we depend upon
+
+// EAM: modern PHP has deprecated the function import_request_variables
+// I have created a wrapper function to filter_input to replace
+$rvar_project         = request_var ('project', FILTER_SANITIZE_STRING);
+$rvar_email           = request_var ('email',   FILTER_VALIDATE_EMAIL);
+$rvar_select_by       = request_var ('select_by', FILTER_SANITIZE_STRING);
+$rvar_img_type        = request_var ('img_type', FILTER_SANITIZE_STRING);
+$rvar_id              = request_var ('id', FILTER_SANITIZE_STRING);
+$rvar_component       = request_var ('component', FILTER_SANITIZE_STRING);
+$rvar_survey          = request_var ('survey', FILTER_SANITIZE_STRING, "bypass");
+$rvar_release         = request_var ('release', FILTER_SANITIZE_STRING);
+$rvar_data_group      = request_var ('data_group', FILTER_SANITIZE_STRING);
+$rvar_filter          = request_var ('filter', FILTER_SANITIZE_STRING);
+$rvar_center_type     = request_var ('center_type', FILTER_SANITIZE_STRING);
+$rvar_range_type      = request_var ('range_type', FILTER_SANITIZE_STRING);
+$rvar_RA              = request_var ('RA', FILTER_VALIDATE_FLOAT);
+$rvar_DEC             = request_var ('DEC', FILTER_VALIDATE_FLOAT);
+$rvar_dRA             = request_var ('dRA', FILTER_VALIDATE_FLOAT);
+$rvar_dDEC            = request_var ('dDEC', FILTER_VALIDATE_FLOAT);
+$rvar_X               = request_var ('X', FILTER_VALIDATE_FLOAT);
+$rvar_Y               = request_var ('Y', FILTER_VALIDATE_FLOAT);
+$rvar_W               = request_var ('W', FILTER_VALIDATE_FLOAT);
+$rvar_H               = request_var ('H', FILTER_VALIDATE_FLOAT);
+$rvar_make_jpeg       = request_var ('make_jpeg', FILTER_SANITIZE_STRING);
+$rvar_getall_roi      = request_var ('getall_roi', FILTER_SANITIZE_STRING);
+$rvar_cmd_mode        = request_var ('cmd_mode', FILTER_SANITIZE_STRING);
+$rvar_last_cmd_mode   = request_var ('last_cmd_mode', FILTER_SANITIZE_STRING);
+$rvar_request_id      = request_var ('request_id', FILTER_VALIDATE_INT, 0);
+$rvar_last_request_id = request_var ('last_request_id', FILTER_VALIDATE_INT, 0);
 
 // now get the values from this post
 
-import_request_variables("gp", "rvar_");
+// import_request_variables("gp", "rvar_");
 
 if ($rvar_project == "gpc1") {
@@ -284 +282 @@
     global $rvar_survey, $rvar_release;
     global $command_line;
-    global $dbname;
-    global $dbserver;
     global $require_component;
     global $PSCONFDIR, $PSCONFIG, $WORKDIR;
@@ -314 +310 @@
 
     if ($dbname) {
-        $cmd .= " --dbname $dbname --dbserver $dbserver";
+        $cmd .= " --dbname $PS_DATABASE --dbserver $PS_HOSTNAME";
     }
 
@@ -455 +451 @@
     global $command_status;
 
-    // echo "<br>running $command_line\n<br>";
-
-    exec ("$command_line", $output_array, $command_status);
+    // EAM : testing:
+    echo "<br>running $command_line\n<br>";
+
+    // EAM : testing:
+    // exec ("$command_line", $output_array, $command_status);
+    http_response_code(400);
+    echo "<b> run command $command_line</b><br>";
+    die ("run command $command_line");
 
     $size = sizeof($output_array);
@@ -503 +504 @@
                 global $dsroot;
                 $dirName  = "$dsroot/$product/$req_name";
-                // XXX: TODO: make this a configuration parameter
-                //$filesetURL = "http://datastore.ipp.ifa.hawaii.edu/$product/$req_name";
-                $filesetURL = "http://datastore.ipp.ifa.hawaii.edu/ds/$product/$req_name";
+                $filesetURL = "$DS_URL/$product/$req_name";
 
                 $fullpath = "$dirName/$fileName";
-// echo "<pre>fullpath: $fullpath filesetURL: $filesetURL\n</pre>";
+                // echo "<pre>fullpath: $fullpath filesetURL: $filesetURL\n</pre>";
                 if (file_exists($dirName)) {
                     // this job is done, list the url as a link
@@ -551 +550 @@
   s.innerHTML = s.innerHTML - 1;
   if (s.innerHTML == 0)
-//    window.location = 'http://pstamp.ipp.ifa.hawaii.edu/request.php';
+ //    window.location = 'http://pstamp.ipp.ifa.hawaii.edu/request.php';
     location.reload();
   else
@@ -878 +877 @@
 <?php
     // echo "calling listRequests\n";
-    //listRequests("http://datastore.ipp.ifa.hawaii.edu", "pstamp_results_fileset");
-    listRequests("http://datastore.ipp.ifa.hawaii.edu/ds", "pstamp_results_fileset");
+    listRequests("$DS_URL", "pstamp_results_fileset");
 ?>