+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019 |
+ | Copyright CiviCRM LLC (c) 2004-2020 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
*/
/**
* @param CRM_Core_Form $form
* @param int $proxSearch
*/
- static public function buildQuickForm($form, $proxSearch) {
+ public static function buildQuickForm($form, $proxSearch) {
// is proximity search required (2) or optional (1)?
$proxRequired = ($proxSearch == 2 ? TRUE : FALSE);
$form->assign('proximity_search', TRUE);
$form->add('text', 'prox_postal_code', ts('Postal Code'), NULL, FALSE);
- $form->addChainSelect('prox_state_province_id', array('required' => $proxRequired));
+ $form->addChainSelect('prox_state_province_id', ['required' => $proxRequired]);
- $country = array('' => ts('- select -')) + CRM_Core_PseudoConstant::country();
+ $country = ['' => ts('- select -')] + CRM_Core_PseudoConstant::country();
$form->add('select', 'prox_country_id', ts('Country'), $country, $proxRequired);
$form->add('text', 'prox_distance', ts('Distance'), NULL, $proxRequired);
- $proxUnits = array('km' => ts('km'), 'miles' => ts('miles'));
+ $proxUnits = ['km' => ts('km'), 'miles' => ts('miles')];
$form->add('select', 'prox_distance_unit', ts('Units'), $proxUnits, $proxRequired);
// prox_distance_unit
- $form->addFormRule(array('CRM_Contact_Form_Task_ProximityCommon', 'formRule'), $form);
+ $form->addFormRule(['CRM_Contact_Form_Task_ProximityCommon', 'formRule'], $form);
}
/**
* true if no errors, else array of errors
*/
public static function formRule($fields, $files, $form) {
- $errors = array();
+ $errors = [];
// If Distance is present, make sure state, country and city or postal code are populated.
if (!empty($fields['prox_distance'])) {
if (empty($fields['prox_state_province_id']) || empty($fields['prox_country_id'])) {
$errors["prox_state_province_id"] = ts("Country AND State/Province are required to search by distance.");
}
- if (!CRM_Utils_Array::value('prox_postal_code', $fields) AND
- !CRM_Utils_Array::value('prox_city', $fields)
- ) {
+ if (empty($fields['prox_postal_code']) && empty($fields['prox_city'])) {
$errors["prox_distance"] = ts("City OR Postal Code are required to search by distance.");
}
}
* @return array
* the default array reference
*/
- static public function setDefaultValues($form) {
- $defaults = array();
+ public static function setDefaultValues($form) {
+ $defaults = [];
$config = CRM_Core_Config::singleton();
$countryDefault = $config->defaultContactCountry;