fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-05 17:51:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

파비콘이 가상 사이트에 대응하도록 개선

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

이전 버전과 호환을 위해 기본 사이트의 경우 files/attach/xeicon/favicon.ico 와 같이 기존 주소를 그대로
이용하도록 처리.
This commit is contained in:
upgle 2014-05-14 16:18:53 +05:45
parent 59067047d1
commit 7b53f24435
3 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/admin/admin.admin.controller.php
View file

@ -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
{

8
modules/admin/admin.admin.model.php
View file

@ -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;
}

12
modules/install/install.admin.controller.php
View file

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