X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FMailing%2FBAO%2FQuery.php;h=4cc084c077114ac23c04e45514dd5c6f66baa0a3;hb=86bfa4f6487e37328f4b18c50cab27958311a0d2;hp=ab966d346b1785129b6087d8ca7c267542a12dcc;hpb=68acd6ae8e764d8e713829675cfadfdefff770e8;p=civicrm-core.git

diff --git a/CRM/Mailing/BAO/Query.php b/CRM/Mailing/BAO/Query.php
index ab966d346b..4cc084c077 100644
--- a/CRM/Mailing/BAO/Query.php
+++ b/CRM/Mailing/BAO/Query.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -38,7 +38,7 @@ class CRM_Mailing_BAO_Query {
   /**
    * @return array|null
    */
-  static function &getFields() {
+  public static function &getFields() {
     if (!self::$_mailingFields) {
       self::$_mailingFields = array();
       $_mailingFields['mailing_id'] = array(
@@ -51,14 +51,13 @@ class CRM_Mailing_BAO_Query {
   }
 
   /**
-   * if mailings are involved, add the specific Mailing fields
+   * If mailings are involved, add the specific Mailing fields
    *
    * @param $query
    *
    * @return void
-   * @access public
    */
-  static function select(&$query) {
+  public static function select(&$query) {
     // if Mailing mode add mailing id
     if ($query->_mode & CRM_Contact_BAO_Query::MODE_MAILING) {
       $query->_select['mailing_id'] = "civicrm_mailing.id as mailing_id";
@@ -128,7 +127,7 @@ class CRM_Mailing_BAO_Query {
   /**
    * @param $query
    */
-  static function where(&$query) {
+  public static function where(&$query) {
     $grouping = NULL;
     foreach (array_keys($query->_params) as $id) {
       if (empty($query->_params[$id][0])) {
@@ -145,13 +144,13 @@ class CRM_Mailing_BAO_Query {
   }
 
   /**
-   * @param $name
+   * @param string $name
    * @param $mode
    * @param $side
    *
    * @return null|string
    */
-  static function from($name, $mode, $side) {
+  public static function from($name, $mode, $side) {
     $from = NULL;
 
     switch ($name) {
@@ -198,7 +197,8 @@ class CRM_Mailing_BAO_Query {
    *
    * @return array|null
    */
-  static function defaultReturnProperties($mode,
+  static function defaultReturnProperties(
+    $mode,
     $includeCustomFields = TRUE
   ) {
 
@@ -226,7 +226,7 @@ class CRM_Mailing_BAO_Query {
    * @param $values
    * @param $query
    */
-  static function whereClauseSingle(&$values, &$query) {
+  public static function whereClauseSingle(&$values, &$query) {
     list($name, $op, $value, $grouping, $wildcard) = $values;
 
     $fields = array();
@@ -251,8 +251,8 @@ class CRM_Mailing_BAO_Query {
         return;
 
       case 'mailing_name':
-        $value = strtolower( addslashes( $value ) );
-        if ( $wildcard ) {
+        $value = strtolower(addslashes($value));
+        if ($wildcard) {
           $value = "%$value%";
           $op    = 'LIKE';
         }
@@ -375,15 +375,14 @@ class CRM_Mailing_BAO_Query {
   }
 
   /**
-   * add all the elements shared between Mailing search and advnaced search
+   * Add all the elements shared between Mailing search and advnaced search
    *
-   * @access public
    *
-   * @param $form CRM_Core_Form
+   * @param CRM_Core_Form $form
    * @return void
    * @static
    */
-  static function buildSearchForm(&$form) {
+  public static function buildSearchForm(&$form) {
     // mailing selectors
     $mailings = CRM_Mailing_BAO_Mailing::getMailingsList();
 
@@ -427,14 +426,15 @@ class CRM_Mailing_BAO_Query {
 
   /**
    * @param $row
-   * @param $id
+   * @param int $id
    */
-  static function searchAction(&$row, $id) {}
+  public static function searchAction(&$row, $id) {
+  }
 
   /**
    * @param $tables
    */
-  static function tableNames(&$tables) {
+  public static function tableNames(&$tables) {
   }
 
   /**
@@ -442,15 +442,15 @@ class CRM_Mailing_BAO_Query {
    *
    * @param $query
    * @param $values
-   * @param $tableName
-   * @param $fieldName
+   * @param string $tableName
+   * @param string $fieldName
    * @param $fieldTitle
    *
    * @param $valueTitles
    *
    * @return void
    */
-  static function mailingEventQueryBuilder(&$query, &$values, $tableName, $fieldName, $fieldTitle, &$valueTitles) {
+  public static function mailingEventQueryBuilder(&$query, &$values, $tableName, $fieldName, $fieldTitle, &$valueTitles) {
     list($name, $op, $value, $grouping, $wildcard) = $values;
 
     if (empty($value) || $value == 'A') {
@@ -467,7 +467,7 @@ class CRM_Mailing_BAO_Query {
 
     if (is_array($value)) {
       $query->_where[$grouping][] = "$tableName.$fieldName $op (" . implode(',', $value) . ")";
-      $query->_qill[$grouping][] = "$fieldTitle $op ". implode(', ', array_intersect_key($valueTitles, array_flip($value)));
+      $query->_qill[$grouping][] = "$fieldTitle $op " . implode(', ', array_intersect_key($valueTitles, array_flip($value)));
     }
     else {
       $query->_qill[$grouping][] = $fieldTitle . ' - ' . $valueTitles[$value];
@@ -480,4 +480,3 @@ class CRM_Mailing_BAO_Query {
     $query->_tables[$tableName] = $query->_whereTables[$tableName] = 1;
   }
 }
-