<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.4 |
+ | CiviCRM version 4.5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013 |
+ | Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
// do check for geocoding.
$processGeocode = FALSE;
if (empty($config->geocodeMethod)) {
- if ($this->geocoding == 'true') {
+ if (CRM_Utils_String::strtobool($this->geocoding) === TRUE) {
$this->returnMessages[] = ts('Error: You need to set a mapping provider under Administer > System Settings > Mapping and Geocoding');
$this->returnError = 1;
$this->returnResult();
else {
$processGeocode = TRUE;
// user might want to over-ride.
- if ($this->geocoding == 'false') {
+ if (CRM_Utils_String::strtobool($this->geocoding) === FALSE) {
$processGeocode = FALSE;
}
}
);
$parseStreetAddress = FALSE;
if (!$parseAddress) {
- if ($this->parse == 'true') {
+ if (CRM_Utils_String::strtobool($this->parse) === TRUE) {
$this->returnMessages[] = ts('Error: You need to enable Street Address Parsing under Administer > Localization > Address Settings.');
$this->returnError = 1;
return $this->returnResult();
else {
$parseStreetAddress = TRUE;
// user might want to over-ride.
- if ($this->parse == 'false') {
+ if (CRM_Utils_String::strtobool($this->parse) === FALSE) {
$parseStreetAddress = FALSE;
}
}
$success = TRUE;
// consider address is automatically parseable,
// when we should found street_number and street_name
- if (!CRM_Utils_Array::value('street_name', $parsedFields) ||
- !CRM_Utils_Array::value('street_number', $parsedFields)
- ) {
+ if (empty($parsedFields['street_name']) || empty($parsedFields['street_number'])) {
$success = FALSE;
}