mkrieger/patchcablemgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.14

Browse Source
This commit is contained in:
Garrett K 2021-03-17 00:22:59 +00:00
parent aad2c4da9a
commit 6b5f8c8927
1 changed files with 63 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/process_cable.php
View File

@ -87,11 +87,6 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){
$peerPort = $cable['remote_object_port']; $peerPort = $cable['remote_object_port'];
$localAttrPrefix = $cable['localAttrPrefix']; $localAttrPrefix = $cable['localAttrPrefix'];
if($qls->App->loopDetected2($peerID, $peerFace, $peerDepth, $peerPort, $elementID, $elementFace, $elementDepth, $elementPort)) {
$errMsg = 'Loop detected.';
array_push($validate->returnData['error'], $errMsg);
} else {
// Remove any populated port entries that may exist // Remove any populated port entries that may exist
$qls->SQL->delete( $qls->SQL->delete(
'app_populated_port', 'app_populated_port',
@ -158,7 +153,7 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){
// Retrieve connector path // Retrieve connector path
$connectorFlatPath = $qls->App->buildConnectorFlatPath($cable, 'local'); $connectorFlatPath = $qls->App->buildConnectorFlatPath($cable, 'local');
$validate->returnData['success']['connectorFlatPath'] = $connectorFlatPath; $validate->returnData['success']['connectorFlatPath'] = $connectorFlatPath;
}
break; break;
case 'connectionExploreClear': case 'connectionExploreClear':
@ -436,12 +431,6 @@ function validate($data, &$validate, &$qls){
); );
$validate->validateTrunkedEndpoint($connectionPeerArray); $validate->validateTrunkedEndpoint($connectionPeerArray);
// Validate no loops will result
if($qls->App->loopDetected2($localID, $localFace, $localDepth, $localPort, $remoteID, $remoteFace, $remoteDepth, $remotePort)) {
$errMsg = 'Loop detected.';
array_push($validate->returnData['error'], $errMsg);
}
// Does this action need to be confirmed? // Does this action need to be confirmed?
if(!isset($data['confirmed'])) { if(!isset($data['confirmed'])) {
if (isset($qls->App->inventoryArray[$remoteID][$remoteFace][$remoteDepth][$remotePort])) { if (isset($qls->App->inventoryArray[$remoteID][$remoteFace][$remoteDepth][$remotePort])) {