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);