Merge pull request #4836 from colemanw/edit

[civicrm-core.git] / CRM / Contact / Selector / Custom.php

diff --git a/CRM/Contact/Selector/Custom.php b/CRM/Contact/Selector/Custom.php
index afaa3f82e9e8bdc7406fc0447b13a88f2e0a82de..15fe2948022049ca040b14323a3fb9f38bd1460d 100644 (file)
--- a/CRM/Contact/Selector/Custom.php
+++ b/CRM/Contact/Selector/Custom.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -69,7 +69,6 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
    * the HTML_QuickForm_Controller for that page.
    *
    * @var array
-   * @access protected
    */
   public $_formValues;
 
@@ -77,7 +76,6 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
    * Params is the array in a value used by the search query creator
    *
    * @var array
-   * @access protected
    */
   public $_params;
 
@@ -85,7 +83,6 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
    * Represent the type of selector
    *
    * @var int
-   * @access protected
    */
   protected $_action;
 
@@ -95,7 +92,6 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
    * The public visible fields to be shown to the user
    *
    * @var array
-   * @access protected
    */
   protected $_fields;
 
@@ -166,10 +162,9 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
    * - Edit
    *
    * @return array
-   * @access public
    *
    */
-  static function &links() {
+  public static function &links() {
     list($key) = func_get_args();
     $searchContext = "&context=custom";
     $extraParams = ($key) ? "&key={$key}" : NULL;
@@ -212,9 +207,8 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
    * @param $action
    * @param array $params
    *
-   * @access public
    */
-  function getPagerParams($action, &$params) {
+  public function getPagerParams($action, &$params) {
     $params['status']    = ts('Contact %%StatusMessage%%');
     $params['csvString'] = NULL;
     $params['rowCount']  = CRM_Utils_Pager::ROWCOUNT;
@@ -231,9 +225,8 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
    * @param enum   $output what should the result set include (web/email/csv)
    *
    * @return array the column headers that need to be displayed
-   * @access public
    */
-  function &getColumnHeaders($action = NULL, $output = NULL) {
+  public function &getColumnHeaders($action = NULL, $output = NULL) {
     $columns = $this->_search->columns();
     if ($output == CRM_Core_Selector_Controller::EXPORT) {
       return array_keys($columns);
@@ -262,9 +255,8 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
    * @param
    *
    * @return int Total number of rows
-   * @access public
    */
-  function getTotalCount($action) {
+  public function getTotalCount($action) {
     return $this->_search->count();
   }
 
@@ -279,7 +271,7 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
    *
    * @return int   the total number of rows for this action
    */
-  function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
+  public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
 
     $includeContactIDs = FALSE;
     if (($output == CRM_Core_Selector_Controller::EXPORT ||
@@ -380,7 +372,6 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
      reference)   $formValues   submitted formValues
    *
    * @return array              $qill         which contains an array of strings
-   * @access public
    */
   public function getQILL() {
     return NULL;
@@ -400,14 +391,14 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
    *
    * @return string name of the file
    */
-  function getExportFileName($output = 'csv') {
+  public function getExportFileName($output = 'csv') {
     return ts('CiviCRM Custom Search');
   }
 
   /**
    * @return null
    */
-  function alphabetQuery() {
+  public function alphabetQuery() {
     return NULL;
   }
 
@@ -420,7 +411,7 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
    *
    * @return Object
    */
-  function &contactIDQuery($params, $action, $sortID, $displayRelationshipType = NULL, $queryOperator = 'AND') {
+  public function &contactIDQuery($params, $action, $sortID, $displayRelationshipType = NULL, $queryOperator = 'AND') {
     $params = array();
     $sql = $this->_search->contactIDs($params);
 
@@ -430,7 +421,7 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
   /**
    * @param $rows
    */
-  function addActions(&$rows) {
+  public function addActions(&$rows) {
     $links = self::links($this->_key);
 
     $permissions = array(CRM_Core_Permission::getPermission());
@@ -455,10 +446,9 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
   /**
    * @param $rows
    */
-  function removeActions(&$rows) {
+  public function removeActions(&$rows) {
     foreach ($rows as $rid => & $rValue) {
       unset($rValue['action']);
     }
   }
 }
-