projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
INFRA-132 - Remove extra spaces around '.'
[civicrm-core.git]
/
CRM
/
Mailing
/
BAO
/
Query.php
diff --git
a/CRM/Mailing/BAO/Query.php
b/CRM/Mailing/BAO/Query.php
index dcea6d6050beabdbc3eb4f63e7f43d4ebbfe0bd6..4cc084c077114ac23c04e45514dd5c6f66baa0a3 100644
(file)
--- a/
CRM/Mailing/BAO/Query.php
+++ b/
CRM/Mailing/BAO/Query.php
@@
-1,7
+1,7
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
5
|
+ | CiviCRM version 4.
6
|
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
@@
-38,7
+38,7
@@
class CRM_Mailing_BAO_Query {
/**
* @return array|null
*/
/**
* @return array|null
*/
- static function &getFields() {
+
public
static function &getFields() {
if (!self::$_mailingFields) {
self::$_mailingFields = array();
$_mailingFields['mailing_id'] = array(
if (!self::$_mailingFields) {
self::$_mailingFields = array();
$_mailingFields['mailing_id'] = array(
@@
-56,9
+56,8
@@
class CRM_Mailing_BAO_Query {
* @param $query
*
* @return void
* @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";
// 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
*/
/**
* @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])) {
$grouping = NULL;
foreach (array_keys($query->_params) as $id) {
if (empty($query->_params[$id][0])) {
@@
-151,7
+150,7
@@
class CRM_Mailing_BAO_Query {
*
* @return null|string
*/
*
* @return null|string
*/
- static function from($name, $mode, $side) {
+
public
static function from($name, $mode, $side) {
$from = NULL;
switch ($name) {
$from = NULL;
switch ($name) {
@@
-198,7
+197,8
@@
class CRM_Mailing_BAO_Query {
*
* @return array|null
*/
*
* @return array|null
*/
- static function defaultReturnProperties($mode,
+ static function defaultReturnProperties(
+ $mode,
$includeCustomFields = TRUE
) {
$includeCustomFields = TRUE
) {
@@
-226,7
+226,7
@@
class CRM_Mailing_BAO_Query {
* @param $values
* @param $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();
list($name, $op, $value, $grouping, $wildcard) = $values;
$fields = array();
@@
-251,8
+251,8
@@
class CRM_Mailing_BAO_Query {
return;
case 'mailing_name':
return;
case 'mailing_name':
- $value = strtolower(
addslashes( $value )
);
- if (
$wildcard
) {
+ $value = strtolower(
addslashes($value)
);
+ if (
$wildcard
) {
$value = "%$value%";
$op = 'LIKE';
}
$value = "%$value%";
$op = 'LIKE';
}
@@
-377,13
+377,12
@@
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 CRM_Core_Form $form
* @return void
* @static
*/
*
* @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();
// mailing selectors
$mailings = CRM_Mailing_BAO_Mailing::getMailingsList();
@@
-429,12
+428,13
@@
class CRM_Mailing_BAO_Query {
* @param $row
* @param int $id
*/
* @param $row
* @param int $id
*/
- static function searchAction(&$row, $id) {}
+ public static function searchAction(&$row, $id) {
+ }
/**
* @param $tables
*/
/**
* @param $tables
*/
- static function tableNames(&$tables) {
+
public
static function tableNames(&$tables) {
}
/**
}
/**
@@
-450,7
+450,7
@@
class CRM_Mailing_BAO_Query {
*
* @return void
*/
*
* @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') {
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) . ")";
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];
}
else {
$query->_qill[$grouping][] = $fieldTitle . ' - ' . $valueTitles[$value];
@@
-480,4
+480,3
@@
class CRM_Mailing_BAO_Query {
$query->_tables[$tableName] = $query->_whereTables[$tableName] = 1;
}
}
$query->_tables[$tableName] = $query->_whereTables[$tableName] = 1;
}
}
-