From 9741e2dd2463f77932ceb36b17a4b349ffe2aaaa Mon Sep 17 00:00:00 2001
From: MinSoo Kim <misol.kr@gmail.com>
Date: Tue, 21 Jul 2015 14:05:29 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A0=9C=EB=AA=A9=20=EC=97=86=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=84=20RSS=EB=A5=BC=20=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94?=
 =?UTF-8?q?=20=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20=EC=88=98=EC=A0=95=20=EB=93=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* RSS 모듈의 관리자 페이지 개선 ( 리라이트 모드가 아닐 때 RSS 피드 주소를 잘못 표시하던 문제 개선 )
* 제목이 없이도 RSS 미사용 할 수 있게 개선 ( RSS 통합 피드 비활성화 #1573 )
---
 modules/rss/rss.admin.view.php          |  1 +
 modules/rss/rss.view.php                |  2 +-
 modules/rss/ruleset/insertRssConfig.xml | 10 +++++-----
 modules/rss/tpl/rss_admin_index.html    |  2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/rss/rss.admin.view.php b/modules/rss/rss.admin.view.php
index 5dffb4888..6993774b8 100644
--- a/modules/rss/rss.admin.view.php
+++ b/modules/rss/rss.admin.view.php
@@ -55,6 +55,7 @@ class rssAdminView extends rss
 			}
 		}
 		if(!$total_config->feed_document_count) $total_config->feed_document_count = 15;
+		$total_config->url = $oRssModel->getModuleFeedUrl(NULL, '', 'rss');
 
 		Context::set('feed_config', $feed_config);
 		Context::set('total_config', $total_config);
diff --git a/modules/rss/rss.view.php b/modules/rss/rss.view.php
index 33577cf3a..86b99b5f5 100644
--- a/modules/rss/rss.view.php
+++ b/modules/rss/rss.view.php
@@ -172,7 +172,7 @@ class rssView extends rss
 			$info->id = $proctcl.$_SERVER['HTTP_HOST'].$info->id;
 		}
 
-		$info->language = Context::getLangType();
+		$info->language = str_replace('jp','ja',Context::getLangType());
 		// Set the variables used in the RSS output
 		Context::set('info', $info);
 		Context::set('feed_config', $config);
diff --git a/modules/rss/ruleset/insertRssConfig.xml b/modules/rss/ruleset/insertRssConfig.xml
index 86304d836..9a8680fcf 100644
--- a/modules/rss/ruleset/insertRssConfig.xml
+++ b/modules/rss/ruleset/insertRssConfig.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ruleset version="1.5.0">
-    <customrules>
+	<customrules>
 		<rule name="boolean" type="enum" test="Y,N" />
-    </customrules>
-    <fields>
+	</customrules>
+	<fields>
 		<field name="module" required="true" default="rss" />
 		<field name="act" required="true" default="procRssAdminInsertConfig" />
 		<field name="use_total_feed" required="true" default="Y" rule="boolean" />
-		<field name="feed_title" required="true">
+		<field name="feed_title">
 			<title xml:lang="ko">피드(Feed) 제목</title>
 			<title xml:lang="en">Feed Title</title>
 		</field>
diff --git a/modules/rss/tpl/rss_admin_index.html b/modules/rss/tpl/rss_admin_index.html
index aa0ae58d9..9055e894e 100644
--- a/modules/rss/tpl/rss_admin_index.html
+++ b/modules/rss/tpl/rss_admin_index.html
@@ -12,7 +12,7 @@
 		<input type="hidden" name="xe_validator_id" value="modules/rss/tpl/rss_admin_index/1" />
 		<div class="x_control-group">
 			<div class="x_control-label">{$lang->url}</div>
-			<div class="x_controls" style="padding-top:5px"><a href="{getFullSiteUrl()}rss" target="_blank">{getFullSiteUrl()}rss</a></div>
+			<div class="x_controls" style="padding-top:5px"><a href="{$total_config->url}" target="_blank">{$total_config->url}</a></div>
 		</div>
 		<div class="x_control-group">
 			<label class="x_control-label">{$lang->total_feed}</label>