Skip to content
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions api/v1/deleteRoutes.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 )) {
Expand All @@ -81,6 +81,11 @@ function updatedevice($deviceid){
// If this port isn't the last port then we're gonna shuffle ports to keep the ids in orderish
$portlist=$pp->getPorts();
$lastport=end($portlist);
if(!$lastport){
$r['error']=true;
$r['errorcode']=404;
return $response->withJson($r, $r['errorcode']);
}
Copy link
Copy Markdown
Collaborator

@wilpig wilpig Dec 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand you trying to be helpful, but this little snippet, like some of the others you've added, shortcut the process and cause this function to completely skip the code that would have otherwise run on line 105.

if($lastport->PortNumber!=$pp->PortNumber){
foreach($lastport as $prop=>$value){
if($prop!="PortNumber"){
Expand Down Expand Up @@ -362,7 +367,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;
Expand Down
50 changes: 26 additions & 24 deletions api/v1/getRoutes.php
Original file line number Diff line number Diff line change
Expand Up @@ -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"] );
Expand Down Expand Up @@ -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" ) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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" ) {
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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" ) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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" ) {
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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();

Expand All @@ -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;
Expand Down Expand Up @@ -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){
Expand Down Expand Up @@ -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){
Expand Down Expand Up @@ -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){
Expand Down Expand Up @@ -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){
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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();

Expand Down
6 changes: 3 additions & 3 deletions api/v1/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}

/*
*
Expand Down
32 changes: 16 additions & 16 deletions api/v1/postRoutes.php
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 )) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
Loading