Skip to content
Snippets Groups Projects
Commit ef65de78 authored by Alan Nelson's avatar Alan Nelson
Browse files

Added error checking / validation for pull request number

parent ed95a4d9
No related branches found
No related tags found
1 merge request!3Projects Task 9
...@@ -46,7 +46,7 @@ class Bulletin_NewController extends Creq_Controller_Action ...@@ -46,7 +46,7 @@ class Bulletin_NewController extends Creq_Controller_Action
$pullRequestNumber = $request->getPullRequestNumber(); $pullRequestNumber = $request->getPullRequestNumber();
// Make sure we have a number and not NULL // Make sure we have a number and not NULL
if ($pullRequestNumber != 'NULL' && $pullRequestNumber != ''){ if (is_int($pullRequestNumber) && intval($pullRequestNumber) > 0){
$merged = Bulletin_RepositoryModel::getInstance()->pullRequestHasBeenMerged(intval($pullRequestNumber)); $merged = Bulletin_RepositoryModel::getInstance()->pullRequestHasBeenMerged(intval($pullRequestNumber));
if ($merged == false) { if ($merged == false) {
......
...@@ -137,6 +137,7 @@ class Bulletin_ApprovalActionPullRequestModel extends Requests_ApprovalActionMod ...@@ -137,6 +137,7 @@ class Bulletin_ApprovalActionPullRequestModel extends Requests_ApprovalActionMod
$safeRequestId = intval($requestId); $safeRequestId = intval($requestId);
$safePullRequestNumber = intval($pullRequestNumber); $safePullRequestNumber = intval($pullRequestNumber);
if ($safePullRequestNumber > 0) {
$data = array( $data = array(
'pullRequestNumber' => $safePullRequestNumber 'pullRequestNumber' => $safePullRequestNumber
); );
...@@ -145,5 +146,6 @@ class Bulletin_ApprovalActionPullRequestModel extends Requests_ApprovalActionMod ...@@ -145,5 +146,6 @@ class Bulletin_ApprovalActionPullRequestModel extends Requests_ApprovalActionMod
$db = Zend_Registry::get('db'); $db = Zend_Registry::get('db');
$db->update('creqRequests', $data, $where); $db->update('creqRequests', $data, $where);
} }
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment