From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 1 Dec 2016 18:52:50 +0000 (-0500)
Subject: Rewrite for way to not use getLastOid
X-Git-Tag: v1.0.0^2~2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=df7725ef41c53aee8b05d9561ed447d973caf5e9;p=web%2Fwww.thelindy.com.git

Rewrite for way to not use getLastOid

this function has been deprecated in newer vrs of php.
---

diff --git a/admin/Toolbox/update_bus.phtml b/admin/Toolbox/update_bus.phtml
index 5c3e2e6..54cc92d 100755
--- a/admin/Toolbox/update_bus.phtml
+++ b/admin/Toolbox/update_bus.phtml
@@ -18,10 +18,10 @@ http_strip($url);
 if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 
 	switch($Command) {
-	
+
 		case "Move":
 			if(!$dbd = db_connect()) html_error(DB_ERROR_MSG,0);
-		
+
 			$qs = "SELECT 	pos,id
 				   FROM 	bus_category_bus
 				   WHERE 	id = $id";
@@ -30,16 +30,16 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 
 			$data = db_fetch_array($result,0,PGSQL_ASSOC);
 			$pos = $data['pos'];
-		
+
 			if($newpos < $pos) {
 				$qs = "SELECT 	id,pos
-					   FROM 	bus_category_bus 
+					   FROM 	bus_category_bus
 					   WHERE 	pos < $pos
 					   AND 		pos >= $newpos
 					   AND 		catid = $catid
 					   ORDER BY pos";
 				if(!$res = db_exec($dbd,$qs)) html_error(DB_ERROR_MSG.$qs,0);
-			
+
 				$counter = ($newpos + 1);
 				for($i=0;$i<db_numrows($res);$i++) {
 					$res_data = db_fetch_array($res,$i,PGSQL_ASSOC);
@@ -48,7 +48,7 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 					$qs = "UPDATE 	bus_category_bus
 						   SET 		pos = $counter
 						   WHERE 	id = $res_id";
-				
+
 					if(!db_exec($dbd,$qs)) html_error(DB_ERROR_MSG.$qs,0);
 					$counter++;
 				}
@@ -62,7 +62,7 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 					   ORDER BY pos";
 
 				if(!$res = db_exec($dbd,$qs)) html_error(DB_ERROR_MSG.$qs,0);
-			
+
 				$counter = ($pos);
 				for($i=0;$i<db_numrows($res);$i++) {
 					$res_data = db_fetch_array($res,$i,PGSQL_ASSOC);
@@ -71,7 +71,7 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 					$qs = "UPDATE 	bus_category_bus
 						   SET 		pos = $counter
 						   WHERE 	id = $res_id";
-					
+
 					if(!db_exec($dbd,$qs)) html_error(DB_ERROR_MSG.$qs,0);
 					$counter++;
 				}
@@ -79,16 +79,16 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 			$qs = "UPDATE	bus_category_bus
 				   SET 		pos = $newpos
 				   WHERE 	id = $id";
-	
+
 			if(!db_exec($dbd,$qs)) html_error(DB_ERROR_MSG.$qs,0);
-		
+
 			$location = "list_bus.phtml?catid=$catid";
 			break;
-	
+
 		case "Update":
 			$oldcatid = ereg_replace("^:","",$oldcatid);
 			$oldcatid = split(":",$oldcatid);
-	
+
 			if($category)
 			{
 				$category = ereg_replace("^:","",$category);
@@ -103,12 +103,12 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 		//echo "oldcatid = $oldcatid[0]<br>";
 		//echo "catid = $catid[0]<br>";
 */
-			if(!$dbd = db_connect()) 
+			if(!$dbd = db_connect())
 				html_error(DB_ERROR_MSG,0);
 			db_exec($dbd,"BEGIN WORK");
-	
+
 			$array_counter = 0;
-			if(is_array($catid)) 
+			if(is_array($catid))
 			{
 
 				$query = "select catid,pos from bus_category_bus where busid = $id";
@@ -120,37 +120,37 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 					if( !in_array( $row['catid'],$catid ) )
 					{
 						$query = "update bus_category_bus set pos = pos - 1 where catid = ".$row['catid']." and pos >= $oldpos";
-//echo $query.'<br>';	
+//echo $query.'<br>';
 						db_exec($dbd,$query);
 						$query = "delete from bus_category_bus where catid = ".$row['catid']." and busid = $id";
-//echo $query.'<br>';	
-						db_exec($dbd,$query);				
+//echo $query.'<br>';
+						db_exec($dbd,$query);
 					}
-					
+
 				}
 
-				foreach($catid as $key=>$value) 
+				foreach($catid as $key=>$value)
 				{
-				
+
 					// do this only if ald catid is being removed
 					if( !in_array( $value,$oldcatid ) )
 					{
 						$qs = "SELECT 	count(*) as maxpos
 							   FROM 	bus_category_bus
 							   WHERE	catid = $value";
-		
-						if(!$res = db_exec($dbd,$qs)) 
+
+						if(!$res = db_exec($dbd,$qs))
 							html_error(DB_ERROR_MSG.$qs,1);
-		
+
 						$row = db_fetch_array($res,0,PGSQL_ASSOC);
 						$pos = ( $row['maxpos'] == 0 ) ? (int)0 : (int)$row['maxpos'] ;
 						$pos++;
-						
-						$qs = "INSERT 	
+
+						$qs = "INSERT
 							   INTO		bus_category_bus
 										(busid,catid,pos)
 							   VALUES	($id,$value,$pos)";
-	//echo $qs.'<br>';	
+	//echo $qs.'<br>';
 						if(!db_exec($dbd,$qs))
 						{
 							html_error(DB_ERROR_MSG.$qs,1);
@@ -161,9 +161,9 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 		//exit();
 			$fields = array_reverse($fields);
 			$qs = "UPDATE ".TABLE." SET ";
-			for($i=0;$i<count($fields);$i++) 
+			for($i=0;$i<count($fields);$i++)
 				{
-				if($fields[$i][type]=="date") 
+				if($fields[$i][type]=="date")
 					{
 					$month =  $fields[$i][name]."_month";
 					$day = $fields[$i][name]."_day";
@@ -173,7 +173,7 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 					if($i != $LAST)
 						$qs .= ",";
 					}
-				elseif($fields[$i][type]=="datetime") 
+				elseif($fields[$i][type]=="datetime")
 					{
 					$month =  $fields[$i][name]."_month";
 					$day = $fields[$i][name]."_day";
@@ -182,26 +182,26 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 					$mm = $fields[$i][name]."_mm";
 					if($$mm == "PM")
 						$$H = $$H + 12;
-					$m = $fields[$i][name]."_min"; 
+					$m = $fields[$i][name]."_min";
 					$date = date("Y-m-d H:i:s T",mktime($$H,$$m,0,$$month,$$day,$$year));
 					$qs .= $fields[$i][name]." = '$date'";
 					if($i != $LAST)
 						$qs .= ",";
 					}
-				elseif($fields[$i][name]!=ID) 
+				elseif($fields[$i][name]!=ID)
 					{
-					if($fields[$i][type]=="img") 
+					if($fields[$i][type]=="img")
 						{
 						$tmpimg = $fields[$i]['name'];
 						$image_tmp = $$tmpimg;
 						$oldy = ${"old".$tmpimg};
 						$image_tmp_name = ${$tmpimg."_name"};
-						if($image_tmp == "none" || $image_tmp == "") 
+						if($image_tmp == "none" || $image_tmp == "")
 							{
 							$image_tmp_name = $oldy;
 							}
-						else 
-							{ 
+						else
+							{
 							$image_tmp_name = process_image($image_tmp,$image_tmp_name);
 							@unlink(ORIGINAL_PATH.$oldy);
 							@unlink(RESIZED_PATH.$oldy);
@@ -209,7 +209,7 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 							@unlink(MIDSIZED_PATH.$oldy);
 							}
 						$delete = ${"delete".$tmpimg};
-						if($delete==1) 
+						if($delete==1)
 							{
 							$image_tmp_name = "";
 							@unlink(ORIGINAL_PATH.$oldy);
@@ -220,28 +220,28 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 						$qs .= $fields[$i][name]." = '".$image_tmp_name."'";
 						if($i != $LAST)
 							$qs .= ",";
-						}	
-					elseif($fields[$i][type]=="seperator") 
+						}
+					elseif($fields[$i][type]=="seperator")
 						{
 							//empty
 						}
-					elseif($fields[$i][type]=="file") 
+					elseif($fields[$i][type]=="file")
 						{
 						$tmpfile = $fields[$i]['name'];
 						$file_tmp = $$tmpfile;
 						$oldy = ${"old".$tmpfile};
 						$file_tmp_name = ${$tmpfile."_name"};
-						if($file_tmp == "none" || $file_tmp == "") 
+						if($file_tmp == "none" || $file_tmp == "")
 							{
 							$file_tmp_name = $oldy;
 							}
-						else 
-							{ 
+						else
+							{
 							$file_tmp_name = file_upload($file_tmp,$file_tmp_name,UP_BASE);
 							}
 
 						$delete = ${"delete".$tmpfile};
-						if($delete==1) 
+						if($delete==1)
 							{
 							$file_tmp_name = "";
 							@unlink(UP_BASE.$oldy);
@@ -249,41 +249,41 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 						$qs .= $fields[$i][name]." = '".$file_tmp_name."'";
 						if($i != $LAST)
 							$qs .= ",";
-						}	
+						}
 					elseif($fields[$i][type]=="static")
 						{
 						}
-					elseif($fields[$i][type]=="password") 
+					elseif($fields[$i][type]=="password")
 						{
-						if(($password && $password2) && ($password == $password2)) 
+						if(($password && $password2) && ($password == $password2))
 							{
 							$qs .= $fields[$i][name]." = '".$$fields[$i][name]."'";
 							if($i != $LAST)
 								$qs .= ",";
-							}		
+							}
 						}
-					else 
+					else
 						{
 						$qs .= $fields[$i][name]." = '".$$fields[$i][name]."'";
 						if($i != $LAST)
 							$qs .= ",";
 						}
 					}
-				else 
+				else
 					{
 					$qs = substr($qs,0,strlen($qs)-1);
 					$qs .= " WHERE ".$fields[$i][name]." = ".$$fields[$i][name];
-					}	
+					}
 				}
 			$fields = array_reverse($fields);
 //echo $qs;
 //exit;
-			if(!db_exec($dbd,$qs)) 
+			if(!db_exec($dbd,$qs))
 				$ERRORS .= pg_errormessage($dbd).$qs;
 			$location = "list_bus.phtml?catid=".$catid[0]."&".SID;
 			db_exec($dbd,"COMMIT WORK");
 			break;
-	
+
 		case "Insert":
 			if($category)
 			{
@@ -293,35 +293,35 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 			if(!$dbd = db_connect()) html_error(DB_ERROR_MSG,0);
 			$tmp = "";
 			$tmp_value = "";
-			for($i=0;$i<count($fields);$i++) 
+			for($i=0;$i<count($fields);$i++)
 				{
-				if($fields[$i][name]!=ID) 
+				if($fields[$i][name]!=ID)
 					{
 					if($fields[$i][type]!="static" && $fields[$i][type]!="seperator")
 						{
 						$tmp .= $fields[$i][name];
-						$tmp .= ",";	
+						$tmp .= ",";
 						}
 					}
 				}
-			for($i=0;$i<count($fields);$i++) 
+			for($i=0;$i<count($fields);$i++)
 				{
-				if($fields[$i][type]=="date") 
+				if($fields[$i][type]=="date")
 					{
 					$month =  $fields[$i][name]."_month";
 					$day = $fields[$i][name]."_day";
 					$year = $fields[$i][name]."_year";
 					$date = date("Y-m-d H:i:s T",mktime(0,0,0,$$month,$$day,$$year));
 					$tmp_value .= "'$date'";
-					$tmp_value .= ",";	
+					$tmp_value .= ",";
 					}
-				elseif($fields[$i][type]=="static") 
+				elseif($fields[$i][type]=="static")
 					{
 					}
-				elseif($fields[$i][type]=="seperator") 
+				elseif($fields[$i][type]=="seperator")
 					{
 					}
-				elseif($fields[$i][type]=="datetime") 
+				elseif($fields[$i][type]=="datetime")
 					{
 					$month =  $fields[$i][name]."_month";
 					$day = $fields[$i][name]."_day";
@@ -330,95 +330,95 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 					$mm = $fields[$i][name]."_mm";
 					if($$mm == "PM")
 						$$H = $$H + 12;
-					$m = $fields[$i][name]."_min"; 
+					$m = $fields[$i][name]."_min";
 					$date = date("Y-m-d H:i:s T",mktime($$H,$$m,0,$$month,$$day,$$year));
 					$tmp_value .= "'$date'";
-					$tmp_value .= ",";	
+					$tmp_value .= ",";
 					}
 				elseif($fields[$i][type]=="img")
 					{
 					$tmpimg = $fields[$i]['name'];
 					$image = $$tmpimg;
 					$image_name = ${$tmpimg."_name"};
-					if($image == "none" || $image == "") 
+					if($image == "none" || $image == "")
 						{
 						$image_name = '';
 						}
-					else 
-						{ 
+					else
+						{
 						$image_name = process_image($image,$image_name);
 						}
 					$tmp_value .= "'".$image_name."'";
-					$tmp_value .= ",";	
+					$tmp_value .= ",";
 					}
 				elseif($fields[$i][type]=="file")
 					{
 					$tmpfile = $fields[$i]['name'];
 					$file = $$tmpfile;
 					$file_name = ${$tmpfile."_name"};
-					if($file == "none" || $file == "") 
+					if($file == "none" || $file == "")
 						{
 						$file_name = '';
 						}
-					else 
-						{ 
+					else
+						{
 						$file_name = file_upload($file,$file_name,UP_BASE);
 						}
 					$tmp_value .= "'".$file_name."'";
-					$tmp_value .= ",";	
+					$tmp_value .= ",";
 					}
-				elseif($fields[$i][name]!=ID) 
+				elseif($fields[$i][name]!=ID)
 					{
 					$tmp_value .= "'".$$fields[$i][name]."'";
-					$tmp_value .= ",";	
+					$tmp_value .= ",";
 					}
 				}
 			// get the lat and lon for bus
-	
+
 			// check for all blanks
 			$tmp_blank = str_replace("'","",$tmp_value);
 			$tmp_blank = str_replace(",","",$tmp_blank);
 			$tmp = substr($tmp,0,strlen($tmp)-1);
 			$tmp_value = substr($tmp_value,0,strlen($tmp_value)-1);
-			if(!$res = db_exec($dbd,"BEGIN WORK")) 
+			if(!$res = db_exec($dbd,"BEGIN WORK"))
 				die( pg_errormessage($dbd).$qs );
-			if($tmp_blank) 
+			if($tmp_blank)
 				{
-					$qs = "INSERT INTO ".TABLE." 
+					$qs = "INSERT INTO ".TABLE."
 								(".ID.", $tmp )
 						   VALUES
-								(nextval('".SEQUENCE."'), $tmp_value)";
-					if(!$res = db_exec($dbd,$qs)) 
-					{
-						die( pg_errormessage($dbd).$qs );
-					}
-					if(!$oid = pg_GetLastOid($res)) 
-					{
-						die( pg_errormessage($dbd).$qs );
-						html_error("CANT GET LAST OID",1);
-					}
-					
-					$qs = "SELECT 	id
-						   FROM 	bus 
-						   WHERE	oid = $oid";
+								(nextval('".SEQUENCE."'), $tmp_value) RETURNING id";
 					if(!$res = db_exec($dbd,$qs))
 					{
-						html_error(DB_ERROR_MSG.$qs,0);
+						die( pg_errormessage($dbd).$qs );
 					}
+					//if(!$oid = pg_GetLastOid($res))
+					//{
+						//die( pg_errormessage($dbd).$qs );
+						//html_error("CANT GET LAST OID",1);
+					//}
+
+					//$qs = "SELECT 	id
+					//	   FROM 	bus
+					//	   WHERE	oid = $oid";
+					//if(!$res = db_exec($dbd,$qs))
+					//{
+						//html_error(DB_ERROR_MSG.$qs,0);
+					//}
 					$row = db_fetch_array($res,0,PGSQL_ASSOC);
 					if(is_array($catid))
 					{
-						foreach($catid as $key=>$value) 
+						foreach($catid as $key=>$value)
 						{
 							$qs = "SELECT 	count(*) as maxpos
 								   FROM 	bus_category_bus
 								   WHERE	catid = $value";
-				
-							if(!$res = db_exec($dbd,$qs)) 
+
+							if(!$res = db_exec($dbd,$qs))
 							{
 								html_error(DB_ERROR_MSG.$qs,1);
 							}
-				
+
 							$row2 = db_fetch_array($res,0,PGSQL_ASSOC);
 							if( !$pos = $row2[maxpos])
 							{
@@ -428,17 +428,17 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 							{
 								$pos++;
 							}
-							
-							$qs = "INSERT 	
+
+							$qs = "INSERT
 								   INTO		bus_category_bus
 											(busid,catid,pos)
 								   VALUES	($row[id],$value,$pos)";
-				
+
 							if(!db_exec($dbd,$qs))
 							{
 								html_error(DB_ERROR_MSG.$qs,1);
 							}
-							if(!$res = db_exec($dbd,"COMMIT WORK")) 
+							if(!$res = db_exec($dbd,"COMMIT WORK"))
 							{
 								die( pg_errormessage($dbd).$qs );
 							}
@@ -449,12 +449,12 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 							$qs = "SELECT 	count(*) as maxpos
 								   FROM 	bus_category_bus
 								   WHERE	catid = $catid";
-				
-							if(!$res = db_exec($dbd,$qs)) 
+
+							if(!$res = db_exec($dbd,$qs))
 							{
 								html_error(DB_ERROR_MSG.$qs,1);
 							}
-				
+
 							$row2 = db_fetch_array($res,0,PGSQL_ASSOC);
 							if( !$pos = $row2[maxpos])
 							{
@@ -464,110 +464,110 @@ if(	$REQUEST_METHOD == "POST" || $Command == "Move"	) {
 							{
 								$pos++;
 							}
-							$qs = "INSERT 	
+							$qs = "INSERT
 								   INTO		bus_category_bus
 											(busid,catid,pos)
 								   VALUES	($row[id],$catid,$pos)";
-				
+
 							if(!db_exec($dbd,$qs))
 							{
 								html_error(DB_ERROR_MSG.$qs,1);
 							}
-							if(!$res = db_exec($dbd,"COMMIT WORK")) 
+							if(!$res = db_exec($dbd,"COMMIT WORK"))
 							{
 								die( pg_errormessage($dbd).$qs );
 							}
 					}
 				}
-			$location = "list_bus.phtml?catid=".$catid[0]."&".SID; 
-		
+			$location = "list_bus.phtml?catid=".$catid[0]."&".SID;
+
 			break;
-	
+
 		case "Delete":
 			$oldcatid = ereg_replace("^:","",$oldcatid);
 			$oldcatid = split(":",$oldcatid);
-	
+
 			$qs = "DELETE FROM bus
 				   WHERE id = $id";
 			if(!db_auto_exec($qs)) html_error("failed ->".$qs,1);
-			
+
 			@unlink(ORIGINAL_PATH."/".$oldimage);
 			@unlink(RESIZED_PATH.$oldimage);
 			@unlink(THUMB_PATH.$oldimage);
 			@unlink(MIDSIZED_PATH.$oldimage);
-			
+
 			@unlink(ORIGINAL_PATH."/".$oldimage2);
 			@unlink(RESIZED_PATH.$oldimage2);
 			@unlink(THUMB_PATH.$oldimage2);
 			@unlink(MIDSIZED_PATH.$oldimage2);
-			
+
 			@unlink(ORIGINAL_PATH."/".$oldimage3);
 			@unlink(RESIZED_PATH.$oldimage3);
 			@unlink(THUMB_PATH.$oldimage3);
 			@unlink(MIDSIZED_PATH.$oldimage3);
-			
+
 			@unlink(UP_BASE.$oldfile);
 			@unlink(UP_BASE.$oldfile2);
 			@unlink(UP_BASE.$oldfile3);
 			$dbd = db_connect();
-			
+
 			if(!$dbd) html_erro(DB_ERROR_MSG,1);
-			
+
 			foreach($oldcatid as $key=>$value){
 				$qs = "SELECT 	id,pos
 					   FROM 	bus_category_bus
 					   WHERE	busid = $id";
-	
-				if(!$res = db_exec($dbd,$qs)) 
+
+				if(!$res = db_exec($dbd,$qs))
 					html_error(DB_ERROR_MSG.$qs,1);
-				
+
 				$row = db_fetch_array($res,0,PGSQL_ASSOC);
-				
+
 				$qs = "SELECT 	id
 					   FROM 	bus_category_bus
 					   WHERE	pos > $row[pos]
 					   AND 		catid = $value
 					   ORDER BY pos";
-				
-				if(!$res2 = db_exec($dbd,$qs)) 
+
+				if(!$res2 = db_exec($dbd,$qs))
 					html_error(DB_ERROR_MSG.$qs,1);
-				
+
 					$counter = $row[pos];
 					for($i=0;$i<db_numrows($res2);$i++) {
 						$row2 = db_fetch_array($res2,$i,PGSQL_ASSOC);
-					
+
 						$qs = "UPDATE	bus_category_bus
 							   SET		pos = $counter
 							   WHERE	id = $row2[id]";
-							   
-						if(!db_exec($dbd,$qs)) 
+
+						if(!db_exec($dbd,$qs))
 							html_error(DB_ERROR_MSG.$qs,1);
 						$counter++;
 					}
 				}
-				$qs = "DELETE	
+				$qs = "DELETE
 					   FROM 	bus_category_bus
 					   WHERE	busid = $id";
-						   
-				if(!db_exec($dbd,$qs)) 
+
+				if(!db_exec($dbd,$qs))
 					html_error(DB_ERROR_MSG.$qs,1);
-				$location = "list_bus.phtml?catid=".$oldcatid[0]."&".SID; 
+				$location = "list_bus.phtml?catid=".$oldcatid[0]."&".SID;
 			break;
-	
+
 		case "Cancel":
 			$oldcatid = ereg_replace("^:","",$oldcatid);
 			$oldcatid = split(":",$oldcatid);
 			$catid = ereg_replace("^:","",$oldcatid);
 			$catid = split(":",$oldcatid);
-			$location = "list_bus.phtml?catid=".$oldcatid[0]."&".SID; 
+			$location = "list_bus.phtml?catid=".$oldcatid[0]."&".SID;
 			break;
-	
+
 		default:
 			html_error("incorrect value for Command",1);
 			break;
-			
+
 	}
-	
+
 	header("Location: $location");
 }
 ?>