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

Remove unnecessary site_srl from several other modules

Browse source
This commit is contained in:
Kijin Sung 2021-01-18 16:25:02 +09:00
parent 972fbc9ca6
commit 1f34c33e29
29 changed files with 79 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -169,10 +169,6 @@ class adminAdminController extends admin
public function procAdminInsertDefaultDesignInfo()
{
$vars = Context::getRequestVars();
if(!$vars->site_srl)
{
$vars->site_srl = 0;
}
// create a DesignInfo file
$this->updateDefaultDesignInfo($vars);
@ -190,7 +186,7 @@ class adminAdminController extends admin
FileHandler::makeDir($siteDesignPath);
}
$siteDesignFile = RX_BASEDIR . 'files/site_design/design_' . $vars->site_srl . '.php';
$siteDesignFile = RX_BASEDIR . 'files/site_design/design_0.php';
$layoutTarget = 'layout_srl';
$skinTarget = 'skin';
@ -225,10 +221,10 @@ class adminAdminController extends admin
$designInfo->module->{$moduleName}->{$skinTarget} = $skinName;
}
$this->makeDefaultDesignFile($designInfo, $vars->site_srl);
$this->makeDefaultDesignFile($designInfo);
}
function makeDefaultDesignFile($designInfo, $site_srl = 0)
function makeDefaultDesignFile($designInfo)
{
$buff = array();
$buff[] = '<?php if(!defined("__XE__")) exit();';
@ -255,7 +251,7 @@ class adminAdminController extends admin
}
}
$siteDesignFile = RX_BASEDIR . 'files/site_design/design_' . $site_srl . '.php';
$siteDesignFile = RX_BASEDIR . 'files/site_design/design_0.php';
FileHandler::writeFile($siteDesignFile, implode(PHP_EOL, $buff));
}
@ -265,7 +261,6 @@ class adminAdminController extends admin
*/
function procAdminToggleFavorite()
{
$siteSrl = Context::get('site_srl');
$moduleName = Context::get('module_name');
// check favorite exists
@ -286,7 +281,7 @@ class adminAdminController extends admin
// if not exists, insert favorite
else
{
$output = $this->_insertFavorite($siteSrl, $moduleName);
$output = $this->_insertFavorite(0, $moduleName);
$result = 'on';
}
@ -412,11 +407,10 @@ class adminAdminController extends admin
* Insert favorite
* @return object query result
*/
function _insertFavorite($siteSrl, $module, $type = 'module')
function _insertFavorite($site_srl, $module, $type = 'module')
{
$args = new stdClass();
$args->adminFavoriteSrl = getNextSequence();
$args->site_srl = $siteSrl;
$args->module = $module;
$args->type = $type;
$output = executeQuery('admin.insertFavorite', $args);