Merge pull request #250 from helloxz/dev

1.3.2

controller/admin.php

@@ -303,9 +303,25 @@ if( $page == 'setting/subscribe' ) {
     $subscribe = array_merge([
         'order_id'  =>  '',
         'email'     =>  '',
-        'end_time'  =>  ''
+        'end_time'  =>  0
     ], $subscribe);
 
+    //规范化到期时间：空值统一为0，数字视为时间戳，其它字符串尝试解析
+    $end_time = $subscribe['end_time'];
+    if ( is_numeric($end_time) ) {
+        $end_time = (int) $end_time;
+    }
+    elseif ( is_string($end_time) && $end_time !== '' ) {
+        $end_time = strtotime($end_time) ?: 0;
+    }
+    else {
+        $end_time = 0;
+    }
+    $subscribe['end_time'] = $end_time;
+
+    //是否存在订阅记录：有订单号、邮箱或到期时间即视为已填写
+    $has_subscribe = ( $subscribe['order_id'] !== '' || $subscribe['email'] !== '' || $subscribe['end_time'] > 0 );
+
     //获取当前版本信息
     $current_version = explode("-",file_get_contents("version.txt"));
     $current_version = str_replace("v","",$current_version[0]);

controller/api.php

@@ -427,8 +427,9 @@ function set_subscribe($api) {
     $data['order_id'] = htmlspecialchars( trim(req_param('order_id', '')) );
     //获取邮箱
     $data['email'] = htmlspecialchars( trim(req_param('email', '')) );
-    //到期时间
+    //到期时间：统一存为整型时间戳，空值存0
-    $data['end_time'] = htmlspecialchars( trim(req_param('end_time', '')) );
+    $end_time = trim(req_param('end_time', ''));
+    $data['end_time'] = is_numeric($end_time) ? (int) $end_time : 0;
     //重置订阅状态
     session_start();
     $_SESSION['subscribe'] = NULL;

templates/admin/setting/subscribe.php

@@ -57,16 +57,20 @@
             </div>
         </div>
 
+        <?php if (!empty($has_subscribe)): ?>
         <div class="layui-form-item">
             <label class="layui-form-label">到期时间</label>
             <div class="layui-input-block">
-            <input type="text" name="end_time" id = "end_time" readonly="readonly" value = "<?php echo date("Y-m-d",$subscribe['end_time']); ?>" autocomplete="off" placeholder="订阅到期时间" class="layui-input">
+            <input type="text" name="end_time" id = "end_time" readonly="readonly" value = "<?php echo $subscribe['end_time'] > 0 ? date("Y-m-d",$subscribe['end_time']) : ''; ?>" autocomplete="off" placeholder="订阅到期时间" class="layui-input">
             </div>
         </div>
+        <?php endif; ?>
 
         <div class="layui-form-item">
             <button class="layui-btn" lay-submit="" lay-filter="set_subscribe">保存设置</button>
+            <?php if (!empty($has_subscribe)): ?>
             <button class="layui-btn" lay-submit="" lay-filter="reset_subscribe">删除订阅</button>
+            <?php endif; ?>
             <a class="layui-btn layui-btn-danger" onclick="buySubscribe('<?php echo get_host(); ?>')" rel = "nofollow" title = "点此购买订阅" href="javascript:;"><i class="fa fa-shopping-cart"></i> 购买订阅</a>
             <a class="layui-btn layui-btn-danger" onclick="openRedeem()" rel = "nofollow" title = "点此使用兑换码" href="javascript:;"><i class="layui-icon layui-icon-gift"></i> 使用兑换码</a>
         </div>

version.txt

@@ -1 +1 @@
-v1.3.1-20261023
+v1.3.2-20261029