Merge pull request #6454 from eileenmcnaughton/master

[civicrm-core.git] / CRM / Member / Task.php

diff --git a/CRM/Member/Task.php b/CRM/Member/Task.php
index 5763e7813bf6084fd3a8e0946a391e58af80bfa6..19bc954e984f9480896a203bec37af38ba9e8992 100644 (file)
--- a/CRM/Member/Task.php
+++ b/CRM/Member/Task.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,12 +23,12 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -40,13 +40,12 @@
  *
  */
 class CRM_Member_Task {
-  CONST DELETE_MEMBERS = 1, PRINT_MEMBERS = 2, EXPORT_MEMBERS = 3, EMAIL_CONTACTS = 4, BATCH_MEMBERS = 5;
+  const DELETE_MEMBERS = 1, PRINT_MEMBERS = 2, EXPORT_MEMBERS = 3, EMAIL_CONTACTS = 4, BATCH_MEMBERS = 5;
 
   /**
    * The task array
    *
    * @var array
-   * @static
    */
   static $_tasks = NULL;
 
@@ -54,7 +53,6 @@ class CRM_Member_Task {
    * The optional task array
    *
    * @var array
-   * @static
    */
   static $_optionalTasks = NULL;
 
@@ -62,11 +60,10 @@ class CRM_Member_Task {
    * These tasks are the core set of tasks that the user can perform
    * on a contact / group of contacts
    *
-   * @return array the set of tasks for a group of contacts
-   * @static
-   * @access public
+   * @return array
+   *   the set of tasks for a group of contacts
    */
-  static function &tasks() {
+  public static function &tasks() {
     if (!(self::$_tasks)) {
       self::$_tasks = array(
         1 => array(
@@ -119,7 +116,7 @@ class CRM_Member_Task {
         unset(self::$_tasks[1]);
       }
       //CRM-12920 - check for edit permission
-      if( !CRM_Core_Permission::check('edit memberships') ){
+      if (!CRM_Core_Permission::check('edit memberships')) {
         unset(self::$_tasks[5]);
       }
     }
@@ -132,11 +129,10 @@ class CRM_Member_Task {
    * These tasks are the core set of task titles
    * on members
    *
-   * @return array the set of task titles
-   * @static
-   * @access public
+   * @return array
+   *   the set of task titles
    */
-  static function &taskTitles() {
+  public static function &taskTitles() {
     self::tasks();
     $titles = array();
     foreach (self::$_tasks as $id => $value) {
@@ -151,10 +147,10 @@ class CRM_Member_Task {
    *
    * @param int $permission
    *
-   * @return array set of tasks that are valid for the user
-   * @access public
+   * @return array
+   *   set of tasks that are valid for the user
    */
-  static function &permissionedTaskTitles($permission) {
+  public static function &permissionedTaskTitles($permission) {
     $tasks = array();
     if (($permission == CRM_Core_Permission::EDIT)
       || CRM_Core_Permission::check('edit memberships')
@@ -180,11 +176,10 @@ class CRM_Member_Task {
    *
    * @param int $value
    *
-   * @return array the set of tasks for a group of members
-   * @static
-   * @access public
+   * @return array
+   *   the set of tasks for a group of members
    */
-  static function getTask($value) {
+  public static function getTask($value) {
     self::tasks();
     if (!$value || !CRM_Utils_Array::value($value, self::$_tasks)) {
       // make the print task by default
@@ -195,5 +190,5 @@ class CRM_Member_Task {
       self::$_tasks[$value]['result'],
     );
   }
-}
 
+}