));
}
- // check json key for all methods but some exceptoins
+ // check json key for all methods but some exceptions
if (! in_array($method, $anonymnousMethods) && Setup_Core::configFileExists()
&& ( empty($jsonKey) || $jsonKey != Setup_Core::get('jsonKey')
|| !Setup_Core::isRegistered(Setup_Core::USER)
Tine.Tinebase.tineInit.initRegistry = Tine.Tinebase.tineInit.initRegistry.createInterceptor(function () {
Tine.Tinebase.tineInit.clearRegistry();
Tine.Tinebase.tineInit.getAllRegistryDataMethod = 'Setup.getAllRegistryData';
+ Tine.Tinebase.tineInit.jsonKeyCookieId = 'TINE20SETUPJSONKEY';
Tine.Tinebase.tineInit.stateful = false;
return true;
stateful: true,
/**
+ * @cfg {String} jsonKeyCookieId
+ */
+ jsonKeyCookieId: 'TINE20JSONKEY',
+
+ /**
* @cfg {String} requestUrl
*/
requestUrl: 'index.php',
Ext.Ajax.on('beforerequest', function (connection, options) {
var jsonKey = Tine.Tinebase.registry && Tine.Tinebase.registry.get ? Tine.Tinebase.registry.get('jsonKey') : '';
- if (Tine.Tinebase.tineInit.jsonKeyCookieProvider.get('TINE20JSONKEY')) {
- var cookieJsonKey = Tine.Tinebase.tineInit.jsonKeyCookieProvider.get('TINE20JSONKEY');
- Tine.Tinebase.tineInit.jsonKeyCookieProvider.clear('TINE20JSONKEY');
+ if (Tine.Tinebase.tineInit.jsonKeyCookieProvider.get(this.jsonKeyCookieId)) {
+ var cookieJsonKey = Tine.Tinebase.tineInit.jsonKeyCookieProvider.get(this.jsonKeyCookieId);
+ Tine.Tinebase.tineInit.jsonKeyCookieProvider.clear(this.jsonKeyCookieId);
// NOTE cookie reset is not always working in IE, so we need to check jsonKey again
if (cookieJsonKey && cookieJsonKey != "null") {
jsonKey = cookieJsonKey;
json: options.jsonData
};
});
+
+
/**
* inspect completed responses => staus code == 200