hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed the code/revision controller to return failure if the revision number is negative

Browse Source
This commit is contained in:
hyung-hwan 2015-08-14 05:16:36 +00:00
parent 38e63af4fb
commit 0986be08db
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
codepot/src/codepot/controllers/code.php
View File

@ -474,6 +474,11 @@ class Code extends Controller
" - {$projectid}"; " - {$projectid}";
$this->load->view ($this->VIEW_ERROR, $data); $this->load->view ($this->VIEW_ERROR, $data);
} }
else if ($rev < 0)
{
$data['message'] = 'INVALID REVISION NUMBER';
$this->load->view ($this->VIEW_ERROR, $data);
}
else else
{ {
if ($project->public !== 'Y' && $login['id'] == '') if ($project->public !== 'Y' && $login['id'] == '')
@ -564,7 +569,10 @@ class Code extends Controller
$this->form_validation->_field_data = array(); $this->form_validation->_field_data = array();
// TODO: message localization // TODO: message localization
$email_subject = sprintf ('New review message #%d by %s in %s', $review_sno, $login['id'], $projectid); $email_subject = sprintf (
'New review message #%d for r%d by %s in %s',
$review_sno, $rev, $login['id'], $projectid
);
$email_message = 'See ' . current_url(); $email_message = 'See ' . current_url();
$this->projects->emailMessageToMembers ( $this->projects->emailMessageToMembers (
$projectid, $this->login, $email_subject, $email_message $projectid, $this->login, $email_subject, $email_message
@ -626,7 +634,16 @@ class Code extends Controller
} }
else else
{ {
$reviews = $this->code_review->getReviews ($projectid, $rev); $r_rev = $rev;
if ($r_rev < 0)
{
if (array_key_exists('history', $file))
{
$h = &$file['history'];
if (array_key_exists('rev', $h)) $r_rev = $h['rev'];
}
}
$reviews = $this->code_review->getReviews ($projectid, $r_rev);
if ($reviews === FALSE) if ($reviews === FALSE)
{ {
$data['project'] = $project; $data['project'] = $project;