diff --git a/api/v1/deleteRoutes.php b/api/v1/deleteRoutes.php index 8bbf4db36..5950bf85c 100644 --- a/api/v1/deleteRoutes.php +++ b/api/v1/deleteRoutes.php @@ -62,7 +62,7 @@ $pp=new PowerPorts(); $pp->DeviceID=$deviceid; - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( property_exists( $pp, $prop )) { @@ -362,7 +362,7 @@ function updatedevice($deviceid){ // Returns: true/false on delete operation $app->delete( '/powerconnectortypes/{id}', function( Request $request, Response $response, $args ) use ($person) { - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); $id = intval($args["id"]); $r['error']=true; diff --git a/api/v1/getRoutes.php b/api/v1/getRoutes.php index 5d0b22043..42e7f290d 100644 --- a/api/v1/getRoutes.php +++ b/api/v1/getRoutes.php @@ -31,7 +31,7 @@ return $response->withJson( $r, $r['errorcode'] ); } - $attrList = $request->getQueryParams() ?: $request->getParsedBody(); + $attrList = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); if ( isset( $attrList["DeviceID"] ) ) { $auditList = LogActions::getDeviceAudits( $attrList["DeviceID"] ); @@ -69,7 +69,7 @@ $sp=new People(); $loose = false; $outputAttr = array(); - $attrList = $request->getQueryParams() ?: $request->getParsedBody(); + $attrList = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($attrList as $prop => $val){ if ( strtoupper($prop) == "WILDCARDS" ) { @@ -114,7 +114,7 @@ $dept=new Department(); $loose = false; $outputAttr = array(); - $attrList = $request->getQueryParams() ?: $request->getParsedBody(); + $attrList = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($attrList as $prop => $val){ if ( strtoupper($prop) == "WILDCARDS" ) { $loose = true; @@ -153,7 +153,7 @@ $outputAttr = array(); $loose = false; - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); if ( $config->ParameterArray["GDPRCountryIsolation"] == "enabled" && !$person->SiteAdmin ) { $vars["countryCode"] = $person->countryCode; } @@ -218,7 +218,7 @@ $loose = false; $outputAttr = array(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( strtoupper($prop) == "WILDCARDS" ) { @@ -284,6 +284,7 @@ if ( array_key_exists( "cabinetid", $args ) ) { $cabinetid = $args["cabinetid"]; } else { + $cabinetid = ''; return $response->withJson(array("message"=>"Cabinet $cabinetid not found."), 404); } @@ -327,6 +328,7 @@ $app->get( '/cabinet/{cabinetid}/sensor', function( Request $request, Response $response, array $args ) use ($config,$person) { $dc = new DataCenter(); + $cabinetid = $args['cabinetid']; if ( $config->ParameterArray["GDPRCountryIsolation"] == "enabled" && !$person->SiteAdmin ) { $dcList = array(); @@ -379,7 +381,7 @@ $loose = false; $outputAttr = array(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( strtoupper($prop) == "WILDCARDS" ) { @@ -516,12 +518,12 @@ $app->get( '/deviceport/{deviceid}/patchcandidates', function( Request $request, Response $response, $args ) { $deviceid = intval($args["deviceid"]); $s=new stdClass(); - $vars = $request->getParsedBody(); - $s->portnumber=$vars['PortNumber']; - $s->connectto=$vars['connectto']; - $s->listports=$vars['listports']; - $s->patchpanels=$vars['patchpanels']; - $s->limiter=$vars['limiter']; + $vars = $request->getParsedBody() ?: array(); + $s->portnumber=$vars['PortNumber'] ?? null; + $s->connectto=$vars['connectto'] ?? null; + $s->listports=$vars['listports'] ?? null; + $s->patchpanels=$vars['patchpanels'] ?? null; + $s->limiter=$vars['limiter'] ?? null; $r['error']=false; $r['errorcode']=200; @@ -870,7 +872,7 @@ $loose = false; $outputAttr = array(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( strtoupper($prop) == "WILDCARDS" ) { @@ -1035,7 +1037,7 @@ $r['error']=false; $r['errorcode']=200; - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ $man->$prop=$val; } @@ -1056,7 +1058,7 @@ $r['error']=false; $r['errorcode']=200; - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ $zone->$prop=$val; } @@ -1080,9 +1082,9 @@ $r['error']=false; $r['errorcode']=200; - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ - $dev->$prop=$val; + $zone->$prop=$val; } $r['zone']=$zone->GetZone(); @@ -1102,7 +1104,7 @@ $r['error']=false; $r['errorcode']=200; - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ $cabrow->$prop=$val; @@ -1138,7 +1140,7 @@ $app->get( '/sensorreadings', function(Request $request, Response $response) { $sensorreadings=new SensorReadings(); $outputAttr = array(); - $attrList = $request->getQueryParams() ?: $request->getParsedBody(); + $attrList = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); $loose = false; foreach($attrList as $prop => $val){ @@ -1190,7 +1192,7 @@ $app->get( '/pdustats', function(Request $request, Response $response) use ($person) { $pdustats=new PDUStats(); $outputAttr = array(); - $attrList = $request->getQueryParams() ?: $request->getParsedBody(); + $attrList = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); $loose = false; foreach($attrList as $prop => $val){ @@ -1242,7 +1244,7 @@ $app->get( '/vminventory', function(Request $request, Response $response) { $vm = new VM(); $outputAttr = array(); - $attrList = $request->getQueryParams() ?: $request->getParsedBody(); + $attrList = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); $loose = false; foreach($attrList as $prop => $val){ @@ -1294,7 +1296,7 @@ $app->get( '/powerpanel', function(Request $request, Response $response) { $pp = new PowerPanel(); $outputAttr = array(); - $attrList = $request->getQueryParams() ?: $request->getParsedBody(); + $attrList = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); $loose = false; foreach($attrList as $prop => $val){ @@ -1343,7 +1345,7 @@ // Params: Optionally filter by DataCenterID, ZoneID, RowID, CabinetID // Returns: Device information for all polling power/CDU sensors that meet the filter criteria $app->get( '/pollers/power', function(Request $request, Response $response) { - $filters = $request->getQueryParams() ?: $request->getParsedBody(); + $filters = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); $dev = new Device(); @@ -1390,7 +1392,7 @@ // Params: Optionally filter by DataCenterID, ZoneID, RowID, CabinetID // Returns: Device information for all polling sensors that meet the filter criteria $app->get( '/pollers/sensors', function(Request $request, Response $response) { - $filters = $request->getQueryParams() ?: $request->getParsedBody(); + $filters = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); $dev = new Device(); diff --git a/api/v1/index.php b/api/v1/index.php index 2e20e07e4..42375a641 100644 --- a/api/v1/index.php +++ b/api/v1/index.php @@ -25,9 +25,9 @@ $app = new \Slim\App($c); // Import any local extensions to the API, which obviously will not be supported - foreach( glob("../local/*.php") as $filename) { - include_once( $filename ); - } + foreach( (glob("../local/*.php") ?: []) as $filename) { + include_once( $filename ); + } /* * diff --git a/api/v1/postRoutes.php b/api/v1/postRoutes.php index 5075ffc70..38bca0bed 100644 --- a/api/v1/postRoutes.php +++ b/api/v1/postRoutes.php @@ -44,7 +44,7 @@ $r['message']=__("UserID=" . $p->PersonID . " not found in database."); } else { // Slim Framework will simply return null for any variables that were not passed, so this is safe to call without blowing up the script - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($p as $prop => $val){ if ( isset( $vars[$prop] ) ){ $p->$prop=$vars[$prop]; @@ -147,7 +147,7 @@ } else { $pp=new PowerPorts(); $pp->DeviceID=$deviceid; - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ $pp->$prop=$val; } @@ -178,7 +178,7 @@ } else { $cab = new Cabinet(); $cab->CabinetID=$cabinetid; - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach ($vars as $prop=>$val) { if ( property_exists($cab, $prop)) { @@ -236,7 +236,7 @@ $r['message'] = __("Access Denied"); } else { $cc=new ColorCoding(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( property_exists($cc, $prop)) { $cc->$prop=$val; @@ -313,7 +313,7 @@ $r['errorcode']=401; $r['message']=__("Access Denied"); }else{ - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( property_exists( $dev, $prop )) { $dev->$prop=$val; @@ -389,7 +389,7 @@ $r['errorcode']=404; $r['message']=__("No device template found with TemplateID: ").$templateid; }else{ - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( property_exists( $dt, $prop )) { $dt->$prop=$val; @@ -433,9 +433,9 @@ if(!$tp->getPort()){ $r['error']=true; $r['errorcode']=404; - $r['message']=__("Template port not found with id: ")." $templateid:$portnum"; + $r['message']=__("Template port not found with id: ")." $templateid:$portnumber"; }else{ - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( property_exists( $tp, $prop )) { $tp->$prop=$val; @@ -483,7 +483,7 @@ $r['errorcode']=404; $r['message']=__("Template slot not found with id: ")." $templateid:$slotnum"; }else{ - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( property_exists( $s, $prop )) { $s->$prop=$val; @@ -525,7 +525,7 @@ $r['message'] = __("Access Denied"); } else { $ds=new DeviceStatus($statusid); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach( $vars as $prop=>$val ) { if ( property_exists( $ds, $prop )) { @@ -573,7 +573,7 @@ $r['errorcode'] = 404; $r['message']=__("Manufacturer not found with id: ").$args['manufacturerid']; }else{ - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( property_exists($man, $prop)) { $man->$prop=$val; @@ -612,7 +612,7 @@ $r['errorcode']=401; $r['message']=__("Access Denied"); }else{ - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( property_exists($sensorreadings, $prop)) { $sensorreadings->$prop=$val; @@ -646,7 +646,7 @@ $r['errorcode']=401; $r['message']=__("Access Denied"); }else{ - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( property_exists($pdustats, $prop)) { $pdustats->$prop=$val; @@ -689,7 +689,7 @@ $r['errorcode']=404; $r['message']=__("No VM found with VMIndex ").$vmindex; }else{ - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( property_exists($vm, $prop)) { $vm->$prop=$val; @@ -733,7 +733,7 @@ $r['errorcode']=404; $r['message']=__("No Powerpanel found with PanelID ").$panelid; }else{ - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( property_exists($pp, $prop)) { $pp->$prop=$val; @@ -762,7 +762,7 @@ // Returns: true/false on update operation $app->post( '/powerconnectortypes/{id}', function( Request $request, Response $response, $args ) use ($person) { - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); $id = intval($args["id"]); $pc=new PowerConnectors(); diff --git a/api/v1/putRoutes.php b/api/v1/putRoutes.php index cfeebc116..77788a8a3 100644 --- a/api/v1/putRoutes.php +++ b/api/v1/putRoutes.php @@ -29,7 +29,7 @@ $r = array(); $error = false; - $attrList = $request->getQueryParams() ?: $request->getParsedBody(); + $attrList = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); $log = new LogActions(); if ( isset( $attrList["CabinetID"] ) ) { @@ -97,7 +97,7 @@ } $p = new People(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); $p->UserID = $userid; if($p->GetPersonByUserID()){ @@ -146,7 +146,7 @@ $r['message'] = __("Access Denied"); } else { $cab = new Cabinet(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach ($vars as $prop=>$val) { if ( property_exists($cab, $prop)) { @@ -197,7 +197,7 @@ $r['message'] = __("Access Denied"); } else { $cc=new ColorCoding(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach( $vars as $prop=>$val ) { if ( property_exists( $cc, $prop )) { @@ -237,7 +237,7 @@ $r['message'] = __("Access Denied"); } else { $dept=new Department(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach( $vars as $prop=>$val ) { if ( property_exists( $dept, $prop )) { @@ -275,7 +275,7 @@ $dev=new Device(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach( $vars as $prop=>$val ) { if ( property_exists( $dev, $prop )) { @@ -416,7 +416,7 @@ // It is expected that this would overwrite the entire existing port // due to being a PUT instead of POST $dp = new DevicePorts(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( property_exists($dp, $prop)) { $dp->$prop=$val; @@ -461,7 +461,7 @@ $r['message'] = __("Access Denied"); } else { $ds=new DeviceStatus(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach( $vars as $prop=>$val ) { if ( property_exists( $ds, $prop )) { @@ -499,7 +499,7 @@ $dt=new DeviceTemplate(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach( $vars as $prop=>$val ) { if ( property_exists( $dt, $prop )) { @@ -547,7 +547,7 @@ $tp=new TemplatePorts(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach( $vars as $prop=>$val ) { if ( property_exists($tp, $prop)) { @@ -593,7 +593,7 @@ $tp=new TemplatePowerPorts(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach( $vars as $prop=>$val ) { if ( property_exists($tp, $prop)) { @@ -639,7 +639,7 @@ $s=new Slot(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( property_exists($s, $prop)) { $s->$prop=$val; @@ -680,7 +680,7 @@ $man=new Manufacturer(); - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach( $vars as $prop=>$val ) { if ( property_exists( $man, $prop )) { @@ -698,7 +698,7 @@ $r['message']=__("Access Denied"); }else{ if(!$man->CreateManufacturer()){ - $r['message']=__("Manufacturer not created: ")." $manufacturerid"; + $r['message']=__("Manufacturer not created: ")." $name"; }else{ $r['error']=false; $r['errorcode']=200; @@ -737,7 +737,7 @@ $r['errorcode']=404; $r['message']=__("No Device found with DeviceID ").$deviceid; }else{ - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( property_exists($vm, $prop)) { $vm->$prop=$val; @@ -777,7 +777,7 @@ $r['errorcode']=401; $r['message']=__("Access Denied"); }else{ - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); foreach($vars as $prop => $val){ if ( property_exists($pp, $prop)) { $pp->$prop=$val; @@ -806,7 +806,7 @@ // Returns: new power connector id $app->put( '/powerconnectortypes', function( Request $request, Response $response ) use ($person) { - $vars = $request->getQueryParams() ?: $request->getParsedBody(); + $vars = $request->getQueryParams() ?: ($request->getParsedBody() ?: array()); $pc=new PowerConnectors(); $pc->ConnectorName=$vars["name"];