vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

📋Copy from device #721
Some checks are pending
docker / docker_dev (push) Waiting to run
Details

Browse Source
This commit is contained in:
jokob-sk
2024-07-03 09:07:33 +10:00
parent 624e30842a
commit 70d117cb6d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front/js/db_methods.js
View File

@@ -27,7 +27,7 @@ function checkDbLock() {
type: 'GET', type: 'GET',
success: function(response) { success: function(response) {
// console.log(response); console.log(response);
if (response == 0) { if (response == 0) {
// console.log('Database is not locked'); // console.log('Database is not locked');
$(".header-status-locked-db").hide() $(".header-status-locked-db").hide()

7
front/php/components/logs_defaults.json
View File

@@ -66,6 +66,13 @@
"filePath": "/app/front/log/app_front.log", "filePath": "/app/front/log/app_front.log",
"textAreaCssClass": "logs logs-small" "textAreaCssClass": "logs logs-small"
}, },
{
"buttons": [
],
"fileName": "db_is_locked.log",
"filePath": "/app/front/log/db_is_locked.log",
"textAreaCssClass": "logs logs-small"
},
{ {
"buttons": [ "buttons": [
{ {

9
front/php/server/devices.php
View File

@@ -901,18 +901,11 @@ function copyFromDevice() {
$MAC_FROM = $_REQUEST['macFrom']; $MAC_FROM = $_REQUEST['macFrom'];
$MAC_TO = $_REQUEST['macTo']; $MAC_TO = $_REQUEST['macTo'];
if ((false === filter_var($MAC_FROM , FILTER_VALIDATE_MAC) && $MAC_FROM != "Internet" && $MAC_FROM != "") ) {
throw new Exception('Invalid mac address');
}
if ((false === filter_var($MAC_TO , FILTER_VALIDATE_MAC) && $MAC_TO != "Internet" && $MAC_TO != "") ) {
throw new Exception('Invalid mac address');
}
global $db; global $db;
// clean-up temporary table // clean-up temporary table
$sql = "DROP TABLE temp_devices "; $sql = "DROP TABLE IF EXISTS temp_devices ";
$result = $db->query($sql); $result = $db->query($sql);
// create temporary table with the source data // create temporary table with the source data