fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-08 19:42:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Apply favicon, mobicon, and default image for each domain

Browse source
This commit is contained in:
Kijin Sung 2017-03-12 23:40:11 +09:00
parent fc6002f2cb
commit d5959a91bb
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
classes/display/HTMLDisplayHandler.php
View file

@ -221,9 +221,10 @@ class HTMLDisplayHandler
} }
// set icon // set icon
$site_module_info = Context::get('site_module_info');
$oAdminModel = getAdminModel('admin'); $oAdminModel = getAdminModel('admin');
$favicon_url = $oAdminModel->getFaviconUrl(false); $favicon_url = $oAdminModel->getFaviconUrl($site_module_info->domain_srl);
$mobicon_url = $oAdminModel->getMobileIconUrl(false); $mobicon_url = $oAdminModel->getMobileIconUrl($site_module_info->domain_srl);
Context::set('favicon_url', $favicon_url); Context::set('favicon_url', $favicon_url);
Context::set('mobicon_url', $mobicon_url); Context::set('mobicon_url', $mobicon_url);
@ -500,7 +501,7 @@ class HTMLDisplayHandler
Context::addOpenGraphData('og:image:width', $first_image['width']); Context::addOpenGraphData('og:image:width', $first_image['width']);
Context::addOpenGraphData('og:image:height', $first_image['height']); Context::addOpenGraphData('og:image:height', $first_image['height']);
} }
elseif ($default_image = getAdminModel('admin')->getSiteDefaultImageUrl($width, $height)) elseif ($default_image = getAdminModel('admin')->getSiteDefaultImageUrl($site_module_info->domain_srl, $width, $height))
{ {
Context::addOpenGraphData('og:image', Rhymix\Framework\URL::getCurrentDomainURL($default_image)); Context::addOpenGraphData('og:image', Rhymix\Framework\URL::getCurrentDomainURL($default_image));
if ($width && $height) if ($width && $height)

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

@ -824,10 +824,6 @@ class adminAdminModel extends admin
function getSiteDefaultImageUrl($domain_srl = 0, &$width = 0, &$height = 0) function getSiteDefaultImageUrl($domain_srl = 0, &$width = 0, &$height = 0)
{ {
$domain_srl = intval($domain_srl); $domain_srl = intval($domain_srl);
if (!$domain_srl)
{
$domain_srl = intval(Context::get('site_module_info')->domain_srl);
}
if ($domain_srl) if ($domain_srl)
{ {
$virtual_site = $domain_srl . '/'; $virtual_site = $domain_srl . '/';
@ -853,10 +849,6 @@ class adminAdminModel extends admin
function iconUrlCheck($iconname, $default_icon_name, $domain_srl) function iconUrlCheck($iconname, $default_icon_name, $domain_srl)
{ {
$domain_srl = intval($domain_srl); $domain_srl = intval($domain_srl);
if (!$domain_srl)
{
$domain_srl = intval(Context::get('site_module_info')->domain_srl);
}
if ($domain_srl) if ($domain_srl)
{ {
$virtual_site = $domain_srl . '/'; $virtual_site = $domain_srl . '/';