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

#713 파비콘 가상사이트 대응

Browse source
This commit is contained in:
upgle 2014-07-03 16:32:16 +09:00 • committed by akasima
commit 1f1c1f8ccc
4 changed files with 41 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -467,11 +467,19 @@ class adminAdminController extends admin
*/ */
function procAdminRemoveIcons() function procAdminRemoveIcons()
{ {
$site_info = Context::get('site_module_info');
$virtual_site = '';
if($site_info->site_srl)
{
$virtual_site = $site_info->site_srl . '/';
}
$iconname = Context::get('iconname'); $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) if($file_exist)
{ {
@FileHandler::removeFile(_XE_PATH_ . 'files/attach/xeicon/' . $iconname); @FileHandler::removeFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
} }
else else
{ {

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

@ -947,14 +947,22 @@ class adminAdminModel extends admin
function iconUrlCheck($iconname, $default_icon_name) function iconUrlCheck($iconname, $default_icon_name)
{ {
$file_exsit = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $iconname);
$site_info = Context::get('site_module_info');
$virtual_site = '';
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) if(!$file_exsit)
{ {
$icon_url = './modules/admin/tpl/img/' . $default_icon_name; $icon_url = './modules/admin/tpl/img/' . $default_icon_name;
} }
else 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; return $icon_url;
} }

6
modules/admin/tpl/config_general.html
View file

@ -98,8 +98,8 @@
<input type="hidden" name="module" value="install"> <input type="hidden" name="module" value="install">
<input type="hidden" name="act" value="procInstallAdminConfigIconUpload"> <input type="hidden" name="act" value="procInstallAdminConfigIconUpload">
<p> <p>
<input type="file" name="favicon" id="favicon" title="Mobile Home Icon"/> <input type="file" name="favicon" id="favicon" title="Favicon"/>
<input class="x_btn" type="submit" value="{$lang->cmd_submit}" style="vertical-align:top"> <input class="x_btn" type="submit" value="{$lang->cmd_preview}" style="vertical-align:top">
</p> </p>
</form> </form>
<span class="x_help-block">{$lang->about_use_favicon}</span> <span class="x_help-block">{$lang->about_use_favicon}</span>
@ -118,7 +118,7 @@
<input type="hidden" name="act" value="procInstallAdminConfigIconUpload"> <input type="hidden" name="act" value="procInstallAdminConfigIconUpload">
<p> <p>
<input type="file" name="mobicon" id="mobicon" title="Mobile Home Icon"/> <input type="file" name="mobicon" id="mobicon" title="Mobile Home Icon"/>
<input class="x_btn" type="submit" value="{$lang->cmd_submit}" style="vertical-align:top"> <input class="x_btn" type="submit" value="{$lang->cmd_preview}" style="vertical-align:top">
</p> </p>
</form> </form>
<span class="x_help-block">{$lang->detail_use_mobile_icon}</span> <span class="x_help-block">{$lang->detail_use_mobile_icon}</span>

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

@ -327,9 +327,17 @@ class installAdminController extends install
private function saveIconTmp($icon, $iconname) private function saveIconTmp($icon, $iconname)
{ {
$site_info = Context::get('site_module_info');
$virtual_site = '';
if($site_info->site_srl)
{
$virtual_site = $site_info->site_srl . '/';
}
$target_file = $icon['tmp_name']; $target_file = $icon['tmp_name'];
$type = $icon['type']; $type = $icon['type'];
$relative_filename = 'files/attach/xeicon/tmp/'.$iconname; $relative_filename = 'files/attach/xeicon/'.$virtual_site.'tmp/'.$iconname;
$target_filename = _XE_PATH_.$relative_filename; $target_filename = _XE_PATH_.$relative_filename;
list($width, $height, $type_no, $attrs) = @getimagesize($target_file); list($width, $height, $type_no, $attrs) = @getimagesize($target_file);
@ -364,7 +372,15 @@ class installAdminController extends install
} }
private function updateIcon($iconname, $deleteIcon = false) { private function updateIcon($iconname, $deleteIcon = false) {
$image_filepath = _XE_PATH_.'files/attach/xeicon/';
$site_info = Context::get('site_module_info');
$virtual_site = '';
if($site_info->site_srl)
{
$virtual_site = $site_info->site_srl . '/';
}
$image_filepath = _XE_PATH_.'files/attach/xeicon/' . $virtual_site;
if($deleteIcon) { if($deleteIcon) {
FileHandler::removeFile($image_filepath.$iconname); FileHandler::removeFile($image_filepath.$iconname);