fix: service worker precaching logout.php causes user to be logged out

fix: add samesite directive to cookies fix: sort by price
ellite · Aug 7, 2024 · 8b0325c · 8b0325c
1 parent 2bb8381
commit 8b0325c
Show file tree

Hide file tree

Showing 12 changed files with 197 additions and 170 deletions.
diff --git a/endpoints/subscriptions/get.php b/endpoints/subscriptions/get.php
@@ -146,19 +146,8 @@
     }
   }
 
-  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)) {
-    printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme, "../../");
+    printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme, "../../", $settings['disabledToBottom']);
   }
 
   if (count($subscriptions) == 0) {

diff --git a/endpoints/user/save_user.php b/endpoints/user/save_user.php
@@ -291,7 +291,11 @@ function resizeAndUploadAvatar($uploadedFile, $uploadDir, $name)
         $oldLanguage = isset($_COOKIE['language']) ? $_COOKIE['language'] : "en";
         $root = str_replace('/endpoints/user', '', dirname($_SERVER['PHP_SELF']));
         $root = $root == '' ? '/' : $root;
-        setcookie('language', $language, $cookieExpire, $root);
+        setcookie('language', $language, [
+            'path' => $root,
+            'expires' => $cookieExpire,
+            'samesite' => 'Strict'
+        ]);
         $_SESSION['avatar'] = $avatar;
         $_SESSION['main_currency'] = $main_currency;
 

diff --git a/includes/getsettings.php b/includes/getsettings.php
@@ -11,7 +11,10 @@
     $themeMapping = array(0 => 'light', 1 => 'dark', 2 => 'automatic');
     $themeKey = isset($settings['dark_theme']) ? $settings['dark_theme'] : 2;
     $themeValue = $themeMapping[$themeKey];
-    setcookie('theme', $themeValue, $cookieExpire);
+    setcookie('theme', $themeValue, [
+        'expires' => $cookieExpire,
+        'samesite' => 'Strict'
+    ]);
     $settings['update_theme_setttings'] = false;
     if (isset($_COOKIE['inUseTheme']) && $settings['dark_theme'] == 2) {
         $inUseTheme = $_COOKIE['inUseTheme'];

diff --git a/includes/list_subscriptions.php b/includes/list_subscriptions.php
@@ -1,9 +1,10 @@
 <?php
 
-    require_once 'i18n/getlang.php';
+require_once 'i18n/getlang.php';
 
-    function getBillingCycle($cycle, $frequency, $i18n) {
-        switch ($cycle) {
+function getBillingCycle($cycle, $frequency, $i18n)
+{
+    switch ($cycle) {
         case 1:
             return $frequency == 1 ? translate('Daily', $i18n) : $frequency . " " . translate('days', $i18n);
         case 2:
@@ -12,13 +13,14 @@ function getBillingCycle($cycle, $frequency, $i18n) {
             return $frequency == 1 ? translate('Monthly', $i18n) : $frequency . " " . translate('months', $i18n);
         case 4:
             return $frequency == 1 ? translate('Yearly', $i18n) : $frequency . " " . translate('years', $i18n);
-        }
     }
+}
 
-    function getPricePerMonth($cycle, $frequency, $price) {
-        switch ($cycle) {
+function getPricePerMonth($cycle, $frequency, $price)
+{
+    switch ($cycle) {
         case 1:
-            $numberOfPaymentsPerMonth = (30 / $frequency); 
+            $numberOfPaymentsPerMonth = (30 / $frequency);
             return $price * $numberOfPaymentsPerMonth;
         case 2:
             $numberOfPaymentsPerMonth = (4.35 / $frequency);
@@ -29,137 +31,160 @@ function getPricePerMonth($cycle, $frequency, $price) {
         case 4:
             $numberOfMonths = (12 * $frequency);
             return $price / $numberOfMonths;
-        }
     }
+}
+
+
+function getPriceConverted($price, $currency, $database)
+{
+    $query = "SELECT rate FROM currencies WHERE id = :currency";
+    $stmt = $database->prepare($query);
+    $stmt->bindParam(':currency', $currency, 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) {
-        $query = "SELECT rate FROM currencies WHERE id = :currency";
-        $stmt = $database->prepare($query);
-        $stmt->bindParam(':currency', $currency, SQLITE3_INTEGER);
-        $result = $stmt->execute();
-
-        $exchangeRate = $result->fetchArray(SQLITE3_ASSOC);
-        if ($exchangeRate === false) {
-            return $price;
-        } else {
-            $fromRate = $exchangeRate['rate'];
-            return $price / $fromRate;
+function printSubscriptions($subscriptions, $sort, $categories, $members, $i18n, $colorTheme, $imagePath, $disabledToBottom)
+{
+    if ($sort === "price") {
+        usort($subscriptions, function ($a, $b) {
+            return $a['price'] < $b['price'] ? 1 : -1;
+        });
+        if ($disabledToBottom === 'true') {
+            usort($subscriptions, function ($a, $b) {
+                return $a['inactive'] - $b['inactive'];
+            });
         }
     }
 
-    function printSubscriptions($subscriptions, $sort, $categories, $members, $i18n, $colorTheme, $imagePath) {
-        $currentCategory = 0;
-        $currentPayerUserId = 0;
-        $currentPaymentMethodId = 0;
-        foreach ($subscriptions as $subscription) {
-            if ($sort == "category_id" && $subscription['category_id'] != $currentCategory) {
-                ?>
-                    <div class="subscription-list-title">
-                        <?php
-                            if ($subscription['category_id'] == 1) {
-                                echo translate('no_category', $i18n);
-                            } else {
-                                echo $categories[$subscription['category_id']]['name'];
-                            }
-                        ?>
-                    </div>
+    $currentCategory = 0;
+    $currentPayerUserId = 0;
+    $currentPaymentMethodId = 0;
+    foreach ($subscriptions as $subscription) {
+        if ($sort == "category_id" && $subscription['category_id'] != $currentCategory) {
+            ?>
+            <div class="subscription-list-title">
                 <?php
-                $currentCategory = $subscription['category_id'];
-            }
-            if ($sort == "payer_user_id" && $subscription['payer_user_id'] != $currentPayerUserId) {
+                if ($subscription['category_id'] == 1) {
+                    echo translate('no_category', $i18n);
+                } else {
+                    echo $categories[$subscription['category_id']]['name'];
+                }
                 ?>
-                    <div class="subscription-list-title">
-                        <?= $members[$subscription['payer_user_id']]['name'] ?>
-                    </div>
-                <?php
-                $currentPayerUserId = $subscription['payer_user_id'];
-            }
-            if ($sort == "payment_method_id" && $subscription['payment_method_id'] != $currentPaymentMethodId) {
-                ?>
-                    <div class="subscription-list-title">
-                        <?= $subscription['payment_method_name'] ?>
-                    </div>
-                <?php
-                $currentPaymentMethodId = $subscription['payment_method_id'];
-            }
+            </div>
+            <?php
+            $currentCategory = $subscription['category_id'];
+        }
+        if ($sort == "payer_user_id" && $subscription['payer_user_id'] != $currentPayerUserId) {
+            ?>
+            <div class="subscription-list-title">
+                <?= $members[$subscription['payer_user_id']]['name'] ?>
+            </div>
+            <?php
+            $currentPayerUserId = $subscription['payer_user_id'];
+        }
+        if ($sort == "payment_method_id" && $subscription['payment_method_id'] != $currentPaymentMethodId) {
+            ?>
+            <div class="subscription-list-title">
+                <?= $subscription['payment_method_name'] ?>
+            </div>
+            <?php
+            $currentPaymentMethodId = $subscription['payment_method_id'];
+        }
         ?>
-            <div class="subscription<?= $subscription['inactive'] ? ' inactive' : '' ?>" onClick="toggleOpenSubscription(<?= $subscription['id'] ?>)" data-id="<?= $subscription['id'] ?>" data-name="<?= $subscription['name'] ?>">
-                <div class="subscription-main">
-                    <span class="logo">
-                        <?php
-                            if ($subscription['logo'] != "") {
-                                ?>
-                                <img src="<?= $subscription['logo'] ?>">
-                                <?php
-                            } else {
-                                include $imagePath . "images/siteicons/svg/logo.php";
-                            }
-                        ?>
-                    </span>
-                    <span class="name"><?= $subscription['name'] ?></span>
-                    <span class="cycle"><?= $subscription['billing_cycle'] ?></span>
-                    <span class="next"><?= $subscription['next_payment'] ?></span>
-                    <span class="price">
-                    <img src="<?= $subscription['payment_method_icon'] ?>" title="<?= translate('payment_method', $i18n) ?>: <?= $subscription['payment_method_name'] ?>"/>
-                    <?= CurrencyFormatter::format($subscription['price'], $subscription['currency_code']) ?>
-                    </span>
-                    <button type="button" class="actions-expand" onClick="expandActions(event, <?= $subscription['id'] ?>)">
-                        <i class="fas fa-ellipsis-v"></i>
-                    </button>
-                    <ul class="actions">
-                        <li class="edit" title="<?= translate('edit_subscription', $i18n) ?>" onClick="openEditSubscription(event, <?= $subscription['id'] ?>)">
-                            <?php include $imagePath . "images/siteicons/svg/edit.php"; ?>
-                            <?= translate('edit_subscription', $i18n) ?>
-                        </li>
-                        <li class="delete" title="<?= translate('delete', $i18n) ?>" onClick="deleteSubscription(event, <?= $subscription['id'] ?>)">
-                            <?php include $imagePath . "images/siteicons/svg/delete.php"; ?>
-                            <?= translate('delete', $i18n) ?>
-                        </li>
-                        <li class="clone" title="<?= translate('clone', $i18n) ?>" onClick="cloneSubscription(event, <?= $subscription['id'] ?>)">
-                            <?php include $imagePath . "images/siteicons/svg/clone.php"; ?>
-                            <?= translate('clone', $i18n) ?>
-                        </li>
-                    </ul>
-                </div>
-                <div class="subscription-secondary">
-                    <span class="name"><?php include $imagePath . "images/siteicons/svg/subscription.php"; ?><?= $subscription['name'] ?></span>
-                    <span class="payer_user" title="<?= translate('paid_by', $i18n) ?>"><?php include $imagePath . "images/siteicons/svg/payment.php"; ?><?= $members[$subscription['payer_user_id']]['name'] ?></span>
-                    <span class="category" title="<?= translate('category', $i18n) ?>" ><?php include $imagePath . "images/siteicons/svg/category.php"; ?><?= $categories[$subscription['category_id']]['name'] ?></span>
+        <div class="subscription<?= $subscription['inactive'] ? ' inactive' : '' ?>"
+            onClick="toggleOpenSubscription(<?= $subscription['id'] ?>)" data-id="<?= $subscription['id'] ?>"
+            data-name="<?= $subscription['name'] ?>">
+            <div class="subscription-main">
+                <span class="logo">
                     <?php
-                        if ($subscription['url'] != "") {
-                            $url = $subscription['url'];
-                            if (!preg_match('/^https?:\/\//', $url)) {
-                                $url = "https://" . $url;
-                            }
-                            ?>
-                                <span class="url" title="<?= translate('external_url', $i18n) ?>"><a href="<?= $url ?>" target="_blank"><?php include $imagePath . "images/siteicons/svg/web.php"; ?></a></span>
-                            <?php
-                        }
-                    ?>
-                </div>
-                <?php
-                    if ($subscription['notes'] != "") {
+                    if ($subscription['logo'] != "") {
                         ?>
-                            <div class="subscription-notes">
-                                <span class="notes">
-                                    <?php include $imagePath . "images/siteicons/svg/notes.php"; ?>
-                                    <?= $subscription['notes'] ?>
-                                </span>
-                            </div>
+                        <img src="<?= $subscription['logo'] ?>">
                         <?php
+                    } else {
+                        include $imagePath . "images/siteicons/svg/logo.php";
                     }
-                ?>    
+                    ?>
+                </span>
+                <span class="name"><?= $subscription['name'] ?></span>
+                <span class="cycle"><?= $subscription['billing_cycle'] ?></span>
+                <span class="next"><?= $subscription['next_payment'] ?></span>
+                <span class="price">
+                    <img src="<?= $subscription['payment_method_icon'] ?>"
+                        title="<?= translate('payment_method', $i18n) ?>: <?= $subscription['payment_method_name'] ?>" />
+                    <?= CurrencyFormatter::format($subscription['price'], $subscription['currency_code']) ?>
+                </span>
+                <button type="button" class="actions-expand" onClick="expandActions(event, <?= $subscription['id'] ?>)">
+                    <i class="fas fa-ellipsis-v"></i>
+                </button>
+                <ul class="actions">
+                    <li class="edit" title="<?= translate('edit_subscription', $i18n) ?>"
+                        onClick="openEditSubscription(event, <?= $subscription['id'] ?>)">
+                        <?php include $imagePath . "images/siteicons/svg/edit.php"; ?>
+                        <?= translate('edit_subscription', $i18n) ?>
+                    </li>
+                    <li class="delete" title="<?= translate('delete', $i18n) ?>"
+                        onClick="deleteSubscription(event, <?= $subscription['id'] ?>)">
+                        <?php include $imagePath . "images/siteicons/svg/delete.php"; ?>
+                        <?= translate('delete', $i18n) ?>
+                    </li>
+                    <li class="clone" title="<?= translate('clone', $i18n) ?>"
+                        onClick="cloneSubscription(event, <?= $subscription['id'] ?>)">
+                        <?php include $imagePath . "images/siteicons/svg/clone.php"; ?>
+                        <?= translate('clone', $i18n) ?>
+                    </li>
+                </ul>
             </div>
+            <div class="subscription-secondary">
+                <span
+                    class="name"><?php include $imagePath . "images/siteicons/svg/subscription.php"; ?><?= $subscription['name'] ?></span>
+                <span class="payer_user"
+                    title="<?= translate('paid_by', $i18n) ?>"><?php include $imagePath . "images/siteicons/svg/payment.php"; ?><?= $members[$subscription['payer_user_id']]['name'] ?></span>
+                <span class="category"
+                    title="<?= translate('category', $i18n) ?>"><?php include $imagePath . "images/siteicons/svg/category.php"; ?><?= $categories[$subscription['category_id']]['name'] ?></span>
+                <?php
+                if ($subscription['url'] != "") {
+                    $url = $subscription['url'];
+                    if (!preg_match('/^https?:\/\//', $url)) {
+                        $url = "https://" . $url;
+                    }
+                    ?>
+                    <span class="url" title="<?= translate('external_url', $i18n) ?>"><a href="<?= $url ?>"
+                            target="_blank"><?php include $imagePath . "images/siteicons/svg/web.php"; ?></a></span>
+                    <?php
+                }
+                ?>
+            </div>
+            <?php
+            if ($subscription['notes'] != "") {
+                ?>
+                <div class="subscription-notes">
+                    <span class="notes">
+                        <?php include $imagePath . "images/siteicons/svg/notes.php"; ?>
+                        <?= $subscription['notes'] ?>
+                    </span>
+                </div>
+                <?php
+            }
+            ?>
+        </div>
         <?php
-        }
     }
+}
 
-    $query = "SELECT main_currency FROM user WHERE id = :userId";
-    $stmt = $db->prepare($query);
-    $stmt->bindValue(':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->bindValue(':userId', $userId, SQLITE3_INTEGER);
+$result = $stmt->execute();
+$row = $result->fetchArray(SQLITE3_ASSOC);
+$mainCurrencyId = $row['main_currency'];
 
 ?>
diff --git a/includes/version.php b/includes/version.php
@@ -1,3 +1,3 @@
 <?php
-$version = "v2.21.1";
+$version = "v2.21.2";
 ?>
diff --git a/index.php b/index.php
@@ -289,19 +289,8 @@
       }
     }
 
-    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)) {
-      printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme, "");
+      printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme, "", $settings['disabledToBottom']);
     }
     $db->close();