From 5826e8f8325cb374596585c5847323c90d5665d0 Mon Sep 17 00:00:00 2001
From: kf_wuhao <15392746632@qq.com>
Date: Thu, 4 Mar 2021 15:00:00 +0800
Subject: [PATCH 1/2] 1

---
 pmcalendar.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pmcalendar.php b/pmcalendar.php
index 6ee6b6f..8f71909 100644
--- a/pmcalendar.php
+++ b/pmcalendar.php
@@ -201,12 +201,13 @@ if ($act == 'newevent') {
     we('1');
 }  else if ($act == 'edityanqi') {
     $id = r('id');
-    $idx = r('idx');
+    $idx = (int)r('idx');
     $del = r('del');
     $content = stripslashes(r('content'));
     $dict = array();
     $event = DB::getone("select yanqi_history from calendar where id={$id}");
-    $yanqi_history = $event['yanqi_history'];
+
+    $yanqi_history = json_decode($event['yanqi_history'],true);
     if(!$del) {
         $yanqi_history[$idx]['reason'] = $content;
     }

From dbc166a46fb2a9ca8334712a07e057b3cbcd6f41 Mon Sep 17 00:00:00 2001
From: kf_wuhao <15392746632@qq.com>
Date: Thu, 4 Mar 2021 15:11:45 +0800
Subject: [PATCH 2/2] 1

---
 edit.php       | 20 ++++++++++----------
 pmcalendar.php |  3 ++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/edit.php b/edit.php
index c1d2458..cbb7bdc 100644
--- a/edit.php
+++ b/edit.php
@@ -300,16 +300,16 @@ if(!isn(r('myqeroles'))){
     </p>
 </form>
 <!--延期评论权限-->
-<h3>延期评论权限？</h3>
-<form name="form1" method="post" action="">
-    <p>每行一个</p>
-    <p>
-        <textarea name="yqeroles" id="yqeroles" cols="45" rows="5" style="width:90%;height:300px;"><?=implode("\n",$YQEROLES)?></textarea>
-    </p>
-    <p>
-        <input type="submit" name="myqeroles" id="button" value="提交">
-    </p>
-</form>
+<!--<h3>延期评论权限？</h3>-->
+<!--<form name="form1" method="post" action="">-->
+<!--    <p>每行一个</p>-->
+<!--    <p>-->
+<!--        <textarea name="yqeroles" id="yqeroles" cols="45" rows="5" style="width:90%;height:300px;">--><?//=implode("\n",$YQEROLES)?><!--</textarea>-->
+<!--    </p>-->
+<!--    <p>-->
+<!--        <input type="submit" name="myqeroles" id="button" value="提交">-->
+<!--    </p>-->
+<!--</form>-->
 <p>&nbsp;</p>
 </body>
 </html>
\ No newline at end of file
diff --git a/pmcalendar.php b/pmcalendar.php
index 8f71909..7622e40 100644
--- a/pmcalendar.php
+++ b/pmcalendar.php
@@ -213,9 +213,10 @@ if ($act == 'newevent') {
     }
     else{
         unset($yanqi_history[$idx]);
+        $yanqi_history = array_values($yanqi_history);
     }
 
-    $dict['yanqi_history']=json_encode($yanqi_history);
+    $dict['yanqi_history']=json_encode($yanqi_history,true);
     $sql = DB::update('calendar', $dict, "id='{$id}'");
     DB::exe($sql);
     we('1');