From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 28 Nov 2016 20:34:30 +0000 (-0500)
Subject: PHP version doesn't have get last oid function anymore
X-Git-Tag: v1.0.0~6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=46a96edd416f3e41558444709870190ba467b6de;p=web%2Fwww.mackinacislandpackage.com.git

PHP version doesn't have get last oid function anymore

Need to replace these with this better way of getting the last id from
an insert statement. Using the postgres RETURNING id to get it.
---

diff --git a/admin/packages/orderForm.php b/admin/packages/orderForm.php
index f8ee791..520800c 100644
--- a/admin/packages/orderForm.php
+++ b/admin/packages/orderForm.php
@@ -223,7 +223,7 @@ class orderForm extends form_creator
             // need to unset session var above durring !$_POST
             $_SESSION['MackinacPackageSubmit'] = true;
             return $out;
-            
+
         }
     }
 
@@ -307,19 +307,19 @@ class orderForm extends form_creator
             $this->DB->db_exec($query) ;
         } else {
             // if they don't exists then setup INSERT
-            $query      = "INSERT INTO contact ($contact_fields) VALUES ('$contact_values');";
+            $query      = "INSERT INTO contact ($contact_fields) VALUES ('$contact_values') RETURNING id;";
             $res2       = $this->DB->db_exec($query) ;
-            $lastoid    = pg_getlastoid($res2) ;
-            $query      = "SELECT id FROM contact WHERE oid = $lastoid";
-            $res3       = $this->DB->db_exec($query) ;
-            $contact_id = pg_result($res3, 0, 'id') ;
+            //$lastoid    = pg_getlastoid($res2) ;
+            //$query      = "SELECT id FROM contact WHERE oid = $lastoid";
+            //$res3       = $this->DB->db_exec($query) ;
+            $contact_id = pg_result($res2, 0, 'id') ;
         }
-        $query      = "INSERT INTO package_req (contact_id,$fields) VALUES ($contact_id,'$values')";
+        $query      = "INSERT INTO package_req (contact_id,$fields) VALUES ($contact_id,'$values') RETURNING package_number;";
         $res        = $this->DB->db_exec($query) ;
-        $lastoid    = pg_getlastoid($res) ;
-        $query2     = "SELECT package_number FROM package_req WHERE oid = $lastoid";
-        $res2       = $this->DB->db_exec($query2) ;
-        $package_id = pg_result($res2, 0, 'package_number');
+        //$lastoid    = pg_getlastoid($res) ;
+        //$query2     = "SELECT package_number FROM package_req WHERE oid = $lastoid";
+        //$res2       = $this->DB->db_exec($query2) ;
+        $package_id = pg_result($res, 0, 'package_number');
         $this->send_cust_email($package_id) ;
         header('Location: index.php');exit;
     }
diff --git a/classes/class_order_form.inc b/classes/class_order_form.inc
index cab6da8..48fde6e 100755
--- a/classes/class_order_form.inc
+++ b/classes/class_order_form.inc
@@ -366,24 +366,24 @@ class order_form extends form_creator
             $this->DB->db_exec($query) ;
         } else {
             // if they don't exists then setup INSERT
-            $lastoid    = pg_getlastoid($res2) ;
-            $query      = "INSERT INTO contact ($contact_fields) VALUES ('$contact_values');";
+            //$lastoid    = pg_getlastoid($res2) ;
+            $query      = "INSERT INTO contact ($contact_fields) VALUES ('$contact_values') RETURNING id;";
             $res2       = $this->DB->db_exec($query);
-        	$lastoid    = pg_getlastoid($res2) ;
-            $query      = "SELECT id FROM contact WHERE oid = $lastoid";
-            $res3       = $this->DB->db_exec($query) ;
-            $contact_id = pg_result($res3, 0, 'id') ;
+        	//$lastoid    = pg_getlastoid($res2) ;
+            //$query      = "SELECT id FROM contact WHERE oid = $lastoid";
+            //$res3       = $this->DB->db_exec($query) ;
+            $contact_id = pg_result($res2, 0, 'id') ;
         }
         if (!$contact_id) {
             $query = "INSERT INTO package_req (contact_id,$fields) VALUES (null,'$values')";
         } else {
-            $query = "INSERT INTO package_req (contact_id,$fields) VALUES ($contact_id,'$values')";
+            $query = "INSERT INTO package_req (contact_id,$fields) VALUES ($contact_id,'$values') RETURNING package_number;";
         }
         $res        = $this->DB->db_exec($query) ;
-        $lastoid    = pg_getlastoid($res) ;
-        $query2     = "SELECT package_number FROM package_req WHERE oid = $lastoid";
-        $res2       = $this->DB->db_exec($query2) ;
-        $package_id = pg_result($res2, 0, 'package_number');
+        //$lastoid    = pg_getlastoid($res) ;
+        //$query2     = "SELECT package_number FROM package_req WHERE oid = $lastoid";
+        //$res2       = $this->DB->db_exec($query2) ;
+        $package_id = pg_result($res, 0, 'package_number');
 
         $confirmation
             = $this->send_cust_email($package_id) ;