diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/geoconfiguration.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/geoconfiguration.tpl.php
index e4cbac9c74..b1756f8080 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/geoconfiguration.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/geoconfiguration.tpl.php
@@ -128,8 +128,8 @@
-
-
+
+
diff --git a/lhc_web/ezcomponents/Base/src/file.php b/lhc_web/ezcomponents/Base/src/file.php
index 843399c796..9d5329b9fa 100644
--- a/lhc_web/ezcomponents/Base/src/file.php
+++ b/lhc_web/ezcomponents/Base/src/file.php
@@ -110,7 +110,7 @@ static protected function findRecursiveCallback( ezcBaseFileFindContext $context
* not be opened for reading.
* @return array
*/
- static public function walkRecursive( $sourceDir, array $includeFilters = array(), array $excludeFilters = array(), $callback, &$callbackContext )
+ static public function walkRecursive( $sourceDir, array $includeFilters, array $excludeFilters, $callback, &$callbackContext )
{
if ( !is_dir( $sourceDir ) )
{
diff --git a/lhc_web/ezcomponents/ConsoleTools/src/input/option.php b/lhc_web/ezcomponents/ConsoleTools/src/input/option.php
index 447688efda..e9d4f03a61 100644
--- a/lhc_web/ezcomponents/ConsoleTools/src/input/option.php
+++ b/lhc_web/ezcomponents/ConsoleTools/src/input/option.php
@@ -147,8 +147,8 @@ class ezcConsoleOption
* sign or contain whitespaces.
*/
public function __construct(
- $short = '',
- $long,
+ $short = '',
+ $long = '',
$type = ezcConsoleInput::TYPE_NONE,
$default = null,
$multiple = false,
diff --git a/lhc_web/modules/lhchat/geoconfiguration.php b/lhc_web/modules/lhchat/geoconfiguration.php
index 18d6f516f8..dc90e67ec5 100644
--- a/lhc_web/modules/lhchat/geoconfiguration.php
+++ b/lhc_web/modules/lhchat/geoconfiguration.php
@@ -109,9 +109,6 @@
'MaxMindDetectionType' => new ezcInputFormDefinitionElement(
ezcInputFormDefinitionElement::OPTIONAL, 'string'
),
- 'CityGeoLocation' => new ezcInputFormDefinitionElement(
- ezcInputFormDefinitionElement::OPTIONAL, 'string'
- ),
'ipapi_key' => new ezcInputFormDefinitionElement(
ezcInputFormDefinitionElement::OPTIONAL, 'string'
),
@@ -198,15 +195,15 @@
} elseif ($form->UseGeoIP == 'max_mind') {
$data['geo_service_identifier'] = 'max_mind';
$data['max_mind_detection_type'] = $form->hasValidData('MaxMindDetectionType') ? $form->MaxMindDetectionType : 'city';
- $data['max_mind_city_location'] = $form->CityGeoLocation != '' ? $form->CityGeoLocation : 'var/external/geoip/GeoLite2-City.mmdb';
-
+ $data['max_mind_city_location'] = 'var/external/geoip/GeoLite2-City.mmdb';
+
if ($data['max_mind_detection_type'] == 'city' && !file_exists($data['max_mind_city_location'])) {
$Errors[] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/onlineusers','MaxMind city file does not exists!');
} elseif (!file_exists('var/external/geoip/GeoLite2-Country.mmdb')) {
$data['max_mind_detection_type'] = 'country';
$Errors[] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/onlineusers','MaxMind country file does not exists!');
}
-
+
if (empty($Errors)) {
$responseDetection = erLhcoreClassModelChatOnlineUser::getUserData('max_mind','94.23.200.91',array('city_file' => $data['max_mind_city_location'],'detection_type' => $data['max_mind_detection_type']));
if ( $responseDetection == false || !isset($responseDetection->country_code) || !isset($responseDetection->country_name) ) {