From 60b0a76f3f1fbfa7499410360b5da35f5b3d5bcb Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Tue, 13 Nov 2012 08:14:12 +0000
Subject: [PATCH] issue 2686 set default site title

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12197 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/module/ModuleHandler.class.php       | 13 +++++++++++--
 modules/admin/admin.admin.view.php           |  1 +
 modules/admin/lang/lang.xml                  |  8 ++++++++
 modules/admin/tpl/config_general.html        |  7 +++++++
 modules/install/install.admin.controller.php |  2 ++
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index eeda6f18a..b4efea9d2 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -488,8 +488,17 @@
 
 			if($type == "view" && $kind != 'admin'){
 				$module_config= $oModuleModel->getModuleConfig('module');
-				if($module_config->htmlFooter){
-						Context::addHtmlFooter($module_config->htmlFooter);
+				if($module_config->htmlFooter)
+				{
+					Context::addHtmlFooter($module_config->htmlFooter);
+				}
+				if($module_config->siteTitle)
+				{
+					$siteTitle = Context::getBrowserTitle();
+					if(!$siteTitle)
+					{
+						Context::setBrowserTitle($module_config->siteTitle);
+					}
 				}
 			}
 
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index 4fb2f9caa..d7773e5c1 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -347,6 +347,7 @@
 			
 			$oModuleModel = &getModel('module');
 			$config = $oModuleModel->getModuleConfig('module');
+       		Context::set('siteTitle',$config->siteTitle);
        		Context::set('htmlFooter',$config->htmlFooter);
 
 
diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml
index 3881b5638..a605572a0 100644
--- a/modules/admin/lang/lang.xml
+++ b/modules/admin/lang/lang.xml
@@ -99,6 +99,10 @@
 		<value xml:lang="vi"><![CDATA[Bảng điều khiển]]></value>
 		<value xml:lang="tr"><![CDATA[Kontrol Paneli]]></value>
 	</item>
+	<item name="site_title">
+		<value xml:lang="ko"><![CDATA[사이트 제목]]></value>
+		<value xml:lang="en"><![CDATA[Site title]]></value>
+	</item>
 	<item name="start_module">
 		<value xml:lang="ko"><![CDATA[시작 모듈]]></value>
 		<value xml:lang="en"><![CDATA[Default Module]]></value>
@@ -111,6 +115,10 @@
 		<value xml:lang="tr"><![CDATA[Varsayılan Modül]]></value>
 		<value xml:lang="vi"><![CDATA[Module trang chủ]]></value>
 	</item>
+	<item name="about_site_title">
+		<value xml:lang="ko"><![CDATA[세부 설정에서 사이트제목을 설정하지 않았을 경우 노출되는 제목입니다.]]></value>
+		<value xml:lang="en"><![CDATA[세부 설정에서 사이트제목을 설정하지 않았을 경우 노출되는 제목입니다.]]></value>
+	</item>
 	<item name="about_start_module">
 		<value xml:lang="ko"><![CDATA[사이트 접속 시 기본으로 호출될 모듈을 지정할 수 있습니다.]]></value>
 		<value xml:lang="en"><![CDATA[You can specify the default module for the site.]]></value>
diff --git a/modules/admin/tpl/config_general.html b/modules/admin/tpl/config_general.html
index c110b68b4..ce8ebea45 100644
--- a/modules/admin/tpl/config_general.html
+++ b/modules/admin/tpl/config_general.html
@@ -13,6 +13,13 @@
 		<input type="hidden" name="module" value="install" />
 		<input type="hidden" name="act" value="procInstallAdminConfig" />
 
+		<div class="x_control-group">
+			<label class="x_control-label">{$lang->site_title}</label>
+			<div class="x_controls">
+				<input type="text" name="site_title" value="{$siteTitle}" />
+				{$lang->about_site_title}
+			</div>
+		</div>
 		<div class="x_control-group">
 			<label class="x_control-label" for="_target_module">{$lang->start_module}</label>
 			<div class="x_controls">
diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php
index bfe077d66..6561feaf1 100644
--- a/modules/install/install.admin.controller.php
+++ b/modules/install/install.admin.controller.php
@@ -223,6 +223,7 @@
 			//모듈 설정 저장(썸네일, 풋터스크립트)
 			$config->thumbnail_type = Context::get('thumbnail_type');
 			$config->htmlFooter = Context::get('htmlFooter');
+			$config->siteTitle = Context::get('site_title');
 			$this->setModulesConfig($config);
 
 			//파비콘
@@ -265,6 +266,7 @@
 			unset($args);
 			
 			$args->htmlFooter = $config->htmlFooter;
+			$args->siteTitle = $config->siteTitle;
 			$oModuleController->insertModuleConfig('module',$args);
 
 			return $output;