From 1d8d685fc1ce6510f6827d824131e6b43c1998ae Mon Sep 17 00:00:00 2001
From: conory <conorycom@gmail.com>
Date: Wed, 6 Sep 2017 23:38:42 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=98=EB=8F=84=EC=97=90=20=EB=A7=9E?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20getRegdateGM(),=20getUpdateGM()=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0=20RSS=20Feed=EC=9D=98=20=EB=82=A0=EC=A7=9C?=
 =?UTF-8?q?=20=ED=91=9C=EC=8B=9C=EB=A5=BC=20GMT+0=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/comment/comment.item.php   | 16 ++++++++--------
 modules/document/document.item.php | 16 ++++++++--------
 modules/rss/rss.view.php           |  6 +++---
 modules/rss/tpl/format/atom10.html |  6 +++---
 modules/rss/tpl/format/rss10.html  |  4 ++--
 modules/rss/tpl/format/rss20.html  |  4 ++--
 modules/rss/tpl/format/xe.html     |  6 +++---
 7 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php
index d66b15181..737ae0a9e 100644
--- a/modules/comment/comment.item.php
+++ b/modules/comment/comment.item.php
@@ -468,14 +468,14 @@ class commentItem extends Object
 		return ztime($this->get('regdate'));
 	}
 
-	function getRegdateGM()
+	function getRegdateGM($format = 'r')
 	{
-		return gmdate('r', ztime($this->get('regdate')));
+		return gmdate($format, $this->getRegdateTime());
 	}
 
-	function getRegdateDT()
+	function getRegdateDT($format = 'c')
 	{
-		return zdate($this->get('regdate'), 'c', false);
+		return Rhymix\Framework\DateTime::formatTimestampForCurrentUser($format, $this->getRegdateTime());
 	}
 
 	function getUpdate($format = 'Y.m.d H:i:s', $conversion = true)
@@ -488,14 +488,14 @@ class commentItem extends Object
 		return ztime($this->get('last_update'));
 	}
 
-	function getUpdateGM()
+	function getUpdateGM($format = 'r')
 	{
-		return gmdate('r', ztime($this->get('last_update')));
+		return gmdate($format, $this->getUpdateTime());
 	}
 
-	function getUpdateDT()
+	function getUpdateDT($format = 'c')
 	{
-		return zdate($this->get('last_update'), 'c', false);
+		return Rhymix\Framework\DateTime::formatTimestampForCurrentUser($format, $this->getUpdateTime());
 	}
 
 	function getPermanentUrl()
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index dfde4a1f7..e35c583b8 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -687,14 +687,14 @@ class documentItem extends Object
 		return ztime($this->get('regdate'));
 	}
 
-	function getRegdateGM()
+	function getRegdateGM($format = 'r')
 	{
-		return Rhymix\Framework\DateTime::formatTimestampForCurrentUser('r', $this->getRegdateTime());
+		return gmdate($format, $this->getRegdateTime());
 	}
 
-	function getRegdateDT()
+	function getRegdateDT($format = 'c')
 	{
-		return Rhymix\Framework\DateTime::formatTimestampForCurrentUser('c', $this->getRegdateTime());
+		return Rhymix\Framework\DateTime::formatTimestampForCurrentUser($format, $this->getRegdateTime());
 	}
 
 	function getUpdate($format = 'Y.m.d H:i:s', $conversion = true)
@@ -707,14 +707,14 @@ class documentItem extends Object
 		return ztime($this->get('last_update'));
 	}
 
-	function getUpdateGM()
+	function getUpdateGM($format = 'r')
 	{
-		return Rhymix\Framework\DateTime::formatTimestampForCurrentUser('r', $this->getUpdateTime());
+		return gmdate($format, $this->getUpdateTime());
 	}
 
-	function getUpdateDT()
+	function getUpdateDT($format = 'c')
 	{
-		return Rhymix\Framework\DateTime::formatTimestampForCurrentUser('c', $this->getUpdateTime());
+		return Rhymix\Framework\DateTime::formatTimestampForCurrentUser($format, $this->getUpdateTime());
 	}
 
 	function getPermanentUrl()
diff --git a/modules/rss/rss.view.php b/modules/rss/rss.view.php
index fb5e1534e..d08ec4b9a 100644
--- a/modules/rss/rss.view.php
+++ b/modules/rss/rss.view.php
@@ -174,13 +174,13 @@ class rssView extends rss
 		}
 		
 		$info->id = $channel_url;
-		$info->title = $obj->title ?: $info->title;
 		$info->feed_title = $config->feed_title;
+		$info->title = $obj->title ?: $info->title;
 		$info->description = $obj->description ?: $info->description;
 		$info->language = Context::getLangType();
 		$info->site_url = Context::getRequestUri();
-		$info->dateGM = Rhymix\Framework\DateTime::formatTimestampForCurrentUser('r');
-		$info->dateDT = Rhymix\Framework\DateTime::formatTimestampForCurrentUser('c');
+		$info->date_r = gmdate('r');
+		$info->date_c = gmdate('c');
 		$info->image = $config->image ? Context::getRequestUri() . $config->image : '';
 		getController('module')->replaceDefinedLangCode($info->title);
 		
