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 use of BaseObject

Browse source 
- 트리거 등 반환값이 필요하지 않은 곳에서 new BaseObject()를 반환하는 것 삭제
- 모듈 설치, 업데이트 후 무의미한 new BaseObject()를 반환하는 것 삭제
- 사용자에게 에러 메시지를 돌려주는 용도로 new BaseObject(-1, '에러메시지')를
  사용하는 경우는 대부분 $this->setError()로 변경함. 언어 변환과 sprintf()
  처리까지 한 번에 이루어지므로 이쪽이 더 편리함.
This commit is contained in:
Kijin Sung 2017-12-01 00:54:51 +09:00
parent 03d74a984f
commit 84e5542d77
103 changed files with 692 additions and 862 deletions
Download patch file Download diff file Expand all files Collapse all files

72
modules/file/file.controller.php
View file

@ -39,7 +39,7 @@ class fileController extends file
// Exit a session if there is neither upload permission nor information
if(!$_SESSION['upload_info'][$editor_sequence]->enabled)
{
return new BaseObject(-1, 'msg_not_permitted');
return $this->setError('msg_not_permitted');
}
// Get upload_target_srl
@ -63,7 +63,7 @@ class fileController extends file
$total_size = intval($matches[3]);
if ($chunk_start < 0 || $chunk_size < 0 || $total_size < 0 || $chunk_start + $chunk_size > $total_size || $chunk_size != $file_info['size'])
{
return new BaseObject(-1, 'msg_upload_invalid_chunk');
return $this->setError('msg_upload_invalid_chunk');
}
$this->add('chunk_current_size', $chunk_size);
$this->add('chunk_uploaded_size', $chunk_start);
@ -76,13 +76,13 @@ class fileController extends file
{
Rhymix\Framework\Storage::delete($temp_filename);
$this->add('chunk_status', 11);
return new BaseObject(-1, 'msg_upload_invalid_chunk');
return $this->setError('msg_upload_invalid_chunk');
}
if ($chunk_start != 0 && (!Rhymix\Framework\Storage::isFile($temp_filename) || Rhymix\Framework\Storage::getSize($temp_filename) != $chunk_start))
{
Rhymix\Framework\Storage::delete($temp_filename);
$this->add('chunk_status', 12);
return new BaseObject(-1, 'msg_upload_invalid_chunk');
return $this->setError('msg_upload_invalid_chunk');
}
// Check size limit
@ -95,13 +95,13 @@ class fileController extends file
if ($total_size > $allowed_filesize)
{
$this->add('chunk_status', 21);
return new BaseObject(-1, 'msg_exceeds_limit_size');
return $this->setError('msg_exceeds_limit_size');
}
$output = executeQuery('file.getAttachedFileSize', (object)array('upload_target_srl' => $upload_target_srl));
if (intval($output->data->attached_size) + $total_size > $allowed_attach_size)
{
$this->add('chunk_status', 22);
return new BaseObject(-1, 'msg_exceeds_limit_size');
return $this->setError('msg_exceeds_limit_size');
}
}
@ -119,14 +119,14 @@ class fileController extends file
}
else
{
return new BaseObject();
return;
}
}
else
{
Rhymix\Framework\Storage::delete($temp_filename);
$this->add('chunk_status', 40);
return new BaseObject(-1, 'msg_upload_invalid_chunk');
return $this->setError('msg_upload_invalid_chunk');
}
}
else
@ -207,14 +207,14 @@ class fileController extends file
if(!$file_srl || !$width)
{
return new BaseObject(-1,'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$oFileModel = getModel('file');
$fileInfo = $oFileModel->getFile($file_srl);
if(!$fileInfo || $fileInfo->direct_download != 'Y')
{
return new BaseObject(-1,'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$source_src = $fileInfo->uploaded_filename;
@ -230,7 +230,7 @@ class fileController extends file
}
else
{
return new BaseObject(-1,'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$this->add('resized_info',$output);
@ -271,7 +271,7 @@ class fileController extends file
{
$oFileModel = getModel('file');
if(isset($this->grant->access) && $this->grant->access !== true) return new BaseObject(-1, 'msg_not_permitted');
if(isset($this->grant->access) && $this->grant->access !== true) return $this->setError('msg_not_permitted');
$file_srl = Context::get('file_srl');
$sid = Context::get('sid');
@ -554,11 +554,11 @@ class fileController extends file
*/
function procFileGetList()
{
if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
if(!Context::get('is_logged')) return $this->setError('msg_not_permitted');
$logged_info = Context::get('logged_info');
if($logged_info->is_admin !== 'Y' && !getModel('module')->isSiteAdmin($logged_info))
{
return new BaseObject(-1,'msg_not_permitted');
return $this->setError('msg_not_permitted');
}
$fileSrls = Context::get('file_srls');
@ -598,12 +598,12 @@ class fileController extends file
function triggerCheckAttached(&$obj)
{
$document_srl = $obj->document_srl;
if(!$document_srl) return new BaseObject();
if(!$document_srl) return;
// Get numbers of attachments
$oFileModel = getModel('file');
$obj->uploaded_count = $oFileModel->getFilesCount($document_srl);
return new BaseObject();
// TODO: WTF are we doing with uploaded_count anyway?
}
/**
@ -615,12 +615,10 @@ class fileController extends file
function triggerAttachFiles(&$obj)
{
$document_srl = $obj->document_srl;
if(!$document_srl) return new BaseObject();
if(!$document_srl) return;
$output = $this->setFilesValid($document_srl);
if(!$output->toBool()) return $output;
return new BaseObject();
}
/**
@ -632,7 +630,7 @@ class fileController extends file
function triggerDeleteAttached(&$obj)
{
$document_srl = $obj->document_srl;
if(!$document_srl) return new BaseObject();
if(!$document_srl) return;
$output = $this->deleteFiles($document_srl);
return $output;
@ -647,12 +645,10 @@ class fileController extends file
function triggerCommentCheckAttached(&$obj)
{
$comment_srl = $obj->comment_srl;
if(!$comment_srl) return new BaseObject();
if(!$comment_srl) return;
// Get numbers of attachments
$oFileModel = getModel('file');
$obj->uploaded_count = $oFileModel->getFilesCount($comment_srl);
return new BaseObject();
}
/**
@ -665,12 +661,10 @@ class fileController extends file
{
$comment_srl = $obj->comment_srl;
$uploaded_count = $obj->uploaded_count;
if(!$comment_srl || !$uploaded_count) return new BaseObject();
if(!$comment_srl || !$uploaded_count) return;
$output = $this->setFilesValid($comment_srl);
if(!$output->toBool()) return $output;
return new BaseObject();
}
/**
@ -682,9 +676,9 @@ class fileController extends file
function triggerCommentDeleteAttached(&$obj)
{
$comment_srl = $obj->comment_srl;
if(!$comment_srl) return new BaseObject();
if(!$comment_srl) return;
if($obj->isMoveToTrash) return new BaseObject();
if($obj->isMoveToTrash) return;
$output = $this->deleteFiles($comment_srl);
return $output;
@ -699,7 +693,7 @@ class fileController extends file
function triggerDeleteModuleFiles(&$obj)
{
$module_srl = $obj->module_srl;
if(!$module_srl) return new BaseObject();
if(!$module_srl) return;
$oFileController = getAdminController('file');
return $oFileController->deleteModuleFiles($module_srl);
@ -817,13 +811,13 @@ class fileController extends file
$allowed_filesize = $config->allowed_filesize * 1024 * 1024;
$allowed_attach_size = $config->allowed_attach_size * 1024 * 1024;
// An error appears if file size exceeds a limit
if($allowed_filesize < filesize($file_info['tmp_name'])) return new BaseObject(-1, 'msg_exceeds_limit_size');
if($allowed_filesize < filesize($file_info['tmp_name'])) return $this->setError('msg_exceeds_limit_size');
// Get total file size of all attachements (from DB)
$size_args = new stdClass;
$size_args->upload_target_srl = $upload_target_srl;
$output = executeQuery('file.getAttachedFileSize', $size_args);
$attached_size = (int)$output->data->attached_size + filesize($file_info['tmp_name']);
if($attached_size > $allowed_attach_size) return new BaseObject(-1, 'msg_exceeds_limit_size');
if($attached_size > $allowed_attach_size) return $this->setError('msg_exceeds_limit_size');
}
}
@ -860,7 +854,7 @@ class fileController extends file
// Create a directory
if(!Rhymix\Framework\Storage::isDirectory($path) && !Rhymix\Framework\Storage::createDirectory($path))
{
return new BaseObject(-1,'msg_not_permitted_create');
return $this->setError('msg_not_permitted_create');
}
// Move the file
@ -872,7 +866,7 @@ class fileController extends file
@copy($file_info['tmp_name'], $filename);
if(!file_exists($filename))
{
return new BaseObject(-1,'msg_file_upload_error');
return $this->setError('msg_file_upload_error');
}
}
}
@ -882,7 +876,7 @@ class fileController extends file
{
if (!Rhymix\Framework\Storage::move($file_info['tmp_name'], $filename))
{
return new BaseObject(-1,'msg_file_upload_error');
return $this->setError('msg_file_upload_error');
}
}
}
@ -892,7 +886,7 @@ class fileController extends file
{
if(!@move_uploaded_file($file_info['tmp_name'], $filename))
{
return new BaseObject(-1,'msg_file_upload_error');
return $this->setError('msg_file_upload_error');
}
}
}
@ -1107,16 +1101,16 @@ class fileController extends file
$vars = Context::getRequestVars();
$logged_info = Context::get('logged_info');
if(!$vars->editor_sequence) return new BaseObject(-1, 'msg_invalid_request');
if(!$vars->editor_sequence) return $this->setError('msg_invalid_request');
$upload_target_srl = $_SESSION['upload_info'][$vars->editor_sequence]->upload_target_srl;
$oFileModel = getModel('file');
$file_info = $oFileModel->getFile($vars->file_srl);
if(!$file_info) return new BaseObject(-1, 'msg_not_founded');
if(!$file_info) return $this->setError('msg_not_founded');
if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) return new BaseObject(-1, 'msg_not_permitted');
if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) return $this->setError('msg_not_permitted');
$args = new stdClass();
$args->file_srl = $vars->file_srl;