X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContact%2FBAO%2FSavedSearch.php;h=a42b1fe4740b33372d527355c46433b7da62ce59;hb=c09fd8feb6f7307c8482574994888c0f99a05a40;hp=18e2118d87985b2b899d664606e7eb0c188878c1;hpb=6049c0d89e4b18c81cea8108acc71ba6bdc3ba85;p=civicrm-core.git diff --git a/CRM/Contact/BAO/SavedSearch.php b/CRM/Contact/BAO/SavedSearch.php index 18e2118d87..a42b1fe474 100644 --- a/CRM/Contact/BAO/SavedSearch.php +++ b/CRM/Contact/BAO/SavedSearch.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * @@ -51,8 +51,8 @@ class CRM_Contact_BAO_SavedSearch extends CRM_Contact_DAO_SavedSearch { /** * Query the db for all saved searches. * - * @return array $aSavedSearch - contains the search name as value and and id as key - * + * @return array + * contains the search name as value and and id as key */ public function getAll() { $savedSearch = new CRM_Contact_DAO_SavedSearch(); @@ -75,7 +75,6 @@ class CRM_Contact_BAO_SavedSearch extends CRM_Contact_DAO_SavedSearch { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Contact_BAO_SavedSearch - * @static */ public static function retrieve(&$params, &$defaults) { $savedSearch = new CRM_Contact_DAO_SavedSearch(); @@ -93,8 +92,8 @@ class CRM_Contact_BAO_SavedSearch extends CRM_Contact_DAO_SavedSearch { * @param int $id * The id of the saved search. * - * @return array the values of the posted saved search - * @static + * @return array + * the values of the posted saved search */ public static function &getFormValues($id) { $fv = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_SavedSearch', $id, 'form_values'); @@ -159,8 +158,8 @@ class CRM_Contact_BAO_SavedSearch extends CRM_Contact_DAO_SavedSearch { * @param array $whereTables * (reference ) add the tables that are needed for the where clause. * - * @return string the where clause for this saved search - * @static + * @return string + * the where clause for this saved search */ public static function whereClause($id, &$tables, &$whereTables) { $params = self::getSearchParams($id); @@ -169,8 +168,8 @@ class CRM_Contact_BAO_SavedSearch extends CRM_Contact_DAO_SavedSearch { // this has not yet been implemented } else { - return CRM_Contact_BAO_Query::getWhereClause($params, NULL, $tables, $whereTables); - } + return CRM_Contact_BAO_Query::getWhereClause($params, NULL, $tables, $whereTables); + } } return NULL; } @@ -213,8 +212,8 @@ WHERE $where"; } else { $tables = $whereTables = array('civicrm_contact' => 1, 'civicrm_email' => 1); - $where = CRM_Contact_BAO_SavedSearch::whereClause($id, $tables, $whereTables); - $from = CRM_Contact_BAO_Query::fromClause($whereTables); + $where = CRM_Contact_BAO_SavedSearch::whereClause($id, $tables, $whereTables); + $from = CRM_Contact_BAO_Query::fromClause($whereTables); return array($from, $where); } } @@ -255,8 +254,6 @@ LEFT JOIN civicrm_email ON (contact_a.id = civicrm_email.contact_id AND civicrm_ $this->where_tables = serialize($whereTables); } } - - return; } public function save() { @@ -274,8 +271,8 @@ LEFT JOIN civicrm_email ON (contact_a.id = civicrm_email.contact_id AND civicrm_ * * @param string $value * - * @return string the name of the saved search - * @static + * @return string + * the name of the saved search */ public static function getName($id, $value = 'name') { $group = new CRM_Contact_DAO_Group(); @@ -310,4 +307,5 @@ LEFT JOIN civicrm_email ON (contact_a.id = civicrm_email.contact_id AND civicrm_ return $savedSearch; } + }