fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-27 22:33:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Add FeatureDisabled and SecurityViolation exception classes

Browse source
This commit is contained in:
Kijin Sung 2018-09-06 10:00:47 +09:00
parent 88dc76501a
commit 10c8d11785
11 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/board/board.view.php
View file

@ -679,18 +679,18 @@ class boardView extends board
$document_srl = Context::get('document_srl');
if(!$document_srl)
{
throw new Rhymix\Framework\Exception("msg_invalid_request");
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
if($this->grant->view == false || ($this->module_info->consultation == 'Y' && !$this->grant->manager && !$this->grant->consultation_read))
{
throw new Rhymix\Framework\Exception("msg_not_permitted");
throw new Rhymix\Framework\Exceptions\NotPermitted;
}
$oDocument = getModel('document')->getDocument($document_srl);
if(!$oDocument->isExists())
{
throw new Rhymix\Framework\Exception("msg_invalid_request");
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
Context::set('oDocument', $oDocument);
@ -960,7 +960,7 @@ class boardView extends board
$oDocument = $oDocumentModel->getDocument($document_srl);
if(!$oDocument->isExists())
{
return $this->dispBoardMessage('msg_invalid_request');
return $this->dispBoardMessage('msg_not_founded');
}
// Check allow comment
@ -1015,11 +1015,11 @@ class boardView extends board
// if the comment is not existed, opoup an error message
if(!$oSourceComment->isExists())
{
return $this->dispBoardMessage('msg_invalid_request');
return $this->dispBoardMessage('msg_not_founded');
}
if(Context::get('document_srl') && $oSourceComment->get('document_srl') != Context::get('document_srl'))
{
return $this->dispBoardMessage('msg_invalid_request');
return $this->dispBoardMessage('msg_not_founded');
}
// Check allow comment
@ -1102,7 +1102,7 @@ class boardView extends board
// if the comment is not exited, alert an error message
if(!$oComment->isExists())
{
return $this->dispBoardMessage('msg_invalid_request');
return $this->dispBoardMessage('msg_not_founded');
}
// if the comment is not granted, then back to the password input form

4
modules/comment/comment.controller.php
View file

@ -315,7 +315,7 @@ class commentController extends comment
{
if(!$manual_inserted && !checkCSRF())
{
return new BaseObject(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_security_violation');
}
if(!is_object($obj))
@ -717,7 +717,7 @@ class commentController extends comment
{
if(!$manual_updated && !checkCSRF())
{
return new BaseObject(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_security_violation');
}
if(!is_object($obj))

4
modules/comment/comment.model.php
View file

@ -1003,7 +1003,7 @@ class commentModel extends comment
{
if($comment_config->use_vote_down != 'S')
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
throw new Rhymix\Framework\Exceptions\FeatureDisabled;
}
$args->below_point = 0;
@ -1012,7 +1012,7 @@ class commentModel extends comment
{
if($comment_config->use_vote_up != 'S')
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
throw new Rhymix\Framework\Exceptions\FeatureDisabled;
}
$args->more_point = 0;

4
modules/document/document.controller.php
View file

@ -347,7 +347,7 @@ class documentController extends document
{
if(!$manual_inserted && !checkCSRF())
{
return new BaseObject(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_security_violation');
}
// begin transaction
@ -576,7 +576,7 @@ class documentController extends document
{
if(!$manual_updated && !checkCSRF())
{
return new BaseObject(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_security_violation');
}
if(!$source_obj->document_srl || !$obj->document_srl) return new BaseObject(-1, 'msg_invalied_request');

4
modules/document/document.model.php
View file

@ -1153,12 +1153,12 @@ class documentModel extends document
$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
if($point == -1)
{
if($document_config->use_vote_down!='S') throw new Rhymix\Framework\Exceptions\InvalidRequest;
if($document_config->use_vote_down!='S') throw new Rhymix\Framework\Exceptions\FeatureDisabled;
$args->below_point = 0;
}
else
{
if($document_config->use_vote_up!='S') throw new Rhymix\Framework\Exceptions\InvalidRequest;
if($document_config->use_vote_up!='S') throw new Rhymix\Framework\Exceptions\FeatureDisabled;
$args->more_point = 0;
}

4
modules/member/member.controller.php
View file

@ -578,7 +578,7 @@ class memberController extends member
{
if (Context::getRequestMethod() == 'GET')
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
throw new Rhymix\Framework\Exceptions\SecurityViolation;
}
$oMemberModel = &getModel ('member');
@ -588,7 +588,7 @@ class memberController extends member
$trigger_output = ModuleHandler::triggerCall ('member.procMemberInsert', 'before', $config);
if(!$trigger_output->toBool ()) return $trigger_output;
// Check if an administrator allows a membership
if($config->enable_join != 'Y') throw new Rhymix\Framework\Exception('msg_signup_disabled');
if($config->enable_join != 'Y') throw new Rhymix\Framework\Exceptions\FeatureDisabled('msg_signup_disabled');
// Check if the user accept the license terms (only if terms exist)
$accept_agreement = Context::get('accept_agreement');

14
modules/member/member.view.php
View file

@ -203,7 +203,7 @@ class memberView extends member
$trigger_output = ModuleHandler::triggerCall('member.dispMemberSignUpForm', 'before', $member_config);
if(!$trigger_output->toBool()) return $trigger_output;
// Error appears if the member is not allowed to join
if($member_config->enable_join != 'Y') throw new Rhymix\Framework\Exception('msg_signup_disabled');
if($member_config->enable_join != 'Y') throw new Rhymix\Framework\Exceptions\FeatureDisabled('msg_signup_disabled');
$formTags = getAdminView('member')->_getMemberInputTag();
Context::set('formTags', $formTags);
@ -351,7 +351,7 @@ class memberView extends member
{
if ($this->member_config->features['my_documents'] === false)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
throw new Rhymix\Framework\Exceptions\FeatureDisabled;
}
// A message appears if the user is not logged-in
@ -385,7 +385,7 @@ class memberView extends member
{
if ($this->member_config->features['my_comments'] === false)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
throw new Rhymix\Framework\Exceptions\FeatureDisabled;
}
$oMemberModel = getModel('member');
@ -417,7 +417,7 @@ class memberView extends member
{
if ($this->member_config->features['scrapped_documents'] === false)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
throw new Rhymix\Framework\Exceptions\FeatureDisabled;
}
$oMemberModel = getModel('member');
@ -493,7 +493,7 @@ class memberView extends member
{
if ($this->member_config->features['saved_documents'] === false)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
throw new Rhymix\Framework\Exceptions\FeatureDisabled;
}
$oMemberModel = getModel('member');
@ -524,7 +524,7 @@ class memberView extends member
{
if ($this->member_config->features['active_logins'] === false)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
throw new Rhymix\Framework\Exceptions\FeatureDisabled;
}
$logged_info = Context::get('logged_info');
@ -803,7 +803,7 @@ class memberView extends member
{
if ($this->member_config->features['nickname_log'] === false || $this->member_config->update_nickname_log != 'Y')
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
throw new Rhymix\Framework\Exceptions\FeatureDisabled;
}
$member_srl = Context::get('member_srl');