Fix timezone error in XmlRpc

Signed-off-by: Kraity <kraity@krait.cn>
typecho · Apr 14, 2024 · 2aafc95 · 2aafc95
1 parent 71c6381
commit 2aafc95
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 19 deletions.
diff --git a/var/IXR/Date.php b/var/IXR/Date.php
@@ -9,17 +9,19 @@
  */
 class Date
 {
-    private int $year;
+    private string $year;
 
-    private int $month;
+    private string $month;
 
-    private int $day;
+    private string $day;
 
-    private int $hour;
+    private string $hour;
 
-    private int $minute;
+    private string $minute;
 
-    private int $second;
+    private string $second;
+
+    private string $timezone;
 
     /**
      * @param int|string $time
@@ -39,12 +41,13 @@ public function __construct($time)
      */
     private function parseTimestamp(int $timestamp)
     {
-        $this->year = intval(date('Y', $timestamp));
-        $this->month = intval(date('m', $timestamp));
-        $this->day = intval(date('d', $timestamp));
-        $this->hour = intval(date('H', $timestamp));
-        $this->minute = intval(date('i', $timestamp));
-        $this->second = intval(date('s', $timestamp));
+        $this->year = gmdate('Y', $timestamp);
+        $this->month = gmdate('m', $timestamp);
+        $this->day = gmdate('d', $timestamp);
+        $this->hour = gmdate('H', $timestamp);
+        $this->minute = gmdate('i', $timestamp);
+        $this->second = gmdate('s', $timestamp);
+        $this->timezone = '';
     }
 
     /**
@@ -58,14 +61,15 @@ private function parseIso(string $iso)
         $this->hour = substr($iso, 9, 2);
         $this->minute = substr($iso, 12, 2);
         $this->second = substr($iso, 15, 2);
+        $this->timezone = substr($iso, 17);
     }
 
     /**
      * @return string
      */
     public function getIso(): string
     {
-        return $this->year . $this->month . $this->day . 'T' . $this->hour . ':' . $this->minute . ':' . $this->second;
+        return $this->year . $this->month . $this->day . 'T' . $this->hour . ':' . $this->minute . ':' . $this->second . $this->timezone;
     }
 
     /**

diff --git a/var/Widget/XmlRpc.php b/var/Widget/XmlRpc.php
@@ -576,7 +576,7 @@ public function wpGetPageList(int $blogId, string $userName, string $password):
         while ($pages->next()) {
             $pageStructs[] = [
                 'dateCreated'      => new Date($this->options->timezone + $pages->created),
-                'date_created_gmt' => new Date($this->options->timezone + $pages->created),
+                'date_created_gmt' => new Date($pages->created),
                 'page_id'          => $pages->cid,
                 'page_title'       => $pages->title,
                 'page_parent_id'   => '0',
@@ -945,7 +945,7 @@ public function wpGetComment(int $blogId, string $userName, string $password, in
         }
 
         return [
-            'date_created_gmt' => new Date($this->options->timezone + $comment->created),
+            'date_created_gmt' => new Date($comment->created),
             'user_id'          => $comment->authorId,
             'comment_id'       => $comment->coid,
             'parent'           => $comment->parent,
@@ -999,7 +999,7 @@ public function wpGetComments(int $blogId, string $userName, string $password, a
 
         while ($comments->next()) {
             $commentsStruct[] = [
-                'date_created_gmt' => new Date($this->options->timezone + $comments->created),
+                'date_created_gmt' => new Date($comments->created),
                 'user_id'          => $comments->authorId,
                 'comment_id'       => $comments->coid,
                 'parent'           => $comments->parent,
@@ -1174,7 +1174,7 @@ public function wpGetMediaLibrary(int $blogId, string $userName, string $passwor
         while ($attachments->next()) {
             $attachmentsStruct[] = [
                 'attachment_id'    => $attachments->cid,
-                'date_created_gmt' => new Date($this->options->timezone + $attachments->created),
+                'date_created_gmt' => new Date($attachments->created),
                 'parent'           => $attachments->parent,
                 'link'             => $attachments->attachment->url,
                 'title'            => $attachments->title,
@@ -1205,7 +1205,7 @@ public function wpGetMediaItem(int $blogId, string $userName, string $password,
 
         return [
             'attachment_id'    => $attachment->cid,
-            'date_created_gmt' => new Date($this->options->timezone + $attachment->created),
+            'date_created_gmt' => new Date($attachment->created),
             'parent'           => $attachment->parent,
             'link'             => $attachment->attachment->url,
             'title'            => $attachment->title,
@@ -1417,7 +1417,7 @@ public function mtGetRecentPostTitles(int $blogId, string $userName, string $pas
                 'userid'           => $posts->authorId,
                 'postid'           => $posts->cid,
                 'title'            => $posts->title,
-                'date_created_gmt' => new Date($this->options->timezone + $posts->created)
+                'date_created_gmt' => new Date($posts->created)
             ];
         }