X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FMailing%2FSelector%2FBrowse.php;h=3189ce9956ce49e50cacf28a1e1010d2bc8c11ed;hb=95d8ddc04c08360567c00283822622fb8bcb0b35;hp=0a7f46b30cde78aacf7998c13417ce6791ae518d;hpb=00be918220e9ac8f6d25d12ed3c9c49fddd07ff7;p=civicrm-core.git diff --git a/CRM/Mailing/Selector/Browse.php b/CRM/Mailing/Selector/Browse.php index 0a7f46b30c..3189ce9956 100644 --- a/CRM/Mailing/Selector/Browse.php +++ b/CRM/Mailing/Selector/Browse.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * @@ -42,7 +42,6 @@ class CRM_Mailing_Selector_Browse extends CRM_Core_Selector_Base implements CRM_ * Array of supported links, currenly null * * @var array - * @static */ static $_links = NULL; @@ -50,7 +49,6 @@ class CRM_Mailing_Selector_Browse extends CRM_Core_Selector_Base implements CRM_ * We use desc to remind us what that column is, name is used in the tpl * * @var array - * @static */ static $_columnHeaders; @@ -61,7 +59,6 @@ class CRM_Mailing_Selector_Browse extends CRM_Core_Selector_Base implements CRM_ * * * @return \CRM_Mailing_Selector_Browse - @access public */ public function __construct() { } @@ -70,8 +67,6 @@ class CRM_Mailing_Selector_Browse extends CRM_Core_Selector_Base implements CRM_ * This method returns the links that are given for each search row. * * @return array - * @access public - * */ public static function &links() { return self::$_links; @@ -82,8 +77,6 @@ class CRM_Mailing_Selector_Browse extends CRM_Core_Selector_Base implements CRM_ * * @param $action * @param array $params - * - * @access public */ public function getPagerParams($action, &$params) { $params['csvString'] = NULL; @@ -97,11 +90,13 @@ class CRM_Mailing_Selector_Browse extends CRM_Core_Selector_Base implements CRM_ * Returns the column headers as an array of tuples: * (name, sortName (key to the sort array)) * - * @param string $action the action being performed - * @param enum $output what should the result set include (web/email/csv) + * @param string $action + * The action being performed. + * @param string $output + * What should the result set include (web/email/csv). * - * @return array the column headers that need to be displayed - * @access public + * @return array + * the column headers that need to be displayed */ public function &getColumnHeaders($action = NULL, $output = NULL) { $mailing = CRM_Mailing_BAO_Mailing::getTableName(); @@ -167,7 +162,8 @@ class CRM_Mailing_Selector_Browse extends CRM_Core_Selector_Base implements CRM_ ); if (CRM_Campaign_BAO_Campaign::isCampaignEnable()) { - self::$_columnHeaders[] = array('name' => ts('Campaign'), + self::$_columnHeaders[] = array( + 'name' => ts('Campaign'), 'sort' => 'campaign_id', 'direction' => CRM_Utils_Sort::DONTCARE, ); @@ -185,12 +181,12 @@ class CRM_Mailing_Selector_Browse extends CRM_Core_Selector_Base implements CRM_ * * @param * - * @return int Total number of rows - * @access public + * @return int + * Total number of rows */ public function getTotalCount($action) { - $job = CRM_Mailing_BAO_MailingJob::getTableName(); - $mailing = CRM_Mailing_BAO_Mailing::getTableName(); + $job = CRM_Mailing_BAO_MailingJob::getTableName(); + $mailing = CRM_Mailing_BAO_Mailing::getTableName(); $mailingACL = CRM_Mailing_BAO_Mailing::mailingACL(); //get the where clause. @@ -212,19 +208,25 @@ LEFT JOIN civicrm_contact scheduledContact ON ( $mailing.scheduled_id = schedul /** * Returns all the rows in the given offset and rowCount * - * @param enum $action the action being performed - * @param int $offset the row number to start from - * @param int $rowCount the number of rows to return - * @param string $sort the sql string that describes the sort order - * @param enum $output what should the result set include (web/email/csv) + * @param string $action + * The action being performed. + * @param int $offset + * The row number to start from. + * @param int $rowCount + * The number of rows to return. + * @param string $sort + * The sql string that describes the sort order. + * @param string $output + * What should the result set include (web/email/csv). * - * @return int the total number of rows for this action + * @return int + * the total number of rows for this action */ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) { static $actionLinks = NULL; if (empty($actionLinks)) { - $cancelExtra = ts('Are you sure you want to cancel this mailing?'); - $deleteExtra = ts('Are you sure you want to delete this mailing?'); + $cancelExtra = ts('Are you sure you want to cancel this mailing?'); + $deleteExtra = ts('Are you sure you want to delete this mailing?'); $archiveExtra = ts('Are you sure you want to archive this mailing?'); $actionLinks = array( @@ -356,7 +358,10 @@ LEFT JOIN civicrm_contact scheduledContact ON ( $mailing.scheduled_id = schedul } } if (in_array($row['status'], array( - 'Scheduled', 'Running', 'Paused'))) { + 'Scheduled', + 'Running', + 'Paused', + ))) { if ($allAccess || ($showApprovalLinks && $showCreateLinks && $showScheduleLinks) ) { @@ -373,7 +378,8 @@ LEFT JOIN civicrm_contact scheduledContact ON ( $mailing.scheduled_id = schedul } if (in_array($row['status'], array('Complete', 'Canceled')) && - !$row['archived']) { + !$row['archived'] + ) { if ($allAccess || $showCreateLinks) { $actionMask |= CRM_Core_Action::RENEW; } @@ -417,9 +423,11 @@ LEFT JOIN civicrm_contact scheduledContact ON ( $mailing.scheduled_id = schedul /** * Name of export file. * - * @param string $output type of output + * @param string $output + * Type of output. * - * @return string name of the file + * @return string + * name of the file */ public function getExportFileName($output = 'csv') { return ts('CiviMail Mailings'); @@ -440,7 +448,7 @@ LEFT JOIN civicrm_contact scheduledContact ON ( $mailing.scheduled_id = schedul */ public function whereClause(&$params, $sortBy = TRUE) { $values = $clauses = array(); - $isFormSubmitted = $this->_parent->get('hidden_find_mailings'); + $isFormSubmitted = $this->_parent->get('hidden_find_mailings'); $title = $this->_parent->get('mailing_name'); if ($title) { @@ -475,7 +483,7 @@ LEFT JOIN civicrm_contact scheduledContact ON ( $mailing.scheduled_id = schedul $dateClause1[] = 'civicrm_mailing_job.start_date <= %3'; $dateClause2[] = 'civicrm_mailing_job.scheduled_date <= %3'; } - $params[3] = array($to, 'String'); + $params[3] = array($to, 'String'); } $dateClauses = array(); @@ -498,8 +506,8 @@ LEFT JOIN civicrm_contact scheduledContact ON ( $mailing.scheduled_id = schedul } // get values submitted by form - $isDraft = $this->_parent->get('status_unscheduled'); - $isArchived = $this->_parent->get('is_archived'); + $isDraft = $this->_parent->get('status_unscheduled'); + $isArchived = $this->_parent->get('is_archived'); $mailingStatus = $this->_parent->get('mailing_status'); if (!$isFormSubmitted && $this->_parent->get('scheduled')) { @@ -530,7 +538,8 @@ LEFT JOIN civicrm_contact scheduledContact ON ( $mailing.scheduled_id = schedul if (isset($isArchived)) { if ($isArchived) { $clauses[] = "civicrm_mailing.is_archived = 1"; - } else { + } + else { $clauses[] = "(civicrm_mailing.is_archived IS NULL OR civicrm_mailing.is_archived = 0)"; } } @@ -599,5 +608,5 @@ ORDER BY LEFT(name, 1) $aToZBar = CRM_Utils_PagerAToZ::getAToZBar($dao, $this->_parent->_sortByCharacter, TRUE); $this->_parent->assign('aToZ', $aToZBar); } -} +}