Wallos: Open-source, self-hostable personal subscription tracker. Visualize your recurring expenses, manage your budget, and save money.
feat: support automatic dark mode
Miguel Ribeiroc2e85d6e109d
diff --git a/about.php b/about.phpindex 7ba6c74..b46e7a4 100644--- a/about.php+++ b/about.php@@ -1,5 +1,5 @@<?php- require_once 'includes/header.php';+require_once 'includes/header.php';?><section class="contain">@@ -10,25 +10,27 @@</header><div class="credits-list"><p>Wallos <?= $version ?></p>- <p><?= translate('license', $i18n) ?>:+ <p><?= translate('license', $i18n) ?>:<span>GPLv3- <a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank" title="<?= translate('external_url', $i18n) ?>">+ <a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank"+ title="<?= translate('external_url', $i18n) ?>"><i class="fa-solid fa-arrow-up-right-from-square"></i></a></span></p><p>- <?= translate('issues_and_requests', $i18n) ?>:+ <?= translate('issues_and_requests', $i18n) ?>:<span>GitHub- <a href="https://github.com/ellite/Wallos/issues" target="_blank" title="<?= translate('external_url', $i18n) ?>">+ <a href="https://github.com/ellite/Wallos/issues" target="_blank"+ title="<?= translate('external_url', $i18n) ?>"><i class="fa-solid fa-arrow-up-right-from-square"></i></a></span></p><p>- <?= translate('the_author', $i18n) ?>:+ <?= translate('the_author', $i18n) ?>:<span>https://henrique.pt<a href="https://henrique.pt/" target="_blank" title="<?= translate('external_url', $i18n) ?>">@@ -37,25 +39,27 @@</span></p><p>- <?= translate('icons', $i18n) ?>:+ <?= translate('icons', $i18n) ?>:<span>https://www.streamlinehq.com/freebies/plump-flat-free- <a href="https://www.streamlinehq.com/freebies/plump-flat-free" target="_blank" title="<?= translate('external_url', $i18n) ?>">+ <a href="https://www.streamlinehq.com/freebies/plump-flat-free" target="_blank"+ title="<?= translate('external_url', $i18n) ?>"><i class="fa-solid fa-arrow-up-right-from-square"></i></a></span></p><p>- <?= translate('payment_icons', $i18n) ?>:+ <?= translate('payment_icons', $i18n) ?>:<span>https://www.figma.com/file/5IMW8JfoXfB5GRlPNdTyeg/Credit-Cards-and-Payment-Methods-Icons-(Community)- <a href="https://www.figma.com/file/5IMW8JfoXfB5GRlPNdTyeg/Credit-Cards-and-Payment-Methods-Icons-(Community)" target="_blank" title="<?= translate('external_url', $i18n) ?>">+ <a href="https://www.figma.com/file/5IMW8JfoXfB5GRlPNdTyeg/Credit-Cards-and-Payment-Methods-Icons-(Community)"+ target="_blank" title="<?= translate('external_url', $i18n) ?>"><i class="fa-solid fa-arrow-up-right-from-square"></i></a></span></p><p>- Chart.js:+ Chart.js:<span>https://www.chartjs.org/<a href="https://www.chartjs.org/" target="_blank" title="<?= translate('external_url', $i18n) ?>">@@ -69,5 +73,5 @@</section><?php- require_once 'includes/footer.php';+require_once 'includes/footer.php';?>\ No newline at end of filediff --git a/admin.php b/admin.phpindex adf4b12..598d552 100644--- a/admin.php+++ b/admin.php@@ -1,27 +1,27 @@<?php- require_once 'includes/header.php';+require_once 'includes/header.php';- if ($isAdmin != 1) {- header('Location: index.php');- exit;- }+if ($isAdmin != 1) {+ header('Location: index.php');+ exit;+}- // get admin settings from admin table- $stmt = $db->prepare('SELECT * FROM admin');- $result = $stmt->execute();- $settings = $result->fetchArray(SQLITE3_ASSOC);+// get admin settings from admin table+$stmt = $db->prepare('SELECT * FROM admin');+$result = $stmt->execute();+$settings = $result->fetchArray(SQLITE3_ASSOC);- // get user accounts- $stmt = $db->prepare('SELECT id, username, email FROM user ORDER BY id ASC');- $result = $stmt->execute();+// get user accounts+$stmt = $db->prepare('SELECT id, username, email FROM user ORDER BY id ASC');+$result = $stmt->execute();- $users = [];- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $users[] = $row;- }- $userCount = is_array($users) ? count($users) : 0;+$users = [];+while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $users[] = $row;+}+$userCount = is_array($users) ? count($users) : 0;- $loginDisabledAllowed = $userCount == 1 && $settings['registrations_open'] == 0;+$loginDisabledAllowed = $userCount == 1 && $settings['registrations_open'] == 0;?><section class="contain settings">@@ -43,28 +43,30 @@<p><i class="fa-solid fa-circle-info"></i><?= translate('max_users_info', $i18n) ?>- </p><p>+ </p>+ <p><i class="fa-solid fa-circle-info"></i>By enabling user registrations, the setting to disable login will be unavailable.</p></div><div class="form-group-inline">- <input type="checkbox" id="requireEmail" <?= $settings['require_email_verification'] ? 'checked' : '' ?> <?= empty($settings['smtp_address']) ? 'disabled' : '' ?>/>+ <input type="checkbox" id="requireEmail" <?= $settings['require_email_verification'] ? 'checked' : '' ?>+ <?= empty($settings['smtp_address']) ? 'disabled' : '' ?> /><label for="requireEmail"><?= translate('require_email_verification', $i18n) ?></label></div><?php- if (empty($settings['smtp_address'])) {- ?>- <div class="settings-notes">- <p>- <i class="fa-solid fa-circle-info"></i>- <?= translate('configure_smtp_settings_to_enable', $i18n) ?>- </p>- </div>- <?php- }+ if (empty($settings['smtp_address'])) {+ ?>+ <div class="settings-notes">+ <p>+ <i class="fa-solid fa-circle-info"></i>+ <?= translate('configure_smtp_settings_to_enable', $i18n) ?>+ </p>+ </div>+ <?php+ }?><div class="form-group"><label for="serverUrl"><?= translate('server_url', $i18n) ?></label>@@ -82,7 +84,8 @@</div><hr><div class="form-group-inline">- <input type="checkbox" id="disableLogin" <?= $settings['login_disabled'] ? 'checked' : '' ?> <?= $loginDisabledAllowed ? '' : 'disabled' ?> />+ <input type="checkbox" id="disableLogin" <?= $settings['login_disabled'] ? 'checked' : '' ?>+ <?= $loginDisabledAllowed ? '' : 'disabled' ?> /><label for="disableLogin"><?= translate('disable_login', $i18n) ?></label></div><div class="settings-notes">@@ -96,64 +99,68 @@</p></div><div class="buttons">- <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>" id="saveAccountRegistrations" onClick="saveAccountRegistrationsButton()"/>+ <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>" id="saveAccountRegistrations"+ onClick="saveAccountRegistrationsButton()" /></div></div></section><?php- if ($userCount >= 0) {- ?>+ if ($userCount >= 0) {+ ?>- <section class="account-section">- <header>- <h2><?= translate('user_management', $i18n) ?></h2>- </header>- <div class="user-list">- <?php+ <section class="account-section">+ <header>+ <h2><?= translate('user_management', $i18n) ?></h2>+ </header>+ <div class="user-list">+ <?phpforeach ($users as $user) {$userIcon = $user['id'] == 1 ? 'fa-user-tie' : 'fa-id-badge';?><div class="form-group-inline" data-userid="<?= $user['id'] ?>"><div class="user-list-row">- <div title="<?= translate('username', $i18n) ?>"><i class="fa-solid <?= $userIcon ?>"></i><?= $user['username'] ?></div>+ <div title="<?= translate('username', $i18n) ?>"><i+ class="fa-solid <?= $userIcon ?>"></i><?= $user['username'] ?></div><div title="<?= translate('email', $i18n) ?>"><i class="fa-solid fa-envelope"></i>- <a href="mailto:<?= $user['email']?>"><?= $user['email']?></a>+ <a href="mailto:<?= $user['email'] ?>"><?= $user['email'] ?></a></div></div><div><?php- if ($user['id'] != 1) {- ?>- <button class="image-button medium" onClick="removeUser(<?= $user['id'] ?>)">- <img src="images/siteicons/<?= $colorTheme ?>/delete.png" title="<?= translate('delete_user', $i18n) ?>">- </button>- <?php- } else {- ?>- <button class="image-button medium disabled" disabled>- <img src="images/siteicons/<?= $colorTheme ?>/delete.png" title="<?= translate('delete_user', $i18n) ?>">- </button>- <?php- }+ if ($user['id'] != 1) {+ ?>+ <button class="image-button medium" onClick="removeUser(<?= $user['id'] ?>)">+ <img src="images/siteicons/<?= $colorTheme ?>/delete.png"+ title="<?= translate('delete_user', $i18n) ?>">+ </button>+ <?php+ } else {?>-- </div>+ <button class="image-button medium disabled" disabled>+ <img src="images/siteicons/<?= $colorTheme ?>/delete.png"+ title="<?= translate('delete_user', $i18n) ?>">+ </button>+ <?php+ }+ ?>++ </div></div><?php}- ?>- </div>- <div class="settings-notes">- <p>- <i class="fa-solid fa-circle-info"></i>- <?= translate('delete_user_info', $i18n) ?>- </p>- </div>- </section>+ ?>+ </div>+ <div class="settings-notes">+ <p>+ <i class="fa-solid fa-circle-info"></i>+ <?= translate('delete_user_info', $i18n) ?>+ </p>+ </div>+ </section>- <?php- }+ <?php+ }?><section class="account-section">@@ -162,8 +169,10 @@</header><div class="admin-form"><div class="form-group-inline">- <input type="text" name="smtpaddress" id="smtpaddress" placeholder="<?= translate('smtp_address', $i18n) ?>" value="<?= $settings['smtp_address'] ?>" />- <input type="text" name="smtpport" id="smtpport" placeholder="<?= translate('port', $i18n) ?>" class="one-third" value="<?= $settings['smtp_port'] ?>" />+ <input type="text" name="smtpaddress" id="smtpaddress"+ placeholder="<?= translate('smtp_address', $i18n) ?>" value="<?= $settings['smtp_address'] ?>" />+ <input type="text" name="smtpport" id="smtpport" placeholder="<?= translate('port', $i18n) ?>"+ class="one-third" value="<?= $settings['smtp_port'] ?>" /></div><div class="form-group-inline"><input type="radio" name="encryption" id="encryptiontls" value="tls" <?= empty($settings['encryption']) || $settings['encryption'] == "tls" ? "checked" : "" ?> />@@ -172,13 +181,16 @@<label for="encryptionssl"><?= translate('ssl', $i18n) ?></label></div><div class="form-group-inline">- <input type="text" name="smtpusername" id="smtpusername" placeholder="<?= translate('smtp_username', $i18n) ?>" value="<?= $settings['smtp_username'] ?>" />+ <input type="text" name="smtpusername" id="smtpusername"+ placeholder="<?= translate('smtp_username', $i18n) ?>" value="<?= $settings['smtp_username'] ?>" /></div><div class="form-group-inline">- <input type="password" name="smtppassword" id="smtppassword" placeholder="<?= translate('smtp_password', $i18n) ?>" value="<?= $settings['smtp_password'] ?>" />+ <input type="password" name="smtppassword" id="smtppassword"+ placeholder="<?= translate('smtp_password', $i18n) ?>" value="<?= $settings['smtp_password'] ?>" /></div><div class="form-group-inline">- <input type="text" name="fromemail" id="fromemail" placeholder="<?= translate('from_email', $i18n) ?>" value="<?= $settings['from_email'] ?>" />+ <input type="text" name="fromemail" id="fromemail" placeholder="<?= translate('from_email', $i18n) ?>"+ value="<?= $settings['from_email'] ?>" /></div><div class="settings-notes"><p>@@ -190,8 +202,10 @@</p></div><div class="buttons">- <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>" id="testSmtpSettingsButton" onClick="testSmtpSettingsButton()"/>- <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>" id="saveSmtpSettingsButton" onClick="saveSmtpSettingsButton()"/>+ <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>"+ id="testSmtpSettingsButton" onClick="testSmtpSettingsButton()" />+ <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>" id="saveSmtpSettingsButton"+ onClick="saveSmtpSettingsButton()" /></div></div></section>@@ -203,11 +217,14 @@</header><div class="form-group-inline"><div>- <input type="button" class="button thin" value="<?= translate('backup', $i18n) ?>" id="backupDB" onClick="backupDB()"/>- </div>+ <input type="button" class="button thin" value="<?= translate('backup', $i18n) ?>" id="backupDB"+ onClick="backupDB()" />+ </div><div>- <input type="button" class="secondary-button thin" value="<?= translate('restore', $i18n) ?>" id="restoreDB" onClick="openRestoreDBFileSelect()" />- <input type="file" name="restoreDBFile" id="restoreDBFile" style="display: none;" onChange="restoreDB()" accept=".zip">+ <input type="button" class="secondary-button thin" value="<?= translate('restore', $i18n) ?>"+ id="restoreDB" onClick="openRestoreDBFileSelect()" />+ <input type="file" name="restoreDBFile" id="restoreDBFile" style="display: none;" onChange="restoreDB()"+ accept=".zip"></div></div><div class="settings-notes">@@ -215,12 +232,12 @@<i class="fa-solid fa-circle-info"></i><?= translate('restore_info', $i18n) ?></p>- </div>+ </div></section></section><script src="scripts/admin.js?<?= $version ?>"></script><?php- require_once 'includes/footer.php';+require_once 'includes/footer.php';?>\ No newline at end of filediff --git a/auth.php b/auth.phpdeleted file mode 100644index e69de29..0000000diff --git a/calendar.php b/calendar.phpindex 61bc0eb..bb7f71d 100644--- a/calendar.php+++ b/calendar.php@@ -1,22 +1,6 @@<?phprequire_once 'includes/header.php';-function getCycleDays($cycleId)-{- switch ($cycleId) {- case 1:- return 1; // Daily- case 2:- return 7; // Weekly- case 3:- return 30; // Monthly- case 4:- return 365; // Yearly- default:- return 0;- }-}-$currentMonth = date('m');$currentYear = date('Y');$sameAsCurrent = false;@@ -129,18 +113,44 @@ $yearsToLoad = $calendarYear - $currentYear + 1;<?phpforeach ($subscriptions as $subscription) {$nextPaymentDate = strtotime($subscription['next_payment']);- $cycleDays = getCycleDays($subscription['cycle']);+ $cycle = $subscription['cycle']; // Integer from 1 to 4$frequency = $subscription['frequency'];-- // Calculate the end date for displaying this subscription, for simplicity, we'll assume a 2-year range+$endDate = strtotime("+" . $yearsToLoad . " years", $nextPaymentDate);++ // Determine the strtotime increment string based on cycle+ switch ($cycle) {+ case 1: // Days+ $incrementString = "+{$frequency} days";+ break;+ case 2: // Weeks+ $incrementString = "+{$frequency} weeks";+ break;+ case 3: // Months+ $incrementString = "+{$frequency} months";+ break;+ case 4: // Years+ $incrementString = "+{$frequency} years";+ break;+ default:+ $incrementString = "+{$frequency} months"; // Default case, if needed+ }++ // Calculate the start of the month+ $startOfMonth = strtotime($calendarYear . '-' . str_pad($calendarMonth, 2, '0', STR_PAD_LEFT) . '-01');- for ($date = $nextPaymentDate; $date <= $endDate; $date = strtotime("+{$frequency} month", $date)) {+ // Find the first payment date of the month by moving backwards+ $startDate = $nextPaymentDate;+ while ($startDate > $startOfMonth) {+ $startDate = strtotime("-" . $incrementString, $startDate);+ }++ for ($date = $startDate; $date <= $endDate; $date = strtotime($incrementString, $date)) {if (date('Y-m', $date) == $calendarYear . '-' . str_pad($calendarMonth, 2, '0', STR_PAD_LEFT)) {if (date('d', $date) == $day) {?><div class="calendar-subscription-title" onClick="openSubscriptionModal(<?= $subscription['id'] ?>)">- <?= $subscription['name'] ?>+ <?= htmlspecialchars($subscription['name']) ?></div><?php}@@ -171,17 +181,44 @@ $yearsToLoad = $calendarYear - $currentYear + 1;<?phpforeach ($subscriptions as $subscription) {$nextPaymentDate = strtotime($subscription['next_payment']);- $cycleDays = getCycleDays($subscription['cycle']); // Function to get the number of days based on the cycle id+ $cycle = $subscription['cycle']; // Integer from 1 to 4$frequency = $subscription['frequency'];$endDate = strtotime("+" . $yearsToLoad . " years", $nextPaymentDate);- for ($date = $nextPaymentDate; $date <= $endDate; $date = strtotime("+{$frequency} month", $date)) {+ // Determine the strtotime increment string based on cycle+ switch ($cycle) {+ case 1: // Days+ $incrementString = "+{$frequency} days";+ break;+ case 2: // Weeks+ $incrementString = "+{$frequency} weeks";+ break;+ case 3: // Months+ $incrementString = "+{$frequency} months";+ break;+ case 4: // Years+ $incrementString = "+{$frequency} years";+ break;+ default:+ $incrementString = "+{$frequency} months"; // Default case, if needed+ }++ // Calculate the start of the month+ $startOfMonth = strtotime($calendarYear . '-' . str_pad($calendarMonth, 2, '0', STR_PAD_LEFT) . '-01');++ // Find the first payment date of the month by moving backwards+ $startDate = $nextPaymentDate;+ while ($startDate > $startOfMonth) {+ $startDate = strtotime("-" . $incrementString, $startDate);+ }++ for ($date = $startDate; $date <= $endDate; $date = strtotime($incrementString, $date)) {if (date('Y-m', $date) == $calendarYear . '-' . str_pad($calendarMonth, 2, '0', STR_PAD_LEFT)) {if (date('d', $date) == $day) {?><div class="calendar-subscription-title" onClick="openSubscriptionModal(<?= $subscription['id'] ?>)">- <?= $subscription['name'] ?>+ <?= htmlspecialchars($subscription['name']) ?></div><?php}diff --git a/endpoints/admin/deleteuser.php b/endpoints/admin/deleteuser.phpindex 44009da..c00b876 100644--- a/endpoints/admin/deleteuser.php+++ b/endpoints/admin/deleteuser.php@@ -73,7 +73,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {// Delete payment methods$stmt = $db->prepare('DELETE FROM payment_methods WHERE user_id = :id');$stmt->bindValue(':id', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ $result = $stmt->execute();// Delete email notifications$stmt = $db->prepare('DELETE FROM email_notifications WHERE user_id = :id');@@ -114,7 +114,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {$stmt = $db->prepare('DELETE FROM email_verification WHERE user_id = :id');$stmt->bindValue(':id', $userId, SQLITE3_INTEGER);$result = $stmt->execute();-+die(json_encode(["success" => true,"message" => translate('success', $i18n)diff --git a/endpoints/categories/category.php b/endpoints/categories/category.phpindex cb70f08..d33501f 100644--- a/endpoints/categories/category.php+++ b/endpoints/categories/category.php@@ -23,7 +23,7 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {$stmtInsert->bindParam(':order', $order, SQLITE3_INTEGER);$stmtInsert->bindParam(':userId', $userId, SQLITE3_INTEGER);$resultInsert = $stmtInsert->execute();-+if ($resultInsert) {$categoryId = $db->lastInsertRowID();$response = [@@ -120,4 +120,4 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {echo translate('error', $i18n);}-?>+?>\ No newline at end of filediff --git a/endpoints/categories/sort.php b/endpoints/categories/sort.phpindex 1da4277..68d61f2 100644--- a/endpoints/categories/sort.php+++ b/endpoints/categories/sort.php@@ -20,7 +20,7 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {"success" => true,"message" => translate("sort_order_saved", $i18n)];- echo json_encode($response);+ echo json_encode($response);} else {$response = ["success" => false,diff --git a/endpoints/cronjobs/createdatabase.php b/endpoints/cronjobs/createdatabase.phpindex 27a05c6..7dbb753 100644--- a/endpoints/cronjobs/createdatabase.php+++ b/endpoints/cronjobs/createdatabase.php@@ -1,4 +1,4 @@-<?php+<?php$databaseFile = __DIR__ . '/../../db/wallos.db';@@ -276,4 +276,4 @@ if (!file_exists($databaseFile)) {}-?>+?>\ No newline at end of filediff --git a/endpoints/cronjobs/sendnotifications.php b/endpoints/cronjobs/sendnotifications.phpindex 192e3cf..3471c8b 100644--- a/endpoints/cronjobs/sendnotifications.php+++ b/endpoints/cronjobs/sendnotifications.php@@ -1,569 +1,580 @@<?php- use PHPMailer\PHPMailer\PHPMailer;- use PHPMailer\PHPMailer\SMTP;- use PHPMailer\PHPMailer\Exception;+use PHPMailer\PHPMailer\PHPMailer;+use PHPMailer\PHPMailer\SMTP;+use PHPMailer\PHPMailer\Exception;++require_once __DIR__ . '/../../includes/connect_endpoint_crontabs.php';++require __DIR__ . '/../../libs/PHPMailer/PHPMailer.php';+require __DIR__ . '/../../libs/PHPMailer/SMTP.php';+require __DIR__ . '/../../libs/PHPMailer/Exception.php';++// Get all user ids+$query = "SELECT id, username FROM user";+$stmt = $db->prepare($query);+$usersToNotify = $stmt->execute();++while ($userToNotify = $usersToNotify->fetchArray(SQLITE3_ASSOC)) {+ $userId = $userToNotify['id'];+ echo "For user: " . $userToNotify['username'] . "<br />";++ $days = 1;+ $emailNotificationsEnabled = false;+ $gotifyNotificationsEnabled = false;+ $telegramNotificationsEnabled = false;+ $webhookNotificationsEnabled = false;+ $pushoverNotificationsEnabled = false;+ $discordNotificationsEnabled = false;+ $ntfyNotificationsEnabled = false;++ // Get notification settings (how many days before the subscription ends should the notification be sent)+ $query = "SELECT days FROM notification_settings WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- require_once __DIR__ . '/../../includes/connect_endpoint_crontabs.php';+ if ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $days = $row['days'];+ }- require __DIR__ . '/../../libs/PHPMailer/PHPMailer.php';- require __DIR__ . '/../../libs/PHPMailer/SMTP.php';- require __DIR__ . '/../../libs/PHPMailer/Exception.php';- // Get all user ids- $query = "SELECT id, username FROM user";+ // Check if email notifications are enabled and get the settings+ $query = "SELECT * FROM email_notifications WHERE user_id = :userId";$stmt = $db->prepare($query);- $usersToNotify = $stmt->execute();-- while ($userToNotify = $usersToNotify->fetchArray(SQLITE3_ASSOC)) {- $userId = $userToNotify['id'];- echo "For user: " . $userToNotify['username'] . "<br />";-- $days = 1;- $emailNotificationsEnabled = false;- $gotifyNotificationsEnabled = false;- $telegramNotificationsEnabled = false;- $webhookNotificationsEnabled = false;- $pushoverNotificationsEnabled = false;- $discordNotificationsEnabled = false;- $ntfyNotificationsEnabled = false;-- // Get notification settings (how many days before the subscription ends should the notification be sent)- $query = "SELECT days FROM notification_settings WHERE user_id = :userId";- $stmt = $db->prepare($query);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();++ if ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $emailNotificationsEnabled = $row['enabled'];+ $email['smtpAddress'] = $row["smtp_address"];+ $email['smtpPort'] = $row["smtp_port"];+ $email['encryption'] = $row["encryption"];+ $email['smtpUsername'] = $row["smtp_username"];+ $email['smtpPassword'] = $row["smtp_password"];+ $email['fromEmail'] = $row["from_email"] ? $row["from_email"] : "[email protected]";+ }- if ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $days = $row['days'];- }+ // Check if Discord notifications are enabled and get the settings+ $query = "SELECT * FROM discord_notifications WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();++ if ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $discordNotificationsEnabled = $row['enabled'];+ $discord['webhook_url'] = $row["webhook_url"];+ $discord['bot_username'] = $row["bot_username"];+ $discord['bot_avatar_url'] = $row["bot_avatar_url"];+ }+ // Check if Gotify notifications are enabled and get the settings+ $query = "SELECT * FROM gotify_notifications WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- // Check if email notifications are enabled and get the settings- $query = "SELECT * FROM email_notifications WHERE user_id = :userId";- $stmt = $db->prepare($query);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ $gotify = [];- if ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $emailNotificationsEnabled = $row['enabled'];- $email['smtpAddress'] = $row["smtp_address"];- $email['smtpPort'] = $row["smtp_port"];- $email['encryption'] = $row["encryption"];- $email['smtpUsername'] = $row["smtp_username"];- $email['smtpPassword'] = $row["smtp_password"];- $email['fromEmail'] = $row["from_email"] ? $row["from_email"] : "[email protected]";- }+ if ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $gotifyNotificationsEnabled = $row['enabled'];+ $gotify['serverUrl'] = $row["url"];+ $gotify['appToken'] = $row["token"];+ }- // Check if Discord notifications are enabled and get the settings- $query = "SELECT * FROM discord_notifications WHERE user_id = :userId";- $stmt = $db->prepare($query);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ // Check if Telegram notifications are enabled and get the settings+ $query = "SELECT * FROM telegram_notifications WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- if ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $discordNotificationsEnabled = $row['enabled'];- $discord['webhook_url'] = $row["webhook_url"];- $discord['bot_username'] = $row["bot_username"];- $discord['bot_avatar_url'] = $row["bot_avatar_url"];- }+ if ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $telegramNotificationsEnabled = $row['enabled'];+ $telegram['botToken'] = $row["bot_token"];+ $telegram['chatId'] = $row["chat_id"];+ }- // Check if Gotify notifications are enabled and get the settings- $query = "SELECT * FROM gotify_notifications WHERE user_id = :userId";- $stmt = $db->prepare($query);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ // Check if Pushover notifications are enabled and get the settings+ $query = "SELECT * FROM pushover_notifications WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();++ if ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $pushoverNotificationsEnabled = $row['enabled'];+ $pushover['user_key'] = $row["user_key"];+ $pushover['token'] = $row["token"];+ }++ // Check if Nrfy notifications are enabled and get the settings+ $query = "SELECT * FROM ntfy_notifications WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();++ if ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $ntfyNotificationsEnabled = $row['enabled'];+ $ntfy['host'] = $row["host"];+ $ntfy['topic'] = $row["topic"];+ $ntfy['headers'] = $row["headers"];+ }- if ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $gotifyNotificationsEnabled = $row['enabled'];- $gotify['serverUrl'] = $row["url"];- $gotify['appToken'] = $row["token"];+ // Check if Webhook notifications are enabled and get the settings+ $query = "SELECT * FROM webhook_notifications WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();++ if ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $webhookNotificationsEnabled = $row['enabled'];+ $webhook['url'] = $row["url"];+ $webhook['request_method'] = $row["request_method"];+ $webhook['headers'] = $row["headers"];+ $webhook['payload'] = $row["payload"];+ $webhook['iterator'] = $row["iterator"];+ if ($webhook['iterator'] === "") {+ $webhook['iterator'] = "subscriptions";}+ }- // Check if Telegram notifications are enabled and get the settings- $query = "SELECT * FROM telegram_notifications WHERE user_id = :userId";+ $notificationsEnabled = $emailNotificationsEnabled || $gotifyNotificationsEnabled || $telegramNotificationsEnabled ||+ $webhookNotificationsEnabled || $pushoverNotificationsEnabled || $discordNotificationsEnabled ||+ $ntfyNotificationsEnabled;++ // If no notifications are enabled, no need to run+ if (!$notificationsEnabled) {+ echo "Notifications are disabled. No need to run.<br />";+ continue;+ } else {+ // Get all currencies+ $currencies = array();+ $query = "SELECT * FROM currencies WHERE user_id = :userId";$stmt = $db->prepare($query);$stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);$result = $stmt->execute();- if ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $telegramNotificationsEnabled = $row['enabled'];- $telegram['botToken'] = $row["bot_token"];- $telegram['chatId'] = $row["chat_id"];+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $currencies[$row['id']] = $row;}- // Check if Pushover notifications are enabled and get the settings- $query = "SELECT * FROM pushover_notifications WHERE user_id = :userId";+ // Get all household members+ $query = "SELECT * FROM household WHERE user_id = :userId";$stmt = $db->prepare($query);$stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ $resultHousehold = $stmt->execute();- if ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $pushoverNotificationsEnabled = $row['enabled'];- $pushover['user_key'] = $row["user_key"];- $pushover['token'] = $row["token"];+ $household = [];+ while ($rowHousehold = $resultHousehold->fetchArray(SQLITE3_ASSOC)) {+ $household[$rowHousehold['id']] = $rowHousehold;}- // Check if Nrfy notifications are enabled and get the settings- $query = "SELECT * FROM ntfy_notifications WHERE user_id = :userId";+ // Get all categories+ $query = "SELECT * FROM categories WHERE user_id = :userId";$stmt = $db->prepare($query);$stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ $resultCategories = $stmt->execute();- if ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $ntfyNotificationsEnabled = $row['enabled'];- $ntfy['host'] = $row["host"];- $ntfy['topic'] = $row["topic"];- $ntfy['headers'] = $row["headers"];+ $categories = [];+ while ($rowCategory = $resultCategories->fetchArray(SQLITE3_ASSOC)) {+ $categories[$rowCategory['id']] = $rowCategory;}- // Check if Webhook notifications are enabled and get the settings- $query = "SELECT * FROM webhook_notifications WHERE user_id = :userId";+ $query = "SELECT * FROM subscriptions WHERE user_id = :user_id AND notify = :notify AND inactive = :inactive ORDER BY payer_user_id ASC";$stmt = $db->prepare($query);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();-- if ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $webhookNotificationsEnabled = $row['enabled'];- $webhook['url'] = $row["url"];- $webhook['request_method'] = $row["request_method"];- $webhook['headers'] = $row["headers"];- $webhook['payload'] = $row["payload"];- $webhook['iterator'] = $row["iterator"];- if ($webhook['iterator'] === "") {- $webhook['iterator'] = "subscriptions";+ $stmt->bindValue(':user_id', $userId, SQLITE3_INTEGER);+ $stmt->bindValue(':notify', 1, SQLITE3_INTEGER);+ $stmt->bindValue(':inactive', 0, SQLITE3_INTEGER);+ $resultSubscriptions = $stmt->execute();++ $notify = [];+ $i = 0;+ $currentDate = new DateTime('now');+ while ($rowSubscription = $resultSubscriptions->fetchArray(SQLITE3_ASSOC)) {+ if ($rowSubscription['notify_days_before'] !== 0) {+ $daysToCompare = $rowSubscription['notify_days_before'];+ } else {+ $daysToCompare = $days;+ }+ $nextPaymentDate = new DateTime($rowSubscription['next_payment']);+ $difference = $currentDate->diff($nextPaymentDate)->days + 1;+ if ($difference === $daysToCompare) {+ $notify[$rowSubscription['payer_user_id']][$i]['name'] = $rowSubscription['name'];+ $notify[$rowSubscription['payer_user_id']][$i]['price'] = $rowSubscription['price'] . $currencies[$rowSubscription['currency_id']]['symbol'];+ $notify[$rowSubscription['payer_user_id']][$i]['currency'] = $currencies[$rowSubscription['currency_id']]['name'];+ $notify[$rowSubscription['payer_user_id']][$i]['category'] = $categories[$rowSubscription['category_id']]['name'];+ $notify[$rowSubscription['payer_user_id']][$i]['payer'] = $household[$rowSubscription['payer_user_id']]['name'];+ $notify[$rowSubscription['payer_user_id']][$i]['date'] = $rowSubscription['next_payment'];+ $notify[$rowSubscription['payer_user_id']][$i]['days'] = $daysToCompare;+ $i++;}}- $notificationsEnabled = $emailNotificationsEnabled || $gotifyNotificationsEnabled || $telegramNotificationsEnabled ||- $webhookNotificationsEnabled || $pushoverNotificationsEnabled || $discordNotificationsEnabled ||- $ntfyNotificationsEnabled;+ if (!empty($notify)) {- // If no notifications are enabled, no need to run- if (!$notificationsEnabled) {- echo "Notifications are disabled. No need to run.<br />";- continue;- } else {- // Get all currencies- $currencies = array();- $query = "SELECT * FROM currencies WHERE user_id = :userId";- $stmt = $db->prepare($query);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();-- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $currencies[$row['id']] = $row;- }+ // Email notifications if enabled+ if ($emailNotificationsEnabled) {- // Get all household members- $query = "SELECT * FROM household WHERE user_id = :userId";- $stmt = $db->prepare($query);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $resultHousehold = $stmt->execute();+ $stmt = $db->prepare('SELECT * FROM user WHERE id = :user_id');+ $stmt->bindValue(':user_id', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();+ $defaultUser = $result->fetchArray(SQLITE3_ASSOC);+ $defaultEmail = $defaultUser['email'];+ $defaultName = $defaultUser['username'];- $household = [];- while ($rowHousehold = $resultHousehold->fetchArray(SQLITE3_ASSOC)) {- $household[$rowHousehold['id']] = $rowHousehold;- }+ foreach ($notify as $userId => $perUser) {+ $message = "The following subscriptions are up for renewal:\n";- // Get all categories- $query = "SELECT * FROM categories WHERE user_id = :userId";- $stmt = $db->prepare($query);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $resultCategories = $stmt->execute();+ foreach ($perUser as $subscription) {+ $dayText = $subscription['days'] == 1 ? "Tomorrow" : "In " . $subscription['days'] . " days";+ $message .= $subscription['name'] . " for " . $subscription['price'] . " (" . $dayText . ")\n";+ }- $categories = [];- while ($rowCategory = $resultCategories->fetchArray(SQLITE3_ASSOC)) {- $categories[$rowCategory['id']] = $rowCategory;- }+ $mail = new PHPMailer(true);+ $mail->CharSet = "UTF-8";+ $mail->isSMTP();- $query = "SELECT * FROM subscriptions WHERE user_id = :user_id AND notify = :notify AND inactive = :inactive ORDER BY payer_user_id ASC";- $stmt = $db->prepare($query);- $stmt->bindValue(':user_id', $userId, SQLITE3_INTEGER);- $stmt->bindValue(':notify', 1, SQLITE3_INTEGER);- $stmt->bindValue(':inactive', 0, SQLITE3_INTEGER);- $resultSubscriptions = $stmt->execute();-- $notify = []; $i = 0;- $currentDate = new DateTime('now');- while ($rowSubscription = $resultSubscriptions->fetchArray(SQLITE3_ASSOC)) {- if ($rowSubscription['notify_days_before'] !== 0) {- $daysToCompare = $rowSubscription['notify_days_before'];- } else {- $daysToCompare = $days;- }- $nextPaymentDate = new DateTime($rowSubscription['next_payment']);- $difference = $currentDate->diff($nextPaymentDate)->days + 1;- if ($difference === $daysToCompare) {- $notify[$rowSubscription['payer_user_id']][$i]['name'] = $rowSubscription['name'];- $notify[$rowSubscription['payer_user_id']][$i]['price'] = $rowSubscription['price'] . $currencies[$rowSubscription['currency_id']]['symbol'];- $notify[$rowSubscription['payer_user_id']][$i]['currency'] = $currencies[$rowSubscription['currency_id']]['name'];- $notify[$rowSubscription['payer_user_id']][$i]['category'] = $categories[$rowSubscription['category_id']]['name'];- $notify[$rowSubscription['payer_user_id']][$i]['payer'] = $household[$rowSubscription['payer_user_id']]['name'];- $notify[$rowSubscription['payer_user_id']][$i]['date'] = $rowSubscription['next_payment'];- $notify[$rowSubscription['payer_user_id']][$i]['days'] = $daysToCompare;- $i++;- }- }+ $mail->Host = $email['smtpAddress'];+ $mail->SMTPAuth = true;+ $mail->Username = $email['smtpUsername'];+ $mail->Password = $email['smtpPassword'];+ $mail->SMTPSecure = $email['encryption'];+ $mail->Port = $email['smtpPort'];++ $stmt = $db->prepare('SELECT * FROM household WHERE id = :userId');+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();+ $user = $result->fetchArray(SQLITE3_ASSOC);- if (!empty($notify)) {+ $emailaddress = !empty($user['email']) ? $user['email'] : $defaultEmail;+ $name = !empty($user['name']) ? $user['name'] : $defaultName;- // Email notifications if enabled- if ($emailNotificationsEnabled) {+ $mail->setFrom($email['fromEmail'], 'Wallos App');+ $mail->addAddress($emailaddress, $name);- $stmt = $db->prepare('SELECT * FROM user WHERE id = :user_id');- $stmt->bindValue(':user_id', $userId, SQLITE3_INTEGER);+ $mail->Subject = 'Wallos Notification';+ $mail->Body = $message;++ if ($mail->send()) {+ echo "Email Notifications sent<br />";+ } else {+ echo "Error sending notifications: " . $mail->ErrorInfo . "<br />";+ }+ }+ }++ // Discord notifications if enabled+ if ($discordNotificationsEnabled) {+ foreach ($notify as $userId => $perUser) {+ // Get name of user from household table+ $stmt = $db->prepare('SELECT * FROM household WHERE id = :userId');+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);$result = $stmt->execute();- $defaultUser = $result->fetchArray(SQLITE3_ASSOC);- $defaultEmail = $defaultUser['email'];- $defaultName = $defaultUser['username'];+ $user = $result->fetchArray(SQLITE3_ASSOC);++ $title = translate('wallos_notification', $i18n);- foreach ($notify as $userId => $perUser) {+ if ($user['name']) {+ $message = $user['name'] . ", the following subscriptions are up for renewal:\n";+ } else {$message = "The following subscriptions are up for renewal:\n";+ }- foreach ($perUser as $subscription) {- $dayText = $subscription['days'] == 1 ? "Tomorrow" : "In " . $subscription['days'] . " days";- $message .= $subscription['name'] . " for " . $subscription['price'] . " (" . $dayText . ")\n";- }-- $mail = new PHPMailer(true);- $mail->CharSet="UTF-8";- $mail->isSMTP();-- $mail->Host = $email['smtpAddress'];- $mail->SMTPAuth = true;- $mail->Username = $email['smtpUsername'];- $mail->Password = $email['smtpPassword'];- $mail->SMTPSecure = $email['encryption'];- $mail->Port = $email['smtpPort'];-- $stmt = $db->prepare('SELECT * FROM household WHERE id = :userId');- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- $user = $result->fetchArray(SQLITE3_ASSOC);-- $emailaddress = !empty($user['email']) ? $user['email'] : $defaultEmail;- $name = !empty($user['name']) ? $user['name'] : $defaultName;-- $mail->setFrom($email['fromEmail'], 'Wallos App');- $mail->addAddress($emailaddress, $name);-- $mail->Subject = 'Wallos Notification';- $mail->Body = $message;-- if ($mail->send()) {- echo "Email Notifications sent<br />";- } else {- echo "Error sending notifications: " . $mail->ErrorInfo . "<br />";- }+ foreach ($perUser as $subscription) {+ $dayText = $subscription['days'] == 1 ? "Tomorrow" : "In " . $subscription['days'] . " days";+ $message .= $subscription['name'] . " for " . $subscription['price'] . " (" . $dayText . ")\n";}- }- // Discord notifications if enabled- if ($discordNotificationsEnabled) {- foreach ($notify as $userId => $perUser) {- // Get name of user from household table- $stmt = $db->prepare('SELECT * FROM household WHERE id = :userId');- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- $user = $result->fetchArray(SQLITE3_ASSOC);-- $title = translate('wallos_notification', $i18n);-- if ($user['name']) {- $message = $user['name'] . ", the following subscriptions are up for renewal:\n";- } else {- $message = "The following subscriptions are up for renewal:\n";- }+ $postfields = [+ 'content' => $message+ ];- foreach ($perUser as $subscription) {- $dayText = $subscription['days'] == 1 ? "Tomorrow" : "In " . $subscription['days'] . " days";- $message .= $subscription['name'] . " for " . $subscription['price'] . " (" . $dayText . ")\n";- }+ if (!empty($discord['bot_username'])) {+ $postfields['username'] = $discord['bot_username'];+ }- $postfields = [- 'content' => $message- ];-- if (!empty($discord['bot_username'])) {- $postfields['username'] = $discord['bot_username'];- }-- if (!empty($discord['bot_avatar_url'])) {- $postfields['avatar_url'] = $discord['bot_avatar_url'];- }+ if (!empty($discord['bot_avatar_url'])) {+ $postfields['avatar_url'] = $discord['bot_avatar_url'];+ }- $ch = curl_init();+ $ch = curl_init();- curl_setopt($ch, CURLOPT_URL, $discord['webhook_url']);- curl_setopt($ch, CURLOPT_POST, 1);- curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($postfields));- curl_setopt($ch, CURLOPT_HTTPHEADER, [- 'Content-Type: application/json'- ]);- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);+ curl_setopt($ch, CURLOPT_URL, $discord['webhook_url']);+ curl_setopt($ch, CURLOPT_POST, 1);+ curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($postfields));+ curl_setopt($ch, CURLOPT_HTTPHEADER, [+ 'Content-Type: application/json'+ ]);+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);- $response = curl_exec($ch);- curl_close($ch);+ $response = curl_exec($ch);+ curl_close($ch);- if ($result === false) {- echo "Error sending notifications: " . curl_error($ch) . "<br />";- } else {- echo "Discord Notifications sent<br />";- }+ if ($result === false) {+ echo "Error sending notifications: " . curl_error($ch) . "<br />";+ } else {+ echo "Discord Notifications sent<br />";}}+ }- // Gotify notifications if enabled- if ($gotifyNotificationsEnabled) {- foreach ($notify as $userId => $perUser) {- // Get name of user from household table- $stmt = $db->prepare('SELECT * FROM household WHERE id = :userId');- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- $user = $result->fetchArray(SQLITE3_ASSOC);-- if ($user['name']) {- $message = $user['name'] . ", the following subscriptions are up for renewal:\n";- } else {- $message = "The following subscriptions are up for renewal:\n";- }+ // Gotify notifications if enabled+ if ($gotifyNotificationsEnabled) {+ foreach ($notify as $userId => $perUser) {+ // Get name of user from household table+ $stmt = $db->prepare('SELECT * FROM household WHERE id = :userId');+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();+ $user = $result->fetchArray(SQLITE3_ASSOC);- foreach ($perUser as $subscription) {- $dayText = $subscription['days'] == 1 ? "Tomorrow" : "In " . $subscription['days'] . " days";- $message .= $subscription['name'] . " for " . $subscription['price'] . " (" . $dayText . ")\n";- }+ if ($user['name']) {+ $message = $user['name'] . ", the following subscriptions are up for renewal:\n";+ } else {+ $message = "The following subscriptions are up for renewal:\n";+ }++ foreach ($perUser as $subscription) {+ $dayText = $subscription['days'] == 1 ? "Tomorrow" : "In " . $subscription['days'] . " days";+ $message .= $subscription['name'] . " for " . $subscription['price'] . " (" . $dayText . ")\n";+ }- $data = array(- 'message' => $message,- 'priority' => 5- );+ $data = array(+ 'message' => $message,+ 'priority' => 5+ );- $data_string = json_encode($data);+ $data_string = json_encode($data);- $ch = curl_init($gotify['serverUrl'] . '/message?token=' . $gotify['appToken']);- curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");- curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);- curl_setopt($ch, CURLOPT_HTTPHEADER, array(+ $ch = curl_init($gotify['serverUrl'] . '/message?token=' . $gotify['appToken']);+ curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");+ curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);+ curl_setopt(+ $ch,+ CURLOPT_HTTPHEADER,+ array('Content-Type: application/json',- 'Content-Length: ' . strlen($data_string))- );-- $result = curl_exec($ch);- if ($result === false) {- echo "Error sending notifications: " . curl_error($ch) . "<br />";- } else {- echo "Gotify Notifications sent<br />";- }+ 'Content-Length: ' . strlen($data_string)+ )+ );++ $result = curl_exec($ch);+ if ($result === false) {+ echo "Error sending notifications: " . curl_error($ch) . "<br />";+ } else {+ echo "Gotify Notifications sent<br />";}}+ }- // Telegram notifications if enabled- if ($telegramNotificationsEnabled) {- foreach ($notify as $userId => $perUser) {- // Get name of user from household table- $stmt = $db->prepare('SELECT * FROM household WHERE id = :userId');- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- $user = $result->fetchArray(SQLITE3_ASSOC);-- if ($user['name']) {- $message = $user['name'] . ", the following subscriptions are up for renewal:\n";- } else {- $message = "The following subscriptions are up for renewal:\n";- }+ // Telegram notifications if enabled+ if ($telegramNotificationsEnabled) {+ foreach ($notify as $userId => $perUser) {+ // Get name of user from household table+ $stmt = $db->prepare('SELECT * FROM household WHERE id = :userId');+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();+ $user = $result->fetchArray(SQLITE3_ASSOC);- foreach ($perUser as $subscription) {- $dayText = $subscription['days'] == 1 ? "Tomorrow" : "In " . $subscription['days'] . " days";- $message .= $subscription['name'] . " for " . $subscription['price'] . " (" . $dayText . ")\n";- }+ if ($user['name']) {+ $message = $user['name'] . ", the following subscriptions are up for renewal:\n";+ } else {+ $message = "The following subscriptions are up for renewal:\n";+ }- $data = array(- 'chat_id' => $telegram['chatId'],- 'text' => $message- );+ foreach ($perUser as $subscription) {+ $dayText = $subscription['days'] == 1 ? "Tomorrow" : "In " . $subscription['days'] . " days";+ $message .= $subscription['name'] . " for " . $subscription['price'] . " (" . $dayText . ")\n";+ }- $data_string = json_encode($data);+ $data = array(+ 'chat_id' => $telegram['chatId'],+ 'text' => $message+ );- $ch = curl_init('https://api.telegram.org/bot' . $telegram['botToken'] . '/sendMessage');- curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");- curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);- curl_setopt($ch, CURLOPT_HTTPHEADER, array(+ $data_string = json_encode($data);++ $ch = curl_init('https://api.telegram.org/bot' . $telegram['botToken'] . '/sendMessage');+ curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");+ curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);+ curl_setopt(+ $ch,+ CURLOPT_HTTPHEADER,+ array('Content-Type: application/json',- 'Content-Length: ' . strlen($data_string))- );-- $result = curl_exec($ch);- if ($result === false) {- echo "Error sending notifications: " . curl_error($ch) . "<br />";- } else {- echo "Telegram Notifications sent<br />";- }+ 'Content-Length: ' . strlen($data_string)+ )+ );++ $result = curl_exec($ch);+ if ($result === false) {+ echo "Error sending notifications: " . curl_error($ch) . "<br />";+ } else {+ echo "Telegram Notifications sent<br />";}}+ }- // Pushover notifications if enabled- if ($pushoverNotificationsEnabled) {- foreach ($notify as $userId => $perUser) {- // Get name of user from household table- $stmt = $db->prepare('SELECT * FROM household WHERE id = :userId');- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- $user = $result->fetchArray(SQLITE3_ASSOC);-- if ($user['name']) {- $message = $user['name'] . ", the following subscriptions are up for renewal:\n";- } else {- $message = "The following subscriptions are up for renewal:\n";- }+ // Pushover notifications if enabled+ if ($pushoverNotificationsEnabled) {+ foreach ($notify as $userId => $perUser) {+ // Get name of user from household table+ $stmt = $db->prepare('SELECT * FROM household WHERE id = :userId');+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();+ $user = $result->fetchArray(SQLITE3_ASSOC);- foreach ($perUser as $subscription) {- $dayText = $subscription['days'] == 1 ? "Tomorrow" : "In " . $subscription['days'] . " days";- $message .= $subscription['name'] . " for " . $subscription['price'] . " (" . $dayText . ")\n";- }+ if ($user['name']) {+ $message = $user['name'] . ", the following subscriptions are up for renewal:\n";+ } else {+ $message = "The following subscriptions are up for renewal:\n";+ }- $ch = curl_init();- curl_setopt($ch, CURLOPT_URL, "https://api.pushover.net/1/messages.json");- curl_setopt($ch, CURLOPT_POST, 1);- curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query([- 'token' => $pushover['token'],- 'user' => $pushover['user_key'],- 'message' => $message,- ]));- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);+ foreach ($perUser as $subscription) {+ $dayText = $subscription['days'] == 1 ? "Tomorrow" : "In " . $subscription['days'] . " days";+ $message .= $subscription['name'] . " for " . $subscription['price'] . " (" . $dayText . ")\n";+ }- $result = curl_exec($ch);+ $ch = curl_init();+ curl_setopt($ch, CURLOPT_URL, "https://api.pushover.net/1/messages.json");+ curl_setopt($ch, CURLOPT_POST, 1);+ curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query([+ 'token' => $pushover['token'],+ 'user' => $pushover['user_key'],+ 'message' => $message,+ ]));+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);- curl_close($ch);+ $result = curl_exec($ch);- if ($result === false) {- echo "Error sending notifications: " . curl_error($ch) . "<br />";- } else {- echo "Pushover Notifications sent<br />";- }+ curl_close($ch);++ if ($result === false) {+ echo "Error sending notifications: " . curl_error($ch) . "<br />";+ } else {+ echo "Pushover Notifications sent<br />";}}+ }- // Ntfy notifications if enabled- if ($ntfyNotificationsEnabled) {- foreach ($notify as $userId => $perUser) {- // Get name of user from household table- $stmt = $db->prepare('SELECT * FROM household WHERE id = :userId');- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- $user = $result->fetchArray(SQLITE3_ASSOC);-- if ($user['name']) {- $message = $user['name'] . ", the following subscriptions are up for renewal:\n";- } else {- $message = "The following subscriptions are up for renewal:\n";- }+ // Ntfy notifications if enabled+ if ($ntfyNotificationsEnabled) {+ foreach ($notify as $userId => $perUser) {+ // Get name of user from household table+ $stmt = $db->prepare('SELECT * FROM household WHERE id = :userId');+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();+ $user = $result->fetchArray(SQLITE3_ASSOC);- foreach ($perUser as $subscription) {- $dayText = $subscription['days'] == 1 ? "Tomorrow" : "In " . $subscription['days'] . " days";- $message .= $subscription['name'] . " for " . $subscription['price'] . " (" . $dayText . ")\n";- }+ if ($user['name']) {+ $message = $user['name'] . ", the following subscriptions are up for renewal:\n";+ } else {+ $message = "The following subscriptions are up for renewal:\n";+ }- $headers = json_decode($ntfy["headers"], true);- $customheaders = array_map(function($key, $value) {- return "$key: $value";- }, array_keys($headers), $headers);+ foreach ($perUser as $subscription) {+ $dayText = $subscription['days'] == 1 ? "Tomorrow" : "In " . $subscription['days'] . " days";+ $message .= $subscription['name'] . " for " . $subscription['price'] . " (" . $dayText . ")\n";+ }- $ch = curl_init();+ $headers = json_decode($ntfy["headers"], true);+ $customheaders = array_map(function ($key, $value) {+ return "$key: $value";+ }, array_keys($headers), $headers);- $ntfyHost = rtrim($ntfy["host"], '/');- $ntfyTopic = $ntfy['topic'];+ $ch = curl_init();- curl_setopt($ch, CURLOPT_URL, $ntfyHost . '/' . $ntfyTopic);- curl_setopt($ch, CURLOPT_POST, 1);- curl_setopt($ch, CURLOPT_POSTFIELDS, $message);- curl_setopt($ch, CURLOPT_HTTPHEADER, $customheaders);- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);+ $ntfyHost = rtrim($ntfy["host"], '/');+ $ntfyTopic = $ntfy['topic'];- $response = curl_exec($ch);- curl_close($ch);+ curl_setopt($ch, CURLOPT_URL, $ntfyHost . '/' . $ntfyTopic);+ curl_setopt($ch, CURLOPT_POST, 1);+ curl_setopt($ch, CURLOPT_POSTFIELDS, $message);+ curl_setopt($ch, CURLOPT_HTTPHEADER, $customheaders);+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);- if ($response === false) {- echo "Error sending notifications: " . curl_error($ch) . "<br />";- } else {- echo "Ntfy Notifications sent<br />";- }+ $response = curl_exec($ch);+ curl_close($ch);++ if ($response === false) {+ echo "Error sending notifications: " . curl_error($ch) . "<br />";+ } else {+ echo "Ntfy Notifications sent<br />";}}+ }- // Webhook notifications if enabled- if ($webhookNotificationsEnabled) {- // Get webhook payload and turn it into a json object+ // Webhook notifications if enabled+ if ($webhookNotificationsEnabled) {+ // Get webhook payload and turn it into a json object- $payload = str_replace("{{days_until}}", $days, $webhook['payload']); // The default value for all subscriptions- $payload_json = json_decode($payload, true);+ $payload = str_replace("{{days_until}}", $days, $webhook['payload']); // The default value for all subscriptions+ $payload_json = json_decode($payload, true);- $subscription_template = $payload_json["{{subscriptions}}"];- $subscriptions = [];+ $subscription_template = $payload_json["{{subscriptions}}"];+ $subscriptions = [];- foreach ($notify as $userId => $perUser) {- // Get name of user from household table- $stmt = $db->prepare('SELECT * FROM household WHERE id = :userId');- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- $user = $result->fetchArray(SQLITE3_ASSOC);+ foreach ($notify as $userId => $perUser) {+ // Get name of user from household table+ $stmt = $db->prepare('SELECT * FROM household WHERE id = :userId');+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();+ $user = $result->fetchArray(SQLITE3_ASSOC);- if ($user['name']) {- $payer = $user['name'];- }+ if ($user['name']) {+ $payer = $user['name'];+ }- foreach ($perUser as $k => $subscription) {- $temp_subscription = $subscription_template[0];-- foreach ($temp_subscription as $key => $value) {- if (is_string($value)) {- $temp_subscription[$key] = str_replace("{{subscription_name}}", $subscription['name'], $value);- $temp_subscription[$key] = str_replace("{{subscription_price}}", $subscription['price'], $temp_subscription[$key]);- $temp_subscription[$key] = str_replace("{{subscription_currency}}", $subscription['currency'], $temp_subscription[$key]);- $temp_subscription[$key] = str_replace("{{subscription_category}}", $subscription['category'], $temp_subscription[$key]);- $temp_subscription[$key] = str_replace("{{subscription_payer}}", $subscription['payer'], $temp_subscription[$key]);- $temp_subscription[$key] = str_replace("{{subscription_date}}", $subscription['date'], $temp_subscription[$key]);- $temp_subscription[$key] = str_replace("{{subscription_days_until_payment}}", $subscription['days'], $temp_subscription[$key]); // The de facto value for this subscription- }+ foreach ($perUser as $k => $subscription) {+ $temp_subscription = $subscription_template[0];++ foreach ($temp_subscription as $key => $value) {+ if (is_string($value)) {+ $temp_subscription[$key] = str_replace("{{subscription_name}}", $subscription['name'], $value);+ $temp_subscription[$key] = str_replace("{{subscription_price}}", $subscription['price'], $temp_subscription[$key]);+ $temp_subscription[$key] = str_replace("{{subscription_currency}}", $subscription['currency'], $temp_subscription[$key]);+ $temp_subscription[$key] = str_replace("{{subscription_category}}", $subscription['category'], $temp_subscription[$key]);+ $temp_subscription[$key] = str_replace("{{subscription_payer}}", $subscription['payer'], $temp_subscription[$key]);+ $temp_subscription[$key] = str_replace("{{subscription_date}}", $subscription['date'], $temp_subscription[$key]);+ $temp_subscription[$key] = str_replace("{{subscription_days_until_payment}}", $subscription['days'], $temp_subscription[$key]); // The de facto value for this subscription}- $subscriptions[] = $temp_subscription;-}- }-- $payload_json["{{subscriptions}}"] = $subscriptions;- $payload_json[$webhook['iterator']] = $subscriptions;- unset($payload_json["{{subscriptions}}"]);+ $subscriptions[] = $temp_subscription;- $ch = curl_init();- curl_setopt($ch, CURLOPT_URL, $webhook['url']);- curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $webhook['request_method']);- curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload_json));- if (!empty($webhook['headers'])) {- $customheaders = preg_split("/\r\n|\n|\r/", $webhook['headers']);- curl_setopt($ch, CURLOPT_HTTPHEADER, $customheaders);}- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);+ }- $response = curl_exec($ch);- curl_close($ch);+ $payload_json["{{subscriptions}}"] = $subscriptions;+ $payload_json[$webhook['iterator']] = $subscriptions;+ unset($payload_json["{{subscriptions}}"]);++ $ch = curl_init();+ curl_setopt($ch, CURLOPT_URL, $webhook['url']);+ curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $webhook['request_method']);+ curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload_json));+ if (!empty($webhook['headers'])) {+ $customheaders = preg_split("/\r\n|\n|\r/", $webhook['headers']);+ curl_setopt($ch, CURLOPT_HTTPHEADER, $customheaders);+ }+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);- if ($response === false) {- echo "Error sending notifications: " . curl_error($ch) . "<br />";- } else {- echo "Webhook Notifications sent<br />";- }+ $response = curl_exec($ch);+ curl_close($ch);+ if ($response === false) {+ echo "Error sending notifications: " . curl_error($ch) . "<br />";+ } else {+ echo "Webhook Notifications sent<br />";}--- } else {- echo "Nothing to notify.<br />";+}++ } else {+ echo "Nothing to notify.<br />";}}-?>+}++?>\ No newline at end of filediff --git a/endpoints/cronjobs/sendresetpasswordemails.php b/endpoints/cronjobs/sendresetpasswordemails.phpindex 50cebbf..d31117a 100644--- a/endpoints/cronjobs/sendresetpasswordemails.php+++ b/endpoints/cronjobs/sendresetpasswordemails.php@@ -1,82 +1,82 @@<?php- use PHPMailer\PHPMailer\PHPMailer;- use PHPMailer\PHPMailer\SMTP;- use PHPMailer\PHPMailer\Exception;+use PHPMailer\PHPMailer\PHPMailer;+use PHPMailer\PHPMailer\SMTP;+use PHPMailer\PHPMailer\Exception;- require_once __DIR__ . '/../../includes/connect_endpoint_crontabs.php';+require_once __DIR__ . '/../../includes/connect_endpoint_crontabs.php';- $query = "SELECT * FROM admin";- $stmt = $db->prepare($query);- $result = $stmt->execute();- $admin = $result->fetchArray(SQLITE3_ASSOC);+$query = "SELECT * FROM admin";+$stmt = $db->prepare($query);+$result = $stmt->execute();+$admin = $result->fetchArray(SQLITE3_ASSOC);- $query = "SELECT * FROM password_resets WHERE email_sent = 0";- $stmt = $db->prepare($query);- $result = $stmt->execute();+$query = "SELECT * FROM password_resets WHERE email_sent = 0";+$stmt = $db->prepare($query);+$result = $stmt->execute();- $rows = [];- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $rows[] = $row;- }+$rows = [];+while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $rows[] = $row;+}- if ($rows) {- if ($admin['smtp_address'] && $admin['smtp_port'] && $admin['smtp_username'] && $admin['smtp_password'] && $admin['encryption']) {- // There are SMTP settings- $smtpAddress = $admin['smtp_address'];- $smtpPort = $admin['smtp_port'];- $smtpUsername = $admin['smtp_username'];- $smtpPassword = $admin['smtp_password'];- $fromEmail = empty($admin['from_email']) ? '[email protected]' : $admin['from_email'];- $encryption = $admin['encryption'];- $server_url = $admin['server_url'];+if ($rows) {+ if ($admin['smtp_address'] && $admin['smtp_port'] && $admin['smtp_username'] && $admin['smtp_password'] && $admin['encryption']) {+ // There are SMTP settings+ $smtpAddress = $admin['smtp_address'];+ $smtpPort = $admin['smtp_port'];+ $smtpUsername = $admin['smtp_username'];+ $smtpPassword = $admin['smtp_password'];+ $fromEmail = empty($admin['from_email']) ? '[email protected]' : $admin['from_email'];+ $encryption = $admin['encryption'];+ $server_url = $admin['server_url'];- require __DIR__ . '/../../libs/PHPMailer/PHPMailer.php';- require __DIR__ . '/../../libs/PHPMailer/SMTP.php';- require __DIR__ . '/../../libs/PHPMailer/Exception.php';+ require __DIR__ . '/../../libs/PHPMailer/PHPMailer.php';+ require __DIR__ . '/../../libs/PHPMailer/SMTP.php';+ require __DIR__ . '/../../libs/PHPMailer/Exception.php';- $mail = new PHPMailer(true);- $mail->isSMTP();- $mail->Host = $smtpAddress;- $mail->SMTPAuth = true;- $mail->Username = $smtpUsername;- $mail->Password = $smtpPassword;- $mail->SMTPSecure = $encryption;- $mail->Port = $smtpPort;- $mail->setFrom($fromEmail);+ $mail = new PHPMailer(true);+ $mail->isSMTP();+ $mail->Host = $smtpAddress;+ $mail->SMTPAuth = true;+ $mail->Username = $smtpUsername;+ $mail->Password = $smtpPassword;+ $mail->SMTPSecure = $encryption;+ $mail->Port = $smtpPort;+ $mail->setFrom($fromEmail);- try {- foreach ($rows as $user) {- $mail->addAddress($user['email']);- $mail->isHTML(true);- $mail->Subject = 'Wallos - Reset Password';- $mail->Body = '<img src="' . $server_url . '/images/siteicons/blue/wallos.png" alt="Logo" />+ try {+ foreach ($rows as $user) {+ $mail->addAddress($user['email']);+ $mail->isHTML(true);+ $mail->Subject = 'Wallos - Reset Password';+ $mail->Body = '<img src="' . $server_url . '/images/siteicons/blue/wallos.png" alt="Logo" /><br>A password reset was requested for your account.<br>Please click the following link to reset your password: <a href="' . $server_url . '/passwordreset.php?email=' . $user['email'] . '&token=' . $user['token'] . '">Reset Password</a>';-- $mail->send();- $query = "UPDATE password_resets SET email_sent = 1 WHERE id = :id";- $stmt = $db->prepare($query);- $stmt->bindParam(':id', $user['id'], SQLITE3_INTEGER);- $stmt->execute();+ $mail->send();++ $query = "UPDATE password_resets SET email_sent = 1 WHERE id = :id";+ $stmt = $db->prepare($query);+ $stmt->bindParam(':id', $user['id'], SQLITE3_INTEGER);+ $stmt->execute();- $mail->clearAddresses();+ $mail->clearAddresses();- echo "Password reset email sent to " . $user['email'] . "<br>";+ echo "Password reset email sent to " . $user['email'] . "<br>";- }- } catch (Exception $e) {- echo "Message could not be sent. Mailer Error: {$mail->ErrorInfo} <br>";}- } else {- // There are no SMTP settings- exit();+ } catch (Exception $e) {+ echo "Message could not be sent. Mailer Error: {$mail->ErrorInfo} <br>";}} else {- // There are no password reset emails to be sent+ // There are no SMTP settingsexit();}+} else {+ // There are no password reset emails to be sent+ exit();+}?>\ No newline at end of filediff --git a/endpoints/cronjobs/sendverificationemails.php b/endpoints/cronjobs/sendverificationemails.phpindex 6f05ac1..cdf7564 100644--- a/endpoints/cronjobs/sendverificationemails.php+++ b/endpoints/cronjobs/sendverificationemails.php@@ -1,85 +1,85 @@<?php- use PHPMailer\PHPMailer\PHPMailer;- use PHPMailer\PHPMailer\SMTP;- use PHPMailer\PHPMailer\Exception;+use PHPMailer\PHPMailer\PHPMailer;+use PHPMailer\PHPMailer\SMTP;+use PHPMailer\PHPMailer\Exception;- require_once __DIR__ . '/../../includes/connect_endpoint_crontabs.php';+require_once __DIR__ . '/../../includes/connect_endpoint_crontabs.php';- $query = "SELECT * FROM admin";- $stmt = $db->prepare($query);- $result = $stmt->execute();- $admin = $result->fetchArray(SQLITE3_ASSOC);+$query = "SELECT * FROM admin";+$stmt = $db->prepare($query);+$result = $stmt->execute();+$admin = $result->fetchArray(SQLITE3_ASSOC);- if ($admin['require_email_verification'] == 0) {- die("Email verification is not required.");- }+if ($admin['require_email_verification'] == 0) {+ die("Email verification is not required.");+}- $query = "SELECT * FROM email_verification WHERE email_sent = 0";- $stmt = $db->prepare($query);- $result = $stmt->execute();+$query = "SELECT * FROM email_verification WHERE email_sent = 0";+$stmt = $db->prepare($query);+$result = $stmt->execute();- $rows = [];- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $rows[] = $row;- }+$rows = [];+while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $rows[] = $row;+}- if ($rows) {- if ($admin['smtp_address'] && $admin['smtp_port'] && $admin['smtp_username'] && $admin['smtp_password'] && $admin['encryption']) {- // There are SMTP settings- $smtpAddress = $admin['smtp_address'];- $smtpPort = $admin['smtp_port'];- $smtpUsername = $admin['smtp_username'];- $smtpPassword = $admin['smtp_password'];- $fromEmail = empty($admin['from_email']) ? '[email protected]' : $admin['from_email'];- $encryption = $admin['encryption'];- $server_url = $admin['server_url'];+if ($rows) {+ if ($admin['smtp_address'] && $admin['smtp_port'] && $admin['smtp_username'] && $admin['smtp_password'] && $admin['encryption']) {+ // There are SMTP settings+ $smtpAddress = $admin['smtp_address'];+ $smtpPort = $admin['smtp_port'];+ $smtpUsername = $admin['smtp_username'];+ $smtpPassword = $admin['smtp_password'];+ $fromEmail = empty($admin['from_email']) ? '[email protected]' : $admin['from_email'];+ $encryption = $admin['encryption'];+ $server_url = $admin['server_url'];- require __DIR__ . '/../../libs/PHPMailer/PHPMailer.php';- require __DIR__ . '/../../libs/PHPMailer/SMTP.php';- require __DIR__ . '/../../libs/PHPMailer/Exception.php';+ require __DIR__ . '/../../libs/PHPMailer/PHPMailer.php';+ require __DIR__ . '/../../libs/PHPMailer/SMTP.php';+ require __DIR__ . '/../../libs/PHPMailer/Exception.php';- $mail = new PHPMailer(true);- $mail->isSMTP();- $mail->Host = $smtpAddress;- $mail->SMTPAuth = true;- $mail->Username = $smtpUsername;- $mail->Password = $smtpPassword;- $mail->SMTPSecure = $encryption;- $mail->Port = $smtpPort;- $mail->setFrom($fromEmail);+ $mail = new PHPMailer(true);+ $mail->isSMTP();+ $mail->Host = $smtpAddress;+ $mail->SMTPAuth = true;+ $mail->Username = $smtpUsername;+ $mail->Password = $smtpPassword;+ $mail->SMTPSecure = $encryption;+ $mail->Port = $smtpPort;+ $mail->setFrom($fromEmail);- try {- foreach ($rows as $user) {- $mail->addAddress($user['email']);- $mail->isHTML(true);- $mail->Subject = 'Wallos - Email Verification';- $mail->Body = '<img src="' . $server_url . '/images/siteicons/blue/wallos.png" alt="Logo" />+ try {+ foreach ($rows as $user) {+ $mail->addAddress($user['email']);+ $mail->isHTML(true);+ $mail->Subject = 'Wallos - Email Verification';+ $mail->Body = '<img src="' . $server_url . '/images/siteicons/blue/wallos.png" alt="Logo" /><br>Registration on Wallos was successful.<br>Please click the following link to verify your email: <a href="' . $server_url . '/verifyemail.php?email=' . $user['email'] . '&token=' . $user['token'] . '">Verify Email</a>';-- $mail->send();- $query = "UPDATE email_verification SET email_sent = 1 WHERE id = :id";- $stmt = $db->prepare($query);- $stmt->bindParam(':id', $user['id'], SQLITE3_INTEGER);- $stmt->execute();+ $mail->send();++ $query = "UPDATE email_verification SET email_sent = 1 WHERE id = :id";+ $stmt = $db->prepare($query);+ $stmt->bindParam(':id', $user['id'], SQLITE3_INTEGER);+ $stmt->execute();- $mail->clearAddresses();+ $mail->clearAddresses();- echo "Verification email sent to " . $user['email'] . "<br>";- }- } catch (Exception $e) {- echo "Message could not be sent. Mailer Error: {$mail->ErrorInfo}";+ echo "Verification email sent to " . $user['email'] . "<br>";}- } else {- // There are no SMTP settings- exit();+ } catch (Exception $e) {+ echo "Message could not be sent. Mailer Error: {$mail->ErrorInfo}";}} else {- // There are no verification emails to be sent+ // There are no SMTP settingsexit();}+} else {+ // There are no verification emails to be sent+ exit();+}?>\ No newline at end of filediff --git a/endpoints/cronjobs/updateexchange.php b/endpoints/cronjobs/updateexchange.phpindex 999e704..40f6196 100644--- a/endpoints/cronjobs/updateexchange.php+++ b/endpoints/cronjobs/updateexchange.php@@ -1,104 +1,104 @@<?php- require_once __DIR__ . '/../../includes/connect_endpoint_crontabs.php';+require_once __DIR__ . '/../../includes/connect_endpoint_crontabs.php';- // Get all user ids+// Get all user ids- $query = "SELECT id, username FROM user";+$query = "SELECT id, username FROM user";+$stmt = $db->prepare($query);+$usersToUpdateExchange = $stmt->execute();++while ($userToUpdateExchange = $usersToUpdateExchange->fetchArray(SQLITE3_ASSOC)) {+ $userId = $userToUpdateExchange['id'];+ echo "For user: " . $userToUpdateExchange['username'] . "<br />";++ $query = "SELECT api_key, provider FROM fixer WHERE user_id = :userId";$stmt = $db->prepare($query);- $usersToUpdateExchange = $stmt->execute();+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- while ($userToUpdateExchange = $usersToUpdateExchange->fetchArray(SQLITE3_ASSOC)) {- $userId = $userToUpdateExchange['id'];- echo "For user: " . $userToUpdateExchange['username'] . "<br />";+ if ($result) {+ $row = $result->fetchArray(SQLITE3_ASSOC);- $query = "SELECT api_key, provider FROM fixer WHERE user_id = :userId";- $stmt = $db->prepare($query);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ if ($row) {+ $apiKey = $row['api_key'];+ $provider = $row['provider'];- if ($result) {+ $codes = "";+ $query = "SELECT id, name, symbol, code FROM currencies WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $codes .= $row['code'] . ",";+ }+ $codes = rtrim($codes, ',');+ $query = "SELECT u.main_currency, c.code FROM user u LEFT JOIN currencies c ON u.main_currency = c.id WHERE u.id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();$row = $result->fetchArray(SQLITE3_ASSOC);-- if ($row) {- $apiKey = $row['api_key'];- $provider = $row['provider'];+ $mainCurrencyCode = $row['code'];+ $mainCurrencyId = $row['main_currency'];- $codes = "";- $query = "SELECT id, name, symbol, code FROM currencies WHERE user_id = :userId";- $stmt = $db->prepare($query);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $codes .= $row['code'].",";- }- $codes = rtrim($codes, ',');- $query = "SELECT u.main_currency, c.code FROM user u LEFT JOIN currencies c ON u.main_currency = c.id WHERE u.id = :userId";- $stmt = $db->prepare($query);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- $row = $result->fetchArray(SQLITE3_ASSOC);- $mainCurrencyCode = $row['code'];- $mainCurrencyId = $row['main_currency'];-- if ($provider === 1) {- $api_url = "https://api.apilayer.com/fixer/latest?base=EUR&symbols=" . $codes;- $context = stream_context_create([- 'http' => [- 'method' => 'GET',- 'header' => 'apikey: ' . $apiKey,- ]- ]);- $response = file_get_contents($api_url, false, $context);- } else {- $api_url = "http://data.fixer.io/api/latest?access_key=". $apiKey . "&base=EUR&symbols=" . $codes;- $response = file_get_contents($api_url);- }+ if ($provider === 1) {+ $api_url = "https://api.apilayer.com/fixer/latest?base=EUR&symbols=" . $codes;+ $context = stream_context_create([+ 'http' => [+ 'method' => 'GET',+ 'header' => 'apikey: ' . $apiKey,+ ]+ ]);+ $response = file_get_contents($api_url, false, $context);+ } else {+ $api_url = "http://data.fixer.io/api/latest?access_key=" . $apiKey . "&base=EUR&symbols=" . $codes;+ $response = file_get_contents($api_url);+ }- $apiData = json_decode($response, true);-- $mainCurrencyToEUR = $apiData['rates'][$mainCurrencyCode];-- if ($apiData !== null && isset($apiData['rates'])) {- foreach ($apiData['rates'] as $currencyCode => $rate) {- if ($currencyCode === $mainCurrencyCode) {- $exchangeRate = 1.0;- } else {- $exchangeRate = $rate / $mainCurrencyToEUR;- }- $updateQuery = "UPDATE currencies SET rate = :rate WHERE code = :code";- $updateStmt = $db->prepare($updateQuery);- $updateStmt->bindParam(':rate', $exchangeRate, SQLITE3_TEXT);- $updateStmt->bindParam(':code', $currencyCode, SQLITE3_TEXT);- $updateResult = $updateStmt->execute();-- if (!$updateResult) {- echo "Error updating rate for currency: $currencyCode <br />";- }- }- $currentDate = new DateTime();- $formattedDate = $currentDate->format('Y-m-d');+ $apiData = json_decode($response, true);- $deleteQuery = "DELETE FROM last_exchange_update WHERE user_id = :userId";- $deleteStmt = $db->prepare($deleteQuery);- $deleteResult = $deleteStmt->execute();+ $mainCurrencyToEUR = $apiData['rates'][$mainCurrencyCode];- $query = "INSERT INTO last_exchange_update (date, user_id) VALUES (:formattedDate, :userId)";- $stmt = $db->prepare($query);- $stmt->bindParam(':formattedDate', $formattedDate, SQLITE3_TEXT);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ if ($apiData !== null && isset($apiData['rates'])) {+ foreach ($apiData['rates'] as $currencyCode => $rate) {+ if ($currencyCode === $mainCurrencyCode) {+ $exchangeRate = 1.0;+ } else {+ $exchangeRate = $rate / $mainCurrencyToEUR;+ }+ $updateQuery = "UPDATE currencies SET rate = :rate WHERE code = :code";+ $updateStmt = $db->prepare($updateQuery);+ $updateStmt->bindParam(':rate', $exchangeRate, SQLITE3_TEXT);+ $updateStmt->bindParam(':code', $currencyCode, SQLITE3_TEXT);+ $updateResult = $updateStmt->execute();- echo "Rates updated successfully!<br />";+ if (!$updateResult) {+ echo "Error updating rate for currency: $currencyCode <br />";+ }}- } else {- echo "Exchange rates update skipped. No fixer.io api key provided<br />";- $apiKey = null;+ $currentDate = new DateTime();+ $formattedDate = $currentDate->format('Y-m-d');++ $deleteQuery = "DELETE FROM last_exchange_update WHERE user_id = :userId";+ $deleteStmt = $db->prepare($deleteQuery);+ $deleteResult = $deleteStmt->execute();++ $query = "INSERT INTO last_exchange_update (date, user_id) VALUES (:formattedDate, :userId)";+ $stmt = $db->prepare($query);+ $stmt->bindParam(':formattedDate', $formattedDate, SQLITE3_TEXT);+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();++ echo "Rates updated successfully!<br />";}} else {echo "Exchange rates update skipped. No fixer.io api key provided<br />";$apiKey = null;}+ } else {+ echo "Exchange rates update skipped. No fixer.io api key provided<br />";+ $apiKey = null;}- $db->close();+}+$db->close();?>\ No newline at end of filediff --git a/endpoints/cronjobs/updatenextpayment.php b/endpoints/cronjobs/updatenextpayment.phpindex f3a4ef5..70ad028 100644--- a/endpoints/cronjobs/updatenextpayment.php+++ b/endpoints/cronjobs/updatenextpayment.php@@ -1,66 +1,66 @@<?php- require_once __DIR__ . '/../../includes/connect_endpoint_crontabs.php';+require_once __DIR__ . '/../../includes/connect_endpoint_crontabs.php';- $currentDate = new DateTime();- $currentDateString = $currentDate->format('Y-m-d');+$currentDate = new DateTime();+$currentDateString = $currentDate->format('Y-m-d');- $cycles = array();- $query = "SELECT * FROM cycles";- $result = $db->query($query);- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $cycleId = $row['id'];- $cycles[$cycleId] = $row;- }-- $query = "SELECT id, next_payment, frequency, cycle FROM subscriptions WHERE next_payment < :currentDate";- $stmt = $db->prepare($query);- $stmt->bindValue(':currentDate', $currentDate->format('Y-m-d'));- $result = $stmt->execute();+$cycles = array();+$query = "SELECT * FROM cycles";+$result = $db->query($query);+while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $cycleId = $row['id'];+ $cycles[$cycleId] = $row;+}- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $subscriptionId = $row['id'];- $nextPaymentDate = new DateTime($row['next_payment']);- $frequency = $row['frequency'];- $cycle = $cycles[$row['cycle']]['name'];+$query = "SELECT id, next_payment, frequency, cycle FROM subscriptions WHERE next_payment < :currentDate";+$stmt = $db->prepare($query);+$stmt->bindValue(':currentDate', $currentDate->format('Y-m-d'));+$result = $stmt->execute();- // Calculate the interval to add based on the cycle- $intervalSpec = "P";- if ($cycle == 'Daily') {- $intervalSpec .= "{$frequency}D";- } elseif ($cycle === 'Weekly') {- $intervalSpec .= "{$frequency}W";- } elseif ($cycle === 'Monthly') {- $intervalSpec .= "{$frequency}M";- } elseif ($cycle === 'Yearly') {- $intervalSpec .= "{$frequency}Y";- }+while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $subscriptionId = $row['id'];+ $nextPaymentDate = new DateTime($row['next_payment']);+ $frequency = $row['frequency'];+ $cycle = $cycles[$row['cycle']]['name'];- $interval = new DateInterval($intervalSpec);+ // Calculate the interval to add based on the cycle+ $intervalSpec = "P";+ if ($cycle == 'Daily') {+ $intervalSpec .= "{$frequency}D";+ } elseif ($cycle === 'Weekly') {+ $intervalSpec .= "{$frequency}W";+ } elseif ($cycle === 'Monthly') {+ $intervalSpec .= "{$frequency}M";+ } elseif ($cycle === 'Yearly') {+ $intervalSpec .= "{$frequency}Y";+ }- // Add intervals until the next payment date is in the future- while ($nextPaymentDate < $currentDate) {- $nextPaymentDate->add($interval);- }+ $interval = new DateInterval($intervalSpec);- // Update the subscription's next_payment date- $updateQuery = "UPDATE subscriptions SET next_payment = :nextPaymentDate WHERE id = :subscriptionId";- $updateStmt = $db->prepare($updateQuery);- $updateStmt->bindValue(':nextPaymentDate', $nextPaymentDate->format('Y-m-d'));- $updateStmt->bindValue(':subscriptionId', $subscriptionId);- $updateStmt->execute();+ // Add intervals until the next payment date is in the future+ while ($nextPaymentDate < $currentDate) {+ $nextPaymentDate->add($interval);}- $formattedDate = $currentDate->format('Y-m-d');+ // Update the subscription's next_payment date+ $updateQuery = "UPDATE subscriptions SET next_payment = :nextPaymentDate WHERE id = :subscriptionId";+ $updateStmt = $db->prepare($updateQuery);+ $updateStmt->bindValue(':nextPaymentDate', $nextPaymentDate->format('Y-m-d'));+ $updateStmt->bindValue(':subscriptionId', $subscriptionId);+ $updateStmt->execute();+}++$formattedDate = $currentDate->format('Y-m-d');- $deleteQuery = "DELETE FROM last_update_next_payment_date";- $deleteStmt = $db->prepare($deleteQuery);- $deleteResult = $deleteStmt->execute();+$deleteQuery = "DELETE FROM last_update_next_payment_date";+$deleteStmt = $db->prepare($deleteQuery);+$deleteResult = $deleteStmt->execute();- $query = "INSERT INTO last_update_next_payment_date (date) VALUES (:formattedDate)";- $stmt = $db->prepare($query);- $stmt->bindParam(':formattedDate', $currentDateString, SQLITE3_TEXT);- $result = $stmt->execute();+$query = "INSERT INTO last_update_next_payment_date (date) VALUES (:formattedDate)";+$stmt = $db->prepare($query);+$stmt->bindParam(':formattedDate', $currentDateString, SQLITE3_TEXT);+$result = $stmt->execute();- echo "Updated next payment dates";+echo "Updated next payment dates";?>\ No newline at end of filediff --git a/endpoints/currency/add.php b/endpoints/currency/add.phpindex 7af026b..8e2b8cd 100644--- a/endpoints/currency/add.php+++ b/endpoints/currency/add.php@@ -3,25 +3,25 @@ require_once '../../includes/connect_endpoint.php';require_once '../../includes/inputvalidation.php';if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {- $currencyName = "Currency";- $currencySymbol = "$";- $currencyCode = "CODE";- $currencyRate = 1;- $sqlInsert = "INSERT INTO currencies (name, symbol, code, rate, user_id) VALUES (:name, :symbol, :code, :rate, :userId)";- $stmtInsert = $db->prepare($sqlInsert);- $stmtInsert->bindParam(':name', $currencyName, SQLITE3_TEXT);- $stmtInsert->bindParam(':symbol', $currencySymbol, SQLITE3_TEXT);- $stmtInsert->bindParam(':code', $currencyCode, SQLITE3_TEXT);- $stmtInsert->bindParam(':rate', $currencyRate, SQLITE3_TEXT);- $stmtInsert->bindParam(':userId', $userId, SQLITE3_INTEGER);- $resultInsert = $stmtInsert->execute();-- if ($resultInsert) {- $currencyId = $db->lastInsertRowID();- echo $currencyId;- } else {- echo translate('error_adding_currency', $i18n);- }+ $currencyName = "Currency";+ $currencySymbol = "$";+ $currencyCode = "CODE";+ $currencyRate = 1;+ $sqlInsert = "INSERT INTO currencies (name, symbol, code, rate, user_id) VALUES (:name, :symbol, :code, :rate, :userId)";+ $stmtInsert = $db->prepare($sqlInsert);+ $stmtInsert->bindParam(':name', $currencyName, SQLITE3_TEXT);+ $stmtInsert->bindParam(':symbol', $currencySymbol, SQLITE3_TEXT);+ $stmtInsert->bindParam(':code', $currencyCode, SQLITE3_TEXT);+ $stmtInsert->bindParam(':rate', $currencyRate, SQLITE3_TEXT);+ $stmtInsert->bindParam(':userId', $userId, SQLITE3_INTEGER);+ $resultInsert = $stmtInsert->execute();++ if ($resultInsert) {+ $currencyId = $db->lastInsertRowID();+ echo $currencyId;+ } else {+ echo translate('error_adding_currency', $i18n);+ }} else {$response = ["success" => false,@@ -30,4 +30,4 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {echo json_encode($response);}-?>+?>\ No newline at end of filediff --git a/endpoints/currency/currency.php b/endpoints/currency/currency.phpindex 92f8aff..f2e30ab 100644--- a/endpoints/currency/currency.php+++ b/endpoints/currency/currency.php@@ -16,7 +16,7 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {$stmtInsert->bindParam(':rate', $currencyRate, SQLITE3_TEXT);$stmtInsert->bindParam(':userId', $userId, SQLITE3_INTEGER);$resultInsert = $stmtInsert->execute();-+if ($resultInsert) {$currencyId = $db->lastInsertRowID();echo $currencyId;@@ -126,4 +126,4 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {echo json_encode($response);}-?>+?>\ No newline at end of filediff --git a/endpoints/currency/edit.php b/endpoints/currency/edit.phpindex 4ea3c9c..a40cc24 100644--- a/endpoints/currency/edit.php+++ b/endpoints/currency/edit.php@@ -45,4 +45,4 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {echo json_encode($response);}-?>+?>\ No newline at end of filediff --git a/endpoints/currency/fixer_api_key.php b/endpoints/currency/fixer_api_key.phpindex 10f301a..4f40f06 100644--- a/endpoints/currency/fixer_api_key.php+++ b/endpoints/currency/fixer_api_key.php@@ -1,59 +1,59 @@<?php- require_once '../../includes/connect_endpoint.php';-- if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {- if ($_SERVER["REQUEST_METHOD"] === "POST") {- $newApiKey = isset($_POST["api_key"]) ? trim($_POST["api_key"]) : "";- $provider = isset($_POST["provider"]) ? $_POST["provider"] : 0;+require_once '../../includes/connect_endpoint.php';- $removeOldKey = "DELETE FROM fixer WHERE user_id = :userId";- $stmt = $db->prepare($removeOldKey);- $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);- $stmt->execute();+if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {+ if ($_SERVER["REQUEST_METHOD"] === "POST") {+ $newApiKey = isset($_POST["api_key"]) ? trim($_POST["api_key"]) : "";+ $provider = isset($_POST["provider"]) ? $_POST["provider"] : 0;- if ($provider == 1) {- $testKeyUrl = "https://api.apilayer.com/fixer/latest?base=USD&symbols=EUR";- $context = stream_context_create([- 'http' => [- 'method' => 'GET',- 'header' => 'apikey: ' . $newApiKey,- ]- ]);- $response = file_get_contents($testKeyUrl, false, $context);- } else {- $testKeyUrl = "http://data.fixer.io/api/latest?access_key=$newApiKey";- $response = file_get_contents($testKeyUrl);- }-- $apiData = json_decode($response, true);- if ($apiData['success'] && $apiData['success'] == 1) {- if (!empty($newApiKey)) {- $insertNewKey = "INSERT INTO fixer (api_key, provider, user_id) VALUES (:api_key, :provider, :userId)";- $stmt = $db->prepare($insertNewKey);- $stmt->bindParam(":api_key", $newApiKey, SQLITE3_TEXT);- $stmt->bindParam(":provider", $provider, SQLITE3_INTEGER);- $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- if ($result) {- echo json_encode(["success" => true, "message" => translate('api_key_saved', $i18n)]);- } else {- $response = [- "success" => false,- "message" => translate('failed_to_store_api_key', $i18n)- ];- echo json_encode($response);- }+ $removeOldKey = "DELETE FROM fixer WHERE user_id = :userId";+ $stmt = $db->prepare($removeOldKey);+ $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);+ $stmt->execute();++ if ($provider == 1) {+ $testKeyUrl = "https://api.apilayer.com/fixer/latest?base=USD&symbols=EUR";+ $context = stream_context_create([+ 'http' => [+ 'method' => 'GET',+ 'header' => 'apikey: ' . $newApiKey,+ ]+ ]);+ $response = file_get_contents($testKeyUrl, false, $context);+ } else {+ $testKeyUrl = "http://data.fixer.io/api/latest?access_key=$newApiKey";+ $response = file_get_contents($testKeyUrl);+ }++ $apiData = json_decode($response, true);+ if ($apiData['success'] && $apiData['success'] == 1) {+ if (!empty($newApiKey)) {+ $insertNewKey = "INSERT INTO fixer (api_key, provider, user_id) VALUES (:api_key, :provider, :userId)";+ $stmt = $db->prepare($insertNewKey);+ $stmt->bindParam(":api_key", $newApiKey, SQLITE3_TEXT);+ $stmt->bindParam(":provider", $provider, SQLITE3_INTEGER);+ $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();+ if ($result) {+ echo json_encode(["success" => true, "message" => translate('api_key_saved', $i18n)]);} else {- echo json_encode(["success" => true, "message" => translate('apy_key_saved', $i18n)]);+ $response = [+ "success" => false,+ "message" => translate('failed_to_store_api_key', $i18n)+ ];+ echo json_encode($response);}} else {- $response = [- "success" => false,- "message" => translate('invalid_api_key', $i18n)- ];- echo json_encode($response);+ echo json_encode(["success" => true, "message" => translate('apy_key_saved', $i18n)]);}+ } else {+ $response = [+ "success" => false,+ "message" => translate('invalid_api_key', $i18n)+ ];+ echo json_encode($response);}}-+}+?>\ No newline at end of filediff --git a/endpoints/currency/remove.php b/endpoints/currency/remove.phpindex b65a293..a836831 100644--- a/endpoints/currency/remove.php+++ b/endpoints/currency/remove.php@@ -67,4 +67,4 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {echo json_encode($response);}-?>+?>\ No newline at end of filediff --git a/endpoints/currency/update_exchange.php b/endpoints/currency/update_exchange.phpindex 49f96de..1ce46a2 100644--- a/endpoints/currency/update_exchange.php+++ b/endpoints/currency/update_exchange.php@@ -18,7 +18,7 @@ if (isset($_GET['force']) && $_GET['force'] === "true") {$currentDateString = $currentDate->format('Y-m-d');$shouldUpdate = $lastUpdateDateString < $currentDateString;}-+if (!$shouldUpdate) {echo "Rates are current, no need to update.";exit;@@ -30,7 +30,7 @@ $result = $db->query($query);if ($result) {$row = $result->fetchArray(SQLITE3_ASSOC);-+if ($row) {$apiKey = $row['api_key'];$provider = $row['provider'];@@ -41,7 +41,7 @@ if ($result) {$stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);$result = $stmt->execute();while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $codes .= $row['code'].",";+ $codes .= $row['code'] . ",";}$codes = rtrim($codes, ',');$query = "SELECT u.main_currency, c.code FROM user u LEFT JOIN currencies c ON u.main_currency = c.id WHERE u.id = :userId";@@ -62,7 +62,7 @@ if ($result) {]);$response = file_get_contents($api_url, false, $context);} else {- $api_url = "http://data.fixer.io/api/latest?access_key=". $apiKey . "&base=EUR&symbols=" . $codes;+ $api_url = "http://data.fixer.io/api/latest?access_key=" . $apiKey . "&base=EUR&symbols=" . $codes;$response = file_get_contents($api_url);}diff --git a/endpoints/db/backup.php b/endpoints/db/backup.phpindex 346e3a7..f27c5cf 100644--- a/endpoints/db/backup.php+++ b/endpoints/db/backup.php@@ -8,21 +8,23 @@ if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {]));}-function addFolderToZip($dir, $zipArchive, $zipdir = ''){+function addFolderToZip($dir, $zipArchive, $zipdir = '')+{if (is_dir($dir)) {if ($dh = opendir($dir)) {//Add the directory- if(!empty($zipdir)) $zipArchive->addEmptyDir($zipdir);+ if (!empty($zipdir))+ $zipArchive->addEmptyDir($zipdir);while (($file = readdir($dh)) !== false) {// Skip '.' and '..'if ($file == "." || $file == "..") {continue;}//If it's a folder, run the function again!- if(is_dir($dir . $file)){+ if (is_dir($dir . $file)) {$newdir = $dir . $file . '/';addFolderToZip($newdir, $zipArchive, $zipdir . $file . '/');- }else{+ } else {//Add the files$zipArchive->addFile($dir . $file, $zipdir . $file);}@@ -40,7 +42,7 @@ $zip = new ZipArchive();$filename = "backup_" . uniqid() . ".zip";$zipname = "../../.tmp/" . $filename;-if ($zip->open($zipname, ZipArchive::CREATE)!==TRUE) {+if ($zip->open($zipname, ZipArchive::CREATE) !== TRUE) {die(json_encode(["success" => false,"message" => translate('cannot_open_zip', $i18n)diff --git a/endpoints/db/import.php b/endpoints/db/import.phpindex d346e7e..41907f0 100644--- a/endpoints/db/import.php+++ b/endpoints/db/import.php@@ -42,8 +42,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {$di = new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS);$ri = new RecursiveIteratorIterator($di, RecursiveIteratorIterator::CHILD_FIRST);- foreach ( $ri as $file ) {- if ( $file->isDir() ) {+ foreach ($ri as $file) {+ if ($file->isDir()) {rmdir($file->getPathname());} else {unlink($file->getPathname());@@ -67,12 +67,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {}}}-+$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator('../../.tmp', RecursiveDirectoryIterator::SKIP_DOTS),RecursiveIteratorIterator::CHILD_FIRST);-+foreach ($files as $fileinfo) {$removeFunction = ($fileinfo->isDir() ? 'rmdir' : 'unlink');$removeFunction($fileinfo->getRealPath());diff --git a/endpoints/db/migrate.php b/endpoints/db/migrate.phpindex e789477..0e5b989 100644--- a/endpoints/db/migrate.php+++ b/endpoints/db/migrate.php@@ -1,5 +1,6 @@<?php-function errorHandler($severity, $message, $file, $line) {+function errorHandler($severity, $message, $file, $line)+{throw new ErrorException($message, 0, $severity, $file, $line);}@@ -19,8 +20,8 @@ try {$completedMigrations = [];$migrationTableExists = $db- ->query('SELECT name FROM sqlite_master WHERE type="table" AND name="migrations"')- ->fetchArray(SQLITE3_ASSOC) !== false;+ ->query('SELECT name FROM sqlite_master WHERE type="table" AND name="migrations"')+ ->fetchArray(SQLITE3_ASSOC) !== false;if ($migrationTableExists) {$migrationQuery = $db->query('SELECT migration FROM migrations');@@ -34,11 +35,11 @@ if (count($allMigrations) == 0) {$allMigrations = glob('../../migrations/*.php');}-$allMigrations = array_map(function($migration) {+$allMigrations = array_map(function ($migration) {return str_replace('../../', '', $migration);}, $allMigrations);-$completedMigrations = array_map(function($migration) {+$completedMigrations = array_map(function ($migration) {return str_replace('../../', '', $migration);}, $completedMigrations);diff --git a/endpoints/db/restore.php b/endpoints/db/restore.phpindex 5803164..7872954 100644--- a/endpoints/db/restore.php+++ b/endpoints/db/restore.php@@ -40,8 +40,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {$di = new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS);$ri = new RecursiveIteratorIterator($di, RecursiveIteratorIterator::CHILD_FIRST);- foreach ( $ri as $file ) {- if ( $file->isDir() ) {+ foreach ($ri as $file) {+ if ($file->isDir()) {rmdir($file->getPathname());} else {unlink($file->getPathname());@@ -70,12 +70,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {new RecursiveDirectoryIterator('../../.tmp', RecursiveDirectoryIterator::SKIP_DOTS),RecursiveIteratorIterator::CHILD_FIRST);-+foreach ($files as $fileinfo) {$removeFunction = ($fileinfo->isDir() ? 'rmdir' : 'unlink');$removeFunction($fileinfo->getRealPath());}-+echo json_encode(["success" => true,"message" => translate("success", $i18n)diff --git a/endpoints/household/household.php b/endpoints/household/household.phpindex 334e614..d82861f 100644--- a/endpoints/household/household.php+++ b/endpoints/household/household.php@@ -10,7 +10,7 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {$stmtInsert->bindParam(':name', $householdName, SQLITE3_TEXT);$stmtInsert->bindParam(':userId', $userId, SQLITE3_INTEGER);$resultInsert = $stmtInsert->execute();-+if ($resultInsert) {$householdId = $db->lastInsertRowID();$response = [@@ -110,4 +110,4 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {echo translate('error', $i18n);}-?>+?>\ No newline at end of filediff --git a/endpoints/logos/search.php b/endpoints/logos/search.phpindex f5f5854..f89aa63 100644--- a/endpoints/logos/search.php+++ b/endpoints/logos/search.php@@ -1,83 +1,84 @@<?php- if (isset($_GET['search'])) {- $searchTerm = urlencode($_GET['search'] . " logo");+if (isset($_GET['search'])) {+ $searchTerm = urlencode($_GET['search'] . " logo");- $url = "https://www.google.com/search?q={$searchTerm}&tbm=isch&tbs=iar:xw,ift:png";- $backupUrl = "https://search.brave.com/search?q={$searchTerm}";+ $url = "https://www.google.com/search?q={$searchTerm}&tbm=isch&tbs=iar:xw,ift:png";+ $backupUrl = "https://search.brave.com/search?q={$searchTerm}";+ $ch = curl_init();+ curl_setopt($ch, CURLOPT_URL, $url);+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);+ curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);++ // Convert all environment variable keys to lowercase+ $envVars = array_change_key_case($_SERVER, CASE_LOWER);++ // Check for http_proxy or https_proxy environment variables+ $httpProxy = isset($envVars['http_proxy']) ? $envVars['http_proxy'] : null;+ $httpsProxy = isset($envVars['https_proxy']) ? $envVars['https_proxy'] : null;++ if (!empty($httpProxy)) {+ curl_setopt($ch, CURLOPT_PROXY, $httpProxy);+ } elseif (!empty($httpsProxy)) {+ curl_setopt($ch, CURLOPT_PROXY, $httpsProxy);+ }++ $response = curl_exec($ch);++ if ($response === false) {+ // If cURL fails to access google images, use brave image search as a backup$ch = curl_init();- curl_setopt($ch, CURLOPT_URL, $url);+ curl_setopt($ch, CURLOPT_URL, $backupUrl);curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);-- // Convert all environment variable keys to lowercase$envVars = array_change_key_case($_SERVER, CASE_LOWER);-- // Check for http_proxy or https_proxy environment variables$httpProxy = isset($envVars['http_proxy']) ? $envVars['http_proxy'] : null;$httpsProxy = isset($envVars['https_proxy']) ? $envVars['https_proxy'] : null;-if (!empty($httpProxy)) {curl_setopt($ch, CURLOPT_PROXY, $httpProxy);} elseif (!empty($httpsProxy)) {curl_setopt($ch, CURLOPT_PROXY, $httpsProxy);}-$response = curl_exec($ch);-if ($response === false) {- // If cURL fails to access google images, use brave image search as a backup- $ch = curl_init();- curl_setopt($ch, CURLOPT_URL, $backupUrl);- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);- curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);- $envVars = array_change_key_case($_SERVER, CASE_LOWER);- $httpProxy = isset($envVars['http_proxy']) ? $envVars['http_proxy'] : null;- $httpsProxy = isset($envVars['https_proxy']) ? $envVars['https_proxy'] : null;- if (!empty($httpProxy)) {- curl_setopt($ch, CURLOPT_PROXY, $httpProxy);- } elseif (!empty($httpsProxy)) {- curl_setopt($ch, CURLOPT_PROXY, $httpsProxy);- }- $response = curl_exec($ch);- if ($response === false) {- echo json_encode(['error' => 'Failed to fetch data from Google.']);- } else {- $imageUrls = extractImageUrlsFromPage($response);- header('Content-Type: application/json');- echo json_encode(['imageUrls' => $imageUrls]);- }+ echo json_encode(['error' => 'Failed to fetch data from Google.']);} else {- // Parse the HTML response to extract image URLs$imageUrls = extractImageUrlsFromPage($response);-- // Pass the image URLs to the clientheader('Content-Type: application/json');echo json_encode(['imageUrls' => $imageUrls]);}-- curl_close($ch);} else {- echo json_encode(['error' => 'Invalid request.']);+ // Parse the HTML response to extract image URLs+ $imageUrls = extractImageUrlsFromPage($response);++ // Pass the image URLs to the client+ header('Content-Type: application/json');+ echo json_encode(['imageUrls' => $imageUrls]);}- function extractImageUrlsFromPage($html) {- $imageUrls = [];+ curl_close($ch);+} else {+ echo json_encode(['error' => 'Invalid request.']);+}++function extractImageUrlsFromPage($html)+{+ $imageUrls = [];- $doc = new DOMDocument();- @$doc->loadHTML($html);+ $doc = new DOMDocument();+ @$doc->loadHTML($html);- $imgTags = $doc->getElementsByTagName('img');- foreach ($imgTags as $imgTag) {- $src = $imgTag->getAttribute('src');- if (!strstr($imgTag->getAttribute('class'), "favicon") && !strstr($imgTag->getAttribute('class'), "logo")) {- if (filter_var($src, FILTER_VALIDATE_URL)) {- $imageUrls[] = $src;- }+ $imgTags = $doc->getElementsByTagName('img');+ foreach ($imgTags as $imgTag) {+ $src = $imgTag->getAttribute('src');+ if (!strstr($imgTag->getAttribute('class'), "favicon") && !strstr($imgTag->getAttribute('class'), "logo")) {+ if (filter_var($src, FILTER_VALIDATE_URL)) {+ $imageUrls[] = $src;}}-- return $imageUrls;}--?>++ return $imageUrls;+}++?>\ No newline at end of filediff --git a/endpoints/notifications/savediscordnotifications.php b/endpoints/notifications/savediscordnotifications.phpindex f3caaf7..9eb2e91 100644--- a/endpoints/notifications/savediscordnotifications.php+++ b/endpoints/notifications/savediscordnotifications.php@@ -1,77 +1,77 @@<?php- require_once '../../includes/connect_endpoint.php';+require_once '../../includes/connect_endpoint.php';- if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {- die(json_encode([+if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {+ die(json_encode([+ "success" => false,+ "message" => translate('session_expired', $i18n)+ ]));+}++if ($_SERVER["REQUEST_METHOD"] === "POST") {+ $postData = file_get_contents("php://input");+ $data = json_decode($postData, true);++ if (+ !isset($data["url"]) || $data["url"] == ""+ ) {+ $response = ["success" => false,- "message" => translate('session_expired', $i18n)- ]));- }+ "message" => translate('fill_mandatory_fields', $i18n)+ ];+ echo json_encode($response);+ } else {+ $enabled = $data["enabled"];+ $webhook_url = $data["url"];+ $bot_username = $data["bot_username"];+ $bot_avatar_url = $data["bot_avatar"];- if ($_SERVER["REQUEST_METHOD"] === "POST") {- $postData = file_get_contents("php://input");- $data = json_decode($postData, true);+ $query = "SELECT COUNT(*) FROM discord_notifications WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- if (- !isset($data["url"]) || $data["url"] == ""- ) {+ if ($result === false) {$response = ["success" => false,- "message" => translate('fill_mandatory_fields', $i18n)+ "message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);} else {- $enabled = $data["enabled"];- $webhook_url = $data["url"];- $bot_username = $data["bot_username"];- $bot_avatar_url = $data["bot_avatar"];+ $row = $result->fetchArray();+ $count = $row[0];+ if ($count == 0) {+ $query = "INSERT INTO discord_notifications (enabled, webhook_url, bot_username, bot_avatar_url, user_id)+ VALUES (:enabled, :webhook_url, :bot_username, :bot_avatar_url, :userId)";+ } else {+ $query = "UPDATE discord_notifications+ SET enabled = :enabled, webhook_url = :webhook_url, bot_username = :bot_username, bot_avatar_url = :bot_avatar_url+ WHERE user_id = :userId";+ }- $query = "SELECT COUNT(*) FROM discord_notifications WHERE user_id = :userId";$stmt = $db->prepare($query);- $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);- $result = $stmt->execute();-- if ($result === false) {+ $stmt->bindValue(':enabled', $enabled, SQLITE3_INTEGER);+ $stmt->bindValue(':webhook_url', $webhook_url, SQLITE3_TEXT);+ $stmt->bindValue(':bot_username', $bot_username, SQLITE3_TEXT);+ $stmt->bindValue(':bot_avatar_url', $bot_avatar_url, SQLITE3_TEXT);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);++ if ($stmt->execute()) {+ $response = [+ "success" => true,+ "message" => translate('notifications_settings_saved', $i18n)+ ];+ echo json_encode($response);+ } else {$response = ["success" => false,"message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);- } else {- $row = $result->fetchArray();- $count = $row[0];- if ($count == 0) {- $query = "INSERT INTO discord_notifications (enabled, webhook_url, bot_username, bot_avatar_url, user_id)- VALUES (:enabled, :webhook_url, :bot_username, :bot_avatar_url, :userId)";- } else {- $query = "UPDATE discord_notifications- SET enabled = :enabled, webhook_url = :webhook_url, bot_username = :bot_username, bot_avatar_url = :bot_avatar_url- WHERE user_id = :userId";- }-- $stmt = $db->prepare($query);- $stmt->bindValue(':enabled', $enabled, SQLITE3_INTEGER);- $stmt->bindValue(':webhook_url', $webhook_url, SQLITE3_TEXT);- $stmt->bindValue(':bot_username', $bot_username, SQLITE3_TEXT);- $stmt->bindValue(':bot_avatar_url', $bot_avatar_url, SQLITE3_TEXT);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);-- if ($stmt->execute()) {- $response = [- "success" => true,- "message" => translate('notifications_settings_saved', $i18n)- ];- echo json_encode($response);- } else {- $response = [- "success" => false,- "message" => translate('error_saving_notifications', $i18n)- ];- echo json_encode($response);- }}}}+}?>\ No newline at end of filediff --git a/endpoints/notifications/saveemailnotifications.php b/endpoints/notifications/saveemailnotifications.phpindex 6250431..1965462 100644--- a/endpoints/notifications/saveemailnotifications.php+++ b/endpoints/notifications/saveemailnotifications.php@@ -1,87 +1,87 @@<?php- require_once '../../includes/connect_endpoint.php';+require_once '../../includes/connect_endpoint.php';- if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {- die(json_encode([+if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {+ die(json_encode([+ "success" => false,+ "message" => translate('session_expired', $i18n)+ ]));+}++if ($_SERVER["REQUEST_METHOD"] === "POST") {+ $postData = file_get_contents("php://input");+ $data = json_decode($postData, true);++ if (+ !isset($data["smtpaddress"]) || $data["smtpaddress"] == "" ||+ !isset($data["smtpport"]) || $data["smtpport"] == "" ||+ !isset($data["smtpusername"]) || $data["smtpusername"] == "" ||+ !isset($data["smtppassword"]) || $data["smtppassword"] == ""+ ) {+ $response = ["success" => false,- "message" => translate('session_expired', $i18n)- ]));- }+ "message" => translate('fill_mandatory_fields', $i18n)+ ];+ echo json_encode($response);+ } else {+ $enabled = $data["enabled"];+ $smtpAddress = $data["smtpaddress"];+ $smtpPort = $data["smtpport"];+ $encryption = "tls";+ if (isset($data["encryption"])) {+ $encryption = $data["encryption"];+ }+ $smtpUsername = $data["smtpusername"];+ $smtpPassword = $data["smtppassword"];+ $fromEmail = $data["fromemail"];- if ($_SERVER["REQUEST_METHOD"] === "POST") {- $postData = file_get_contents("php://input");- $data = json_decode($postData, true);+ $query = "SELECT COUNT(*) FROM email_notifications WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- if (- !isset($data["smtpaddress"]) || $data["smtpaddress"] == "" ||- !isset($data["smtpport"]) || $data["smtpport"] == "" ||- !isset($data["smtpusername"]) || $data["smtpusername"] == "" ||- !isset($data["smtppassword"]) || $data["smtppassword"] == ""- ) {+ if ($result === false) {$response = ["success" => false,- "message" => translate('fill_mandatory_fields', $i18n)+ "message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);} else {- $enabled = $data["enabled"];- $smtpAddress = $data["smtpaddress"];- $smtpPort = $data["smtpport"];- $encryption = "tls";- if (isset($data["encryption"])) {- $encryption = $data["encryption"];+ $row = $result->fetchArray();+ $count = $row[0];+ if ($count == 0) {+ $query = "INSERT INTO email_notifications (enabled, smtp_address, smtp_port, smtp_username, smtp_password, from_email, encryption, user_id)+ VALUES (:enabled, :smtpAddress, :smtpPort, :smtpUsername, :smtpPassword, :fromEmail, :encryption, :userId)";+ } else {+ $query = "UPDATE email_notifications+ SET enabled = :enabled, smtp_address = :smtpAddress, smtp_port = :smtpPort,+ smtp_username = :smtpUsername, smtp_password = :smtpPassword, from_email = :fromEmail, encryption = :encryption WHERE user_id = :userId";}- $smtpUsername = $data["smtpusername"];- $smtpPassword = $data["smtppassword"];- $fromEmail = $data["fromemail"];- $query = "SELECT COUNT(*) FROM email_notifications WHERE user_id = :userId";$stmt = $db->prepare($query);- $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);- $result = $stmt->execute();-- if ($result === false) {+ $stmt->bindValue(':enabled', $enabled, SQLITE3_INTEGER);+ $stmt->bindValue(':smtpAddress', $smtpAddress, SQLITE3_TEXT);+ $stmt->bindValue(':smtpPort', $smtpPort, SQLITE3_INTEGER);+ $stmt->bindValue(':smtpUsername', $smtpUsername, SQLITE3_TEXT);+ $stmt->bindValue(':smtpPassword', $smtpPassword, SQLITE3_TEXT);+ $stmt->bindValue(':fromEmail', $fromEmail, SQLITE3_TEXT);+ $stmt->bindValue(':encryption', $encryption, SQLITE3_TEXT);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);++ if ($stmt->execute()) {+ $response = [+ "success" => true,+ "message" => translate('notifications_settings_saved', $i18n)+ ];+ echo json_encode($response);+ } else {$response = ["success" => false,"message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);- } else {- $row = $result->fetchArray();- $count = $row[0];- if ($count == 0) {- $query = "INSERT INTO email_notifications (enabled, smtp_address, smtp_port, smtp_username, smtp_password, from_email, encryption, user_id)- VALUES (:enabled, :smtpAddress, :smtpPort, :smtpUsername, :smtpPassword, :fromEmail, :encryption, :userId)";- } else {- $query = "UPDATE email_notifications- SET enabled = :enabled, smtp_address = :smtpAddress, smtp_port = :smtpPort,- smtp_username = :smtpUsername, smtp_password = :smtpPassword, from_email = :fromEmail, encryption = :encryption WHERE user_id = :userId";- }-- $stmt = $db->prepare($query);- $stmt->bindValue(':enabled', $enabled, SQLITE3_INTEGER);- $stmt->bindValue(':smtpAddress', $smtpAddress, SQLITE3_TEXT);- $stmt->bindValue(':smtpPort', $smtpPort, SQLITE3_INTEGER);- $stmt->bindValue(':smtpUsername', $smtpUsername, SQLITE3_TEXT);- $stmt->bindValue(':smtpPassword', $smtpPassword, SQLITE3_TEXT);- $stmt->bindValue(':fromEmail', $fromEmail, SQLITE3_TEXT);- $stmt->bindValue(':encryption', $encryption, SQLITE3_TEXT);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);-- if ($stmt->execute()) {- $response = [- "success" => true,- "message" => translate('notifications_settings_saved', $i18n)- ];- echo json_encode($response);- } else {- $response = [- "success" => false,- "message" => translate('error_saving_notifications', $i18n)- ];- echo json_encode($response);- }}}}+}?>\ No newline at end of filediff --git a/endpoints/notifications/savegotifynotifications.php b/endpoints/notifications/savegotifynotifications.phpindex 6dda4e7..77a5db2 100644--- a/endpoints/notifications/savegotifynotifications.php+++ b/endpoints/notifications/savegotifynotifications.php@@ -1,73 +1,73 @@<?php- require_once '../../includes/connect_endpoint.php';+require_once '../../includes/connect_endpoint.php';- if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {- die(json_encode([+if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {+ die(json_encode([+ "success" => false,+ "message" => translate('session_expired', $i18n)+ ]));+}++if ($_SERVER["REQUEST_METHOD"] === "POST") {+ $postData = file_get_contents("php://input");+ $data = json_decode($postData, true);++ if (+ !isset($data["gotify_url"]) || $data["gotify_url"] == "" ||+ !isset($data["token"]) || $data["token"] == ""+ ) {+ $response = ["success" => false,- "message" => translate('session_expired', $i18n)- ]));- }+ "message" => translate('fill_mandatory_fields', $i18n)+ ];+ echo json_encode($response);+ } else {+ $enabled = $data["enabled"];+ $url = $data["gotify_url"];+ $token = $data["token"];- if ($_SERVER["REQUEST_METHOD"] === "POST") {- $postData = file_get_contents("php://input");- $data = json_decode($postData, true);+ $query = "SELECT COUNT(*) FROM gotify_notifications WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- if (- !isset($data["gotify_url"]) || $data["gotify_url"] == "" ||- !isset($data["token"]) || $data["token"] == ""- ) {+ if ($result === false) {$response = ["success" => false,- "message" => translate('fill_mandatory_fields', $i18n)+ "message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);} else {- $enabled = $data["enabled"];- $url = $data["gotify_url"];- $token = $data["token"];+ $row = $result->fetchArray();+ $count = $row[0];+ if ($count == 0) {+ $query = "INSERT INTO gotify_notifications (enabled, url, token, user_id)+ VALUES (:enabled, :url, :token, :userId)";+ } else {+ $query = "UPDATE gotify_notifications+ SET enabled = :enabled, url = :url, token = :token WHERE user_id = :userId";+ }- $query = "SELECT COUNT(*) FROM gotify_notifications WHERE user_id = :userId";$stmt = $db->prepare($query);- $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);- $result = $stmt->execute();-- if ($result === false) {+ $stmt->bindValue(':enabled', $enabled, SQLITE3_INTEGER);+ $stmt->bindValue(':url', $url, SQLITE3_TEXT);+ $stmt->bindValue(':token', $token, SQLITE3_TEXT);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);++ if ($stmt->execute()) {+ $response = [+ "success" => true,+ "message" => translate('notifications_settings_saved', $i18n)+ ];+ echo json_encode($response);+ } else {$response = ["success" => false,"message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);- } else {- $row = $result->fetchArray();- $count = $row[0];- if ($count == 0) {- $query = "INSERT INTO gotify_notifications (enabled, url, token, user_id)- VALUES (:enabled, :url, :token, :userId)";- } else {- $query = "UPDATE gotify_notifications- SET enabled = :enabled, url = :url, token = :token WHERE user_id = :userId";- }-- $stmt = $db->prepare($query);- $stmt->bindValue(':enabled', $enabled, SQLITE3_INTEGER);- $stmt->bindValue(':url', $url, SQLITE3_TEXT);- $stmt->bindValue(':token', $token, SQLITE3_TEXT);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);-- if ($stmt->execute()) {- $response = [- "success" => true,- "message" => translate('notifications_settings_saved', $i18n)- ];- echo json_encode($response);- } else {- $response = [- "success" => false,- "message" => translate('error_saving_notifications', $i18n)- ];- echo json_encode($response);- }}}}+}?>\ No newline at end of filediff --git a/endpoints/notifications/savenotificationsettings.php b/endpoints/notifications/savenotificationsettings.phpindex f6addcc..eb88713 100644--- a/endpoints/notifications/savenotificationsettings.php+++ b/endpoints/notifications/savenotificationsettings.php@@ -1,71 +1,71 @@<?php- require_once '../../includes/connect_endpoint.php';+require_once '../../includes/connect_endpoint.php';- if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {- die(json_encode([- "success" => false,- "message" => translate('session_expired', $i18n)- ]));- }+if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {+ die(json_encode([+ "success" => false,+ "message" => translate('session_expired', $i18n)+ ]));+}- if ($_SERVER["REQUEST_METHOD"] === "POST") {- $postData = file_get_contents("php://input");- $data = json_decode($postData, true);+if ($_SERVER["REQUEST_METHOD"] === "POST") {+ $postData = file_get_contents("php://input");+ $data = json_decode($postData, true);- if (!isset($data["days"]) || $data['days'] == "") {+ if (!isset($data["days"]) || $data['days'] == "") {+ $response = [+ "success" => false,+ "message" => translate('fill_mandatory_fields', $i18n)+ ];+ echo json_encode($response);+ } else {+ $days = $data["days"];+ $query = "SELECT COUNT(*) FROM notification_settings WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();++ if ($result === false) {$response = ["success" => false,- "message" => translate('fill_mandatory_fields', $i18n)+ "message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);} else {- $days = $data["days"];- $query = "SELECT COUNT(*) FROM notification_settings WHERE user_id = :userId";+ $row = $result->fetchArray();+ $count = $row[0];+ if ($count == 0) {+ $query = "INSERT INTO notification_settings (days, user_id)+ VALUES (:days, :userId)";+ } else {+ $query = "UPDATE notification_settings SET days = :days WHERE user_id = :userId";+ }+$stmt = $db->prepare($query);- $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);- $result = $stmt->execute();-- if ($result === false) {+ $stmt->bindValue(':days', $days, SQLITE3_INTEGER);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);++ if ($stmt->execute()) {+ $response = [+ "success" => true,+ "message" => translate('notifications_settings_saved', $i18n)+ ];+ echo json_encode($response);+ } else {$response = ["success" => false,"message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);- } else {- $row = $result->fetchArray();- $count = $row[0];- if ($count == 0) {- $query = "INSERT INTO notification_settings (days, user_id)- VALUES (:days, :userId)";- } else {- $query = "UPDATE notification_settings SET days = :days WHERE user_id = :userId";- }-- $stmt = $db->prepare($query);- $stmt->bindValue(':days', $days, SQLITE3_INTEGER);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);-- if ($stmt->execute()) {- $response = [- "success" => true,- "message" => translate('notifications_settings_saved', $i18n)- ];- echo json_encode($response);- } else {- $response = [- "success" => false,- "message" => translate('error_saving_notifications', $i18n)- ];- echo json_encode($response);- }}}- } else {- $response = [- "success" => false,- "message" => "Invalid request method"- ];- echo json_encode($response);- exit();- }\ No newline at end of file+ }+} else {+ $response = [+ "success" => false,+ "message" => "Invalid request method"+ ];+ echo json_encode($response);+ exit();+}\ No newline at end of filediff --git a/endpoints/notifications/saventfynotifications.php b/endpoints/notifications/saventfynotifications.phpindex ec663bc..0797e04 100644--- a/endpoints/notifications/saventfynotifications.php+++ b/endpoints/notifications/saventfynotifications.php@@ -1,84 +1,84 @@<?php- require_once '../../includes/connect_endpoint.php';+require_once '../../includes/connect_endpoint.php';- if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {- die(json_encode([+if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {+ die(json_encode([+ "success" => false,+ "message" => translate('session_expired', $i18n)+ ]));+}++if ($_SERVER["REQUEST_METHOD"] === "POST") {+ $postData = file_get_contents("php://input");+ $data = json_decode($postData, true);++ if (+ !isset($data["topic"]) || $data["topic"] == "" ||+ !isset($data["host"]) || $data["host"] == ""+ ) {+ $response = ["success" => false,- "message" => translate('session_expired', $i18n)- ]));- }+ "message" => translate('fill_mandatory_fields', $i18n)+ ];+ echo json_encode($response);+ } else {+ $enabled = $data["enabled"];+ $host = $data["host"];+ $topic = $data["topic"];+ $headers = $data["headers"];- if ($_SERVER["REQUEST_METHOD"] === "POST") {- $postData = file_get_contents("php://input");- $data = json_decode($postData, true);+ $query = "SELECT COUNT(*) FROM ntfy_notifications WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- if (- !isset($data["topic"]) || $data["topic"] == "" ||- !isset($data["host"]) || $data["host"] == ""- ) {+ if ($result === false) {$response = ["success" => false,- "message" => translate('fill_mandatory_fields', $i18n)+ "message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);} else {- $enabled = $data["enabled"];- $host = $data["host"];- $topic = $data["topic"];- $headers = $data["headers"];+ $row = $result->fetchArray();+ $count = $row[0];+ if ($count == 0) {+ $query = "INSERT INTO ntfy_notifications (enabled, host, topic, headers, user_id)+ VALUES (:enabled, :host, :topic, :headers, :userId)";+ } else {+ $query = "UPDATE ntfy_notifications+ SET enabled = :enabled, host = :host, topic = :topic, headers = :headers WHERE user_id = :userId";+ }- $query = "SELECT COUNT(*) FROM ntfy_notifications WHERE user_id = :userId";$stmt = $db->prepare($query);- $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ $stmt->bindValue(':enabled', $enabled, SQLITE3_INTEGER);+ $stmt->bindValue(':host', $host, SQLITE3_TEXT);+ $stmt->bindValue(':topic', $topic, SQLITE3_TEXT);+ $stmt->bindValue(':headers', $headers, SQLITE3_TEXT);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- if ($result === false) {+ if ($stmt->execute()) {+ $response = [+ "success" => true,+ "message" => translate('notifications_settings_saved', $i18n)+ ];+ echo json_encode($response);+ } else {$response = ["success" => false,"message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);- } else {- $row = $result->fetchArray();- $count = $row[0];- if ($count == 0) {- $query = "INSERT INTO ntfy_notifications (enabled, host, topic, headers, user_id)- VALUES (:enabled, :host, :topic, :headers, :userId)";- } else {- $query = "UPDATE ntfy_notifications- SET enabled = :enabled, host = :host, topic = :topic, headers = :headers WHERE user_id = :userId";- }-- $stmt = $db->prepare($query);- $stmt->bindValue(':enabled', $enabled, SQLITE3_INTEGER);- $stmt->bindValue(':host', $host, SQLITE3_TEXT);- $stmt->bindValue(':topic', $topic, SQLITE3_TEXT);- $stmt->bindValue(':headers', $headers, SQLITE3_TEXT);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);-- if ($stmt->execute()) {- $response = [- "success" => true,- "message" => translate('notifications_settings_saved', $i18n)- ];- echo json_encode($response);- } else {- $response = [- "success" => false,- "message" => translate('error_saving_notifications', $i18n)- ];- echo json_encode($response);- }- }+ }}-- } else {- $response = [- "success" => false,- "message" => translate('invalid_request_method', $i18n)- ];- echo json_encode($response);}-?>+} else {+ $response = [+ "success" => false,+ "message" => translate('invalid_request_method', $i18n)+ ];+ echo json_encode($response);+}++?>\ No newline at end of filediff --git a/endpoints/notifications/savepushovernotifications.php b/endpoints/notifications/savepushovernotifications.phpindex 0c171de..cff844a 100644--- a/endpoints/notifications/savepushovernotifications.php+++ b/endpoints/notifications/savepushovernotifications.php@@ -1,81 +1,81 @@<?php- require_once '../../includes/connect_endpoint.php';+require_once '../../includes/connect_endpoint.php';- if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {- die(json_encode([+if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {+ die(json_encode([+ "success" => false,+ "message" => translate('session_expired', $i18n)+ ]));+}++if ($_SERVER["REQUEST_METHOD"] === "POST") {+ $postData = file_get_contents("php://input");+ $data = json_decode($postData, true);++ if (+ !isset($data["user_key"]) || $data["user_key"] == "" ||+ !isset($data["token"]) || $data["token"] == ""+ ) {+ $response = ["success" => false,- "message" => translate('session_expired', $i18n)- ]));- }+ "message" => translate('fill_mandatory_fields', $i18n)+ ];+ echo json_encode($response);+ } else {+ $enabled = $data["enabled"];+ $user_key = $data["user_key"];+ $token = $data["token"];- if ($_SERVER["REQUEST_METHOD"] === "POST") {- $postData = file_get_contents("php://input");- $data = json_decode($postData, true);+ $query = "SELECT COUNT(*) FROM pushover_notifications WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- if (- !isset($data["user_key"]) || $data["user_key"] == "" ||- !isset($data["token"]) || $data["token"] == ""- ) {+ if ($result === false) {$response = ["success" => false,- "message" => translate('fill_mandatory_fields', $i18n)+ "message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);} else {- $enabled = $data["enabled"];- $user_key = $data["user_key"];- $token = $data["token"];+ $row = $result->fetchArray();+ $count = $row[0];+ if ($count == 0) {+ $query = "INSERT INTO pushover_notifications (enabled, user_key, token, user_id)+ VALUES (:enabled, :user_key, :token, :userId)";+ } else {+ $query = "UPDATE pushover_notifications+ SET enabled = :enabled, user_key = :user_key, token = :token, user_id = :userId";+ }- $query = "SELECT COUNT(*) FROM pushover_notifications WHERE user_id = :userId";$stmt = $db->prepare($query);- $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);- $result = $stmt->execute();-- if ($result === false) {+ $stmt->bindValue(':enabled', $enabled, SQLITE3_INTEGER);+ $stmt->bindValue(':user_key', $user_key, SQLITE3_TEXT);+ $stmt->bindValue(':token', $token, SQLITE3_TEXT);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);++ if ($stmt->execute()) {+ $response = [+ "success" => true,+ "message" => translate('notifications_settings_saved', $i18n)+ ];+ echo json_encode($response);+ } else {$response = ["success" => false,"message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);- } else {- $row = $result->fetchArray();- $count = $row[0];- if ($count == 0) {- $query = "INSERT INTO pushover_notifications (enabled, user_key, token, user_id)- VALUES (:enabled, :user_key, :token, :userId)";- } else {- $query = "UPDATE pushover_notifications- SET enabled = :enabled, user_key = :user_key, token = :token, user_id = :userId";- }-- $stmt = $db->prepare($query);- $stmt->bindValue(':enabled', $enabled, SQLITE3_INTEGER);- $stmt->bindValue(':user_key', $user_key, SQLITE3_TEXT);- $stmt->bindValue(':token', $token, SQLITE3_TEXT);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);-- if ($stmt->execute()) {- $response = [- "success" => true,- "message" => translate('notifications_settings_saved', $i18n)- ];- echo json_encode($response);- } else {- $response = [- "success" => false,- "message" => translate('error_saving_notifications', $i18n)- ];- echo json_encode($response);- }}}- } else {- $response = [- "success" => false,- "message" => translate('invalid_request_method', $i18n)- ];- echo json_encode($response);}+} else {+ $response = [+ "success" => false,+ "message" => translate('invalid_request_method', $i18n)+ ];+ echo json_encode($response);+}?>\ No newline at end of filediff --git a/endpoints/notifications/savetelegramnotifications.php b/endpoints/notifications/savetelegramnotifications.phpindex af54cb2..8910386 100644--- a/endpoints/notifications/savetelegramnotifications.php+++ b/endpoints/notifications/savetelegramnotifications.php@@ -1,73 +1,73 @@<?php- require_once '../../includes/connect_endpoint.php';+require_once '../../includes/connect_endpoint.php';- if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {- die(json_encode([+if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {+ die(json_encode([+ "success" => false,+ "message" => translate('session_expired', $i18n)+ ]));+}++if ($_SERVER["REQUEST_METHOD"] === "POST") {+ $postData = file_get_contents("php://input");+ $data = json_decode($postData, true);++ if (+ !isset($data["bot_token"]) || $data["bot_token"] == "" ||+ !isset($data["chat_id"]) || $data["chat_id"] == ""+ ) {+ $response = ["success" => false,- "message" => translate('session_expired', $i18n)- ]));- }+ "message" => translate('fill_mandatory_fields', $i18n)+ ];+ echo json_encode($response);+ } else {+ $enabled = $data["enabled"];+ $bot_token = $data["bot_token"];+ $chat_id = $data["chat_id"];- if ($_SERVER["REQUEST_METHOD"] === "POST") {- $postData = file_get_contents("php://input");- $data = json_decode($postData, true);+ $query = "SELECT COUNT(*) FROM telegram_notifications WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- if (- !isset($data["bot_token"]) || $data["bot_token"] == "" ||- !isset($data["chat_id"]) || $data["chat_id"] == ""- ) {+ if ($result === false) {$response = ["success" => false,- "message" => translate('fill_mandatory_fields', $i18n)+ "message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);} else {- $enabled = $data["enabled"];- $bot_token = $data["bot_token"];- $chat_id = $data["chat_id"];+ $row = $result->fetchArray();+ $count = $row[0];+ if ($count == 0) {+ $query = "INSERT INTO telegram_notifications (enabled, bot_token, chat_id, user_id)+ VALUES (:enabled, :bot_token, :chat_id, :userId)";+ } else {+ $query = "UPDATE telegram_notifications+ SET enabled = :enabled, bot_token = :bot_token, chat_id = :chat_id WHERE user_id = :userId";+ }- $query = "SELECT COUNT(*) FROM telegram_notifications WHERE user_id = :userId";$stmt = $db->prepare($query);- $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);- $result = $stmt->execute();-- if ($result === false) {+ $stmt->bindValue(':enabled', $enabled, SQLITE3_INTEGER);+ $stmt->bindValue(':bot_token', $bot_token, SQLITE3_TEXT);+ $stmt->bindValue(':chat_id', $chat_id, SQLITE3_TEXT);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);++ if ($stmt->execute()) {+ $response = [+ "success" => true,+ "message" => translate('notifications_settings_saved', $i18n)+ ];+ echo json_encode($response);+ } else {$response = ["success" => false,"message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);- } else {- $row = $result->fetchArray();- $count = $row[0];- if ($count == 0) {- $query = "INSERT INTO telegram_notifications (enabled, bot_token, chat_id, user_id)- VALUES (:enabled, :bot_token, :chat_id, :userId)";- } else {- $query = "UPDATE telegram_notifications- SET enabled = :enabled, bot_token = :bot_token, chat_id = :chat_id WHERE user_id = :userId";- }-- $stmt = $db->prepare($query);- $stmt->bindValue(':enabled', $enabled, SQLITE3_INTEGER);- $stmt->bindValue(':bot_token', $bot_token, SQLITE3_TEXT);- $stmt->bindValue(':chat_id', $chat_id, SQLITE3_TEXT);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);-- if ($stmt->execute()) {- $response = [- "success" => true,- "message" => translate('notifications_settings_saved', $i18n)- ];- echo json_encode($response);- } else {- $response = [- "success" => false,- "message" => translate('error_saving_notifications', $i18n)- ];- echo json_encode($response);- }}}}+}?>\ No newline at end of filediff --git a/endpoints/notifications/savewebhooknotifications.php b/endpoints/notifications/savewebhooknotifications.phpindex 25fa1be..c3d099e 100644--- a/endpoints/notifications/savewebhooknotifications.php+++ b/endpoints/notifications/savewebhooknotifications.php@@ -1,75 +1,75 @@<?php- require_once '../../includes/connect_endpoint.php';+require_once '../../includes/connect_endpoint.php';- if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {- die(json_encode([+if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {+ die(json_encode([+ "success" => false,+ "message" => translate('session_expired', $i18n)+ ]));+}++if ($_SERVER["REQUEST_METHOD"] === "POST") {+ $postData = file_get_contents("php://input");+ $data = json_decode($postData, true);++ if (+ !isset($data["webhook_url"]) || $data["webhook_url"] == "" ||+ !isset($data["payload"]) || $data["payload"] == ""+ ) {+ $response = ["success" => false,- "message" => translate('session_expired', $i18n)- ]));- }+ "message" => translate('fill_mandatory_fields', $i18n)+ ];+ echo json_encode($response);+ } else {+ $enabled = $data["enabled"];+ $url = $data["webhook_url"];+ $headers = $data["headers"];+ $payload = $data["payload"];- if ($_SERVER["REQUEST_METHOD"] === "POST") {- $postData = file_get_contents("php://input");- $data = json_decode($postData, true);+ $query = "SELECT COUNT(*) FROM webhook_notifications WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- if (- !isset($data["webhook_url"]) || $data["webhook_url"] == "" ||- !isset($data["payload"]) || $data["payload"] == ""- ) {+ if ($result === false) {$response = ["success" => false,- "message" => translate('fill_mandatory_fields', $i18n)+ "message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);} else {- $enabled = $data["enabled"];- $url = $data["webhook_url"];- $headers = $data["headers"];- $payload = $data["payload"];+ $row = $result->fetchArray();+ $count = $row[0];+ if ($count == 0) {+ $query = "INSERT INTO webhook_notifications (enabled, url, headers, payload, user_id)+ VALUES (:enabled, :url, :headers, :payload, :userId)";+ } else {+ $query = "UPDATE webhook_notifications+ SET enabled = :enabled, url = :url, headers = :headers, payload = :payload WHERE user_id = :userId";+ }- $query = "SELECT COUNT(*) FROM webhook_notifications WHERE user_id = :userId";$stmt = $db->prepare($query);- $stmt->bindParam(":userId", $userId, SQLITE3_INTEGER);- $result = $stmt->execute();-- if ($result === false) {+ $stmt->bindValue(':enabled', $enabled, SQLITE3_INTEGER);+ $stmt->bindValue(':url', $url, SQLITE3_TEXT);+ $stmt->bindValue(':headers', $headers, SQLITE3_TEXT);+ $stmt->bindValue(':payload', $payload, SQLITE3_TEXT);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);++ if ($stmt->execute()) {+ $response = [+ "success" => true,+ "message" => translate('notifications_settings_saved', $i18n)+ ];+ echo json_encode($response);+ } else {$response = ["success" => false,"message" => translate('error_saving_notifications', $i18n)];echo json_encode($response);- } else {- $row = $result->fetchArray();- $count = $row[0];- if ($count == 0) {- $query = "INSERT INTO webhook_notifications (enabled, url, headers, payload, user_id)- VALUES (:enabled, :url, :headers, :payload, :userId)";- } else {- $query = "UPDATE webhook_notifications- SET enabled = :enabled, url = :url, headers = :headers, payload = :payload WHERE user_id = :userId";- }-- $stmt = $db->prepare($query);- $stmt->bindValue(':enabled', $enabled, SQLITE3_INTEGER);- $stmt->bindValue(':url', $url, SQLITE3_TEXT);- $stmt->bindValue(':headers', $headers, SQLITE3_TEXT);- $stmt->bindValue(':payload', $payload, SQLITE3_TEXT);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);-- if ($stmt->execute()) {- $response = [- "success" => true,- "message" => translate('notifications_settings_saved', $i18n)- ];- echo json_encode($response);- } else {- $response = [- "success" => false,- "message" => translate('error_saving_notifications', $i18n)- ];- echo json_encode($response);- }}}}+}?>\ No newline at end of filediff --git a/endpoints/notifications/testdiscordnotifications.php b/endpoints/notifications/testdiscordnotifications.phpindex 0d0a7dd..d87eec0 100644--- a/endpoints/notifications/testdiscordnotifications.php+++ b/endpoints/notifications/testdiscordnotifications.php@@ -40,17 +40,17 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {]]];-+if (!empty($bot_username)) {$postfields['username'] = $bot_username;}-+if (!empty($bot_avatar_url)) {$postfields['avatar_url'] = $bot_avatar_url;}$ch = curl_init();-+// Set the URL and other optionscurl_setopt($ch, CURLOPT_URL, $webhook_url);curl_setopt($ch, CURLOPT_POST, 1);diff --git a/endpoints/notifications/testemailnotifications.php b/endpoints/notifications/testemailnotifications.phpindex 654bb85..266411a 100644--- a/endpoints/notifications/testemailnotifications.php+++ b/endpoints/notifications/testemailnotifications.php@@ -45,7 +45,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {$fromEmail = $data["fromemail"] ? $data['fromemail'] : "[email protected]";$mail = new PHPMailer(true);- $mail->CharSet="UTF-8";+ $mail->CharSet = "UTF-8";$mail->isSMTP();$mail->Host = $smtpAddress;@@ -83,4 +83,4 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {}}-?>+?>\ No newline at end of filediff --git a/endpoints/notifications/testgotifynotifications.php b/endpoints/notifications/testgotifynotifications.phpindex 50a594c..88e5a56 100644--- a/endpoints/notifications/testgotifynotifications.php+++ b/endpoints/notifications/testgotifynotifications.php@@ -28,7 +28,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {$priority = 5;$url = $data["gotify_url"];- $token = $data["token"];+ $token = $data["token"];$ch = curl_init();diff --git a/endpoints/notifications/testntfynotifications.php b/endpoints/notifications/testntfynotifications.phpindex da0d29f..1f7efb0 100644--- a/endpoints/notifications/testntfynotifications.php+++ b/endpoints/notifications/testntfynotifications.php@@ -26,9 +26,9 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {$host = rtrim($data["host"], '/');$topic = $data["topic"];$headers = json_decode($data["headers"], true);- $customheaders = array_map(function($key, $value) {+ $customheaders = array_map(function ($key, $value) {return "$key: $value";- }, array_keys($headers), $headers);+ }, array_keys($headers), $headers);$url = "$host/$topic";diff --git a/endpoints/notifications/testwebhooknotifications.php b/endpoints/notifications/testwebhooknotifications.phpindex 0543d56..221c2fd 100644--- a/endpoints/notifications/testwebhooknotifications.php+++ b/endpoints/notifications/testwebhooknotifications.php@@ -46,7 +46,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {// Execute the request$response = curl_exec($ch);-+// Close the cURL sessioncurl_close($ch);diff --git a/endpoints/payments/add.php b/endpoints/payments/add.phpindex 165b292..6a674ac 100644--- a/endpoints/payments/add.php+++ b/endpoints/payments/add.php@@ -1,217 +1,222 @@<?php- error_reporting(E_ERROR | E_PARSE);- require_once '../../includes/connect_endpoint.php';- require_once '../../includes/inputvalidation.php';- require_once '../../includes/getsettings.php';-- function sanitizeFilename($filename) {- $filename = preg_replace("/[^a-zA-Z0-9\s]/", "", $filename);- $filename = str_replace(" ", "-", $filename);- $filename = str_replace(".", "", $filename);- return $filename;- }-- function validateFileExtension($fileExtension) {- $allowedExtensions = ['png', 'jpg', 'jpeg', 'gif', 'jtif', 'webp'];- return in_array($fileExtension, $allowedExtensions);- }+error_reporting(E_ERROR | E_PARSE);+require_once '../../includes/connect_endpoint.php';+require_once '../../includes/inputvalidation.php';+require_once '../../includes/getsettings.php';++function sanitizeFilename($filename)+{+ $filename = preg_replace("/[^a-zA-Z0-9\s]/", "", $filename);+ $filename = str_replace(" ", "-", $filename);+ $filename = str_replace(".", "", $filename);+ return $filename;+}++function validateFileExtension($fileExtension)+{+ $allowedExtensions = ['png', 'jpg', 'jpeg', 'gif', 'jtif', 'webp'];+ return in_array($fileExtension, $allowedExtensions);+}++function getLogoFromUrl($url, $uploadDir, $name, $i18n, $settings)+{++ $ch = curl_init($url);+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);++ $imageData = curl_exec($ch);++ if ($imageData !== false) {+ $timestamp = time();+ $fileName = $timestamp . '-payments-' . sanitizeFilename($name) . '.png';+ $uploadDir = '../../images/uploads/logos/';+ $uploadFile = $uploadDir . $fileName;- function getLogoFromUrl($url, $uploadDir, $name) {-- $ch = curl_init($url);- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);-- $imageData = curl_exec($ch);-- if ($imageData !== false) {- $timestamp = time();- $fileName = $timestamp . '-payments-' . sanitizeFilename($name) . '.png';- $uploadDir = '../../images/uploads/logos/';- $uploadFile = $uploadDir . $fileName;-- if (saveLogo($imageData, $uploadFile, $name)) {- return $fileName;- } else {- echo translate('error_fetching_image', $i18n) . ": " . curl_error($ch);- return "";- }-+ if (saveLogo($imageData, $uploadFile, $name, $settings)) {curl_close($ch);+ return $fileName;} else {+ curl_close($ch);echo translate('error_fetching_image', $i18n) . ": " . curl_error($ch);return "";}+ } else {+ echo translate('error_fetching_image', $i18n) . ": " . curl_error($ch);+ return "";}+}++function saveLogo($imageData, $uploadFile, $name, $settings)+{+ $image = imagecreatefromstring($imageData);+ $removeBackground = isset($settings['removeBackground']) && $settings['removeBackground'] === 'true';+ if ($image !== false) {+ $tempFile = tempnam(sys_get_temp_dir(), 'logo');+ imagepng($image, $tempFile);+ imagedestroy($image);++ $imagick = new Imagick($tempFile);+ if ($removeBackground) {+ $fuzz = Imagick::getQuantum() * 0.1; // 10%+ $imagick->transparentPaintImage("rgb(247, 247, 247)", 0, $fuzz, false);+ }+ $imagick->setImageFormat('png');+ $imagick->writeImage($uploadFile);- function saveLogo($imageData, $uploadFile, $name) {- $image = imagecreatefromstring($imageData);- $removeBackground = isset($settings['removeBackground']) && $settings['removeBackground'] === 'true';- if ($image !== false) {- $tempFile = tempnam(sys_get_temp_dir(), 'logo');- imagepng($image, $tempFile);- imagedestroy($image);+ $imagick->clear();+ $imagick->destroy();+ unlink($tempFile);- $imagick = new Imagick($tempFile);- if ($removeBackground) {- $fuzz = Imagick::getQuantum() * 0.1; // 10%- $imagick->transparentPaintImage("rgb(247, 247, 247)", 0, $fuzz, false);+ return true;+ } else {+ return false;+ }+}++function resizeAndUploadLogo($uploadedFile, $uploadDir, $name)+{+ $targetWidth = 70;+ $targetHeight = 48;++ $timestamp = time();+ $originalFileName = $uploadedFile['name'];+ $fileExtension = pathinfo($originalFileName, PATHINFO_EXTENSION);+ $fileExtension = validateFileExtension($fileExtension) ? $fileExtension : 'png';+ $fileName = $timestamp . '-payments-' . sanitizeFilename($name) . '.' . $fileExtension;+ $uploadFile = $uploadDir . $fileName;++ if (move_uploaded_file($uploadedFile['tmp_name'], $uploadFile)) {+ $fileInfo = getimagesize($uploadFile);++ if ($fileInfo !== false) {+ $width = $fileInfo[0];+ $height = $fileInfo[1];++ // Load the image based on its format+ if ($fileExtension === 'png') {+ $image = imagecreatefrompng($uploadFile);+ } elseif ($fileExtension === 'jpg' || $fileExtension === 'jpeg') {+ $image = imagecreatefromjpeg($uploadFile);+ } elseif ($fileExtension === 'gif') {+ $image = imagecreatefromgif($uploadFile);+ } elseif ($fileExtension === 'webp') {+ $image = imagecreatefromwebp($uploadFile);+ } else {+ // Handle other image formats as needed+ return "";}- $imagick->setImageFormat('png');- $imagick->writeImage($uploadFile);- $imagick->clear();- $imagick->destroy();- unlink($tempFile);+ // Enable alpha channel (transparency) for PNG images+ if ($fileExtension === 'png') {+ imagesavealpha($image, true);+ }- return true;- } else {- return false;- }- }+ $newWidth = $width;+ $newHeight = $height;- function resizeAndUploadLogo($uploadedFile, $uploadDir, $name) {- $targetWidth = 70;- $targetHeight = 48;-- $timestamp = time();- $originalFileName = $uploadedFile['name'];- $fileExtension = pathinfo($originalFileName, PATHINFO_EXTENSION);- $fileExtension = validateFileExtension($fileExtension) ? $fileExtension : 'png';- $fileName = $timestamp . '-payments-' . sanitizeFilename($name) . '.' . $fileExtension;- $uploadFile = $uploadDir . $fileName;-- if (move_uploaded_file($uploadedFile['tmp_name'], $uploadFile)) {- $fileInfo = getimagesize($uploadFile);-- if ($fileInfo !== false) {- $width = $fileInfo[0];- $height = $fileInfo[1];-- // Load the image based on its format- if ($fileExtension === 'png') {- $image = imagecreatefrompng($uploadFile);- } elseif ($fileExtension === 'jpg' || $fileExtension === 'jpeg') {- $image = imagecreatefromjpeg($uploadFile);- } elseif ($fileExtension === 'gif') {- $image = imagecreatefromgif($uploadFile);- } elseif ($fileExtension === 'webp') {- $image = imagecreatefromwebp($uploadFile);- } else {- // Handle other image formats as needed- return "";- }-- // Enable alpha channel (transparency) for PNG images- if ($fileExtension === 'png') {- imagesavealpha($image, true);- }-- $newWidth = $width;- $newHeight = $height;-- if ($width > $targetWidth) {- $newWidth = $targetWidth;- $newHeight = ($targetWidth / $width) * $height;- }-- if ($newHeight > $targetHeight) {- $newWidth = ($targetHeight / $newHeight) * $newWidth;- $newHeight = $targetHeight;- }-- $resizedImage = imagecreatetruecolor($newWidth, $newHeight);- imagesavealpha($resizedImage, true);- $transparency = imagecolorallocatealpha($resizedImage, 0, 0, 0, 127);- imagefill($resizedImage, 0, 0, $transparency);- imagecopyresampled($resizedImage, $image, 0, 0, 0, 0, $newWidth, $newHeight, $width, $height);-- if ($fileExtension === 'png') {- imagepng($resizedImage, $uploadFile);- } elseif ($fileExtension === 'jpg' || $fileExtension === 'jpeg') {- imagejpeg($resizedImage, $uploadFile);- } elseif ($fileExtension === 'gif') {- imagegif($resizedImage, $uploadFile);- } elseif ($fileExtension === 'webp') {- imagewebp($resizedImage, $uploadFile);- } else {- return "";- }-- imagedestroy($image);- imagedestroy($resizedImage);- return $fileName;+ if ($width > $targetWidth) {+ $newWidth = $targetWidth;+ $newHeight = ($targetWidth / $width) * $height;+ }++ if ($newHeight > $targetHeight) {+ $newWidth = ($targetHeight / $newHeight) * $newWidth;+ $newHeight = $targetHeight;}++ $resizedImage = imagecreatetruecolor($newWidth, $newHeight);+ imagesavealpha($resizedImage, true);+ $transparency = imagecolorallocatealpha($resizedImage, 0, 0, 0, 127);+ imagefill($resizedImage, 0, 0, $transparency);+ imagecopyresampled($resizedImage, $image, 0, 0, 0, 0, $newWidth, $newHeight, $width, $height);++ if ($fileExtension === 'png') {+ imagepng($resizedImage, $uploadFile);+ } elseif ($fileExtension === 'jpg' || $fileExtension === 'jpeg') {+ imagejpeg($resizedImage, $uploadFile);+ } elseif ($fileExtension === 'gif') {+ imagegif($resizedImage, $uploadFile);+ } elseif ($fileExtension === 'webp') {+ imagewebp($resizedImage, $uploadFile);+ } else {+ return "";+ }++ imagedestroy($image);+ imagedestroy($resizedImage);+ return $fileName;}-- return "";}- if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {- if ($_SERVER["REQUEST_METHOD"] === "POST") {- $enabled = 1;- $name = validate($_POST["paymentname"]);- $iconUrl = validate($_POST['icon-url']);-- if ($name === "" || ($iconUrl === "" && empty($_FILES['paymenticon']['name']))) {- $response = [- "success" => false,- "errorMessage" => translate('fill_all_fields', $i18n)- ];- echo json_encode($response);- exit();- }+ return "";+}++if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {+ if ($_SERVER["REQUEST_METHOD"] === "POST") {+ $enabled = 1;+ $name = validate($_POST["paymentname"]);+ $iconUrl = validate($_POST['icon-url']);++ if ($name === "" || ($iconUrl === "" && empty($_FILES['paymenticon']['name']))) {+ $response = [+ "success" => false,+ "errorMessage" => translate('fill_all_fields', $i18n)+ ];+ echo json_encode($response);+ exit();+ }-- $icon = "";- if($iconUrl !== "") {- $icon = getLogoFromUrl($iconUrl, '../../images/uploads/logos/', $name);- } else {- if (!empty($_FILES['paymenticon']['name'])) {- $fileType = mime_content_type($_FILES['paymenticon']['tmp_name']);- if (strpos($fileType, 'image') === false) {- $response = [- "success" => false,- "errorMessage" => translate('fill_all_fields', $i18n)- ];- echo json_encode($response);- exit();- }- $icon = resizeAndUploadLogo($_FILES['paymenticon'], '../../images/uploads/logos/', $name);+ $icon = "";++ if ($iconUrl !== "") {+ $icon = getLogoFromUrl($iconUrl, '../../images/uploads/logos/', $name, $i18n, $settings);+ } else {+ if (!empty($_FILES['paymenticon']['name'])) {+ $fileType = mime_content_type($_FILES['paymenticon']['tmp_name']);+ if (strpos($fileType, 'image') === false) {+ $response = [+ "success" => false,+ "errorMessage" => translate('fill_all_fields', $i18n)+ ];+ echo json_encode($response);+ exit();}+ $icon = resizeAndUploadLogo($_FILES['paymenticon'], '../../images/uploads/logos/', $name);}+ }- // Get the maximum existing ID- $stmt = $db->prepare("SELECT MAX(id) as maxID FROM payment_methods");- $result = $stmt->execute();- $row = $result->fetchArray(SQLITE3_ASSOC);- $maxID = $row['maxID'];-- // Ensure the new ID is greater than 31- $newID = max($maxID + 1, 32);-- // Insert the new record with the new ID- $sql = "INSERT INTO payment_methods (id, name, icon, enabled, user_id) VALUES (:id, :name, :icon, :enabled, :userId)";- $stmt = $db->prepare($sql);-- $stmt->bindParam(':id', $newID, SQLITE3_INTEGER);- $stmt->bindParam(':name', $name, SQLITE3_TEXT);- $stmt->bindParam(':icon', $icon, SQLITE3_TEXT);- $stmt->bindParam(':enabled', $enabled, SQLITE3_INTEGER);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);-- if ($stmt->execute()) {- $success['success'] = true;- $success['message'] = translate('payment_method_added_successfuly', $i18n);- $json = json_encode($success);- header('Content-Type: application/json');- echo $json;- exit();- } else {- echo translate('error', $i18n) . ": " . $db->lastErrorMsg();- }+ // Get the maximum existing ID+ $stmt = $db->prepare("SELECT MAX(id) as maxID FROM payment_methods");+ $result = $stmt->execute();+ $row = $result->fetchArray(SQLITE3_ASSOC);+ $maxID = $row['maxID'];++ // Ensure the new ID is greater than 31+ $newID = max($maxID + 1, 32);++ // Insert the new record with the new ID+ $sql = "INSERT INTO payment_methods (id, name, icon, enabled, user_id) VALUES (:id, :name, :icon, :enabled, :userId)";+ $stmt = $db->prepare($sql);++ $stmt->bindParam(':id', $newID, SQLITE3_INTEGER);+ $stmt->bindParam(':name', $name, SQLITE3_TEXT);+ $stmt->bindParam(':icon', $icon, SQLITE3_TEXT);+ $stmt->bindParam(':enabled', $enabled, SQLITE3_INTEGER);+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);++ if ($stmt->execute()) {+ $success['success'] = true;+ $success['message'] = translate('payment_method_added_successfuly', $i18n);+ $json = json_encode($success);+ header('Content-Type: application/json');+ echo $json;+ exit();+ } else {+ echo translate('error', $i18n) . ": " . $db->lastErrorMsg();}}- $db->close();+}+$db->close();?>\ No newline at end of filediff --git a/endpoints/payments/delete.php b/endpoints/payments/delete.phpindex 010f9af..bee5264 100644--- a/endpoints/payments/delete.php+++ b/endpoints/payments/delete.php@@ -27,4 +27,4 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {}$db->close();-?>+?>\ No newline at end of filediff --git a/endpoints/payments/get.php b/endpoints/payments/get.phpindex 5ff6af4..f6348db 100644--- a/endpoints/payments/get.php+++ b/endpoints/payments/get.php@@ -6,12 +6,12 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {$paymentsInUseQuery = $db->prepare('SELECT id FROM payment_methods WHERE id IN (SELECT DISTINCT payment_method_id FROM subscriptions) AND user_id = :userId');$paymentsInUseQuery->bindParam(':userId', $userId, SQLITE3_INTEGER);$result = $paymentsInUseQuery->execute();-+$paymentsInUse = [];while ($row = $result->fetchArray(SQLITE3_ASSOC)) {$paymentsInUse[] = $row['id'];}-+$sql = "SELECT * FROM payment_methods WHERE user_id = :userId";$stmt = $db->prepare($sql);$stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);@@ -20,7 +20,7 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {if ($result) {$payments = array();while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $payments[] = $row;+ $payments[] = $row;}} else {http_response_code(500);@@ -32,26 +32,25 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {$paymentIconFolder = (strpos($payment['icon'], 'images/uploads/icons/') !== false) ? "" : "images/uploads/logos/";$inUse = in_array($payment['id'], $paymentsInUse);?>- <div class="payments-payment"- data-enabled="<?= $payment['enabled']; ?>"- data-in-use="<?= $inUse ? 'yes' : 'no' ?>"- data-paymentid="<?= $payment['id'] ?>"- title="<?= $inUse ? translate('cant_delete_payment_method_in_use', $i18n) : ($payment['enabled'] ? translate('disable', $i18n) : translate('enable', $i18n)) ?>"- onClick="togglePayment(<?= $payment['id'] ?>)">- <img src="<?= $paymentIconFolder.$payment['icon'] ?>" alt="Logo" />- <span class="payment-name">- <?= $payment['name'] ?>- </span>- <?php- if (!$inUse) {- ?>- <div class="delete-payment-method" title="<?= translate('delete', $i18n) ?>" data-paymentid="<?= $payment['id'] ?>" onclick="deletePaymentMethod(<?= $payment['id'] ?>)">- x- </div>- <?php- }+ <div class="payments-payment" data-enabled="<?= $payment['enabled']; ?>" data-in-use="<?= $inUse ? 'yes' : 'no' ?>"+ data-paymentid="<?= $payment['id'] ?>"+ title="<?= $inUse ? translate('cant_delete_payment_method_in_use', $i18n) : ($payment['enabled'] ? translate('disable', $i18n) : translate('enable', $i18n)) ?>"+ onClick="togglePayment(<?= $payment['id'] ?>)">+ <img src="<?= $paymentIconFolder . $payment['icon'] ?>" alt="Logo" />+ <span class="payment-name">+ <?= $payment['name'] ?>+ </span>+ <?php+ if (!$inUse) {?>- </div>+ <div class="delete-payment-method" title="<?= translate('delete', $i18n) ?>" data-paymentid="<?= $payment['id'] ?>"+ onclick="deletePaymentMethod(<?= $payment['id'] ?>)">+ x+ </div>+ <?php+ }+ ?>+ </div><?php}} else {diff --git a/endpoints/payments/payment.php b/endpoints/payments/payment.phpindex 19a8de4..e377afc 100644--- a/endpoints/payments/payment.php+++ b/endpoints/payments/payment.php@@ -51,5 +51,5 @@ if ($resultUpdate) {die(json_encode(["success" => false,- "message" => tranlate('failed_update_payment', $i18n)+ "message" => translate('failed_update_payment', $i18n)]));diff --git a/endpoints/payments/search.php b/endpoints/payments/search.phpindex 8deb47f..b88a08b 100644--- a/endpoints/payments/search.php+++ b/endpoints/payments/search.php@@ -1,83 +1,84 @@<?php- if (isset($_GET['search'])) {- $searchTerm = urlencode($_GET['search'] . " logo");+if (isset($_GET['search'])) {+ $searchTerm = urlencode($_GET['search'] . " logo");- $url = "https://www.google.com/search?q={$searchTerm}&tbm=isch";- $backupUrl = "https://search.brave.com/search?q={$searchTerm}";+ $url = "https://www.google.com/search?q={$searchTerm}&tbm=isch";+ $backupUrl = "https://search.brave.com/search?q={$searchTerm}";+ $ch = curl_init();+ curl_setopt($ch, CURLOPT_URL, $url);+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);+ curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);++ // Convert all environment variable keys to lowercase+ $envVars = array_change_key_case($_SERVER, CASE_LOWER);++ // Check for http_proxy or https_proxy environment variables+ $httpProxy = isset($envVars['http_proxy']) ? $envVars['http_proxy'] : null;+ $httpsProxy = isset($envVars['https_proxy']) ? $envVars['https_proxy'] : null;++ if (!empty($httpProxy)) {+ curl_setopt($ch, CURLOPT_PROXY, $httpProxy);+ } elseif (!empty($httpsProxy)) {+ curl_setopt($ch, CURLOPT_PROXY, $httpsProxy);+ }++ $response = curl_exec($ch);++ if ($response === false) {+ // If cURL fails to access google images, use brave image search as a backup$ch = curl_init();- curl_setopt($ch, CURLOPT_URL, $url);+ curl_setopt($ch, CURLOPT_URL, $backupUrl);curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);-- // Convert all environment variable keys to lowercase$envVars = array_change_key_case($_SERVER, CASE_LOWER);-- // Check for http_proxy or https_proxy environment variables$httpProxy = isset($envVars['http_proxy']) ? $envVars['http_proxy'] : null;$httpsProxy = isset($envVars['https_proxy']) ? $envVars['https_proxy'] : null;-if (!empty($httpProxy)) {curl_setopt($ch, CURLOPT_PROXY, $httpProxy);} elseif (!empty($httpsProxy)) {curl_setopt($ch, CURLOPT_PROXY, $httpsProxy);}-$response = curl_exec($ch);-if ($response === false) {- // If cURL fails to access google images, use brave image search as a backup- $ch = curl_init();- curl_setopt($ch, CURLOPT_URL, $backupUrl);- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);- curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);- $envVars = array_change_key_case($_SERVER, CASE_LOWER);- $httpProxy = isset($envVars['http_proxy']) ? $envVars['http_proxy'] : null;- $httpsProxy = isset($envVars['https_proxy']) ? $envVars['https_proxy'] : null;- if (!empty($httpProxy)) {- curl_setopt($ch, CURLOPT_PROXY, $httpProxy);- } elseif (!empty($httpsProxy)) {- curl_setopt($ch, CURLOPT_PROXY, $httpsProxy);- }- $response = curl_exec($ch);- if ($response === false) {- echo json_encode(['error' => 'Failed to fetch data from Google.']);- } else {- $imageUrls = extractImageUrlsFromPage($response);- header('Content-Type: application/json');- echo json_encode(['imageUrls' => $imageUrls]);- }+ echo json_encode(['error' => 'Failed to fetch data from Google.']);} else {- // Parse the HTML response to extract image URLs$imageUrls = extractImageUrlsFromPage($response);-- // Pass the image URLs to the clientheader('Content-Type: application/json');echo json_encode(['imageUrls' => $imageUrls]);}-- curl_close($ch);} else {- echo json_encode(['error' => 'Invalid request.']);+ // Parse the HTML response to extract image URLs+ $imageUrls = extractImageUrlsFromPage($response);++ // Pass the image URLs to the client+ header('Content-Type: application/json');+ echo json_encode(['imageUrls' => $imageUrls]);}- function extractImageUrlsFromPage($html) {- $imageUrls = [];+ curl_close($ch);+} else {+ echo json_encode(['error' => 'Invalid request.']);+}++function extractImageUrlsFromPage($html)+{+ $imageUrls = [];- $doc = new DOMDocument();- @$doc->loadHTML($html);+ $doc = new DOMDocument();+ @$doc->loadHTML($html);- $imgTags = $doc->getElementsByTagName('img');- foreach ($imgTags as $imgTag) {- $src = $imgTag->getAttribute('src');- if (!strstr($imgTag->getAttribute('class'), "favicon") && !strstr($imgTag->getAttribute('class'), "logo")) {- if (filter_var($src, FILTER_VALIDATE_URL)) {- $imageUrls[] = $src;- }+ $imgTags = $doc->getElementsByTagName('img');+ foreach ($imgTags as $imgTag) {+ $src = $imgTag->getAttribute('src');+ if (!strstr($imgTag->getAttribute('class'), "favicon") && !strstr($imgTag->getAttribute('class'), "logo")) {+ if (filter_var($src, FILTER_VALIDATE_URL)) {+ $imageUrls[] = $src;}}-- return $imageUrls;}-++ return $imageUrls;+}+?>\ No newline at end of filediff --git a/endpoints/payments/sort.php b/endpoints/payments/sort.phpindex a217beb..7fc5a22 100644--- a/endpoints/payments/sort.php+++ b/endpoints/payments/sort.php@@ -20,7 +20,7 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {"success" => true,"message" => translate("sort_order_saved", $i18n)];- echo json_encode($response);+ echo json_encode($response);} else {$response = ["success" => false,diff --git a/endpoints/settings/colortheme.php b/endpoints/settings/colortheme.phpindex 00b9c1e..c8632ac 100644--- a/endpoints/settings/colortheme.php+++ b/endpoints/settings/colortheme.php@@ -1,35 +1,35 @@<?php- require_once '../../includes/connect_endpoint.php';-- if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {- die(json_encode([- "success" => false,- "message" => translate('session_expired', $i18n)- ]));- }+require_once '../../includes/connect_endpoint.php';++if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {+ die(json_encode([+ "success" => false,+ "message" => translate('session_expired', $i18n)+ ]));+}++if ($_SERVER["REQUEST_METHOD"] === "POST") {+ $postData = file_get_contents("php://input");+ $data = json_decode($postData, true);- if ($_SERVER["REQUEST_METHOD"] === "POST") {- $postData = file_get_contents("php://input");- $data = json_decode($postData, true);-- $color = $data['color'];+ $color = $data['color'];- $stmt = $db->prepare('UPDATE settings SET color_theme = :color WHERE user_id = :userId');- $stmt->bindParam(':color', $color, SQLITE3_TEXT);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);+ $stmt = $db->prepare('UPDATE settings SET color_theme = :color WHERE user_id = :userId');+ $stmt->bindParam(':color', $color, SQLITE3_TEXT);+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);- if ($stmt->execute()) {- die(json_encode([- "success" => true,- "message" => translate("success", $i18n)- ]));- } else {- die(json_encode([- "success" => false,- "message" => translate("error", $i18n)- ]));- }+ if ($stmt->execute()) {+ die(json_encode([+ "success" => true,+ "message" => translate("success", $i18n)+ ]));+ } else {+ die(json_encode([+ "success" => false,+ "message" => translate("error", $i18n)+ ]));}+}?>\ No newline at end of filediff --git a/endpoints/settings/convert_currency.php b/endpoints/settings/convert_currency.phpindex 0f04d56..a847016 100644--- a/endpoints/settings/convert_currency.php+++ b/endpoints/settings/convert_currency.php@@ -11,7 +11,7 @@ if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {if ($_SERVER["REQUEST_METHOD"] === "POST") {$postData = file_get_contents("php://input");$data = json_decode($postData, true);-+$convert_currency = $data['value'];$stmt = $db->prepare('UPDATE settings SET convert_currency = :convert_currency WHERE user_id = :userId');diff --git a/endpoints/settings/customtheme.php b/endpoints/settings/customtheme.phpindex 4d05a10..2703041 100644--- a/endpoints/settings/customtheme.php+++ b/endpoints/settings/customtheme.php@@ -1,42 +1,42 @@<?php- require_once '../../includes/connect_endpoint.php';+require_once '../../includes/connect_endpoint.php';- if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {+if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {+ die(json_encode([+ "success" => false,+ "message" => translate('session_expired', $i18n)+ ]));+}++if ($_SERVER["REQUEST_METHOD"] === "POST") {+ $postData = file_get_contents("php://input");+ $data = json_decode($postData, true);++ $main_color = $data['mainColor'];+ $accent_color = $data['accentColor'];+ $hover_color = $data['hoverColor'];++ $stmt = $db->prepare('DELETE FROM custom_colors');+ $stmt->execute();++ $stmt = $db->prepare('INSERT INTO custom_colors (main_color, accent_color, hover_color, user_id) VALUES (:main_color, :accent_color, :hover_color, :userId)');+ $stmt->bindParam(':main_color', $main_color, SQLITE3_TEXT);+ $stmt->bindParam(':accent_color', $accent_color, SQLITE3_TEXT);+ $stmt->bindParam(':hover_color', $hover_color, SQLITE3_TEXT);+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);++ if ($stmt->execute()) {+ die(json_encode([+ "success" => true,+ "message" => translate("success", $i18n)+ ]));+ } else {die(json_encode(["success" => false,- "message" => translate('session_expired', $i18n)+ "message" => translate("error", $i18n)]));}-- if ($_SERVER["REQUEST_METHOD"] === "POST") {- $postData = file_get_contents("php://input");- $data = json_decode($postData, true);-- $main_color = $data['mainColor'];- $accent_color = $data['accentColor'];- $hover_color = $data['hoverColor'];-- $stmt = $db->prepare('DELETE FROM custom_colors');- $stmt->execute();-- $stmt = $db->prepare('INSERT INTO custom_colors (main_color, accent_color, hover_color, user_id) VALUES (:main_color, :accent_color, :hover_color, :userId)');- $stmt->bindParam(':main_color', $main_color, SQLITE3_TEXT);- $stmt->bindParam(':accent_color', $accent_color, SQLITE3_TEXT);- $stmt->bindParam(':hover_color', $hover_color, SQLITE3_TEXT);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);-- if ($stmt->execute()) {- die(json_encode([- "success" => true,- "message" => translate("success", $i18n)- ]));- } else {- die(json_encode([- "success" => false,- "message" => translate("error", $i18n)- ]));- }- }+}?>\ No newline at end of filediff --git a/endpoints/settings/hide_disabled.php b/endpoints/settings/hide_disabled.phpindex 37da598..bf07b42 100644--- a/endpoints/settings/hide_disabled.php+++ b/endpoints/settings/hide_disabled.php@@ -11,7 +11,7 @@ if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {if ($_SERVER["REQUEST_METHOD"] === "POST") {$postData = file_get_contents("php://input");$data = json_decode($postData, true);-+$hide_disabled = $data['value'];$stmt = $db->prepare('UPDATE settings SET hide_disabled = :hide_disabled WHERE user_id = :userId');diff --git a/endpoints/settings/monthly_price.php b/endpoints/settings/monthly_price.phpindex 8894a99..a3410ce 100644--- a/endpoints/settings/monthly_price.php+++ b/endpoints/settings/monthly_price.php@@ -11,7 +11,7 @@ if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {if ($_SERVER["REQUEST_METHOD"] === "POST") {$postData = file_get_contents("php://input");$data = json_decode($postData, true);-+$monthly_price = $data['value'];$stmt = $db->prepare('UPDATE settings SET monthly_price = :monthly_price WHERE user_id = :userId');diff --git a/endpoints/settings/remove_background.php b/endpoints/settings/remove_background.phpindex 2eabd30..92badd4 100644--- a/endpoints/settings/remove_background.php+++ b/endpoints/settings/remove_background.php@@ -11,7 +11,7 @@ if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {if ($_SERVER["REQUEST_METHOD"] === "POST") {$postData = file_get_contents("php://input");$data = json_decode($postData, true);-+$remove_background = $data['value'];$stmt = $db->prepare('UPDATE settings SET remove_background = :remove_background WHERE user_id = :userId');diff --git a/endpoints/settings/resettheme.php b/endpoints/settings/resettheme.phpindex f3e38c9..8204c9d 100644--- a/endpoints/settings/resettheme.php+++ b/endpoints/settings/resettheme.php@@ -1,29 +1,29 @@<?php- require_once '../../includes/connect_endpoint.php';-- if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {+require_once '../../includes/connect_endpoint.php';++if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {+ die(json_encode([+ "success" => false,+ "message" => translate('session_expired', $i18n)+ ]));+}++if ($_SERVER["REQUEST_METHOD"] === "DELETE") {+ $stmt = $db->prepare('DELETE FROM custom_colors WHERE user_id = :userId');+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);++ if ($stmt->execute()) {+ die(json_encode([+ "success" => true,+ "message" => translate("success", $i18n)+ ]));+ } else {die(json_encode(["success" => false,- "message" => translate('session_expired', $i18n)+ "message" => translate("error", $i18n)]));}-- if ($_SERVER["REQUEST_METHOD"] === "DELETE") {- $stmt = $db->prepare('DELETE FROM custom_colors WHERE user_id = :userId');- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);-- if ($stmt->execute()) {- die(json_encode([- "success" => true,- "message" => translate("success", $i18n)- ]));- } else {- die(json_encode([- "success" => false,- "message" => translate("error", $i18n)- ]));- }- }+}?>\ No newline at end of filediff --git a/endpoints/settings/theme.php b/endpoints/settings/theme.phpindex 46ca9ce..bcc1967 100644--- a/endpoints/settings/theme.php+++ b/endpoints/settings/theme.php@@ -11,7 +11,7 @@ if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {if ($_SERVER["REQUEST_METHOD"] === "POST") {$postData = file_get_contents("php://input");$data = json_decode($postData, true);-+$theme = $data['theme'];$stmt = $db->prepare('UPDATE settings SET dark_theme = :theme WHERE user_id = :userId');diff --git a/endpoints/subscription/add.php b/endpoints/subscription/add.phpindex 5fb3f66..222e801 100644--- a/endpoints/subscription/add.php+++ b/endpoints/subscription/add.php@@ -1,240 +1,246 @@<?php- error_reporting(E_ERROR | E_PARSE);- require_once '../../includes/connect_endpoint.php';- require_once '../../includes/inputvalidation.php';- require_once '../../includes/getsettings.php';-- function sanitizeFilename($filename) {- $filename = preg_replace("/[^a-zA-Z0-9\s]/", "", $filename);- $filename = str_replace(" ", "-", $filename);- $filename = str_replace(".", "", $filename);- return $filename;- }+error_reporting(E_ERROR | E_PARSE);+require_once '../../includes/connect_endpoint.php';+require_once '../../includes/inputvalidation.php';+require_once '../../includes/getsettings.php';- function validateFileExtension($fileExtension) {- $allowedExtensions = ['png', 'jpg', 'jpeg', 'gif', 'webp'];- return in_array($fileExtension, $allowedExtensions);- }+function sanitizeFilename($filename)+{+ $filename = preg_replace("/[^a-zA-Z0-9\s]/", "", $filename);+ $filename = str_replace(" ", "-", $filename);+ $filename = str_replace(".", "", $filename);+ return $filename;+}- function getLogoFromUrl($url, $uploadDir, $name, $settings) {-- $ch = curl_init($url);- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);-- $imageData = curl_exec($ch);-- if ($imageData !== false) {- $timestamp = time();- $fileName = $timestamp . '-' . sanitizeFilename($name) . '.png';- $uploadDir = '../../images/uploads/logos/';- $uploadFile = $uploadDir . $fileName;-- if (saveLogo($imageData, $uploadFile, $name, $settings)) {- return $fileName;- } else {- echo translate('error_fetching_image', $i18n) . ": " . curl_error($ch);- return "";- }-+function validateFileExtension($fileExtension)+{+ $allowedExtensions = ['png', 'jpg', 'jpeg', 'gif', 'webp'];+ return in_array($fileExtension, $allowedExtensions);+}++function getLogoFromUrl($url, $uploadDir, $name, $settings, $i18n)+{++ $ch = curl_init($url);+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);++ $imageData = curl_exec($ch);++ if ($imageData !== false) {+ $timestamp = time();+ $fileName = $timestamp . '-' . sanitizeFilename($name) . '.png';+ $uploadDir = '../../images/uploads/logos/';+ $uploadFile = $uploadDir . $fileName;++ if (saveLogo($imageData, $uploadFile, $name, $settings)) {curl_close($ch);+ return $fileName;} else {+ curl_close($ch);echo translate('error_fetching_image', $i18n) . ": " . curl_error($ch);return "";}++ } else {+ echo translate('error_fetching_image', $i18n) . ": " . curl_error($ch);+ return "";}+}- function saveLogo($imageData, $uploadFile, $name, $settings) {- $image = imagecreatefromstring($imageData);- $removeBackground = isset($settings['removeBackground']) && $settings['removeBackground'] === 'true';- if ($image !== false) {- $tempFile = tempnam(sys_get_temp_dir(), 'logo');- imagepng($image, $tempFile);- imagedestroy($image);+function saveLogo($imageData, $uploadFile, $name, $settings)+{+ $image = imagecreatefromstring($imageData);+ $removeBackground = isset($settings['removeBackground']) && $settings['removeBackground'] === 'true';+ if ($image !== false) {+ $tempFile = tempnam(sys_get_temp_dir(), 'logo');+ imagepng($image, $tempFile);+ imagedestroy($image);- $imagick = new Imagick($tempFile);- if ($removeBackground) {- $fuzz = Imagick::getQuantum() * 0.1; // 10%- $imagick->transparentPaintImage("rgb(247, 247, 247)", 0, $fuzz, false);- }- $imagick->setImageFormat('png');- $imagick->writeImage($uploadFile);+ $imagick = new Imagick($tempFile);+ if ($removeBackground) {+ $fuzz = Imagick::getQuantum() * 0.1; // 10%+ $imagick->transparentPaintImage("rgb(247, 247, 247)", 0, $fuzz, false);+ }+ $imagick->setImageFormat('png');+ $imagick->writeImage($uploadFile);- $imagick->clear();- $imagick->destroy();- unlink($tempFile);+ $imagick->clear();+ $imagick->destroy();+ unlink($tempFile);- return true;- } else {- return false;- }+ return true;+ } else {+ return false;}+}- function resizeAndUploadLogo($uploadedFile, $uploadDir, $name, $settings) {- $targetWidth = 135;- $targetHeight = 42;-- $timestamp = time();- $originalFileName = $uploadedFile['name'];- $fileExtension = pathinfo($originalFileName, PATHINFO_EXTENSION);- $fileExtension = validateFileExtension($fileExtension) ? $fileExtension : 'png';- $fileName = $timestamp . '-' . sanitizeFilename($name) . '.' . $fileExtension;- $uploadFile = $uploadDir . $fileName;-- if (move_uploaded_file($uploadedFile['tmp_name'], $uploadFile)) {- $fileInfo = getimagesize($uploadFile);-- if ($fileInfo !== false) {- $width = $fileInfo[0];- $height = $fileInfo[1];-- // Load the image based on its format- if ($fileExtension === 'png') {- $image = imagecreatefrompng($uploadFile);- } elseif ($fileExtension === 'jpg' || $fileExtension === 'jpeg') {- $image = imagecreatefromjpeg($uploadFile);- } elseif ($fileExtension === 'gif') {- $image = imagecreatefromgif($uploadFile);- } elseif ($fileExtension === 'webp') {- $image = imagecreatefromwebp($uploadFile);- } else {- // Handle other image formats as needed- return "";- }-- // Enable alpha channel (transparency) for PNG images- if ($fileExtension === 'png') {- imagesavealpha($image, true);- }-- $newWidth = $width;- $newHeight = $height;-- if ($width > $targetWidth) {- $newWidth = $targetWidth;- $newHeight = ($targetWidth / $width) * $height;- }-- if ($newHeight > $targetHeight) {- $newWidth = ($targetHeight / $newHeight) * $newWidth;- $newHeight = $targetHeight;- }-- $resizedImage = imagecreatetruecolor($newWidth, $newHeight);- imagesavealpha($resizedImage, true);- $transparency = imagecolorallocatealpha($resizedImage, 0, 0, 0, 127);- imagefill($resizedImage, 0, 0, $transparency);- imagecopyresampled($resizedImage, $image, 0, 0, 0, 0, $newWidth, $newHeight, $width, $height);-- if ($fileExtension === 'png') {- imagepng($resizedImage, $uploadFile);- } elseif ($fileExtension === 'jpg' || $fileExtension === 'jpeg') {- imagejpeg($resizedImage, $uploadFile);- } elseif ($fileExtension === 'gif') {- imagegif($resizedImage, $uploadFile);- } elseif ($fileExtension === 'webp') {- imagewebp($resizedImage, $uploadFile);- } else {- return "";- }-- imagedestroy($image);- imagedestroy($resizedImage);-- return $fileName;+function resizeAndUploadLogo($uploadedFile, $uploadDir, $name, $settings)+{+ $targetWidth = 135;+ $targetHeight = 42;++ $timestamp = time();+ $originalFileName = $uploadedFile['name'];+ $fileExtension = pathinfo($originalFileName, PATHINFO_EXTENSION);+ $fileExtension = validateFileExtension($fileExtension) ? $fileExtension : 'png';+ $fileName = $timestamp . '-' . sanitizeFilename($name) . '.' . $fileExtension;+ $uploadFile = $uploadDir . $fileName;++ if (move_uploaded_file($uploadedFile['tmp_name'], $uploadFile)) {+ $fileInfo = getimagesize($uploadFile);++ if ($fileInfo !== false) {+ $width = $fileInfo[0];+ $height = $fileInfo[1];++ // Load the image based on its format+ if ($fileExtension === 'png') {+ $image = imagecreatefrompng($uploadFile);+ } elseif ($fileExtension === 'jpg' || $fileExtension === 'jpeg') {+ $image = imagecreatefromjpeg($uploadFile);+ } elseif ($fileExtension === 'gif') {+ $image = imagecreatefromgif($uploadFile);+ } elseif ($fileExtension === 'webp') {+ $image = imagecreatefromwebp($uploadFile);+ } else {+ // Handle other image formats as needed+ return "";+ }++ // Enable alpha channel (transparency) for PNG images+ if ($fileExtension === 'png') {+ imagesavealpha($image, true);}++ $newWidth = $width;+ $newHeight = $height;++ if ($width > $targetWidth) {+ $newWidth = $targetWidth;+ $newHeight = ($targetWidth / $width) * $height;+ }++ if ($newHeight > $targetHeight) {+ $newWidth = ($targetHeight / $newHeight) * $newWidth;+ $newHeight = $targetHeight;+ }++ $resizedImage = imagecreatetruecolor($newWidth, $newHeight);+ imagesavealpha($resizedImage, true);+ $transparency = imagecolorallocatealpha($resizedImage, 0, 0, 0, 127);+ imagefill($resizedImage, 0, 0, $transparency);+ imagecopyresampled($resizedImage, $image, 0, 0, 0, 0, $newWidth, $newHeight, $width, $height);++ if ($fileExtension === 'png') {+ imagepng($resizedImage, $uploadFile);+ } elseif ($fileExtension === 'jpg' || $fileExtension === 'jpeg') {+ imagejpeg($resizedImage, $uploadFile);+ } elseif ($fileExtension === 'gif') {+ imagegif($resizedImage, $uploadFile);+ } elseif ($fileExtension === 'webp') {+ imagewebp($resizedImage, $uploadFile);+ } else {+ return "";+ }++ imagedestroy($image);+ imagedestroy($resizedImage);++ return $fileName;}-- return "";}- if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {- if ($_SERVER["REQUEST_METHOD"] === "POST") {- $isEdit = isset($_POST['id']) && $_POST['id'] != "";- $name = validate($_POST["name"]);- $price = $_POST['price'];- $currencyId = $_POST["currency_id"];- $frequency = $_POST["frequency"];- $cycle = $_POST["cycle"];- $nextPayment = $_POST["next_payment"];- $paymentMethodId = $_POST["payment_method_id"];- $payerUserId = $_POST["payer_user_id"];- $categoryId = $_POST['category_id'];- $notes = validate($_POST["notes"]);- $url = validate($_POST['url']);- $logoUrl = validate($_POST['logo-url']);- $logo = "";- $notify = isset($_POST['notifications']) ? true : false;- $notifyDaysBefore = $_POST['notify_days_before'];- $inactive = isset($_POST['inactive']) ? true : false;-- if($logoUrl !== "") {- $logo = getLogoFromUrl($logoUrl, '../../images/uploads/logos/', $name, $settings);- } else {- if (!empty($_FILES['logo']['name'])) {- $fileType = mime_content_type($_FILES['logo']['tmp_name']);- if (strpos($fileType, 'image') === false) {- echo translate("fill_all_fields", $i18n);- exit();- }- $logo = resizeAndUploadLogo($_FILES['logo'], '../../images/uploads/logos/', $name, $settings);+ return "";+}++if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {+ if ($_SERVER["REQUEST_METHOD"] === "POST") {+ $isEdit = isset($_POST['id']) && $_POST['id'] != "";+ $name = validate($_POST["name"]);+ $price = $_POST['price'];+ $currencyId = $_POST["currency_id"];+ $frequency = $_POST["frequency"];+ $cycle = $_POST["cycle"];+ $nextPayment = $_POST["next_payment"];+ $paymentMethodId = $_POST["payment_method_id"];+ $payerUserId = $_POST["payer_user_id"];+ $categoryId = $_POST['category_id'];+ $notes = validate($_POST["notes"]);+ $url = validate($_POST['url']);+ $logoUrl = validate($_POST['logo-url']);+ $logo = "";+ $notify = isset($_POST['notifications']) ? true : false;+ $notifyDaysBefore = $_POST['notify_days_before'];+ $inactive = isset($_POST['inactive']) ? true : false;++ if ($logoUrl !== "") {+ $logo = getLogoFromUrl($logoUrl, '../../images/uploads/logos/', $name, $settings, $i18n);+ } else {+ if (!empty($_FILES['logo']['name'])) {+ $fileType = mime_content_type($_FILES['logo']['tmp_name']);+ if (strpos($fileType, 'image') === false) {+ echo translate("fill_all_fields", $i18n);+ exit();}+ $logo = resizeAndUploadLogo($_FILES['logo'], '../../images/uploads/logos/', $name, $settings);}+ }- if (!$isEdit) {- $sql = "INSERT INTO subscriptions (name, logo, price, currency_id, next_payment, cycle, frequency, notes,+ if (!$isEdit) {+ $sql = "INSERT INTO subscriptions (name, logo, price, currency_id, next_payment, cycle, frequency, notes,payment_method_id, payer_user_id, category_id, notify, inactive, url, notify_days_before, user_id)VALUES (:name, :logo, :price, :currencyId, :nextPayment, :cycle, :frequency, :notes,:paymentMethodId, :payerUserId, :categoryId, :notify, :inactive, :url, :notifyDaysBefore, :userId)";- } else {- $id = $_POST['id'];- if ($logo != "") {- $sql = "UPDATE subscriptions SET name = :name, logo = :logo, price = :price, currency_id = :currencyId,+ } else {+ $id = $_POST['id'];+ if ($logo != "") {+ $sql = "UPDATE subscriptions SET name = :name, logo = :logo, price = :price, currency_id = :currencyId,next_payment = :nextPayment, cycle = :cycle, frequency = :frequency, notes = :notes, payment_method_id = :paymentMethodId,payer_user_id = :payerUserId, category_id = :categoryId, notify = :notify, inactive = :inactive,url = :url, notify_days_before = :notifyDaysBefore WHERE id = :id AND user_id = :userId";- } else {- $sql = "UPDATE subscriptions SET name = :name, price = :price, currency_id = :currencyId, next_payment = :nextPayment,+ } else {+ $sql = "UPDATE subscriptions SET name = :name, price = :price, currency_id = :currencyId, next_payment = :nextPayment,cycle = :cycle, frequency = :frequency, notes = :notes, payment_method_id = :paymentMethodId, payer_user_id = :payerUserId,category_id = :categoryId, notify = :notify, inactive = :inactive, url = :url,notify_days_before = :notifyDaysBeforeWHERE id = :id AND user_id = :userId";- }}+ }- $stmt = $db->prepare($sql);- if ($isEdit) {- $stmt->bindParam(':id', $id, SQLITE3_INTEGER);- }- $stmt->bindParam(':name', $name, SQLITE3_TEXT);- if ($logo != "") {- $stmt->bindParam(':logo', $logo, SQLITE3_TEXT);- }- $stmt->bindParam(':price', $price, SQLITE3_FLOAT);- $stmt->bindParam(':currencyId', $currencyId, SQLITE3_INTEGER);- $stmt->bindParam(':nextPayment', $nextPayment, SQLITE3_TEXT);- $stmt->bindParam(':cycle', $cycle, SQLITE3_INTEGER);- $stmt->bindParam(':frequency', $frequency, SQLITE3_INTEGER);- $stmt->bindParam(':notes', $notes, SQLITE3_TEXT);- $stmt->bindParam(':paymentMethodId', $paymentMethodId, SQLITE3_INTEGER);- $stmt->bindParam(':payerUserId', $payerUserId, SQLITE3_INTEGER);- $stmt->bindParam(':categoryId', $categoryId, SQLITE3_INTEGER);- $stmt->bindParam(':notify', $notify, SQLITE3_INTEGER);- $stmt->bindParam(':inactive', $inactive, SQLITE3_INTEGER);- $stmt->bindParam(':url', $url, SQLITE3_TEXT);- $stmt->bindParam(':notifyDaysBefore', $notifyDaysBefore, SQLITE3_INTEGER);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);-- if ($stmt->execute()) {- $success['status'] = "Success";- $text = $isEdit ? "updated" : "added";- $success['message'] = translate('subscription_' . $text . '_successfuly', $i18n);- $json = json_encode($success);- header('Content-Type: application/json');- echo $json;- exit();- } else {- echo translate('error', $i18n) . ": " . $db->lastErrorMsg();- }+ $stmt = $db->prepare($sql);+ if ($isEdit) {+ $stmt->bindParam(':id', $id, SQLITE3_INTEGER);+ }+ $stmt->bindParam(':name', $name, SQLITE3_TEXT);+ if ($logo != "") {+ $stmt->bindParam(':logo', $logo, SQLITE3_TEXT);+ }+ $stmt->bindParam(':price', $price, SQLITE3_FLOAT);+ $stmt->bindParam(':currencyId', $currencyId, SQLITE3_INTEGER);+ $stmt->bindParam(':nextPayment', $nextPayment, SQLITE3_TEXT);+ $stmt->bindParam(':cycle', $cycle, SQLITE3_INTEGER);+ $stmt->bindParam(':frequency', $frequency, SQLITE3_INTEGER);+ $stmt->bindParam(':notes', $notes, SQLITE3_TEXT);+ $stmt->bindParam(':paymentMethodId', $paymentMethodId, SQLITE3_INTEGER);+ $stmt->bindParam(':payerUserId', $payerUserId, SQLITE3_INTEGER);+ $stmt->bindParam(':categoryId', $categoryId, SQLITE3_INTEGER);+ $stmt->bindParam(':notify', $notify, SQLITE3_INTEGER);+ $stmt->bindParam(':inactive', $inactive, SQLITE3_INTEGER);+ $stmt->bindParam(':url', $url, SQLITE3_TEXT);+ $stmt->bindParam(':notifyDaysBefore', $notifyDaysBefore, SQLITE3_INTEGER);+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);++ if ($stmt->execute()) {+ $success['status'] = "Success";+ $text = $isEdit ? "updated" : "added";+ $success['message'] = translate('subscription_' . $text . '_successfuly', $i18n);+ $json = json_encode($success);+ header('Content-Type: application/json');+ echo $json;+ exit();+ } else {+ echo translate('error', $i18n) . ": " . $db->lastErrorMsg();}}- $db->close();-?>+}+$db->close();+?>\ No newline at end of filediff --git a/endpoints/subscription/get.php b/endpoints/subscription/get.phpindex b69a031..f9e2134 100644--- a/endpoints/subscription/get.php+++ b/endpoints/subscription/get.php@@ -1,44 +1,44 @@<?php- require_once '../../includes/connect_endpoint.php';-- if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {- if (isset($_GET['id']) && $_GET['id'] != "") {- $subscriptionId = intval($_GET['id']);- $query = "SELECT * FROM subscriptions WHERE id = :subscriptionId AND user_id = :userId";- $stmt = $db->prepare($query);- $stmt->bindParam(':subscriptionId', $subscriptionId, SQLITE3_INTEGER);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+require_once '../../includes/connect_endpoint.php';- $subscriptionData = array();+if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {+ if (isset($_GET['id']) && $_GET['id'] != "") {+ $subscriptionId = intval($_GET['id']);+ $query = "SELECT * FROM subscriptions WHERE id = :subscriptionId AND user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindParam(':subscriptionId', $subscriptionId, SQLITE3_INTEGER);+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- if ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $subscriptionData['id'] = $subscriptionId;- $subscriptionData['name'] = htmlspecialchars_decode($row['name'] ?? "");- $subscriptionData['logo'] = $row['logo'];- $subscriptionData['price'] = $row['price'];- $subscriptionData['currency_id'] = $row['currency_id'];- $subscriptionData['next_payment'] = $row['next_payment'];- $subscriptionData['frequency'] = $row['frequency'];- $subscriptionData['cycle'] = $row['cycle'];- $subscriptionData['notes'] = htmlspecialchars_decode($row['notes'] ?? "");- $subscriptionData['payment_method_id'] = $row['payment_method_id'];- $subscriptionData['payer_user_id'] = $row['payer_user_id'];- $subscriptionData['category_id'] = $row['category_id'];- $subscriptionData['notify'] = $row['notify'];- $subscriptionData['inactive'] = $row['inactive'];- $subscriptionData['url'] = htmlspecialchars_decode($row['url'] ?? "");- $subscriptionData['notify_days_before'] = $row['notify_days_before'];+ $subscriptionData = array();- $subscriptionJson = json_encode($subscriptionData);- header('Content-Type: application/json');- echo $subscriptionJson;- } else {- echo translate('error', $i18n);- }+ if ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $subscriptionData['id'] = $subscriptionId;+ $subscriptionData['name'] = htmlspecialchars_decode($row['name'] ?? "");+ $subscriptionData['logo'] = $row['logo'];+ $subscriptionData['price'] = $row['price'];+ $subscriptionData['currency_id'] = $row['currency_id'];+ $subscriptionData['next_payment'] = $row['next_payment'];+ $subscriptionData['frequency'] = $row['frequency'];+ $subscriptionData['cycle'] = $row['cycle'];+ $subscriptionData['notes'] = htmlspecialchars_decode($row['notes'] ?? "");+ $subscriptionData['payment_method_id'] = $row['payment_method_id'];+ $subscriptionData['payer_user_id'] = $row['payer_user_id'];+ $subscriptionData['category_id'] = $row['category_id'];+ $subscriptionData['notify'] = $row['notify'];+ $subscriptionData['inactive'] = $row['inactive'];+ $subscriptionData['url'] = htmlspecialchars_decode($row['url'] ?? "");+ $subscriptionData['notify_days_before'] = $row['notify_days_before'];++ $subscriptionJson = json_encode($subscriptionData);+ header('Content-Type: application/json');+ echo $subscriptionJson;} else {echo translate('error', $i18n);}+ } else {+ echo translate('error', $i18n);}- $db->close();+}+$db->close();?>\ No newline at end of filediff --git a/endpoints/subscription/getcalendar.php b/endpoints/subscription/getcalendar.phpindex 493dd17..298be0a 100644--- a/endpoints/subscription/getcalendar.php+++ b/endpoints/subscription/getcalendar.php@@ -31,7 +31,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {if ($subscription) {// get payer name from household object- $subscription['payer_user'] = $members[$subscription['payer_user_id']]['name'];+ $subscription['payer_user'] = $members[$subscription['payer_user_id']]['name'];$subscription['category'] = $categories[$subscription['category_id']]['name'];$subscription['payment_method'] = $payment_methods[$subscription['payment_method_id']]['name'];$subscription['currency'] = $currencies[$subscription['currency_id']]['symbol'];diff --git a/endpoints/subscriptions/get.php b/endpoints/subscriptions/get.phpindex 908a058..ea9302b 100644--- a/endpoints/subscriptions/get.php+++ b/endpoints/subscriptions/get.php@@ -1,128 +1,128 @@<?php- require_once '../../includes/connect_endpoint.php';+require_once '../../includes/connect_endpoint.php';++require_once '../../includes/currency_formatter.php';+require_once '../../includes/getdbkeys.php';++include_once '../../includes/list_subscriptions.php';++require_once '../../includes/getsettings.php';++$theme = "light";+if (isset($settings['theme'])) {+ $theme = $settings['theme'];+}++$colorTheme = "blue";+if (isset($settings['color_theme'])) {+ $colorTheme = $settings['color_theme'];+}++if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {+ $sort = "next_payment";+ $order = "ASC";+ $sql = "SELECT * FROM subscriptions ORDER BY next_payment ASC, inactive ASC";+ if (isset($_COOKIE['sortOrder']) && $_COOKIE['sortOrder'] != "") {+ $sort = $_COOKIE['sortOrder'];+ $allowedSortCriteria = ['name', 'id', 'next_payment', 'price', 'payer_user_id', 'category_id', 'payment_method_id'];+ if ($sort == "price" || $sort == "id") {+ $order = "DESC";+ }+ if (!in_array($sort, $allowedSortCriteria)) {+ $sort = "next_payment";+ }+ }- require_once '../../includes/currency_formatter.php';- require_once '../../includes/getdbkeys.php';+ $params = array();+ $sql = "SELECT * FROM subscriptions WHERE user_id = :userId";- include_once '../../includes/list_subscriptions.php';+ if (isset($_GET['category']) && $_GET['category'] != "") {+ $sql .= " AND category_id = :category";+ $params[':category'] = $_GET['category'];+ }- require_once '../../includes/getsettings.php';+ if (isset($_GET['payment']) && $_GET['payment'] != "") {+ $sql .= " AND payment_method_id = :payment";+ $params[':payment'] = $_GET['payment'];+ }- $theme = "light";- if (isset($settings['theme'])) {- $theme = $settings['theme'];- }+ if (isset($_GET['member']) && $_GET['member'] != "") {+ $sql .= " AND payer_user_id = :member";+ $params[':member'] = $_GET['member'];+ }- $colorTheme = "blue";- if (isset($settings['color_theme'])) {- $colorTheme = $settings['color_theme'];- }+ $sql .= " ORDER BY $sort $order, inactive ASC";++ $stmt = $db->prepare($sql);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {- $sort = "next_payment";- $order = "ASC";- $sql = "SELECT * FROM subscriptions ORDER BY next_payment ASC, inactive ASC";- if (isset($_COOKIE['sortOrder']) && $_COOKIE['sortOrder'] != "") {- $sort = $_COOKIE['sortOrder'];- $allowedSortCriteria = ['name', 'id', 'next_payment', 'price', 'payer_user_id', 'category_id', 'payment_method_id'];- if ($sort == "price" || $sort == "id") {- $order = "DESC";- }- if (!in_array($sort, $allowedSortCriteria)) {- $sort = "next_payment";- }- }-- $params = array();- $sql = "SELECT * FROM subscriptions WHERE user_id = :userId";-- if (isset($_GET['category']) && $_GET['category'] != "") {- $sql .= " AND category_id = :category";- $params[':category'] = $_GET['category'];- }-- if (isset($_GET['payment']) && $_GET['payment'] != "") {- $sql .= " AND payment_method_id = :payment";- $params[':payment'] = $_GET['payment'];- }-- if (isset($_GET['member']) && $_GET['member'] != "") {- $sql .= " AND payer_user_id = :member";- $params[':member'] = $_GET['member'];- }-- $sql .= " ORDER BY $sort $order, inactive ASC";-- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);-- foreach ($params as $key => $value) {- $stmt->bindValue($key, $value);- }-- $result = $stmt->execute();- if ($result) {- $subscriptions = array();- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $subscriptions[] = $row;- }- }-- $defaultLogo = $theme == "light" ? "images/siteicons/" . $colorTheme . "/wallos.png" : "images/siteicons/" . $colorTheme . "/walloswhite.png";- foreach ($subscriptions as $subscription) {- if ($subscription['inactive'] == 1 && isset($settings['hideDisabledSubscriptions']) && $settings['hideDisabledSubscriptions'] === 'true') {- continue;- }- $id = $subscription['id'];- $print[$id]['id'] = $id;- $print[$id]['logo'] = $subscription['logo'] != "" ? "images/uploads/logos/".$subscription['logo'] : $defaultLogo;- $print[$id]['name'] = htmlspecialchars_decode($subscription['name'] ?? "");- $cycle = $subscription['cycle'];- $frequency = $subscription['frequency'];- $print[$id]['billing_cycle'] = getBillingCycle($cycle, $frequency, $i18n);- $paymentMethodId = $subscription['payment_method_id'];- $print[$id]['currency_code'] = $currencies[$subscription['currency_id']]['code'];- $currencyId = $subscription['currency_id'];- $print[$id]['next_payment'] = date('M d, Y', strtotime($subscription['next_payment']));- $paymentIconFolder = (strpos($payment_methods[$paymentMethodId]['icon'], 'images/uploads/icons/') !== false) ? "" : "images/uploads/logos/";- $print[$id]['payment_method_icon'] = $paymentIconFolder . $payment_methods[$paymentMethodId]['icon'];- $print[$id]['payment_method_name'] = $payment_methods[$paymentMethodId]['name'];- $print[$id]['payment_method_id'] = $paymentMethodId;- $print[$id]['category_id'] = $subscription['category_id'];- $print[$id]['payer_user_id'] = $subscription['payer_user_id'];- $print[$id]['price'] = floatval($subscription['price']);- $print[$id]['inactive'] = $subscription['inactive'];- $print[$id]['url'] = htmlspecialchars_decode($subscription['url'] ?? "");- $print[$id]['notes'] = htmlspecialchars_decode($subscription['notes'] ?? "");-- if (isset($settings['convertCurrency']) && $settings['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) {- $print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db);- $print[$id]['currency_code'] = $currencies[$mainCurrencyId]['code'];- }- if (isset($settings['showMonthlyPrice']) && $settings['showMonthlyPrice'] === 'true') {- $print[$id]['price'] = getPricePerMonth($cycle, $frequency, $print[$id]['price']);- }- }-- if (isset($print)) {- printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme);- }-- if (count($subscriptions) == 0) {- ?>- <div class="no-matching-subscriptions">- <p>- <?= translate('no_matching_subscriptions', $i18n) ?>- </p>- <button class="button" onClick="clearFilters()">- <span clasS="fa-solid fa-minus-circle"></span>- <?= translate('clear_filters', $i18n) ?>- </button>- <img src="images/siteimages/empty.png" alt="<?= translate('empty_page', $i18n) ?>" />- </div>- <?php- }+ foreach ($params as $key => $value) {+ $stmt->bindValue($key, $value);+ }++ $result = $stmt->execute();+ if ($result) {+ $subscriptions = array();+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $subscriptions[] = $row;}+ }- $db->close();+ $defaultLogo = $theme == "light" ? "images/siteicons/" . $colorTheme . "/wallos.png" : "images/siteicons/" . $colorTheme . "/walloswhite.png";+ foreach ($subscriptions as $subscription) {+ if ($subscription['inactive'] == 1 && isset($settings['hideDisabledSubscriptions']) && $settings['hideDisabledSubscriptions'] === 'true') {+ continue;+ }+ $id = $subscription['id'];+ $print[$id]['id'] = $id;+ $print[$id]['logo'] = $subscription['logo'] != "" ? "images/uploads/logos/" . $subscription['logo'] : $defaultLogo;+ $print[$id]['name'] = htmlspecialchars_decode($subscription['name'] ?? "");+ $cycle = $subscription['cycle'];+ $frequency = $subscription['frequency'];+ $print[$id]['billing_cycle'] = getBillingCycle($cycle, $frequency, $i18n);+ $paymentMethodId = $subscription['payment_method_id'];+ $print[$id]['currency_code'] = $currencies[$subscription['currency_id']]['code'];+ $currencyId = $subscription['currency_id'];+ $print[$id]['next_payment'] = date('M d, Y', strtotime($subscription['next_payment']));+ $paymentIconFolder = (strpos($payment_methods[$paymentMethodId]['icon'], 'images/uploads/icons/') !== false) ? "" : "images/uploads/logos/";+ $print[$id]['payment_method_icon'] = $paymentIconFolder . $payment_methods[$paymentMethodId]['icon'];+ $print[$id]['payment_method_name'] = $payment_methods[$paymentMethodId]['name'];+ $print[$id]['payment_method_id'] = $paymentMethodId;+ $print[$id]['category_id'] = $subscription['category_id'];+ $print[$id]['payer_user_id'] = $subscription['payer_user_id'];+ $print[$id]['price'] = floatval($subscription['price']);+ $print[$id]['inactive'] = $subscription['inactive'];+ $print[$id]['url'] = htmlspecialchars_decode($subscription['url'] ?? "");+ $print[$id]['notes'] = htmlspecialchars_decode($subscription['notes'] ?? "");++ if (isset($settings['convertCurrency']) && $settings['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) {+ $print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db);+ $print[$id]['currency_code'] = $currencies[$mainCurrencyId]['code'];+ }+ if (isset($settings['showMonthlyPrice']) && $settings['showMonthlyPrice'] === 'true') {+ $print[$id]['price'] = getPricePerMonth($cycle, $frequency, $print[$id]['price']);+ }+ }++ if (isset($print)) {+ printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme);+ }++ if (count($subscriptions) == 0) {+ ?>+ <div class="no-matching-subscriptions">+ <p>+ <?= translate('no_matching_subscriptions', $i18n) ?>+ </p>+ <button class="button" onClick="clearFilters()">+ <span clasS="fa-solid fa-minus-circle"></span>+ <?= translate('clear_filters', $i18n) ?>+ </button>+ <img src="images/siteimages/empty.png" alt="<?= translate('empty_page', $i18n) ?>" />+ </div>+ <?php+ }+}++$db->close();?>\ No newline at end of filediff --git a/endpoints/user/delete_avatar.php b/endpoints/user/delete_avatar.phpindex 0e6846c..0a5d094 100644--- a/endpoints/user/delete_avatar.php+++ b/endpoints/user/delete_avatar.php@@ -1,38 +1,38 @@<?php- require_once '../../includes/connect_endpoint.php';+require_once '../../includes/connect_endpoint.php';- if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {- die(json_encode([- "success" => false,- "message" => translate('session_expired', $i18n)- ]));- }+if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {+ die(json_encode([+ "success" => false,+ "message" => translate('session_expired', $i18n)+ ]));+}- $input = json_decode(file_get_contents('php://input'), true);- if (isset($input['avatar'])) {- $avatar = "images/uploads/logos/avatars/".$input['avatar'];- $sql = "SELECT avatar FROM user WHERE id = :userId";- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- $userAvatar = $result->fetchArray(SQLITE3_ASSOC)['avatar'];+$input = json_decode(file_get_contents('php://input'), true);+if (isset($input['avatar'])) {+ $avatar = "images/uploads/logos/avatars/" . $input['avatar'];+ $sql = "SELECT avatar FROM user WHERE id = :userId";+ $stmt = $db->prepare($sql);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();+ $userAvatar = $result->fetchArray(SQLITE3_ASSOC)['avatar'];- // Check if $avatar matches the avatar in the user table- if ($avatar === $userAvatar) {- echo json_encode(array("success" => false));- } else {- // The avatars do not match- $filePath = "../../" . $avatar;+ // Check if $avatar matches the avatar in the user table+ if ($avatar === $userAvatar) {+ echo json_encode(array("success" => false));+ } else {+ // The avatars do not match+ $filePath = "../../" . $avatar;if (file_exists($filePath)) {unlink($filePath);echo json_encode(array("success" => true, "message" => translate("success", $i18n)));} else {echo json_encode(array("success" => false, "message" => translate("error", $i18n)));}- }- } else {- echo json_encode(array("success" => false, "message" => translate("error", $i18n)));}+} else {+ echo json_encode(array("success" => false, "message" => translate("error", $i18n)));+}?>\ No newline at end of filediff --git a/endpoints/user/save_user.php b/endpoints/user/save_user.phpindex b2cd660..51a3e71 100644--- a/endpoints/user/save_user.php+++ b/endpoints/user/save_user.php@@ -1,256 +1,254 @@<?php- require_once '../../includes/connect_endpoint.php';- require_once '../../includes/inputvalidation.php';+require_once '../../includes/connect_endpoint.php';+require_once '../../includes/inputvalidation.php';- function update_exchange_rate($db) {- $query = "SELECT api_key, provider FROM fixer WHERE user_id = :userId";- $stmt = $db->prepare($query);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+function update_exchange_rate($db, $userId)+{+ $query = "SELECT api_key, provider FROM fixer WHERE user_id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();++ if ($result) {+ $row = $result->fetchArray(SQLITE3_ASSOC);++ if ($row) {+ $apiKey = $row['api_key'];+ $provider = $row['provider'];++ $codes = "";+ $query = "SELECT id, name, symbol, code FROM currencies";+ $result = $db->query($query);+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $codes .= $row['code'] . ",";+ }+ $codes = rtrim($codes, ',');- if ($result) {+ $query = "SELECT u.main_currency, c.code FROM user u LEFT JOIN currencies c ON u.main_currency = c.id WHERE u.id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();$row = $result->fetchArray(SQLITE3_ASSOC);-- if ($row) {- $apiKey = $row['api_key'];- $provider = $row['provider'];-- $codes = "";- $query = "SELECT id, name, symbol, code FROM currencies";- $result = $db->query($query);- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $codes .= $row['code'].",";+ $mainCurrencyCode = $row['code'];+ $mainCurrencyId = $row['main_currency'];++ if ($provider === 1) {+ $api_url = "https://api.apilayer.com/fixer/latest?base=EUR&symbols=" . $codes;+ $context = stream_context_create([+ 'http' => [+ 'method' => 'GET',+ 'header' => 'apikey: ' . $apiKey,+ ]+ ]);+ $response = file_get_contents($api_url, false, $context);+ } else {+ $api_url = "http://data.fixer.io/api/latest?access_key=" . $apiKey . "&base=EUR&symbols=" . $codes;+ $response = file_get_contents($api_url);+ }++ $apiData = json_decode($response, true);++ $mainCurrencyToEUR = $apiData['rates'][$mainCurrencyCode];++ if ($apiData !== null && isset($apiData['rates'])) {+ foreach ($apiData['rates'] as $currencyCode => $rate) {+ if ($currencyCode === $mainCurrencyCode) {+ $exchangeRate = 1.0;+ } else {+ $exchangeRate = $rate / $mainCurrencyToEUR;+ }+ $updateQuery = "UPDATE currencies SET rate = :rate WHERE code = :code AND user_id = :userId";+ $updateStmt = $db->prepare($updateQuery);+ $updateStmt->bindParam(':rate', $exchangeRate, SQLITE3_TEXT);+ $updateStmt->bindParam(':code', $currencyCode, SQLITE3_TEXT);+ $updateStmt->bindParam(':userId', $userId, SQLITE3_INTEGER);+ $updateResult = $updateStmt->execute();}- $codes = rtrim($codes, ',');+ $currentDate = new DateTime();+ $formattedDate = $currentDate->format('Y-m-d');- $query = "SELECT u.main_currency, c.code FROM user u LEFT JOIN currencies c ON u.main_currency = c.id WHERE u.id = :userId";+ $query = "SELECT * FROM last_exchange_update WHERE user_id = :userId";$stmt = $db->prepare($query);$stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);$result = $stmt->execute();$row = $result->fetchArray(SQLITE3_ASSOC);- $mainCurrencyCode = $row['code'];- $mainCurrencyId = $row['main_currency'];-- if ($provider === 1) {- $api_url = "https://api.apilayer.com/fixer/latest?base=EUR&symbols=" . $codes;- $context = stream_context_create([- 'http' => [- 'method' => 'GET',- 'header' => 'apikey: ' . $apiKey,- ]- ]);- $response = file_get_contents($api_url, false, $context);++ if ($row) {+ $query = "UPDATE last_exchange_update SET date = :formattedDate WHERE user_id = :userId";} else {- $api_url = "http://data.fixer.io/api/latest?access_key=". $apiKey . "&base=EUR&symbols=" . $codes;- $response = file_get_contents($api_url);+ $query = "INSERT INTO last_exchange_update (date, user_id) VALUES (:formattedDate, :userId)";}- $apiData = json_decode($response, true);-- $mainCurrencyToEUR = $apiData['rates'][$mainCurrencyCode];-- if ($apiData !== null && isset($apiData['rates'])) {- foreach ($apiData['rates'] as $currencyCode => $rate) {- if ($currencyCode === $mainCurrencyCode) {- $exchangeRate = 1.0;- } else {- $exchangeRate = $rate / $mainCurrencyToEUR;- }- $updateQuery = "UPDATE currencies SET rate = :rate WHERE code = :code AND user_id = :userId";- $updateStmt = $db->prepare($updateQuery);- $updateStmt->bindParam(':rate', $exchangeRate, SQLITE3_TEXT);- $updateStmt->bindParam(':code', $currencyCode, SQLITE3_TEXT);- $updateStmt->bindParam(':userId', $userId, SQLITE3_INTEGER);- $updateResult = $updateStmt->execute();- }- $currentDate = new DateTime();- $formattedDate = $currentDate->format('Y-m-d');+ $stmt = $db->prepare($query);+ $stmt->bindParam(':formattedDate', $formattedDate, SQLITE3_TEXT);+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);+ $resutl = $stmt->execute();- $query = "SELECT * FROM last_exchange_update WHERE user_id = :userId";- $stmt = $db->prepare($query);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- $row = $result->fetchArray(SQLITE3_ASSOC);+ $db->close();+ }+ }+ }+}- if ($row) {- $query = "UPDATE last_exchange_update SET date = :formattedDate WHERE user_id = :userId";- } else {- $query = "INSERT INTO last_exchange_update (date, user_id) VALUES (:formattedDate, :userId)";- }+$query = "SELECT main_currency FROM user WHERE id = :userId";+$stmt = $db->prepare($query);+$stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);+$result = $stmt->execute();+$row = $result->fetchArray(SQLITE3_ASSOC);+$mainCurrencyId = $row['main_currency'];- $stmt = $db->prepare($query);- $stmt->bindParam(':formattedDate', $formattedDate, SQLITE3_TEXT);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);- $resutl = $stmt->execute();+function sanitizeFilename($filename)+{+ $filename = preg_replace("/[^a-zA-Z0-9\s]/", "", $filename);+ $filename = str_replace(" ", "-", $filename);+ $filename = str_replace(".", "", $filename);+ return $filename;+}- $db->close();- }- }- }- }+function validateFileExtension($fileExtension)+{+ $allowedExtensions = ['png', 'jpg', 'jpeg', 'gif', 'jtif', 'webp'];+ return in_array($fileExtension, $allowedExtensions);+}- $query = "SELECT main_currency FROM user WHERE id = :userId";- $stmt = $db->prepare($query);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- $row = $result->fetchArray(SQLITE3_ASSOC);- $mainCurrencyId = $row['main_currency'];-- function sanitizeFilename($filename) {- $filename = preg_replace("/[^a-zA-Z0-9\s]/", "", $filename);- $filename = str_replace(" ", "-", $filename);- $filename = str_replace(".", "", $filename);- return $filename;- }+function resizeAndUploadAvatar($uploadedFile, $uploadDir, $name)+{+ $targetWidth = 80;+ $targetHeight = 80;- function validateFileExtension($fileExtension) {- $allowedExtensions = ['png', 'jpg', 'jpeg', 'gif', 'jtif', 'webp'];- return in_array($fileExtension, $allowedExtensions);- }+ $timestamp = time();+ $originalFileName = $uploadedFile['name'];+ $fileExtension = strtolower(pathinfo($originalFileName, PATHINFO_EXTENSION));+ $fileExtension = validateFileExtension($fileExtension) ? $fileExtension : 'png';+ $fileName = $timestamp . '-avatars-' . sanitizeFilename($name) . '.' . $fileExtension;+ $uploadFile = $uploadDir . $fileName;- function resizeAndUploadAvatar($uploadedFile, $uploadDir, $name) {- $targetWidth = 80;- $targetHeight = 80;-- $timestamp = time();- $originalFileName = $uploadedFile['name'];- $fileExtension = strtolower(pathinfo($originalFileName, PATHINFO_EXTENSION));- $fileExtension = validateFileExtension($fileExtension) ? $fileExtension : 'png';- $fileName = $timestamp . '-avatars-' . sanitizeFilename($name) . '.' . $fileExtension;- $uploadFile = $uploadDir . $fileName;-- if (move_uploaded_file($uploadedFile['tmp_name'], $uploadFile)) {- $fileInfo = getimagesize($uploadFile);-- if ($fileInfo !== false) {- $width = $fileInfo[0];- $height = $fileInfo[1];-- // Load the image based on its format- if ($fileExtension === 'png') {- $image = imagecreatefrompng($uploadFile);- } elseif ($fileExtension === 'jpg' || $fileExtension === 'jpeg') {- $image = imagecreatefromjpeg($uploadFile);- } elseif ($fileExtension === 'gif') {- $image = imagecreatefromgif($uploadFile);- } elseif ($fileExtension === 'webp') {- $image = imagecreatefromwebp($uploadFile);- } else {- // Handle other image formats as needed- return "";- }-- // Enable alpha channel (transparency) for PNG images- if ($fileExtension === 'png') {- imagesavealpha($image, true);- }-- $newWidth = $width;- $newHeight = $height;-- if ($width > $targetWidth) {- $newWidth = $targetWidth;- $newHeight = ($targetWidth / $width) * $height;- }-- if ($newHeight > $targetHeight) {- $newWidth = ($targetHeight / $newHeight) * $newWidth;- $newHeight = $targetHeight;- }-- $resizedImage = imagecreatetruecolor($newWidth, $newHeight);- imagesavealpha($resizedImage, true);- $transparency = imagecolorallocatealpha($resizedImage, 0, 0, 0, 127);- imagefill($resizedImage, 0, 0, $transparency);- imagecopyresampled($resizedImage, $image, 0, 0, 0, 0, $newWidth, $newHeight, $width, $height);-- if ($fileExtension === 'png') {- imagepng($resizedImage, $uploadFile);- } elseif ($fileExtension === 'jpg' || $fileExtension === 'jpeg') {- imagejpeg($resizedImage, $uploadFile);- } elseif ($fileExtension === 'gif') {- imagegif($resizedImage, $uploadFile);- } elseif ($fileExtension === 'webp') {- imagewebp($resizedImage, $uploadFile);- } else {- return "";- }-- imagedestroy($image);- imagedestroy($resizedImage);- return "images/uploads/logos/avatars/".$fileName;+ if (move_uploaded_file($uploadedFile['tmp_name'], $uploadFile)) {+ $fileInfo = getimagesize($uploadFile);++ if ($fileInfo !== false) {+ $width = $fileInfo[0];+ $height = $fileInfo[1];++ // Load the image based on its format+ if ($fileExtension === 'png') {+ $image = imagecreatefrompng($uploadFile);+ } elseif ($fileExtension === 'jpg' || $fileExtension === 'jpeg') {+ $image = imagecreatefromjpeg($uploadFile);+ } elseif ($fileExtension === 'gif') {+ $image = imagecreatefromgif($uploadFile);+ } elseif ($fileExtension === 'webp') {+ $image = imagecreatefromwebp($uploadFile);+ } else {+ // Handle other image formats as needed+ return "";}++ // Enable alpha channel (transparency) for PNG images+ if ($fileExtension === 'png') {+ imagesavealpha($image, true);+ }++ $newWidth = $width;+ $newHeight = $height;++ if ($width > $targetWidth) {+ $newWidth = $targetWidth;+ $newHeight = ($targetWidth / $width) * $height;+ }++ if ($newHeight > $targetHeight) {+ $newWidth = ($targetHeight / $newHeight) * $newWidth;+ $newHeight = $targetHeight;+ }++ $resizedImage = imagecreatetruecolor($newWidth, $newHeight);+ imagesavealpha($resizedImage, true);+ $transparency = imagecolorallocatealpha($resizedImage, 0, 0, 0, 127);+ imagefill($resizedImage, 0, 0, $transparency);+ imagecopyresampled($resizedImage, $image, 0, 0, 0, 0, $newWidth, $newHeight, $width, $height);++ if ($fileExtension === 'png') {+ imagepng($resizedImage, $uploadFile);+ } elseif ($fileExtension === 'jpg' || $fileExtension === 'jpeg') {+ imagejpeg($resizedImage, $uploadFile);+ } elseif ($fileExtension === 'gif') {+ imagegif($resizedImage, $uploadFile);+ } elseif ($fileExtension === 'webp') {+ imagewebp($resizedImage, $uploadFile);+ } else {+ return "";+ }++ imagedestroy($image);+ imagedestroy($resizedImage);+ return "images/uploads/logos/avatars/" . $fileName;}-- return "";}- if (isset($_SESSION['username']) && isset($_POST['email']) && $_POST['email'] !== ""- && isset($_POST['avatar']) && $_POST['avatar'] !== ""- && isset($_POST['main_currency']) && $_POST['main_currency'] !== ""- && isset($_POST['language']) && $_POST['language'] !== "") {-- $email = validate($_POST['email']);-- $query = "SELECT email FROM user WHERE id = :user_id";+ return "";+}++if (+ isset($_SESSION['username']) && isset($_POST['email']) && $_POST['email'] !== ""+ && isset($_POST['avatar']) && $_POST['avatar'] !== ""+ && isset($_POST['main_currency']) && $_POST['main_currency'] !== ""+ && isset($_POST['language']) && $_POST['language'] !== ""+) {++ $email = validate($_POST['email']);++ $query = "SELECT email FROM user WHERE id = :user_id";+ $stmt = $db->prepare($query);+ $stmt->bindValue(':user_id', $userId, SQLITE3_TEXT);+ $result = $stmt->execute();+ $user = $result->fetchArray(SQLITE3_ASSOC);++ $oldEmail = $user['email'];++ if ($oldEmail != $email) {+ $query = "SELECT email FROM user WHERE email = :email AND id != :userId";$stmt = $db->prepare($query);- $stmt->bindValue(':user_id', $userId, SQLITE3_TEXT);+ $stmt->bindValue(':email', $email, SQLITE3_TEXT);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);$result = $stmt->execute();- $user = $result->fetchArray(SQLITE3_ASSOC);-- $oldEmail = $user['email'];+ $otherUser = $result->fetchArray(SQLITE3_ASSOC);- if ($oldEmail != $email) {- $query = "SELECT email FROM user WHERE email = :email AND id != :userId";- $stmt = $db->prepare($query);- $stmt->bindValue(':email', $email, SQLITE3_TEXT);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- $otherUser = $result->fetchArray(SQLITE3_ASSOC);-- if ($otherUser) {- $response = [- "success" => false,- "errorMessage" => translate('email_exists', $i18n)- ];- echo json_encode($response);- exit();- }+ if ($otherUser) {+ $response = [+ "success" => false,+ "errorMessage" => translate('email_exists', $i18n)+ ];+ echo json_encode($response);+ exit();}+ }- $avatar = $_POST['avatar'];- $main_currency = $_POST['main_currency'];- $language = $_POST['language'];+ $avatar = $_POST['avatar'];+ $main_currency = $_POST['main_currency'];+ $language = $_POST['language'];- if (! empty($_FILES['profile_pic']["name"])) {- $file = $_FILES['profile_pic'];+ if (!empty($_FILES['profile_pic']["name"])) {+ $file = $_FILES['profile_pic'];- $fileType = mime_content_type($_FILES['profile_pic']['tmp_name']);- if (strpos($fileType, 'image') === false) {- $response = [- "success" => false,- "errorMessage" => translate('fill_all_fields', $i18n)- ];- echo json_encode($response);- exit();- }- $name = $file['name'];- $avatar = resizeAndUploadAvatar($_FILES['profile_pic'], '../../images/uploads/logos/avatars/', $name);+ $fileType = mime_content_type($_FILES['profile_pic']['tmp_name']);+ if (strpos($fileType, 'image') === false) {+ $response = [+ "success" => false,+ "errorMessage" => translate('fill_all_fields', $i18n)+ ];+ echo json_encode($response);+ exit();}+ $name = $file['name'];+ $avatar = resizeAndUploadAvatar($_FILES['profile_pic'], '../../images/uploads/logos/avatars/', $name);+ }- if (isset($_POST['password']) && $_POST['password'] != "") {- $password = $_POST['password'];- if (isset($_POST['confirm_password'])) {- $confirm = $_POST['confirm_password'];- if ($password != $confirm) {- $response = [- "success" => false,- "errorMessage" => translate('passwords_dont_match', $i18n)- ];- echo json_encode($response);- exit();- }- } else {+ if (isset($_POST['password']) && $_POST['password'] != "") {+ $password = $_POST['password'];+ if (isset($_POST['confirm_password'])) {+ $confirm = $_POST['confirm_password'];+ if ($password != $confirm) {$response = ["success" => false,"errorMessage" => translate('passwords_dont_match', $i18n)@@ -258,64 +256,72 @@echo json_encode($response);exit();}- }-- if (isset($_POST['password']) && $_POST['password'] != "") {- $sql = "UPDATE user SET avatar = :avatar, email = :email, password = :password, main_currency = :main_currency, language = :language WHERE id = :userId";} else {- $sql = "UPDATE user SET avatar = :avatar, email = :email, main_currency = :main_currency, language = :language WHERE id = :userId";- }-- $stmt = $db->prepare($sql);- $stmt->bindParam(':avatar', $avatar, SQLITE3_TEXT);- $stmt->bindParam(':email', $email, SQLITE3_TEXT);- $stmt->bindParam(':main_currency', $main_currency, SQLITE3_INTEGER);- $stmt->bindParam(':language', $language, SQLITE3_TEXT);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);-- if (isset($_POST['password']) && $_POST['password'] != "") {- $hashedPassword = password_hash($password, PASSWORD_DEFAULT);- $stmt->bindParam(':password', $hashedPassword, SQLITE3_TEXT);+ $response = [+ "success" => false,+ "errorMessage" => translate('passwords_dont_match', $i18n)+ ];+ echo json_encode($response);+ exit();}+ }- $result = $stmt->execute();+ if (isset($_POST['password']) && $_POST['password'] != "") {+ $sql = "UPDATE user SET avatar = :avatar, email = :email, password = :password, main_currency = :main_currency, language = :language WHERE id = :userId";+ } else {+ $sql = "UPDATE user SET avatar = :avatar, email = :email, main_currency = :main_currency, language = :language WHERE id = :userId";+ }- if ($result) {- $cookieExpire = time() + (30 * 24 * 60 * 60);- $oldLanguage = isset($_COOKIE['language']) ? $_COOKIE['language'] : "en";- $root = str_replace('/endpoints/user', '', dirname($_SERVER['PHP_SELF']));- $root = $root == '' ? '/' : $root;- setcookie('language', $language, $cookieExpire, $root);- $_SESSION['avatar'] = $avatar;- $_SESSION['main_currency'] = $main_currency;-- if ($main_currency != $mainCurrencyId) {- update_exchange_rate($db);- }+ $stmt = $db->prepare($sql);+ $stmt->bindParam(':avatar', $avatar, SQLITE3_TEXT);+ $stmt->bindParam(':email', $email, SQLITE3_TEXT);+ $stmt->bindParam(':main_currency', $main_currency, SQLITE3_INTEGER);+ $stmt->bindParam(':language', $language, SQLITE3_TEXT);+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);- $reload = $oldLanguage != $language;+ if (isset($_POST['password']) && $_POST['password'] != "") {+ $hashedPassword = password_hash($password, PASSWORD_DEFAULT);+ $stmt->bindParam(':password', $hashedPassword, SQLITE3_TEXT);+ }- $response = [- "success" => true,- "message" => translate('user_details_saved', $i18n),- "reload" => $reload- ];- echo json_encode($response);- } else {- $response = [- "success" => false,- "errorMessage" => translate('error_updating_user_data', $i18n)- ];- echo json_encode($response);+ $result = $stmt->execute();++ if ($result) {+ $cookieExpire = time() + (30 * 24 * 60 * 60);+ $oldLanguage = isset($_COOKIE['language']) ? $_COOKIE['language'] : "en";+ $root = str_replace('/endpoints/user', '', dirname($_SERVER['PHP_SELF']));+ $root = $root == '' ? '/' : $root;+ setcookie('language', $language, $cookieExpire, $root);+ $_SESSION['avatar'] = $avatar;+ $_SESSION['main_currency'] = $main_currency;++ if ($main_currency != $mainCurrencyId) {+ update_exchange_rate($db, $userId);}- exit();+ $reload = $oldLanguage != $language;++ $response = [+ "success" => true,+ "message" => translate('user_details_saved', $i18n),+ "reload" => $reload+ ];+ echo json_encode($response);} else {$response = ["success" => false,- "errorMessage" => translate('fill_all_fields', $i18n)+ "errorMessage" => translate('error_updating_user_data', $i18n)];echo json_encode($response);- exit();}-?>++ exit();+} else {+ $response = [+ "success" => false,+ "errorMessage" => translate('fill_all_fields', $i18n)+ ];+ echo json_encode($response);+ exit();+}+?>\ No newline at end of filediff --git a/includes/checksession.php b/includes/checksession.phpindex 9ceed0a..8250bb5 100644--- a/includes/checksession.php+++ b/includes/checksession.php@@ -1,90 +1,90 @@<?php- session_start();- if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {- $username = $_SESSION['username'];- $main_currency = $_SESSION['main_currency'];+session_start();+if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {+ $username = $_SESSION['username'];+ $main_currency = $_SESSION['main_currency'];+ $sql = "SELECT * FROM user WHERE username = :username";+ $stmt = $db->prepare($sql);+ $stmt->bindValue(':username', $username, SQLITE3_TEXT);+ $result = $stmt->execute();+ $userData = $result->fetchArray(SQLITE3_ASSOC);+ $userId = $userData['id'];++ if ($userData === false) {+ header('Location: logout.php');+ exit();+ } else {+ $_SESSION['userId'] = $userData['id'];+ }++ if ($userData['avatar'] == "") {+ $userData['avatar'] = "0";+ }+} else {++ if (isset($_COOKIE['wallos_login'])) {+ $cookie = explode('|', $_COOKIE['wallos_login'], 3);+ $username = $cookie[0];+ $token = $cookie[1];+ $main_currency = $cookie[2];+$sql = "SELECT * FROM user WHERE username = :username";$stmt = $db->prepare($sql);$stmt->bindValue(':username', $username, SQLITE3_TEXT);$result = $stmt->execute();- $userData = $result->fetchArray(SQLITE3_ASSOC);- $userId = $userData['id'];- if ($userData === false) {- header('Location: logout.php');- exit();- } else {- $_SESSION['userId'] = $userData['id'];- }-- if ($userData['avatar'] == "") {- $userData['avatar'] = "0";- }- } else {+ if ($result) {+ $userData = $result->fetchArray(SQLITE3_ASSOC);+ if (!isset($userData['id'])) {+ $db->close();+ header("Location: logout.php");+ exit();+ }- if (isset($_COOKIE['wallos_login'])) {- $cookie = explode('|', $_COOKIE['wallos_login'], 3);- $username = $cookie[0];- $token = $cookie[1];- $main_currency = $cookie[2];+ if ($userData['avatar'] == "") {+ $userData['avatar'] = "0";+ }+ $userId = $userData['id'];+ $main_currency = $userData['main_currency'];- $sql = "SELECT * FROM user WHERE username = :username";- $stmt = $db->prepare($sql);- $stmt->bindValue(':username', $username, SQLITE3_TEXT);+ $adminQuery = "SELECT login_disabled FROM admin";+ $adminResult = $db->query($adminQuery);+ $adminRow = $adminResult->fetchArray(SQLITE3_ASSOC);+ if ($adminRow['login_disabled'] == 1) {+ $sql = "SELECT * FROM login_tokens WHERE user_id = :userId";+ $stmt = $db->prepare($sql);+ $stmt->bindParam(':userId', $userId, SQLITE3_TEXT);+ } else {+ $sql = "SELECT * FROM login_tokens WHERE user_id = :userId AND token = :token";+ $stmt = $db->prepare($sql);+ $stmt->bindParam(':userId', $userId, SQLITE3_TEXT);+ $stmt->bindParam(':token', $token, SQLITE3_TEXT);+ }$result = $stmt->execute();-- if ($result) {- $userData = $result->fetchArray(SQLITE3_ASSOC);- if (!isset($userData['id'])) {- $db->close();- header("Location: logout.php");- exit();- }+ $row = $result->fetchArray(SQLITE3_ASSOC);- if ($userData['avatar'] == "") {- $userData['avatar'] = "0";- }- $userId = $userData['id'];- $main_currency = $userData['main_currency'];-- $adminQuery = "SELECT login_disabled FROM admin";- $adminResult = $db->query($adminQuery);- $adminRow = $adminResult->fetchArray(SQLITE3_ASSOC);- if ($adminRow['login_disabled'] == 1) {- $sql = "SELECT * FROM login_tokens WHERE user_id = :userId";- $stmt = $db->prepare($sql);- $stmt->bindParam(':userId', $userId, SQLITE3_TEXT);- } else {- $sql = "SELECT * FROM login_tokens WHERE user_id = :userId AND token = :token";- $stmt = $db->prepare($sql);- $stmt->bindParam(':userId', $userId, SQLITE3_TEXT);- $stmt->bindParam(':token', $token, SQLITE3_TEXT);- }- $result = $stmt->execute();- $row = $result->fetchArray(SQLITE3_ASSOC);-- if ($row != false) {- $_SESSION['username'] = $username;- $_SESSION['token'] = $token;- $_SESSION['loggedin'] = true;- $_SESSION['main_currency'] = $main_currency;- $_SESSION['userId'] = $userId;- } else {- $db->close();- header("Location: logout.php");- exit();- }+ if ($row != false) {+ $_SESSION['username'] = $username;+ $_SESSION['token'] = $token;+ $_SESSION['loggedin'] = true;+ $_SESSION['main_currency'] = $main_currency;+ $_SESSION['userId'] = $userId;} else {$db->close();header("Location: logout.php");exit();}--} else {$db->close();- header("Location: login.php");+ header("Location: logout.php");exit();}+++ } else {+ $db->close();+ header("Location: login.php");+ exit();}+}?>\ No newline at end of filediff --git a/includes/checkuser.php b/includes/checkuser.phpindex d0a5d37..c2f086c 100644--- a/includes/checkuser.php+++ b/includes/checkuser.php@@ -1,6 +1,6 @@<?php- $query = "SELECT COUNT(*) as count FROM user";- $result = $db->query($query);- $row = $result->fetchArray(SQLITE3_ASSOC);- $userCount = $row['count'];+$query = "SELECT COUNT(*) as count FROM user";+$result = $db->query($query);+$row = $result->fetchArray(SQLITE3_ASSOC);+$userCount = $row['count'];?>\ No newline at end of filediff --git a/includes/footer.php b/includes/footer.phpindex 55c8038..0ef9f17 100644--- a/includes/footer.php+++ b/includes/footer.php@@ -25,10 +25,11 @@</div><?php- if (isset($db)) {- $db->close();- }+ if (isset($db)) {+ $db->close();+ }?>-</body>+ </body>+</html>\ No newline at end of filediff --git a/includes/getsettings.php b/includes/getsettings.phpindex 135c743..da53100 100644--- a/includes/getsettings.php+++ b/includes/getsettings.php@@ -8,8 +8,20 @@ $result = $stmt->execute();$settings = $result->fetchArray(SQLITE3_ASSOC);if ($settings) {$cookieExpire = time() + (30 * 24 * 60 * 60);- setcookie('theme', $settings['dark_theme'] ? 'dark': 'light', $cookieExpire);- $settings['theme'] = $settings['dark_theme'] ? 'dark': 'light';+ $themeMapping = array(0 => 'light', 1 => 'dark', 2 => 'automatic');+ $themeKey = isset($settings['dark_theme']) ? $settings['dark_theme'] : 2;+ $themeValue = $themeMapping[$themeKey];+ setcookie('theme', $themeValue, $cookieExpire);+ $settings['update_theme_setttings'] = false;+ if (isset($_COOKIE['inUseTheme']) && $settings['dark_theme'] == 2) {+ $inUseTheme = $_COOKIE['inUseTheme'];+ $settings['theme'] = $inUseTheme;+ } else {+ $settings['theme'] = $themeValue;+ }+ if ($themeValue == "automatic") {+ $settings['update_theme_setttings'] = true;+ }$settings['color_theme'] = $settings['color_theme'] ? $settings['color_theme'] : "blue";$settings['showMonthlyPrice'] = $settings['monthly_price'] ? 'true': 'false';$settings['convertCurrency'] = $settings['convert_currency'] ? 'true': 'false';diff --git a/includes/header.php b/includes/header.phpindex e066be9..9dc6d15 100644--- a/includes/header.php+++ b/includes/header.php@@ -18,11 +18,16 @@exit();}- $theme = "light";+ $theme = "automatic";if (isset($settings['theme'])) {$theme = $settings['theme'];}+ $updateThemeSettings = false;+ if (isset($settings['update_theme_setttings'])) {+ $updateThemeSettings = $settings['update_theme_setttings'];+ }+$colorTheme = "blue";if (isset($settings['color_theme'])) {$colorTheme = $settings['color_theme'];@@ -37,13 +42,13 @@<meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><title>Wallos - Subscription Tracker</title>- <meta name="theme-color" content="<?= $theme == "light" ? "#FFFFFF" : "#222222" ?>"/>+ <meta name="theme-color" content="<?= $theme == "light" ? "#FFFFFF" : "#222222" ?>" id="theme-color"/><link rel="icon" type="image/png" href="images/icon/favicon.ico" sizes="16x16"><link rel="apple-touch-icon" sizes="180x180" href="images/icon/apple-touch-icon.png"><link rel="manifest" href="manifest.json" crossorigin="use-credentials"><link rel="stylesheet" href="styles/theme.css?<?= $version ?>"><link rel="stylesheet" href="styles/styles.css?<?= $version ?>">- <link rel="stylesheet" href="styles/dark-theme.css?<?= $version ?>" id="dark-theme" <?= $theme == "light" ? "disabled" : "" ?>>+ <link rel="stylesheet" href="styles/dark-theme.css?<?= $version ?>" id="dark-theme" <?= $theme != "dark" ? "disabled" : "" ?>><link rel="stylesheet" href="styles/themes/red.css?<?= $version ?>" id="red-theme" <?= $colorTheme != "red" ? "disabled" : "" ?>><link rel="stylesheet" href="styles/themes/green.css?<?= $version ?>" id="green-theme" <?= $colorTheme != "green" ? "disabled" : "" ?>><link rel="stylesheet" href="styles/themes/yellow.css?<?= $version ?>" id="yellow-theme" <?= $colorTheme != "yellow" ? "disabled" : "" ?>>@@ -54,6 +59,7 @@<script type="text/javascript" src="scripts/common.js?<?= $version ?>"></script><script type="text/javascript">window.theme = "<?= $theme ?>";+ window.update_theme_settings = "<?= $updateThemeSettings ?>";window.lang = "<?=$lang ?>";window.colorTheme = "<?= $colorTheme ?>";</script>diff --git a/includes/i18n/de.php b/includes/i18n/de.phpindex 4260256..74ae898 100644--- a/includes/i18n/de.php+++ b/includes/i18n/de.php@@ -77,8 +77,6 @@ $i18n = ["payment_every" => "Zahlung alle","frequency" => "Abrechnungsfrequenz","cycle" => "Zeitraum",- "next_payment" => "Nächste Zahlung",- "payment_method" => "Zahlungsmethode","no_category" => "Keine Kategorie","paid_by" => "Gezahlt durch","url" => "URL",@@ -180,7 +178,7 @@ $i18n = ["theme_settings" => "Themen-Einstellungen","custom_colors" => "Benutzerdefinierte Farben","dark_theme" => "Dark Theme",- "switch_theme" => "Light / Dark Theme umschalten",+ "automatic"=> "Automatisch","calculate_monthly_price" => "Berechne und zeige monatlichen Preis für alle Abonnements an","convert_prices" => "Preise immer in meine Hauptwährung umrechnen und darin anzeigen (langsamer)","hide_disabled_subscriptions" => "Deaktivierte Abonnements verstecken",diff --git a/includes/i18n/el.php b/includes/i18n/el.phpindex f2b2414..d668c99 100644--- a/includes/i18n/el.php+++ b/includes/i18n/el.php@@ -77,8 +77,6 @@ $i18n = ["payment_every" => "Πληρωμή κάθε","frequency" => "Συχνότητα","cycle" => "Κύκλος",- "next_payment" => "Επόμενη πληρωμή",- "payment_method" => "Τρόπος πληρωμής","no_category" => "Καμία κατηγορία","paid_by" => "Πληρώνεται από","url" => "URL",@@ -180,7 +178,7 @@ $i18n = ["theme_settings" => "Ρυθμίσεις θέματος","custom_colors" => "Προσαρμοσμένα χρώματα","dark_theme" => "Dark Theme",- "switch_theme" => "Διακόπτης Light / Dark Theme",+ "automatic"=> "Αυτόματο","calculate_monthly_price" => "Υπολογισμός και εμφάνιση της μηνιαίας τιμής για όλες τις συνδρομές","convert_prices" => "Πάντα να μετατρέπει και να εμφανίζει τις τιμές στο κύριο νόμισμά μου (πιο αργό)","hide_disabled_subscriptions" => "Απόκρυψη απενεργοποιημένων συνδρομών",diff --git a/includes/i18n/en.php b/includes/i18n/en.phpindex e2e4914..9963bde 100644--- a/includes/i18n/en.php+++ b/includes/i18n/en.php@@ -77,8 +77,6 @@ $i18n = ["payment_every" => "Payment every","frequency" => "Frequency","cycle" => "Cycle",- "next_payment" => "Next Payment",- "payment_method" => "Payment Method","no_category" => "No category","paid_by" => "Paid by","url" => "URL",@@ -180,7 +178,7 @@ $i18n = ["theme_settings" => "Theme Settings","custom_colors" => "Custom Colors","dark_theme" => "Dark Theme",- "switch_theme" => "Switch Light / Dark Theme",+ "automatic"=> "Automatic","calculate_monthly_price" => "Calculate and show monthly price for all subscriptions","convert_prices" => "Always convert and show prices on my main currency (slower)","hide_disabled_subscriptions" => "Hide disabled subscriptions",diff --git a/includes/i18n/es.php b/includes/i18n/es.phpindex 0c631b3..d1b5129 100644--- a/includes/i18n/es.php+++ b/includes/i18n/es.php@@ -77,8 +77,6 @@ $i18n = ["payment_every" => "Pago cada","frequency" => "Frecuencia","cycle" => "Ciclo",- "next_payment" => "Próximo Pago",- "payment_method" => "Método de Pago","no_category" => "Sin categoría","paid_by" => "Pagado por","url" => "URL",@@ -180,7 +178,7 @@ $i18n = ["theme_settings" => "Configuración de Tema","custom_collors" => "Colores Personalizados","dark_theme" => "Tema Oscuro",- "switch_theme" => "Cambiar entre Tema Claro / Oscuro",+ "automatic"=> "Automático","calculate_monthly_price" => "Calcular y mostrar el precio mensual de todas las suscripciones","convert_prices" => "Convertir y mostrar siempre los precios en mi moneda principal (más lento)","hide_disabled_subscriptions" => "Ocultar suscripciones desactivadas",diff --git a/includes/i18n/fr.php b/includes/i18n/fr.phpindex 027ef90..0aa42c8 100644--- a/includes/i18n/fr.php+++ b/includes/i18n/fr.php@@ -77,8 +77,6 @@ $i18n = ["payment_every" => "Paiement tous les","frequency" => "Fréquence","cycle" => "Cycle",- "next_payment" => "Prochain paiement",- "payment_method" => "Méthode de paiement","no_category" => "Pas de catégorie","paid_by" => "Payé par","url" => "URL",@@ -180,7 +178,7 @@ $i18n = ["theme_settings" => "Paramètres de thème","custom_colors" => "Couleurs personnalisées","dark_theme" => "Thème sombre",- "switch_theme" => "Basculer entre le thème clair et sombre",+ "automatic"=> "Automatique","calculate_monthly_price" => "Calculer et afficher le prix mensuel pour tous les abonnements","convert_prices" => "Convertir toujours et afficher les prix dans ma devise principale (plus lent)","hide_disabled_subscriptions" => "Masquer les abonnements désactivés",diff --git a/includes/i18n/getlang.php b/includes/i18n/getlang.phpindex b615d1c..a80f93e 100644--- a/includes/i18n/getlang.php+++ b/includes/i18n/getlang.php@@ -9,7 +9,8 @@ if (isset($_COOKIE['language'])) {}}-function translate($text, $translations) {+function translate($text, $translations)+{if (array_key_exists($text, $translations)) {return $translations[$text];} else {diff --git a/includes/i18n/it.php b/includes/i18n/it.phpindex 2692576..3cc2554 100644--- a/includes/i18n/it.php+++ b/includes/i18n/it.php@@ -186,7 +186,7 @@ $i18n = ["theme_settings" => 'Impostazioni del tema',"custom_colors" => 'Colori personalizzati',"dark_theme" => 'Tema scuro',- 'switch_theme' => 'Cambia tema chiaro/scuro',+ "automatic" => "Automatico",'calculate_monthly_price' => 'Calcola e mostra il prezzo mensile per tutti gli abbonamenti','convert_prices' => 'Converti sempre e mostra i prezzi nella mia valuta principale (più lento)',"hide_disabled_subscriptions" => 'Nascondi gli abbonamenti disattivati',diff --git a/includes/i18n/jp.php b/includes/i18n/jp.phpindex 1f7a6af..fb6dfa6 100644--- a/includes/i18n/jp.php+++ b/includes/i18n/jp.php@@ -77,8 +77,6 @@ $i18n = ["payment_every" => "支払い頻度","frequency" => "頻度","cycle" => "サイクル",- "next_payment" => "次回支払い",- "payment_method" => "支払い方法","no_category" => "カテゴリなし","paid_by" => "支払い元","url" => "URL",@@ -180,7 +178,7 @@ $i18n = ["theme_settings" => "テーマ設定","custom_colors" => "カスタムカラー","dark_theme" => "ダークテーマ",- "switch_theme" => "ライト/ダーク テーマの切り替え",+ "automatic"=> "自動","calculate_monthly_price" => "すべての定期購入の月額料金を計算して表示する","convert_prices" => "常にメイン通貨で価格を換算して表示する (遅い)","hide_disabled_subscriptions" => "無効な定期購入を非表示にする",diff --git a/includes/i18n/ko.php b/includes/i18n/ko.phpindex 63a7fbb..20a0de0 100644--- a/includes/i18n/ko.php+++ b/includes/i18n/ko.php@@ -77,8 +77,6 @@ $i18n = ["payment_every" => "지불 빈도","frequency" => "빈도","cycle" => "주기",- "next_payment" => "다음 결제",- "payment_method" => "결제 방법","no_category" => "카테고리 없음","paid_by" => "결제하는 사람","url" => "URL",@@ -181,7 +179,7 @@ $i18n = ["theme_settings" => "테마 설정","custom_colors" => "커스텀 색상","dark_theme" => "다크 테마",- "switch_theme" => "라이트/다크 테마 전환",+ "automatic"=> "자동","calculate_monthly_price" => "모든 구독에 대한 월별 요금을 계산하고 표시","convert_prices" => "항상 기본 통화로 가격을 환산하고 표시 (느림)","hide_disabled_subscriptions" => "비활성화된 구독 숨기기",diff --git a/includes/i18n/languages.php b/includes/i18n/languages.phpindex dcb1e4f..f2f1ef1 100644--- a/includes/i18n/languages.php+++ b/includes/i18n/languages.php@@ -1,26 +1,26 @@<?php- // File Name => Language Name- $languages = [- // English first- "en" => ["name" => "English", "dir" => "ltr"],- // Remaining sorted alphabetically by language code- "de" => ["name" => "Deutsch", "dir" => "ltr"],- "el" => ["name" => "Ελληνικά", "dir" => "ltr"],- "es" => ["name" => "Español", "dir" => "ltr"],- "fr" => ["name" => "Français", "dir" => "ltr"],- "it" => ["name" => "Italiano", "dir" => "ltr"],- "jp" => ["name" => "日本語", "dir" => "ltr"],- "ko" => ["name" => "한국어", "dir" => "ltr"],- "pl" => ["name" => "Polski", "dir" => "ltr"],- "pt" => ["name" => "Português", "dir" => "ltr"],- "pt_br" => ["name" => "Português Brasileiro", "dir" => "ltr"],- "ru" => ["name" => "Русский", "dir" => "ltr"],- "sl" => ["name" => "Slovenščina", "dir" => "ltr"],- "sr_lat" => ["name" => "Srpski", "dir" => "ltr"],- "sr" => ["name" => "Српски", "dir" => "ltr"],- "tr" => ["name" => "Türkçe", "dir" => "ltr"],- "zh_cn" => ["name" => "简体中文", "dir" => "ltr"],- "zh_tw" => ["name" => "繁體中文", "dir" => "ltr"],- ]--?>\ No newline at end of file+// File Name => Language Name+$languages = [+ // English first+ "en" => ["name" => "English", "dir" => "ltr"],+ // Remaining sorted alphabetically by language code+ "de" => ["name" => "Deutsch", "dir" => "ltr"],+ "el" => ["name" => "Ελληνικά", "dir" => "ltr"],+ "es" => ["name" => "Español", "dir" => "ltr"],+ "fr" => ["name" => "Français", "dir" => "ltr"],+ "it" => ["name" => "Italiano", "dir" => "ltr"],+ "jp" => ["name" => "日本語", "dir" => "ltr"],+ "ko" => ["name" => "한국어", "dir" => "ltr"],+ "pl" => ["name" => "Polski", "dir" => "ltr"],+ "pt" => ["name" => "Português", "dir" => "ltr"],+ "pt_br" => ["name" => "Português Brasileiro", "dir" => "ltr"],+ "ru" => ["name" => "Русский", "dir" => "ltr"],+ "sl" => ["name" => "Slovenščina", "dir" => "ltr"],+ "sr_lat" => ["name" => "Srpski", "dir" => "ltr"],+ "sr" => ["name" => "Српски", "dir" => "ltr"],+ "tr" => ["name" => "Türkçe", "dir" => "ltr"],+ "zh_cn" => ["name" => "简体中文", "dir" => "ltr"],+ "zh_tw" => ["name" => "繁體中文", "dir" => "ltr"],+]++ ?>\ No newline at end of filediff --git a/includes/i18n/pl.php b/includes/i18n/pl.phpindex 48e24fd..997aae0 100644--- a/includes/i18n/pl.php+++ b/includes/i18n/pl.php@@ -77,8 +77,6 @@ $i18n = ["payment_every" => "Płatność co","frequency" => "Częstotliwość","cycle" => "Cykl",- "next_payment" => "Następna płatność",- "payment_method" => "Metoda płatności","no_category" => "Brak kategorii","paid_by" => "Zapłacone przez","url" => "URL",@@ -180,7 +178,7 @@ $i18n = ["theme_settings" => "Ustawienia motywu","custom_colors" => "Kolory niestandardowe","dark_theme" => "Przełącz na jasny/ciemny motyw",- "switch_theme" => "Przełącz na jasny/ciemny motyw",+ "automatic"=> "Automatycznie","calculate_monthly_price" => "Oblicz i pokaż miesięczną cenę wszystkich subskrypcji","convert_prices" => "Zawsze przeliczaj i pokazuj ceny w mojej głównej walucie (wolniej)","hide_disabled_subscriptions" => "Ukryj wyłączone subskrypcje",diff --git a/includes/i18n/pt.php b/includes/i18n/pt.phpindex 0c61571..72b1f8e 100644--- a/includes/i18n/pt.php+++ b/includes/i18n/pt.php@@ -77,8 +77,6 @@ $i18n = ["payment_every" => "Pagamento a cada","frequency" => "Frequencia","Cycle" => "Ciclo",- "next_payment" => "Próximo Pagamento",- "payment_method" => "Método de Pagamento","no_category" => "Sem categoria","paid_by" => "Pago por","url" => "URL",@@ -180,7 +178,7 @@ $i18n = ["theme_settings" => "Definições de Tema","custom_colors" => "Cores Personalizadas","dark_theme" => "Tema Escuro",- "switch_theme" => "Trocar Tema Claro / Escuro",+ "automatic"=> "Automático","calculate_monthly_price" => "Calcular e mostrar preço mensal para todas as subscrições","convert_prices" => "Converter e mostrar todas as subscrições na moeda principal (mais lento)","hide_disabled_subscriptions" => "Esconder subscrições desactivadas",diff --git a/includes/i18n/pt_br.php b/includes/i18n/pt_br.phpindex 81f9df0..0c8cc5e 100644--- a/includes/i18n/pt_br.php+++ b/includes/i18n/pt_br.php@@ -178,7 +178,7 @@ $i18n = ["theme_settings" => "Configurações de tema","custom_colors" => "Cores personalizadas","dark_theme" => "Tema Escuro",- "switch_theme" => "Alternar entre tema Claro / Escuro",+ "automatic" => "Automático","calculate_monthly_price" => "Calcular e exibir o custo mensal para todas as assinaturas","convert_prices" => "Sempre converter e exibir preços na moeda principal (mais lento)","hide_disabled_subscriptions" => "Ocultar assinaturas desativadas",diff --git a/includes/i18n/ru.php b/includes/i18n/ru.phpindex 07430c6..1d61245 100644--- a/includes/i18n/ru.php+++ b/includes/i18n/ru.php@@ -77,8 +77,6 @@ $i18n = ["payment_every" => "Оплата каждые","frequency" => "Частота","cycle" => "Цикл",- "next_payment" => "Следующий платеж",- "payment_method" => "Способ оплаты","no_category" => "Нет категории","paid_by" => "Оплачивает","url" => "URL",@@ -180,7 +178,7 @@ $i18n = ["theme_settings" => "Настройки темы","custom_colors" => "Пользовательские цвета","dark_theme" => "Темная тема",- "switch_theme" => "Переключить светлую/темную тему",+ "automatic"=> "Автоматически","calculate_monthly_price" => "Рассчитать и показать ежемесячную цену для всех подписок","convert_prices" => "Всегда конвертировать и показывать цены в моей основной валюте (медленнее)","hide_disabled_subscriptions" => "Скрыть отключенные подписки",diff --git a/includes/i18n/sl.php b/includes/i18n/sl.phpindex 4ccf825..d3f367a 100644--- a/includes/i18n/sl.php+++ b/includes/i18n/sl.php@@ -77,8 +77,6 @@ $i18n = ["payment_every" => "Plačilo vsakih","frequency" => "Ponavljanje","cycle" => "cikel",- "next_payment" => "Naslednje plačilo",- "payment_method" => "Način plačila","no_category" => "Brez kategorije","paid_by" => "Plačal","url" => "URL",@@ -180,7 +178,7 @@ $i18n = ["theme_settings" => "Nastavitve teme","custom_colors" => "Barve po meri","dark_theme" => "Temna tema",- "switch_theme" => "Preklop med svetlo/temno temo",+ "automatic"=> "Samodejno","calculate_monthly_price" => "Izračunaj in prikaži mesečno ceno za vse naročnine","convert_prices" => "Vedno pretvori in prikaži cene v moji glavni valuti (počasneje)","hide_disabled_subscriptions" => "Skrij onemogočene naročnine",diff --git a/includes/i18n/sr.php b/includes/i18n/sr.phpindex 5a3e029..d892c48 100644--- a/includes/i18n/sr.php+++ b/includes/i18n/sr.php@@ -77,8 +77,6 @@ $i18n = ["payment_every" => "Плаћање сваког","frequency" => "Фреквенција","cycle" => "Циклус",- "next_payment" => "Следећа уплата",- "payment_method" => "Начин плаћања","no_category" => "Без категорије","paid_by" => "Плаћено од","url" => "URL",@@ -179,7 +177,7 @@ $i18n = ["theme_settings" => "Подешавања теме","custom_colors" => "Прилагођене боје","dark_theme" => "Тамна тема",- "switch_theme" => "Промени светлу / тамну тему",+ "automatic"=> "Аутоматски","calculate_monthly_price" => "Израчунајте и прикажите месечну цену за све претплате","convert_prices" => "Увек конвертујте и прикажите цене на мојој главној валути (спорије)","hide_disabled_subscriptions" => "Сакриј онемогућене претплате",diff --git a/includes/i18n/sr_lat.php b/includes/i18n/sr_lat.phpindex c44ac25..f27495e 100644--- a/includes/i18n/sr_lat.php+++ b/includes/i18n/sr_lat.php@@ -77,8 +77,6 @@ $i18n = ["payment_every" => "Plaćanje svakog","frequency" => "Frekvencija","cycle" => "Ciklus",- "next_payment" => "Sledeća uplata",- "payment_method" => "Način plaćanja","no_category" => "Bez kategorije","paid_by" => "Plaćeno od strane","url" => "URL",@@ -180,7 +178,7 @@ $i18n = ["theme_settings" => "Podešavanja teme","custom_colors" => "Prilagođene boje","dark_theme" => "Tamna tema",- "switch_theme" => "Promeni svetli / tamni temu",+ "automatic"=> "Automatski","calculate_monthly_price" => "Izračunaj i prikaži mesečnu cenu za sve pretplate","convert_prices" => "Uvek konvertuj i prikaži cene u mojoj glavnoj valuti (sporije)","hide_disabled_subscriptions" => "Sakrij onemogućene pretplate",diff --git a/includes/i18n/tr.php b/includes/i18n/tr.phpindex 2a73f7f..a7e7cda 100644--- a/includes/i18n/tr.php+++ b/includes/i18n/tr.php@@ -77,8 +77,6 @@ $i18n = ["payment_every" => "Ödeme Sıklığı","frequency" => "Frekans","cycle" => "Döngü",- "next_payment" => "Sonraki Ödeme",- "payment_method" => "Ödeme Yöntemi","no_category" => "Kategori yok","paid_by" => "Ödeyen","url" => "URL",@@ -181,6 +179,7 @@ $i18n = ["custom_colors" => "Özel Renkler","dark_theme" => "Koyu Temayı","switch_theme" => "Açık / Koyu Temayı Değiştir",+ "automatic"=> "Otomatik","calculate_monthly_price" => "Tüm aboneliklerin aylık fiyatını hesaplayın ve gösterin","convert_prices" => "Fiyatları her zaman ana para birimimde dönüştürün ve gösterin (daha yavaş)","hide_disabled_subscriptions" => "Devre dışı bırakılan abonelikleri gizle",diff --git a/includes/i18n/zh_cn.php b/includes/i18n/zh_cn.phpindex c3b11f8..cbbd8d1 100644--- a/includes/i18n/zh_cn.php+++ b/includes/i18n/zh_cn.php@@ -82,8 +82,6 @@ $i18n = ["payment_every" => "支付频率","frequency" => "频率","cycle" => "周期",- "next_payment" => "下次支付",- "payment_method" => "支付方式","no_category" => "无分类","paid_by" => "付款人","url" => "链接",@@ -188,7 +186,7 @@ $i18n = ["theme_settings" => "主题设置","custom_colors" => "自定义颜色","dark_theme" => "深色主题",- "switch_theme" => "切换浅色/深色主题",+ "automatic"=> "自动","calculate_monthly_price" => "计算并显示所有订阅的月价格","convert_prices" => "始终按我的主要货币转换和显示价格(较慢)","hide_disabled_subscriptions" => "隐藏已停用的订阅",diff --git a/includes/i18n/zh_tw.php b/includes/i18n/zh_tw.phpindex a85f71a..3e2d8aa 100644--- a/includes/i18n/zh_tw.php+++ b/includes/i18n/zh_tw.php@@ -77,8 +77,6 @@ $i18n = ["payment_every" => "付款頻率","frequency" => "頻率","cycle" => "週期",- "next_payment" => "下次付款",- "payment_method" => "付款方式","no_category" => "無分類","paid_by" => "付款人","url" => "連結",@@ -180,7 +178,7 @@ $i18n = ["theme_settings" => "主題設定","custom_colors" => "自訂顏色","dark_theme" => "深色主題",- "switch_theme" => "切換淺色/深色主題",+ "automatic"=> "自動","calculate_monthly_price" => "計算並顯示所有訂閱的每月價格","convert_prices" => "始終按照我的主要貨幣單位轉換和顯示價格(較慢)","hide_disabled_subscriptions" => "隱藏已停用的訂閱",diff --git a/includes/inputvalidation.php b/includes/inputvalidation.phpindex f3d8d01..fdd1c85 100644--- a/includes/inputvalidation.php+++ b/includes/inputvalidation.php@@ -1,6 +1,7 @@<?php-function validate($value) {+function validate($value)+{$value = trim($value);$value = stripslashes($value);$value = htmlspecialchars($value);diff --git a/includes/list_subscriptions.php b/includes/list_subscriptions.phpindex 0fcdfae..ea0e105 100644--- a/includes/list_subscriptions.php+++ b/includes/list_subscriptions.php@@ -6,16 +6,12 @@switch ($cycle) {case 1:return $frequency == 1 ? translate('Daily', $i18n) : $frequency . " " . translate('days', $i18n);- break;case 2:return $frequency == 1 ? translate('Weekly', $i18n) : $frequency . " " . translate('weeks', $i18n);- break;case 3:return $frequency == 1 ? translate('Monthly', $i18n) : $frequency . " " . translate('months', $i18n);- break;case 4:return $frequency == 1 ? translate('Yearly', $i18n) : $frequency . " " . translate('years', $i18n);- break;}}@@ -24,19 +20,15 @@case 1:$numberOfPaymentsPerMonth = (30 / $frequency);return $price * $numberOfPaymentsPerMonth;- break;case 2:$numberOfPaymentsPerMonth = (4.35 / $frequency);return $price * $numberOfPaymentsPerMonth;- break;case 3:$numberOfPaymentsPerMonth = (1 / $frequency);return $price * $numberOfPaymentsPerMonth;- break;case 4:$numberOfMonths = (12 * $frequency);return $price / $numberOfMonths;- break;}}diff --git a/includes/version.php b/includes/version.phpindex 775fc0c..e9b617b 100644--- a/includes/version.php+++ b/includes/version.php@@ -1,3 +1,3 @@<?php- $version = "v2.7.0";-?>+$version = "v2.8.0";+?>\ No newline at end of filediff --git a/index.php b/index.phpindex 429ca24..b93247a 100644--- a/index.php+++ b/index.php@@ -1,372 +1,392 @@<?php- require_once 'includes/header.php';- require_once 'includes/getdbkeys.php';+require_once 'includes/header.php';+require_once 'includes/getdbkeys.php';- include_once 'includes/list_subscriptions.php';+include_once 'includes/list_subscriptions.php';- $sort = "next_payment";- $sql = "SELECT * FROM subscriptions WHERE user_id = :userId ORDER BY next_payment ASC, inactive ASC";- if (isset($_COOKIE['sortOrder']) && $_COOKIE['sortOrder'] != "") {- $sort = $_COOKIE['sortOrder'];- $allowedSortCriteria = ['name', 'id', 'next_payment', 'price', 'payer_user_id', 'category_id', 'payment_method_id'];- $order = "ASC";- if ($sort == "price" || $sort == "id") {- $order = "DESC";- }- if (in_array($sort, $allowedSortCriteria)) {- $sql = "SELECT * FROM subscriptions WHERE user_id = :userId ORDER BY $sort $order, inactive ASC";- }+$sort = "next_payment";+$sql = "SELECT * FROM subscriptions WHERE user_id = :userId ORDER BY next_payment ASC, inactive ASC";+if (isset($_COOKIE['sortOrder']) && $_COOKIE['sortOrder'] != "") {+ $sort = $_COOKIE['sortOrder'];+ $allowedSortCriteria = ['name', 'id', 'next_payment', 'price', 'payer_user_id', 'category_id', 'payment_method_id'];+ $order = "ASC";+ if ($sort == "price" || $sort == "id") {+ $order = "DESC";}-- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- if ($result) {- $subscriptions = array();- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $subscriptions[] = $row;- }+ if (in_array($sort, $allowedSortCriteria)) {+ $sql = "SELECT * FROM subscriptions WHERE user_id = :userId ORDER BY $sort $order, inactive ASC";+ }+}++$stmt = $db->prepare($sql);+$stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+$result = $stmt->execute();+if ($result) {+ $subscriptions = array();+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $subscriptions[] = $row;}+}- $headerClass = count($subscriptions) > 0 ? "main-actions" : "main-actions hidden";- $defaultLogo = $theme == "light" ? "images/siteicons/" . $colorTheme . "/wallos.png" : "images/siteicons/" . $colorTheme . "/walloswhite.png";+$headerClass = count($subscriptions) > 0 ? "main-actions" : "main-actions hidden";+$defaultLogo = $theme == "light" ? "images/siteicons/" . $colorTheme . "/wallos.png" : "images/siteicons/" . $colorTheme . "/walloswhite.png";?>- <style>- .logo-preview:after {- content: '<?= translate('upload_logo', $i18n) ?>';- }- </style>- <section class="contain">- <header class="<?= $headerClass ?>" id="main-actions">- <button class="button" onClick="addSubscription()">- <i class="fa-solid fa-circle-plus"></i>- <?= translate('new_subscription', $i18n) ?>- </button>- <div class="top-actions">- <div class="search">- <input type="text" autocomplete="off" name="search" id="search" placeholder="<?= translate('search', $i18n) ?>" onkeyup="searchSubscriptions()" />- <span class="fa-solid fa-magnifying-glass search-icon"></span>- </div>+<style>+ .logo-preview:after {+ content: '<?= translate('upload_logo', $i18n) ?>';+ }+</style>+<section class="contain">+ <header class="<?= $headerClass ?>" id="main-actions">+ <button class="button" onClick="addSubscription()">+ <i class="fa-solid fa-circle-plus"></i>+ <?= translate('new_subscription', $i18n) ?>+ </button>+ <div class="top-actions">+ <div class="search">+ <input type="text" autocomplete="off" name="search" id="search" placeholder="<?= translate('search', $i18n) ?>"+ onkeyup="searchSubscriptions()" />+ <span class="fa-solid fa-magnifying-glass search-icon"></span>+ </div>- <div class="filtermenu on-dashboard">- <button class="button secondary-button" id="filtermenu-button" title="<?= translate("filter", $i18n) ?>">- <i class="fa-solid fa-filter"></i>- </button>- <div class="filtermenu-content">- <?php- if (count($members) > 1) {- ?>- <div class="filtermenu-submenu">- <div class="filter-title" onClick="toggleSubMenu('member')"><?= translate("member", $i18n) ?></div>- <div class="filtermenu-submenu-content" id="filter-member">- <?php- foreach ($members as $member) {- $selectedClass = '';- if (isset($_GET['member']) && $_GET['member'] == $member['id']) {- $selectedClass = 'selected';- }- ?>- <div class="filter-item <?= $selectedClass ?>" data-memberid="<?= $member['id'] ?>"><?= $member['name'] ?></div>- <?php- }- ?>+ <div class="filtermenu on-dashboard">+ <button class="button secondary-button" id="filtermenu-button" title="<?= translate("filter", $i18n) ?>">+ <i class="fa-solid fa-filter"></i>+ </button>+ <div class="filtermenu-content">+ <?php+ if (count($members) > 1) {+ ?>+ <div class="filtermenu-submenu">+ <div class="filter-title" onClick="toggleSubMenu('member')"><?= translate("member", $i18n) ?></div>+ <div class="filtermenu-submenu-content" id="filter-member">+ <?php+ foreach ($members as $member) {+ $selectedClass = '';+ if (isset($_GET['member']) && $_GET['member'] == $member['id']) {+ $selectedClass = 'selected';+ }+ ?>+ <div class="filter-item <?= $selectedClass ?>" data-memberid="<?= $member['id'] ?>"><?= $member['name'] ?></div>- </div>- <?php+ <?php}- ?>- <?php- if (count($categories) > 1) {- ?>- <div class="filtermenu-submenu">- <div class="filter-title" onClick="toggleSubMenu('category')"><?= translate("category", $i18n) ?></div>- <div class="filtermenu-submenu-content" id="filter-category">- <?php- foreach ($categories as $category) {- if ($category['name'] == "No category") {- $category['name'] = translate("no_category", $i18n);- }- $selectedClass = '';- if (isset($_GET['category']) && $_GET['category'] == $category['id']) {- $selectedClass = 'selected';- }- ?>- <div class="filter-item <?= $selectedClass ?>" data-categoryid="<?= $category['id'] ?>"><?= $category['name'] ?></div>- <?php- }- ?>- </div>- </div>- <?php+ ?>+ </div>+ </div>+ <?php+ }+ ?>+ <?php+ if (count($categories) > 1) {+ ?>+ <div class="filtermenu-submenu">+ <div class="filter-title" onClick="toggleSubMenu('category')"><?= translate("category", $i18n) ?></div>+ <div class="filtermenu-submenu-content" id="filter-category">+ <?php+ foreach ($categories as $category) {+ if ($category['name'] == "No category") {+ $category['name'] = translate("no_category", $i18n);+ }+ $selectedClass = '';+ if (isset($_GET['category']) && $_GET['category'] == $category['id']) {+ $selectedClass = 'selected';+ }+ ?>+ <div class="filter-item <?= $selectedClass ?>" data-categoryid="<?= $category['id'] ?>">+ <?= $category['name'] ?></div>+ <?php}- ?>- <?php- if (count($payment_methods) > 1) {- ?>- <div class="filtermenu-submenu">- <div class="filter-title" onClick="toggleSubMenu('payment')"><?= translate("payment_method", $i18n) ?></div>- <div class="filtermenu-submenu-content" id="filter-payment">- <?php- foreach ($payment_methods as $payment) {- $selectedClass = '';- if (isset($_GET['payment']) && $_GET['payment'] == $payment['id']) {- $selectedClass = 'selected';- }- ?>- <div class="filter-item <?= $selectedClass ?>" data-paymentid="<?= $payment['id'] ?>"><?= $payment['name'] ?></div>- <?php- }- ?>- </div>- </div>- <?php+ ?>+ </div>+ </div>+ <?php+ }+ ?>+ <?php+ if (count($payment_methods) > 1) {+ ?>+ <div class="filtermenu-submenu">+ <div class="filter-title" onClick="toggleSubMenu('payment')"><?= translate("payment_method", $i18n) ?></div>+ <div class="filtermenu-submenu-content" id="filter-payment">+ <?php+ foreach ($payment_methods as $payment) {+ $selectedClass = '';+ if (isset($_GET['payment']) && $_GET['payment'] == $payment['id']) {+ $selectedClass = 'selected';+ }+ ?>+ <div class="filter-item <?= $selectedClass ?>" data-paymentid="<?= $payment['id'] ?>">+ <?= $payment['name'] ?></div>+ <?php}- ?>- <div class="filtermenu-submenu hide" id="clear-filters">- <div class="filter-title filter-clear" onClick="clearFilters()">- <i class="fa-solid fa-times-circle"></i> <?= translate("clear", $i18n) ?>- </div>+ ?></div></div>- </div>-- <div class="sort-container">- <button class="button secondary-button" value="Sort" onClick="toggleSortOptions()" id="sort-button" title="<?= translate('sort', $i18n) ?>">- <i class="fa-solid fa-arrow-down-wide-short"></i>- </button>- <div class="sort-options" id="sort-options">- <ul>- <li <?= $sort == "name" ? 'class="selected"' : "" ?> onClick="setSortOption('name')" id="sort-name"><?= translate('name', $i18n) ?></li>- <li <?= $sort == "id" ? 'class="selected"' : "" ?> onClick="setSortOption('id')" id="sort-id"><?= translate('last_added', $i18n) ?></li>- <li <?= $sort == "price" ? 'class="selected"' : "" ?> onClick="setSortOption('price')" id="sort-price"><?= translate('price', $i18n) ?></li>- <li <?= $sort == "next_payment" ? 'class="selected"' : "" ?> onClick="setSortOption('next_payment')" id="sort-next_payment"><?= translate('next_payment', $i18n) ?></li>- <li <?= $sort == "payer_user_id" ? 'class="selected"' : "" ?> onClick="setSortOption('payer_user_id')" id="sort-payer_user_id"><?= translate('member', $i18n) ?></li>- <li <?= $sort == "category_id" ? 'class="selected"' : "" ?> onClick="setSortOption('category_id')" id="sort-category_id"><?= translate('category', $i18n) ?></li>- <li <?= $sort == "payment_method_id" ? 'class="selected"' : "" ?> onClick="setSortOption('payment_method_id')" id="sort-payment_method_id"><?= translate('payment_method', $i18n) ?></li>- </ul>+ <?php+ }+ ?>+ <div class="filtermenu-submenu hide" id="clear-filters">+ <div class="filter-title filter-clear" onClick="clearFilters()">+ <i class="fa-solid fa-times-circle"></i> <?= translate("clear", $i18n) ?></div></div></div>- </header>- <div class="subscriptions" id="subscriptions">- <?php- foreach ($subscriptions as $subscription) {- if ($subscription['inactive'] == 1 && isset($settings['hideDisabledSubscriptions']) && $settings['hideDisabledSubscriptions'] === 'true') {- continue;- }- $id = $subscription['id'];- $print[$id]['id'] = $id;- $print[$id]['logo'] = $subscription['logo'] != "" ? "images/uploads/logos/".$subscription['logo'] : $defaultLogo;- $print[$id]['name']= $subscription['name'];- $cycle = $subscription['cycle'];- $frequency = $subscription['frequency'];- $print[$id]['billing_cycle'] = getBillingCycle($cycle, $frequency, $i18n);- $paymentMethodId = $subscription['payment_method_id'];- $print[$id]['currency_code'] = $currencies[$subscription['currency_id']]['code'];- $currencyId = $subscription['currency_id'];- $print[$id]['next_payment'] = date('M d, Y', strtotime($subscription['next_payment']));- $paymentIconFolder = (strpos($payment_methods[$paymentMethodId]['icon'], 'images/uploads/icons/') !== false) ? "" : "images/uploads/logos/";- $print[$id]['payment_method_icon'] = $paymentIconFolder . $payment_methods[$paymentMethodId]['icon'];- $print[$id]['payment_method_name'] = $payment_methods[$paymentMethodId]['name'];- $print[$id]['payment_method_id'] = $paymentMethodId;- $print[$id]['category_id'] = $subscription['category_id'];- $print[$id]['payer_user_id'] = $subscription['payer_user_id'];- $print[$id]['price'] = floatval($subscription['price']);- $print[$id]['inactive'] = $subscription['inactive'];- $print[$id]['url'] = $subscription['url'];- $print[$id]['notes'] = $subscription['notes'];+ </div>- if (isset($settings['convertCurrency']) && $settings['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) {- $print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db);- $print[$id]['currency_code'] = $currencies[$mainCurrencyId]['code'];- }- if (isset($settings['showMonthlyPrice']) && $settings['showMonthlyPrice'] === 'true') {- $print[$id]['price'] = getPricePerMonth($cycle, $frequency, $print[$id]['price']);- }- }+ <div class="sort-container">+ <button class="button secondary-button" value="Sort" onClick="toggleSortOptions()" id="sort-button"+ title="<?= translate('sort', $i18n) ?>">+ <i class="fa-solid fa-arrow-down-wide-short"></i>+ </button>+ <div class="sort-options" id="sort-options">+ <ul>+ <li <?= $sort == "name" ? 'class="selected"' : "" ?> onClick="setSortOption('name')" id="sort-name">+ <?= translate('name', $i18n) ?></li>+ <li <?= $sort == "id" ? 'class="selected"' : "" ?> onClick="setSortOption('id')" id="sort-id">+ <?= translate('last_added', $i18n) ?></li>+ <li <?= $sort == "price" ? 'class="selected"' : "" ?> onClick="setSortOption('price')" id="sort-price">+ <?= translate('price', $i18n) ?></li>+ <li <?= $sort == "next_payment" ? 'class="selected"' : "" ?> onClick="setSortOption('next_payment')"+ id="sort-next_payment"><?= translate('next_payment', $i18n) ?></li>+ <li <?= $sort == "payer_user_id" ? 'class="selected"' : "" ?> onClick="setSortOption('payer_user_id')"+ id="sort-payer_user_id"><?= translate('member', $i18n) ?></li>+ <li <?= $sort == "category_id" ? 'class="selected"' : "" ?> onClick="setSortOption('category_id')"+ id="sort-category_id"><?= translate('category', $i18n) ?></li>+ <li <?= $sort == "payment_method_id" ? 'class="selected"' : "" ?> onClick="setSortOption('payment_method_id')"+ id="sort-payment_method_id"><?= translate('payment_method', $i18n) ?></li>+ </ul>+ </div>+ </div>+ </div>+ </header>+ <div class="subscriptions" id="subscriptions">+ <?php+ foreach ($subscriptions as $subscription) {+ if ($subscription['inactive'] == 1 && isset($settings['hideDisabledSubscriptions']) && $settings['hideDisabledSubscriptions'] === 'true') {+ continue;+ }+ $id = $subscription['id'];+ $print[$id]['id'] = $id;+ $print[$id]['logo'] = $subscription['logo'] != "" ? "images/uploads/logos/" . $subscription['logo'] : $defaultLogo;+ $print[$id]['name'] = $subscription['name'];+ $cycle = $subscription['cycle'];+ $frequency = $subscription['frequency'];+ $print[$id]['billing_cycle'] = getBillingCycle($cycle, $frequency, $i18n);+ $paymentMethodId = $subscription['payment_method_id'];+ $print[$id]['currency_code'] = $currencies[$subscription['currency_id']]['code'];+ $currencyId = $subscription['currency_id'];+ $print[$id]['next_payment'] = date('M d, Y', strtotime($subscription['next_payment']));+ $paymentIconFolder = (strpos($payment_methods[$paymentMethodId]['icon'], 'images/uploads/icons/') !== false) ? "" : "images/uploads/logos/";+ $print[$id]['payment_method_icon'] = $paymentIconFolder . $payment_methods[$paymentMethodId]['icon'];+ $print[$id]['payment_method_name'] = $payment_methods[$paymentMethodId]['name'];+ $print[$id]['payment_method_id'] = $paymentMethodId;+ $print[$id]['category_id'] = $subscription['category_id'];+ $print[$id]['payer_user_id'] = $subscription['payer_user_id'];+ $print[$id]['price'] = floatval($subscription['price']);+ $print[$id]['inactive'] = $subscription['inactive'];+ $print[$id]['url'] = $subscription['url'];+ $print[$id]['notes'] = $subscription['notes'];- if (isset($print)) {- printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme);- }- $db->close();+ if (isset($settings['convertCurrency']) && $settings['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) {+ $print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db);+ $print[$id]['currency_code'] = $currencies[$mainCurrencyId]['code'];+ }+ if (isset($settings['showMonthlyPrice']) && $settings['showMonthlyPrice'] === 'true') {+ $print[$id]['price'] = getPricePerMonth($cycle, $frequency, $print[$id]['price']);+ }+ }++ if (isset($print)) {+ printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme);+ }+ $db->close();- if (count($subscriptions) == 0) {+ if (count($subscriptions) == 0) {+ ?>+ <div class="empty-page">+ <img src="images/siteimages/empty.png" alt="<?= translate('empty_page', $i18n) ?>" />+ <p>+ <?= translate('no_subscriptions_yet', $i18n) ?>+ </p>+ <button class="button" onClick="addSubscription()">+ <i class="fa-solid fa-circle-plus"></i>+ <?= translate('add_first_subscription', $i18n) ?>+ </button>+ </div>+ <?php+ }+ ?>+ </div>++ <section class="subscription-form" id="subscription-form">+ <header>+ <h3 id="form-title"><?= translate('add_subscription', $i18n) ?></h3>+ <span class="fa-solid fa-xmark close-form" onClick="closeAddSubscription()"></span>+ </header>+ <form action="endpoints/subscription/add.php" method="post" id="subs-form">++ <div class="form-group-inline">+ <input type="text" id="name" name="name" placeholder="<?= translate('subscription_name', $i18n) ?>"+ onchange="setSearchButtonStatus()" onkeypress="this.onchange();" onpaste="this.onchange();"+ oninput="this.onchange();" required>+ <label for="logo" class="logo-preview">+ <img src="" alt="<?= translate('logo_preview', $i18n) ?>" id="form-logo">+ </label>+ <input type="file" id="logo" name="logo" accept="image/jpeg, image/png, image/gif, image/webp"+ onchange="handleFileSelect(event)" class="hidden-input">+ <input type="hidden" id="logo-url" name="logo-url">+ <div id="logo-search-button" class="image-button medium disabled" title="<?= translate('search_logo', $i18n) ?>"+ onClick="searchLogo()">+ <img src="images/siteicons/<?= $colorTheme ?>/websearch.png">+ </div>+ <input type="hidden" id="id" name="id">+ <div id="logo-search-results" class="logo-search">+ <header>+ <?= translate('web_search', $i18n) ?>+ <span class="fa-solid fa-xmark close-logo-search" onClick="closeLogoSearch()"></span>+ </header>+ <div id="logo-search-images"></div>+ </div>+ </div>++ <div class="form-group-inline">+ <input type="number" step="0.01" id="price" name="price" placeholder="<?= translate('price', $i18n) ?>"+ required>+ <select id="currency" name="currency_id" placeholder="<?= translate('add_subscription', $i18n) ?>">+ <?php+ foreach ($currencies as $currency) {+ $selected = ($currency['id'] == $main_currency) ? 'selected' : '';?>- <div class="empty-page">- <img src="images/siteimages/empty.png" alt="<?= translate('empty_page', $i18n) ?>" />- <p>- <?= translate('no_subscriptions_yet', $i18n) ?>- </p>- <button class="button" onClick="addSubscription()">- <i class="fa-solid fa-circle-plus"></i>- <?= translate('add_first_subscription', $i18n) ?>- </button>- </div>+ <option value="<?= $currency['id'] ?>" <?= $selected ?>><?= $currency['name'] ?></option><?php}- ?>+ ?>+ </select></div>- <section class="subscription-form" id="subscription-form">- <header>- <h3 id="form-title"><?= translate('add_subscription', $i18n) ?></h3>- <span class="fa-solid fa-xmark close-form" onClick="closeAddSubscription()"></span>- </header>- <form action="endpoints/subscription/add.php" method="post" id="subs-form">-- <div class="form-group-inline">- <input type="text" id="name" name="name" placeholder="<?= translate('subscription_name', $i18n) ?>" onchange="setSearchButtonStatus()" onkeypress="this.onchange();" onpaste="this.onchange();" oninput="this.onchange();" required>- <label for="logo" class="logo-preview">- <img src="" alt="<?= translate('logo_preview', $i18n) ?>" id="form-logo">- </label>- <input type="file" id="logo" name="logo" accept="image/jpeg, image/png, image/gif, image/webp" onchange="handleFileSelect(event)" class="hidden-input">- <input type="hidden" id="logo-url" name="logo-url">- <div id="logo-search-button" class="image-button medium disabled" title="<?= translate('search_logo', $i18n) ?>" onClick="searchLogo()">- <img src="images/siteicons/<?= $colorTheme ?>/websearch.png">- </div>- <input type="hidden" id="id" name="id">- <div id="logo-search-results" class="logo-search">- <header>- <?= translate('web_search', $i18n) ?>- <span class="fa-solid fa-xmark close-logo-search" onClick="closeLogoSearch()"></span>- </header>- <div id="logo-search-images"></div>- </div>- </div>-- <div class="form-group-inline">- <input type="number" step="0.01" id="price" name="price" placeholder="<?= translate('price', $i18n) ?>" required>- <select id="currency" name="currency_id" placeholder="<?= translate('add_subscription', $i18n) ?>">- <?php- foreach ($currencies as $currency) {- $selected = ($currency['id'] == $main_currency) ? 'selected' : '';- ?>- <option value="<?= $currency['id'] ?>" <?= $selected ?>><?= $currency['name'] ?></option>- <?php- }- ?>- </select>- </div>-- <div class="form-group">+ <div class="form-group">+ <div class="inline">+ <div class="split66">+ <label for="cycle"><?= translate('payment_every', $i18n) ?></label><div class="inline">- <div class="split66">- <label for="cycle"><?= translate('payment_every', $i18n) ?></label>- <div class="inline">- <select id="frequency" name="frequency" placeholder="<?= translate('frequency', $i18n) ?>">- <?php- for ($i = 1; $i <= 366; $i++) {+ <select id="frequency" name="frequency" placeholder="<?= translate('frequency', $i18n) ?>">+ <?php+ for ($i = 1; $i <= 366; $i++) {?>- <option value="<?= $i ?>"><?= $i ?></option>+ <option value="<?= $i ?>"><?= $i ?></option><?php- }+ }+ ?>+ </select>+ <select id="cycle" name="cycle" placeholder="Cycle">+ <?php+ foreach ($cycles as $cycle) {?>- </select>- <select id="cycle" name="cycle" placeholder="Cycle">+ <option value="<?= $cycle['id'] ?>" <?= $cycle['id'] == 3 ? "selected" : "" ?>>+ <?= translate(strtolower($cycle['name']), $i18n) ?></option><?php- foreach ($cycles as $cycle) {- ?>- <option value="<?= $cycle['id'] ?>" <?= $cycle['id'] == 3 ? "selected" : "" ?>><?= translate(strtolower($cycle['name']), $i18n) ?></option>- <?php- }- ?>- </select>- </div>- </div>- <div class="split33">- <label for="next_payment"><?= translate('next_payment', $i18n) ?></label>- <input type="date" id="next_payment" name="next_payment" required>- </div>+ }+ ?>+ </select></div></div>-- <div class="form-group-inline">- <input type="checkbox" id="notifications" name="notifications" onchange="toggleNotificationDays()">- <label for="notifications"><?= translate('enable_notifications', $i18n) ?></label>+ <div class="split33">+ <label for="next_payment"><?= translate('next_payment', $i18n) ?></label>+ <input type="date" id="next_payment" name="next_payment" required></div>+ </div>+ </div>- <div class="form-group">- <label for="notify_days_before"><?= translate('notify_me', $i18n) ?></label>- <select id="notify_days_before" name="notify_days_before" disabled>- <option value="0"><?= translate('default_value_from_settings', $i18n) ?></option>- <option value="1">1 <?= translate('day_before', $i18n) ?></option>- <?php- for ($i = 2; $i <= 90; $i++) {- ?>- <option value="<?= $i ?>"><?= $i ?> <?= translate('days_before', $i18n) ?></option>- <?php- }- ?>- </select>- </div>+ <div class="form-group-inline">+ <input type="checkbox" id="notifications" name="notifications" onchange="toggleNotificationDays()">+ <label for="notifications"><?= translate('enable_notifications', $i18n) ?></label>+ </div>- <div class="form-group">- <label for="payment_method"><?= translate('payment_method', $i18n) ?></label>- <select id="payment_method" name="payment_method_id">- <?php- foreach ($payment_methods as $payment) {- ?>- <option value="<?= $payment['id'] ?>">- <?= $payment['name'] ?>- </option>- <?php- }- ?>- </select>- </div>+ <div class="form-group">+ <label for="notify_days_before"><?= translate('notify_me', $i18n) ?></label>+ <select id="notify_days_before" name="notify_days_before" disabled>+ <option value="0"><?= translate('default_value_from_settings', $i18n) ?></option>+ <option value="1">1 <?= translate('day_before', $i18n) ?></option>+ <?php+ for ($i = 2; $i <= 90; $i++) {+ ?>+ <option value="<?= $i ?>"><?= $i ?> <?= translate('days_before', $i18n) ?></option>+ <?php+ }+ ?>+ </select>+ </div>- <div class="form-group">- <label for="category"><?= translate('category', $i18n) ?></label>- <select id="category" name="category_id">- <?php- foreach ($categories as $category) {- ?>- <option value="<?= $category['id'] ?>">- <?= $category['name'] ?>- </option>- <?php- }- ?>- </select>- </div>-+ <div class="form-group">+ <label for="payment_method"><?= translate('payment_method', $i18n) ?></label>+ <select id="payment_method" name="payment_method_id">+ <?php+ foreach ($payment_methods as $payment) {+ ?>+ <option value="<?= $payment['id'] ?>">+ <?= $payment['name'] ?>+ </option>+ <?php+ }+ ?>+ </select>+ </div>- <div class="form-group">- <label for="payer_user"><?= translate('paid_by', $i18n) ?></label>- <select id="payer_user" name="payer_user_id">- <?php- foreach ($members as $member) {- ?>- <option value="<?= $member['id'] ?>"><?= $member['name'] ?></option>- <?php- }- ?>- </select>- </div>+ <div class="form-group">+ <label for="category"><?= translate('category', $i18n) ?></label>+ <select id="category" name="category_id">+ <?php+ foreach ($categories as $category) {+ ?>+ <option value="<?= $category['id'] ?>">+ <?= $category['name'] ?>+ </option>+ <?php+ }+ ?>+ </select>+ </div>- <div class="form-group">- <input type="text" id="url" name="url" placeholder="<?= translate('url', $i18n) ?>">- </div>- <div class="form-group">- <input type="text" id="notes" name="notes" placeholder="<?= translate('notes', $i18n) ?>">- </div>+ <div class="form-group">+ <label for="payer_user"><?= translate('paid_by', $i18n) ?></label>+ <select id="payer_user" name="payer_user_id">+ <?php+ foreach ($members as $member) {+ ?>+ <option value="<?= $member['id'] ?>"><?= $member['name'] ?></option>+ <?php+ }+ ?>+ </select>+ </div>- <div class="form-group-inline">- <input type="checkbox" id="inactive" name="inactive">- <label for="inactive"><?= translate('inactive', $i18n) ?></label>- </div>+ <div class="form-group">+ <input type="text" id="url" name="url" placeholder="<?= translate('url', $i18n) ?>">+ </div>- <div class="buttons">- <input type="button" value="<?= translate('delete', $i18n) ?>" class="warning-button left thin" id="deletesub" style="display: none">- <input type="button" value="<?= translate('cancel', $i18n) ?>" class="secondary-button thin" onClick="closeAddSubscription()">- <input type="submit" value="<?= translate('save', $i18n) ?>" class="thin" id="save-button">- </div>- </form>- </section>- </section>- <script src="scripts/dashboard.js?<?= $version ?>"></script>+ <div class="form-group">+ <input type="text" id="notes" name="notes" placeholder="<?= translate('notes', $i18n) ?>">+ </div>++ <div class="form-group-inline">+ <input type="checkbox" id="inactive" name="inactive">+ <label for="inactive"><?= translate('inactive', $i18n) ?></label>+ </div>++ <div class="buttons">+ <input type="button" value="<?= translate('delete', $i18n) ?>" class="warning-button left thin" id="deletesub"+ style="display: none">+ <input type="button" value="<?= translate('cancel', $i18n) ?>" class="secondary-button thin"+ onClick="closeAddSubscription()">+ <input type="submit" value="<?= translate('save', $i18n) ?>" class="thin" id="save-button">+ </div>+ </form>+ </section>+</section>+<script src="scripts/dashboard.js?<?= $version ?>"></script><?php- require_once 'includes/footer.php';-?>+require_once 'includes/footer.php';+?>\ No newline at end of filediff --git a/login.php b/login.phpindex 501a9c1..e20898d 100644--- a/login.php+++ b/login.php@@ -18,14 +18,14 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {$db->close();header("Location: .");exit();-}+}// Check if login is disabled$adminQuery = "SELECT login_disabled FROM admin";$adminResult = $db->query($adminQuery);$adminRow = $adminResult->fetchArray(SQLITE3_ASSOC);if ($adminRow['login_disabled'] == 1) {-+$query = "SELECT id, username, main_currency, language FROM user WHERE id = :id";$stmt = $db->prepare($query);$stmt->bindValue(':id', 1, SQLITE3_INTEGER);@@ -57,7 +57,7 @@ if ($adminRow['login_disabled'] == 1) {$stmt = $db->prepare($query);$result = $stmt->execute();$settings = $result->fetchArray(SQLITE3_ASSOC);- setcookie('colorTheme', $settings['color_theme'], $cookieExpire);+ setcookie('colorTheme', $settings['color_theme'], $cookieExpire);$cookieValue = $username . "|" . "abc123ABC" . "|" . $main_currency;setcookie('wallos_login', $cookieValue, $cookieExpire);@@ -69,8 +69,11 @@ if ($adminRow['login_disabled'] == 1) {$theme = "light";+$updateThemeSettings = false;if (isset($_COOKIE['theme'])) {$theme = $_COOKIE['theme'];+} else {+ $updateThemeSettings = true;}$colorTheme = "blue";@@ -123,7 +126,7 @@ if (isset($_POST['username']) && isset($_POST['password'])) {$result = $stmt->execute();$settings = $result->fetchArray(SQLITE3_ASSOC);setcookie('colorTheme', $settings['color_theme'], $cookieExpire);-+$token = bin2hex(random_bytes(32));$addLoginTokens = "INSERT INTO login_tokens (user_id, token) VALUES (:userId, :token)";$addLoginTokensStmt = $db->prepare($addLoginTokens);@@ -138,7 +141,7 @@ if (isset($_POST['username']) && isset($_POST['password'])) {header("Location: .");exit();}-+} else {$loginFailed = true;}@@ -175,10 +178,11 @@ if ($adminRow['smtp_address'] != "" && $adminRow['server_url'] != "") {?><!DOCTYPE html><html dir="<?= $languages[$lang]['dir'] ?>">+<head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">- <meta name="theme-color" content="<?= $theme == "light" ? "#FFFFFF" : "#222222" ?>"/>+ <meta name="theme-color" content="<?= $theme == "light" ? "#FFFFFF" : "#222222" ?>" id="theme-color" /><title>Wallos - Subscription Tracker</title><link rel="icon" type="image/png" href="images/icon/favicon.ico" sizes="16x16"><link rel="apple-touch-icon" sizes="180x180" href="images/icon/apple-touch-icon.png">@@ -191,17 +195,25 @@ if ($adminRow['smtp_address'] != "" && $adminRow['server_url'] != "") {<link rel="stylesheet" href="styles/font-awesome.min.css"><link rel="stylesheet" href="styles/barlow.css"><link rel="stylesheet" href="styles/login-dark-theme.css?<?= $version ?>" id="dark-theme" <?= $theme == "light" ? "disabled" : "" ?>>+ <script type="text/javascript">+ window.update_theme_settings = "<?= $updateThemeSettings ?>";+ window.color_theme = "<?= $colorTheme ?>";+ </script>+ <script type="text/javascript" src="scripts/login.js?<?= $version ?>"></script></head>+<body class="<?= $languages[$lang]['dir'] ?>"><div class="content"><section class="container"><header>- <?php- if ($theme == "light") {- ?> <img src="images/siteicons/<?= $colorTheme ?>/wallos.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" width="215" /> <?php- } else {- ?> <img src="images/siteicons/<?= $colorTheme ?>/walloswhite.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" width="215" /> <?php- }+ <?php+ if ($theme == "light") {+ ?> <img src="images/siteicons/<?= $colorTheme ?>/wallos.png" alt="Wallos Logo"+ title="Wallos - Subscription Tracker" width="215" id="wallos-logo" /> <?php+ } else {+ ?> <img src="images/siteicons/<?= $colorTheme ?>/walloswhite.png" alt="Wallos Logo"+ title="Wallos - Subscription Tracker" width="215" id="wallos-logo" /> <?php+ }?><p><?= translate('please_login', $i18n) ?>@@ -224,62 +236,65 @@ if ($adminRow['smtp_address'] != "" && $adminRow['server_url'] != "") {<input type="submit" value="<?= translate('login', $i18n) ?>"></div><?php- if ($loginFailed) {- ?>- <ul class="error-box">+ if ($loginFailed) {+ ?>+ <ul class="error-box"><?php- if ($userEmailWaitingVerification) {- ?>- <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('user_email_waiting_verification', $i18n) ?></li>- <?php- } else {- ?>- <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('login_failed', $i18n) ?></li>- <?php- }+ if ($userEmailWaitingVerification) {+ ?>+ <li><i+ class="fa-solid fa-triangle-exclamation"></i><?= translate('user_email_waiting_verification', $i18n) ?>+ </li>+ <?php+ } else {+ ?>+ <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('login_failed', $i18n) ?></li>+ <?php+ }?>- </ul>- <?php- }- if ($hasSuccessMessage) {- ?>- <ul class="success-box">+ </ul>+ <?php+ }+ if ($hasSuccessMessage) {+ ?>+ <ul class="success-box"><?php- if (isset($_GET['validated']) && $_GET['validated'] == "true") {- ?>- <li><i class="fa-solid fa-check"></i><?= translate('email_verified', $i18n) ?></li>- <?php- } else if (isset($_GET['registered']) && $_GET['registered']) {- ?>+ if (isset($_GET['validated']) && $_GET['validated'] == "true") {+ ?>+ <li><i class="fa-solid fa-check"></i><?= translate('email_verified', $i18n) ?></li>+ <?php+ } else if (isset($_GET['registered']) && $_GET['registered']) {+ ?><li><i class="fa-solid fa-check"></i><?= translate('registration_successful', $i18n) ?></li><?phpif (isset($_GET['requireValidation']) && $_GET['requireValidation'] == true) {?><li><?= translate('user_email_waiting_verification', $i18n) ?></li>- <?php+ <?php}- }+ }?>- </ul>- <?php- }+ </ul>+ <?php+ }- if ($resetPasswordEnabled) {- ?>- <div class="login-form-link">- <a href="passwordreset.php"><?= translate('forgot_password', $i18n) ?></a>- </div>- <?php- }+ if ($resetPasswordEnabled) {+ ?>+ <div class="login-form-link">+ <a href="passwordreset.php"><?= translate('forgot_password', $i18n) ?></a>+ </div>+ <?php+ }?><?php- if ($registrations) {- ?>- <div class="separator">- <input type="button" class="secondary-button" onclick="openRegitrationPage()" value="<?= translate('register', $i18n) ?>"></input>- </div>- <?php- }+ if ($registrations) {+ ?>+ <div class="separator">+ <input type="button" class="secondary-button" onclick="openRegitrationPage()"+ value="<?= translate('register', $i18n) ?>"></input>+ </div>+ <?php+ }?></form></section>@@ -290,4 +305,5 @@ if ($adminRow['smtp_address'] != "" && $adminRow['server_url'] != "") {}</script></body>+</html>\ No newline at end of filediff --git a/logos.php b/logos.phpindex b4829f3..e3384d3 100644--- a/logos.php+++ b/logos.php@@ -1,54 +1,56 @@<!DOCTYPE html><html>+<head><title>Subscription Logos</title><script type="text/javascript">document.addEventListener("DOMContentLoaded", function () {- const searchForm = document.getElementById("search-form");- const imageResults = document.getElementById("image-results");-- searchForm.addEventListener("submit", function (e) {- e.preventDefault();-- const searchTerm = document.getElementById("search").value.trim();- if (searchTerm === "") {- alert("Please enter a search term.");- return;- }-- // Use the proxy to perform a Google image search- const proxyUrl = `endpoints/logos/search.php?search=${searchTerm}`;-- // Send an AJAX request to the proxy- fetch(proxyUrl)- .then(response => response.json())- .then(data => {- if (data.imageUrls) {- // Display the image sources from the PHP response.- displayImageResults(data.imageUrls);- } else if (data.error) {- console.error(data.error);+ const searchForm = document.getElementById("search-form");+ const imageResults = document.getElementById("image-results");++ searchForm.addEventListener("submit", function (e) {+ e.preventDefault();++ const searchTerm = document.getElementById("search").value.trim();+ if (searchTerm === "") {+ alert("Please enter a search term.");+ return;}- })- .catch(error => {- console.error("Error fetching image results:", error);++ // Use the proxy to perform a Google image search+ const proxyUrl = `endpoints/logos/search.php?search=${searchTerm}`;++ // Send an AJAX request to the proxy+ fetch(proxyUrl)+ .then(response => response.json())+ .then(data => {+ if (data.imageUrls) {+ // Display the image sources from the PHP response.+ displayImageResults(data.imageUrls);+ } else if (data.error) {+ console.error(data.error);+ }+ })+ .catch(error => {+ console.error("Error fetching image results:", error);+ });});- });- function displayImageResults(imageSources) {- // Clear previous results- imageResults.innerHTML = "";+ function displayImageResults(imageSources) {+ // Clear previous results+ imageResults.innerHTML = "";- // Display the image sources as image elements- imageSources.forEach(src => {- const img = document.createElement("img");- img.src = src;- imageResults.appendChild(img);+ // Display the image sources as image elements+ imageSources.forEach(src => {+ const img = document.createElement("img");+ img.src = src;+ imageResults.appendChild(img);+ });+ }});- }-});</script></head>+<body><form id="search-form"><input type="text" name="search" id="search">@@ -58,4 +60,5 @@<!-- Image results will be displayed here --></div></body>+</html>\ No newline at end of filediff --git a/logout.php b/logout.phpindex 3c7b112..bc3cd4b 100644--- a/logout.php+++ b/logout.php@@ -1,20 +1,20 @@<?php- require_once 'includes/connect.php';- session_start();- // get token from cookie to remove from DB- if (isset($_SESSION['token'])) {- $token = $_SESSION['token'];- $sql = "DELETE FROM login_tokens WHERE token = :token AND user_id = :userId";- $stmt = $db->prepare($sql);- $stmt->bindParam(':token', $token, SQLITE3_TEXT);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);- $stmt->execute();- }- $_SESSION = array();- session_destroy();- $cookieExpire = time() - 3600;- setcookie('wallos_login', '', $cookieExpire);- $db->close();- header("Location: .");- exit();+require_once 'includes/connect.php';+session_start();+// get token from cookie to remove from DB+if (isset($_SESSION['token'])) {+ $token = $_SESSION['token'];+ $sql = "DELETE FROM login_tokens WHERE token = :token AND user_id = :userId";+ $stmt = $db->prepare($sql);+ $stmt->bindParam(':token', $token, SQLITE3_TEXT);+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);+ $stmt->execute();+}+$_SESSION = array();+session_destroy();+$cookieExpire = time() - 3600;+setcookie('wallos_login', '', $cookieExpire);+$db->close();+header("Location: .");+exit();?>\ No newline at end of filediff --git a/passwordreset.php b/passwordreset.phpindex b5a453e..2d78bcf 100644--- a/passwordreset.php+++ b/passwordreset.php@@ -14,7 +14,7 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {$db->close();header("Location: .");exit();-}+}$requestMode = true;$resetMode = false;@@ -104,10 +104,11 @@ if (isset($_POST['password']) && $_POST['password'] != "" && isset($_POST['confi?><!DOCTYPE html><html dir="<?= $languages[$lang]['dir'] ?>">+<head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">- <meta name="theme-color" content="<?= $theme == "light" ? "#FFFFFF" : "#222222" ?>"/>+ <meta name="theme-color" content="<?= $theme == "light" ? "#FFFFFF" : "#222222" ?>" /><title>Wallos - Subscription Tracker</title><link rel="icon" type="image/png" href="images/icon/favicon.ico" sizes="16x16"><link rel="apple-touch-icon" sizes="180x180" href="images/icon/apple-touch-icon.png">@@ -121,16 +122,19 @@ if (isset($_POST['password']) && $_POST['password'] != "" && isset($_POST['confi<link rel="stylesheet" href="styles/barlow.css"><link rel="stylesheet" href="styles/login-dark-theme.css?<?= $version ?>" id="dark-theme" <?= $theme == "light" ? "disabled" : "" ?>></head>+<body class="<?= $languages[$lang]['dir'] ?>"><div class="content"><section class="container"><header>- <?php- if ($theme == "light") {- ?> <img src="images/siteicons/<?= $colorTheme ?>/wallos.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" width="215" /> <?php- } else {- ?> <img src="images/siteicons/<?= $colorTheme ?>/walloswhite.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" width="215" /> <?php- }+ <?php+ if ($theme == "light") {+ ?> <img src="images/siteicons/<?= $colorTheme ?>/wallos.png" alt="Wallos Logo"+ title="Wallos - Subscription Tracker" width="215" /> <?php+ } else {+ ?> <img src="images/siteicons/<?= $colorTheme ?>/walloswhite.png" alt="Wallos Logo"+ title="Wallos - Subscription Tracker" width="215" /> <?php+ }?><p><?= translate('reset_password', $i18n) ?>@@ -138,8 +142,8 @@ if (isset($_POST['password']) && $_POST['password'] != "" && isset($_POST['confi</header><form action="passwordreset.php?submit=true" method="post"><?php- if ($requestMode) {- if (!$hideForm) {+ if ($requestMode) {+ if (!$hideForm) {?><div class="form-group"><label for="email"><?= translate('email', $i18n) ?>:</label>@@ -149,24 +153,24 @@ if (isset($_POST['password']) && $_POST['password'] != "" && isset($_POST['confi<input type="submit" value="<?= translate('reset_password', $i18n) ?>"></div><?php- }- if ($hasSuccessMessage) {- ?>- <ul class="success-box">- <li><i class="fa-solid fa-check"></i><?= translate('reset_sent_check_email', $i18n) ?></li>- </ul>- <?php- }- if ($hasErrorMessage) {- ?>- <ul class="error-box">- <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('error', $i18n) ?></li>- </ul>- <?php- }}- if ($resetMode) {- if (!$hideForm) {+ if ($hasSuccessMessage) {+ ?>+ <ul class="success-box">+ <li><i class="fa-solid fa-check"></i><?= translate('reset_sent_check_email', $i18n) ?></li>+ </ul>+ <?php+ }+ if ($hasErrorMessage) {+ ?>+ <ul class="error-box">+ <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('error', $i18n) ?></li>+ </ul>+ <?php+ }+ }+ if ($resetMode) {+ if (!$hideForm) {?><div class="form-group"><input type="hidden" name="token" value="<?= $token ?>">@@ -182,30 +186,31 @@ if (isset($_POST['password']) && $_POST['password'] != "" && isset($_POST['confi<input type="submit" value="<?= translate('reset_password', $i18n) ?>"></div><?php- }- if ($hasErrorMessage) {- if ($passwordsMismatch) {- ?>- <ul class="error-box">- <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('passwords_dont_match', $i18n) ?></li>- </ul>- <?php- } else {- ?>- <ul class="error-box">- <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('error', $i18n) ?></li>- </ul>- <?php- }- }- if ($hasSuccessMessage) {+ }+ if ($hasErrorMessage) {+ if ($passwordsMismatch) {?>- <ul class="success-box">- <li><i class="fa-solid fa-check"></i><?= translate('password_reset_successful', $i18n) ?></li>+ <ul class="error-box">+ <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('passwords_dont_match', $i18n) ?>+ </li>+ </ul>+ <?php+ } else {+ ?>+ <ul class="error-box">+ <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('error', $i18n) ?></li></ul><?php}}+ if ($hasSuccessMessage) {+ ?>+ <ul class="success-box">+ <li><i class="fa-solid fa-check"></i><?= translate('password_reset_successful', $i18n) ?></li>+ </ul>+ <?php+ }+ }?><div class="login-form-link"><a href="login.php"><?= translate('login', $i18n) ?></a>@@ -219,6 +224,7 @@ if (isset($_POST['password']) && $_POST['password'] != "" && isset($_POST['confi}</script></body>+</html>?>\ No newline at end of filediff --git a/registration.php b/registration.phpindex 689adb0..ce4dabe 100644--- a/registration.php+++ b/registration.php@@ -8,7 +8,8 @@ require_once 'includes/i18n/' . $lang . '.php';require_once 'includes/version.php';-function validate($value) {+function validate($value)+{$value = trim($value);$value = stripslashes($value);$value = htmlspecialchars($value);@@ -43,8 +44,11 @@ if ($userCount > 0) {$theme = "light";+$updateThemeSettings = false;if (isset($_COOKIE['theme'])) {$theme = $_COOKIE['theme'];+} else {+ $updateThemeSettings = true;}$colorTheme = "blue";@@ -282,150 +286,163 @@ if (isset($_POST['username'])) {$requireValidation = true;}}-+$db->close();header("Location: login.php?registered=true&requireValidation=$requireValidation");exit();} else {- $registrationFailed = true;+ $registrationFailed = true;}- }+ }}?><!DOCTYPE html><html dir="<?= $languages[$lang]['dir'] ?>">- <head>- <meta charset="UTF-8">- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">- <meta name="theme-color" content="<?= $theme == "light" ? "#FFFFFF" : "#222222" ?>"/>- <title>Wallos - Subscription Tracker</title>- <link rel="icon" type="image/png" href="images/icon/favicon.ico" sizes="16x16">- <link rel="apple-touch-icon" sizes="180x180" href="images/icon/apple-touch-icon.png">- <link rel="manifest" href="manifest.json">- <link rel="stylesheet" href="styles/theme.css?<?= $version ?>">- <link rel="stylesheet" href="styles/login.css?<?= $version ?>">- <link rel="stylesheet" href="styles/themes/red.css?<?= $version ?>" id="red-theme" <?= $colorTheme != "red" ? "disabled" : "" ?>>- <link rel="stylesheet" href="styles/themes/green.css?<?= $version ?>" id="green-theme" <?= $colorTheme != "green" ? "disabled" : "" ?>>- <link rel="stylesheet" href="styles/themes/yellow.css?<?= $version ?>" id="yellow-theme" <?= $colorTheme != "yellow" ? "disabled" : "" ?>>- <link rel="stylesheet" href="styles/login-dark-theme.css?<?= $version ?>" id="dark-theme" <?= $theme == "light" ? "disabled" : "" ?>>- <link rel="stylesheet" href="styles/font-awesome.min.css">- <link rel="stylesheet" href="styles/barlow.css">- <script type="text/javascript" src="scripts/registration.js?<?= $version ?>"></script>- </head>- <body class="<?= $languages[$lang]['dir'] ?>">- <div class="content">- <section class="container">- <header>- <?php- if ($theme == "light") {- ?> <img src="images/siteicons/<?= $colorTheme ?>/wallos.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" width="215" /> <?php- } else {- ?> <img src="images/siteicons/<?= $colorTheme ?>/walloswhite.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" width="215" /> <?php- }++<head>+ <meta charset="UTF-8">+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">+ <meta name="theme-color" content="<?= $theme == "light" ? "#FFFFFF" : "#222222" ?>" id="theme-color" />+ <title>Wallos - Subscription Tracker</title>+ <link rel="icon" type="image/png" href="images/icon/favicon.ico" sizes="16x16">+ <link rel="apple-touch-icon" sizes="180x180" href="images/icon/apple-touch-icon.png">+ <link rel="manifest" href="manifest.json">+ <link rel="stylesheet" href="styles/theme.css?<?= $version ?>">+ <link rel="stylesheet" href="styles/login.css?<?= $version ?>">+ <link rel="stylesheet" href="styles/themes/red.css?<?= $version ?>" id="red-theme" <?= $colorTheme != "red" ? "disabled" : "" ?>>+ <link rel="stylesheet" href="styles/themes/green.css?<?= $version ?>" id="green-theme" <?= $colorTheme != "green" ? "disabled" : "" ?>>+ <link rel="stylesheet" href="styles/themes/yellow.css?<?= $version ?>" id="yellow-theme" <?= $colorTheme != "yellow" ? "disabled" : "" ?>>+ <link rel="stylesheet" href="styles/login-dark-theme.css?<?= $version ?>" id="dark-theme" <?= $theme == "light" ? "disabled" : "" ?>>+ <link rel="stylesheet" href="styles/font-awesome.min.css">+ <link rel="stylesheet" href="styles/barlow.css">+ <script type="text/javascript">+ window.update_theme_settings = "<?= $updateThemeSettings ?>";+ window.colorTheme = "<?= $colorTheme ?>";+ </script>+ <script type="text/javascript" src="scripts/registration.js?<?= $version ?>"></script>+</head>++<body class="<?= $languages[$lang]['dir'] ?>">+ <div class="content">+ <section class="container">+ <header>+ <?php+ if ($theme == "light") {+ ?> <img src="images/siteicons/<?= $colorTheme ?>/wallos.png" alt="Wallos Logo"+ title="Wallos - Subscription Tracker" width="215" id="wallos-logo" /> <?php+ } else {+ ?> <img src="images/siteicons/<?= $colorTheme ?>/walloswhite.png" alt="Wallos Logo"+ title="Wallos - Subscription Tracker" width="215" id="wallos-logo" /> <?php+ }?>- <p>- <?= translate('create_account', $i18n) ?>- </p>- </header>- <form action="registration.php" method="post">- <div class="form-group">- <label for="username"><?= translate('username', $i18n) ?>:</label>- <input type="text" id="username" name="username" required>- </div>- <div class="form-group">- <label for="email"><?= translate('email', $i18n) ?>:</label>- <input type="email" id="email" name="email" required>- </div>- <div class="form-group">- <label for="password"><?= translate('password', $i18n) ?>:</label>- <input type="password" id="password" name="password" required>- </div>- <div class="form-group">- <label for="confirm_password"><?= translate('confirm_password', $i18n) ?>:</label>- <input type="password" id="confirm_password" name="confirm_password" required>- </div>- <div class="form-group">- <label for="currency"><?= translate('main_currency', $i18n) ?>:</label>- <select id="currency" name="main_currency" placeholder="Currency">+ <p>+ <?= translate('create_account', $i18n) ?>+ </p>+ </header>+ <form action="registration.php" method="post">+ <div class="form-group">+ <label for="username"><?= translate('username', $i18n) ?>:</label>+ <input type="text" id="username" name="username" required>+ </div>+ <div class="form-group">+ <label for="email"><?= translate('email', $i18n) ?>:</label>+ <input type="email" id="email" name="email" required>+ </div>+ <div class="form-group">+ <label for="password"><?= translate('password', $i18n) ?>:</label>+ <input type="password" id="password" name="password" required>+ </div>+ <div class="form-group">+ <label for="confirm_password"><?= translate('confirm_password', $i18n) ?>:</label>+ <input type="password" id="confirm_password" name="confirm_password" required>+ </div>+ <div class="form-group">+ <label for="currency"><?= translate('main_currency', $i18n) ?>:</label>+ <select id="currency" name="main_currency" placeholder="Currency"><?php- foreach ($currencies as $currency) {- ?>+ foreach ($currencies as $currency) {+ ?><option value="<?= $currency['code'] ?>"><?= $currency['name'] ?></option>- <?php- }- ?>- </select>- </div>- <div class="form-group">- <label for="language"><?= translate('language', $i18n) ?>:</label>- <select id="language" name="language" placeholder="Language" onchange="changeLanguage(this.value)">- <?php- foreach ($languages as $code => $language) {- $selected = ($code === $lang) ? 'selected' : '';+ <?php+ }?>- <option value="<?= $code ?>" <?= $selected ?>><?= $language['name'] ?></option>+ </select>+ </div>+ <div class="form-group">+ <label for="language"><?= translate('language', $i18n) ?>:</label>+ <select id="language" name="language" placeholder="Language" onchange="changeLanguage(this.value)"><?php- }+ foreach ($languages as $code => $language) {+ $selected = ($code === $lang) ? 'selected' : '';+ ?>+ <option value="<?= $code ?>" <?= $selected ?>><?= $language['name'] ?></option>+ <?php+ }?>- </select>- </div>+ </select>+ </div>- <?php- if ($hasErrors) {+ <?php+ if ($hasErrors) {+ ?>+ <ul class="error-box">+ <?php+ if ($passwordMismatch) {?>- <ul class="error-box">+ <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('passwords_dont_match', $i18n) ?>+ </li><?php- if ($passwordMismatch) {- ?>- <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('passwords_dont_match', $i18n) ?></li>- <?php- }+ }+ ?>+ <?php+ if ($usernameExists) {?>+ <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('username_exists', $i18n) ?></li><?php- if ($usernameExists) {- ?>- <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('username_exists', $i18n) ?></li>- <?php- }+ }+ ?>+ <?php+ if ($emailExists) {?>+ <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('email_exists', $i18n) ?></li><?php- if ($emailExists) {- ?>- <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('email_exists', $i18n) ?></li>- <?php- }+ }+ ?>+ <?php+ if ($registrationFailed) {?>- <?php- if ($registrationFailed) {- ?>- <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('registration_failed', $i18n) ?></li>- <?php- }- ?>- </ul>+ <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('registration_failed', $i18n) ?>+ </li><?php}- ?>--- <div class="form-group">- <input type="submit" value="<?= translate('register', $i18n) ?>">- </div>- </form>- <?php- if ($userCount == 0) {?>- <div class="separator">- <input type="button" class="secondary-button" value="<?= translate('restore_database', $i18n) ?>" id="restoreDB" onClick="openRestoreDBFileSelect()" />- <input type="file" name="restoreDBFile" id="restoreDBFile" style="display: none;" onChange="restoreDB()" accept=".zip">- </div>- <?php- }- ?>- </section>- </div>- <?php- require_once 'includes/footer.php';- ?>- </body>+ </ul>+ <?php+ }+ ?>+++ <div class="form-group">+ <input type="submit" value="<?= translate('register', $i18n) ?>">+ </div>+ </form>+ <?php+ if ($userCount == 0) {+ ?>+ <div class="separator">+ <input type="button" class="secondary-button" value="<?= translate('restore_database', $i18n) ?>"+ id="restoreDB" onClick="openRestoreDBFileSelect()" />+ <input type="file" name="restoreDBFile" id="restoreDBFile" style="display: none;" onChange="restoreDB()"+ accept=".zip">+ </div>+ <?php+ }+ ?>+ </section>+ </div>+ <?php+ require_once 'includes/footer.php';+ ?>+</body>+</html>\ No newline at end of filediff --git a/scripts/common.js b/scripts/common.jsindex a7181f0..f76aee0 100644--- a/scripts/common.js+++ b/scripts/common.js@@ -1,86 +1,97 @@let isDropdownOpen = false;function toggleDropdown() {- const dropdown = document.querySelector('.dropdown');- dropdown.classList.toggle('is-open');- isDropdownOpen = !isDropdownOpen;+ const dropdown = document.querySelector('.dropdown');+ dropdown.classList.toggle('is-open');+ isDropdownOpen = !isDropdownOpen;}function showErrorMessage(message) {- const toast = document.querySelector(".toast#errorToast");- (closeIcon = document.querySelector(".close-error")),+ const toast = document.querySelector(".toast#errorToast");+ (closeIcon = document.querySelector(".close-error")),(errorMessage = document.querySelector(".errorMessage")),(progress = document.querySelector(".progress.error"));- let timer1, timer2;- errorMessage.textContent = message;- toast.classList.add("active");- progress.classList.add("active");- timer1 = setTimeout(() => {- toast.classList.remove("active");- closeIcon.removeEventListener("click", () => {});- }, 5000);-- timer2 = setTimeout(() => {+ let timer1, timer2;+ errorMessage.textContent = message;+ toast.classList.add("active");+ progress.classList.add("active");+ timer1 = setTimeout(() => {+ toast.classList.remove("active");+ closeIcon.removeEventListener("click", () => { });+ }, 5000);++ timer2 = setTimeout(() => {+ progress.classList.remove("active");+ }, 5300);++ closeIcon.addEventListener("click", () => {+ toast.classList.remove("active");++ setTimeout(() => {progress.classList.remove("active");- }, 5300);-- closeIcon.addEventListener("click", () => {- toast.classList.remove("active");-- setTimeout(() => {- progress.classList.remove("active");- }, 300);-- clearTimeout(timer1);- clearTimeout(timer2);- closeIcon.removeEventListener("click", () => {});- });+ }, 300);++ clearTimeout(timer1);+ clearTimeout(timer2);+ closeIcon.removeEventListener("click", () => { });+ });}function showSuccessMessage(message) {- const toast = document.querySelector(".toast#successToast");- (closeIcon = document.querySelector(".close-success")),+ const toast = document.querySelector(".toast#successToast");+ (closeIcon = document.querySelector(".close-success")),(successMessage = document.querySelector(".successMessage")),(progress = document.querySelector(".progress.success"));- let timer1, timer2;- successMessage.textContent = message;- toast.classList.add("active");- progress.classList.add("active");- timer1 = setTimeout(() => {- toast.classList.remove("active");- closeIcon.removeEventListener("click", () => {});- }, 5000);-- timer2 = setTimeout(() => {+ let timer1, timer2;+ successMessage.textContent = message;+ toast.classList.add("active");+ progress.classList.add("active");+ timer1 = setTimeout(() => {+ toast.classList.remove("active");+ closeIcon.removeEventListener("click", () => { });+ }, 5000);++ timer2 = setTimeout(() => {+ progress.classList.remove("active");+ }, 5300);++ closeIcon.addEventListener("click", () => {+ toast.classList.remove("active");++ setTimeout(() => {progress.classList.remove("active");- }, 5300);-- closeIcon.addEventListener("click", () => {- toast.classList.remove("active");-- setTimeout(() => {- progress.classList.remove("active");- }, 300);-- clearTimeout(timer1);- clearTimeout(timer2);- closeIcon.removeEventListener("click", () => {});- });+ }, 300);++ clearTimeout(timer1);+ clearTimeout(timer2);+ closeIcon.removeEventListener("click", () => { });+ });}-document.addEventListener('DOMContentLoaded', function() {+document.addEventListener('DOMContentLoaded', function () {++ if (window.update_theme_settings) {+ const prefersDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;+ const themePreference = prefersDarkMode ? 'dark' : 'light';+ const darkThemeCss = document.querySelector("#dark-theme");+ darkThemeCss.disabled = themePreference === 'light';+ document.body.className = themePreference;+ document.cookie = `inUseTheme=${themePreference}; expires=Fri, 31 Dec 9999 23:59:59 GMT`;+ const themeColorMetaTag = document.querySelector('meta[name="theme-color"]');+ themeColorMetaTag.setAttribute('content', themePreference === 'dark' ? '#222222' : '#FFFFFF');+ }- document.addEventListener('mousedown', function(event) {- var dropdown = document.querySelector('.dropdown');- var dropdownContent = document.querySelector('.dropdown-content');+ document.addEventListener('mousedown', function (event) {+ var dropdown = document.querySelector('.dropdown');+ var dropdownContent = document.querySelector('.dropdown-content');- if (!dropdown.contains(event.target) && isDropdownOpen) {- dropdown.classList.remove('is-open');- isDropdownOpen = false;- }- });+ if (!dropdown.contains(event.target) && isDropdownOpen) {+ dropdown.classList.remove('is-open');+ isDropdownOpen = false;+ }+ });- document.querySelector('.dropdown-content').addEventListener('focus', function() {- isDropdownOpen = true;- });+ document.querySelector('.dropdown-content').addEventListener('focus', function () {+ isDropdownOpen = true;+ });});\ No newline at end of filediff --git a/scripts/login.js b/scripts/login.jsnew file mode 100644index 0000000..bc6956a--- /dev/null+++ b/scripts/login.js@@ -0,0 +1,18 @@+document.addEventListener('DOMContentLoaded', function () {++ if (window.update_theme_settings) {+ const prefersDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;+ const themePreference = prefersDarkMode ? 'dark' : 'light';+ const darkThemeCss = document.querySelector("#dark-theme");+ darkThemeCss.disabled = themePreference === 'light';+ document.body.className = themePreference;+ const themeColorMetaTag = document.querySelector('meta[name="theme-color"]');+ themeColorMetaTag.setAttribute('content', themePreference === 'dark' ? '#222222' : '#FFFFFF');+ const logoImage = document.querySelector('#wallos-logo');+ const imageName = themePreference === 'dark' ? 'walloswhite' : 'wallos';+ const colorTheme = window.color_theme ?? 'blue';+ logoImage.src = `images/siteicons/${colorTheme}/${imageName}.png`;++ }++});\ No newline at end of filediff --git a/scripts/registration.js b/scripts/registration.jsindex 364682c..ca188f8 100644--- a/scripts/registration.js+++ b/scripts/registration.js@@ -157,8 +157,25 @@ function restoreDB() {.catch(error => showErrorMessage('Error:', error));}+function checkThemeNeedsUpdate() {+ if (window.update_theme_settings) {+ const prefersDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;+ const themePreference = prefersDarkMode ? 'dark' : 'light';+ const darkThemeCss = document.querySelector("#dark-theme");+ darkThemeCss.disabled = themePreference === 'light';+ document.body.className = themePreference;+ const themeColorMetaTag = document.querySelector('meta[name="theme-color"]');+ themeColorMetaTag.setAttribute('content', themePreference === 'dark' ? '#222222' : '#FFFFFF');+ const logoImage = document.querySelector('#wallos-logo');+ const imageName = themePreference === 'dark' ? 'walloswhite' : 'wallos';+ const colorTheme = window.color_theme ?? 'blue';+ logoImage.src = `images/siteicons/${colorTheme}/${imageName}.png`;+ }+}+window.onload = function () {restoreFormFields();removeFromStorage();runDatabaseMigration();+ checkThemeNeedsUpdate();};diff --git a/scripts/settings.js b/scripts/settings.jsindex 5352aa9..63d9d2b 100644--- a/scripts/settings.js+++ b/scripts/settings.js@@ -903,6 +903,65 @@ function switchTheme() {});}+function setDarkTheme(theme) {+ const darkThemeRadio = document.querySelector("#theme-dark");+ const lightThemeRadio = document.querySelector("#theme-light");+ const automaticThemeRadio = document.querySelector("#theme-automatic");+ const darkThemeCss = document.querySelector("#dark-theme");+ const themes = {0: 'light', 1: 'dark', 2: 'automatic'};+ const themeValue = themes[theme];+ const prefersDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;++ darkThemeRadio.disabled = true;+ lightThemeRadio.disabled = true;+ automaticThemeRadio.disabled = true;++ fetch('endpoints/settings/theme.php', {+ method: 'POST',+ headers: {+ 'Content-Type': 'application/json'+ },+ body: JSON.stringify({theme: theme})+ })+ .then(response => response.json())+ .then(data => {+ if (data.success) {+ darkThemeRadio.disabled = false;+ lightThemeRadio.disabled = false;+ automaticThemeRadio.disabled = false;++ document.cookie = `theme=${themeValue}; expires=Fri, 31 Dec 9999 23:59:59 GMT`;++ if (theme == 0) {+ darkThemeCss.disabled = true;+ document.body.className = 'light';+ }++ if (theme == 1) {+ darkThemeCss.disabled = false;+ document.body.className = 'dark';+ }++ if (theme == 2) {+ darkThemeCss.disabled = !prefersDarkMode;+ document.body.className = prefersDarkMode ? 'dark' : 'light';+ document.cookie = `inUseTheme=${prefersDarkMode ? 'dark' : 'light'}; expires=Fri, 31 Dec 9999 23:59:59 GMT`;+ }++ showSuccessMessage(data.message);+ } else {+ showErrorMessage(data.errorMessage);+ darkThemeRadio.disabled = false;+ lightThemeRadio.disabled = false;+ automaticThemeRadio.disabled = false;+ }+ }).catch(error => {+ darkThemeRadio.disabled = false;+ lightThemeRadio.disabled = false;+ automaticThemeRadio.disabled = false;+ });+}+function storeSettingsOnDB(endpoint, value) {fetch('endpoints/settings/' + endpoint + '.php', {method: 'POST',diff --git a/service-worker.js b/service-worker.jsindex 0fa4249..7554a22 100644--- a/service-worker.js+++ b/service-worker.js@@ -31,6 +31,7 @@ self.addEventListener('install', function(event) {'scripts/settings.js','scripts/notifications.js','scripts/registration.js',+ 'scripts/login.js','scripts/admin.js','scripts/calendar.js','scripts/i18n/en.js',diff --git a/settings.php b/settings.phpindex 0fa53eb..1a1bd9d 100644--- a/settings.php+++ b/settings.php@@ -1,120 +1,128 @@<?php- require_once 'includes/header.php';+require_once 'includes/header.php';?><script src="scripts/libs/sortable.min.js"></script><style>- .logo-preview:after {+ .logo-preview:after {content: '<?= translate('upload_logo', $i18n) ?>';- }+ }</style><section class="contain settings"><section class="account-section"><header><h2><?= translate('user_details', $i18n) ?></h2></header>- <form action="endpoints/user/saveuser.php" method="post" id="userForm" enctype="multipart/form-data">- <div class="user-form">- <div class="fields">- <div>- <div class="user-avatar">- <img src="<?= $userData['avatar'] ?>" alt="avatar" class="avatar" id="avatarImg" onClick="toggleAvatarSelect()"/>- <span class="edit-avatar" onClick="toggleAvatarSelect()" title="Change Avatar">- <i class="fa-solid fa-pencil"></i>- </span>- </div>+ <form action="endpoints/user/saveuser.php" method="post" id="userForm" enctype="multipart/form-data">+ <div class="user-form">+ <div class="fields">+ <div>+ <div class="user-avatar">+ <img src="<?= $userData['avatar'] ?>" alt="avatar" class="avatar" id="avatarImg"+ onClick="toggleAvatarSelect()" />+ <span class="edit-avatar" onClick="toggleAvatarSelect()" title="Change Avatar">+ <i class="fa-solid fa-pencil"></i>+ </span>+ </div>- <input type="hidden" name="avatar" value="<?= $userData['avatar'] ?>" id="avatarUser"/>- <div class="avatar-select" id="avatarSelect">- <div class="avatar-list">- <?php foreach (scandir('images/avatars') as $index => $image) :?>- <?php if (! str_starts_with($image, '.')) :?>- <img src="images/avatars/<?=$image?>" alt="<?=$image?>" class="avatar-option" data-src="images/avatars/<?=$image?>"/>- <?php endif ?>- <?php endforeach ?>- <?php foreach (scandir('images/uploads/logos/avatars') as $index => $image) :?>- <?php if (! str_starts_with($image, '.')) :?>- <div class="avatar-container" data-src="<?=$image?>">- <img src="images/uploads/logos/avatars/<?=$image?>" alt="<?=$image?>" class="avatar-option" data-src="images/uploads/logos/avatars/<?=$image?>"/>- <div class="remove-avatar" onclick="deleteAvatar('<?=$image?>')" title="Delete avatar">- <i class="fa-solid fa-xmark"></i>- </div>+ <input type="hidden" name="avatar" value="<?= $userData['avatar'] ?>" id="avatarUser" />+ <div class="avatar-select" id="avatarSelect">+ <div class="avatar-list">+ <?php foreach (scandir('images/avatars') as $index => $image): ?>+ <?php if (!str_starts_with($image, '.')): ?>+ <img src="images/avatars/<?= $image ?>" alt="<?= $image ?>" class="avatar-option"+ data-src="images/avatars/<?= $image ?>" />+ <?php endif ?>+ <?php endforeach ?>+ <?php foreach (scandir('images/uploads/logos/avatars') as $index => $image): ?>+ <?php if (!str_starts_with($image, '.')): ?>+ <div class="avatar-container" data-src="<?= $image ?>">+ <img src="images/uploads/logos/avatars/<?= $image ?>" alt="<?= $image ?>"+ class="avatar-option" data-src="images/uploads/logos/avatars/<?= $image ?>" />+ <div class="remove-avatar" onclick="deleteAvatar('<?= $image ?>')"+ title="Delete avatar">+ <i class="fa-solid fa-xmark"></i></div>- <?php endif ?>- <?php endforeach ?>- <label for="profile_pic" class="add-avatar" title="<?= translate('upload_avatar', $i18n) ?>">- <i class="fa-solid fa-arrow-up-from-bracket"></i>- </label>- </div>- <input type="file" id="profile_pic"class="hidden-input" name="profile_pic" accept="image/jpeg, image/png, image/gif, image/webp" onChange="successfulUpload(this, '<?= translate('file_type_error', $i18n) ?>')" />+ </div>+ <?php endif ?>+ <?php endforeach ?>+ <label for="profile_pic" class="add-avatar"+ title="<?= translate('upload_avatar', $i18n) ?>">+ <i class="fa-solid fa-arrow-up-from-bracket"></i>+ </label></div>+ <input type="file" id="profile_pic" class="hidden-input" name="profile_pic"+ accept="image/jpeg, image/png, image/gif, image/webp"+ onChange="successfulUpload(this, '<?= translate('file_type_error', $i18n) ?>')" /></div>- <div class="grow">- <div class="form-group">- <label for="username"><?= translate('username', $i18n) ?>:</label>- <input type="text" id="username" name="username" value="<?= $userData['username'] ?>" disabled>- </div>- <div class="form-group">- <label for="email"><?= translate('email', $i18n) ?>:</label>- <input type="email" id="email" name="email" value="<?= $userData['email'] ?>" required>- </div>- <div class="form-group">- <label for="password"><?= translate('password', $i18n) ?>:</label>- <input type="password" id="password" name="password">- </div>- <div class="form-group">- <label for="confirm_password"><?= translate('confirm_password', $i18n) ?>:</label>- <input type="password" id="confirm_password" name="confirm_password">- </div>- <?php- $currencies = array();- $query = "SELECT * FROM currencies WHERE user_id = :userId";- $query = $db->prepare($query);- $query->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $query->execute();- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $currencyId = $row['id'];- $currencies[$currencyId] = $row;- }- $userData['currency_symbol'] = "€";- ?>- <div class="form-group">- <label for="currency"><?= translate('main_currency', $i18n) ?>:</label>- <select id="currency" name="main_currency" placeholder="Currency">- <?php- foreach ($currencies as $currency) {- $selected = "";- if ($currency['id'] == $userData['main_currency']) {- $selected = "selected";- $userData['currency_symbol'] = $currency['symbol'];- }- ?>- <option value="<?= $currency['id'] ?>" <?= $selected ?>><?= $currency['name'] ?></option>+ </div>+ <div class="grow">+ <div class="form-group">+ <label for="username"><?= translate('username', $i18n) ?>:</label>+ <input type="text" id="username" name="username" value="<?= $userData['username'] ?>"+ disabled>+ </div>+ <div class="form-group">+ <label for="email"><?= translate('email', $i18n) ?>:</label>+ <input type="email" id="email" name="email" value="<?= $userData['email'] ?>" required>+ </div>+ <div class="form-group">+ <label for="password"><?= translate('password', $i18n) ?>:</label>+ <input type="password" id="password" name="password">+ </div>+ <div class="form-group">+ <label for="confirm_password"><?= translate('confirm_password', $i18n) ?>:</label>+ <input type="password" id="confirm_password" name="confirm_password">+ </div>+ <?php+ $currencies = array();+ $query = "SELECT * FROM currencies WHERE user_id = :userId";+ $query = $db->prepare($query);+ $query->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $query->execute();+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $currencyId = $row['id'];+ $currencies[$currencyId] = $row;+ }+ $userData['currency_symbol'] = "€";+ ?>+ <div class="form-group">+ <label for="currency"><?= translate('main_currency', $i18n) ?>:</label>+ <select id="currency" name="main_currency" placeholder="Currency"><?php+ foreach ($currencies as $currency) {+ $selected = "";+ if ($currency['id'] == $userData['main_currency']) {+ $selected = "selected";+ $userData['currency_symbol'] = $currency['symbol'];}+ ?>+ <option value="<?= $currency['id'] ?>" <?= $selected ?>><?= $currency['name'] ?></option>+ <?php+ }?>- </select>- </div>- <div class="form-group">- <label for="language"><?= translate('language', $i18n) ?>:</label>- <select id="language" name="language" placeholder="Language">- <?php- foreach ($languages as $code => $language) {- $selected = ($code === $lang) ? 'selected' : '';- ?>- <option value="<?= $code ?>" <?= $selected ?>><?= $language['name'] ?></option>+ </select>+ </div>+ <div class="form-group">+ <label for="language"><?= translate('language', $i18n) ?>:</label>+ <select id="language" name="language" placeholder="Language"><?php- }+ foreach ($languages as $code => $language) {+ $selected = ($code === $lang) ? 'selected' : '';+ ?>+ <option value="<?= $code ?>" <?= $selected ?>><?= $language['name'] ?></option>+ <?php+ }?>- </select>- </div>- </div>- </div>- <div class="buttons">- <input type="submit" value="<?= translate('save', $i18n) ?>" id="userSubmit" class="thin"/>+ </select>+ </div></div></div>- </form>+ <div class="buttons">+ <input type="submit" value="<?= translate('save', $i18n) ?>" id="userSubmit" class="thin" />+ </div>+ </div>+ </form></section>@@ -126,28 +134,29 @@<div class="form-group-inline"><label for="budget"><?= $userData['currency_symbol'] ?></label><input type="number" id="budget" name="budget" value="<?= $userData['budget'] ?>" placeholder="Budget">- <input type="submit" value="<?= translate('save', $i18n) ?>" id="saveBudget" onClick="saveBudget()"/>+ <input type="submit" value="<?= translate('save', $i18n) ?>" id="saveBudget" onClick="saveBudget()" /></div><div class="settings-notes"><p>- <i class="fa-solid fa-circle-info"></i> <?= translate('budget_info', $i18n) ?></p>+ <i class="fa-solid fa-circle-info"></i> <?= translate('budget_info', $i18n) ?>+ </p><p></div></div></section><?php- $sql = "SELECT * FROM household WHERE user_id = :userId";- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ $sql = "SELECT * FROM household WHERE user_id = :userId";+ $stmt = $db->prepare($sql);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- if ($result) {- $household = array();- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $household[] = $row;- }+ if ($result) {+ $household = array();+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $household[] = $row;}+ }?><section class="account-section">@@ -155,205 +164,211 @@<h2><?= translate('household', $i18n) ?></h2></header><div class="account-members">- <div id="householdMembers">- <?php+ <div id="householdMembers">+ <?phpforeach ($household as $index => $member) {?><div class="form-group-inline" data-memberid="<?= $member['id'] ?>"><input type="text" name="member" value="<?= $member['name'] ?>" placeholder="Member"><?php- if ($index !== 0) {- ?>- <input type="text" name="email" value="<?= $member['email'] ?? "" ?>" placeholder="<?= translate("email", $i18n) ?>">- <?php- }+ if ($index !== 0) {+ ?>+ <input type="text" name="email" value="<?= $member['email'] ?? "" ?>"+ placeholder="<?= translate("email", $i18n) ?>">+ <?php+ }?>- <button class="image-button medium" onClick="editMember(<?= $member['id'] ?>)" name="save">- <img src="images/siteicons/<?= $colorTheme ?>/save.png" title="<?= translate('save_member', $i18n) ?>">+ <button class="image-button medium" onClick="editMember(<?= $member['id'] ?>)" name="save">+ <img src="images/siteicons/<?= $colorTheme ?>/save.png"+ title="<?= translate('save_member', $i18n) ?>"></button><?php- if ($index !== 0) {- ?>- <button class="image-button medium" onClick="removeMember(<?= $member['id'] ?>)">- <img src="images/siteicons/<?= $colorTheme ?>/delete.png" title="<?= translate('delete_member', $i18n) ?>">- </button>- <?php- } else {- ?>- <button class="image-button medium disabled">- <img src="images/siteicons/<?= $colorTheme ?>/delete.png" title="<?= translate('cant_delete_member', $i18n) ?>">- </button>- <?php- }+ if ($index !== 0) {+ ?>+ <button class="image-button medium" onClick="removeMember(<?= $member['id'] ?>)">+ <img src="images/siteicons/<?= $colorTheme ?>/delete.png"+ title="<?= translate('delete_member', $i18n) ?>">+ </button>+ <?php+ } else {+ ?>+ <button class="image-button medium disabled">+ <img src="images/siteicons/<?= $colorTheme ?>/delete.png"+ title="<?= translate('cant_delete_member', $i18n) ?>">+ </button>+ <?php+ }?></div><?php}- ?>+ ?></div><div class="settings-notes"><p>- <i class="fa-solid fa-circle-info"></i> <?= translate('household_info', $i18n) ?></p>+ <i class="fa-solid fa-circle-info"></i> <?= translate('household_info', $i18n) ?>+ </p><p></div><div class="buttons">- <input type="submit" value="<?= translate('add', $i18n) ?>" id="addMember" onClick="addMemberButton()" class="thin"/>+ <input type="submit" value="<?= translate('add', $i18n) ?>" id="addMember" onClick="addMemberButton()"+ class="thin" /></div></div></section><?php- // Notification settings- $sql = "SELECT * FROM notification_settings WHERE user_id = :userId LIMIT 1";- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ // Notification settings+ $sql = "SELECT * FROM notification_settings WHERE user_id = :userId LIMIT 1";+ $stmt = $db->prepare($sql);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- $rowCount = 0;- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $notifications = $row;- $rowCount++;- }-- if ($rowCount == 0) {- $notifications['days'] = 1;- }+ $rowCount = 0;+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $notifications = $row;+ $rowCount++;+ }- // Email notifications- $sql = "SELECT * FROM email_notifications WHERE user_id = :userId LIMIT 1";- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ if ($rowCount == 0) {+ $notifications['days'] = 1;+ }- $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++;- }+ // Email notifications+ $sql = "SELECT * FROM email_notifications WHERE user_id = :userId LIMIT 1";+ $stmt = $db->prepare($sql);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- 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'] = "";- }+ $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++;+ }- // Discord notifications- $sql = "SELECT * FROM discord_notifications WHERE user_id = :userId LIMIT 1";- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();-- $rowCount = 0;- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $notificationsDiscord['enabled'] = $row['enabled'];- $notificationsDiscord['webhook_url'] = $row['webhook_url'];- $notificationsDiscord['bot_username'] = $row['bot_username'];- $notificationsDiscord['bot_avatar'] = $row['bot_avatar_url'];- $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'] = "";+ }++ // Discord notifications+ $sql = "SELECT * FROM discord_notifications WHERE user_id = :userId LIMIT 1";+ $stmt = $db->prepare($sql);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- if ($rowCount == 0) {+ $rowCount = 0;+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $notificationsDiscord['enabled'] = $row['enabled'];+ $notificationsDiscord['webhook_url'] = $row['webhook_url'];+ $notificationsDiscord['bot_username'] = $row['bot_username'];+ $notificationsDiscord['bot_avatar'] = $row['bot_avatar_url'];+ $rowCount++;+ }++ if ($rowCount == 0) {$notificationsDiscord['enabled'] = 0;$notificationsDiscord['webhook_url'] = "";$notificationsDiscord['bot_username'] = "";$notificationsDiscord['bot_avatar'] = "";- }+ }- // Pushover notifications- $sql = "SELECT * FROM pushover_notifications WHERE user_id = :userId LIMIT 1";- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();-- $rowCount = 0;- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $notificationsPushover['enabled'] = $row['enabled'];- $notificationsPushover['token'] = $row['token'];- $notificationsPushover['user_key'] = $row['user_key'];- $rowCount++;- }+ // Pushover notifications+ $sql = "SELECT * FROM pushover_notifications WHERE user_id = :userId LIMIT 1";+ $stmt = $db->prepare($sql);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- if ($rowCount == 0) {- $notificationsPushover['enabled'] = 0;- $notificationsPushover['token'] = "";- $notificationsPushover['user_key'] = "";- }+ $rowCount = 0;+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $notificationsPushover['enabled'] = $row['enabled'];+ $notificationsPushover['token'] = $row['token'];+ $notificationsPushover['user_key'] = $row['user_key'];+ $rowCount++;+ }- // Telegram notifications- $sql = "SELECT * FROM telegram_notifications WHERE user_id = :userId LIMIT 1";- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();-- $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) {+ $notificationsPushover['enabled'] = 0;+ $notificationsPushover['token'] = "";+ $notificationsPushover['user_key'] = "";+ }- if ($rowCount == 0) {- $notificationsTelegram['enabled'] = 0;- $notificationsTelegram['bot_token'] = "";- $notificationsTelegram['chat_id'] = "";- }+ // Telegram notifications+ $sql = "SELECT * FROM telegram_notifications WHERE user_id = :userId LIMIT 1";+ $stmt = $db->prepare($sql);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- // Ntfy notifications- $sql = "SELECT * FROM ntfy_notifications WHERE user_id = :userId LIMIT 1";- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ $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++;+ }- $rowCount = 0;- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $notificationsNtfy['enabled'] = $row['enabled'];- $notificationsNtfy['host'] = $row['host'];- $notificationsNtfy['topic'] = $row['topic'];- $notificationsNtfy['headers'] = $row['headers'];- $rowCount++;- }+ if ($rowCount == 0) {+ $notificationsTelegram['enabled'] = 0;+ $notificationsTelegram['bot_token'] = "";+ $notificationsTelegram['chat_id'] = "";+ }- if ($rowCount == 0) {- $notificationsNtfy['enabled'] = 0;- $notificationsNtfy['host'] = "";- $notificationsNtfy['topic'] = "";- $notificationsNtfy['headers'] = "";- }+ // Ntfy notifications+ $sql = "SELECT * FROM ntfy_notifications WHERE user_id = :userId LIMIT 1";+ $stmt = $db->prepare($sql);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- // Webhook notifications- $sql = "SELECT * FROM webhook_notifications WHERE user_id = :userId LIMIT 1";- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- $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++;- }+ $rowCount = 0;+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $notificationsNtfy['enabled'] = $row['enabled'];+ $notificationsNtfy['host'] = $row['host'];+ $notificationsNtfy['topic'] = $row['topic'];+ $notificationsNtfy['headers'] = $row['headers'];+ $rowCount++;+ }- if ($rowCount == 0) {- $notificationsWebhook['enabled'] = 0;- $notificationsWebhook['url'] = "";- $notificationsWebhook['request_method'] = "POST";- $notificationsWebhook['headers'] = "";- $notificationsWebhook['iterator'] = "";- $notificationsWebhook['payload'] = '+ if ($rowCount == 0) {+ $notificationsNtfy['enabled'] = 0;+ $notificationsNtfy['host'] = "";+ $notificationsNtfy['topic'] = "";+ $notificationsNtfy['headers'] = "";+ }++ // Webhook notifications+ $sql = "SELECT * FROM webhook_notifications WHERE user_id = :userId LIMIT 1";+ $stmt = $db->prepare($sql);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();+ $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}}": [@@ -369,27 +384,27 @@]}';- }+ }- // Gotify notifications- $sql = "SELECT * FROM gotify_notifications WHERE user_id = :userId LIMIT 1";- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ // Gotify notifications+ $sql = "SELECT * FROM gotify_notifications WHERE user_id = :userId LIMIT 1";+ $stmt = $db->prepare($sql);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- $rowCount = 0;- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $notificationsGotify['enabled'] = $row['enabled'];- $notificationsGotify['url'] = $row['url'];- $notificationsGotify['token'] = $row['token'];- $rowCount++;- }+ $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'] = "";- }+ if ($rowCount == 0) {+ $notificationsGotify['enabled'] = 0;+ $notificationsGotify['url'] = "";+ $notificationsGotify['token'] = "";+ }?>@@ -402,19 +417,20 @@<label for="days"><?= translate('notify_me', $i18n) ?>:</label><div class="form-group-inline"><select name="days" id="days">- <?php+ <?phpfor ($i = 1; $i <= 7; $i++) {$dayText = $i > 1 ? translate('days_before', $i18n) : translate('day_before', $i18n);$selected = $i == $notifications['days'] ? "selected" : "";?>- <option value="<?= $i ?>" <?= $selected ?>>- <?= $i ?> <?= $dayText ?>- </option>+ <option value="<?= $i ?>" <?= $selected ?>>+ <?= $i ?> <?= $dayText ?>+ </option><?php}- ?>+ ?></select>- <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>" id="saveNotifications" onClick="saveNotifications()"/>+ <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>" id="saveNotifications"+ onClick="saveNotifications()" /></div></section><section class="account-notifications-section">@@ -430,32 +446,46 @@<label for="emailenabled" class="capitalize"><?= translate('enabled', $i18n) ?></label></div><div class="form-group-inline">- <input type="text" name="smtpaddress" id="smtpaddress" placeholder="<?= translate('smtp_address', $i18n) ?>" value="<?= $notificationsEmail['smtp_address'] ?>" />- <input type="text" name="smtpport" id="smtpport" placeholder="<?= translate('port', $i18n) ?>" class="one-third" value="<?= $notificationsEmail['smtp_port'] ?>" />+ <input type="text" name="smtpaddress" id="smtpaddress"+ placeholder="<?= translate('smtp_address', $i18n) ?>"+ value="<?= $notificationsEmail['smtp_address'] ?>" />+ <input type="text" name="smtpport" id="smtpport" placeholder="<?= translate('port', $i18n) ?>"+ class="one-third" value="<?= $notificationsEmail['smtp_port'] ?>" /></div><div class="form-group-inline">- <input type="radio" name="encryption" id="encryptiontls" value="tls" <?= $notificationsEmail['encryption'] == "tls" ? "checked" : "" ?> />+ <input type="radio" name="encryption" id="encryptiontls" value="tls"+ <?= $notificationsEmail['encryption'] == "tls" ? "checked" : "" ?> /><label for="encryptiontls"><?= translate('tls', $i18n) ?></label>- <input type="radio" name="encryption" id="encryptionssl" value="ssl" <?= $notificationsEmail['encryption'] == "ssl" ? "checked" : "" ?> />+ <input type="radio" name="encryption" id="encryptionssl" value="ssl"+ <?= $notificationsEmail['encryption'] == "ssl" ? "checked" : "" ?> /><label for="encryptionssl"><?= translate('ssl', $i18n) ?></label></div><div class="form-group-inline">- <input type="text" name="smtpusername" id="smtpusername" placeholder="<?= translate('smtp_username', $i18n) ?>" value="<?= $notificationsEmail['smtp_username'] ?>" />+ <input type="text" name="smtpusername" id="smtpusername"+ placeholder="<?= translate('smtp_username', $i18n) ?>"+ value="<?= $notificationsEmail['smtp_username'] ?>" /></div><div class="form-group-inline">- <input type="password" name="smtppassword" id="smtppassword" placeholder="<?= translate('smtp_password', $i18n) ?>" value="<?= $notificationsEmail['smtp_password'] ?>" />+ <input type="password" name="smtppassword" id="smtppassword"+ placeholder="<?= translate('smtp_password', $i18n) ?>"+ value="<?= $notificationsEmail['smtp_password'] ?>" /></div><div class="form-group-inline">- <input type="text" name="fromemail" id="fromemail" placeholder="<?= translate('from_email', $i18n) ?>" value="<?= $notificationsEmail['from_email'] ?>" />+ <input type="text" name="fromemail" id="fromemail"+ placeholder="<?= translate('from_email', $i18n) ?>"+ value="<?= $notificationsEmail['from_email'] ?>" /></div><div class="settings-notes"><p>- <i class="fa-solid fa-circle-info"></i> <?= translate('smtp_info', $i18n) ?></p>+ <i class="fa-solid fa-circle-info"></i> <?= translate('smtp_info', $i18n) ?>+ </p><p></div><div class="buttons">- <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>" id="testNotificationsEmail" onClick="testNotificationEmailButton()"/>- <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>" id="saveNotificationsEmail" onClick="saveNotificationsEmailButton()"/>+ <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>"+ id="testNotificationsEmail" onClick="testNotificationEmailButton()" />+ <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>"+ id="saveNotificationsEmail" onClick="saveNotificationsEmailButton()" /></div></div></section>@@ -468,21 +498,30 @@</header><div class="account-notification-section-settings" data-type="discord"><div class="form-group-inline">- <input type="checkbox" id="discordenabled" name="discordenabled" <?= $notificationsDiscord['enabled'] ? "checked" : "" ?>>+ <input type="checkbox" id="discordenabled" name="discordenabled"+ <?= $notificationsDiscord['enabled'] ? "checked" : "" ?>><label for="discordenabled" class="capitalize"><?= translate('enabled', $i18n) ?></label></div><div class="form-group-inline">- <input type="text" name="discordurl" id="discordurl" placeholder="<?= translate('webhook_url', $i18n) ?>" value="<?= $notificationsDiscord['webhook_url'] ?>" />+ <input type="text" name="discordurl" id="discordurl"+ placeholder="<?= translate('webhook_url', $i18n) ?>"+ value="<?= $notificationsDiscord['webhook_url'] ?>" /></div><div class="form-group-inline">- <input type="text" name="discordbotusername" id="discordbotusername" placeholder="<?= translate('discord_bot_username', $i18n) ?>" value="<?= $notificationsDiscord['bot_username'] ?>" />+ <input type="text" name="discordbotusername" id="discordbotusername"+ placeholder="<?= translate('discord_bot_username', $i18n) ?>"+ value="<?= $notificationsDiscord['bot_username'] ?>" /></div><div class="form-group-inline">- <input type="text" name="discordbotavatar" id="discordbotavatar" placeholder="<?= translate('discord_bot_avatar_url', $i18n) ?>" value="<?= $notificationsDiscord['bot_avatar'] ?>" />+ <input type="text" name="discordbotavatar" id="discordbotavatar"+ placeholder="<?= translate('discord_bot_avatar_url', $i18n) ?>"+ value="<?= $notificationsDiscord['bot_avatar'] ?>" /></div><div class="buttons">- <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>" id="testNotificationsDiscord" onClick="testNotificationsDiscordButton()"/>- <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>" id="saveNotificationsDiscord" onClick="saveNotificationsDiscordButton()"/>+ <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>"+ id="testNotificationsDiscord" onClick="testNotificationsDiscordButton()" />+ <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>"+ id="saveNotificationsDiscord" onClick="saveNotificationsDiscordButton()" /></div></div></section>@@ -495,18 +534,24 @@</header><div class="account-notification-section-settings" data-type="gotify"><div class="form-group-inline">- <input type="checkbox" id="gotifyenabled" name="gotifyenabled" <?= $notificationsGotify['enabled'] ? "checked" : "" ?>>+ <input type="checkbox" id="gotifyenabled" name="gotifyenabled"+ <?= $notificationsGotify['enabled'] ? "checked" : "" ?>><label for="gotifyenabled" class="capitalize"><?= translate('enabled', $i18n) ?></label></div><div class="form-group-inline">- <input type="text" name="gotifyurl" id="gotifyurl" placeholder="<?= translate('url', $i18n) ?>" value="<?= $notificationsGotify['url'] ?>" />+ <input type="text" name="gotifyurl" id="gotifyurl" placeholder="<?= translate('url', $i18n) ?>"+ value="<?= $notificationsGotify['url'] ?>" /></div><div class="form-group-inline">- <input type="text" name="gotifytoken" id="gotifytoken" placeholder="<?= translate('token', $i18n) ?>" value="<?= $notificationsGotify['token'] ?>" />+ <input type="text" name="gotifytoken" id="gotifytoken"+ placeholder="<?= translate('token', $i18n) ?>"+ value="<?= $notificationsGotify['token'] ?>" /></div><div class="buttons">- <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>" id="testNotificationsGotify" onClick="testNotificationsGotifyButton()"/>- <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>" id="saveNotificationsGotify" onClick="saveNotificationsGotifyButton()"/>+ <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>"+ id="testNotificationsGotify" onClick="testNotificationsGotifyButton()" />+ <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>"+ id="saveNotificationsGotify" onClick="saveNotificationsGotifyButton()" /></div></div></section>@@ -519,19 +564,26 @@</header><div class="account-notification-section-settings" data-type="pushover"><div class="form-group-inline">- <input type="checkbox" id="pushoverenabled" name="pushoverenabled" <?= $notificationsPushover['enabled'] ? "checked" : "" ?>>+ <input type="checkbox" id="pushoverenabled" name="pushoverenabled"+ <?= $notificationsPushover['enabled'] ? "checked" : "" ?>><label for="pushoverenabled" class="capitalize"><?= translate('enabled', $i18n) ?></label></div><div class="form-group-inline">- <input type="text" name="pushoveruserkey" id="pushoveruserkey" placeholder="<?= translate('pushover_user_key', $i18n) ?>" value="<?= $notificationsPushover['user_key'] ?>" />+ <input type="text" name="pushoveruserkey" id="pushoveruserkey"+ placeholder="<?= translate('pushover_user_key', $i18n) ?>"+ value="<?= $notificationsPushover['user_key'] ?>" /></div><div class="form-group-inline">- <input type="text" name="pushovertoken" id="pushovertoken" placeholder="<?= translate('token', $i18n) ?>" value="<?= $notificationsPushover['token'] ?>" />+ <input type="text" name="pushovertoken" id="pushovertoken"+ placeholder="<?= translate('token', $i18n) ?>"+ value="<?= $notificationsPushover['token'] ?>" /></div><div class="buttons">- <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>" id="testNotificationsPushover" onClick="testNotificationsPushoverButton()"/>- <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>" id="saveNotificationsPushover" onClick="saveNotificationsPushoverButton()"/>+ <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>"+ id="testNotificationsPushover" onClick="testNotificationsPushoverButton()" />+ <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>"+ id="saveNotificationsPushover" onClick="saveNotificationsPushoverButton()" /></div></div></section>@@ -544,18 +596,25 @@</header><div class="account-notification-section-settings" data-type="telegram"><div class="form-group-inline">- <input type="checkbox" id="telegramenabled" name="telegramenabled" <?= $notificationsTelegram['enabled'] ? "checked" : "" ?>>+ <input type="checkbox" id="telegramenabled" name="telegramenabled"+ <?= $notificationsTelegram['enabled'] ? "checked" : "" ?>><label for="telegramenabled" class="capitalize"><?= translate('enabled', $i18n) ?></label></div><div class="form-group-inline">- <input type="text" name="telegrambottoken" id="telegrambottoken" placeholder="<?= translate('telegram_bot_token', $i18n) ?>" value="<?= $notificationsTelegram['bot_token'] ? $notificationsTelegram['bot_token'] : "" ?>" />+ <input type="text" name="telegrambottoken" id="telegrambottoken"+ placeholder="<?= translate('telegram_bot_token', $i18n) ?>"+ value="<?= $notificationsTelegram['bot_token'] ? $notificationsTelegram['bot_token'] : "" ?>" /></div><div class="form-group-inline">- <input type="text" name="telegramchatid" id="telegramchatid" placeholder="<?= translate('telegram_chat_id', $i18n) ?>" value="<?= $notificationsTelegram['chat_id'] ?>" />+ <input type="text" name="telegramchatid" id="telegramchatid"+ placeholder="<?= translate('telegram_chat_id', $i18n) ?>"+ value="<?= $notificationsTelegram['chat_id'] ?>" /></div><div class="buttons">- <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>" id="testNotificationsTelegram" onClick="testNotificationsTelegramButton()"/>- <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>" id="saveNotificationsTelegram" onClick="saveNotificationsTelegramButton()"/>+ <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>"+ id="testNotificationsTelegram" onClick="testNotificationsTelegramButton()" />+ <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>"+ id="saveNotificationsTelegram" onClick="saveNotificationsTelegramButton()" /></div></div></section>@@ -571,17 +630,22 @@<label for="ntfyenabled" class="capitalize"><?= translate('enabled', $i18n) ?></label></div><div class="form-group-inline">- <input type="text" name="ntfyhost" id="ntfyhost" placeholder="<?= translate('host', $i18n) ?>" value="<?= $notificationsNtfy['host'] ?>" />+ <input type="text" name="ntfyhost" id="ntfyhost" placeholder="<?= translate('host', $i18n) ?>"+ value="<?= $notificationsNtfy['host'] ?>" /></div><div class="form-group-inline">- <input type="text" name="ntfytopic" id="ntfytopic" placeholder="<?= translate('topic', $i18n) ?>" value="<?= $notificationsNtfy['topic'] ?>" />+ <input type="text" name="ntfytopic" id="ntfytopic"+ placeholder="<?= translate('topic', $i18n) ?>" value="<?= $notificationsNtfy['topic'] ?>" /></div><div class="form-group-inline">- <textarea class="thin" name="ntfyheaders" id="ntfyheaders" placeholder="<?= translate('custom_headers', $i18n) ?>"><?= $notificationsNtfy['headers'] ?></textarea>+ <textarea class="thin" name="ntfyheaders" id="ntfyheaders"+ placeholder="<?= translate('custom_headers', $i18n) ?>"><?= $notificationsNtfy['headers'] ?></textarea></div><div class="buttons">- <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>" id="testNotificationsNtfy" onClick="testNotificationsNtfyButton()"/>- <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>" id="saveNotificationsNtfy" onClick="saveNotificationsNtfyButton()"/>+ <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>"+ id="testNotificationsNtfy" onClick="testNotificationsNtfyButton()" />+ <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>"+ id="saveNotificationsNtfy" onClick="saveNotificationsNtfyButton()" /></div></section><section class="account-notifications-section">@@ -593,11 +657,13 @@</header><div class="account-notification-section-settings" data-type="webhook"><div class="form-group-inline">- <input type="checkbox" id="webhookenabled" name="webhookenabled" <?= $notificationsWebhook['enabled'] ? "checked" : "" ?>>+ <input type="checkbox" id="webhookenabled" name="webhookenabled"+ <?= $notificationsWebhook['enabled'] ? "checked" : "" ?>><label for="webhookenabled" class="capitalize"><?= translate('enabled', $i18n) ?></label></div><div>- <label for="webhookrequestmethod" class="capitalize"><?= translate('request_method', $i18n) ?>:</label>+ <label for="webhookrequestmethod"+ class="capitalize"><?= translate('request_method', $i18n) ?>:</label><div class="form-group-inline"><select name="webhookrequestmethod" id="webhookrequestmethod"><option value="GET" <?= $notificationsWebhook['request_method'] == 'GET' ? 'selected' : '' ?>>GET</option>@@ -607,25 +673,37 @@</div></div><div class="form-group-inline">- <input type="text" name="webhookurl" id="webhookurl" placeholder="<?= translate('webhook_url', $i18n) ?>" value="<?= $notificationsWebhook['url'] ?>" />+ <input type="text" name="webhookurl" id="webhookurl"+ placeholder="<?= translate('webhook_url', $i18n) ?>"+ value="<?= $notificationsWebhook['url'] ?>" /></div><div class="form-group-inline">- <textarea class="thin" name="webhookcustomheaders" id="webhookcustomheaders" placeholder="<?= translate('custom_headers', $i18n) ?>"><?= $notificationsWebhook['headers'] ?></textarea>+ <textarea class="thin" name="webhookcustomheaders" id="webhookcustomheaders"+ placeholder="<?= translate('custom_headers', $i18n) ?>"><?= $notificationsWebhook['headers'] ?></textarea></div><div class="form-group-inline">- <textarea name="webhookpayload" id="webhookpayload" placeholder="<?= translate('webhook_payload', $i18n) ?>"><?= $notificationsWebhook['payload'] ?></textarea>+ <textarea name="webhookpayload" id="webhookpayload"+ placeholder="<?= translate('webhook_payload', $i18n) ?>"><?= $notificationsWebhook['payload'] ?></textarea></div><div class="form-group-inline">- <input type="text" name="webhookiteratorkey" id="webhookiteratorkey" placeholder="<?= translate('webhook_iterator_key', $i18n) ?>" value="<?= $notificationsWebhook['iterator'] ?>" />+ <input type="text" name="webhookiteratorkey" id="webhookiteratorkey"+ placeholder="<?= translate('webhook_iterator_key', $i18n) ?>"+ value="<?= $notificationsWebhook['iterator'] ?>" /></div><div class="settings-notes"><p>- <i class="fa-solid fa-circle-info"></i> <?= translate('variables_available', $i18n) ?>: {{days_until}}, {{subscription_name}}, {{subscription_price}}, {{subscription_currency}}, {{subscription_category}}, {{subscription_date}}, {{subscription_payer}}, {{subscription_days_until_payment}}</p>+ <i class="fa-solid fa-circle-info"></i> <?= translate('variables_available', $i18n) ?>:+ {{days_until}}, {{subscription_name}}, {{subscription_price}}, {{subscription_currency}},+ {{subscription_category}}, {{subscription_date}}, {{subscription_payer}},+ {{subscription_days_until_payment}}+ </p><p></div><div class="buttons">- <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>" id="testNotificationsWebhook" onClick="testNotificationsWebhookButton()"/>- <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>" id="saveNotificationsWebhook" onClick="saveNotificationsWebhookButton()"/>+ <input type="button" class="secondary-button thin" value="<?= translate('test', $i18n) ?>"+ id="testNotificationsWebhook" onClick="testNotificationsWebhookButton()" />+ <input type="submit" class="thin" value="<?= translate('save', $i18n) ?>"+ id="saveNotificationsWebhook" onClick="saveNotificationsWebhookButton()" /></div></div></section>@@ -633,17 +711,17 @@</section><?php- $sql = "SELECT * FROM categories WHERE user_id = :userId ORDER BY `order` ASC";- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ $sql = "SELECT * FROM categories WHERE user_id = :userId ORDER BY `order` ASC";+ $stmt = $db->prepare($sql);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- if ($result) {- $categories = array();- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $categories[] = $row;- }+ if ($result) {+ $categories = array();+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $categories[] = $row;}+ }?><section class="account-section">@@ -651,8 +729,8 @@<h2><?= translate('categories', $i18n) ?></h2></header><div class="account-categories">- <div id="categories" class="sortable-list">- <?php+ <div id="categories" class="sortable-list">+ <?phpforeach ($categories as $category) {if ($category['id'] != 1) {$canDelete = true;@@ -668,62 +746,66 @@if ($isUsed > 0) {$canDelete = false;}- ?>- <div class="form-group-inline" data-categoryid="<?= $category['id'] ?>">- <div class=" drag-icon"><i class="fa-solid fa-grip-vertical"></i></div>- <input type="text" name="category" value="<?= $category['name'] ?>" placeholder="Category">- <button class="image-button medium" onClick="editCategory(<?= $category['id'] ?>)" name="save">- <img src="images/siteicons/<?= $colorTheme ?>/save.png" title="<?= translate('save_category', $i18n) ?>">- </button>- <?php+ ?>+ <div class="form-group-inline" data-categoryid="<?= $category['id'] ?>">+ <div class=" drag-icon"><i class="fa-solid fa-grip-vertical"></i></div>+ <input type="text" name="category" value="<?= $category['name'] ?>" placeholder="Category">+ <button class="image-button medium" onClick="editCategory(<?= $category['id'] ?>)" name="save">+ <img src="images/siteicons/<?= $colorTheme ?>/save.png"+ title="<?= translate('save_category', $i18n) ?>">+ </button>+ <?phpif ($canDelete) {- ?>+ ?><button class="image-button medium" onClick="removeCategory(<?= $category['id'] ?>)">- <img src="images/siteicons/<?= $colorTheme ?>/delete.png" title="<?= translate('delete_category', $i18n) ?>">+ <img src="images/siteicons/<?= $colorTheme ?>/delete.png"+ title="<?= translate('delete_category', $i18n) ?>"></button>- <?php+ <?php} else {- ?>+ ?><button class="image-button medium disabled">- <img src="images/siteicons/<?= $colorTheme ?>/delete.png" title="<?= translate('cant_delete_category_in_use', $i18n) ?>">+ <img src="images/siteicons/<?= $colorTheme ?>/delete.png"+ title="<?= translate('cant_delete_category_in_use', $i18n) ?>"></button>- <?php+ <?php}- ?>- </div>- <?php+ ?>+ </div>+ <?php}}- ?>+ ?></div><div class="buttons">- <input type="submit" value="<?= translate('add', $i18n) ?>" id="addCategory" onClick="addCategoryButton()" class="thin"/>+ <input type="submit" value="<?= translate('add', $i18n) ?>" id="addCategory"+ onClick="addCategoryButton()" class="thin" /></div></div></section><?php- $sql = "SELECT * FROM currencies WHERE user_id = :userId";- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ $sql = "SELECT * FROM currencies WHERE user_id = :userId";+ $stmt = $db->prepare($sql);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- if ($result) {- $currencies = array();- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $currencies[] = $row;- }+ if ($result) {+ $currencies = array();+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $currencies[] = $row;}+ }- $query = "SELECT main_currency FROM user WHERE id = :userId";- $stmt = $db->prepare($query);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- $row = $result->fetchArray(SQLITE3_ASSOC);- $mainCurrencyId = $row['main_currency'];+ $query = "SELECT main_currency FROM user WHERE id = :userId";+ $stmt = $db->prepare($query);+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();+ $row = $result->fetchArray(SQLITE3_ASSOC);+ $mainCurrencyId = $row['main_currency'];- $query = "SELECT date FROM last_exchange_update";- $exchange_rates_last_updated = $db->querySingle($query);+ $query = "SELECT date FROM last_exchange_update";+ $exchange_rates_last_updated = $db->querySingle($query);?>@@ -733,7 +815,7 @@</header><div class="account-currencies"><div id="currencies">- <?php+ <?phpforeach ($currencies as $currency) {$canDelete = true;$isMainCurrency = false;@@ -757,34 +839,38 @@<div class="form-group-inline" data-currencyid="<?= $currency['id'] ?>"><input type="text" class="short" name="symbol" value="<?= $currency['symbol'] ?>" placeholder="$"><input type="text" name="currency" value="<?= $currency['name'] ?>" placeholder="Currency Name">- <input type="text" name="code" value="<?= $currency['code'] ?>" placeholder="Currency Code" <?= !$canDelete ? 'disabled' : '' ?>>- <button class="image-button medium" onClick="editCurrency(<?= $currency['id'] ?>)" name="save">- <img src="images/siteicons/<?= $colorTheme ?>/save.png" title="<?= translate('save_currency', $i18n) ?>">+ <input type="text" name="code" value="<?= $currency['code'] ?>" placeholder="Currency Code"+ <?= !$canDelete ? 'disabled' : '' ?>>+ <button class="image-button medium" onClick="editCurrency(<?= $currency['id'] ?>)" name="save">+ <img src="images/siteicons/<?= $colorTheme ?>/save.png"+ title="<?= translate('save_currency', $i18n) ?>"></button><?php- if ($canDelete) {+ if ($canDelete) {?>- <button class="image-button medium" onClick="removeCurrency(<?= $currency['id'] ?>)">- <img src="images/siteicons/<?= $colorTheme ?>/delete.png" title="<?= translate('delete_currency', $i18n) ?>">- </button>+ <button class="image-button medium" onClick="removeCurrency(<?= $currency['id'] ?>)">+ <img src="images/siteicons/<?= $colorTheme ?>/delete.png"+ title="<?= translate('delete_currency', $i18n) ?>">+ </button><?php- } else {- $cantDeleteMessage = $isMainCurrency ? translate('cant_delete_main_currency', $i18n) : translate('cant_delete_currency_in_use', $i18n);+ } else {+ $cantDeleteMessage = $isMainCurrency ? translate('cant_delete_main_currency', $i18n) : translate('cant_delete_currency_in_use', $i18n);?>- <button class="image-button medium disabled">- <img src="images/siteicons/<?= $colorTheme ?>/delete.png" title="<?= $cantDeleteMessage ?>">- </button>+ <button class="image-button medium disabled">+ <img src="images/siteicons/<?= $colorTheme ?>/delete.png" title="<?= $cantDeleteMessage ?>">+ </button><?php- }+ }?>-+</div><?php}- ?>+ ?></div><div class="buttons">- <input type="submit" value="<?= translate('add', $i18n) ?>" id="addCurrency" onClick="addCurrencyButton()" class="thin"/>+ <input type="submit" value="<?= translate('add', $i18n) ?>" id="addCurrency"+ onClick="addCurrencyButton()" class="thin" /></div><div class="settings-notes"><p>@@ -798,7 +884,7 @@<i class="fa-solid fa-circle-info"></i><?= translate('currency_info', $i18n) ?><span>- fixer.io+ fixer.io<a href="https://fixer.io/symbols" target="_blank" title="Currency codes"><i class="fa-solid fa-arrow-up-right-from-square"></i></a>@@ -812,20 +898,20 @@</section><?php- $apiKey = "";- $sql = "SELECT api_key, provider FROM fixer WHERE user_id = :userId";- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();- if ($result) {- $row = $result->fetchArray(SQLITE3_ASSOC);- if ($row) {- $apiKey = $row['api_key'];- $provider = $row['provider'];- } else {- $provider = 0;- }+ $apiKey = "";+ $sql = "SELECT api_key, provider FROM fixer WHERE user_id = :userId";+ $stmt = $db->prepare($sql);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();+ if ($result) {+ $row = $result->fetchArray(SQLITE3_ASSOC);+ if ($row) {+ $apiKey = $row['api_key'];+ $provider = $row['provider'];+ } else {+ $provider = 0;}+ }?><section class="account-section">@@ -834,10 +920,11 @@</header><div class="account-fixer"><div class="form-group">- <input type="text" name="fixer-key" id="fixerKey" value="<?= $apiKey ?>" placeholder="<?= translate('api_key', $i18n) ?>">+ <input type="text" name="fixer-key" id="fixerKey" value="<?= $apiKey ?>"+ placeholder="<?= translate('api_key', $i18n) ?>"></div><div class="form-group">- <label for="fixerProvider"><?= translate('provider', $i18n) ?>:</label>+ <label for="fixerProvider"><?= translate('provider', $i18n) ?>:</label><select name="fixer-provider" id="fixerProvider"><option value="0" <?= $provider == 0 ? 'selected' : '' ?>>fixer.io</option><option value="1" <?= $provider == 1 ? 'selected' : '' ?>>apilayer.com</option>@@ -845,10 +932,11 @@</div><div class="settings-notes"><p><i class="fa-solid fa-circle-info"></i><?= translate('fixer_info', $i18n) ?></p>- <p><?= translate('get_key', $i18n) ?>:+ <p><?= translate('get_key', $i18n) ?>:<span>- https://fixer.io/- <a href="https://fixer.io/#pricing_plan" title="<?= translate("get_free_fixer_api_key", $i18n) ?>" target="_blank">+ https://fixer.io/+ <a href="https://fixer.io/#pricing_plan"+ title="<?= translate("get_free_fixer_api_key", $i18n) ?>" target="_blank"><i class="fa-solid fa-arrow-up-right-from-square"></i></a></span>@@ -857,30 +945,32 @@<?= translate("get_key_alternative", $i18n) ?><span>https://apilayer.com- <a href="https://apilayer.com/marketplace/fixer-api" title="Get free fixer api key" target="_blank">+ <a href="https://apilayer.com/marketplace/fixer-api" title="Get free fixer api key"+ target="_blank"><i class="fa-solid fa-arrow-up-right-from-square"></i></a></span></p></div><div class="buttons">- <input type="submit" value="<?= translate('save', $i18n) ?>" id="addFixerKey" onClick="addFixerKeyButton()" class="thin"/>+ <input type="submit" value="<?= translate('save', $i18n) ?>" id="addFixerKey"+ onClick="addFixerKeyButton()" class="thin" /></div></div></section><?php- $sql = "SELECT * FROM payment_methods WHERE user_id = :userId ORDER BY `order` ASC";- $stmt = $db->prepare($sql);- $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();+ $sql = "SELECT * FROM payment_methods WHERE user_id = :userId ORDER BY `order` ASC";+ $stmt = $db->prepare($sql);+ $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();- if ($result) {- $payments = array();- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $payments[] = $row;- }+ if ($result) {+ $payments = array();+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $payments[] = $row;}+ }?><section class="account-section">@@ -889,40 +979,40 @@</header><div class="payments-list" id="payments-list"><?php- $paymentsInUseQuery = $db->prepare('SELECT id FROM payment_methods WHERE user_id = :userId AND id IN (SELECT DISTINCT payment_method_id FROM subscriptions WHERE user_id = :userId)');- $paymentsInUseQuery->bindValue(':userId', $userId, SQLITE3_INTEGER);- $result = $paymentsInUseQuery->execute();+ $paymentsInUseQuery = $db->prepare('SELECT id FROM payment_methods WHERE user_id = :userId AND id IN (SELECT DISTINCT payment_method_id FROM subscriptions WHERE user_id = :userId)');+ $paymentsInUseQuery->bindValue(':userId', $userId, SQLITE3_INTEGER);+ $result = $paymentsInUseQuery->execute();- $paymentsInUse = [];- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $paymentsInUse[] = $row['id'];- }+ $paymentsInUse = [];+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $paymentsInUse[] = $row['id'];+ }- foreach ($payments as $payment) {- $paymentIconFolder = (strpos($payment['icon'], 'images/uploads/icons/') !== false) ? "" : "images/uploads/logos/";+ foreach ($payments as $payment) {+ $paymentIconFolder = (strpos($payment['icon'], 'images/uploads/icons/') !== false) ? "" : "images/uploads/logos/";- $inUse = in_array($payment['id'], $paymentsInUse);- ?>- <div class="payments-payment"- data-enabled="<?= $payment['enabled']; ?>"- data-in-use="<?= $inUse ? 'yes' : 'no' ?>"- data-paymentid="<?= $payment['id'] ?>"- title="<?= $inUse ? translate('cant_delete_payment_method_in_use', $i18n) : ($payment['enabled'] ? translate('disable', $i18n) : translate('enable', $i18n)) ?>">- <div class="drag-icon" title="">- <i class="fa-solid fa-grip-vertical"></i>- </div>- <img src="<?= $paymentIconFolder.$payment['icon'] ?>" alt="Logo" />- <span class="payment-name" contenteditable="true" title="<?= translate("rename_payment_method", $i18n) ?>"><?= $payment['name'] ?></span>- <?php- if (!$inUse) {- ?>- <div class="delete-payment-method" title="<?= translate('delete', $i18n) ?>" data-paymentid="<?= $payment['id'] ?>">x</div>- <?php- }- ?>- </div>+ $inUse = in_array($payment['id'], $paymentsInUse);+ ?>+ <div class="payments-payment" data-enabled="<?= $payment['enabled']; ?>"+ data-in-use="<?= $inUse ? 'yes' : 'no' ?>" data-paymentid="<?= $payment['id'] ?>"+ title="<?= $inUse ? translate('cant_delete_payment_method_in_use', $i18n) : ($payment['enabled'] ? translate('disable', $i18n) : translate('enable', $i18n)) ?>">+ <div class="drag-icon" title="">+ <i class="fa-solid fa-grip-vertical"></i>+ </div>+ <img src="<?= $paymentIconFolder . $payment['icon'] ?>" alt="Logo" />+ <span class="payment-name" contenteditable="true"+ title="<?= translate("rename_payment_method", $i18n) ?>"><?= $payment['name'] ?></span><?php- }+ if (!$inUse) {+ ?>+ <div class="delete-payment-method" title="<?= translate('delete', $i18n) ?>"+ data-paymentid="<?= $payment['id'] ?>">x</div>+ <?php+ }+ ?>+ </div>+ <?php+ }?></div><div class="settings-notes">@@ -941,14 +1031,19 @@<div><form id="payments-form"><div class="form-group-inline">- <input type="text" name="paymentname" id="paymentname" placeholder="<?= translate('payment_method_name', $i18n) ?>" onchange="setSearchButtonStatus()" onkeypress="this.onchange();" onpaste="this.onchange();" oninput="this.onchange();"/>+ <input type="text" name="paymentname" id="paymentname"+ placeholder="<?= translate('payment_method_name', $i18n) ?>" onchange="setSearchButtonStatus()"+ onkeypress="this.onchange();" onpaste="this.onchange();" oninput="this.onchange();" /><label for="paymenticon" class="icon-preview">- <img src="" alt="<?= translate('logo_preview', $i18n) ?>" id="form-icon">+ <img src="" alt="<?= translate('logo_preview', $i18n) ?>" id="form-icon"></label><div class="form-icon-search">- <input type="file" id="paymenticon" name="paymenticon" accept="image/jpeg, image/png, image/gif, image/webp" onchange="handleFileSelect(event)" class="hidden-input">+ <input type="file" id="paymenticon" name="paymenticon"+ accept="image/jpeg, image/png, image/gif, image/webp" onchange="handleFileSelect(event)"+ class="hidden-input"><input type="hidden" id="icon-url" name="icon-url">- <div id="icon-search-button" class="image-button medium disabled" title="<?= translate('search_logo', $i18n) ?>" onClick="searchPaymentIcon()">+ <div id="icon-search-button" class="image-button medium disabled"+ title="<?= translate('search_logo', $i18n) ?>" onClick="searchPaymentIcon()"><img src="images/siteicons/<?= $colorTheme ?>/websearch.png"></div><div id="icon-search-results" class="icon-search">@@ -958,10 +1053,11 @@<div id="icon-search-images"></div></div></div>-- <input type="button" class="button thin" id="add-payment-button" value="+" title="<?= translate('add', $i18n) ?>" id="addPayment" onClick="addPaymentMethod()"/>++ <input type="button" class="button thin" id="add-payment-button" value="+"+ title="<?= translate('add', $i18n) ?>" id="addPayment" onClick="addPaymentMethod()" /></div>- </form>+ </form></div></section>@@ -970,39 +1066,47 @@<h2><?= translate('theme_settings', $i18n) ?></h2></header><div class="account-settings-theme">- <div>+ <div><div class="theme-selector"><div class="theme">- <label for="theme-blue" class="theme-preview blue <?= $settings['color_theme'] == 'blue' ? 'is-selected' : '' ?>">- <input type="radio" name="theme" id="theme-blue" value="blue" onClick="setTheme('blue')" <?= $settings['color_theme'] == 'blue' ? 'checked' : '' ?>>+ <label for="theme-blue"+ class="theme-preview blue <?= $settings['color_theme'] == 'blue' ? 'is-selected' : '' ?>">+ <input type="radio" name="theme" id="theme-blue" value="blue" onClick="setTheme('blue')"+ <?= $settings['color_theme'] == 'blue' ? 'checked' : '' ?>><span class="main-color"></span><span class="accent-color"></span><span class="hover-color"></span></label></div><div class="theme">- <label for="theme-green" class="theme-preview green <?= $settings['color_theme'] == 'green' ? 'is-selected' : '' ?>">- <input type="radio" name="theme" id="theme-green" value="green" onClick="setTheme('green')" <?= $settings['color_theme'] == 'green' ? 'checked' : '' ?>>+ <label for="theme-green"+ class="theme-preview green <?= $settings['color_theme'] == 'green' ? 'is-selected' : '' ?>">+ <input type="radio" name="theme" id="theme-green" value="green" onClick="setTheme('green')"+ <?= $settings['color_theme'] == 'green' ? 'checked' : '' ?>><span class="main-color"></span><span class="accent-color"></span><span class="hover-color"></span></label></div><div class="theme">- <label for="theme-red" class="theme-preview red <?= $settings['color_theme'] == 'red' ? 'is-selected' : '' ?>">- <input type="radio" name="theme" id="theme-red" value="red" onClick="setTheme('red')" <?= $settings['color_theme'] == 'red' ? 'checked' : '' ?>>+ <label for="theme-red"+ class="theme-preview red <?= $settings['color_theme'] == 'red' ? 'is-selected' : '' ?>">+ <input type="radio" name="theme" id="theme-red" value="red" onClick="setTheme('red')"+ <?= $settings['color_theme'] == 'red' ? 'checked' : '' ?>><span class="main-color"></span><span class="accent-color"></span><span class="hover-color"></span></label></div><div class="theme">- <label for="theme-yellow" class="theme-preview yellow <?= $settings['color_theme'] == 'yellow' ? 'is-selected' : '' ?>">- <input type="radio" name="theme" id="theme-yellow" value="yellow" onClick="setTheme('yellow')" <?= $settings['color_theme'] == 'yellow' ? 'checked' : '' ?>>+ <label for="theme-yellow"+ class="theme-preview yellow <?= $settings['color_theme'] == 'yellow' ? 'is-selected' : '' ?>">+ <input type="radio" name="theme" id="theme-yellow" value="yellow"+ onClick="setTheme('yellow')" <?= $settings['color_theme'] == 'yellow' ? 'checked' : '' ?>><span class="main-color"></span><span class="accent-color"></span><span class="hover-color"></span>- </label>+ </label></div></div></div>@@ -1010,19 +1114,41 @@<h2><?= translate('custom_colors', $i18n) ?></h2><div class="form-group-inline wrap"><div class="color-picker-wrapper wrap">- <input type="color" id="mainColor" name="mainColor" value="<?= isset($settings['customColors']['main_color']) ? $settings['customColors']['main_color'] : '#FFFFFF' ?>" class="color-picker fa-solid fa-eye-dropper">- <input type="color" id="accentColor" name="accentColor" value="<?= isset($settings['customColors']['accent_color']) ? $settings['customColors']['accent_color'] : '#FFFFFF' ?>" class="color-picker fa-solid fa-eye-dropper">- <input type="color" id="hoverColor" name="hoverColor" value="<?= isset($settings['customColors']['hover_color']) ? $settings['customColors']['hover_color'] : '#FFFFFF' ?>" class="color-picker fa-solid fa-eye-dropper">+ <input type="color" id="mainColor" name="mainColor"+ value="<?= isset($settings['customColors']['main_color']) ? $settings['customColors']['main_color'] : '#FFFFFF' ?>"+ class="color-picker fa-solid fa-eye-dropper">+ <input type="color" id="accentColor" name="accentColor"+ value="<?= isset($settings['customColors']['accent_color']) ? $settings['customColors']['accent_color'] : '#FFFFFF' ?>"+ class="color-picker fa-solid fa-eye-dropper">+ <input type="color" id="hoverColor" name="hoverColor"+ value="<?= isset($settings['customColors']['hover_color']) ? $settings['customColors']['hover_color'] : '#FFFFFF' ?>"+ class="color-picker fa-solid fa-eye-dropper"></div><div class="color-picker-wrapper wrap">- <input type="button" value="<?= translate('reset', $i18n) ?>" onClick="resetCustomColors()" class="secondary-button thin" id="reset-colors">- <input type="button" value="<?= translate('save', $i18n) ?>" onClick="saveCustomColors()" class="buton thin" id="save-colors">- </div>+ <input type="button" value="<?= translate('reset', $i18n) ?>" onClick="resetCustomColors()"+ class="secondary-button thin" id="reset-colors">+ <input type="button" value="<?= translate('save', $i18n) ?>" onClick="saveCustomColors()"+ class="buton thin" id="save-colors">+ </div></div></div><h2><?= translate('dark_theme', $i18n) ?></h2>- <div>- <input id="switchTheme" type="button" value="<?= translate('switch_theme', $i18n) ?>" onClick="switchTheme()" class="button thin">+ <div class="form-group-inline">+ <label for="theme-light" class="capitalize">+ <input type="radio" name="theme" id="theme-light" value="light" onClick="setDarkTheme('0')"+ <?= $settings['dark_theme'] == '0' ? 'checked' : '' ?>>+ <?= translate('disabled', $i18n) ?>+ </label>+ <label for="theme-dark" class="capitalize">+ <input type="radio" name="theme" id="theme-dark" value="dark" onClick="setDarkTheme('1')"+ <?= $settings['dark_theme'] == '1' ? 'checked' : '' ?>>+ <?= translate('enabled', $i18n) ?>+ </label>+ <label for="theme-automatic" class="capitalize">+ <input type="radio" name="theme" id="theme-automatic" value="automatic" onClick="setDarkTheme('2')"+ <?= $settings['dark_theme'] == '2' ? 'checked' : '' ?>>+ <?= translate('automatic', $i18n) ?>+ </label></div></div></section>@@ -1034,24 +1160,28 @@<div class="account-settings-list"><div><div class="form-group-inline">- <input type="checkbox" id="monthlyprice" name="monthlyprice" onChange="setShowMonthlyPrice()" <?php if ($settings['monthly_price']) echo 'checked'; ?>>+ <input type="checkbox" id="monthlyprice" name="monthlyprice" onChange="setShowMonthlyPrice()" <?php if ($settings['monthly_price'])+ echo 'checked'; ?>><label for="monthlyprice"><?= translate('calculate_monthly_price', $i18n) ?></label></div></div><div><div class="form-group-inline">- <input type="checkbox" id="convertcurrency" name="convertcurrency" onChange="setConvertCurrency()" <?php if ($settings['convert_currency']) echo 'checked'; ?>>+ <input type="checkbox" id="convertcurrency" name="convertcurrency" onChange="setConvertCurrency()"+ <?php if ($settings['convert_currency'])+ echo 'checked'; ?>><label for="convertcurrency"><?= translate('convert_prices', $i18n) ?></label></div></div><div><div class="form-group-inline">- <input type="checkbox" id="hidedisabled" name="hidedisabled" onChange="setHideDisabled()" <?php if ($settings['hide_disabled']) echo 'checked'; ?>>+ <input type="checkbox" id="hidedisabled" name="hidedisabled" onChange="setHideDisabled()" <?php if ($settings['hide_disabled'])+ echo 'checked'; ?>><label for="hidedisabled"><?= translate('hide_disabled_subscriptions', $i18n) ?></label></div></div></div>- </section>+ </section><section class="account-section"><header>@@ -1060,7 +1190,9 @@<div class="account-settings-list"><div><div class="form-group-inline">- <input type="checkbox" id="removebackground" name="removebackground" onChange="setRemoveBackground()" <?php if ($settings['remove_background']) echo 'checked'; ?>>+ <input type="checkbox" id="removebackground" name="removebackground"+ onChange="setRemoveBackground()" <?php if ($settings['remove_background'])+ echo 'checked'; ?>><label for="removebackground"><?= translate('remove_background', $i18n) ?></label></div></div>@@ -1078,5 +1210,5 @@<script src="scripts/notifications.js?<?= $version ?>"></script><?php- require_once 'includes/footer.php';-?>+require_once 'includes/footer.php';+?>\ No newline at end of filediff --git a/stats.php b/stats.phpindex 201a415..1fea28d 100644--- a/stats.php+++ b/stats.php@@ -1,43 +1,41 @@<?php- require_once 'includes/header.php';+require_once 'includes/header.php';- function getPricePerMonth($cycle, $frequency, $price) {- switch ($cycle) {+function getPricePerMonth($cycle, $frequency, $price)+{+ switch ($cycle) {case 1:- $numberOfPaymentsPerMonth = (30 / $frequency);- return $price * $numberOfPaymentsPerMonth;- break;+ $numberOfPaymentsPerMonth = (30 / $frequency);+ return $price * $numberOfPaymentsPerMonth;case 2:- $numberOfPaymentsPerMonth = (4.35 / $frequency);- return $price * $numberOfPaymentsPerMonth;- break;+ $numberOfPaymentsPerMonth = (4.35 / $frequency);+ return $price * $numberOfPaymentsPerMonth;case 3:- $numberOfPaymentsPerMonth = (1 / $frequency);- return $price * $numberOfPaymentsPerMonth;- break;+ $numberOfPaymentsPerMonth = (1 / $frequency);+ return $price * $numberOfPaymentsPerMonth;case 4:$numberOfMonths = (12 * $frequency);return $price / $numberOfMonths;- break;- }}+}- function getPriceConverted($price, $currency, $database, $userId) {- $query = "SELECT rate FROM currencies WHERE id = :currency AND user_id = :userId";- $stmt = $database->prepare($query);- $stmt->bindParam(':currency', $currency, SQLITE3_INTEGER);- $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);- $result = $stmt->execute();-- $exchangeRate = $result->fetchArray(SQLITE3_ASSOC);- if ($exchangeRate === false) {- return $price;- } else {- $fromRate = $exchangeRate['rate'];- return $price / $fromRate;- }+function getPriceConverted($price, $currency, $database, $userId)+{+ $query = "SELECT rate FROM currencies WHERE id = :currency AND user_id = :userId";+ $stmt = $database->prepare($query);+ $stmt->bindParam(':currency', $currency, SQLITE3_INTEGER);+ $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);+ $result = $stmt->execute();++ $exchangeRate = $result->fetchArray(SQLITE3_ASSOC);+ if ($exchangeRate === false) {+ return $price;+ } else {+ $fromRate = $exchangeRate['rate'];+ return $price / $fromRate;}+}//Get household members$members = array();@@ -46,10 +44,10 @@ $stmt = $db->prepare($query);$stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);$result = $stmt->execute();while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $memberId = $row['id'];- $members[$memberId] = $row;- $memberCost[$memberId]['cost'] = 0;- $memberCost[$memberId]['name'] = $row['name'];+ $memberId = $row['id'];+ $members[$memberId] = $row;+ $memberCost[$memberId]['cost'] = 0;+ $memberCost[$memberId]['name'] = $row['name'];}// Get categories@@ -59,10 +57,10 @@ $stmt = $db->prepare($query);$stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);$result = $stmt->execute();while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $categoryId = $row['id'];- $categories[$categoryId] = $row;- $categoryCost[$categoryId]['cost'] = 0;- $categoryCost[$categoryId]['name'] = $row['name'];+ $categoryId = $row['id'];+ $categories[$categoryId] = $row;+ $categoryCost[$categoryId]['cost'] = 0;+ $categoryCost[$categoryId]['name'] = $row['name'];}// Get payment methods@@ -72,10 +70,10 @@ $stmt = $db->prepare($query);$stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);$result = $stmt->execute();while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $paymentMethodId = $row['id'];- $paymentMethodCount[$paymentMethodId] = $row;- $paymentMethodCount[$paymentMethodId]['count'] = 0;- $paymentMethodCount[$paymentMethodId]['name'] = $row['name'];+ $paymentMethodId = $row['id'];+ $paymentMethodCount[$paymentMethodId] = $row;+ $paymentMethodCount[$paymentMethodId]['count'] = 0;+ $paymentMethodCount[$paymentMethodId]['name'] = $row['name'];}// Get code of main currency to display on statistics@@ -104,35 +102,35 @@ $conditions = [];$params = [];if (isset($_GET['member'])) {- $conditions[] = "payer_user_id = :member";- $params[':member'] = $_GET['member'];- $statsSubtitleParts[] = $members[$_GET['member']]['name'];+ $conditions[] = "payer_user_id = :member";+ $params[':member'] = $_GET['member'];+ $statsSubtitleParts[] = $members[$_GET['member']]['name'];}if (isset($_GET['category'])) {- $conditions[] = "category_id = :category";- $params[':category'] = $_GET['category'];- $statsSubtitleParts[] = $categories[$_GET['category']]['name'] == "No category" ? translate("no_category", $i18n) : $categories[$_GET['category']]['name'];+ $conditions[] = "category_id = :category";+ $params[':category'] = $_GET['category'];+ $statsSubtitleParts[] = $categories[$_GET['category']]['name'] == "No category" ? translate("no_category", $i18n) : $categories[$_GET['category']]['name'];}if (isset($_GET['payment'])) {- $conditions[] = "payment_method_id = :payment";- $params[':payment'] = $_GET['payment'];- $statsSubtitleParts[] = $paymentMethodCount[$_GET['payment']]['name'];+ $conditions[] = "payment_method_id = :payment";+ $params[':payment'] = $_GET['payment'];+ $statsSubtitleParts[] = $paymentMethodCount[$_GET['payment']]['name'];}$conditions[] = "user_id = :userId";$params[':userId'] = $userId;if (!empty($conditions)) {- $query .= " WHERE " . implode(' AND ', $conditions);+ $query .= " WHERE " . implode(' AND ', $conditions);}$stmt = $db->prepare($query);$statsSubtitle = !empty($statsSubtitleParts) ? '(' . implode(', ', $statsSubtitleParts) . ')' : "";foreach ($params as $key => $value) {- $stmt->bindValue($key, $value, SQLITE3_INTEGER);+ $stmt->bindValue($key, $value, SQLITE3_INTEGER);}$result = $stmt->execute();@@ -172,20 +170,20 @@ if ($result) {$nextPaymentDate = DateTime::createFromFormat('Y-m-d', trim($next_payment));$tomorrow = new DateTime('tomorrow');$endOfMonth = new DateTime('last day of this month');-+if ($nextPaymentDate >= $tomorrow && $nextPaymentDate <= $endOfMonth) {- $timesToPay = 1;- $daysInMonth = $endOfMonth->diff($tomorrow)->days + 1;- $daysRemaining = $endOfMonth->diff($nextPaymentDate)->days + 1;- if ($cycle == 1) {- $timesToPay = $daysRemaining / $frequency;- }- if ($cycle == 2) {- $weeksInMonth = ceil($daysInMonth / 7);- $weeksRemaining = ceil($daysRemaining / 7);- $timesToPay = $weeksRemaining / $frequency;- }- $amountDueThisMonth += $originalSubscriptionPrice * $timesToPay;+ $timesToPay = 1;+ $daysInMonth = $endOfMonth->diff($tomorrow)->days + 1;+ $daysRemaining = $endOfMonth->diff($nextPaymentDate)->days + 1;+ if ($cycle == 1) {+ $timesToPay = $daysRemaining / $frequency;+ }+ if ($cycle == 2) {+ $weeksInMonth = ceil($daysInMonth / 7);+ $weeksRemaining = ceil($daysRemaining / 7);+ $timesToPay = $weeksRemaining / $frequency;+ }+ $amountDueThisMonth += $originalSubscriptionPrice * $timesToPay;}} else {$inactiveSubscriptions++;@@ -193,10 +191,10 @@ if ($result) {}}-+// Calculate yearly price$totalCostPerYear = $totalCostPerMonth * 12;-+// Calculate average subscription monthly costif ($activeSubscriptions > 0) {$averageSubscriptionCost = $totalCostPerMonth / $activeSubscriptions;@@ -209,7 +207,7 @@ if ($result) {$averageSubscriptionCost = 0;}}-+if (isset($userData['budget']) && $userData['budget'] > 0) {$budget = $userData['budget'];$budgetLeft = $budget - $totalCostPerMonth;@@ -219,7 +217,7 @@ if (isset($userData['budget']) && $userData['budget'] > 0) {if ($totalCostPerMonth > $budget) {$overBudgetAmount = $totalCostPerMonth - $budget;}-}+}$numberOfElements = 6;?>@@ -235,89 +233,92 @@ $numberOfElements = 6;</button><div class="filtermenu-content"><?php- if (count($members) > 1) {- ?>+ if (count($members) > 1) {+ ?><div class="filtermenu-submenu"><div class="filter-title" onClick="toggleSubMenu('member')"><?= translate("member", $i18n) ?></div><div class="filtermenu-submenu-content" id="filter-member"><?php- foreach ($members as $member) {- $selectedClass = '';- if (isset($_GET['member']) && $_GET['member'] == $member['id']) {- $selectedClass = 'selected';- }- ?>- <div class="filter-item <?= $selectedClass ?>" data-memberid="<?= $member['id'] ?>"><?= $member['name'] ?></div>- <?php+ foreach ($members as $member) {+ $selectedClass = '';+ if (isset($_GET['member']) && $_GET['member'] == $member['id']) {+ $selectedClass = 'selected';}+ ?>+ <div class="filter-item <?= $selectedClass ?>" data-memberid="<?= $member['id'] ?>"><?= $member['name'] ?>+ </div>+ <?php+ }?></div></div>- <?php- }+ <?php+ }?><?php- if (count($categories) > 1) {- ?>+ if (count($categories) > 1) {+ ?><div class="filtermenu-submenu"><div class="filter-title" onClick="toggleSubMenu('category')"><?= translate("category", $i18n) ?></div><div class="filtermenu-submenu-content" id="filter-category"><?php- foreach ($categories as $category) {- if ($category['name'] == "No category") {- $category['name'] = translate("no_category", $i18n);- }- $selectedClass = '';- if (isset($_GET['category']) && $_GET['category'] == $category['id']) {- $selectedClass = 'selected';- }- ?>- <div class="filter-item <?= $selectedClass ?>" data-categoryid="<?= $category['id'] ?>"><?= $category['name'] ?></div>- <?php+ foreach ($categories as $category) {+ if ($category['name'] == "No category") {+ $category['name'] = translate("no_category", $i18n);+ }+ $selectedClass = '';+ if (isset($_GET['category']) && $_GET['category'] == $category['id']) {+ $selectedClass = 'selected';}+ ?>+ <div class="filter-item <?= $selectedClass ?>" data-categoryid="<?= $category['id'] ?>">+ <?= $category['name'] ?></div>+ <?php+ }?></div></div>- <?php- }+ <?php+ }?><?php- if (count($paymentMethodCount) > 1) {- ?>+ if (count($paymentMethodCount) > 1) {+ ?><div class="filtermenu-submenu"><div class="filter-title" onClick="toggleSubMenu('payment')"><?= translate("payment_method", $i18n) ?></div><div class="filtermenu-submenu-content" id="filter-payment"><?php- foreach ($paymentMethodCount as $payment) {- $selectedClass = '';- if (isset($_GET['payment']) && $_GET['payment'] == $payment['id']) {- $selectedClass = 'selected';- }- ?>- <div class="filter-item <?= $selectedClass ?>" data-paymentid="<?= $payment['id'] ?>"><?= $payment['name'] ?></div>- <?php+ foreach ($paymentMethodCount as $payment) {+ $selectedClass = '';+ if (isset($_GET['payment']) && $_GET['payment'] == $payment['id']) {+ $selectedClass = 'selected';}+ ?>+ <div class="filter-item <?= $selectedClass ?>" data-paymentid="<?= $payment['id'] ?>">+ <?= $payment['name'] ?></div>+ <?php+ }?></div></div>- <?php- }+ <?php+ }?><?php- if (isset($_GET['member']) || isset($_GET['category']) || isset($_GET['payment'])) {- ?>- <div class="filtermenu-submenu">- <div class="filter-title filter-clear" onClick="clearFilters()">- <i class="fa-solid fa-times-circle"></i> <?= translate("clear", $i18n) ?>- </div>- </div>- <?php- }+ if (isset($_GET['member']) || isset($_GET['category']) || isset($_GET['payment'])) {+ ?>+ <div class="filtermenu-submenu">+ <div class="filter-title filter-clear" onClick="clearFilters()">+ <i class="fa-solid fa-times-circle"></i> <?= translate("clear", $i18n) ?>+ </div>+ </div>+ <?php+ }?></div>- </div>+ </div>+ </div></div>-</div></div><div class="statistics"><div class="statistic">@@ -340,17 +341,18 @@ $numberOfElements = 6;<span><?= CurrencyFormatter::format($mostExpensiveSubscription['price'], $code) ?></span><div class="title"><?= translate('most_expensive', $i18n) ?></div><?php- if (isset($mostExpensiveSubscription['logo']) && $mostExpensiveSubscription['logo'] != '') {- ?>- <div class="subtitle">- <img src="images/uploads/logos/<?= $mostExpensiveSubscription['logo'] ?>" alt="<?= $mostExpensiveSubscription['name'] ?>" title="<?= $mostExpensiveSubscription['name'] ?>" />- </div>- <?php- } else if (isset($mostExpensiveSubscription['name']) && $mostExpensiveSubscription['name'] != ''){- ?>- <div class="subtitle"><?= $mostExpensiveSubscription['name'] ?></div>- <?php- }+ if (isset($mostExpensiveSubscription['logo']) && $mostExpensiveSubscription['logo'] != '') {+ ?>+ <div class="subtitle">+ <img src="images/uploads/logos/<?= $mostExpensiveSubscription['logo'] ?>"+ alt="<?= $mostExpensiveSubscription['name'] ?>" title="<?= $mostExpensiveSubscription['name'] ?>" />+ </div>+ <?php+ } else if (isset($mostExpensiveSubscription['name']) && $mostExpensiveSubscription['name'] != '') {+ ?>+ <div class="subtitle"><?= $mostExpensiveSubscription['name'] ?></div>+ <?php+ }?></div><div class="statistic">@@ -358,161 +360,161 @@ $numberOfElements = 6;<div class="title"><?= translate('amount_due', $i18n) ?></div></div><?php- if (isset($budgetUsed)) {- $numberOfElements += 1;- ?>- <div class="statistic">- <span><?= number_format($budgetUsed, 2) ?>%</span>- <div class="title"><?= translate('percentage_budget_used', $i18n) ?></div>- </div>- <?php- }- if (isset($budgetLeft)) {- $numberOfElements += 1;- ?>- <div class="statistic">- <span><?= CurrencyFormatter::format($budgetLeft, $code) ?></span>- <div class="title"><?= translate('budget_remaining', $i18n) ?></div>- </div>- <?php- }- if (isset($overBudgetAmount)) {- $numberOfElements += 1;- ?>- <div class="statistic">- <span><?= CurrencyFormatter::format($overBudgetAmount, $code) ?></span>- <div class="title"><?= translate('amount_over_budget', $i18n) ?></div>- </div>- <?php- }- if ($inactiveSubscriptions > 0) {- $numberOfElements += 3;- ?>- <div class="statistic">- <span><?= $inactiveSubscriptions ?></span>- <div class="title"><?= translate('inactive_subscriptions', $i18n) ?></div>- </div>- <div class="statistic">- <span><?= CurrencyFormatter::format($totalSavingsPerMonth, $code) ?></span>- <div class="title"><?= translate('monthly_savings', $i18n) ?></div>- </div>- <div class="statistic">- <span><?= CurrencyFormatter::format($totalSavingsPerMonth * 12, $code) ?></span>- <div class="title"><?= translate('yearly_savings', $i18n) ?></div>- </div>- <?php- }+ if (isset($budgetUsed)) {+ $numberOfElements += 1;+ ?>+ <div class="statistic">+ <span><?= number_format($budgetUsed, 2) ?>%</span>+ <div class="title"><?= translate('percentage_budget_used', $i18n) ?></div>+ </div>+ <?php+ }+ if (isset($budgetLeft)) {+ $numberOfElements += 1;+ ?>+ <div class="statistic">+ <span><?= CurrencyFormatter::format($budgetLeft, $code) ?></span>+ <div class="title"><?= translate('budget_remaining', $i18n) ?></div>+ </div>+ <?php+ }+ if (isset($overBudgetAmount)) {+ $numberOfElements += 1;+ ?>+ <div class="statistic">+ <span><?= CurrencyFormatter::format($overBudgetAmount, $code) ?></span>+ <div class="title"><?= translate('amount_over_budget', $i18n) ?></div>+ </div>+ <?php+ }+ if ($inactiveSubscriptions > 0) {+ $numberOfElements += 3;+ ?>+ <div class="statistic">+ <span><?= $inactiveSubscriptions ?></span>+ <div class="title"><?= translate('inactive_subscriptions', $i18n) ?></div>+ </div>+ <div class="statistic">+ <span><?= CurrencyFormatter::format($totalSavingsPerMonth, $code) ?></span>+ <div class="title"><?= translate('monthly_savings', $i18n) ?></div>+ </div>+ <div class="statistic">+ <span><?= CurrencyFormatter::format($totalSavingsPerMonth * 12, $code) ?></span>+ <div class="title"><?= translate('yearly_savings', $i18n) ?></div>+ </div>+ <?php+ }- if (($numberOfElements + 1) % 3 == 0) {- ?>- <div class="statistic empty"></div>- <?php- }- ?>+ if (($numberOfElements + 1) % 3 == 0) {+ ?>+ <div class="statistic empty"></div>+ <?php+ }+ ?></div><?php- $categoryDataPoints = [];- if (isset($categoryCost)) {- foreach ($categoryCost as $category) {- if ($category['cost'] != 0) {- $categoryDataPoints[] = [- "label" => $category['name'],- "y" => $category["cost"],- ];- }- }- }-- $showCategoryCostGraph = count($categoryDataPoints) > 1;-- $memberDataPoints = [];- if (isset($memberCost)) {- foreach ($memberCost as $member) {- if ($member['cost'] != 0) {- $memberDataPoints[] = [- "label" => $member['name'],- "y" => $member["cost"],- ];-- }+ $categoryDataPoints = [];+ if (isset($categoryCost)) {+ foreach ($categoryCost as $category) {+ if ($category['cost'] != 0) {+ $categoryDataPoints[] = [+ "label" => $category['name'],+ "y" => $category["cost"],+ ];}}-- $showMemberCostGraph = count($memberDataPoints) > 1;-- $paymentMethodDataPoints = [];- foreach ($paymentMethodCount as $paymentMethod) {- if ($paymentMethod['count'] != 0) {- $paymentMethodDataPoints[] = [- "label" => $paymentMethod['name'],- "y" => $paymentMethod["count"],+ }++ $showCategoryCostGraph = count($categoryDataPoints) > 1;++ $memberDataPoints = [];+ if (isset($memberCost)) {+ foreach ($memberCost as $member) {+ if ($member['cost'] != 0) {+ $memberDataPoints[] = [+ "label" => $member['name'],+ "y" => $member["cost"],];+}}+ }- $showPaymentMethodCountGraph = count($paymentMethodDataPoints) > 1;- if ($showCategoryCostGraph || $showMemberCostGraph || $showPaymentMethodCountGraph) {- ?>- <h2><?= translate('split_views', $i18n) ?></h2>- <div class="graphs">- <?php- if ($showMemberCostGraph) {- ?>- <section class="graph">- <header>- <?= translate('household_split', $i18n) ?>- <div class="sub-header">(<?= translate('monthly_cost', $i18n) ?>)</div>- </header>- <canvas id="memberSplitChart"></canvas>- </section>- <?php- }-- if ($showCategoryCostGraph) {- ?>- <section class="graph">- <header>- <?= translate('category_split', $i18n) ?>- <div class="sub-header">(<?= translate('monthly_cost', $i18n) ?>)</div>- </header>- <canvas id="categorySplitChart" style="height: 370px; width: 100%;"></canvas>- </section>- <?php- }-- if ($showPaymentMethodCountGraph) {- ?>- <section class="graph">- <header>- <?= translate('payment_method_split', $i18n) ?>- </header>- <canvas id="paymentMethidSplitChart" style="height: 370px; width: 100%;"></canvas>- </section>- <?php- }+ $showMemberCostGraph = count($memberDataPoints) > 1;- ?>- </div>- <?php+ $paymentMethodDataPoints = [];+ foreach ($paymentMethodCount as $paymentMethod) {+ if ($paymentMethod['count'] != 0) {+ $paymentMethodDataPoints[] = [+ "label" => $paymentMethod['name'],+ "y" => $paymentMethod["count"],+ ];}- ?>--</section>-<?php+ }++ $showPaymentMethodCountGraph = count($paymentMethodDataPoints) > 1;if ($showCategoryCostGraph || $showMemberCostGraph || $showPaymentMethodCountGraph) {?>- <script src="scripts/libs/chart.js"></script>- <script type="text/javascript">- window.onload = function() {- loadGraph("categorySplitChart", <?php echo json_encode($categoryDataPoints, JSON_NUMERIC_CHECK); ?>, "<?= $code ?>", <?= $showCategoryCostGraph ?>);- loadGraph("memberSplitChart", <?php echo json_encode($memberDataPoints, JSON_NUMERIC_CHECK); ?>, "<?= $code ?>", <?= $showMemberCostGraph ?>);- loadGraph("paymentMethidSplitChart", <?php echo json_encode($paymentMethodDataPoints, JSON_NUMERIC_CHECK); ?>, "", <?= $showPaymentMethodCountGraph ?>);+ <h2><?= translate('split_views', $i18n) ?></h2>+ <div class="graphs">+ <?php+ if ($showMemberCostGraph) {+ ?>+ <section class="graph">+ <header>+ <?= translate('household_split', $i18n) ?>+ <div class="sub-header">(<?= translate('monthly_cost', $i18n) ?>)</div>+ </header>+ <canvas id="memberSplitChart"></canvas>+ </section>+ <?php}- </script>++ if ($showCategoryCostGraph) {+ ?>+ <section class="graph">+ <header>+ <?= translate('category_split', $i18n) ?>+ <div class="sub-header">(<?= translate('monthly_cost', $i18n) ?>)</div>+ </header>+ <canvas id="categorySplitChart" style="height: 370px; width: 100%;"></canvas>+ </section>+ <?php+ }++ if ($showPaymentMethodCountGraph) {+ ?>+ <section class="graph">+ <header>+ <?= translate('payment_method_split', $i18n) ?>+ </header>+ <canvas id="paymentMethidSplitChart" style="height: 370px; width: 100%;"></canvas>+ </section>+ <?php+ }++ ?>+ </div><?php}+ ?>++</section>+<?php+if ($showCategoryCostGraph || $showMemberCostGraph || $showPaymentMethodCountGraph) {+ ?>+ <script src="scripts/libs/chart.js"></script>+ <script type="text/javascript">+ window.onload = function () {+ loadGraph("categorySplitChart", <?php echo json_encode($categoryDataPoints, JSON_NUMERIC_CHECK); ?>, "<?= $code ?>", <?= $showCategoryCostGraph ?>);+ loadGraph("memberSplitChart", <?php echo json_encode($memberDataPoints, JSON_NUMERIC_CHECK); ?>, "<?= $code ?>", <?= $showMemberCostGraph ?>);+ loadGraph("paymentMethidSplitChart", <?php echo json_encode($paymentMethodDataPoints, JSON_NUMERIC_CHECK); ?>, "", <?= $showPaymentMethodCountGraph ?>);+ }+ </script>+ <?php+}?><script src="scripts/stats.js?<?= $version ?>"></script><?php- require_once 'includes/footer.php';+require_once 'includes/footer.php';?>\ No newline at end of filediff --git a/styles/styles.css b/styles/styles.cssindex af2ada3..a8696e2 100644--- a/styles/styles.css+++ b/styles/styles.css@@ -2094,4 +2094,8 @@ textarea.thin {.subscription-modal img {max-width: 135px;+}++.capitalize {+ text-transform: capitalize;}\ No newline at end of filediff --git a/verifyemail.php b/verifyemail.phpindex 926780e..e5150eb 100644--- a/verifyemail.php+++ b/verifyemail.php@@ -19,7 +19,7 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {$db->close();header("Location: .");exit();-}+}$theme = "light";if (isset($_COOKIE['theme'])) {@@ -72,10 +72,11 @@ if (isset($_GET['email']) && isset($_GET['token'])) {?><!DOCTYPE html><html dir="<?= $languages[$lang]['dir'] ?>">+<head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">- <meta name="theme-color" content="<?= $theme == "light" ? "#FFFFFF" : "#222222" ?>"/>+ <meta name="theme-color" content="<?= $theme == "light" ? "#FFFFFF" : "#222222" ?>" /><title>Wallos - Subscription Tracker</title><link rel="icon" type="image/png" href="images/icon/favicon.ico" sizes="16x16"><link rel="apple-touch-icon" sizes="180x180" href="images/icon/apple-touch-icon.png">@@ -89,32 +90,39 @@ if (isset($_GET['email']) && isset($_GET['token'])) {<link rel="stylesheet" href="styles/barlow.css"><link rel="stylesheet" href="styles/login-dark-theme.css?<?= $version ?>" id="dark-theme" <?= $theme == "light" ? "disabled" : "" ?>></head>+<body class="<?= $languages[$lang]['dir'] ?>"><div class="content"><section class="container"><header>- <?php- if ($theme == "light") {- ?> <img src="images/siteicons/<?= $colorTheme ?>/wallos.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" width="215" /> <?php- } else {- ?> <img src="images/siteicons/<?= $colorTheme ?>/walloswhite.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" width="215" /> <?php- }+ <?php+ if ($theme == "light") {+ ?> <img src="images/siteicons/<?= $colorTheme ?>/wallos.png" alt="Wallos Logo"+ title="Wallos - Subscription Tracker" width="215" /> <?php+ } else {+ ?> <img src="images/siteicons/<?= $colorTheme ?>/walloswhite.png" alt="Wallos Logo"+ title="Wallos - Subscription Tracker" width="215" /> <?php+ }?></header><div class="message"><?php- if ($validated == false) {- ?>- <ul class="error-box">- <li><i class="fa-solid fa-triangle-exclamation"></i><?= translate('email_verification_failed', $i18n) ?></li>- </ul>- <?php- }+ if ($validated == false) {+ ?>+ <ul class="error-box">+ <li><i+ class="fa-solid fa-triangle-exclamation"></i><?= translate('email_verification_failed', $i18n) ?>+ </li>+ </ul>+ <?php+ }?></div><div class="separator"></div>- <input type="button" class="button" onclick="window.location.href='login.php'" value="<?= translate('login', $i18n) ?>"></input>+ <input type="button" class="button" onclick="window.location.href='login.php'"+ value="<?= translate('login', $i18n) ?>"></input></section></div></body>+</html>\ No newline at end of file