diff --git a/modules/rss/tpl/format/atom10.html b/modules/rss/tpl/format/atom10.html
index 4fafda379..ac692996b 100644
--- a/modules/rss/tpl/format/atom10.html
+++ b/modules/rss/tpl/format/atom10.html
@@ -6,7 +6,7 @@
 	<subtitle cond="$info->description">{$info->description}</subtitle>
 	<link rel="alternate" type="text/html" hreflang="{$info->language}" href="{$info->link}"/>
 	<link rel="self" type="application/atom+xml" href="{$info->id}"/>
-	<updated>{$info->dateDT}</updated>
+	<updated>{$info->date_c}</updated>
 	<id>{$info->id}</id>
 	<generator>Rhymix</generator>
 	<rights cond="$info->feed_copyright">{$info->feed_copyright}</rights>
@@ -15,8 +15,8 @@
 		<link rel="alternate" type="text/html" href="{$oDocument->getPermanentUrl()}"/>
 		<link cond="$oDocument->allowComment()" rel="replies" type="text/html" href="{$oDocument->getPermanentUrl()}#comment"/>
 		<id>{$oDocument->getPermanentUrl()}</id>
-		<published>{$oDocument->getRegdateDT()}</published>
-		<updated>{$oDocument->getUpdateDT()}</updated>
+		<published>{$oDocument->getRegdateGM('c')}</published>
+		<updated>{$oDocument->getUpdateGM('c')}</updated>
 		<author>
 			<name>{$oDocument->getNickName()}</name>
 		</author>
diff --git a/modules/rss/tpl/format/rss10.html b/modules/rss/tpl/format/rss10.html
index 0b23212d8..a354560d4 100644
--- a/modules/rss/tpl/format/rss10.html
+++ b/modules/rss/tpl/format/rss10.html
@@ -7,7 +7,7 @@
 		<link>{$info->link}</link>
 		<description>{$info->description}</description>
 		<dc:language>{$info->language}</dc:language>
-		<dc:date>{$info->dateDT}</dc:date>
+		<dc:date>{$info->date_c}</dc:date>
 		<!--@if($info->feed_copyright)-->
 		<dc:rights>{$info->feed_copyright}</dc:rights>
 		<!--@end-->
@@ -30,6 +30,6 @@
 		<link>{$oDocument->getPermanentUrl()}</link>
 		<description>{$oDocument->getSummary(400)|escape}</description>
 		<dc:creator>{$oDocument->getNickName()}</dc:creator>
-		<dc:date>{$oDocument->getRegdateDT()}</dc:date>
+		<dc:date>{$oDocument->getRegdateGM('c')}</dc:date>
 	</item>
 </rdf:RDF>
diff --git a/modules/rss/tpl/format/rss20.html b/modules/rss/tpl/format/rss20.html
index d11801736..2f8998caf 100644
--- a/modules/rss/tpl/format/rss20.html
+++ b/modules/rss/tpl/format/rss20.html
@@ -8,7 +8,7 @@
 		<description>{$info->description}</description>
 		<atom:link href="{$info->id}" rel="self" type="application/rss+xml" />
 		<language>{$info->language}</language>
-		<pubDate>{$info->dateGM}</pubDate>
+		<pubDate>{$info->date_r}</pubDate>
 		<generator>Rhymix</generator>
 		<copyright cond="$info->feed_copyright">{$info->feed_copyright}</copyright>
 		<image cond="$info->image">
@@ -30,7 +30,7 @@
 			<dc:creator>{$oDocument->getNickName()}</dc:creator>
 			<guid isPermaLink="true">{$oDocument->getPermanentUrl()}</guid>
 			<comments cond="$oDocument->allowComment()">{$oDocument->getPermanentUrl()}#comment</comments>
-			<pubDate>{$oDocument->getRegdateGM()}</pubDate>
+			<pubDate>{$oDocument->getRegdateGM('r')}</pubDate>
 		</item>
 	</channel>
 </rss>
diff --git a/modules/rss/tpl/format/xe.html b/modules/rss/tpl/format/xe.html
index 287a34d28..7997b3a5d 100644
--- a/modules/rss/tpl/format/xe.html
+++ b/modules/rss/tpl/format/xe.html
@@ -7,7 +7,7 @@
 		<link>{$info->link}</link>
 		<description>{$info->description}</description>
 		<language>{$info->language}</language>
-		<pubDate>{$info->dateGM}</pubDate>
+		<pubDate>{$info->date_r}</pubDate>
 		<totalCount>{$info->total_count}</totalCount>
 		<totalPage>{$info->total_page}</totalPage>
 		<item loop="$document_list=>$oDocument">
@@ -22,8 +22,8 @@
 			<tags>{$oDocument->get('tags')}</tags>
 			<comment_count>{$oDocument->getCommentCount()}</comment_count>
 			<trackback_count>{$oDocument->getTrackbackCount()}</trackback_count>
-			<pubDate>{$oDocument->getRegdateGM()}</pubDate>
-			<upDate>{$oDocument->getUpdateGM()}</upDate>
+			<pubDate>{$oDocument->getRegdateGM('r')}</pubDate>
+			<upDate>{$oDocument->getUpdateGM('r')}</upDate>
 		</item>
 	</channel>
 </rss>