Refs #2771: Removing CRLFs from javascript files.

git-svn-id: http://code.elgg.org/elgg/trunk@7826 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 115 insertions, 115 deletions

diff --git a/js/lib/session.js b/js/lib/session.js
index fc61144be..613910412 100644
--- a/js/lib/session.js
+++ b/js/lib/session.js
@@ -1,116 +1,116 @@
-/**

- * @todo comment

- */

-elgg.provide('elgg.session');

-

-/**

- * Helper function for setting cookies

- * @param {string} name

- * @param {string} value

- * @param {Object} options

- *  {number|Date} options[expires]

- * 	{string} options[path]

- * 	{string} options[domain]

- * 	{boolean} options[secure]

- * 

- * @return {string} The value of the cookie, if only name is specified

- */

-elgg.session.cookie = function (name, value, options) {

-	var cookies = [], cookie = [], i = 0, date, valid = true;

-	

-	//elgg.session.cookie()

-	if (elgg.isUndefined(name)) {

-		return document.cookie;

-	}

-	

-	//elgg.session.cookie(name)

-	if (elgg.isUndefined(value)) {

-		if (document.cookie && document.cookie !== '') {

-			cookies = document.cookie.split(';');

-			for (i = 0; i < cookies.length; i += 1) {

-				cookie = jQuery.trim(cookies[i]).split('=');

-				if (cookie[0] === name) {

-					return decodeURIComponent(cookie[1]);

-				}

-			}

-		}

-		return undefined;

-	}

-	

-	// elgg.session.cookie(name, value[, opts])

-	options = options || {};

-	

-	if (elgg.isNull(value)) {

-		value = '';

-		options.expires = -1;

-	}

-	

-	cookies.push(name + '=' + value);

-	

-	if (elgg.isNumber(options.expires)) {

-		if (elgg.isNumber(options.expires)) {

-			date = new Date();

-			date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));

-		} else if (options.expires.toUTCString) {

-			date = options.expires;

-		} else {

-			valid = false;

-		}

-		

-		if (valid) {

-			cookies.push('expires=' + date.toUTCString());

-		}

-	}

-	

-	// CAUTION: Needed to parenthesize options.path and options.domain

-	// in the following expressions, otherwise they evaluate to undefined

-	// in the packed version for some reason.

-	if (options.path) {

-		cookies.push('path=' + (options.path));

-	}

-

-	if (options.domain) {

-		cookies.push('domain=' + (options.domain));

-	}

-	

-	if (options.secure) {

-		cookies.push('secure');

-	}

-	

-	document.cookie = cookies.join('; ');

-};

-

-/**

- * @return {ElggUser} The logged in user

- */

-elgg.get_loggedin_user = function() {

-	return elgg.session.user;

-};

-

-/**

- * @return {number} The GUID of the logged in user

- */

-elgg.get_loggedin_userid = function() {

-	var user = elgg.get_loggedin_user();

-	return user ? user.guid : 0;

-};

-

-/**

- * @return {boolean} Whether there is a user logged in

- */

-elgg.isloggedin = function() {

-	return (elgg.get_loggedin_user() instanceof elgg.ElggUser);

-};

-

-/**

- * @return {boolean} Whether there is an admin logged in

- */

-elgg.isadminloggedin = function() {

-	var user = elgg.get_loggedin_user();

-	return (user instanceof elgg.ElggUser) && user.isAdmin();

-};

-

-/**

- * @deprecated Use elgg.session.cookie instead

- */

+/**
+ * @todo comment
+ */
+elgg.provide('elgg.session');
+
+/**
+ * Helper function for setting cookies
+ * @param {string} name
+ * @param {string} value
+ * @param {Object} options
+ *  {number|Date} options[expires]
+ * 	{string} options[path]
+ * 	{string} options[domain]
+ * 	{boolean} options[secure]
+ * 
+ * @return {string} The value of the cookie, if only name is specified
+ */
+elgg.session.cookie = function (name, value, options) {
+	var cookies = [], cookie = [], i = 0, date, valid = true;
+	
+	//elgg.session.cookie()
+	if (elgg.isUndefined(name)) {
+		return document.cookie;
+	}
+	
+	//elgg.session.cookie(name)
+	if (elgg.isUndefined(value)) {
+		if (document.cookie && document.cookie !== '') {
+			cookies = document.cookie.split(';');
+			for (i = 0; i < cookies.length; i += 1) {
+				cookie = jQuery.trim(cookies[i]).split('=');
+				if (cookie[0] === name) {
+					return decodeURIComponent(cookie[1]);
+				}
+			}
+		}
+		return undefined;
+	}
+	
+	// elgg.session.cookie(name, value[, opts])
+	options = options || {};
+	
+	if (elgg.isNull(value)) {
+		value = '';
+		options.expires = -1;
+	}
+	
+	cookies.push(name + '=' + value);
+	
+	if (elgg.isNumber(options.expires)) {
+		if (elgg.isNumber(options.expires)) {
+			date = new Date();
+			date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+		} else if (options.expires.toUTCString) {
+			date = options.expires;
+		} else {
+			valid = false;
+		}
+		
+		if (valid) {
+			cookies.push('expires=' + date.toUTCString());
+		}
+	}
+	
+	// CAUTION: Needed to parenthesize options.path and options.domain
+	// in the following expressions, otherwise they evaluate to undefined
+	// in the packed version for some reason.
+	if (options.path) {
+		cookies.push('path=' + (options.path));
+	}
+
+	if (options.domain) {
+		cookies.push('domain=' + (options.domain));
+	}
+	
+	if (options.secure) {
+		cookies.push('secure');
+	}
+	
+	document.cookie = cookies.join('; ');
+};
+
+/**
+ * @return {ElggUser} The logged in user
+ */
+elgg.get_loggedin_user = function() {
+	return elgg.session.user;
+};
+
+/**
+ * @return {number} The GUID of the logged in user
+ */
+elgg.get_loggedin_userid = function() {
+	var user = elgg.get_loggedin_user();
+	return user ? user.guid : 0;
+};
+
+/**
+ * @return {boolean} Whether there is a user logged in
+ */
+elgg.isloggedin = function() {
+	return (elgg.get_loggedin_user() instanceof elgg.ElggUser);
+};
+
+/**
+ * @return {boolean} Whether there is an admin logged in
+ */
+elgg.isadminloggedin = function() {
+	var user = elgg.get_loggedin_user();
+	return (user instanceof elgg.ElggUser) && user.isAdmin();
+};
+
+/**
+ * @deprecated Use elgg.session.cookie instead
+ */
 jQuery.cookie = elgg.session.cookie;
\ No newline at end of file