#19705602 module related DB select column arrangement

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

View file

@ -168,6 +168,7 @@
}
if($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_allowed_outlink');
}
// Check if a permission for file download is granted
if(is_array($file_module_config->download_grant) && count($file_module_config->download_grant)>0) {
if(!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
@ -175,7 +176,8 @@
if($logged_info->is_admin != 'Y') {
$oModuleModel =& getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($file_obj->module_srl);
$columnList = array('module_srl', 'site_srl');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($file_obj->module_srl, $columnList);
if(!$oModuleModel->isSiteAdmin($logged_info, $module_info->site_srl))
{