fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 19:21:40 +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

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

@ -136,7 +136,8 @@
// Module List
$mod_srls_count = count($mod_srls);
if($mod_srls_count) {
$module_output = $oModuleModel->getModulesInfo($mod_srls);
$columnList = array('module_srl', 'mid', 'browser_title');
$module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList);
if($module_output && is_array($module_output)){
foreach($module_output as $module) {
$module_list[$module->module_srl] = $module;

4
modules/file/file.controller.php
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))
{

3
modules/file/file.model.php
View file

@ -53,7 +53,8 @@
// Display upload status
$upload_status = $this->getUploadStatus($attached_size);
// Check remained file size until upload complete
$config = $oModuleModel->getModuleInfoByMid($mid);
//$config = $oModuleModel->getModuleInfoByMid($mid); //perhaps config varialbles not used
$file_config = $this->getUploadConfig();
$left_size = $file_config->allowed_attach_size*1024*1024 - $attached_size;
// Settings of required information