diff --git a/migrations/000016.php b/migrations/000016.php
new file mode 100644
index 0000000..b333136
--- /dev/null
+++ b/migrations/000016.php
@@ -0,0 +1,64 @@
+exec('CREATE TABLE IF NOT EXISTS telegram_notifications (
+ enabled BOOLEAN DEFAULT 0,
+ bot_token TEXT DEFAULT "",
+ chat_id TEXT DEFAULT ""
+)');
+
+$db->exec('CREATE TABLE IF NOT EXISTS webhook_notifications (
+ enabled BOOLEAN DEFAULT 0,
+ headers TEXT DEFAULT "",
+ url TEXT DEFAULT "",
+ request_method TEXT DEFAULT "POST",
+ payload TEXT DEFAULT "",
+ iterator TEXT DEFAULT ""
+)');
+
+$db->exec('CREATE TABLE IF NOT EXISTS gotify_notifications (
+ enabled BOOLEAN DEFAULT 0,
+ url TEXT DEFAULT "",
+ token TEXT DEFAULT ""
+)');
+
+$db->exec('CREATE TABLE IF NOT EXISTS email_notifications (
+ enabled BOOLEAN DEFAULT 0,
+ smtp_address TEXT DEFAULT "",
+ smtp_port INTEGER DEFAULT 587,
+ smtp_username TEXT DEFAULT "",
+ smtp_password TEXT DEFAULT "",
+ from_email TEXT DEFAULT "",
+ encryption TEXT DEFAULT "tls"
+)');
+
+$db->exec('CREATE TABLE IF NOT EXISTS notification_settings (
+ days INTEGER DEFAULT 0
+)');
+
+// Check if old email notifications table has data and migrate it
+$result = $db->query('SELECT COUNT(*) as count FROM notifications');
+$row = $result->fetchArray(SQLITE3_ASSOC);
+
+if ($row['count'] > 0) {
+ // Copy data from notifications to email_notifications
+ $db->exec('INSERT INTO email_notifications (enabled, smtp_address, smtp_port, smtp_username, smtp_password, from_email, encryption)
+ SELECT enabled, smtp_address, smtp_port, smtp_username, smtp_password, from_email, encryption FROM notifications');
+
+ // Copy data from notifications to notification_settings
+ $db->exec('INSERT INTO notification_settings (days)
+ SELECT days FROM notifications');
+
+ if ($db->changes() > 0) {
+ $db->exec('DROP TABLE IF EXISTS notifications');
+ }
+} else {
+ $db->exec('DROP TABLE IF EXISTS notifications');
+}
+
+?>
\ No newline at end of file
diff --git a/scripts/notifications.js b/scripts/notifications.js
new file mode 100644
index 0000000..4502edc
--- /dev/null
+++ b/scripts/notifications.js
@@ -0,0 +1,212 @@
+function openNotificationsSettings(type) {
+ // Get all .account-notification-section-settings elements
+ var sections = document.querySelectorAll('.account-notification-section-settings');
+ var targetSection = document.querySelector(`.account-notification-section-settings[data-type="${type}"]`);
+
+ // Remove the is-open class from all elements
+ sections.forEach(function(section) {
+ if (section !== targetSection) {
+ section.classList.remove('is-open');
+ }
+ });
+
+ // Add the is-open class to the element with data-type=type
+
+ if (targetSection && !targetSection.classList.contains('is-open')) {
+ targetSection.classList.add('is-open');
+ } else {
+ targetSection.classList.remove('is-open');
+ }
+}
+
+function makeFetchCall(url, data, button) {
+ return fetch(url, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(data),
+ })
+ .then(response => response.json())
+ .then(data => {
+ if (data.success) {
+ showSuccessMessage(data.message);
+ } else {
+ showErrorMessage(data.message);
+ }
+ button.disabled = false;
+ })
+ .catch((error) => {
+ showErrorMessage(error);
+ button.disabled = false;
+ });
+
+}
+
+function saveNotifications() {
+ const button = document.getElementById("saveNotifications");
+ button.disabled = true;
+ const days = document.querySelector('#days').value;
+
+ const url = 'endpoints/notifications/savenotificationsettings.php';
+ const data = { days: days };
+
+ makeFetchCall(url, data, button);
+}
+
+function saveNotificationsEmailButton() {
+ const button = document.getElementById("saveNotificationsEmail");
+ button.disabled = true;
+
+ const enabled = document.getElementById("emailenabled").checked ? 1 : 0;
+ const smtpAddress = document.getElementById("smtpaddress").value;
+ const smtpPort = document.getElementById("smtpport").value;
+ const encryption = document.querySelector('input[name="encryption"]:checked').value;
+ const smtpUsername = document.getElementById("smtpusername").value;
+ const smtpPassword = document.getElementById("smtppassword").value;
+ const fromEmail = document.getElementById("fromemail").value;
+
+ const data = {
+ enabled: enabled,
+ smtpaddress: smtpAddress,
+ smtpport: smtpPort,
+ encryption: encryption,
+ smtpusername: smtpUsername,
+ smtppassword: smtpPassword,
+ fromemail: fromEmail
+ };
+
+ makeFetchCall('endpoints/notifications/saveemailnotifications.php', data, button);
+}
+
+function testNotificationEmailButton() {
+ const button = document.getElementById("testNotificationsEmail");
+ button.disabled = true;
+
+ const smtpAddress = document.getElementById("smtpaddress").value;
+ const smtpPort = document.getElementById("smtpport").value;
+ const encryption = document.querySelector('input[name="encryption"]:checked').value;
+ const smtpUsername = document.getElementById("smtpusername").value;
+ const smtpPassword = document.getElementById("smtppassword").value;
+ const fromEmail = document.getElementById("fromemail").value;
+
+ const data = {
+ smtpaddress: smtpAddress,
+ smtpport: smtpPort,
+ encryption: encryption,
+ smtpusername: smtpUsername,
+ smtppassword: smtpPassword,
+ fromemail: fromEmail
+ };
+
+ makeFetchCall('endpoints/notifications/testemailnotifications.php', data, button);
+}
+
+function saveNotificationsWebhookButton() {
+ const button = document.getElementById("saveNotificationsWebhook");
+ button.disabled = true;
+
+ const enabled = document.getElementById("webhookenabled").checked ? 1 : 0;
+ const webhook_url = document.getElementById("webhookurl").value;
+ const headers = document.getElementById("webhookcustomheaders").value;
+ const payload = document.getElementById("webhookpayload").value;
+
+ const data = {
+ enabled: enabled,
+ webhook_url: webhook_url,
+ headers: headers,
+ payload: payload
+ };
+
+ makeFetchCall('endpoints/notifications/savewebhooknotifications.php', data, button);
+}
+
+function testNotificationsWebhookButton() {
+ const button = document.getElementById("testNotificationsWebhook");
+ button.disabled = true;
+
+ const enabled = document.getElementById("webhookenabled").checked ? 1 : 0;
+ const requestmethod = document.getElementById("webhookrequestmethod").value;
+ const url = document.getElementById("webhookurl").value;
+ const customheaders = document.getElementById("webhookcustomheaders").value;
+ const payload = document.getElementById("webhookpayload").value;
+
+ const data = {
+ enabled: enabled,
+ requestmethod: requestmethod,
+ url: url,
+ customheaders: customheaders,
+ payload: payload
+ };
+
+ makeFetchCall('endpoints/notifications/testwebhooknotifications.php', data, button);
+}
+
+function saveNotificationsTelegramButton() {
+ const button = document.getElementById("saveNotificationsTelegram");
+ button.disabled = true;
+
+ const enabled = document.getElementById("telegramenabled").checked ? 1 : 0;
+ const chat_id = document.getElementById("telegramchatid").value;
+ const bot_token = document.getElementById("telegrambottoken").value;
+
+ const data = {
+ enabled: enabled,
+ chat_id: chat_id,
+ bot_token: bot_token
+ };
+
+ makeFetchCall('endpoints/notifications/savetelegramnotifications.php', data, button);
+}
+
+function testNotificationsTelegramButton() {
+ const button = document.getElementById("testNotificationsTelegram");
+ button.disabled = true;
+
+ const enabled = document.getElementById("telegramenabled").checked ? 1 : 0;
+ const bottoken = document.getElementById("telegrambottoken").value;
+ const chatid = document.getElementById("telegramchatid").value;
+
+ const data = {
+ enabled: enabled,
+ bottoken: bottoken,
+ chatid: chatid
+ };
+
+ makeFetchCall('endpoints/notifications/testtelegramnotifications.php', data, button);
+}
+
+function saveNotificationsGotifyButton() {
+ const button = document.getElementById("saveNotificationsGotify");
+ button.disabled = true;
+
+ const enabled = document.getElementById("gotifyenabled").checked ? 1 : 0;
+ const gotify_url = document.getElementById("gotifyurl").value;
+ const token = document.getElementById("gotifytoken").value;
+
+ const data = {
+ enabled: enabled,
+ gotify_url: gotify_url,
+ token: token
+ };
+
+ makeFetchCall('endpoints/notifications/savegotifynotifications.php', data, button);
+}
+
+function testNotificationsGotifyButton() {
+ const button = document.getElementById("testNotificationsGotify");
+ button.disabled = true;
+
+ const enabled = document.getElementById("gotifyenabled").checked ? 1 : 0;
+ const gotify_url = document.getElementById("gotifyurl").value;
+ const token = document.getElementById("gotifytoken").value;
+
+ const data = {
+ enabled: enabled,
+ gotify_url: gotify_url,
+ token: token
+ };
+
+ makeFetchCall('endpoints/notifications/testgotifynotifications.php', data, button);
+}
+
diff --git a/scripts/settings.js b/scripts/settings.js
index 9b3901c..6564631 100644
--- a/scripts/settings.js
+++ b/scripts/settings.js
@@ -842,94 +842,6 @@ function addFixerKeyButton() {
});
}
-function saveNotificationsButton() {
- const button = document.getElementById("saveNotifications");
- button.disabled = true;
-
- const enabled = document.getElementById("notifications").checked ? 1 : 0;
- const days = document.getElementById("days").value;
- const smtpAddress = document.getElementById("smtpaddress").value;
- const smtpPort = document.getElementById("smtpport").value;
- const encryption = document.querySelector('input[name="encryption"]:checked').value;
- const smtpUsername = document.getElementById("smtpusername").value;
- const smtpPassword = document.getElementById("smtppassword").value;
- const fromEmail = document.getElementById("fromemail").value;
-
- const data = {
- enabled: enabled,
- days: days,
- smtpaddress: smtpAddress,
- smtpport: smtpPort,
- encryption: encryption,
- smtpusername: smtpUsername,
- smtppassword: smtpPassword,
- fromemail: fromEmail
- };
-
- fetch('endpoints/notifications/save.php', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(data)
- })
- .then(response => response.json())
- .then(data => {
- if (data.success) {
- showSuccessMessage(data.message);
- } else {
- showErrorMessage(data.errorMessage);
- }
- button.disabled = false;
- })
- .catch(error => {
- showErrorMessage(translate('error_saving_notification_data'));
- button.disabled = false;
- });
-}
-
-function testNotificationButton() {
- const button = document.getElementById("testNotifications");
- button.disabled = true;
-
- const smtpAddress = document.getElementById("smtpaddress").value;
- const smtpPort = document.getElementById("smtpport").value;
- const encryption = document.querySelector('input[name="encryption"]:checked').value;
- const smtpUsername = document.getElementById("smtpusername").value;
- const smtpPassword = document.getElementById("smtppassword").value;
- const fromEmail = document.getElementById("fromemail").value;
-
- const data = {
- smtpaddress: smtpAddress,
- smtpport: smtpPort,
- encryption: encryption,
- smtpusername: smtpUsername,
- smtppassword: smtpPassword,
- fromemail: fromEmail
- };
-
- fetch('endpoints/notifications/sendtestmail.php', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(data)
- })
- .then(response => response.json())
- .then(data => {
- if (data.success) {
- showSuccessMessage(data.message);
- } else {
- showErrorMessage(data.errorMessage);
- }
- button.disabled = false;
- })
- .catch(error => {
- showErrorMessage(translate('error_sending_notification'));
- button.disabled = false;
- });
-}
-
function switchTheme() {
const darkThemeCss = document.querySelector("#dark-theme");
darkThemeCss.disabled = !darkThemeCss.disabled;
diff --git a/service-worker.js b/service-worker.js
index 9d32d57..d67dd7c 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -23,6 +23,7 @@ self.addEventListener('install', function(event) {
'scripts/dashboard.js',
'scripts/stats.js',
'scripts/settings.js',
+ 'scripts/notifications.js',
'scripts/registration.js',
'scripts/i18n/en.js',
'scripts/i18n/de.js',
diff --git a/settings.php b/settings.php
index 1a69eb8..4b593bb 100644
--- a/settings.php
+++ b/settings.php
@@ -176,7 +176,8 @@
query($sql);
$rowCount = 0;
@@ -186,14 +187,107 @@
}
if ($rowCount == 0) {
- $notifications['enabled'] = false;
$notifications['days'] = 1;
- $notifications['smtp_address'] = "";
- $notifications['smtp_port'] = "";
- $notifications['smtp_username'] = "";
- $notifications['smtp_password'] = "";
- $notifications['from_email'] = "";
- $notifications['encryption'] = "tls";
+ }
+
+ // Email notifications
+ $sql = "SELECT * FROM email_notifications LIMIT 1";
+ $result = $db->query($sql);
+
+ $rowCount = 0;
+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+ $notificationsEmail['enabled'] = $row['enabled'];
+ $notificationsEmail['smtp_address'] = $row['smtp_address'];
+ $notificationsEmail['smtp_port'] = $row['smtp_port'];
+ $notificationsEmail['encryption'] = $row['encryption'];
+ $notificationsEmail['smtp_username'] = $row['smtp_username'];
+ $notificationsEmail['smtp_password'] = $row['smtp_password'];
+ $notificationsEmail['from_email'] = $row['from_email'];
+ $rowCount++;
+ }
+
+ if ($rowCount == 0) {
+ $notificationsEmail['enabled'] = 0;
+ $notificationsEmail['smtp_address'] = "";
+ $notificationsEmail['smtp_port'] = 587;
+ $notificationsEmail['encryption'] = "tls";
+ $notificationsEmail['smtp_username'] = "";
+ $notificationsEmail['smtp_password'] = "";
+ $notificationsEmail['from_email'] = "";
+ }
+
+ // Telegram notifications
+ $sql = "SELECT * FROM telegram_notifications LIMIT 1";
+ $result = $db->query($sql);
+
+ $rowCount = 0;
+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+ $notificationsTelegram['enabled'] = $row['enabled'];
+ $notificationsTelegram['bot_token'] = $row['bot_token'];
+ $notificationsTelegram['chat_id'] = $row['chat_id'];
+ $rowCount++;
+ }
+
+ if ($rowCount == 0) {
+ $notificationsTelegram['enabled'] = 0;
+ $notificationsTelegram['bot_token'] = "";
+ $notificationsTelegram['chat_id'] = "";
+ }
+
+ // Webhook notifications
+ $sql = "SELECT * FROM webhook_notifications LIMIT 1";
+ $result = $db->query($sql);
+
+ $rowCount = 0;
+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+ $notificationsWebhook['enabled'] = $row['enabled'];
+ $notificationsWebhook['url'] = $row['url'];
+ $notificationsWebhook['request_method'] = $row['request_method'];
+ $notificationsWebhook['headers'] = $row['headers'];
+ $notificationsWebhook['payload'] = $row['payload'];
+ $notificationsWebhook['iterator'] = $row['iterator'];
+ $rowCount++;
+ }
+
+ if ($rowCount == 0) {
+ $notificationsWebhook['enabled'] = 0;
+ $notificationsWebhook['url'] = "";
+ $notificationsWebhook['request_method'] = "POST";
+ $notificationsWebhook['headers'] = "";
+ $notificationsWebhook['iterator'] = "";
+ $notificationsWebhook['payload'] = '
+{
+ "days_until": "{{days_until}}",
+ "{{subscriptions}}": [
+ {
+ "name": "{{subscription_name}}",
+ "price": "{{subscription_price}}",
+ "currency": "{{subscription_currency}}",
+ "category": "{{subscription_category}}",
+ "date": "{{subscription_date}}",
+ "payer": "{{subscription_payer}}"
+ }
+ ]
+
+}';
+ }
+
+ // Gotify notifications
+ $sql = "SELECT * FROM gotify_notifications LIMIT 1";
+ $result = $db->query($sql);
+
+ $rowCount = 0;
+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+ $notificationsGotify['enabled'] = $row['enabled'];
+ $notificationsGotify['url'] = $row['url'];
+ $notificationsGotify['token'] = $row['token'];
+ $rowCount++;
+ }
+
+ if ($rowCount == 0) {
+ $notificationsGotify['enabled'] = 0;
+ $notificationsGotify['url'] = "";
+ $notificationsGotify['token'] = "";
}
?>
@@ -203,54 +297,160 @@
-
- >
-
-
-
+
-
-
-
-
-
-
-
- />
-
- />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ : {{days_until}}, {{subscription_name}}, {{subscription_price}}, {{subscription_currency}}, {{subscription_category}}, {{subscription_date}}, {{subscription_payer}}
+
+
+
+
+
+
+
@@ -702,6 +902,7 @@
+
div:first-of-type {
+ margin-top: 20px;
+}
+
+.account-notification-section-settings > div:last-of-type {
+ margin-bottom: 20px;
+}
+
.account-notifications .buttons {
gap: 15px;
}
@@ -965,6 +1008,21 @@ input[type="text"]:disabled {
cursor: not-allowed;
}
+textarea {
+ font-size: 16px;
+ background-color: #FFFFFF;
+ border: 1px solid #ccc;
+ border-radius: 8px;
+ padding: 5px 14px;
+ color: #202020;
+ width: 100%;
+ height: 245px;
+}
+
+textarea.thin {
+ height: 80px;
+}
+
@media (max-width: 768px) {
input[type="checkbox"] {
width: 20px;
@@ -1046,6 +1104,9 @@ input[type="text"]:disabled {
padding-bottom: 0px;
}
+.capitalize {
+ text-transform: capitalize;
+}
.error {
display: block;