fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 03:32:00 +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);

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

@ -490,7 +490,7 @@ class adminAdminModel extends admin
$is_new_layout = TRUE;
$oLayoutModel = getModel('layout');
$layout_info_list = array();
$layout_list = $oLayoutModel->getLayoutList($site_info->site_srl);
$layout_list = $oLayoutModel->getLayoutList();
if($layout_list)
{
foreach($layout_list as $val)
@ -508,7 +508,6 @@ class adminAdminModel extends admin
{
$site_module_info = Context::get('site_module_info');
$args = new stdClass();
$args->site_srl = (int) $site_module_info->site_srl;
$args->layout_srl = getNextSequence();
$args->layout = $layout_info->name;
$args->title = $layout_info->title;
@ -655,14 +654,13 @@ class adminAdminModel extends admin
/**
* Get admin favorite list
* @param int $siteSrl if default site, siteSrl is zero
* @param int $site_srl @deprecated
* @param bool $isGetModuleInfo
* @return object
*/
function getFavoriteList($siteSrl = 0, $isGetModuleInfo = FALSE)
function getFavoriteList($site_srl = 0, $isGetModuleInfo = FALSE)
{
$args = new stdClass();
$args->site_srl = $siteSrl;
$output = executeQueryArray('admin.getFavoriteList', $args);
if(!$output->toBool())
{
@ -691,14 +689,13 @@ class adminAdminModel extends admin
/**
* Check available insert favorite
* @param int $siteSrl if default site, siteSrl is zero
* @param int $site_srl @deprecated
* @param string $module
* @return object
*/
function isExistsFavorite($siteSrl, $module)
function isExistsFavorite($site_srl, $module)
{
$args = new stdClass();
$args->site_srl = $siteSrl;
$args->module = $module;
$output = executeQuery('admin.getFavorite', $args);
if(!$output->toBool())

2
modules/admin/admin.admin.view.php
View file

@ -360,7 +360,7 @@ class adminAdminView extends admin
// Check counter addon
$site_module_info = Context::get('site_module_info');
$oAddonAdminModel = getAdminModel('addon');
$counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter', $site_module_info->site_srl );
$counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter');
if(!$counterAddonActivated)
{
$columnList = array('member_srl', 'nick_name', 'user_name', 'user_id', 'email_address');

2
modules/admin/queries/getFavoriteList.xml
View file

@ -6,7 +6,7 @@
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" />
<condition operation="equal" column="site_srl" var="site_srl" default="0" />
<condition operation="equal" column="module" var="module" pipe="and" />
</conditions>
</query>

2
modules/admin/queries/insertFavorite.xml
View file

@ -4,7 +4,7 @@
</tables>
<columns>
<column name="admin_favorite_srl" var="adminFavoriteSrl" filter="number" notnull="notnull" />
<column name="site_srl" var="site_srl" filter="number" notnull="notnull" />
<column name="site_srl" var="site_srl" default="0" />
<column name="module" var="module" notnull="notnull" />
<column name="type" var="favoriteType" default="module" />
</columns>