From 7b53f2443578a2c3defe2087bdd0d9ed4596b37b Mon Sep 17 00:00:00 2001
From: upgle <admin@upgle.com>
Date: Wed, 14 May 2014 16:18:53 +0545
Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=EB=B9=84=EC=BD=98=EC=9D=B4=20?=
 =?UTF-8?q?=EA=B0=80=EC=83=81=20=EC=82=AC=EC=9D=B4=ED=8A=B8=EC=97=90=20?=
 =?UTF-8?q?=EB=8C=80=EC=9D=91=ED=95=98=EB=8F=84=EB=A1=9D=20=EA=B0=9C?=
 =?UTF-8?q?=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

파비콘 저장시
files/attach/xeicon/{가상사이트srl}/favicon.ico
와 같이 저장하도록 개선

이전 버전과 호환을 위해 기본 사이트의 경우 files/attach/xeicon/favicon.ico 와 같이 기존 주소를 그대로
이용하도록 처리.
---
 modules/admin/admin.admin.controller.php     |  8 ++++++--
 modules/admin/admin.admin.model.php          |  8 ++++++--
 modules/install/install.admin.controller.php | 12 ++++++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php
index 6e1d09f3b..24f07d369 100644
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@@ -467,11 +467,15 @@ class adminAdminController extends admin
 	 */
 	function procAdminRemoveIcons()
 	{
+
+		$site_info = Context::get('site_module_info');
+		if($site_info->site_srl) $virtual_site = $site_info->site_srl . '/';
+
 		$iconname = Context::get('iconname');
-		$file_exist = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $iconname);
+		$file_exist = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
 		if($file_exist)
 		{
-			@FileHandler::removeFile(_XE_PATH_ . 'files/attach/xeicon/' . $iconname);
+			@FileHandler::removeFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
 		}
 		else
 		{
diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php
index 1c863da8a..3f5b2878b 100644
--- a/modules/admin/admin.admin.model.php
+++ b/modules/admin/admin.admin.model.php
@@ -947,14 +947,18 @@ class adminAdminModel extends admin
 
 	function iconUrlCheck($iconname, $default_icon_name)
 	{
-		$file_exsit = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $iconname);
+
+		$site_info = Context::get('site_module_info');
+		if($site_info->site_srl) $virtual_site = $site_info->site_srl . '/';
+
+		$file_exsit = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
 		if(!$file_exsit)
 		{
 			$icon_url = './modules/admin/tpl/img/' . $default_icon_name;
 		}
 		else
 		{
-			$icon_url = $db_info->default_url . 'files/attach/xeicon/' . $iconname;
+			$icon_url = $db_info->default_url . 'files/attach/xeicon/' . $virtual_site . $iconname;
 		}
 		return $icon_url;
 	}
diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php
index 9cdb759fa..1790574ea 100644
--- a/modules/install/install.admin.controller.php
+++ b/modules/install/install.admin.controller.php
@@ -327,8 +327,12 @@ class installAdminController extends install
 
 	private function saveIconTmp($icon, $iconname)
 	{
+
+		$site_info = Context::get('site_module_info');
+		if($site_info->site_srl) $virtual_site = $site_info->site_srl . '/';
+
 		$target_file = $icon['tmp_name'];
-		$relative_filename = 'files/attach/xeicon/tmp/'.$iconname;
+		$relative_filename = 'files/attach/xeicon/'.$virtual_site.'tmp/'.$iconname;
 		$target_filename = _XE_PATH_.$relative_filename;
 
 		list($width, $height, $type_no, $attrs) = @getimagesize($target_file);
@@ -367,7 +371,11 @@ class installAdminController extends install
 	}
 
 	private function updateIcon($iconname, $deleteIcon = false) {
-		$image_filepath = _XE_PATH_.'files/attach/xeicon/';
+
+		$site_info = Context::get('site_module_info');
+		if($site_info->site_srl) $virtual_site = $site_info->site_srl . '/';
+
+		$image_filepath = _XE_PATH_.'files/attach/xeicon/' . $virtual_site;
 
 		if($deleteIcon) {
 			FileHandler::removeFile($image_filepath.$iconname);