From 048969a77c32190e9590115b67a525d61f4752c6 Mon Sep 17 00:00:00 2001 From: brettp Date: Tue, 4 Jan 2011 19:48:31 +0000 Subject: Refs #2771: Removing CRLFs from javascript files. git-svn-id: http://code.elgg.org/elgg/trunk@7826 36083f99-b078-4883-b0ff-0f9b5a30f544 --- js/lib/security.js | 150 ++++++++++++++++++++++++++--------------------------- 1 file changed, 75 insertions(+), 75 deletions(-) (limited to 'js/lib/security.js') diff --git a/js/lib/security.js b/js/lib/security.js index b9d1be3a3..def775c05 100644 --- a/js/lib/security.js +++ b/js/lib/security.js @@ -1,76 +1,76 @@ -/** - * Hold security-related data here - */ -elgg.provide('elgg.security'); - -elgg.security.token = {}; - -elgg.security.setToken = function(json) { - //update the convenience object - elgg.security.token = json; - - //also update all forms - $('[name=__elgg_ts]').val(json.__elgg_ts); - $('[name=__elgg_token]').val(json.__elgg_token); - - //also update all links - $('[href]').each(function() { - this.href = this.href - .replace(/__elgg_ts=\d*/, '__elgg_ts=' + json.__elgg_ts) - .replace(/__elgg_token=[0-9a-f]*/, '__elgg_token=' + json.__elgg_token); - }); -}; - -/** - * Security tokens time out, so lets refresh those every so often - * - * @todo handle error and bad return data - */ -elgg.security.refreshToken = function() { - elgg.action('security/refreshtoken', function(data) { - elgg.security.setToken(data.output); - }); -}; - - -/** - * Add elgg action tokens to an object or string (assumed to be url data) - * - * @param {Object|string} data - * @return {Object} The new data object including action tokens - * @private - */ -elgg.security.addToken = function(data) { - - // 'http://example.com?data=sofar' - if (elgg.isString(data)) { - var args = []; - if (data) { - args.push(data); - } - args.push("__elgg_ts=" + elgg.security.token.__elgg_ts); - args.push("__elgg_token=" + elgg.security.token.__elgg_token); - - return args.join('&'); - } - - // no input! acts like a getter - if (elgg.isUndefined(data)) { - return elgg.security.token; - } - - // {...} - if (elgg.isPlainObject(data)) { - return elgg.extend(data, elgg.security.token); - } - - // oops, don't recognize that! - throw new TypeError("elgg.security.addToken not implemented for " + (typeof data) + "s"); -}; - -elgg.security.init = function() { - //refresh security token every 5 minutes - setInterval(elgg.security.refreshToken, elgg.security.interval); -}; - +/** + * Hold security-related data here + */ +elgg.provide('elgg.security'); + +elgg.security.token = {}; + +elgg.security.setToken = function(json) { + //update the convenience object + elgg.security.token = json; + + //also update all forms + $('[name=__elgg_ts]').val(json.__elgg_ts); + $('[name=__elgg_token]').val(json.__elgg_token); + + //also update all links + $('[href]').each(function() { + this.href = this.href + .replace(/__elgg_ts=\d*/, '__elgg_ts=' + json.__elgg_ts) + .replace(/__elgg_token=[0-9a-f]*/, '__elgg_token=' + json.__elgg_token); + }); +}; + +/** + * Security tokens time out, so lets refresh those every so often + * + * @todo handle error and bad return data + */ +elgg.security.refreshToken = function() { + elgg.action('security/refreshtoken', function(data) { + elgg.security.setToken(data.output); + }); +}; + + +/** + * Add elgg action tokens to an object or string (assumed to be url data) + * + * @param {Object|string} data + * @return {Object} The new data object including action tokens + * @private + */ +elgg.security.addToken = function(data) { + + // 'http://example.com?data=sofar' + if (elgg.isString(data)) { + var args = []; + if (data) { + args.push(data); + } + args.push("__elgg_ts=" + elgg.security.token.__elgg_ts); + args.push("__elgg_token=" + elgg.security.token.__elgg_token); + + return args.join('&'); + } + + // no input! acts like a getter + if (elgg.isUndefined(data)) { + return elgg.security.token; + } + + // {...} + if (elgg.isPlainObject(data)) { + return elgg.extend(data, elgg.security.token); + } + + // oops, don't recognize that! + throw new TypeError("elgg.security.addToken not implemented for " + (typeof data) + "s"); +}; + +elgg.security.init = function() { + //refresh security token every 5 minutes + setInterval(elgg.security.refreshToken, elgg.security.interval); +}; + elgg.register_event_handler('boot', 'system', elgg.security.init); \ No newline at end of file -- cgit v1.2.3