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

#19705602 module related DB select column arrangement

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8358 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-05-11 04:52:43 +00:00
parent 914f4d7ef0
commit ee276fe56e
30 changed files with 133 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

24
modules/module/module.controller.php
View file

@ -164,8 +164,11 @@
$args->domain = preg_replace('/\/$/','',$domain);
$args->index_module_srl = $index_module_srl;
$args->default_language = Context::getLangType();
$output = executeQuery('module.getSiteInfoByDomain', $args);
if($output->data) return new Object(-1,'msg_already_registed_vid');
$columnList = array('modules.site_srl');
$oModuleModel = &getModel('module');
$output = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
if($output) return new Object(-1,'msg_already_registed_vid');
$output = executeQuery('module.insertSite', $args);
if(!$output->toBool()) return $output;
@ -179,9 +182,10 @@
**/
function updateSite($args) {
$oModuleModel = &getModel('module');
$site_info = $oModuleModel->getSiteInfo($args->site_srl);
$columnList = array('sites.site_srl', 'sites.domain');
$site_info = $oModuleModel->getSiteInfo($args->site_srl, $columnList);
if($site_info->domain != $args->domain) {
$info = $oModuleModel->getSiteInfoByDomain($args->domain);
$info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
if($info->site_srl && $info->site_srl != $args->site_srl) return new Object(-1,'msg_already_registed_domain');
if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new Object(-1,'msg_already_registed_vid');
@ -277,11 +281,15 @@
$oDB = &DB::getInstance();
$oDB->begin();
$oModuleModel = &getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
if(!$args->site_srl || !$args->browser_title)
{
$oModuleModel = &getModel('module');
$columnList = array('module_srl', 'site_srl', 'browser_title');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
$args->site_srl = (int)$module_info->site_srl;
if(!$args->browser_title) $args->browser_title = $module_info->browser_title;
if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl;
if(!$args->browser_title) $args->browser_title = $module_info->browser_title;
}
$output = executeQuery('module.isExistsModuleName', $args);
if(!$output->toBool() || $output->data->count) {