X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FMailing%2FPseudoConstant.php;h=d38864c95b873288b0152ac432d79582aa4663c8;hb=5552f12522cb2481ce8f8ccf028148084367237f;hp=5e92f7f63907b4f07524228c051905347c58f812;hpb=fc39f196c427ec3f13f2a240967bd36f426e9609;p=civicrm-core.git

diff --git a/CRM/Mailing/PseudoConstant.php b/CRM/Mailing/PseudoConstant.php
index 5e92f7f639..d38864c95b 100644
--- a/CRM/Mailing/PseudoConstant.php
+++ b/CRM/Mailing/PseudoConstant.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -40,39 +40,36 @@
 class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant {
 
   /**
-   * mailing templates
+   * Mailing templates
    * @var array
-   * @static
    */
   private static $template;
 
   /**
-   * completed mailings
+   * Completed mailings
    * @var array
-   * @static
    */
   private static $completed;
 
   /**
-   * mailing components
+   * Mailing components
    * @var array
-   * @static
    */
   private static $component;
 
   /**
-   * default component id's, indexed by component type
+   * Default component id's, indexed by component type
    */
   private static $defaultComponent;
 
   /**
    * Get all the mailing components of a particular type
    *
-   * @param $type the type of component needed
-   * @access public
+   * @param $type
+   *   The type of component needed.
    *
-   * @return array - array reference of all mailing components
-   * @static
+   * @return array
+   *   array reference of all mailing components
    */
   public static function &component($type = NULL) {
     $name = $type ? $type : 'ALL';
@@ -89,7 +86,6 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant {
         // we need to add an additional filter for $type
         self::$component[$name] = array();
 
-
         $object = new CRM_Mailing_DAO_Component();
         $object->component_type = $type;
         $object->selectAdd();
@@ -108,12 +104,13 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant {
   /**
    * Determine the default mailing component of a given type
    *
-   * @param $type the type of component needed
-   * @param $undefined the value to use if no default is defined
-   * @access public
+   * @param $type
+   *   The type of component needed.
+   * @param $undefined
+   *   The value to use if no default is defined.
    *
-   * @return integer -The ID of the default mailing component.
-   * @static
+   * @return int
+   *   The ID of the default mailing component.
    */
   public static function &defaultComponent($type, $undefined = NULL) {
     if (!self::$defaultComponent) {
@@ -137,10 +134,9 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant {
   /**
    * Get all the mailing templates
    *
-   * @access public
    *
-   * @return array - array reference of all mailing templates if any
-   * @static
+   * @return array
+   *   array reference of all mailing templates if any
    */
   public static function &template() {
     if (!self::$template) {
@@ -152,12 +148,11 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant {
   /**
    * Get all the completed mailing
    *
-   * @access public
    *
    * @param null $mode
    *
-   * @return array - array reference of all mailing templates if any
-   * @static
+   * @return array
+   *   array reference of all mailing templates if any
    */
   public static function &completed($mode = NULL) {
     if (!self::$completed) {
@@ -187,19 +182,24 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant {
     if (!$options) {
       $options = array(
         'bounce' => array(
-          'N' => ts('Successful '), 'Y' => ts('Bounced '),
+          'N' => ts('Successful '),
+          'Y' => ts('Bounced '),
         ),
         'delivered' => array(
-          'Y' => ts('Successful '), 'N' => ts('Bounced '),
+          'Y' => ts('Successful '),
+          'N' => ts('Bounced '),
         ),
         'open' => array(
-          'Y' => ts('Opened '), 'N' => ts('Unopened/Hidden '),
+          'Y' => ts('Opened '),
+          'N' => ts('Unopened/Hidden '),
         ),
         'click' => array(
-          'Y' => ts('Clicked '), 'N' => ts('Not Clicked '),
+          'Y' => ts('Clicked '),
+          'N' => ts('Not Clicked '),
         ),
         'reply' => array(
-          'Y' => ts('Replied '), 'N' => ts('No Reply '),
+          'Y' => ts('Replied '),
+          'N' => ts('No Reply '),
         ),
       );
     }
@@ -210,15 +210,12 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant {
    * Flush given pseudoconstant so it can be reread from db
    * next time it's requested.
    *
-   * @access public
-   * @static
    *
    * @param bool|string $name pseudoconstant to be flushed
    */
   public static function flush($name = 'template') {
-   if (isset(self::$$name)) {
+    if (isset(self::$$name)) {
       self::$$name = NULL;
     }
   }
 }
-