Gerätehersteller, Devices, API Erweiterungen

This commit is contained in:
Spitzer_Daniel
2023-03-22 15:23:35 +01:00
parent 71d9675350
commit 0ce064b56b
9 changed files with 395 additions and 52 deletions

View File

@@ -25,7 +25,8 @@
<li class="breadcrumb-item active">Device Detail</li>
</ol>
</div>
<h4 class="page-title">Device: <span class="font-weight-normal ml-1"><?= $devices->data->name ?></span> <span class="ml-2">
<h4 class="page-title">Device: <span class="font-weight-normal ml-1"><?= $devices->data->name ?></span>
<span class="ml-2">
<a href="<?= self::getUrl("Device", "edit", ["id" => $devices->id, 'returnto' => "device-detail"]) ?>">
<button class="btn btn-primary">Bearbeiten</button>
</a>
@@ -36,11 +37,17 @@
<!-- end page title -->
<?php
if (!empty($devices->price)) {
if ($devices->price != "0.00") {
$price = $devices->price;
} else {
$price = $devices->devicetype->price;
}
if ($devices->power != "0.0") {
$power = $devices->power;
} else {
$power = $devices->devicetype->power;
}
?>
<div class="row">
<div class="col-12">
@@ -83,6 +90,10 @@ if (!empty($devices->price)) {
<th>Preis</th>
<td><?= $price ?> €</td>
</tr>
<tr>
<th>Leistung</th>
<td><?= $power ?> Watt</td>
</tr>
<tr>
<th>Bemerkung</th>
<td><?= nl2br($devices->comment) ?> </td>
@@ -152,11 +163,21 @@ if (!empty($devices->price)) {
</div>
<div class="col-3 card-border">
<div>
<h4>Config Backups</h4>
<div class="overflow-auto">
<h4 class="float-left">Config Backups</h4>
<?php if ($devices->devicetype->devicemanufactor->config_backup > count()): ?>
<span><i title="Switch config" class="fa-light fa-rectangle-code code-ico"
data-toggle="modal" data-target="#configCode"></i></span>
<?php endif; ?>
<div class="float-right">
<a id="create-backup-href"
href="https://<?= $_SERVER['SERVER_NAME']; ?>/Device/api?do=createconfig&ip=<?= $devices->ip; ?>&id=<?= $devices->id; ?>">
<button class="btn btn-primary "><span id="create-backup-button-text">Backup erstellen</span>
<span id="create-backup-load"></i></span></button>
</a></div>
</div>
<?php
if (!empty($configs)) {
if ($devicesconfig->success == "true" && $devicesconfig->data > count()) {
?>
<div>
<table class="table table-sm">
@@ -164,21 +185,35 @@ if (!empty($devices->price)) {
<tr>
<th>Datum/Uhrzeit</th>
<th></th>
</tr>
</thead>
<tbody>
<tr>
<td></td>
<td></td>
</tr>
<?php foreach ($devicesconfig->data as $config) :
$configfileCleartext = $config->config_cleartext;
$configfileCompressed = $config->config_compressed;
$configid = $config->id;
?>
<tr>
<td><?= date("d.m.Y/H:i", $config->config_timestamp); ?></td>
<td>
<a href="https://<?= $_SERVER['SERVER_NAME']; ?>/Device/api?do=getconfig&id=<?= $configid; ?>&format=txt&filename=<?= $configfileCleartext; ?>">
TXT</a> / <a
href="https://<?= $_SERVER['SERVER_NAME']; ?>/Device/api?do=getconfig&id=<?= $configid; ?>&format=xml&filename=<?= $configfileCompressed; ?>">
XML</a></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
<?php
} else {
?>
<h5 class="text-center">Keine Configs vorhanden</h5>
<div class="mt-1">
<h5 class="text-center">Keine Configs vorhanden</h5>
</div>
<?php
}
?>
@@ -191,10 +226,48 @@ if (!empty($devices->price)) {
</div>
</div>
</div>
<?php if ($devices->devicetype->devicemanufactor->config_backup > count()):
$year = date("Y", time());
$month = date("n", time());
$day = date("d", time());
$config = $devices->devicetype->devicemanufactor->config_backup;
$config = str_replace("&&YEAR&&", $year, $config);
$config = str_replace("&&MONTH&&", $month, $config);
$config = str_replace("&&DAY&&", $day, $config);
?>
<div class="modal fade" id="configCode" tabindex="-1" role="dialog" aria-labelledby="configCodeLabel"
aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="configCodeLabel">SwitchConfig Autobackup</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<?= nl2br($config) ?>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Schließen</button>
</div>
</div>
</div>
</div>
<?php endif; ?>
<script type="text/javascript">
$(document).ready(function () {
$('#create-backup-href').click(function () {
$('#create-backup-load').html('<i class="fas fa-spinner fa-spin spinner-ico"></i>');
$('#create-backup-button-text').text('Backup wird erstellt.')
});
});
</script>

View File

@@ -1,11 +1,25 @@
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
<?php
foreach ($devicetypes as $devicetype) {
$deviceTypes[$devicetype->id]=$devicetype->devicemanufactor->name . " " . $devicetype->name;
$deviceTypes[$devicetype->id] = $devicetype->devicemanufactor->name . " " . $devicetype->name;
}
asort($deviceTypes);
if ($device->price == "0.00") {
$price = "";
} else {
$price = $device->price;
}
if ($device->power == "0.0") {
$power = "";
} else {
$power = $device->power;
}
if (isset($_GET['returnto']) && $_GET['returnto'] == "device-detail") {
$cancelUrl = self::getUrl("Device", "Detail", ["id" => $device->id]);
} else {
$cancelUrl = self::getUrl("Device");
}
?>
<link href="<?= self::getResourcePath() ?>assets/css/select2-cstm.css" rel="stylesheet" type="text/css"/>
<!-- start page title -->
@@ -34,7 +48,6 @@ asort($deviceTypes);
<div class="card">
<div class="card-body">
<h4 class="header-title mb-2"><?= ($device->id) ? "Device bearbeiten" : "Neues Gerät" ?></h4>
<form class="form-horizontal" method="post"
action="<?= self::getUrl("Device", "save", ["returnto" => $_GET["returnto"]]) ?>">
<div class="card">
@@ -93,6 +106,22 @@ asort($deviceTypes);
value="<?= $device->serial ?>">
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="serial">Preis</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="price" id="price"
placeholder="<?= $device->devicetype->price ?>"
value="<?= $price ?>">
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="serial">Leistung</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="power" id="power"
placeholder="<?= $device->devicetype->power ?>"
value="<?= $power ?>">
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="comment">Bemerkung</label>
<div class="col-lg-10">
@@ -109,6 +138,10 @@ asort($deviceTypes);
<label class="col-lg-2"></label>
<div class="col-lg-10">
<button type="submit" class="btn btn-primary">Speichern</button>
<a href="<?= $cancelUrl ?>">
<button type="button" class="btn btn-secondary">Abbrechen</button>
</a>
</div>
</div>

View File

@@ -4,7 +4,7 @@ $pagination_baseurl_params = ["filter" => $filter];
$pagination_entity_name = "Device";
?>
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
<link href="<?=self::getResourcePath()?>assets/css/datatables-std.css" rel="stylesheet" type="text/css" />
<link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css" rel="stylesheet" type="text/css"/>
<style>
</style>
@@ -74,11 +74,16 @@ $pagination_entity_name = "Device";
<?php
foreach ($devices as $device):
if (!empty($device->price)) {
if ($device->price != "0.00") {
$price = $device->price;
} else {
$price = $device->devicetype->price;
}
if ($device->power != "0.0") {
$power = $device->power;
} else {
$power = $device->devicetype->power;
}
?>
<tr>
@@ -94,7 +99,7 @@ $pagination_entity_name = "Device";
<td class="text-center"><?= $device->mac ?></td>
<td class="text-center"><?= $device->serial ?></td>
<td class="text-right"><?= $price ?> €</td>
<td class="text-right"><?= $device->devicetype->power ?> Watt</td>
<td class="text-right"><?= $power ?> Watt</td>
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em; width: 80px">
@@ -124,13 +129,13 @@ $pagination_entity_name = "Device";
<script type="text/javascript">
var hidesearch=[9];
var hidesearch = [9];
$(document).ready(function () {
});
</script>
<script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/datatables-std.js"></script>
<script type="text/javascript" src="<?= self::getResourcePath() ?>assets/js/datatables-std.js"></script>
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>

View File

@@ -42,6 +42,13 @@
value="<?= $devicemanufactors->name ?>">
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="comment">Backup Config</label>
<div class="col-lg-10">
<textarea class="form-control" id="config_backup" name="config_backup"
rows="10"><?= $devicemanufactors->config_backup ?></textarea>
</div>
</div>
</div>

View File

@@ -0,0 +1,25 @@
<?php
class DeviceApicontroller extends mfBaseApicontroller
{
protected function init()
{
$db = $this->db(ADDRESSDB_DBHOST, ADDRESSDB_DBUSER, ADDRESSDB_DBPASS, ADDRESSDB_DBNAME);
$this->addRoute("/device/getDevices", "getDevices", "GET");
}
protected function getDevices()
{
$devices = DeviceModel::getAll();
foreach ($devices as $key => $device) {
$deviceReturn[$key]['id'] = $device->id;
$deviceReturn[$key]['name'] = $device->name;
$deviceReturn[$key]['ip'] = $device->ip;
$deviceReturn[$key]['serial'] = $device->serial;
}
return mfResponse::Ok($deviceReturn);
}
}

View File

@@ -42,7 +42,9 @@ class DeviceController extends mfBaseController
}
$this->layout()->setTemplate("Device/Detail");
$devicesconfig = DeviceModel::getconifg($id);
$devices = DeviceModel::getOne($id);
$this->layout()->set("devicesconfig", $devicesconfig);
$this->layout()->set("devices", $devices);
}
@@ -60,13 +62,13 @@ class DeviceController extends mfBaseController
$id = $this->request->id;
if (!is_numeric($id) || !$id) {
$this->layout()->setFlash("Gerät nicht gefunden", "error");
$this->layout()->setFlash("Device nicht gefunden", "error");
$this->redirect("Device");
}
$device = new Device($id);
if ($device->id != $id) {
$this->layout()->setFlash("Gerät nicht gefunden", "error");
$this->layout()->setFlash("Device nicht gefunden", "error");
$this->redirect("Device");
}
@@ -93,7 +95,7 @@ class DeviceController extends mfBaseController
$data = [];
$data['name'] = trim($r->name);
$data['devicetype_id'] = $r->devicetype_id;
if (trim($r->pop_id)=="0") {
if (trim($r->pop_id) == "0") {
$data['pop_id'] = NULL;
} else {
$data['pop_id'] = $r->pop_id;
@@ -101,6 +103,16 @@ class DeviceController extends mfBaseController
$data['ip'] = $r->ip;
$data['mac'] = $r->mac;
$data['serial'] = $r->serial;
if (empty(trim($r->price))) {
$data['price'] = "0.00";
} else {
$data['price'] = $r->price;
}
if (empty(trim($r->power))) {
$data['power'] = "0.0";
} else {
$data['power'] = $r->power;
}
$data['comment'] = $r->comment;
$ipv4_validation_regex = "/^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/";
@@ -133,11 +145,8 @@ class DeviceController extends mfBaseController
// exit;
$id = $device->save();
if (!$id) {
$this->layout()->setFlash("Device konnte nicht angelegt werden", "error");
$this->redirect("Device");
}
$returnUrl="Device";
$returnUrl = "Device";
$returnAction = "Index";
$returnVariables = array();
$returnAnker = "";
@@ -163,6 +172,15 @@ class DeviceController extends mfBaseController
}
}
if (!$id) {
$returnVariables['id'] = $r->id;
if ($mode == "edit") {
$this->layout()->setFlash("Device konnte nicht gespeichert werden", "error");
} else if ($mode = "add") {
$this->layout()->setFlash("Device konnte nicht angelegt werden", "error");
}
$this->redirect($returnUrl, $returnAction, $returnVariables, $returnAnker);
}
if ($mode == "edit") {
$this->layout()->setFlash("Device erfolgreich geändert", "success");
@@ -171,4 +189,63 @@ class DeviceController extends mfBaseController
}
$this->redirect($returnUrl, $returnAction, $returnVariables, $returnAnker);
}
protected function apiAction()
{
if (!$this->me->is(["Admin"])) {
$this->redirect("Dashboard");
}
$do = $this->request->do;
$format = $this->request->format;
$filename = $this->request->filename;
$id = $this->request->id;
$ip = $this->request->ip;
$data = [];
switch ($do) {
case "getconfig":
$return = $this->getConfig($id, $format, $filename);
break;
case "createconfig":
$return = $this->createConfig($ip);
break;
default:
$return = false;
}
}
private function getConfig($id, $format, $filename)
{
$configDownload = DeviceModel::getconifgdownload($id, $format);
//
// header('Content-Type: application/octet-stream');
header('Content-Type: text/plain');
header('Content-disposition: attachment; filename="' . $filename . '"');
echo $configDownload;
exit;
}
private function createConfig($ip)
{
$r = $this->request;
$id = $r->id;
$createConfig = DeviceModel::configcreate($ip);
if ($createConfig->success==="true")
{
$this->layout()->setFlash("Backup wurde erfolgreich erstellt", "success");
}
else
{
$this->layout()->setFlash("Backup konnte nicht erstellt werden. <b>Fehler</b>: ".$createConfig->error, "error");
}
$returnUrl = "Device";
$returnAction = "Detail";
$returnVariables['id'] = $id;
return $this->redirect($returnUrl, $returnAction, $returnVariables, $returnAnker);
}
}

View File

@@ -5,8 +5,8 @@ class DeviceModel
public $name = null;
public $ip = null;
public $mac = null;
public $serial= null;
public $comment= null;
public $serial = null;
public $comment = null;
public $devicetype_id = null;
public $pop_id = null;
@@ -16,16 +16,18 @@ class DeviceModel
public $create = null;
public $edit = null;
public static function find($data) {
public static function find($data)
{
}
public static function create(Array $data) {
public static function create(array $data)
{
$model = new Device();
foreach($data as $field => $value) {
if(property_exists(get_called_class(), $field)) {
if(substr($field, 0, 5) == "vlan_" && !$value) {
foreach ($data as $field => $value) {
if (property_exists(get_called_class(), $field)) {
if (substr($field, 0, 5) == "vlan_" && !$value) {
$model->$field = null;
continue;
}
@@ -34,45 +36,47 @@ class DeviceModel
}
$me = mfValuecache::singleton()->get("me");
if(!$me) {
if (!$me) {
$me = new User();
$me->loadMe();
mfValuecache::singleton()->set("me", $me);
}
if($model->create_by === null) {
if ($model->create_by === null) {
$model->create_by = $me->id;
}
if($model->edit_by === null) {
if ($model->edit_by === null) {
$model->edit_by = $me->id;
}
return $model;
}
public static function getOne($id) {
if(!is_numeric($id) || !$id) {
public static function getOne($id)
{
if (!is_numeric($id) || !$id) {
throw new Exception("Invalid number", 400);
}
$item = [];
$db = FronkDB::singleton();
$res = $db->select("Device", "*", "id=$id LIMIT 1");
if($db->num_rows($res)) {
if ($db->num_rows($res)) {
$data = $db->fetch_object($res);
$item = new Device($data);
}
return $item;
}
public static function getAll() {
public static function getAll()
{
$items = [];
$db = FronkDB::singleton();
$res = $db->select("Device", "*");
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
if ($db->num_rows($res)) {
while ($data = $db->fetch_object($res)) {
$items[] = new Device($data);
}
}
@@ -80,15 +84,16 @@ class DeviceModel
}
public static function getFirst() {
public static function getFirst()
{
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$res = $db->select("Device", "*", "$where ORDER BY name, network_id");
if($db->num_rows($res)) {
if ($db->num_rows($res)) {
$data = $db->fetch_object($res);
$item = new Device($data);
if($item->id) {
if ($item->id) {
return $item;
} else {
return null;
@@ -97,26 +102,28 @@ class DeviceModel
return null;
}
public static function search($filter) {
public static function search($filter)
{
$items = [];
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$res = $db->select("Device", "*", "$where ORDER BY name");
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
if ($db->num_rows($res)) {
while ($data = $db->fetch_object($res)) {
$items[] = new Device($data);
}
}
return $items;
}
private static function getSqlFilter($filter) {
private static function getSqlFilter($filter)
{
$where = "1=1 ";
//var_dump($filter);exit;
if(array_key_exists("pop_id", $filter)) {
if (array_key_exists("pop_id", $filter)) {
$popid = $filter['pop_id'];
if(is_numeric($popid)) {
if (is_numeric($popid)) {
$where .= " AND pop_id=$popid";
}
}
@@ -124,4 +131,78 @@ class DeviceModel
//var_dump($filter, $where);exit;
return $where;
}
public static function getconifg($id)
{
$curl = curl_init();
curl_setopt_array($curl, array(
CURLOPT_URL => 'https://172.16.5.56/api/deviceconfigs/' . $id,
CURLOPT_RETURNTRANSFER => true,
CURLOPT_ENCODING => '',
CURLOPT_MAXREDIRS => 10,
CURLOPT_SSL_VERIFYHOST => false,
CURLOPT_SSL_VERIFYPEER => false,
CURLOPT_TIMEOUT => 0,
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
CURLOPT_CUSTOMREQUEST => 'GET',
CURLOPT_HTTPHEADER => array(
'Authorization: Bearer 4|6l5ixx3CYBP7xClqEfVAC3zrBbQlxusAtu4zNwQp'),
));
$response = curl_exec($curl);
curl_close($curl);
return json_decode($response);
}
public static function getconifgdownload($id, $format)
{
$curl = curl_init();
curl_setopt_array($curl, array(
CURLOPT_URL => 'https://172.16.5.56/api/deviceconfigsdownload/' . $id . '/' . $format,
CURLOPT_RETURNTRANSFER => true,
CURLOPT_ENCODING => '',
CURLOPT_MAXREDIRS => 10,
CURLOPT_SSL_VERIFYHOST => false,
CURLOPT_SSL_VERIFYPEER => false,
CURLOPT_TIMEOUT => 0,
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
CURLOPT_CUSTOMREQUEST => 'GET',
CURLOPT_HTTPHEADER => array(
'Authorization: Bearer 5|3QyhSkLgzrHwdVt05wQFUp2sFciiFhhGzucJirnI'),
));
$response = curl_exec($curl);
curl_close($curl);
// echo $response;
// var_dump($response);
return ($response);
}
public static function configcreate($ip)
{
$curl = curl_init();
curl_setopt_array($curl, array(
CURLOPT_URL => 'https://172.16.5.56/api/deviceconfigscreate/' . $ip ,
CURLOPT_RETURNTRANSFER => true,
CURLOPT_ENCODING => '',
CURLOPT_MAXREDIRS => 10,
CURLOPT_SSL_VERIFYHOST => false,
CURLOPT_SSL_VERIFYPEER => false,
CURLOPT_TIMEOUT => 0,
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
CURLOPT_CUSTOMREQUEST => 'GET',
CURLOPT_HTTPHEADER => array(
'Authorization: Bearer 5|3QyhSkLgzrHwdVt05wQFUp2sFciiFhhGzucJirnI'),
));
$response = curl_exec($curl);
return json_decode($response);
}
}

View File

@@ -68,6 +68,7 @@ class DevicemanufactorController extends mfBaseController
$data = [];
$data['name'] = trim($r->name);
$data['config_backup'] = trim($r->config_backup);
if (!$data['name']) {

View File

@@ -32,6 +32,10 @@
width: 50px;
}
.edit-width-large {
width: 100px;
}
.order-date-pill {
margin: 2px;
white-space: nowrap;
@@ -40,3 +44,40 @@
.font-weight-500 {
font-weight: 500;
}
.history-ico {
color: #007bff;
cursor: pointer;
}
.history-ico:hover {
color: #006875;
}
.code-ico {
cursor: pointer;
font-size: 25px;
margin-top: 7px;
margin-left: 10px;
}
.spinner-ico {
margin-left: 5px;
}
.filestore-history {
background-color: #33ff0021 !important;
}
.filestore-history-td {
padding: 0 0px 0 10px !important;
box-shadow: unset;
}
.filestore-history-td:hover {
box-shadow: unset !important;
}
.filestore-history-tr:hover{
color: unset !important;
background-color: #fff !important;
}