Use relative URL and mtime in favicon & mobicon URL

This commit is contained in:
Kijin Sung 2016-04-10 22:49:17 +09:00
parent d772a8df85
commit a052bed9be

View file

@ -943,24 +943,30 @@ class adminAdminModel extends admin
function iconUrlCheck($iconname, $default_icon_name, $default) function iconUrlCheck($iconname, $default_icon_name, $default)
{ {
if ($default)
{
return \RX_BASEURL . 'modules/admin/tpl/img/' . $default_icon_name;
}
$site_info = Context::get('site_module_info'); $site_info = Context::get('site_module_info');
$virtual_site = '';
if ($site_info->site_srl) if ($site_info->site_srl)
{ {
$virtual_site = $site_info->site_srl . '/'; $virtual_site = $site_info->site_srl . '/';
} }
else
{
$virtual_site = '';
}
$file_exsit = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname); $filename = 'files/attach/xeicon/' . $virtual_site . $iconname;
if(!$file_exsit && $default === true) if (Rhymix\Framework\Storage::exists(\RX_BASEDIR . $filename))
{ {
$icon_url = './modules/admin/tpl/img/' . $default_icon_name; return \RX_BASEURL . $filename . '?' . date('YmdHis', filemtime(\RX_BASEDIR . $filename));
} }
elseif($file_exsit) else
{ {
$default_url = Context::getDefaultUrl(); return false;
$icon_url = $default_url . 'files/attach/xeicon/' . $virtual_site . $iconname;
} }
return $icon_url;
} }
} }