+ onchange="toggleUpdateNotification()"/>
+
+
> /var/log/cron/sendnotifications.log 2>&1
*/2 * * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/sendverificationemails.php >> /var/log/cron/sendverificationemails.log 2>&1
*/2 * * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/sendresetpasswordemails.php >> /var/log/cron/sendresetpasswordemails.log 2>&1
+0 */6 * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/checkforupdates.php >> /var/log/cron/checkforupdates.log 2>&1
diff --git a/endpoints/admin/updatenotification.php b/endpoints/admin/updatenotification.php
new file mode 100644
index 000000000..dfa00c5d3
--- /dev/null
+++ b/endpoints/admin/updatenotification.php
@@ -0,0 +1,46 @@
+ false,
+ "message" => translate('session_expired', $i18n)
+ ]));
+}
+
+// Check that user is an admin
+if ($userId !== 1) {
+ die(json_encode([
+ "success" => false,
+ "message" => translate('error', $i18n)
+ ]));
+}
+
+if ($_SERVER["REQUEST_METHOD"] === "POST") {
+
+ $postData = file_get_contents("php://input");
+ $data = json_decode($postData, true);
+
+ $updateNotification = $data['notificationEnabled'];
+
+ // Save settings
+ $stmt = $db->prepare('UPDATE admin SET update_notification = :update_notification');
+ $stmt->bindValue(':update_notification', $updateNotification, SQLITE3_INTEGER);
+ $result = $stmt->execute();
+
+ if ($result) {
+ die(json_encode([
+ "success" => true,
+ "message" => translate('success', $i18n)
+ ]));
+ } else {
+ die(json_encode([
+ "success" => false,
+ "message" => translate('error', $i18n)
+ ]));
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/endpoints/cronjobs/checkforupdates.php b/endpoints/cronjobs/checkforupdates.php
new file mode 100644
index 000000000..32bcb64e7
--- /dev/null
+++ b/endpoints/cronjobs/checkforupdates.php
@@ -0,0 +1,30 @@
+ [
+ 'header' => "User-Agent: MyApp\r\n"
+ ]
+];
+
+$repository = 'ellite/Wallos'; // Change this to your repository if you fork Wallos
+$url = "https://api.github.com/repos/$repository/releases/latest";
+
+$context = stream_context_create($options);
+$fetch = file_get_contents($url, false, $context);
+
+if ($fetch === false) {
+ die('Error fetching data from GitHub API');
+}
+
+$latestVersion = json_decode($fetch, true)['tag_name'];
+
+// Check that $latestVersion is a valid version number
+if (!preg_match('/^v\d+\.\d+\.\d+$/', $latestVersion)) {
+ die('Error: Invalid version number from GitHub API');
+}
+
+$db->exec("UPDATE admin SET latest_version = '$latestVersion'");
+
+?>
\ No newline at end of file
diff --git a/endpoints/settings/disabled_to_bottom.php b/endpoints/settings/disabled_to_bottom.php
new file mode 100644
index 000000000..722a7eb52
--- /dev/null
+++ b/endpoints/settings/disabled_to_bottom.php
@@ -0,0 +1,34 @@
+ false,
+ "message" => translate('session_expired', $i18n)
+ ]));
+}
+
+if ($_SERVER["REQUEST_METHOD"] === "POST") {
+ $postData = file_get_contents("php://input");
+ $data = json_decode($postData, true);
+
+ $disabled_to_bottom = $data['value'];
+
+ $stmt = $db->prepare('UPDATE settings SET disabled_to_bottom = :disabled_to_bottom WHERE user_id = :userId');
+ $stmt->bindParam(':disabled_to_bottom', $disabled_to_bottom, SQLITE3_INTEGER);
+ $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 file
diff --git a/endpoints/subscriptions/get.php b/endpoints/subscriptions/get.php
index 98fd9a28f..0eacce5fd 100644
--- a/endpoints/subscriptions/get.php
+++ b/endpoints/subscriptions/get.php
@@ -19,24 +19,11 @@
}
if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {
+
+
$sort = "next_payment";
$sortOrder = $sort;
$order = "ASC";
- $sql = "SELECT * FROM subscriptions ORDER BY next_payment ASC, inactive ASC";
- if (isset($_COOKIE['sortOrder']) && $_COOKIE['sortOrder'] != "") {
- $sort = $_COOKIE['sortOrder'];
- $sortOrder = $sort;
- $allowedSortCriteria = ['name', 'id', 'next_payment', 'price', 'payer_user_id', 'category_id', 'payment_method_id', 'inactive', 'alphanumeric'];
- if ($sort == "price" || $sort == "id") {
- $order = "DESC";
- }
- if ($sort == "alphanumeric") {
- $sort = "name";
- }
- if (!in_array($sort, $allowedSortCriteria)) {
- $sort = "next_payment";
- }
- }
$params = array();
$sql = "SELECT * FROM subscriptions WHERE user_id = :userId";
@@ -61,12 +48,41 @@
$params[':inactive'] = $_GET['state'];
}
- $sql .= " ORDER BY LOWER($sort) $order";
- if ($sort != "next_payment") {
- $sql .= ", next_payment ASC";
- }
- if ($sort != "state") {
- $sql .= ", 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', 'inactive', 'alphanumeric'];
+ $order = ($sort == "price" || $sort == "id") ? "DESC" : "ASC";
+
+ if ($sort == "alphanumeric") {
+ $sort = "name";
+ }
+
+ if (!in_array($sort, $allowedSortCriteria)) {
+ $sort = "next_payment";
+ }
+
+ $orderByClauses = [];
+
+ if ($settings['disabledToBottom'] === 'true') {
+ if (in_array($sort, ["payer_user_id", "category_id", "payment_method_id"])) {
+ $orderByClauses[] = "$sort $order";
+ $orderByClauses[] = "inactive ASC";
+ } else {
+ $orderByClauses[] = "inactive ASC";
+ $orderByClauses[] = "$sort $order";
+ }
+ } else {
+ $orderByClauses[] = "$sort $order";
+ if ($sort != "inactive") {
+ $orderByClauses[] = "inactive ASC";
+ }
+ }
+
+ if ($sort != "next_payment") {
+ $orderByClauses[] = "next_payment ASC";
+ }
+
+ $sql .= " ORDER BY " . implode(", ", $orderByClauses);
}
$stmt = $db->prepare($sql);
@@ -123,6 +139,22 @@
usort($print, function ($a, $b) {
return strnatcmp(strtolower($a['name']), strtolower($b['name']));
});
+ if ($settings['disabledToBottom'] === 'true') {
+ usort($print, function ($a, $b) {
+ return $a['inactive'] - $b['inactive'];
+ });
+ }
+ }
+
+ if ($sort === "price") {
+ usort($subscriptions, function ($a, $b) {
+ return $a['price'] < $b['price'] ? 1 : -1;
+ });
+ if ($settings['disabledToBottom'] === 'true') {
+ usort($print, function ($a, $b) {
+ return $a['inactive'] - $b['inactive'];
+ });
+ }
}
if (isset($print)) {
diff --git a/includes/getsettings.php b/includes/getsettings.php
index 7b35a0873..7def7ee62 100644
--- a/includes/getsettings.php
+++ b/includes/getsettings.php
@@ -27,6 +27,7 @@
$settings['convertCurrency'] = $settings['convert_currency'] ? 'true': 'false';
$settings['removeBackground'] = $settings['remove_background'] ? 'true': 'false';
$settings['hideDisabledSubscriptions'] = $settings['hide_disabled'] ? 'true': 'false';
+ $settings['disabledToBottom'] = $settings['disabled_to_bottom'] ? 'true': 'false';
}
$query = "SELECT * FROM custom_colors WHERE user_id = :userId";
@@ -54,6 +55,8 @@
if ($adminSettings) {
$settings['disableLogin'] = $adminSettings['login_disabled'];
+ $settings['update_notification'] = $adminSettings['update_notification'];
+ $settings['latest_version'] = $adminSettings['latest_version'];
}
?>
\ No newline at end of file
diff --git a/includes/i18n/de.php b/includes/i18n/de.php
index 371cd32d5..398aa08b7 100644
--- a/includes/i18n/de.php
+++ b/includes/i18n/de.php
@@ -197,6 +197,7 @@
"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",
+ "show_disabled_subscriptions_at_the_bottom" => "Deaktivierte Abonnements am Ende anzeigen",
"experimental_settings" => "Experimentelle Einstellungen",
"remove_background" => "Versuchen den Hintergrund von Logos aus der Bildersuche zu entfernen (experimentell)",
"experimental_info" => "Experimentelle Einstellungen funktionieren möglicherweise nicht perfekt.",
@@ -309,6 +310,12 @@
"smtp_usage_info" => "Wird für die Passwortwiederherstellung und andere System-E-Mails verwendet",
"maintenance_tasks" => "Wartungsaufgaben",
"orphaned_logos" => "Verwaiste Logos",
+ "update" => "Update",
+ "new_version_available" => "Eine neue Version von Wallos ist verfügbar",
+ "current_version" => "Aktuelle Version",
+ "latest_version" => "Neueste Version",
+ "on_current_version" => "Sie verwenden die neueste Version von Wallos.",
+ "show_update_notification" => "Benachrichtigung über Updates auf dem Dashboard anzeigen",
// Email Verification
"email_verified" => "E-Mail verifiziert",
"email_verification_failed" => "E-Mail konnte nicht verifiziert werden",
diff --git a/includes/i18n/el.php b/includes/i18n/el.php
index c3a1b8a70..b0c3bf44f 100644
--- a/includes/i18n/el.php
+++ b/includes/i18n/el.php
@@ -186,7 +186,7 @@
"theme" => "Θέμα",
"dark_theme" => "Dark Theme",
"light_theme" => "Light Theme",
- "automatic"=> "Αυτόματο",
+ "automatic" => "Αυτόματο",
"main_color" => "Κύριο χρώμα",
"accent_color" => "Χρώμα επισήμανσης",
"hover_color" => "Χρώμα πάνω από",
@@ -197,6 +197,7 @@
"calculate_monthly_price" => "Υπολογισμός και εμφάνιση της μηνιαίας τιμής για όλες τις συνδρομές",
"convert_prices" => "Πάντα να μετατρέπει και να εμφανίζει τις τιμές στο κύριο νόμισμά μου (πιο αργό)",
"hide_disabled_subscriptions" => "Απόκρυψη απενεργοποιημένων συνδρομών",
+ "show_disabled_subscriptions_at_the_bottom" => "Εμφάνιση απενεργοποιημένων συνδρομών στο τέλος",
"experimental_settings" => "Πειραματικές ρυθμίσεις",
"remove_background" => "Προσπάθεια αφαίρεσης του φόντου των λογότυπων από την αναζήτηση εικόνας (πειραματικά)",
"experimental_info" => "Οι πειραματικές ρυθμίσεις πιθανότατα δεν θα λειτουργούν τέλεια.",
@@ -309,6 +310,12 @@
"smtp_usage_info" => "Θα χρησιμοποιηθεί για ανάκτηση κωδικού πρόσβασης και άλλα μηνύματα ηλεκτρονικού ταχυδρομείου συστήματος.",
"maintenance_tasks" => "Εργασίες συντήρησης",
"orphaned_logos" => "Ορφανά λογότυπα",
+ "update" => "Ενημέρωση",
+ "new_version_available" => "Μια νέα έκδοση του Wallos είναι διαθέσιμη",
+ "current_version" => "Τρέχουσα Έκδοση",
+ "latest_version" => "Τελευταία Έκδοση",
+ "on_current_version" => "Χρησιμοποιείτε την τελευταία έκδοση του Wallos.",
+ "show_update_notification" => "Εμφάνιση ειδοποίησης για ενημερώσεις στο dashboard",
// Email Verification
"email_verified" => "Το email επιβεβαιώθηκε",
"email_verification_failed" => "Η επαλήθευση email απέτυχε",
diff --git a/includes/i18n/en.php b/includes/i18n/en.php
index 31176a8b7..6e84637ea 100644
--- a/includes/i18n/en.php
+++ b/includes/i18n/en.php
@@ -197,6 +197,7 @@
"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",
+ "show_disabled_subscriptions_at_the_bottom" => "Show disabled subscriptions at the bottom",
"experimental_settings" => "Experimental Settings",
"remove_background" => "Attempt to remove background of logos from image search (experimental)",
"experimental_info" => "Experimental settings will probably not work perfectly.",
@@ -309,6 +310,12 @@
"smtp_usage_info" => "Will be used for password recovery and other system emails.",
"maintenance_tasks" => "Maintenance Tasks",
"orphaned_logos" => "Orphaned Logos",
+ "update" => "Update",
+ "new_version_available" => "A new version of Wallos is available",
+ "current_version" => "Current Version",
+ "latest_version" => "Latest Version",
+ "on_current_version" => "You're running the latest version of Wallos.",
+ "show_update_notification" => "Show notification for updates on the dashboard",
// Email Verification
"email_verified" => "Email verified successfully",
"email_verification_failed" => "Email verification failed",
diff --git a/includes/i18n/es.php b/includes/i18n/es.php
index 199efac5a..2ce4ef698 100644
--- a/includes/i18n/es.php
+++ b/includes/i18n/es.php
@@ -186,7 +186,7 @@
"theme" => "Tema",
"dark_theme" => "Tema Oscuro",
"light_theme" => "Tema Claro",
- "automatic"=> "Automático",
+ "automatic" => "Automático",
"main_color" => "Color Principal",
"accent_color" => "Color de Acento",
"hover_color" => "Color de Hover",
@@ -197,6 +197,7 @@
"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",
+ "show_disabled_subscriptions_at_the_bottom" => "Mostrar suscripciones desactivadas al final",
"experimental_settings" => "Configuraciones Experimentales",
"remove_background" => "Intentar quitar el fondo de los logotipos de la búsqueda de imágenes (experimental)",
"experimental_info" => "Las configuraciones experimentales probablemente no funcionarán perfectamente.",
@@ -309,6 +310,12 @@
"smtp_usage_info" => "Se utilizará para recuperar contraseñas y otros correos electrónicos del sistema.",
"maintenance_tasks" => "Tareas de Mantenimiento",
"orphaned_logos" => "Logotipos huérfanos",
+ "update" => "Actualizar",
+ "new_version_available" => "Una nueva versión de Wallos está disponible",
+ "current_version" => "Versión Actual",
+ "latest_version" => "Última Versión",
+ "on_current_version" => "Está utilizando la última versión de Wallos.",
+ "show_update_notification" => "Mostrar notificación de actualizaciones en el dashboard",
// Email Verification
"email_verified" => "Correo electrónico verificado",
"email_verification_failed" => "Error al verificar el correo electrónico",
diff --git a/includes/i18n/fr.php b/includes/i18n/fr.php
index cbe6ac53d..cba8f0704 100644
--- a/includes/i18n/fr.php
+++ b/includes/i18n/fr.php
@@ -186,7 +186,7 @@
"theme" => "Thème",
"dark_theme" => "Thème sombre",
"light_theme" => "Thème clair",
- "automatic"=> "Automatique",
+ "automatic" => "Automatique",
"main_color" => "Couleur principale",
"accent_color" => "Couleur d'accent",
"hover_color" => "Couleur de survol",
@@ -197,6 +197,7 @@
"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",
+ "show_disabled_subscriptions_at_the_bottom" => "Afficher les abonnements désactivés en bas",
"experimental_settings" => "Paramètres expérimentaux",
"remove_background" => "Tenter de supprimer l'arrière-plan des logos de la recherche d'images (expérimental)",
"experimental_info" => "Les paramètres expérimentaux ne fonctionneront probablement pas parfaitement.",
@@ -309,6 +310,12 @@
"smtp_usage_info" => "Sera utilisé pour la récupération du mot de passe et d'autres e-mails système.",
"maintenance_tasks" => "Tâches de maintenance",
"orphaned_logos" => "Logos orphelins",
+ "update" => "Mise à jour",
+ "new_version_available" => "Une nouvelle version de Wallos est disponible",
+ "current_version" => "Version actuelle",
+ "latest_version" => "Dernière version",
+ "on_current_version" => "Vous utilisez la dernière version de Wallos.",
+ "show_update_notification" => "Afficher la notification de mise à jour sur le tableau de bord",
// Email Verification
"email_verified" => "Votre adresse courriel a été vérifiée avec succès",
"email_verification_failed" => "La vérification de l'adresse courriel a échoué",
diff --git a/includes/i18n/it.php b/includes/i18n/it.php
index cc6c47ce1..ff441ef26 100644
--- a/includes/i18n/it.php
+++ b/includes/i18n/it.php
@@ -205,6 +205,7 @@
'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',
+ "show_disabled_subscriptions_at_the_bottom" => 'Mostra gli abbonamenti disattivati in fondo',
'experimental_settings' => 'Impostazioni sperimentali',
'remove_background' => 'Prova a rimuovere lo sfondo dei loghi dalla ricerca delle immagini (sperimentale)',
'experimental_info' => 'Le impostazioni sperimentali potrebbero non funzioneranno perfettamente.',
@@ -328,6 +329,12 @@
"smtp_usage_info" => "Verrà utilizzato per il recupero della password e altre e-mail di sistema.",
"maintenance_tasks" => "Compiti di manutenzione",
"orphaned_logos" => "Loghi orfani",
+ "update" => "Aggiorna",
+ "new_version_available" => "È disponibile una nuova versione di Wallos",
+ "current_version" => "Versione attuale",
+ "latest_version" => "Ultima versione",
+ "on_current_version" => "Stai utilizzando l'ultima versione di Wallos.",
+ "show_update_notification" => "Mostra notifica di aggiornamento sulla dashboard",
// Email Verification
"email_verified" => "L'indirizzo email è stato verificato con successo",
diff --git a/includes/i18n/jp.php b/includes/i18n/jp.php
index b55c9dfe1..5c9be3c2e 100644
--- a/includes/i18n/jp.php
+++ b/includes/i18n/jp.php
@@ -186,7 +186,7 @@
"theme" => "テーマ",
"dark_theme" => "ダークテーマ",
"light_theme" => "ライトテーマ",
- "automatic"=> "自動",
+ "automatic" => "自動",
"main_color" => "メインカラー",
"accent_color" => "アクセントカラー",
"hover_color" => "ホバーカラー",
@@ -197,6 +197,7 @@
"calculate_monthly_price" => "すべての定期購入の月額料金を計算して表示する",
"convert_prices" => "常にメイン通貨で価格を換算して表示する (遅い)",
"hide_disabled_subscriptions" => "無効な定期購入を非表示にする",
+ "show_disabled_subscriptions_at_the_bottom" => "無効な定期購入を一番下に表示する",
"experimental_settings" => "実験的な設定",
"remove_background" => "画像検索からロゴの背景を削除する (実験)",
"experimental_info" => "実験的な設定は、おそらく完全には機能しません。",
@@ -302,6 +303,12 @@
"smtp_usage_info" => "パスワードの回復やその他のシステム電子メールに使用されます。",
"maintenance_tasks" => "メンテナンスタスク",
"orphaned_logos" => "孤立したロゴ",
+ "update" => "更新",
+ "new_version_available" => "新しいバージョンのWallosが利用可能です",
+ "current_version" => "現在のバージョン",
+ "latest_version" => "最新バージョン",
+ "on_current_version" => "最新バージョンのWallosを使用しています。",
+ "show_update_notification" => "ダッシュボードに更新通知を表示する",
// Email Verification
"email_verified" => "メールアドレスが確認されました",
"email_verification_failed" => "メールアドレスの確認に失敗しました",
diff --git a/includes/i18n/ko.php b/includes/i18n/ko.php
index 98aadce5e..d1eff9fb4 100644
--- a/includes/i18n/ko.php
+++ b/includes/i18n/ko.php
@@ -187,7 +187,7 @@
"theme" => "테마",
"dark_theme" => "다크 테마",
"light_theme" => "라이트 테마",
- "automatic"=> "자동",
+ "automatic" => "자동",
"main_color" => "메인 색상",
"accent_color" => "강조 색상",
"hover_color" => "마우스 호버 색상",
@@ -198,6 +198,7 @@
"calculate_monthly_price" => "모든 구독에 대한 월별 요금을 계산하고 표시",
"convert_prices" => "항상 기본 통화로 가격을 환산하고 표시 (느림)",
"hide_disabled_subscriptions" => "비활성화된 구독 숨기기",
+ "show_disabled_subscriptions_at_the_bottom" => "비활성화된 구독을 하단에 표시",
"experimental_settings" => "실험적 설정",
"remove_background" => "로고 이미지 검색에서 배경 삭제 (실험적)",
"experimental_info" => "실험적 설정은 제대로 작동하지 않을 수 있습니다.",
@@ -310,6 +311,12 @@
"smtp_usage_info" => "비밀번호 복구 및 기타 시스템 이메일에 사용됩니다.",
"maintenance_tasks" => "유지보수 작업",
"orphaned_logos" => "고아 로고",
+ "update" => "업데이트",
+ "new_version_available" => "새로운 버전의 Wallos가 이용 가능합니다",
+ "current_version" => "현재 버전",
+ "latest_version" => "최신 버전",
+ "on_current_version" => "최신 버전의 Wallos를 사용 중입니다.",
+ "show_update_notification" => "대시보드에 업데이트 알림 표시",
// Email Verification
"email_verified" => "이메일 인증 완료",
"email_verification_failed" => "이메일 인증 실패",
diff --git a/includes/i18n/pl.php b/includes/i18n/pl.php
index 233c82442..fa402cbe7 100644
--- a/includes/i18n/pl.php
+++ b/includes/i18n/pl.php
@@ -197,6 +197,7 @@
"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",
+ "show_disabled_subscriptions_at_the_bottom" => "Pokaż wyłączone subskrypcje na dole",
"experimental_settings" => "Ustawienia eksperymentalne",
"remove_background" => "Próba usunięcia tła logo z wyszukiwania obrazów (eksperymentalnie)",
"experimental_info" => "Ustawienia eksperymentalne prawdopodobnie nie będą działać idealnie.",
@@ -309,6 +310,12 @@
"smtp_usage_info" => "Będzie używany do odzyskiwania hasła i innych e-maili systemowych.",
"maintenance_tasks" => "Zadania konserwacyjne",
"orphaned_logos" => "Osierocone logo",
+ "update" => "Aktualizacja",
+ "new_version_available" => "Dostępna jest nowa wersja Wallos",
+ "current_version" => "Aktualna wersja",
+ "latest_version" => "Najnowsza wersja",
+ "on_current_version" => "Używasz najnowszej wersji Wallos.",
+ "show_update_notification" => "Pokaż powiadomienie o aktualizacjach na dashboardzie",
// Email Verification
"email_verified" => "E-mail został zweryfikowany",
"email_verification_failed" => "Weryfikacja e-maila nie powiodła się",
diff --git a/includes/i18n/pt.php b/includes/i18n/pt.php
index 78717494e..ad2895c0e 100644
--- a/includes/i18n/pt.php
+++ b/includes/i18n/pt.php
@@ -186,7 +186,7 @@
"theme" => "Tema",
"dark_theme" => "Tema Escuro",
"light_theme" => "Tema Claro",
- "automatic"=> "Automático",
+ "automatic" => "Automático",
"main_color" => "Cor Principal",
"accent_color" => "Cor de Destaque",
"hover_color" => "Cor de Hover",
@@ -197,6 +197,7 @@
"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",
+ "show_disabled_subscriptions_at_the_bottom" => "Mostrar subscrições desactivadas no fundo da lista",
"experimental_settings" => "Definições Experimentais",
"remove_background" => "Tentar remover o fundo dos logos na pesquisa de imagem (experimental)",
"experimental_info" => "Definições experimentais provavelmente não funcionarão correctamente.",
@@ -309,6 +310,12 @@
"smtp_usage_info" => "Será usado para recuperações de password e outros emails do sistema.",
"maintenance_tasks" => "Tarefas de Manutenção",
"orphaned_logos" => "Logos Órfãos",
+ "update" => "Actualizar",
+ "new_version_available" => "Uma nova versão do Wallos está disponível",
+ "current_version" => "Versão Atual",
+ "latest_version" => "Última Versão",
+ "on_current_version" => "Está a usar a versão mais recente do Wallos.",
+ "show_update_notification" => "Mostrar notificação de atualizações no dashboard",
// Email Verification
"email_verified" => "Email verificado",
"email_verification_failed" => "Verificação de email falhou",
@@ -336,4 +343,4 @@
];
-?>
+?>
\ No newline at end of file
diff --git a/includes/i18n/pt_br.php b/includes/i18n/pt_br.php
index f8835d530..aa054e17c 100644
--- a/includes/i18n/pt_br.php
+++ b/includes/i18n/pt_br.php
@@ -197,6 +197,7 @@
"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",
+ "show_disabled_subscriptions_at_the_bottom" => "Mostre as assinaturas desativadas no final da lista",
"experimental_settings" => "Configurações experimentais",
"remove_background" => "Tentar remover o fundo de logos na pesquisa de imagem",
"experimental_info" => "As configurações experimentais provavelmente não funcionarão corretamente",
@@ -309,6 +310,12 @@
"smtp_usage_info" => "Será usado para recuperação de senha e outros e-mails do sistema.",
"maintenance_tasks" => "Tarefas de manutenção",
"orphaned_logos" => "Logos órfãos",
+ "update" => "Atualizar",
+ "new_version_available" => "Nova versão do Wallos disponível",
+ "current_version" => "Versão atual",
+ "latest_version" =>"Última versão",
+ "on_current_version" => "Você está na última versão do Wallos.",
+ "show_update_notification" => "Mostrar notificação de atualização no dashboard",
// Email Verification
"email_verified" => "Email verificado",
"email_verification_failed" => "Falha na verificação do email",
diff --git a/includes/i18n/ru.php b/includes/i18n/ru.php
index 2f784702a..fb78e8771 100644
--- a/includes/i18n/ru.php
+++ b/includes/i18n/ru.php
@@ -186,7 +186,7 @@
"theme" => "Тема",
"dark_theme" => "Темная тема",
"light_theme" => "Светлая тема",
- "automatic"=> "Автоматически",
+ "automatic" => "Автоматически",
"main_color" => "Основной цвет",
"accent_color" => "Акцентный цвет",
"hover_color" => "Цвет при наведении",
@@ -197,6 +197,7 @@
"calculate_monthly_price" => "Рассчитать и показать ежемесячную цену для всех подписок",
"convert_prices" => "Всегда конвертировать и показывать цены в моей основной валюте (медленнее)",
"hide_disabled_subscriptions" => "Скрыть отключенные подписки",
+ "show_disabled_subscriptions_at_the_bottom" => "Показать отключенные подписки внизу списка",
"experimental_settings" => "Экспериментальные настройки",
"remove_background" => "Попытка удалить фон логотипов из поиска изображений (экспериментально).",
"experimental_info" => "Экспериментальные настройки, вероятно, не будут работать идеально.",
@@ -309,6 +310,12 @@
"smtp_usage_info" => "Будет использоваться для восстановления пароля и других системных писем.",
"maintenance_tasks" => "Задачи обслуживания",
"orphaned_logos" => "Одинокие логотипы",
+ "update" => "Обновить",
+ "new_version_available" => "Доступна новая версия Wallos",
+ "current_version" => "Текущая версия",
+ "latest_version" => "Последняя версия",
+ "on_current_version" => "Вы используете последнюю версию Wallos.",
+ "show_update_notification" => "Показывать уведомление об обновлениях на дашборде",
// Email Verification
"email_verified" => "Ваш адрес электронной почты подтвержден. Теперь вы можете войти.",
"email_verification_failed" => "Не удалось подтвердить ваш адрес электронной почты.",
diff --git a/includes/i18n/sl.php b/includes/i18n/sl.php
index e14a0a703..c1960c790 100644
--- a/includes/i18n/sl.php
+++ b/includes/i18n/sl.php
@@ -186,7 +186,7 @@
"theme" => "Tema",
"dark_theme" => "Temna tema",
"light_theme" => "Svetla tema",
- "automatic"=> "Samodejno",
+ "automatic" => "Samodejno",
"main_color" => "Glavna barva",
"accent_color" => "Poudarna barva",
"hover_color" => "Barva ob hoverju",
@@ -197,6 +197,7 @@
"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",
+ "show_disabled_subscriptions_at_the_bottom" => "Prikaži onemogočene naročnine na dnu seznama",
"experimental_settings" => "Eksperimentalne nastavitve",
"remove_background" => "Poskusi odstraniti ozadje logotipov iz iskanja slik (eksperimentalno)",
"experimental_info" => "Poskusne nastavitve verjetno ne bodo popolnoma delovale.",
@@ -302,6 +303,12 @@
"smtp_usage_info" => "Uporabljeno bo za obnovitev gesla in druge sistemske e-pošte.",
"maintenance_tasks" => "Vzdrževalne naloge",
"orphaned_logos" => "Osamljeni logotipi",
+ "update" => "Posodobi",
+ "new_version_available" => "Na voljo je nova različica Wallos",
+ "current_version" => "Trenutna različica",
+ "latest_version" => "Najnovejša različica",
+ "on_current_version" => "Uporabljate najnovejšo različico Wallos.",
+ "show_update_notification" => "Prikaži obvestilo o posodobitvah na dashboardu",
// Email Verification
"email_verified" => "E-pošta je bila uspešno preverjena",
"email_verification_failed" => "Preverjanje e-pošte ni uspelo",
diff --git a/includes/i18n/sr.php b/includes/i18n/sr.php
index a8c008f5e..3f17d6278 100644
--- a/includes/i18n/sr.php
+++ b/includes/i18n/sr.php
@@ -197,6 +197,7 @@
"calculate_monthly_price" => "Израчунајте и прикажите месечну цену за све претплате",
"convert_prices" => "Увек конвертујте и прикажите цене на мојој главној валути (спорије)",
"hide_disabled_subscriptions" => "Сакриј онемогућене претплате",
+ "show_disabled_subscriptions_at_the_bottom" => "Прикажи онемогућене претплате на дну",
"experimental_settings" => "Експериментална подешавања",
"remove_background" => "Покушајте уклонити позадину логотипа са слика претраге (експериментално)",
"experimental_info" => "Експериментална подешавања вероватно неће радити савршено.",
@@ -309,6 +310,12 @@
"smtp_usage_info" => "SMTP се користи за слање е-поште за обавештења.",
"maintenance_tasks" => "Одржавање",
"orphaned_logos" => "Породични логотипови",
+ "update" => "Ажурирај",
+ "new_version_available" => "Нова верзија Wallos-а је доступна",
+ "current_version" => "Тренутна верзија",
+ "latest_version" => "Најновија верзија",
+ "on_current_version" => "Користите најновију верзију Wallos-а.",
+ "show_update_notification" => "Прикажи обавештење о ажурирањима на dashboardu",
// Email Verification
"email_verified" => "Е-пошта је верификована",
"email_verification_failed" => "Верификација е-поште није успела",
diff --git a/includes/i18n/sr_lat.php b/includes/i18n/sr_lat.php
index 546852e85..fd0e30afc 100644
--- a/includes/i18n/sr_lat.php
+++ b/includes/i18n/sr_lat.php
@@ -186,7 +186,7 @@
"theme" => "Tema",
"dark_theme" => "Tamna tema",
"light_theme" => "Svetla tema",
- "automatic"=> "Automatski",
+ "automatic" => "Automatski",
"main_color" => "Glavna boja",
"accent_color" => "Akcentna boja",
"hover_color" => "Boja prilikom prelaska",
@@ -197,6 +197,7 @@
"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",
+ "show_disabled_subscriptions_at_the_bottom" => "Prikaži onemogućene pretplate na dnu",
"experimental_settings" => "Eksperimentalna podešavanja",
"remove_background" => "Pokušajte ukloniti pozadinu logotipa sa pretrage slika (eksperimentalno)",
"experimental_info" => "Eksperimentalna podešavanja verovatno neće savršeno funkcionisati.",
@@ -309,6 +310,12 @@
"smtp_usage_info" => "Koristiće se za oporavak lozinke i druge sistemske e-poruke.",
"maintenance_tasks" => "Održavanje",
"orphaned_logos" => "Nepovezani logotipi",
+ "update" => "Ažuriraj",
+ "new_version_available" => "Nova verzija Wallos-a je dostupna",
+ "current_version" => "Trenutna verzija",
+ "latest_version" => "Najnovija verzija",
+ "on_current_version" => "Koristite najnoviju verziju Wallos-a.",
+ "show_update_notification" => "Prikaži obaveštenje o ažuriranjima na dashboardu",
// Email Verification
"email_verified" => "E-pošta je uspešno verifikovana",
"email_verification_failed" => "Verifikacija e-pošte nije uspela",
diff --git a/includes/i18n/tr.php b/includes/i18n/tr.php
index 952f74fcc..c589c2528 100644
--- a/includes/i18n/tr.php
+++ b/includes/i18n/tr.php
@@ -197,6 +197,7 @@
"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",
+ "show_disabled_subscriptions_at_the_bottom" => "Devre dışı bırakılan abonelikleri altta göster",
"experimental_settings" => "Deneysel Ayarlar",
"remove_background" => "Görsel aramadan logoların arka planını kaldırmayı deneyin (deneysel)",
"experimental_info" => "Deneysel ayarlar muhtemelen mükemmel çalışmayacak.",
@@ -309,6 +310,12 @@
"smtp_usage_info" => "Şifre kurtarma ve diğer sistem e-postaları için kullanılacaktır.",
"maintenance_tasks" => "Bakım Görevleri",
"orphaned_logos" => "Yetim Logolar",
+ "update" => "Güncelle",
+ "new_version_available" => "Yeni bir Wallos sürümü mevcut",
+ "current_version" => "Mevcut Sürüm",
+ "latest_version" => "En Son Sürüm",
+ "on_current_version" => "Wallos'un en son sürümünü kullanıyorsunuz.",
+ "show_update_notification" => "Gösterge panelinde güncelleme bildirimini göster",
// Email Verification
"email_verified" => "E-posta doğrulandı",
"email_verification_failed" => "E-posta doğrulaması başarısız oldu",
diff --git a/includes/i18n/zh_cn.php b/includes/i18n/zh_cn.php
index 17d9514a8..3ded75a24 100644
--- a/includes/i18n/zh_cn.php
+++ b/includes/i18n/zh_cn.php
@@ -194,7 +194,7 @@
"theme" => "主题",
"dark_theme" => "深色主题",
"light_theme" => "浅色主题",
- "automatic"=> "自动",
+ "automatic" => "自动",
"main_color" => "主色",
"accent_color" => "强调色",
"hover_color" => "悬停颜色",
@@ -205,6 +205,7 @@
"calculate_monthly_price" => "计算并显示所有订阅的月价格",
"convert_prices" => "始终按我的主要货币转换和显示价格（较慢）",
"hide_disabled_subscriptions" => "隐藏已停用的订阅",
+ "show_disabled_subscriptions_at_the_bottom" => "在订阅列表底部显示已停用的订阅",
"experimental_settings" => "实验性设置",
"remove_background" => "尝试从图片搜索中移除标志的背景（实验性）",
"experimental_info" => "实验性设置，可能存在问题。",
@@ -327,6 +328,12 @@
"smtp_usage_info" => "将用于密码恢复和其他系统电子邮件。",
"maintenance_tasks" => "维护任务",
"orphaned_logos" => "孤立的 Logo",
+ "update" => "更新",
+ "new_version_available" => "新的 Wallos 版本可用",
+ "current_version" => "当前版本",
+ "latest_version" => "最新版本",
+ "on_current_version" => "您正在运行最新版本的 Wallos。",
+ "show_update_notification" => "在仪表板上显示更新通知",
// Email Verification
"email_verified" => "电子邮件已验证",
diff --git a/includes/i18n/zh_tw.php b/includes/i18n/zh_tw.php
index 2c6282889..11a79223d 100644
--- a/includes/i18n/zh_tw.php
+++ b/includes/i18n/zh_tw.php
@@ -186,7 +186,7 @@
"theme" => "主題",
"dark_theme" => "深色主題",
"light_theme" => "淺色主題",
- "automatic"=> "自動",
+ "automatic" => "自動",
"main_color" => "主要顏色",
"accent_color" => "強調顏色",
"hover_color" => "懸停顏色",
@@ -197,6 +197,7 @@
"calculate_monthly_price" => "計算並顯示所有訂閱的每月價格",
"convert_prices" => "始終按照我的主要貨幣單位轉換和顯示價格（較慢）",
"hide_disabled_subscriptions" => "隱藏已停用的訂閱",
+ "show_disabled_subscriptions_at_the_bottom" => "將已停用的訂閱顯示在底部",
"experimental_settings" => "實驗性設定",
"remove_background" => "嘗試從圖片搜尋中移除圖示的背景顏色（實驗性）",
"experimental_info" => "實驗性設定，可能存在問題。",
@@ -309,6 +310,12 @@
"smtp_usage_info" => "將用於密碼恢復和其他系統電子郵件。",
"maintenance_tasks" => "維護任務",
"orphaned_logos" => "孤立的圖示",
+ "update" => "更新",
+ "new_version_available" => "新的 Wallos 版本可用",
+ "current_version" => "當前版本",
+ "latest_version" => "最新版本",
+ "on_current_version" => "您正在運行最新版本的 Wallos。",
+ "show_update_notification" => "在儀表板上顯示更新通知",
// Email Verification
"email_verified" => "電子郵件已驗證",
"email_verification_failed" => "電子郵件驗證失敗",
diff --git a/includes/list_subscriptions.php b/includes/list_subscriptions.php
index f37789b67..a19ab0325 100644
--- a/includes/list_subscriptions.php
+++ b/includes/list_subscriptions.php
@@ -49,12 +49,6 @@ function getPriceConverted($price, $currency, $database) {
}
function printSubscriptions($subscriptions, $sort, $categories, $members, $i18n, $colorTheme, $imagePath) {
- if ($sort === "price") {
- usort($subscriptions, function($a, $b) {
- return $a['price'] < $b['price'] ? 1 : -1;
- });
- }
-
$currentCategory = 0;
$currentPayerUserId = 0;
$currentPaymentMethodId = 0;
diff --git a/includes/version.php b/includes/version.php
index d7baef171..9884b3c70 100644
--- a/includes/version.php
+++ b/includes/version.php
@@ -1,3 +1,3 @@
\ No newline at end of file
diff --git a/index.php b/index.php
index a3b966dc5..0d00cd308 100644
--- a/index.php
+++ b/index.php
@@ -6,30 +6,51 @@
$sort = "next_payment";
$sortOrder = $sort;
-$sql = "SELECT * FROM subscriptions WHERE user_id = :userId ORDER BY next_payment ASC, inactive ASC";
+
+if ($settings['disabledToBottom'] === 'true') {
+ $sql = "SELECT * FROM subscriptions WHERE user_id = :userId ORDER BY inactive ASC, next_payment ASC";
+} else {
+ $sql = "SELECT * FROM subscriptions WHERE user_id = :userId ORDER BY next_payment ASC, inactive ASC";
+}
+
if (isset($_COOKIE['sortOrder']) && $_COOKIE['sortOrder'] != "") {
- $sort = $_COOKIE['sortOrder'];
+ $sort = $_COOKIE['sortOrder'] ?? 'next_payment';
$sortOrder = $sort;
$allowedSortCriteria = ['name', 'id', 'next_payment', 'price', 'payer_user_id', 'category_id', 'payment_method_id', 'inactive', 'alphanumeric'];
- $order = "ASC";
- if ($sort == "price" || $sort == "id") {
- $order = "DESC";
- }
+ $order = ($sort == "price" || $sort == "id") ? "DESC" : "ASC";
+
if ($sort == "alphanumeric") {
$sort = "name";
}
+
if (!in_array($sort, $allowedSortCriteria)) {
$sort = "next_payment";
}
$sql = "SELECT * FROM subscriptions WHERE user_id = :userId";
- $sql .= " ORDER BY $sort $order";
- if ($sort != "next_payment") {
- $sql .= ", next_payment ASC";
+
+ $orderByClauses = [];
+
+ if ($settings['disabledToBottom'] === 'true') {
+ if (in_array($sort, ["payer_user_id", "category_id", "payment_method_id"])) {
+ $orderByClauses[] = "$sort $order";
+ $orderByClauses[] = "inactive ASC";
+ } else {
+ $orderByClauses[] = "inactive ASC";
+ $orderByClauses[] = "$sort $order";
+ }
+ } else {
+ $orderByClauses[] = "$sort $order";
+ if ($sort != "inactive") {
+ $orderByClauses[] = "inactive ASC";
+ }
}
- if ($sort != "inactive") {
- $sql .= ", inactive ASC";
+
+ if ($sort != "next_payment") {
+ $orderByClauses[] = "next_payment ASC";
}
+
+ $sql .= " ORDER BY " . implode(", ", $orderByClauses);
}
$stmt = $db->prepare($sql);
@@ -49,7 +70,18 @@
content: '';
}
+
+
+
+
+