X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FMail%2FIncoming.php;h=26e3ce1cc5627729b189a5dbc701d929070e1099;hb=7da04cdea71382ff22ffd94e9b3ae9915c25422b;hp=ed58956bc9c7c524d1e10937b04402ad84b2f8ce;hpb=d10b2c65fedfc3bac77085a1639acc2188de2926;p=civicrm-core.git

diff --git a/CRM/Utils/Mail/Incoming.php b/CRM/Utils/Mail/Incoming.php
index ed58956bc9..26e3ce1cc5 100644
--- a/CRM/Utils/Mail/Incoming.php
+++ b/CRM/Utils/Mail/Incoming.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -33,7 +33,7 @@
  *
  */
 class CRM_Utils_Mail_Incoming {
-  CONST
+  const
     EMAILPROCESSOR_CREATE_INDIVIDUAL = 1,
     EMAILPROCESSOR_OVERRIDE = 2,
     EMAILPROCESSOR_IGNORE = 3;
@@ -64,7 +64,7 @@ class CRM_Utils_Mail_Incoming {
    *
    * @throws Exception
    */
-  function formatMailPart($part, &$attachments) {
+  public static function formatMailPart($part, &$attachments) {
     if ($part instanceof ezcMail) {
       return self::formatMail($part, $attachments);
     }
@@ -203,7 +203,7 @@ class CRM_Utils_Mail_Incoming {
    *
    * @return string
    */
-  function formatMailText($part, &$attachments) {
+  public static function formatMailText($part, &$attachments) {
     $t = "\n{$part->text}\n";
     return $t;
   }
@@ -310,7 +310,7 @@ class CRM_Utils_Mail_Incoming {
    *
    * @return array
    */
-  function parseMailingObject(&$mail) {
+  public static function parseMailingObject(&$mail) {
 
     $config = CRM_Core_Config::singleton();
 
@@ -370,11 +370,11 @@ class CRM_Utils_Mail_Incoming {
 
   /**
    * @param $address
-   * @param $params
+   * @param array $params
    * @param $subParam
    * @param $mail
    */
-  function parseAddress(&$address, &$params, &$subParam, &$mail) {
+  public static function parseAddress(&$address, &$params, &$subParam, &$mail) {
     // CRM-9484
     if (empty($address->email)) {
       return;
@@ -395,10 +395,10 @@ class CRM_Utils_Mail_Incoming {
   /**
    * @param $addresses
    * @param $token
-   * @param $params
+   * @param array $params
    * @param $mail
    */
-  function parseAddresses(&$addresses, $token, &$params, &$mail) {
+  public static function parseAddresses(&$addresses, $token, &$params, &$mail) {
     $params[$token] = array();
 
     foreach ($addresses as $address) {
@@ -409,10 +409,10 @@ class CRM_Utils_Mail_Incoming {
   }
 
   /**
-   * retrieve a contact ID and if not present
+   * Retrieve a contact ID and if not present
    * create one with this email
    */
-  function getContactID($email, $name = NULL, $create = TRUE, &$mail) {
+  public static function getContactID($email, $name = NULL, $create = TRUE, &$mail) {
     $dao = CRM_Contact_BAO_Contact::matchContactOnEmail($email, 'Individual');
 
     $contactID = NULL;