From 1aad5314baa2bdf47d01c132fd9df818a8712006 Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Mon, 19 Sep 2022 21:00:47 +0800
Subject: [PATCH] fix pos_state no until

---
 public/takeedit.php   | 15 ++++++++-------
 public/takeupload.php | 15 ++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/public/takeedit.php b/public/takeedit.php
index 21d68d21..56f8cf1d 100644
--- a/public/takeedit.php
+++ b/public/takeedit.php
@@ -146,13 +146,14 @@ if(user_can('torrentonpromotion'))
 if(user_can('torrentsticky'))
 {
     if (isset($_POST['pos_state']) && isset(\App\Models\Torrent::$posStates[$_POST['pos_state']])) {
-        $posStateUntil = null;
-        $posState = \App\Models\Torrent::POS_STATE_STICKY_NONE;
-        if (!empty($_POST['pos_state_until']) && $_POST['pos_state'] != \App\Models\Torrent::POS_STATE_STICKY_NONE) {
-            $posStateUntil = \Carbon\Carbon::parse($_POST['pos_state_until']);
-            if ($posStateUntil->gte(now())) {
-                $posState = $_POST['pos_state'];
-            }
+        $posStateUntil = $_POST['pos_state_until'] ?: null;
+        $posState = $_POST['pos_state'];
+        if ($posState == \App\Models\Torrent::POS_STATE_STICKY_NONE) {
+            $posStateUntil = null;
+        }
+        if ($posStateUntil && \Carbon\Carbon::parse($posStateUntil)->lte(now())) {
+            $posState = \App\Models\Torrent::POS_STATE_STICKY_NONE;
+            $posStateUntil = null;
         }
         $updateset[] = sprintf("pos_state = %s", sqlesc($posState));
         $updateset[] = sprintf("pos_state_until = %s", sqlesc($posStateUntil));
diff --git a/public/takeupload.php b/public/takeupload.php
index 571f8f59..70830baf 100644
--- a/public/takeupload.php
+++ b/public/takeupload.php
@@ -344,13 +344,14 @@ if (isset($_POST['hr']) && isset(\App\Models\Torrent::$hrStatus[$_POST['hr']]) &
 }
 if(user_can('torrentsticky')) {
     if (isset($_POST['pos_state']) && isset(\App\Models\Torrent::$posStates[$_POST['pos_state']])) {
-        $posStateUntil = null;
-        $posState = \App\Models\Torrent::POS_STATE_STICKY_NONE;
-        if (!empty($_POST['pos_state_until']) && $_POST['pos_state'] != \App\Models\Torrent::POS_STATE_STICKY_NONE) {
-            $posStateUntil = \Carbon\Carbon::parse($_POST['pos_state_until']);
-            if ($posStateUntil->gte(now())) {
-                $posState = $_POST['pos_state'];
-            }
+        $posStateUntil = $_POST['pos_state_until'] ?: null;
+        $posState = $_POST['pos_state'];
+        if ($posState == \App\Models\Torrent::POS_STATE_STICKY_NONE) {
+            $posStateUntil = null;
+        }
+        if ($posStateUntil && \Carbon\Carbon::parse($posStateUntil)->lte(now())) {
+            $posState = \App\Models\Torrent::POS_STATE_STICKY_NONE;
+            $posStateUntil = null;
         }
         $insert['pos_state'] = $posState;
         $insert['pos_state_until'] = $posStateUntil;