Commit 79e6bfe5 authored by Florian Bogner's avatar Florian Bogner

Merge branch 'dev' into #775

parents af5002aa 6f487535
/**
* @module controls/users/Login
*
* @event onLoad
* @event onAuthBegin
* @event onAuthNext
* @event onSuccess
......@@ -85,9 +86,13 @@ define('controls/users/Login', [
this.Loader.show();
}
var self = this;
QUIAjax.get('ajax_users_loginControl', function (result) {
this.$buildAuthenticator(result);
}.bind(this), {
self.$buildAuthenticator(result).then(function () {
self.fireEvent('load', [self]);
});
}, {
isAdminLogin : typeof QUIQQER_IS_ADMIN_LOGIN !== 'undefined' ? 1 : 0,
authenticators: JSON.encode(this.getAttribute('authenticators'))
});
......@@ -105,6 +110,7 @@ define('controls/users/Login', [
}
this.$refreshForm();
this.fireEvent('load', [this]);
},
/**
......@@ -152,6 +158,7 @@ define('controls/users/Login', [
* Build the authenticator from the ajax html
*
* @param {String} html
* @return {Promise}
*/
$buildAuthenticator: function (html) {
var Container = new Element('div', {
......@@ -169,7 +176,8 @@ define('controls/users/Login', [
QUIAjax.post('ajax_user_logout', function () {
window.location.reload();
});
return;
return Promise.resolve();
}
forms.setStyle('opacity', 0);
......@@ -189,7 +197,7 @@ define('controls/users/Login', [
Child.inject(forms[0]);
});
QUI.parse(forms).then(function () {
return QUI.parse(forms).then(function () {
this.Loader.hide();
forms.setStyle('top', 20);
......
......@@ -71,19 +71,15 @@ HEAD;
$geoIPSettings = <<<GEO
### SET GEOIP Variables ###
#fastcgi_param GEOIP_COUNTRY_CODE \$geoip_country_code;
#fastcgi_param GEOIP_COUNTRY_CODE3 \$geoip_country_code3;
#fastcgi_param GEOIP_COUNTRY_NAME \$geoip_country_name;
#fastcgi_param GEOIP_CITY_COUNTRY_CODE \$geoip_city_country_code;
#fastcgi_param GEOIP_CITY_COUNTRY_CODE3 \$geoip_city_country_code3;
#fastcgi_param GEOIP_CITY_COUNTRY_NAME \$geoip_city_country_name;
#fastcgi_param GEOIP_REGION \$geoip_region;
#fastcgi_param GEOIP_CITY \$geoip_city;
#fastcgi_param GEOIP_POSTAL_CODE \$geoip_postal_code;
#fastcgi_param GEOIP_CITY_CONTINENT_CODE \$geoip_city_continent_code;
#fastcgi_param GEOIP_LATITUDE \$geoip_latitude;
#fastcgi_param GEOIP_LONGITUDE \$geoip_longitude;
#fastcgi_param GEOIP_COUNTRY_CODE \$geoip2_data_country_code;
#fastcgi_param GEOIP_COUNTRY_NAME \$geoip2_data_country_name;
#fastcgi_param GEOIP_CITY_COUNTRY_CODE \$geoip2_data_city_country_code;
#fastcgi_param GEOIP_CITY_COUNTRY_NAME \$geoip2_data_city_country_name;
#fastcgi_param GEOIP_CITY \$geoip2_data_city_name;
#fastcgi_param GEOIP_POSTAL_CODE \$geoip2_data_postal_code;
#fastcgi_param GEOIP_CITY_CONTINENT_CODE \$geoip2_data_continent_code;
#fastcgi_param GEOIP_LATITUDE \$geoip2_data_location_longitude;
#fastcgi_param GEOIP_LONGITUDE \$geoip2_data_postal_code;
GEO;
file_put_contents($this->subConfDir."php.include", $geoIPSettings, FILE_APPEND);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment