Fix PHP 8.2 compatibility across core classes

classes/BinAudits.class.php

@@ -29,7 +29,7 @@ class BinAudits {
 
 	function MakeSafe(){
 		$this->BinID=intval($this->BinID);
-		$this->UserID=sanitize($this->UserID);
+		$this->UserID=trim($this->UserID);
 		$this->AuditStamp=sanitize($this->AuditStamp);
 	}
 
@@ -48,7 +48,12 @@ function AddAudit(){
 		$this->MakeSafe();
 
 		$sql="INSERT INTO fac_BinAudits SET BinID=$this->BinID, UserID=\"$this->UserID\", AuditStamp=\"$this->AuditStamp\";";
-		$this->exec($sql);
+		if ( $this->exec($sql) === false ) {
+			$info = $GLOBALS['dbh']->errorInfo();
+			error_log("BinAudits::AddAudit PDO Error: {$info[2]} SQL=$sql");
+			return false;
+}
+return true;
 	}
 
 	public static function RedactUser($UserID) {

classes/BinContents.class.php

@@ -53,6 +53,7 @@ function exec($sql){
 	}
 
 	function AddContents(){
+		$this->MakeSafe();
 		$sql="INSERT INTO fac_BinContents SET BinID=$this->BinID, SupplyID=$this->SupplyID, Count=$this->Count;";
 		return $this->exec($sql);
 	}
@@ -92,7 +93,7 @@ function UpdateCount(){
 		$sql="UPDATE fac_BinContents SET Count=$this->Count WHERE BinID=$this->BinID 
 			AND SupplyID=$this->SupplyID;";
 
-		return $this->query($sql);
+		return $this->exec($sql);
 	}
 
 	function RemoveContents(){

classes/CDUInfo.class.php

@@ -43,10 +43,10 @@ static private function BasicTests($DeviceID){
 
 		// If the device doesn't have an SNMP community set,
 		// check and see if we have a global one
-		$dev->SNMPCommunity=($dev->SNMPCommunity=="")?$config->ParameterArray["SNMPCommunity"]:$dev->SNMPCommunity;
+		$dev->SNMPCommunity=($dev->SNMPCommunity=="")?($config->ParameterArray["SNMPCommunity"] ?? ''):$dev->SNMPCommunity;
 
 		// Make this false faster
-		$dev->SNMPCommunity=trim($dev->SNMPCommunity);
+		$dev->SNMPCommunity=trim((string)$dev->SNMPCommunity);
 		if($dev->SNMPCommunity==""){return false;}
 
 		// We've passed all the repeatable tests, return the device object for digging
@@ -58,8 +58,8 @@ static private function BasicTests($DeviceID){
 	static private function OSS_SNMP_Lookup($dev,$snmplookup,$portid=null,$baseOID=null){
 		// This is find out the name of the function that called this to
 		// make the error logging more descriptive
-		$caller=debug_backtrace();
-		$caller=$caller[1]['function'];
+		$trace=debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+		$caller=$trace[1]['function'] ?? 'unknown';
 
 		// Since we don't really let the user specify the version right now here's a stop gap
 		// Try the default version of 2c first

classes/CDUTemplate.class.php

@@ -75,43 +75,43 @@ function MakeSafe(){
 	}
 
 	function MakeDisplay(){
-		$this->Model=stripslashes($this->Model);
-		$this->VersionOID=stripslashes($this->VersionOID);
-		$this->OutletNameOID=stripslashes($this->OutletNameOID);
-		$this->OutletDescOID=stripslashes($this->OutletDescOID);
-		$this->OutletCountOID=stripslashes($this->OutletCountOID);
-		$this->OutletStatusOID=stripslashes($this->OutletStatusOID);
-		$this->OutletStatusOn=stripslashes($this->OutletStatusOn);
-		$this->OID1=stripslashes($this->OID1);
-		$this->OID2=stripslashes($this->OID2);
-		$this->OID3=stripslashes($this->OID3);
-		$this->ATSStatusOID=stripslashes($this->ATSStatusOID);
-		$this->ATSDesiredResult=stripslashes($this->ATSDesiredResult);
+		$this->Model=stripslashes((string)$this->Model);
+		$this->VersionOID=stripslashes((string)$this->VersionOID);
+		$this->OutletNameOID=stripslashes((string)$this->OutletNameOID);
+		$this->OutletDescOID=stripslashes((string)$this->OutletDescOID);
+		$this->OutletCountOID=stripslashes((string)$this->OutletCountOID);
+		$this->OutletStatusOID=stripslashes((string)$this->OutletStatusOID);
+		$this->OutletStatusOn=stripslashes((string)$this->OutletStatusOn);
+		$this->OID1=stripslashes((string)$this->OID1);
+		$this->OID2=stripslashes((string)$this->OID2);
+		$this->OID3=stripslashes((string)$this->OID3);
+		$this->ATSStatusOID=stripslashes((string)$this->ATSStatusOID);
+		$this->ATSDesiredResult=stripslashes((string)$this->ATSDesiredResult);
 	}
 
 	static function RowToObject($row){
 		$template=new CDUTemplate();
-		$template->TemplateID=$row["TemplateID"];
-		$template->ManufacturerID=$row["ManufacturerID"];
-		$template->Model=$row["Model"];
-		$template->Managed=$row["Managed"];
-		$template->ATS=$row["ATS"];
-		$template->VersionOID=$row["VersionOID"];
-		$template->OutletNameOID=$row["OutletNameOID"];
-		$template->OutletDescOID=$row["OutletDescOID"];
-		$template->OutletCountOID=$row["OutletCountOID"];
-		$template->OutletStatusOID=$row["OutletStatusOID"];
-		$template->OutletStatusOn=$row["OutletStatusOn"];
-		$template->Multiplier=$row["Multiplier"];
-		$template->OID1=$row["OID1"];
-		$template->OID2=$row["OID2"];
-		$template->OID3=$row["OID3"];
-		$template->ATSStatusOID=$row["ATSStatusOID"];
-		$template->ATSDesiredResult=$row["ATSDesiredResult"];
-		$template->ProcessingProfile=$row["ProcessingProfile"];
-		$template->Voltage=$row["Voltage"];
-		$template->Amperage=$row["Amperage"];
-		$template->NumOutlets=$row["NumOutlets"];
+		$template->TemplateID=$row["TemplateID"] ?? null;
+		$template->ManufacturerID=$row["ManufacturerID"] ?? null;
+		$template->Model=$row["Model"] ?? null;
+		$template->Managed=$row["Managed"] ?? null;
+		$template->ATS=$row["ATS"] ?? null;
+		$template->VersionOID=$row["VersionOID"] ?? null;
+		$template->OutletNameOID=$row["OutletNameOID"] ?? null;
+		$template->OutletDescOID=$row["OutletDescOID"] ?? null;
+		$template->OutletCountOID=$row["OutletCountOID"] ?? null;
+		$template->OutletStatusOID=$row["OutletStatusOID"] ?? null;
+		$template->OutletStatusOn=$row["OutletStatusOn"] ?? null;
+		$template->Multiplier=$row["Multiplier"] ?? null;
+		$template->OID1=$row["OID1"] ?? null;
+		$template->OID2=$row["OID2"] ?? null;
+		$template->OID3=$row["OID3"] ?? null;
+		$template->ATSStatusOID=$row["ATSStatusOID"] ?? null;
+		$template->ATSDesiredResult=$row["ATSDesiredResult"] ?? null;
+		$template->ProcessingProfile=$row["ProcessingProfile"] ?? null;
+		$template->Voltage=$row["Voltage"] ?? null;
+		$template->Amperage=$row["Amperage"] ?? null;
+		$template->NumOutlets=$row["NumOutlets"] ?? null;
 
 		$template->MakeDisplay();
 
@@ -125,8 +125,10 @@ function GetTemplateList(){
 			a.ManufacturerID=b.ManufacturerID ORDER BY b.Name ASC,a.Model ASC;";
 
 		$tmpList=array();
-		foreach($dbh->query($sql) as $row){
-			$tmpList[]=CDUTemplate::RowToObject($row);
+		if($stmt=$dbh->query($sql)){
+			foreach($stmt as $row){
+				$tmpList[]=CDUTemplate::RowToObject($row);
+			}
 		}
 
 		return $tmpList;
@@ -139,7 +141,8 @@ function GetTemplate(){
 
 		$sql="SELECT * FROM fac_CDUTemplate WHERE TemplateID=$this->TemplateID";
 
-		if($row=$dbh->query($sql)->fetch()){
+		$stmt=$dbh->query($sql);
+		if($stmt && ($row=$stmt->fetch())){
 			foreach(CDUTemplate::RowToObject($row) as $prop => $value){
 				$this->$prop=$value;
 			}

classes/CabRow.class.php

@@ -36,15 +36,15 @@ function MakeSafe() {
 	}
 
 	function MakeDisplay(){
-		$this->Name=stripslashes($this->Name);
+		$this->Name=stripslashes((string)$this->Name);
 	}
 
 	static function RowToObject($row){
 		$cabrow=new CabRow();
-		$cabrow->CabRowID=$row["CabRowID"];
-		$cabrow->Name=$row["Name"];
-		$cabrow->DataCenterID=$row["DataCenterID"];
-		$cabrow->ZoneID=$row["ZoneID"];
+		$cabrow->CabRowID=$row["CabRowID"] ?? null;
+		$cabrow->Name=$row["Name"] ?? null;
+		$cabrow->DataCenterID=$row["DataCenterID"] ?? null;
+		$cabrow->ZoneID=$row["ZoneID"] ?? null;
 		$cabrow->MakeDisplay();
 
 		return $cabrow;
@@ -134,8 +134,10 @@ function GetCabRow(){
 
 		$sql="SELECT * FROM fac_CabRow WHERE CabRowID=$this->CabRowID;";
 
-		if($row=$this->query($sql)->fetch()){
-			foreach(CabRow::RowToObject($row) as $prop => $value){
+		$stmt=$this->query($sql);
+		if($stmt && ($row=$stmt->fetch())){
+			$tmp = CabRow::RowToObject($row);
+			foreach (get_object_vars($tmp) as $prop => $value) {
 				$this->$prop=$value;
 			}
 			return true;
@@ -150,8 +152,10 @@ function GetCabRowsByZones(){
 		$sql="SELECT * FROM fac_CabRow WHERE ZoneID=$this->ZoneID ORDER BY Name;";
 
 		$cabrowList=array();
-		foreach($this->query($sql) as $row){
-			$cabrowList[]=CabRow::RowToObject($row);
+		if($stmt=$this->query($sql)){
+			foreach($stmt as $row){
+				$cabrowList[]=CabRow::RowToObject($row);
+			}
 		}
 
 		return $cabrowList;
@@ -166,18 +170,23 @@ function GetCabRowsByDC($nozone=false){
 		$sql="SELECT * FROM fac_CabRow WHERE DataCenterID=$this->DataCenterID AND $sqladdon ORDER BY Name;";
 
 		$cabrowList=array();
-		foreach($this->query($sql) as $row){
-			$cabrowList[]=CabRow::RowToObject($row);
+		if($stmt=$this->query($sql)){
+			foreach($stmt as $row){
+				$cabrowList[]=CabRow::RowToObject($row);
+			}
 		}
 
 		return $cabrowList;
 	}
 	function GetCabRowList(){
+		$this->MakeSafe();
 		$sql="SELECT * FROM fac_CabRow ORDER BY Name ASC;";
 
 		$cabrowList=array();
-		foreach($this->query($sql) as $row){
-			$cabrowList[]=CabRow::RowToObject($row);
+		if($stmt=$this->query($sql)){
+			foreach($stmt as $row){
+				$cabrowList[]=CabRow::RowToObject($row);
+			}
 		}
 
 		return $cabrowList;
@@ -203,8 +212,9 @@ function GetCabRowFrontEdge($layout=""){
 			CabRowID=$this->CabRowID$layout GROUP BY FrontEdge ORDER BY CabCount DESC 
 			LIMIT 1;";
 
-		if($cabinetRow=$this->query($sql)->fetch()){
-			return $cabinetRow["FrontEdge"];
+		$stmt=$this->query($sql);
+		if($stmt && ($cabinetRow=$stmt->fetch())){
+			return $cabinetRow["FrontEdge"] ?? "";
 		}
 
 		return "";
@@ -213,8 +223,8 @@ function GetCabRowFrontEdge($layout=""){
 	function Search($indexedbyid=false,$loose=false){
 		$o=new stdClass();
 		// Store any values that have been added before we make them safe 
-		foreach($this as $prop => $val){
-			if(isset($val)){
+		foreach (get_object_vars($this) as $prop => $val) {
+			if ($val !== null) {
 				$o->$prop=$val;
 			}
 		}
@@ -233,11 +243,13 @@ function Search($indexedbyid=false,$loose=false){
 
 		$rowList=array();
 
-		foreach($this->query($sql) as $row){
-			if($indexedbyid){
-				$rowList[$row["CabRowID"]]=CabRow::RowToObject($row);
-			}else{
-				$rowList[]=CabRow::RowToObject($row);
+		if($stmt=$this->query($sql)){
+			foreach($stmt as $row){
+				if($indexedbyid){
+					$rowList[$row["CabRowID"] ?? null]=CabRow::RowToObject($row);
+				}else{
+					$rowList[]=CabRow::RowToObject($row);
+				}
 			}
 		}
 
@@ -249,4 +261,4 @@ function LooseSearch($indexedbyid=false){
 		return $this->Search($indexedbyid,true);
 	}
 }
-?>
+?>

classes/Cabinet.class.php

@@ -172,9 +172,9 @@ private function FilterRights(){
 		if($this->Rights=='None'){
 			// ZoneID and CabRowID are probably both not important but meh
 			$publicfields=array('CabinetID','DataCenterID','Location','LocationSortable','ZoneID','CabRowID','Rights','AssignedTo','U1Position');
-			foreach($this as $prop => $value){
-				if(!in_array($prop,$publicfields)){
-					$this->$prop=null;
+			foreach (get_object_vars($this) as $prop => $value) {
+    			if (!in_array($prop, $publicfields, true)) {
+        		$this->$prop = null;
 				}
 			}
 		}
@@ -254,8 +254,9 @@ function GetCabinet(){
 		$sql="SELECT * FROM fac_Cabinet WHERE CabinetID=$this->CabinetID;";
 
 		if($cabinetRow=$dbh->query($sql)->fetch()){
-			foreach(Cabinet::RowToObject($cabinetRow) as $prop => $value){
-				$this->$prop=$value;
+			$tmp = Cabinet::RowToObject($cabinetRow);
+			foreach (get_object_vars($tmp) as $prop => $value) {
+    			$this->$prop = $value;
 			}
 			return true;
 		}else{
@@ -539,15 +540,16 @@ function Search($indexedbyid=false,$loose=false){
 
 		// This will store all our extended sql
 		$sqlextend="";
-		foreach($this as $prop => $val){
+		$epochDate=date("Y-m-d",0);
+		foreach (get_object_vars($this) as $prop => $val) {
 			// We force the following values to knowns in makesafe 
 			if($prop=="FrontEdge" && $val=="Top" && $ot!="Top"){
 				continue;
 			}
 			if($prop=="U1Position" && $val=="Default" && $op!="Default") {
 				continue;
 			}
-			if($val && $val!=date("Y-m-d", strtotime(0))){
+			if($val && $val !== $epochDate){
 				extendsql($prop,$val,$sqlextend,$loose);
 			}
 		}
@@ -580,9 +582,14 @@ function SearchByCustomTag( $tag=null ) {
 
 		$cabinetList=array();
 
-		foreach ( $dbh->query( $sql ) as $cabinetRow ) {
-			$cabID=$cabinetRow["CabinetID"];
-			$cabinetList[$cabID]=Cabinet::RowToObject($cabinetRow);
+		$stmt = $dbh->query($sql);
+			if ( $stmt === false ) {
+    		return $cabinetList;
+		}
+
+		foreach ( $stmt as $cabinetRow ) {
+    		$cabID = $cabinetRow['CabinetID'];
+    		$cabinetList[$cabID] = Cabinet::RowToObject($cabinetRow);
 		}
 		return $cabinetList;
 	}
@@ -594,9 +601,13 @@ function GetTags() {
 
 		$tags = array();
 
-		foreach ( $dbh->query( $sql ) as $row ) {
-			$tags[]=Tags::FindName($row[0]);
+		$stmt = $dbh->query($sql);
+    	if ( $stmt === false ) {
+        return $tags;
 		}
+		foreach ( $stmt as $row ) {
+        $tags[] = Tags::FindName($row[0]);
+    	}
 
 		return $tags;
 	}