Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

revert $bHaveXML -> SystemConfig #1934

Merged
merged 2 commits into from
Feb 17, 2017
Merged

revert $bHaveXML -> SystemConfig #1934

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e3203f
revert $bHaveXML -> SystemConfig
DawoudIO Feb 17, 2017
c1067db
fixed style
DawoudIO Feb 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Include/GeoCoder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ public function GetLon()

public function AddressLatLon()
{
if (!SystemConfig::getValue('bHaveXML')) {
global $bHaveXML;
if (!$bHaveXML) {
return;
}
if (SystemConfig::getValue('sGeocoderID') && SystemConfig::getValue('sGeocoderID') != '') { // Use credentials if available for unthrottled access to the geocoder server
Expand All @@ -218,6 +219,7 @@ public function SetAddress($newStreet, $newCity, $newState, $newZip)

public function Lookup()
{
global $bHaveXML;
global $googleMapObj;

$address = $this->street.','.$this->city.','.$this->state.','.$this->zip;
Expand All @@ -231,7 +233,7 @@ public function Lookup()
$this->lon = $geocode['lon'];
}
} else {
if (!SystemConfig::getValue('bHaveXML')) {
if (!$bHaveXML) {
return -4;
}

Expand Down