X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCampaign%2FBAO%2FPetition.php;h=30136a430ec9fa4e661e4ab8ce088cee26f1081d;hb=408b79bf693050c99d4e441bbf5f55d147ed26db;hp=b3f6dd51d682a4b11ac2799f427f94579a348ee2;hpb=a335f6b228626e3e1b2f1549c8ddcbb9232b3c6b;p=civicrm-core.git diff --git a/CRM/Campaign/BAO/Petition.php b/CRM/Campaign/BAO/Petition.php index b3f6dd51d6..30136a430e 100644 --- a/CRM/Campaign/BAO/Petition.php +++ b/CRM/Campaign/BAO/Petition.php @@ -1,7 +1,7 @@ cookieExpire = (1 * 60 * 60 * 24); @@ -45,9 +44,8 @@ class CRM_Campaign_BAO_Petition extends CRM_Campaign_BAO_Survey { /** * Get Petition Details for dashboard. * - * @static */ - static function getPetitionSummary($params = array(), $onlyCount = FALSE) { + public static function getPetitionSummary($params = array(), $onlyCount = FALSE) { //build the limit and order clause. $limitClause = $orderByClause = $lookupTableJoins = NULL; if (!$onlyCount) { @@ -155,9 +153,8 @@ SELECT petition.id as id, /** * Get the petition count. * - * @static */ - static function getPetitionCount() { + public static function getPetitionCount() { $whereClause = 'WHERE ( 1 )'; $queryParams = array(); $petitionTypeID = CRM_Core_OptionGroup::getValue('activity_type', 'petition', 'name'); @@ -173,13 +170,12 @@ SELECT petition.id as id, /** * Takes an associative array and creates a petition signature activity * - * @param array $params (reference ) an assoc array of name/value pairs + * @param array $params + * (reference ) an assoc array of name/value pairs. * * @return CRM_Campaign_BAO_Petition - * @access public - * @static */ - function createSignature(&$params) { + public function createSignature(&$params) { if (empty($params)) { return; } @@ -235,7 +231,7 @@ SELECT petition.id as id, * * @return bool */ - function confirmSignature($activity_id, $contact_id, $petition_id) { + public function confirmSignature($activity_id, $contact_id, $petition_id) { // change activity status to completed (status_id = 2) // I wonder why do we need contact_id when we have activity_id anyway? [chastell] $sql = 'UPDATE civicrm_activity SET status_id = 2 WHERE id = %1'; @@ -244,7 +240,7 @@ SELECT petition.id as id, $params = array( 1 => array($activity_id, 'Integer'), 2 => array($contact_id, 'Integer'), - 3 => array($sourceID, 'Integer') + 3 => array($sourceID, 'Integer'), ); CRM_Core_DAO::executeQuery($sql, $params); @@ -284,9 +280,8 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )"; * @param int $surveyId * * @return array - * @static */ - static function getPetitionSignatureTotalbyCountry($surveyId) { + public static function getPetitionSignatureTotalbyCountry($surveyId) { $countries = array(); $sql = " SELECT count(civicrm_address.country_id) as total, @@ -305,7 +300,7 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )"; $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); $params = array( 1 => array($surveyId, 'Integer'), - 2 => array($sourceID, 'Integer') + 2 => array($sourceID, 'Integer'), ); $sql .= " GROUP BY civicrm_address.country_id"; $fields = array('total', 'country_id', 'country_iso', 'country'); @@ -327,9 +322,8 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )"; * @param int $surveyId * * @return array - * @static */ - static function getPetitionSignatureTotal($surveyId) { + public static function getPetitionSignatureTotal($surveyId) { $surveyInfo = CRM_Campaign_BAO_Petition::getSurveyInfo((int) $surveyId); //$activityTypeID = $surveyInfo['activity_type_id']; $sql = " @@ -389,9 +383,8 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )"; * @param int $status_id * * @return array - * @static */ - static function getPetitionSignature($surveyId, $status_id = NULL) { + public static function getPetitionSignature($surveyId, $status_id = NULL) { // sql injection protection $surveyId = (int) $surveyId; @@ -463,12 +456,13 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )"; /** * This function returns all entities assigned to a specific tag * - * @param object $tag an object of a tag. + * @param object $tag + * An object of a tag. * - * @return array $contactIds array of contact ids - * @access public + * @return array + * array of contact ids */ - function getEntitiesByTag($tag) { + public function getEntitiesByTag($tag) { $contactIds = array(); $entityTagDAO = new CRM_Core_DAO_EntityTag(); $entityTagDAO->tag_id = $tag['id']; @@ -487,9 +481,8 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )"; * @param int $contactId * * @return array - * @static */ - static function checkSignature($surveyId, $contactId) { + public static function checkSignature($surveyId, $contactId) { $surveyInfo = CRM_Campaign_BAO_Petition::getSurveyInfo($surveyId); $signature = array(); @@ -515,7 +508,7 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )"; 2 => array($surveyId, 'Integer'), 3 => array($surveyInfo['activity_type_id'], 'Integer'), 4 => array($contactId, 'Integer'), - 5 => array($sourceID, 'Integer') + 5 => array($sourceID, 'Integer'), ); $dao = CRM_Core_DAO::executeQuery($sql, $params); @@ -536,14 +529,13 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )"; /** * Takes an associative array and sends a thank you or email verification email * - * @param array $params (reference ) an assoc array of name/value pairs + * @param array $params + * (reference ) an assoc array of name/value pairs. * * @param $sendEmailMode * * @throws Exception * @return void - @access public - * @static */ public static function sendEmail($params, $sendEmailMode) { @@ -683,4 +675,3 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )"; } } } -