- Real time updates: 60)' : 'disabled') ?>
+ Real time updates: 60)' : 'disabled' ?>
| + |  |
- Containers: + Containers: |
@@ -83,11 +91,12 @@ | Group |
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
@@ -122,7 +122,7 @@
-
- Triggers
-
-
-
-
+
| - | Notification | -Description | -Webhook Event | -Platform | -
|---|---|---|---|---|
| class="form-check-input notification-check" id="notifications-name-"> | -- | - | - | - - | -
+
+
+
+
+
+
+ + + + +
+
+ You have not configured any triggers for this notificationgetNotificationTriggerNameFromId($triggerId, $notificationTriggersTable);
+ $enabledTriggers[] = $trigger;
+ }
+
+ echo '
+ Enabled: ' . implode(', ', $enabledTriggers) . '
';
+ }
+ ?>
+
-
$val) {
- if (!str_contains($key, '-name-')) {
- continue;
+if ($_POST['m'] == 'addNotification') {
+ if (!$_POST['platformId']) {
+ $error = 'Missing required platform id';
+ }
+
+ if (!$error) {
+ $notificationPlatformTable = apiRequest('database-getNotificationPlatforms')['result'];
+ $notificationTriggersTable = apiRequest('database-getNotificationTriggers')['result'];
+ $notificationLinkTable = apiRequest('database-getNotificationLinks')['result'];
+ $platformParameters = json_decode($notificationPlatformTable[$_POST['platformId']]['parameters'], true);
+ $platformName = $notifications->getNotificationPlatformNameFromId($_POST['platformId'], $notificationPlatformTable);
+
+ //-- CHECK FOR REQUIRED FIELDS
+ foreach ($platformParameters as $platformParameterField => $platformParameterData) {
+ if ($platformParameterData['required'] && !$_POST['notificationPlatformParameter-' . $platformParameterField]) {
+ $error = 'Missing required platform field: ' . $platformParameterData['label'];
+ break;
+ }
}
- $type = str_replace('notifications-name-', '', $key);
- $newSettings[$type] = [
- 'active' => trim($val),
- 'platform' => $_POST['notifications-platform-' . $type]
- ];
- }
- $settingsFile['notifications']['triggers'] = $newSettings;
+ if (!$error) {
+ $triggerIds = $platformParameters = [];
+ $senderName = $platformName;
- //-- PLATFORM SETTINGS
- $newSettings = [];
- foreach ($_POST as $key => $val) {
- $strip = str_replace('notifications-platform-', '', $key);
- list($platformId, $platformField) = explode('-', $strip);
+ foreach ($_POST as $key => $val) {
+ if (str_contains($key, 'notificationTrigger-') && $val) {
+ $triggerIds[] = str_replace('notificationTrigger-', '', $key);
+ }
- if (!is_numeric($platformId)) {
- continue;
+ if (str_contains($key, 'notificationPlatformParameter-')) {
+ $field = str_replace('notificationPlatformParameter-', '', $key);
+
+ if ($field != 'name') {
+ $platformParameters[$field] = $val;
+ } else {
+ $senderName = $val;
+ }
+ }
+ }
+
+ apiRequest('database-addNotificationLink', ['platformId' => $_POST['platformId']], ['triggerIds' => $triggerIds, 'platformParameters' => $platformParameters, 'senderName' => $senderName]);
}
+ }
- $newSettings[$platformId][$platformField] = trim($val);
+ echo json_encode(['error' => $error]);
+}
+
+if ($_POST['m'] == 'saveNotification') {
+ if (!$_POST['platformId']) {
+ $error = 'Missing required platform id';
+ }
+ if (!$_POST['linkId']) {
+ $error = 'Missing required link id';
}
- $settingsFile['notifications']['platforms'] = $newSettings;
- $saveSettings = setServerFile('settings', $settingsFile);
+ if (!$error) {
+ $notificationPlatformTable = apiRequest('database-getNotificationPlatforms')['result'];
+ $notificationTriggersTable = apiRequest('database-getNotificationTriggers')['result'];
+ $notificationLinkTable = apiRequest('database-getNotificationLinks')['result'];
+ $platformParameters = json_decode($notificationPlatformTable[$_POST['platformId']]['parameters'], true);
+ $platformName = $notifications->getNotificationPlatformNameFromId($_POST['platformId'], $notificationPlatformTable);
+
+ //-- CHECK FOR REQUIRED FIELDS
+ foreach ($platformParameters as $platformParameterField => $platformParameterData) {
+ if ($platformParameterData['required'] && !$_POST['notificationPlatformParameter-' . $platformParameterField]) {
+ $error = 'Missing required platform field: ' . $platformParameterData['label'];
+ break;
+ }
+ }
+
+ if (!$error) {
+ $triggerIds = $platformParameters = [];
+ $senderName = $platformName;
- if ($saveSettings['code'] != 200) {
- $error = 'Error saving notification settings on server ' . ACTIVE_SERVER_NAME;
+ foreach ($_POST as $key => $val) {
+ if (str_contains($key, 'notificationTrigger-') && $val) {
+ $triggerIds[] = str_replace('notificationTrigger-', '', $key);
+ }
+
+ if (str_contains($key, 'notificationPlatformParameter-')) {
+ $field = str_replace('notificationPlatformParameter-', '', $key);
+
+ if ($field != 'name') {
+ $platformParameters[$field] = $val;
+ } else {
+ $senderName = $val;
+ }
+ }
+ }
+
+ apiRequest('database-updateNotificationLink', [], ['linkId' => $_POST['linkId'], 'triggerIds' => $triggerIds, 'platformParameters' => $platformParameters, 'senderName' => $senderName]);
+ }
}
- echo json_encode(['error' => $error, 'server' => ACTIVE_SERVER_NAME]);
+ echo json_encode(['error' => $error]);
+}
+
+if ($_POST['m'] == 'deleteNotification') {
+ apiRequest('database-deleteNotificationLink', [], ['linkId' => $_POST['linkId']]);
}
if ($_POST['m'] == 'testNotify') {
- $apiResponse = apiRequest('testNotify', [], ['platform' => $_POST['platform']]);
+ $apiResponse = apiRequest('notify-test', [], ['linkId' => $_POST['linkId']]);
if ($apiResponse['code'] == 200) {
$result = 'Test notification sent on server ' . ACTIVE_SERVER_NAME;
} else {
- $error = 'Failed to send test notification on server ' . ACTIVE_SERVER_NAME . '. ' . $apiResponse['response']['result'];
+ $error = 'Failed to send test notification on server ' . ACTIVE_SERVER_NAME . '. ' . $apiResponse['result'];
}
echo json_encode(['error' => $error, 'result' => $result]);
diff --git a/root/app/www/public/ajax/orphans.php b/root/app/www/public/ajax/orphans.php
index 23017bd..7ce389c 100644
--- a/root/app/www/public/ajax/orphans.php
+++ b/root/app/www/public/ajax/orphans.php
@@ -10,12 +10,12 @@
require 'shared.php';
if ($_POST['m'] == 'init') {
- $images = apiRequest('dockerGetOrphanContainers');
- $images = json_decode($images['response']['docker'], true);
- $volumes = apiRequest('dockerGetOrphanVolumes');
- $volumes = json_decode($volumes['response']['docker'], true);
- $networks = apiRequest('dockerGetOrphanNetworks');
- $networks = json_decode($networks['response']['docker'], true);
+ $images = apiRequest('docker-getOrphanContainers');
+ $images = json_decode($images['result'], true);
+ $volumes = apiRequest('docker-getOrphanVolumes');
+ $volumes = json_decode($volumes['result'], true);
+ $networks = apiRequest('docker-getOrphanNetworks');
+ $networks = json_decode($networks['result'], true);
?>
Platforms
- $platform) { ?> --
-
-
+
+ getNotificationPlatformNameFromId($_POST['platformId'], $notificationPlatformTable);
+ $linkRow = $notificationLinkTable[$_POST['linkId']];
+ $existingTriggers = $existingParameters = [];
+
+ if ($linkRow) {
+ $existingTriggers = $linkRow['trigger_ids'] ? json_decode($linkRow['trigger_ids'], true) : [];
+ $existingParameters = $linkRow['platform_parameters'] ? json_decode($linkRow['platform_parameters'], true) : [];
+ $existingName = $linkRow['name'];
+ }
+
+ ?>
+
+
+
- | + | Trigger | +Description | +Event | +|||
|---|---|---|---|---|---|---|
| Name | -Setting | -Description | +type="checkbox" class="form-check-input notification-trigger" id="notificationTrigger-"> | ++ | + |
| Setting | ++ | |||
|---|---|---|---|---|
|
+ Name Required + The name of this notification sender + |
+ + | |||
| *' : '') ?> | -- | + | Required' : '') ?> |
+ + type="text" id="notificationPlatformParameter-" class="form-control" value=""> + |
+
+
+
+
+
+
+
-
-
-
@@ -126,24 +126,21 @@
switch ($_POST['action']) {
case 'remove':
if ($_POST['type'] == 'image') {
- $remove = apiRequest('dockerRemoveImage', [], ['image' => $_POST['orphan']]);
- $remove = $remove['response']['docker'];
- if (stripos($remove, 'error') !== false || stripos($remove, 'help') !== false) {
- echo $remove;
+ $apiRequest = apiRequest('docker-removeImage', [], ['image' => $_POST['orphan']])['result'];
+ if (stripos($apiRequest, 'error') !== false || stripos($apiRequest, 'help') !== false) {
+ echo $apiRequest;
}
}
- if ($_POST['type'] == 'volume') {
- $remove = apiRequest('dockerRemoveVolume', [], ['name' => $_POST['orphan']]);
- $remove = $remove['response']['docker'];
- if (stripos($remove, 'error') !== false || stripos($remove, 'help') !== false) {
- echo $remove;
+ if ($_POST['type'] == 'network') {
+ $apiRequest = apiRequest('docker-removeNetwork', [], ['id' => $_POST['orphan']])['result'];
+ if (stripos($apiRequest, 'error') !== false || stripos($apiRequest, 'help') !== false) {
+ echo $apiRequest;
}
}
- if ($_POST['type'] == 'network') {
- $remove = apiRequest('dockerRemoveNetwork', [], ['id' => $_POST['orphan']]);
- $remove = $remove['response']['docker'];
- if (stripos($remove, 'error') !== false || stripos($remove, 'help') !== false) {
- echo $remove;
+ if ($_POST['type'] == 'volume') {
+ $apiRequest = apiRequest('docker-removeVolume', [], ['name' => $_POST['orphan']])['result'];
+ if (stripos($apiRequest, 'error') !== false || stripos($apiRequest, 'help') !== false) {
+ echo $apiRequest;
}
}
break;
diff --git a/root/app/www/public/ajax/overview.php b/root/app/www/public/ajax/overview.php
index 70c3208..23e910f 100644
--- a/root/app/www/public/ajax/overview.php
+++ b/root/app/www/public/ajax/overview.php
@@ -83,8 +83,8 @@
$network += bytesFromString($netUsed);
}
- if (intval($settingsFile['global']['cpuAmount']) > 0) {
- $cpuActual = number_format(($cpu / intval($settingsFile['global']['cpuAmount'])), 2);
+ if (intval($settingsTable['cpuAmount']) > 0) {
+ $cpuActual = number_format(($cpu / intval($settingsTable['cpuAmount'])), 2);
}
?>
@@ -98,7 +98,7 @@
Running:
Stopped:
- Total: + Total:
Stopped:
- Total: + Total:
Up to date:
Outdated:
- Unchecked: + Unchecked:
@@ -197,4 +197,4 @@
Outdated:
- Unchecked: + Unchecked:
dockwatch-maintenance with this IP and after it has updated/restarted Dockwatch it will be removed. This is only required if you do static IP assignment for your containers.dockwatch-maintenance with this port and after it has updated/restarted Dockwatch it will be removed.