From a3d827a7d20ed4f66a127ef766c273648c383e16 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 11 Nov 2016 16:47:44 -0500 Subject: [PATCH] CRM-17335 - Remove unnecessary use of CRM_Core_DAO::$_nullObject --- CRM/Activity/Form/Search.php | 4 ++-- CRM/Campaign/Form/Search.php | 6 ++--- CRM/Campaign/Page/Petition/Confirm.php | 12 +++++----- CRM/Campaign/Selector/Search.php | 2 +- CRM/Case/Form/ActivityToCase.php | 4 ++-- CRM/Case/Form/ActivityView.php | 4 ++-- CRM/Case/Form/CaseView.php | 6 ++--- CRM/Case/Form/Search.php | 2 +- CRM/Case/XMLProcessor/Report.php | 10 ++++---- CRM/Contact/BAO/Group.php | 2 +- CRM/Contact/Form/Contact.php | 2 +- CRM/Contact/Form/Edit/CustomData.php | 4 ++-- CRM/Contact/Form/Location.php | 4 ++-- CRM/Contact/Form/Search.php | 2 +- CRM/Contact/Page/AJAX.php | 28 +++++++++++----------- CRM/Contact/Page/DedupeMerge.php | 2 +- CRM/Contact/Selector.php | 8 +++---- CRM/Contribute/Form/Contribution/Main.php | 2 +- CRM/Contribute/Form/ContributionBase.php | 10 ++++---- CRM/Contribute/Form/Search.php | 2 +- CRM/Contribute/Page/SubscriptionStatus.php | 4 ++-- CRM/Contribute/Selector/Search.php | 8 +++---- CRM/Core/Page/File.php | 2 +- CRM/Core/QuickForm/Action/Display.php | 2 +- CRM/Custom/Form/CustomData.php | 6 ++--- CRM/Event/Form/Search.php | 2 +- CRM/Export/BAO/Export.php | 4 ++-- CRM/Financial/Page/AJAX.php | 4 ++-- CRM/Grant/Form/Search.php | 2 +- CRM/Logging/ReportDetail.php | 16 ++++++------- CRM/Mailing/Page/Browse.php | 6 ++--- CRM/Mailing/Page/Common.php | 6 ++--- CRM/Mailing/Page/Confirm.php | 6 ++--- CRM/Member/Form/Search.php | 2 +- CRM/Pledge/Form/Search.php | 2 +- CRM/Report/Form.php | 4 ++-- CRM/Report/Form/Activity.php | 2 +- CRM/Report/Form/Contribute/TopDonor.php | 2 +- CRM/Utils/Weight.php | 18 +++++++------- extern/widget.php | 8 +++---- 40 files changed, 111 insertions(+), 111 deletions(-) diff --git a/CRM/Activity/Form/Search.php b/CRM/Activity/Form/Search.php index 14d23bdff8..fcb0902331 100644 --- a/CRM/Activity/Form/Search.php +++ b/CRM/Activity/Form/Search.php @@ -84,7 +84,7 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search { // we allow the controller to set force/reset externally, useful when we are being // driven by the wizard framework - $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean', CRM_Core_DAO::$_nullObject); + $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean'); $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE); $this->_limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this); $this->_context = CRM_Utils_Request::retrieve('context', 'String', $this, FALSE, 'search'); @@ -281,7 +281,7 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search { $this->_defaults['activity_status_id'] = $status; } - $survey = CRM_Utils_Request::retrieve('survey', 'Positive', CRM_Core_DAO::$_nullObject); + $survey = CRM_Utils_Request::retrieve('survey', 'Positive'); if ($survey) { $this->_formValues['activity_survey_id'] = $this->_defaults['activity_survey_id'] = $survey; diff --git a/CRM/Campaign/Form/Search.php b/CRM/Campaign/Form/Search.php index 8849404cff..2771ee8c71 100644 --- a/CRM/Campaign/Form/Search.php +++ b/CRM/Campaign/Form/Search.php @@ -82,7 +82,7 @@ class CRM_Campaign_Form_Search extends CRM_Core_Form_Search { $this->_limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this); $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE); $this->_context = CRM_Utils_Request::retrieve('context', 'String', $this, FALSE, 'search'); - $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean', CRM_Core_DAO::$_nullObject); + $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean'); //operation for state machine. $this->_operation = CRM_Utils_Request::retrieve('op', 'String', $this, FALSE, 'reserve'); @@ -393,14 +393,14 @@ class CRM_Campaign_Form_Search extends CRM_Core_Form_Search { // note that this means that GET over-rides POST :) //since we have qfKey, no need to manipulate set defaults. - $qfKey = CRM_Utils_Request::retrieve('qfKey', 'String', CRM_Core_DAO::$_nullObject); + $qfKey = CRM_Utils_Request::retrieve('qfKey', 'String'); if (!$this->_force || CRM_Utils_Rule::qfKey($qfKey)) { return; } // get survey id - $surveyId = CRM_Utils_Request::retrieve('sid', 'Positive', CRM_Core_DAO::$_nullObject); + $surveyId = CRM_Utils_Request::retrieve('sid', 'Positive'); if ($surveyId) { $surveyId = CRM_Utils_Type::escape($surveyId, 'Integer'); diff --git a/CRM/Campaign/Page/Petition/Confirm.php b/CRM/Campaign/Page/Petition/Confirm.php index 1d0fc70ccd..83db2aab1e 100644 --- a/CRM/Campaign/Page/Petition/Confirm.php +++ b/CRM/Campaign/Page/Petition/Confirm.php @@ -38,13 +38,13 @@ class CRM_Campaign_Page_Petition_Confirm extends CRM_Core_Page { public function run() { CRM_Utils_System::addHTMLHead(''); - $contact_id = CRM_Utils_Request::retrieve('cid', 'Integer', CRM_Core_DAO::$_nullObject); - $subscribe_id = CRM_Utils_Request::retrieve('sid', 'Integer', CRM_Core_DAO::$_nullObject); - $hash = CRM_Utils_Request::retrieve('h', 'String', CRM_Core_DAO::$_nullObject); - $activity_id = CRM_Utils_Request::retrieve('a', 'String', CRM_Core_DAO::$_nullObject); - $petition_id = CRM_Utils_Request::retrieve('pid', 'String', CRM_Core_DAO::$_nullObject); + $contact_id = CRM_Utils_Request::retrieve('cid', 'Integer'); + $subscribe_id = CRM_Utils_Request::retrieve('sid', 'Integer'); + $hash = CRM_Utils_Request::retrieve('h', 'String'); + $activity_id = CRM_Utils_Request::retrieve('a', 'String'); + $petition_id = CRM_Utils_Request::retrieve('pid', 'String'); if (!$petition_id) { - $petition_id = CRM_Utils_Request::retrieve('p', 'String', CRM_Core_DAO::$_nullObject); + $petition_id = CRM_Utils_Request::retrieve('p', 'String'); } if (!$contact_id || diff --git a/CRM/Campaign/Selector/Search.php b/CRM/Campaign/Selector/Search.php index 1554344314..20ca76c7a9 100644 --- a/CRM/Campaign/Selector/Search.php +++ b/CRM/Campaign/Selector/Search.php @@ -267,7 +267,7 @@ class CRM_Campaign_Selector_Search extends CRM_Core_Selector_Base implements CRM */ public function buildPrevNextCache($sort) { //for prev/next pagination - $crmPID = CRM_Utils_Request::retrieve('crmPID', 'Integer', CRM_Core_DAO::$_nullObject); + $crmPID = CRM_Utils_Request::retrieve('crmPID', 'Integer'); if (!$crmPID) { $cacheKey = "civicrm search {$this->_key}"; diff --git a/CRM/Case/Form/ActivityToCase.php b/CRM/Case/Form/ActivityToCase.php index fb08fbb560..fc0a6b5b7b 100644 --- a/CRM/Case/Form/ActivityToCase.php +++ b/CRM/Case/Form/ActivityToCase.php @@ -40,12 +40,12 @@ class CRM_Case_Form_ActivityToCase extends CRM_Core_Form { * Build all the data structures needed to build the form. */ public function preProcess() { - $this->_activityId = CRM_Utils_Request::retrieve('activityId', 'Positive', CRM_Core_DAO::$_nullObject); + $this->_activityId = CRM_Utils_Request::retrieve('activityId', 'Positive'); if (!$this->_activityId) { CRM_Core_Error::fatal('required activity id is missing.'); } - $this->_currentCaseId = CRM_Utils_Request::retrieve('caseId', 'Positive', CRM_Core_DAO::$_nullObject); + $this->_currentCaseId = CRM_Utils_Request::retrieve('caseId', 'Positive'); $this->assign('currentCaseId', $this->_currentCaseId); $this->assign('buildCaseActivityForm', TRUE); } diff --git a/CRM/Case/Form/ActivityView.php b/CRM/Case/Form/ActivityView.php index 3aaa8dbb8c..0876a3455f 100644 --- a/CRM/Case/Form/ActivityView.php +++ b/CRM/Case/Form/ActivityView.php @@ -42,8 +42,8 @@ class CRM_Case_Form_ActivityView extends CRM_Core_Form { public function preProcess() { $contactID = CRM_Utils_Request::retrieve('cid', 'Integer', $this, TRUE); $activityID = CRM_Utils_Request::retrieve('aid', 'Integer', $this, TRUE); - $revs = CRM_Utils_Request::retrieve('revs', 'Boolean', CRM_Core_DAO::$_nullObject); - $caseID = CRM_Utils_Request::retrieve('caseID', 'Boolean', CRM_Core_DAO::$_nullObject); + $revs = CRM_Utils_Request::retrieve('revs', 'Boolean'); + $caseID = CRM_Utils_Request::retrieve('caseID', 'Boolean'); $activitySubject = CRM_Core_DAO::getFieldValue('CRM_Activity_DAO_Activity', $activityID, 'subject' diff --git a/CRM/Case/Form/CaseView.php b/CRM/Case/Form/CaseView.php index cc26a40823..2eabfc6e54 100644 --- a/CRM/Case/Form/CaseView.php +++ b/CRM/Case/Form/CaseView.php @@ -56,8 +56,8 @@ class CRM_Case_Form_CaseView extends CRM_Core_Form { if ($this->_showRelatedCases) { $relatedCases = $this->get('relatedCases'); if (!isset($relatedCases)) { - $cId = CRM_Utils_Request::retrieve('cid', 'Integer', CRM_Core_DAO::$_nullObject); - $caseId = CRM_Utils_Request::retrieve('id', 'Integer', CRM_Core_DAO::$_nullObject); + $cId = CRM_Utils_Request::retrieve('cid', 'Integer'); + $caseId = CRM_Utils_Request::retrieve('id', 'Integer'); $relatedCases = CRM_Case_BAO_Case::getRelatedCases($caseId, $cId); } $this->assign('relatedCases', $relatedCases); @@ -77,7 +77,7 @@ class CRM_Case_Form_CaseView extends CRM_Core_Form { CRM_Core_Error::fatal(ts('You are not authorized to access this page.')); } - $fulltext = CRM_Utils_Request::retrieve('context', 'String', CRM_Core_DAO::$_nullObject); + $fulltext = CRM_Utils_Request::retrieve('context', 'String'); if ($fulltext == 'fulltext') { $this->assign('fulltext', $fulltext); } diff --git a/CRM/Case/Form/Search.php b/CRM/Case/Form/Search.php index cf2199f319..124237a4e1 100644 --- a/CRM/Case/Form/Search.php +++ b/CRM/Case/Form/Search.php @@ -94,7 +94,7 @@ class CRM_Case_Form_Search extends CRM_Core_Form_Search { * driven by the wizard framework */ - $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean', CRM_Core_DAO::$_nullObject); + $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean'); $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE); $this->_limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this); $this->_context = CRM_Utils_Request::retrieve('context', 'String', $this, FALSE, 'search'); diff --git a/CRM/Case/XMLProcessor/Report.php b/CRM/Case/XMLProcessor/Report.php index d25141f904..b537bf6c1b 100644 --- a/CRM/Case/XMLProcessor/Report.php +++ b/CRM/Case/XMLProcessor/Report.php @@ -811,11 +811,11 @@ LIMIT 1 } public static function printCaseReport() { - $caseID = CRM_Utils_Request::retrieve('caseID', 'Positive', CRM_Core_DAO::$_nullObject); - $clientID = CRM_Utils_Request::retrieve('cid', 'Positive', CRM_Core_DAO::$_nullObject); - $activitySetName = CRM_Utils_Request::retrieve('asn', 'String', CRM_Core_DAO::$_nullObject); - $isRedact = CRM_Utils_Request::retrieve('redact', 'Boolean', CRM_Core_DAO::$_nullObject); - $includeActivities = CRM_Utils_Request::retrieve('all', 'Positive', CRM_Core_DAO::$_nullObject); + $caseID = CRM_Utils_Request::retrieve('caseID', 'Positive'); + $clientID = CRM_Utils_Request::retrieve('cid', 'Positive'); + $activitySetName = CRM_Utils_Request::retrieve('asn', 'String'); + $isRedact = CRM_Utils_Request::retrieve('redact', 'Boolean'); + $includeActivities = CRM_Utils_Request::retrieve('all', 'Positive'); $params = $otherRelationships = $globalGroupInfo = array(); $report = new CRM_Case_XMLProcessor_Report($isRedact); if ($includeActivities) { diff --git a/CRM/Contact/BAO/Group.php b/CRM/Contact/BAO/Group.php index b92eaae67b..4715fead97 100644 --- a/CRM/Contact/BAO/Group.php +++ b/CRM/Contact/BAO/Group.php @@ -861,7 +861,7 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { ON contact.id = gOrg.organization_id "; //get the Organization ID - $orgID = CRM_Utils_Request::retrieve('oid', 'Positive', CRM_Core_DAO::$_nullObject); + $orgID = CRM_Utils_Request::retrieve('oid', 'Positive'); if ($orgID) { $where = " AND gOrg.organization_id = {$orgID}"; } diff --git a/CRM/Contact/Form/Contact.php b/CRM/Contact/Form/Contact.php index 5c0cf8e01f..f553866df4 100644 --- a/CRM/Contact/Form/Contact.php +++ b/CRM/Contact/Form/Contact.php @@ -374,7 +374,7 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form { $this->assign('paramSubType', $paramSubType); } - if (CRM_Utils_Request::retrieve('type', 'String', CRM_Core_DAO::$_nullObject)) { + if (CRM_Utils_Request::retrieve('type', 'String')) { CRM_Contact_Form_Edit_CustomData::preProcess($this); } else { diff --git a/CRM/Contact/Form/Edit/CustomData.php b/CRM/Contact/Form/Edit/CustomData.php index 2a227e397b..cf862bde71 100644 --- a/CRM/Contact/Form/Edit/CustomData.php +++ b/CRM/Contact/Form/Edit/CustomData.php @@ -42,8 +42,8 @@ class CRM_Contact_Form_Edit_CustomData { * @param CRM_Core_Form $form */ public static function preProcess(&$form) { - $form->_type = CRM_Utils_Request::retrieve('type', 'String', CRM_Core_DAO::$_nullObject); - $form->_subType = CRM_Utils_Request::retrieve('subType', 'String', CRM_Core_DAO::$_nullObject); + $form->_type = CRM_Utils_Request::retrieve('type', 'String'); + $form->_subType = CRM_Utils_Request::retrieve('subType', 'String'); //build the custom data as other blocks. //$form->assign( "addBlock", false ); diff --git a/CRM/Contact/Form/Location.php b/CRM/Contact/Form/Location.php index e28876b3a2..a026b4cfb0 100644 --- a/CRM/Contact/Form/Location.php +++ b/CRM/Contact/Form/Location.php @@ -38,8 +38,8 @@ class CRM_Contact_Form_Location { * @param CRM_Core_Form $form */ public static function preProcess(&$form) { - $form->_addBlockName = CRM_Utils_Request::retrieve('block', 'String', CRM_Core_DAO::$_nullObject); - $additionalblockCount = CRM_Utils_Request::retrieve('count', 'Positive', CRM_Core_DAO::$_nullObject); + $form->_addBlockName = CRM_Utils_Request::retrieve('block', 'String'); + $additionalblockCount = CRM_Utils_Request::retrieve('count', 'Positive'); $form->assign('addBlock', FALSE); if ($form->_addBlockName && $additionalblockCount) { diff --git a/CRM/Contact/Form/Search.php b/CRM/Contact/Form/Search.php index 94fa086ec7..99b362e17d 100644 --- a/CRM/Contact/Form/Search.php +++ b/CRM/Contact/Form/Search.php @@ -762,7 +762,7 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search { $this->_done = TRUE; //for prev/next pagination - $crmPID = CRM_Utils_Request::retrieve('crmPID', 'Integer', CRM_Core_DAO::$_nullObject); + $crmPID = CRM_Utils_Request::retrieve('crmPID', 'Integer'); if (array_key_exists($this->_searchButtonName, $_POST) || ($this->_force && !$crmPID) diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php index 176adaa864..4f7405ef66 100644 --- a/CRM/Contact/Page/AJAX.php +++ b/CRM/Contact/Page/AJAX.php @@ -226,8 +226,8 @@ class CRM_Contact_Page_AJAX { public static function relationship() { $relType = CRM_Utils_Request::retrieve('rel_type', 'String', CRM_Core_DAO::$_nullObject, TRUE); $relContactID = CRM_Utils_Request::retrieve('rel_contact', 'Positive', CRM_Core_DAO::$_nullObject, TRUE); - $originalCid = CRM_Utils_Request::retrieve('cid', 'Positive', CRM_Core_DAO::$_nullObject); - $relationshipID = CRM_Utils_Request::retrieve('rel_id', 'Positive', CRM_Core_DAO::$_nullObject); + $originalCid = CRM_Utils_Request::retrieve('cid', 'Positive'); + $relationshipID = CRM_Utils_Request::retrieve('rel_id', 'Positive'); $caseID = CRM_Utils_Request::retrieve('case_id', 'Positive', CRM_Core_DAO::$_nullObject, TRUE); if (!CRM_Case_BAO_Case::accessCase($caseID)) { @@ -295,7 +295,7 @@ class CRM_Contact_Page_AJAX { CRM_Utils_System::setHttpHeader('Content-Type', 'text/plain'); $customValueID = CRM_Utils_Type::escape($_REQUEST['valueID'], 'Positive'); $customGroupID = CRM_Utils_Type::escape($_REQUEST['groupID'], 'Positive'); - $contactId = CRM_Utils_Request::retrieve('contactId', 'Positive', CRM_Core_DAO::$_nullObject); + $contactId = CRM_Utils_Request::retrieve('contactId', 'Positive'); CRM_Core_BAO_CustomValue::deleteCustomValue($customValueID, $customGroupID); if ($contactId) { echo CRM_Contact_BAO_Contact::getCountComponent('custom_' . $customGroupID, $contactId); @@ -310,8 +310,8 @@ class CRM_Contact_Page_AJAX { */ static public function checkUserName() { $signer = new CRM_Utils_Signer(CRM_Core_Key::privateKey(), array('for', 'ts')); - $sig = CRM_Utils_Request::retrieve('sig', 'String', CRM_Core_DAO::$_nullObject); - $for = CRM_Utils_Request::retrieve('for', 'String', CRM_Core_DAO::$_nullObject); + $sig = CRM_Utils_Request::retrieve('sig', 'String'); + $for = CRM_Utils_Request::retrieve('for', 'String'); if ( CRM_Utils_Time::getTimeRaw() > $_REQUEST['ts'] + self::CHECK_USERNAME_TTL || $for != 'civicrm/ajax/cmsuser' @@ -411,8 +411,8 @@ LIMIT {$offset}, {$rowCount} // send query to hook to be modified if needed CRM_Utils_Hook::contactListQuery($query, $name, - CRM_Utils_Request::retrieve('context', 'String', CRM_Core_DAO::$_nullObject), - CRM_Utils_Request::retrieve('cid', 'Positive', CRM_Core_DAO::$_nullObject) + CRM_Utils_Request::retrieve('context', 'String'), + CRM_Utils_Request::retrieve('cid', 'Positive') ); $dao = CRM_Core_DAO::executeQuery($query); @@ -436,8 +436,8 @@ LIMIT {$offset}, {$rowCount} // send query to hook to be modified if needed CRM_Utils_Hook::contactListQuery($query, $name, - CRM_Utils_Request::retrieve('context', 'String', CRM_Core_DAO::$_nullObject), - CRM_Utils_Request::retrieve('cid', 'Positive', CRM_Core_DAO::$_nullObject) + CRM_Utils_Request::retrieve('context', 'String'), + CRM_Utils_Request::retrieve('cid', 'Positive') ); $dao = CRM_Core_DAO::executeQuery($query); @@ -507,8 +507,8 @@ LIMIT {$offset}, {$rowCount} // send query to hook to be modified if needed CRM_Utils_Hook::contactListQuery($query, $name, - CRM_Utils_Request::retrieve('context', 'String', CRM_Core_DAO::$_nullObject), - CRM_Utils_Request::retrieve('cid', 'Positive', CRM_Core_DAO::$_nullObject) + CRM_Utils_Request::retrieve('context', 'String'), + CRM_Utils_Request::retrieve('cid', 'Positive') ); $dao = CRM_Core_DAO::executeQuery($query); @@ -529,7 +529,7 @@ LIMIT {$offset}, {$rowCount} public static function buildSubTypes() { - $parent = CRM_Utils_Request::retrieve('parentId', 'Positive', CRM_Core_DAO::$_nullObject); + $parent = CRM_Utils_Request::retrieve('parentId', 'Positive'); switch ($parent) { case 1: @@ -551,7 +551,7 @@ LIMIT {$offset}, {$rowCount} } public static function buildDedupeRules() { - $parent = CRM_Utils_Request::retrieve('parentId', 'Positive', CRM_Core_DAO::$_nullObject); + $parent = CRM_Utils_Request::retrieve('parentId', 'Positive'); switch ($parent) { case 1: @@ -987,7 +987,7 @@ LIMIT {$offset}, {$rowCount} } public static function getAddressDisplay() { - $contactId = CRM_Utils_Request::retrieve('contact_id', 'Positive', CRM_Core_DAO::$_nullObject); + $contactId = CRM_Utils_Request::retrieve('contact_id', 'Positive'); if (!$contactId) { $addressVal["error_message"] = "no contact id found"; } diff --git a/CRM/Contact/Page/DedupeMerge.php b/CRM/Contact/Page/DedupeMerge.php index 7968d853e8..e2f0fe7404 100644 --- a/CRM/Contact/Page/DedupeMerge.php +++ b/CRM/Contact/Page/DedupeMerge.php @@ -58,7 +58,7 @@ class CRM_Contact_Page_DedupeMerge extends CRM_Core_Page { $rgid = CRM_Utils_Request::retrieve('rgid', 'Positive'); $gid = CRM_Utils_Request::retrieve('gid', 'Positive'); $limit = CRM_Utils_Request::retrieve('limit', 'Positive'); - $action = CRM_Utils_Request::retrieve('action', 'String', CRM_Core_DAO::$_nullObject); + $action = CRM_Utils_Request::retrieve('action', 'String'); $mode = CRM_Utils_Request::retrieve('mode', 'String', CRM_Core_DAO::$_nullObject, FALSE, 'safe'); $cacheKeyString = CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid); diff --git a/CRM/Contact/Selector.php b/CRM/Contact/Selector.php index 3e36f01d38..6bee1c33ec 100644 --- a/CRM/Contact/Selector.php +++ b/CRM/Contact/Selector.php @@ -178,7 +178,7 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se $contextMenu = NULL ) { //don't build query constructor, if form is not submitted - $force = CRM_Utils_Request::retrieve('force', 'Boolean', CRM_Core_DAO::$_nullObject); + $force = CRM_Utils_Request::retrieve('force', 'Boolean'); if (empty($formValues) && !$force) { return; } @@ -862,10 +862,10 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se // 2. if records are sorted // get current page requested - $pageNum = CRM_Utils_Request::retrieve('crmPID', 'Integer', CRM_Core_DAO::$_nullObject); + $pageNum = CRM_Utils_Request::retrieve('crmPID', 'Integer'); // get the current sort order - $currentSortID = CRM_Utils_Request::retrieve('crmSID', 'String', CRM_Core_DAO::$_nullObject); + $currentSortID = CRM_Utils_Request::retrieve('crmSID', 'String'); $session = CRM_Core_Session::singleton(); @@ -891,7 +891,7 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se $firstRecord = ($pageNum - 1) * $pageSize; //for alphabetic pagination selection save - $sortByCharacter = CRM_Utils_Request::retrieve('sortByCharacter', 'String', CRM_Core_DAO::$_nullObject); + $sortByCharacter = CRM_Utils_Request::retrieve('sortByCharacter', 'String'); //for text field pagination selection save $countRow = CRM_Core_BAO_PrevNextCache::getCount($cacheKey, NULL, "entity_table = 'civicrm_contact'"); diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php index 76cdb22880..981fbfa105 100644 --- a/CRM/Contribute/Form/Contribution/Main.php +++ b/CRM/Contribute/Form/Contribution/Main.php @@ -99,7 +99,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu $this->assign('isShare', CRM_Utils_Array::value('is_share', $this->_values)); $this->assign('isConfirmEnabled', CRM_Utils_Array::value('is_confirm_enabled', $this->_values)); - $this->assign('reset', CRM_Utils_Request::retrieve('reset', 'Boolean', CRM_Core_DAO::$_nullObject)); + $this->assign('reset', CRM_Utils_Request::retrieve('reset', 'Boolean')); $this->assign('mainDisplay', CRM_Utils_Request::retrieve('_qf_Main_display', 'Boolean', CRM_Core_DAO::$_nullObject)); diff --git a/CRM/Contribute/Form/ContributionBase.php b/CRM/Contribute/Form/ContributionBase.php index 51ab36a334..7bbff8c6c1 100644 --- a/CRM/Contribute/Form/ContributionBase.php +++ b/CRM/Contribute/Form/ContributionBase.php @@ -450,7 +450,7 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form { } //do check for cancel recurring and clean db, CRM-7696 - if (CRM_Utils_Request::retrieve('cancel', 'Boolean', CRM_Core_DAO::$_nullObject)) { + if (CRM_Utils_Request::retrieve('cancel', 'Boolean')) { self::cancelRecurring(); } @@ -1004,15 +1004,15 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form { * lets delete the recurring and related contribution. */ public function cancelRecurring() { - $isCancel = CRM_Utils_Request::retrieve('cancel', 'Boolean', CRM_Core_DAO::$_nullObject); + $isCancel = CRM_Utils_Request::retrieve('cancel', 'Boolean'); if ($isCancel) { - $isRecur = CRM_Utils_Request::retrieve('isRecur', 'Boolean', CRM_Core_DAO::$_nullObject); - $recurId = CRM_Utils_Request::retrieve('recurId', 'Positive', CRM_Core_DAO::$_nullObject); + $isRecur = CRM_Utils_Request::retrieve('isRecur', 'Boolean'); + $recurId = CRM_Utils_Request::retrieve('recurId', 'Positive'); //clean db for recurring contribution. if ($isRecur && $recurId) { CRM_Contribute_BAO_ContributionRecur::deleteRecurContribution($recurId); } - $contribId = CRM_Utils_Request::retrieve('contribId', 'Positive', CRM_Core_DAO::$_nullObject); + $contribId = CRM_Utils_Request::retrieve('contribId', 'Positive'); if ($contribId) { CRM_Contribute_BAO_Contribution::deleteContribution($contribId); } diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php index 866c736fd9..1826982d18 100644 --- a/CRM/Contribute/Form/Search.php +++ b/CRM/Contribute/Form/Search.php @@ -80,7 +80,7 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { * driven by the wizard framework */ - $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean', CRM_Core_DAO::$_nullObject); + $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean'); $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE); $this->_limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this); $this->_context = CRM_Utils_Request::retrieve('context', 'String', $this, FALSE, 'search'); diff --git a/CRM/Contribute/Page/SubscriptionStatus.php b/CRM/Contribute/Page/SubscriptionStatus.php index 873ec6928f..8b45d62f50 100644 --- a/CRM/Contribute/Page/SubscriptionStatus.php +++ b/CRM/Contribute/Page/SubscriptionStatus.php @@ -39,8 +39,8 @@ class CRM_Contribute_Page_SubscriptionStatus extends CRM_Core_Page { * @return null */ public function run() { - $task = CRM_Utils_Request::retrieve('task', 'String', CRM_Core_DAO::$_nullObject); - $result = CRM_Utils_Request::retrieve('result', 'Integer', CRM_Core_DAO::$_nullObject); + $task = CRM_Utils_Request::retrieve('task', 'String'); + $result = CRM_Utils_Request::retrieve('result', 'Integer'); $this->assign('task', $task); $this->assign('result', $result); diff --git a/CRM/Contribute/Selector/Search.php b/CRM/Contribute/Selector/Search.php index c799ad09d8..bb032673e3 100644 --- a/CRM/Contribute/Selector/Search.php +++ b/CRM/Contribute/Selector/Search.php @@ -336,10 +336,10 @@ class CRM_Contribute_Selector_Search extends CRM_Core_Selector_Base implements C $componentId = $componentContext = NULL; if ($this->_context != 'contribute') { // @todo explain the significance of context & why we do not get these i that context. - $qfKey = CRM_Utils_Request::retrieve('key', 'String', CRM_Core_DAO::$_nullObject); - $componentId = CRM_Utils_Request::retrieve('id', 'Positive', CRM_Core_DAO::$_nullObject); - $componentAction = CRM_Utils_Request::retrieve('action', 'String', CRM_Core_DAO::$_nullObject); - $componentContext = CRM_Utils_Request::retrieve('compContext', 'String', CRM_Core_DAO::$_nullObject); + $qfKey = CRM_Utils_Request::retrieve('key', 'String'); + $componentId = CRM_Utils_Request::retrieve('id', 'Positive'); + $componentAction = CRM_Utils_Request::retrieve('action', 'String'); + $componentContext = CRM_Utils_Request::retrieve('compContext', 'String'); if (!$componentContext && $this->_compContext diff --git a/CRM/Core/Page/File.php b/CRM/Core/Page/File.php index dc02ce8017..5f15d659a0 100644 --- a/CRM/Core/Page/File.php +++ b/CRM/Core/Page/File.php @@ -60,7 +60,7 @@ class CRM_Core_Page_File extends CRM_Core_Page { } if ($action & CRM_Core_Action::DELETE) { - if (CRM_Utils_Request::retrieve('confirmed', 'Boolean', CRM_Core_DAO::$_nullObject)) { + if (CRM_Utils_Request::retrieve('confirmed', 'Boolean')) { CRM_Core_BAO_File::deleteFileReferences($id, $eid, $fid); CRM_Core_Session::setStatus(ts('The attached file has been deleted.'), ts('Complete'), 'success'); diff --git a/CRM/Core/QuickForm/Action/Display.php b/CRM/Core/QuickForm/Action/Display.php index 88a2c34d14..8f1e93e723 100644 --- a/CRM/Core/QuickForm/Action/Display.php +++ b/CRM/Core/QuickForm/Action/Display.php @@ -111,7 +111,7 @@ class CRM_Core_QuickForm_Action_Display extends CRM_Core_QuickForm_Action { $form = $page->toSmarty(); // Deprecated - use snippet=6 instead of json=1 - $json = CRM_Utils_Request::retrieve('json', 'Boolean', CRM_Core_DAO::$_nullObject); + $json = CRM_Utils_Request::retrieve('json', 'Boolean'); if ($json) { CRM_Utils_JSON::output($form); } diff --git a/CRM/Custom/Form/CustomData.php b/CRM/Custom/Form/CustomData.php index 9692791efc..c3082917c1 100644 --- a/CRM/Custom/Form/CustomData.php +++ b/CRM/Custom/Form/CustomData.php @@ -90,7 +90,7 @@ class CRM_Custom_Form_CustomData { $form->assign('cgCount', $form->_groupCount); //carry qf key, since this form is not inhereting core form. - if ($qfKey = CRM_Utils_Request::retrieve('qfKey', 'String', CRM_Core_DAO::$_nullObject)) { + if ($qfKey = CRM_Utils_Request::retrieve('qfKey', 'String')) { $form->assign('qfKey', $qfKey); } @@ -101,8 +101,8 @@ class CRM_Custom_Form_CustomData { $form->_entityId = CRM_Utils_Request::retrieve('entityID', 'Positive', $form); } - $typeCheck = CRM_Utils_Request::retrieve('type', 'String', CRM_Core_DAO::$_nullObject); - $urlGroupId = CRM_Utils_Request::retrieve('groupID', 'Positive', CRM_Core_DAO::$_nullObject); + $typeCheck = CRM_Utils_Request::retrieve('type', 'String'); + $urlGroupId = CRM_Utils_Request::retrieve('groupID', 'Positive'); if (isset($typeCheck) && $urlGroupId) { $form->_groupID = $urlGroupId; } diff --git a/CRM/Event/Form/Search.php b/CRM/Event/Form/Search.php index bb5d79940d..efa172d63c 100644 --- a/CRM/Event/Form/Search.php +++ b/CRM/Event/Form/Search.php @@ -96,7 +96,7 @@ class CRM_Event_Form_Search extends CRM_Core_Form_Search { * we allow the controller to set force/reset externally, useful when we are being * driven by the wizard framework */ - $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean', CRM_Core_DAO::$_nullObject); + $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean'); $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE); $this->_limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this); $this->_context = CRM_Utils_Request::retrieve('context', 'String', $this, FALSE, 'search'); diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php index 1b2d8de68e..78db170108 100644 --- a/CRM/Export/BAO/Export.php +++ b/CRM/Export/BAO/Export.php @@ -1186,8 +1186,8 @@ INSERT INTO {$componentTable} SELECT distinct gc.contact_id FROM civicrm_group_c * Handle import error file creation. */ public static function invoke() { - $type = CRM_Utils_Request::retrieve('type', 'Positive', CRM_Core_DAO::$_nullObject); - $parserName = CRM_Utils_Request::retrieve('parser', 'String', CRM_Core_DAO::$_nullObject); + $type = CRM_Utils_Request::retrieve('type', 'Positive'); + $parserName = CRM_Utils_Request::retrieve('parser', 'String'); if (empty($parserName) || empty($type)) { return; } diff --git a/CRM/Financial/Page/AJAX.php b/CRM/Financial/Page/AJAX.php index 2980b8b464..c2a1094b07 100644 --- a/CRM/Financial/Page/AJAX.php +++ b/CRM/Financial/Page/AJAX.php @@ -94,7 +94,7 @@ class CRM_Financial_Page_AJAX { if ($_GET['_value'] != 'select') { $financialAccountType = CRM_Financial_BAO_FinancialAccount::getfinancialAccountRelations(TRUE); - $financialAccountId = CRM_Utils_Request::retrieve('_value', 'Positive', CRM_Core_DAO::$_nullObject); + $financialAccountId = CRM_Utils_Request::retrieve('_value', 'Positive'); $financialAccountTypeId = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialAccount', $financialAccountId, 'financial_account_type_id'); } $params['orderColumn'] = 'label'; @@ -145,7 +145,7 @@ class CRM_Financial_Page_AJAX { ) { CRM_Utils_System::civiExit(); } - $productId = CRM_Utils_Request::retrieve('_value', 'Positive', CRM_Core_DAO::$_nullObject); + $productId = CRM_Utils_Request::retrieve('_value', 'Positive'); $elements = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_Product', $productId, 'financial_type_id'); CRM_Utils_JSON::output($elements); } diff --git a/CRM/Grant/Form/Search.php b/CRM/Grant/Form/Search.php index 5e58a6df11..0119f20ff0 100644 --- a/CRM/Grant/Form/Search.php +++ b/CRM/Grant/Form/Search.php @@ -88,7 +88,7 @@ class CRM_Grant_Form_Search extends CRM_Core_Form_Search { * driven by the wizard framework */ - $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean', CRM_Core_DAO::$_nullObject); + $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean'); $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE); $this->_limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this); $this->_context = CRM_Utils_Request::retrieve('context', 'String', $this, FALSE, 'search'); diff --git a/CRM/Logging/ReportDetail.php b/CRM/Logging/ReportDetail.php index afefe3926c..04c90044f4 100644 --- a/CRM/Logging/ReportDetail.php +++ b/CRM/Logging/ReportDetail.php @@ -352,14 +352,14 @@ class CRM_Logging_ReportDetail extends CRM_Report_Form { * Get the properties that might be in the URL. */ protected function parsePropertiesFromUrl() { - $this->log_conn_id = CRM_Utils_Request::retrieve('log_conn_id', 'String', CRM_Core_DAO::$_nullObject); - $this->log_date = CRM_Utils_Request::retrieve('log_date', 'String', CRM_Core_DAO::$_nullObject); - $this->cid = CRM_Utils_Request::retrieve('cid', 'Integer', CRM_Core_DAO::$_nullObject); - $this->raw = CRM_Utils_Request::retrieve('raw', 'Boolean', CRM_Core_DAO::$_nullObject); - - $this->altered_name = CRM_Utils_Request::retrieve('alteredName', 'String', CRM_Core_DAO::$_nullObject); - $this->altered_by = CRM_Utils_Request::retrieve('alteredBy', 'String', CRM_Core_DAO::$_nullObject); - $this->altered_by_id = CRM_Utils_Request::retrieve('alteredById', 'Integer', CRM_Core_DAO::$_nullObject); + $this->log_conn_id = CRM_Utils_Request::retrieve('log_conn_id', 'String'); + $this->log_date = CRM_Utils_Request::retrieve('log_date', 'String'); + $this->cid = CRM_Utils_Request::retrieve('cid', 'Integer'); + $this->raw = CRM_Utils_Request::retrieve('raw', 'Boolean'); + + $this->altered_name = CRM_Utils_Request::retrieve('alteredName', 'String'); + $this->altered_by = CRM_Utils_Request::retrieve('alteredBy', 'String'); + $this->altered_by_id = CRM_Utils_Request::retrieve('alteredById', 'Integer'); } } diff --git a/CRM/Mailing/Page/Browse.php b/CRM/Mailing/Page/Browse.php index 14dc2c1350..a943ddc307 100644 --- a/CRM/Mailing/Page/Browse.php +++ b/CRM/Mailing/Page/Browse.php @@ -255,15 +255,15 @@ class CRM_Mailing_Page_Browse extends CRM_Core_Page { CRM_Utils_System::setTitle(ts('Find Mass SMS')); } - $crmRowCount = CRM_Utils_Request::retrieve('crmRowCount', 'Integer', CRM_Core_DAO::$_nullObject); - $crmPID = CRM_Utils_Request::retrieve('crmPID', 'Integer', CRM_Core_DAO::$_nullObject); + $crmRowCount = CRM_Utils_Request::retrieve('crmRowCount', 'Integer'); + $crmPID = CRM_Utils_Request::retrieve('crmPID', 'Integer'); if ($crmRowCount || $crmPID) { $urlParams .= '&force=1'; $urlParams .= $crmRowCount ? '&crmRowCount=' . $crmRowCount : ''; $urlParams .= $crmPID ? '&crmPID=' . $crmPID : ''; } - $crmSID = CRM_Utils_Request::retrieve('crmSID', 'Integer', CRM_Core_DAO::$_nullObject); + $crmSID = CRM_Utils_Request::retrieve('crmSID', 'Integer'); if ($crmSID) { $urlParams .= '&crmSID=' . $crmSID; } diff --git a/CRM/Mailing/Page/Common.php b/CRM/Mailing/Page/Common.php index 4260ad501d..6057ab7740 100644 --- a/CRM/Mailing/Page/Common.php +++ b/CRM/Mailing/Page/Common.php @@ -42,9 +42,9 @@ class CRM_Mailing_Page_Common extends CRM_Core_Page { * @throws Exception */ public function run() { - $job_id = CRM_Utils_Request::retrieve('jid', 'Integer', CRM_Core_DAO::$_nullObject); - $queue_id = CRM_Utils_Request::retrieve('qid', 'Integer', CRM_Core_DAO::$_nullObject); - $hash = CRM_Utils_Request::retrieve('h', 'String', CRM_Core_DAO::$_nullObject); + $job_id = CRM_Utils_Request::retrieve('jid', 'Integer'); + $queue_id = CRM_Utils_Request::retrieve('qid', 'Integer'); + $hash = CRM_Utils_Request::retrieve('h', 'String'); if (!$job_id || !$queue_id || diff --git a/CRM/Mailing/Page/Confirm.php b/CRM/Mailing/Page/Confirm.php index e0b29749fd..3c21456d95 100644 --- a/CRM/Mailing/Page/Confirm.php +++ b/CRM/Mailing/Page/Confirm.php @@ -38,9 +38,9 @@ class CRM_Mailing_Page_Confirm extends CRM_Core_Page { public function run() { CRM_Utils_System::addHTMLHead(''); - $contact_id = CRM_Utils_Request::retrieve('cid', 'Integer', CRM_Core_DAO::$_nullObject); - $subscribe_id = CRM_Utils_Request::retrieve('sid', 'Integer', CRM_Core_DAO::$_nullObject); - $hash = CRM_Utils_Request::retrieve('h', 'String', CRM_Core_DAO::$_nullObject); + $contact_id = CRM_Utils_Request::retrieve('cid', 'Integer'); + $subscribe_id = CRM_Utils_Request::retrieve('sid', 'Integer'); + $hash = CRM_Utils_Request::retrieve('h', 'String'); if (!$contact_id || !$subscribe_id || diff --git a/CRM/Member/Form/Search.php b/CRM/Member/Form/Search.php index 7e99b2ba13..5388496d40 100644 --- a/CRM/Member/Form/Search.php +++ b/CRM/Member/Form/Search.php @@ -366,7 +366,7 @@ class CRM_Member_Form_Search extends CRM_Core_Form_Search { ); //LCD also allow restrictions to membership owner via GET - $owner = CRM_Utils_Request::retrieve('owner', 'String', CRM_Core_DAO::$_nullObject); + $owner = CRM_Utils_Request::retrieve('owner', 'String'); if ($owner) { $this->_formValues['member_is_primary'] = $this->_defaults['member_is_primary'] = 2; } diff --git a/CRM/Pledge/Form/Search.php b/CRM/Pledge/Form/Search.php index 8f48b5901e..acff6b4f14 100644 --- a/CRM/Pledge/Form/Search.php +++ b/CRM/Pledge/Form/Search.php @@ -76,7 +76,7 @@ class CRM_Pledge_Form_Search extends CRM_Core_Form_Search { // we allow the controller to set force/reset externally, useful when we are being // driven by the wizard framework - $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean', CRM_Core_DAO::$_nullObject); + $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean'); $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE); $this->_limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this); $this->_context = CRM_Utils_Request::retrieve('context', 'String', $this, FALSE, 'search'); diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php index 821394aff4..b757cc6d14 100644 --- a/CRM/Report/Form.php +++ b/CRM/Report/Form.php @@ -538,7 +538,7 @@ class CRM_Report_Form extends CRM_Core_Form { CRM_Core_DAO::$_nullObject ); - $this->_section = CRM_Utils_Request::retrieve('section', 'Integer', CRM_Core_DAO::$_nullObject); + $this->_section = CRM_Utils_Request::retrieve('section', 'Integer'); $this->assign('section', $this->_section); CRM_Core_Region::instance('page-header')->add(array( @@ -3329,7 +3329,7 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND if ($this->addPaging) { $this->_select = str_ireplace('SELECT ', 'SELECT SQL_CALC_FOUND_ROWS ', $this->_select); - $pageId = CRM_Utils_Request::retrieve('crmPID', 'Integer', CRM_Core_DAO::$_nullObject); + $pageId = CRM_Utils_Request::retrieve('crmPID', 'Integer'); // @todo all http vars should be extracted in the preProcess // - not randomly in the class diff --git a/CRM/Report/Form/Activity.php b/CRM/Report/Form/Activity.php index 83c1fb570f..f68b36a6c6 100644 --- a/CRM/Report/Form/Activity.php +++ b/CRM/Report/Form/Activity.php @@ -60,7 +60,7 @@ class CRM_Report_Form_Activity extends CRM_Report_Form { // Lets hide it for now. $this->_exposeContactID = FALSE; // if navigated from count link of activity summary reports. - $this->_resetDateFilter = CRM_Utils_Request::retrieve('resetDateFilter', 'Boolean', CRM_Core_DAO::$_nullObject); + $this->_resetDateFilter = CRM_Utils_Request::retrieve('resetDateFilter', 'Boolean'); $config = CRM_Core_Config::singleton(); $campaignEnabled = in_array("CiviCampaign", $config->enableComponents); diff --git a/CRM/Report/Form/Contribute/TopDonor.php b/CRM/Report/Form/Contribute/TopDonor.php index de4043f00d..ff22f62f1f 100644 --- a/CRM/Report/Form/Contribute/TopDonor.php +++ b/CRM/Report/Form/Contribute/TopDonor.php @@ -464,7 +464,7 @@ ORDER BY civicrm_contribution_total_amount_sum DESC if ($this->_outputMode == 'html' || $this->_outputMode == 'group') { // Replace only first occurrence of SELECT. $this->_select = preg_replace('/SELECT/', 'SELECT SQL_CALC_FOUND_ROWS ', $this->_select, 1); - $pageId = CRM_Utils_Request::retrieve('crmPID', 'Integer', CRM_Core_DAO::$_nullObject); + $pageId = CRM_Utils_Request::retrieve('crmPID', 'Integer'); if (!$pageId && !empty($_POST) && isset($_POST['crmPID_B'])) { if (!isset($_POST['PagerBottomButton'])) { diff --git a/CRM/Utils/Weight.php b/CRM/Utils/Weight.php index 8da6d84a15..d3a8641333 100644 --- a/CRM/Utils/Weight.php +++ b/CRM/Utils/Weight.php @@ -434,7 +434,7 @@ class CRM_Utils_Weight { } public static function fixOrder() { - $signature = CRM_Utils_Request::retrieve('_sgn', 'String', CRM_Core_DAO::$_nullObject); + $signature = CRM_Utils_Request::retrieve('_sgn', 'String'); $signer = new CRM_Utils_Signer(CRM_Core_Key::privateKey(), self::$SIGNABLE_FIELDS); // Validate $_GET values b/c subsequent code reads $_GET (via CRM_Utils_Request::retrieve) @@ -443,14 +443,14 @@ class CRM_Utils_Weight { } // Note: Ensure this list matches self::$SIGNABLE_FIELDS - $daoName = CRM_Utils_Request::retrieve('dao', 'String', CRM_Core_DAO::$_nullObject); - $id = CRM_Utils_Request::retrieve('id', 'Integer', CRM_Core_DAO::$_nullObject); - $idName = CRM_Utils_Request::retrieve('idName', 'String', CRM_Core_DAO::$_nullObject); - $url = CRM_Utils_Request::retrieve('url', 'String', CRM_Core_DAO::$_nullObject); - $filter = CRM_Utils_Request::retrieve('filter', 'String', CRM_Core_DAO::$_nullObject); - $src = CRM_Utils_Request::retrieve('src', 'Integer', CRM_Core_DAO::$_nullObject); - $dst = CRM_Utils_Request::retrieve('dst', 'Integer', CRM_Core_DAO::$_nullObject); - $dir = CRM_Utils_Request::retrieve('dir', 'String', CRM_Core_DAO::$_nullObject); + $daoName = CRM_Utils_Request::retrieve('dao', 'String'); + $id = CRM_Utils_Request::retrieve('id', 'Integer'); + $idName = CRM_Utils_Request::retrieve('idName', 'String'); + $url = CRM_Utils_Request::retrieve('url', 'String'); + $filter = CRM_Utils_Request::retrieve('filter', 'String'); + $src = CRM_Utils_Request::retrieve('src', 'Integer'); + $dst = CRM_Utils_Request::retrieve('dst', 'Integer'); + $dir = CRM_Utils_Request::retrieve('dir', 'String'); $object = new $daoName(); $srcWeight = CRM_Core_DAO::getFieldValue($daoName, $src, 'weight', $idName); $dstWeight = CRM_Core_DAO::getFieldValue($daoName, $dst, 'weight', $idName); diff --git a/extern/widget.php b/extern/widget.php index 8b789bede1..2f6621f097 100644 --- a/extern/widget.php +++ b/extern/widget.php @@ -38,10 +38,10 @@ $config = CRM_Core_Config::singleton(); $template = CRM_Core_Smarty::singleton(); require_once 'CRM/Utils/Request.php'; -$cpageId = CRM_Utils_Request::retrieve('cpageId', 'Positive', CRM_Core_DAO::$_nullObject); -$widgetId = CRM_Utils_Request::retrieve('widgetId', 'Positive', CRM_Core_DAO::$_nullObject); -$format = CRM_Utils_Request::retrieve('format', 'Positive', CRM_Core_DAO::$_nullObject); -$includePending = CRM_Utils_Request::retrieve('includePending', 'Boolean', CRM_Core_DAO::$_nullObject); +$cpageId = CRM_Utils_Request::retrieve('cpageId', 'Positive'); +$widgetId = CRM_Utils_Request::retrieve('widgetId', 'Positive'); +$format = CRM_Utils_Request::retrieve('format', 'Positive'); +$includePending = CRM_Utils_Request::retrieve('includePending', 'Boolean'); require_once 'CRM/Contribute/BAO/Widget.php'; -- 2.25.1