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

0.3.11

Browse Source
This commit is contained in:
Garrett 2020-11-24 20:33:24 +00:00
parent e00deb9ad2
commit b7903ad672
17 changed files with 10 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/process_admin_edit-user.php
View File

@ -47,9 +47,7 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){
if($userType == 'active') { if($userType == 'active') {
$query = $qls->SQL->select('*', 'users', array('id' => array('=', $userID))); $query = $qls->SQL->select('*', 'users', array('id' => array('=', $userID)));
if($qls->SQL->num_rows($query)) { if($qls->SQL->num_rows($query)) {
error_log('Debug: here');
$qls->Admin->remove_user($userID); $qls->Admin->remove_user($userID);
error_log($qls->Admin->remove_user_error);
} else { } else {
$errMsg = 'User ID does not exist.'; $errMsg = 'User ID does not exist.';
array_push($validate->returnData['error'], $errMsg); array_push($validate->returnData['error'], $errMsg);

5
backend/process_cabinet-objects.php
View File

@ -327,25 +327,20 @@ function checkInsertCompatibility($parent_id, $parent_face, $parent_depth, $obje
if($parent['encTolerance'] == 'Strict') { if($parent['encTolerance'] == 'Strict') {
if($parent['hUnits'] != $insert['templateHUnits']) { if($parent['hUnits'] != $insert['templateHUnits']) {
error_log('Debug: hUnits');
$compatible = false; $compatible = false;
} }
if($parent['vUnits'] != $insert['templateVUnits']) { if($parent['vUnits'] != $insert['templateVUnits']) {
error_log('Debug: vUnits');
$compatible = false; $compatible = false;
} }
if($parent['encLayoutX'] != $insert['templateEncLayoutX']) { if($parent['encLayoutX'] != $insert['templateEncLayoutX']) {
error_log('Debug: layoutX');
$compatible = false; $compatible = false;
} }
if($parent['encLayoutY'] != $insert['templateEncLayoutY']) { if($parent['encLayoutY'] != $insert['templateEncLayoutY']) {
error_log('Debug: layoutY');
$compatible = false; $compatible = false;
} }
} }
if($parent['partitionFunction'] != $insert['templateFunction']) { if($parent['partitionFunction'] != $insert['templateFunction']) {
error_log('Debug: function');
$compatible = false; $compatible = false;
} }

3
backend/process_cable.php
View File

@ -214,15 +214,12 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){
foreach($objIDArray as $objID) { foreach($objIDArray as $objID) {
$templateID = $qls->App->objectArray[$objID]['template_id']; $templateID = $qls->App->objectArray[$objID]['template_id'];
$templateType = $qls->App->templateArray[$templateID]['templateType']; $templateType = $qls->App->templateArray[$templateID]['templateType'];
//error_log('Debug(templateType): '.$templateType);
if(isset($qls->App->floorplanObjDetails[$templateType])) { if(isset($qls->App->floorplanObjDetails[$templateType])) {
$templateFunction = $qls->App->templateArray[$templateID]['templateFunction']; $templateFunction = $qls->App->templateArray[$templateID]['templateFunction'];
//error_log('Debug(templateFunction): '.$templateFunction);
if($templateFunction == 'Endpoint') { if($templateFunction == 'Endpoint') {
if(isset($qls->App->peerArrayWalljack[$objID])) { if(isset($qls->App->peerArrayWalljack[$objID])) {
foreach($qls->App->peerArrayWalljack[$objID] as $peerEntry) { foreach($qls->App->peerArrayWalljack[$objID] as $peerEntry) {
$rowID = $peerEntry['rowID']; $rowID = $peerEntry['rowID'];
//error_log('Debug(rowID): '.$rowID);
$qls->SQL->delete('app_object_peer', array('id' => array('=', $rowID))); $qls->SQL->delete('app_object_peer', array('id' => array('=', $rowID)));
} }
} }

1
backend/process_image-upload.php
View File

@ -79,7 +79,6 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){
$validate->returnData['success']['imgWidth'] = $templateImgWidth; $validate->returnData['success']['imgWidth'] = $templateImgWidth;
} else if($action == 'floorplanImage') { } else if($action == 'floorplanImage') {
$floorplanID = $postData['floorplanID']; $floorplanID = $postData['floorplanID'];
error_log('floorplanID'.$floorplanID);
// Update database with new filname // Update database with new filname
$set = array( $set = array(

115
backend/process_integration-data-upload.php
View File

@ -1866,12 +1866,6 @@ function validateImportedTrunks($qls, &$importedTrunkArray, $portArray, $importe
$walljackPortIDArray = array(); $walljackPortIDArray = array();
$debugObjectArray = fopen($_SERVER['DOCUMENT_ROOT'].'/debug-objectArray.json', 'w');
fwrite($debugObjectArray, json_encode($importedObjectArray));
$debugTrunkArray = fopen($_SERVER['DOCUMENT_ROOT'].'/debug-trunkArray.json', 'w');
fwrite($debugTrunkArray, json_encode($importedTrunkArray));
foreach($importedTrunkArray as &$trunk) { foreach($importedTrunkArray as &$trunk) {
$csvLine = $trunk['line']; $csvLine = $trunk['line'];
@ -1881,11 +1875,8 @@ function validateImportedTrunks($qls, &$importedTrunkArray, $portArray, $importe
array('peerColumn' => 'PeerA', 'nameHash' => $trunk['nameHash'], 'portNameHash' => $trunk['portNameHash']), array('peerColumn' => 'PeerA', 'nameHash' => $trunk['nameHash'], 'portNameHash' => $trunk['portNameHash']),
array('peerColumn' => 'PeerB', 'nameHash' => $trunk['peerNameHash'], 'portNameHash' => $trunk['peerPortNameHash']) array('peerColumn' => 'PeerB', 'nameHash' => $trunk['peerNameHash'], 'portNameHash' => $trunk['peerPortNameHash'])
); );
$portName = $trunk['portName'];
$portNameHash = $trunk['portNameHash'];
$peerPortName = $trunk['peerPortName'];
$peerPortNameHash = $trunk['peerPortNameHash'];
// Collect trunk peer data
foreach($peerDataArray as &$peerData) { foreach($peerDataArray as &$peerData) {
$peerDataFound = false; $peerDataFound = false;
@ -1894,6 +1885,7 @@ function validateImportedTrunks($qls, &$importedTrunkArray, $portArray, $importe
$portNameHash = $peerData['portNameHash']; $portNameHash = $peerData['portNameHash'];
if(isset($portArray[$portNameHash])) { if(isset($portArray[$portNameHash])) {
// Standard object ports are found in portArray
$peerDataFound = true; $peerDataFound = true;
@ -1913,11 +1905,13 @@ function validateImportedTrunks($qls, &$importedTrunkArray, $portArray, $importe
// //
$obj = $qls->App->objectArray[$objID]; $obj = $qls->App->objectArray[$objID];
$objTemplateID = $obj['template_id']; $objTemplateID = $obj['template_id'];
$peerData['id'] = $objID;
$peerData['templateID'] = $objTemplateID; $peerData['templateID'] = $objTemplateID;
$peerData['face'] = $face; $peerData['face'] = $face;
$peerData['depth'] = $depth; $peerData['depth'] = $depth;
} else if(isset($importedObjectArray[$nameHash])) { } else if(isset($importedObjectArray[$nameHash])) {
// Walljack objects are found in importedObjectArray
$importedObj = $importedObjectArray[$nameHash]; $importedObj = $importedObjectArray[$nameHash];
$objID = $importedObj['id']; $objID = $importedObj['id'];
@ -1948,6 +1942,7 @@ function validateImportedTrunks($qls, &$importedTrunkArray, $portArray, $importe
$trunk['aPortID'] = $portID; $trunk['aPortID'] = $portID;
// //
$peerData['id'] = $objID;
$peerData['templateID'] = $objTemplateID; $peerData['templateID'] = $objTemplateID;
$peerData['face'] = 0; $peerData['face'] = 0;
$peerData['depth'] = 0; $peerData['depth'] = 0;
@ -1963,104 +1958,14 @@ function validateImportedTrunks($qls, &$importedTrunkArray, $portArray, $importe
} }
unset($peerData); unset($peerData);
// Validate trunk peer compatibility
/*
// Store PeerA data
if(isset($portArray[$portNameHash])) {
// Collect trunk object information
$port = $portArray[$portNameHash];
$objID = $port['objID'];
$face = $port['face'];
$depth = $port['depth'];
$portID = $port['portID'];
$obj = $qls->App->objectArray[$objID];
$objTemplateID = $obj['template_id'];
$objTemplate = $qls->App->templateArray[$objTemplateID];
$objTemplateType = $objTemplate['templateType'];
if($objTemplateType == 'walljack') {
$peerTrunkEntry = $importedTrunkArray[$peerPortNameHash];
$nameHash = $peerTrunkEntry['nameHash'];
// Create variable to track walljack portID
if(!isset($walljackPortIDArray[$nameHash])) {
$walljackPortIDArray[$nameHash] = 0;
}
// Store walljack portID
$portID = $walljackPortIDArray[$nameHash];
// Increment walljack portID
$walljackPortIDArray[$nameHash]++;
}
// Store the A side Info
$trunk['aObjID'] = $objID;
$trunk['aFace'] = $face;
$trunk['aDepth'] = $depth;
$trunk['aPortID'] = $portID;
} else {
error_log('Debug (portName-portNameHash): '.$portName.'-'.$portNameHash);
$errMsg = 'Port on line '.$csvLine.' of file "'.$csvFileName.'" does not exist.';
array_push($validate->returnData['error'], $errMsg);
}
// Store PeerB data
if(isset($portArray[$peerPortNameHash])) {
// Collect trunk object information
$peerPort = $portArray[$peerPortNameHash];
$peerID = $peerPort['objID'];
$peerFace = $peerPort['face'];
$peerDepth = $peerPort['depth'];
$peerPortID = $peerPort['portID'];
$peer = $qls->App->objectArray[$peerID];
$peerTemplateID = $peer['template_id'];
$peerTemplate = $qls->App->templateArray[$peerTemplateID];
$peerTemplateType = $peerTemplate['templateType'];
if($peerTemplateType == 'walljack') {
$peerTrunkEntry = $importedTrunkArray[$portNameHash];
$nameHash = $peerTrunkEntry['nameHash'];
// Create variable to track walljack portID
if(!isset($walljackPortIDArray[$nameHash])) {
$walljackPortIDArray[$nameHash] = 0;
}
// Store walljack portID
$peerPortID = $walljackPortIDArray[$nameHash];
// Increment walljack portID
$walljackPortIDArray[$nameHash]++;
}
// Store the A side Info
$trunk['bObjID'] = $peerID;
$trunk['bFace'] = $peerFace;
$trunk['bDepth'] = $peerDepth;
$trunk['bPortID'] = $peerPortID;
} else {
error_log('Debug (peerPortName-peerPortNameHash): '.$peerPortName.'-'.$peerPortNameHash);
$errMsg = 'Port on line '.$csvLine.' of file "'.$csvFileName.'" does not exist.';
array_push($validate->returnData['error'], $errMsg);
}
*/
if($peerDataArray[0]['templateID'] and $peerDataArray[1]['templateID']) { if($peerDataArray[0]['templateID'] and $peerDataArray[1]['templateID']) {
$objTemplateID = $peerDataArray[0]['templateID']; $objTemplateID = $peerDataArray[0]['templateID'];
$face = $peerDataArray[0]['face']; $face = $peerDataArray[0]['face'];
$depth = $peerDataArray[0]['depth']; $depth = $peerDataArray[0]['depth'];
$peerID = $peerDataArray[1]['templateID'];
$peerTemplateID = $peerDataArray[1]['templateID']; $peerTemplateID = $peerDataArray[1]['templateID'];
$peerFace = $peerDataArray[1]['face']; $peerFace = $peerDataArray[1]['face'];
$peerDepth = $peerDataArray[1]['depth']; $peerDepth = $peerDataArray[1]['depth'];
@ -3051,15 +2956,10 @@ function buildPortArray(&$qls){
$partitionType = $compatibility['partitionType']; $partitionType = $compatibility['partitionType'];
if($partitionType == 'Connectable') { if($partitionType == 'Connectable') {
if($templateType == 'walljack') { if($templateType == 'walljack') {
error_log('here1');
if(isset($qls->App->peerArray[$objID][$faceID][$depth]['peerArray'])) { if(isset($qls->App->peerArray[$objID][$faceID][$depth]['peerArray'])) {
error_log('here2');
foreach($qls->App->peerArray[$objID][$faceID][$depth]['peerArray'] as $peerID => $peer) { foreach($qls->App->peerArray[$objID][$faceID][$depth]['peerArray'] as $peerID => $peer) {
error_log('here3');
foreach($peer as $peerFaceID => $peerFace) { foreach($peer as $peerFaceID => $peerFace) {
error_log('here4');
foreach($peerFace as $peerDepth => $partition) { foreach($peerFace as $peerDepth => $partition) {
error_log('here5');
$peerObj = $qls->App->objectArray[$peerID]; $peerObj = $qls->App->objectArray[$peerID];
$peerObjName = $peerObj['nameString']; $peerObjName = $peerObj['nameString'];
$peerTemplateID = $peerObj['template_id']; $peerTemplateID = $peerObj['template_id'];
@ -3067,7 +2967,6 @@ function buildPortArray(&$qls){
$peerObjPortNameFormat = json_decode($peerCompatibility['portNameFormat'], true); $peerObjPortNameFormat = json_decode($peerCompatibility['portNameFormat'], true);
$peerObjPortTotal = $peerCompatibility['portTotal']; $peerObjPortTotal = $peerCompatibility['portTotal'];
foreach($partition as $portPair) { foreach($partition as $portPair) {
error_log('here6');
$peerPortID = $portPair[1]; $peerPortID = $portPair[1];
$portID = $portPair[0]; $portID = $portPair[0];
$peerObjPortName = $qls->App->generatePortName($peerObjPortNameFormat, $peerPortID, $peerObjPortTotal); $peerObjPortName = $qls->App->generatePortName($peerObjPortNameFormat, $peerPortID, $peerObjPortTotal);

1
backend/process_object-custom.php
View File

@ -456,7 +456,6 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){
function updatePartitionData(&$partitionData, $depth, $value, $attribute, &$counter=0){ function updatePartitionData(&$partitionData, $depth, $value, $attribute, &$counter=0){
foreach($partitionData as &$element) { foreach($partitionData as &$element) {
error_log('Debug: '.$depth.'-'.$counter.'-'.$element['partitionType']);
if($counter == $depth) { if($counter == $depth) {
$element[$attribute] = $value; $element[$attribute] = $value;
return; return;

4
backend/process_path_finder.php
View File

@ -694,8 +694,4 @@ function getSize($objID, &$qls){
} }
return $size; return $size;
} }
// Debug templates
// file_put_contents('filename.output', json_encode($array));
// error_log('Debug (debugName): '.json_encode($array));
?> ?>

1
backend/process_template-import.php
View File

@ -30,7 +30,6 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){
// Submit the POST request // Submit the POST request
$result = curl_exec($ch); $result = curl_exec($ch);
error_log('Debug: '.$result);
// Collect POST response // Collect POST response
$importData = json_decode($result, true); $importData = json_decode($result, true);

3
backend/retrieve_floorplan_object_details.php
View File

@ -31,9 +31,6 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){
$type = $floorplanObjectTemplate['templateType']; $type = $floorplanObjectTemplate['templateType'];
$trunkable = $qls->App->floorplanObjDetails[$type]['trunkable']; $trunkable = $qls->App->floorplanObjDetails[$type]['trunkable'];
error_log('Debug (objectID): '.$objectID);
error_log('Debug (floorplanObjectTemplateID): '.$floorplanObjectTemplateID);
error_log('Debug (type): '.$type);
$peerIDArray = array(); $peerIDArray = array();
$objPortArray = array(); $objPortArray = array();
if($trunkable) { if($trunkable) {

1
includes/Admin.class.php
View File

@ -222,7 +222,6 @@ var $permissions = array(
$this->remove_user_error = ADMIN_REMOVE_USER_NO_AUTH; $this->remove_user_error = ADMIN_REMOVE_USER_NO_AUTH;
return false; return false;
} }
error_log('Debug: '.$this->remove_user_error);
} }
/** /**

5
includes/MySQLie.class.php
View File

@ -841,10 +841,9 @@ var $qls;
if ($query != '') { if ($query != '') {
$this->update_queries(); $this->update_queries();
$this->last_query[] = $query; $this->last_query[] = $query;
//$start = microtime(true);
$result = mysqli_query($this->connection, $query) or die(mysqli_errno($this->connection) . ': ' . mysqli_error($this->connection)); $result = mysqli_query($this->connection, $query) or die(mysqli_errno($this->connection) . ': ' . mysqli_error($this->connection));
//$end = microtime(true);
//error_log('Debug (query time): '.($start - $end));
return $result; return $result;
} }
else { else {

1
includes/Pub.class.php
View File

@ -78,7 +78,6 @@ var $qls;
$returnData['success'] = false; $returnData['success'] = false;
$returnData['msg'] = 'Error when submitting email data to proxy server.'; $returnData['msg'] = 'Error when submitting email data to proxy server.';
} else { } else {
error_log('Debug: response = '.$responseJSON);
$response = json_decode($responseJSON, true); $response = json_decode($responseJSON, true);
} }
} }

2
includes/Update.class.php
View File

@ -1054,11 +1054,9 @@ var $qls;
$howMuchToIncrement = floor($index / $numerator); $howMuchToIncrement = floor($index / $numerator);
//error_log('Index:'.$index.' Order:'.$order.' howMuchToIncrement:'.$howMuchToIncrement.' numerator:'.$numerator);
if($howMuchToIncrement >= $count) { if($howMuchToIncrement >= $count) {
$rollOver = floor($howMuchToIncrement / $count); $rollOver = floor($howMuchToIncrement / $count);
$howMuchToIncrement = $howMuchToIncrement - ($rollOver * $count); $howMuchToIncrement = $howMuchToIncrement - ($rollOver * $count);
//error_log('rollOver:'.$howMuchToIncrement);
} }
if($type == 'incremental') { if($type == 'incremental') {

1
includes/Validate.class.php
View File

@ -389,7 +389,6 @@ class Validate {
return false; return false;
} else { } else {
if (!preg_match($this->portNameFieldIncrementalRegEx, $input)){ if (!preg_match($this->portNameFieldIncrementalRegEx, $input)){
error_log('Failed Incremental Validation: '.$input);
$errorMsg = $reference ? $reference : 'Incremental port name fields may only contain a single alphanumeric character.'; $errorMsg = $reference ? $reference : 'Incremental port name fields may only contain a single alphanumeric character.';
array_push($this->returnData['error'], $errorMsg); array_push($this->returnData['error'], $errorMsg);
return false; return false;

1
includes/content-path.php
View File

@ -220,7 +220,6 @@ for($x=0; $x<2; $x++){
} }
function isFloorplanTrunked($peer, $portID) { function isFloorplanTrunked($peer, $portID) {
error_log('Debug: '.json_encode($peer));
$isTrunked = false; $isTrunked = false;
foreach($peer['peerArray'] as $peerObjID => $peerObj) { foreach($peer['peerArray'] as $peerObjID => $peerObj) {
foreach($peerObj as $peerFaceID => $peerFace) { foreach($peerObj as $peerFaceID => $peerFace) {

4
includes/header.php
View File

@ -39,12 +39,8 @@ header('Content-Type: text/html; charset=iso-8859-1');
// The language we are using // The language we are using
require_once('Blank.lang.php'); require_once('Blank.lang.php');
define('START_TIME', microtime(true));
// The qls class will start the other classes // The qls class will start the other classes
require_once('qls.class.php'); require_once('qls.class.php');
$qls = new qls(SYS_CURRENT_LANG); $qls = new qls(SYS_CURRENT_LANG);
error_log('Debug (time taken header1): '.(microtime(true)-START_TIME));
?> ?>

2
includes/path_functions.php
View File

@ -940,7 +940,7 @@ function buildTrunkFlatPath($objectID, $objectFace, $objectDepth, &$qls){
$portTotal = $partitionCompatibility['portLayoutX']*$partitionCompatibility['portLayoutY']; $portTotal = $partitionCompatibility['portLayoutX']*$partitionCompatibility['portLayoutY'];
$firstIndex = 0; $firstIndex = 0;
$lastIndex = $portTotal - 1; $lastIndex = $portTotal - 1;
error_log('Debug: '.json_encode($portNameFormat));
$firstPortName = $qls->App->generatePortName($portNameFormat, $firstIndex, $portTotal); $firstPortName = $qls->App->generatePortName($portNameFormat, $firstIndex, $portTotal);
$lastPortName = $qls->App->generatePortName($portNameFormat, $lastIndex, $portTotal); $lastPortName = $qls->App->generatePortName($portNameFormat, $lastIndex, $portTotal);
$portRange = $firstPortName.'&nbsp;&#8209;&nbsp;'.$lastPortName; $portRange = $firstPortName.'&nbsp;&#8209;&nbsp;'.$lastPortName;