Changeset 42996 for branches/eam_branches/ipp-pstamp-20260421/pstamp/web/submitted.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/submitted.php (modified) (5 diffs)

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

@@ -72 +72 @@
         if ($id && ($req->state != "stop")) {
             // Get the current state of this request from the database
-            if (!$dbserver) {
-                $dbserver = dblogin();
+            if (!$dbconnection) {
+                $dbconnection = dblogin("PSTAMP");
             }
 
@@ -79 +79 @@
             // echo "<br />$query<br />";
 
-            $result  = mysqli_query($dbserver, $query);
+            $result  = mysqli_query($dbconnection, $query);
             if (!$result) {
-                die("Database access failed: " . mysqli_error($dbserver));
+                die("Database access failed: " . mysqli_error($dbconnection));
             }
 
@@ -128 +128 @@
 function listRequests($dataStoreRoot, $targetWindow)
 {
-    $debug_listing = 0;
-    $request_count = count($_SESSION['requests']);
-    // echo "request_count: $request_count<br />";
+  $debug_listing = 0;
+  $request_count = count($_SESSION['requests']);
+  $dbconnection = 0;
+  
+  // echo "request_count: $request_count<br />";
 
     for ($i = $request_count-1; $i >= 0; $i--) {
@@ -147 +149 @@
             // Request not done last time that we checked.
             // Get its current state of this request from the database
-            if (!$dbserver) {
-                $dbserver = dblogin();
+            if (!$dbconnection) {
+                $dbconnection = dblogin("PSTAMP");
             }
             $query = "SELECT pstampRequest.state, COUNT(job_id) as num_jobs, pstampRequest.fault, pstampRequest.outProduct FROM pstampRequest LEFT JOIN pstampJob USING(req_id) WHERE req_id = $id";
@@ -154 +156 @@
             // echo "<br />$query<br />";
 
-            $result  = mysqli_query($dbserver, $query);
+            $result  = mysqli_query($dbconnection, $query);
             if (!$result) {
-                die("Database access failed: " . mysqli_error($dbserver));
+                die("Database access failed: " . mysqli_error($dbconnection));
             }