diff --git a/.gitignore b/.gitignore
index ece56d3..066d5fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,6 @@ local/*
*.local.*
*.local/
server/libs/daemon/daemon.node
-server/libs/daemon/.lock-wscript
\ No newline at end of file
+server/libs/daemon/.lock-wscript
+client/js/im.compiled.js
+client/js/im.min.js
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0f9a8dd
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,43 @@
+SRC_DIR = client/js
+BUILD_DIR = build
+
+PREFIX = .
+DIST_DIR = client/js
+
+BASE_FILES = ${SRC_DIR}/md5.js\
+ ${SRC_DIR}/store.js\
+ ${SRC_DIR}/cookies.js\
+ ${SRC_DIR}/dateformat.js\
+ ${SRC_DIR}/json.js\
+ ${SRC_DIR}/im.js
+
+MODULES = ${SRC_DIR}/intro.js\
+ ${BASE_FILES}\
+ ${SRC_DIR}/outro.js
+
+IMJS = ${DIST_DIR}/im.compiled.js
+IMJS_MIN = ${DIST_DIR}/im.min.js
+
+COMPILER = java -jar ${BUILD_DIR}/google-compiler-20100616.jar
+
+all: imjs min
+ @@echo "Ajax IM build complete."
+
+imjs: ${IMJS}
+
+${IMJS}: ${MODULES}
+ @@echo "Building" ${IMJS}
+ @@cat ${MODULES} > ${IMJS}
+
+min: ${IMJS_MIN}
+
+${IMJS_MIN}: ${IMJS}
+ @@echo "Building" ${IMJS_MIN}
+
+ @@head -21 ${IMJS} > ${IMJS_MIN}
+ @@${COMPILER} --js ${IMJS} --warning_level QUIET >> ${IMJS_MIN}
+
+clean:
+ @@echo "Removing built files"
+ @@rm -f ${IMJS}
+ @@rm -f ${IMJS_MIN}
diff --git a/build/google-compiler-20100616.jar b/build/google-compiler-20100616.jar
new file mode 100644
index 0000000..484e874
Binary files /dev/null and b/build/google-compiler-20100616.jar differ
diff --git a/build/package b/build/package
deleted file mode 100755
index abd9acb..0000000
--- a/build/package
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-# Ajax IM build script
-# Automatically exports, minifies, and packages Ajax IM
-
-# Path to checked-out repository
-AJAXIM=$HOME/Sites/AjaxIM
-AJAXIMBUILD=$HOME/Sites/AjaxIMBuild
-YUIC=$HOME/Sites/yuicompressor-2.4.2.jar
-
-echo "Ajax IM, (c) 2005-2010 Joshua Gross"
-
-cd $AJAXIM/..
-echo "Cleaning up any old folders... \c"
-rm -rf AjaxIMBuild
-mkdir AjaxIMBuild
-echo "Done."
-
-cd $AJAXIM
-
-echo "Checking out repository for Development and Minified versions... \c"
-git checkout-index -a -f $AJAXIMBUILD/AjaxIMDevelopment/
-git checkout-index -a -f $AJAXIMBUILD/AjaxIMMinified/
-echo "Done."
-
-echo "Building Development .tar.gz file... \c"
-cd $AJAXIMBUILD/AjaxIMDevelopment
-tar -cf AjaxIM_v$1.tar *
-gzip -9 AjaxIM_v$1.tar
-mv AjaxIM_v$1.tar.gz $AJAXIM/build
-cd ..
-rm -rf AjaxIMDevelopment
-echo "Done."
-
-echo "Compacting Minified copy with YUI Compressor... \c"
-cd AjaxIMMinified
-java -jar $YUIC -o js/im.min.js js/im.js
-mv im.min.js im.js
-java -jar $YUIC -o js/im.load.min.js js/im.load.js
-mv im.load.min.js im.load.js
-java -jar $YUIC -o js/jquery.md5.min.js js/jquery.md5.js
-mv jquery.md5.min.js jquery.md5.js
-echo "Done."
-
-echo "Building Minified .tar.gz file... \c"
-cd AjaxIMMinified
-tar -cf AjaxIM_v$1_min.tar *
-gzip -9 AjaxIM_v$1_min.tar
-mv AjaxIM_v$1_min.tar.gz ..
-cd ..
-rm -rf AjaxIMMinified
-echo "Done."
\ No newline at end of file
diff --git a/client/js/im.js b/client/js/im.js
index 6fca5bd..c69e010 100644
--- a/client/js/im.js
+++ b/client/js/im.js
@@ -375,7 +375,7 @@ $.extend(AjaxIM.prototype, {
// * {{{status}}} is the current status of the friend.
// * {{{group}}} is the user group to which the friend should be added.
addFriend: function(username, status, group) {
- var group_id = 'imjs-group-' + $.md5(group);
+ var group_id = 'imjs-group-' + md5.hex(group);
if(!(group_item = $('#' + group_id)).length) {
var group_item = $('.imjs-friend-group.imjs-default').clone()
@@ -388,7 +388,7 @@ $.extend(AjaxIM.prototype, {
group_header.html(group_header.html().replace('{group}', group));
}
- var user_id = 'imjs-friend-' + $.md5(username + group);
+ var user_id = 'imjs-friend-' + md5.hex(username + group);
if(!$('#' + user_id).length) {
var user_item = group_item.find('ul li.imjs-default').clone()
@@ -449,7 +449,7 @@ $.extend(AjaxIM.prototype, {
// format of {{{#imjs-[md5 of username]}}}.
_createChatbox: function(username, no_stamp) {
var self = this,
- chatbox_id = 'imjs-' + $.md5(username);
+ chatbox_id = 'imjs-' + md5.hex(username);
if(!(chatbox = $('#' + chatbox_id)).length) {
// add a tab
var tab = this.addTab(username, '#' + chatbox_id);
@@ -727,7 +727,7 @@ $.extend(AjaxIM.prototype, {
}
if(this.friends[friend]) {
- var friend_id = 'imjs-friend-' + $.md5(friend + this.friends[friend].group);
+ var friend_id = 'imjs-friend-' + md5.hex(friend + this.friends[friend].group);
$('#' + friend_id).attr('class', 'imjs-friend imjs-' + status);
if(status == 0) {
@@ -1046,7 +1046,7 @@ $.extend(AjaxIM.prototype, {
addTab: function(label, action, closable) {
var tab = $('.imjs-tab.imjs-default').clone().insertAfter('#imjs-scroll-left');
tab.removeClass('imjs-default')
- .attr('id', 'imjs-tab-' + $.md5(label))
+ .attr('id', 'imjs-tab-' + md5.hex(label))
.html(tab.html().replace('{label}', label))
.data('state', 'minimized');
@@ -1274,5 +1274,5 @@ AjaxIM.l10n = {
notConnected: 'You are currently not connected or the server is not available. ' +
'Please ensure that you are signed in and try again.',
- notConnectedTip: 'You are currently not connected.',
+ notConnectedTip: 'You are currently not connected.'
};
\ No newline at end of file
diff --git a/client/js/intro.js b/client/js/intro.js
index ad0d34a..1f8df18 100644
--- a/client/js/intro.js
+++ b/client/js/intro.js
@@ -1 +1,22 @@
-(function($) {
\ No newline at end of file
+/*!
+ * Ajax IM
+ * Ajax Instant Messeneger
+ * http://ajaxim.com/
+ *
+ * Copyright 2010, Joshua Gross
+ * Licensed under the MIT license.
+ * [License URL]
+ *
+ * Includes:
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * v2.1, Copyright 2002, Paul Johnston
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info
+ *
+ * Date Format 1.2.3
+ * http://blog.stevenlevithan.com/archives/date-time-format
+ * Copyright 2009 Steven Levithan
+ * MIT license
+ */
+(function($) {
diff --git a/client/js/jquery.md5.js b/client/js/jquery.md5.js
deleted file mode 100644
index 0333717..0000000
--- a/client/js/jquery.md5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-
- /**
- * jQuery MD5 hash algorithm function
- *
- *
- * Calculate the md5 hash of a String
- * String $.md5 ( String str )
- *
- *
- * Calculates the MD5 hash of str using the ยป RSA Data Security, Inc. MD5 Message-Digest Algorithm, and returns that hash.
- * MD5 (Message-Digest algorithm 5) is a widely-used cryptographic hash function with a 128-bit hash value. MD5 has been employed in a wide variety of security applications, and is also commonly used to check the integrity of data. The generated hash is also non-reversable. Data cannot be retrieved from the message digest, the digest uniquely identifies the data.
- * MD5 was developed by Professor Ronald L. Rivest in 1994. Its 128 bit (16 byte) message digest makes it a faster implementation than SHA-1.
- * This script is used to process a variable length message into a fixed-length output of 128 bits using the MD5 algorithm. It is fully compatible with UTF-8 encoding. It is very useful when u want to transfer encrypted passwords over the internet. If you plan using UTF-8 encoding in your project don't forget to set the page encoding to UTF-8 (Content-Type meta tag).
- * This function orginally get from the WebToolkit and rewrite for using as the jQuery plugin.
- *
- * Example
- * Code
- *
- * $.md5("I'm Persian.");
- *
- * Result
- *
- * "b8c901d0f02223f9761016cfff9d68df"
- *
- *
- * @alias Muhammad Hussein Fattahizadeh < muhammad [AT] semnanweb [DOT] com >
- * @link http://www.semnanweb.com/jquery-plugin/md5.html
- * @see http://www.webtoolkit.info/
- * @license http://www.gnu.org/licenses/gpl.html [GNU General Public License]
- * @param {jQuery} {md5:function(string))
- * @return string
- */
-
- (function($){
-
- var rotateLeft = function(lValue, iShiftBits) {
- return (lValue << iShiftBits) | (lValue >>> (32 - iShiftBits));
- }
-
- var addUnsigned = function(lX, lY) {
- var lX4, lY4, lX8, lY8, lResult;
- lX8 = (lX & 0x80000000);
- lY8 = (lY & 0x80000000);
- lX4 = (lX & 0x40000000);
- lY4 = (lY & 0x40000000);
- lResult = (lX & 0x3FFFFFFF) + (lY & 0x3FFFFFFF);
- if (lX4 & lY4) return (lResult ^ 0x80000000 ^ lX8 ^ lY8);
- if (lX4 | lY4) {
- if (lResult & 0x40000000) return (lResult ^ 0xC0000000 ^ lX8 ^ lY8);
- else return (lResult ^ 0x40000000 ^ lX8 ^ lY8);
- } else {
- return (lResult ^ lX8 ^ lY8);
- }
- }
-
- var F = function(x, y, z) {
- return (x & y) | ((~ x) & z);
- }
-
- var G = function(x, y, z) {
- return (x & z) | (y & (~ z));
- }
-
- var H = function(x, y, z) {
- return (x ^ y ^ z);
- }
-
- var I = function(x, y, z) {
- return (y ^ (x | (~ z)));
- }
-
- var FF = function(a, b, c, d, x, s, ac) {
- a = addUnsigned(a, addUnsigned(addUnsigned(F(b, c, d), x), ac));
- return addUnsigned(rotateLeft(a, s), b);
- };
-
- var GG = function(a, b, c, d, x, s, ac) {
- a = addUnsigned(a, addUnsigned(addUnsigned(G(b, c, d), x), ac));
- return addUnsigned(rotateLeft(a, s), b);
- };
-
- var HH = function(a, b, c, d, x, s, ac) {
- a = addUnsigned(a, addUnsigned(addUnsigned(H(b, c, d), x), ac));
- return addUnsigned(rotateLeft(a, s), b);
- };
-
- var II = function(a, b, c, d, x, s, ac) {
- a = addUnsigned(a, addUnsigned(addUnsigned(I(b, c, d), x), ac));
- return addUnsigned(rotateLeft(a, s), b);
- };
-
- var convertToWordArray = function(string) {
- var lWordCount;
- var lMessageLength = string.length;
- var lNumberOfWordsTempOne = lMessageLength + 8;
- var lNumberOfWordsTempTwo = (lNumberOfWordsTempOne - (lNumberOfWordsTempOne % 64)) / 64;
- var lNumberOfWords = (lNumberOfWordsTempTwo + 1) * 16;
- var lWordArray = Array(lNumberOfWords - 1);
- var lBytePosition = 0;
- var lByteCount = 0;
- while (lByteCount < lMessageLength) {
- lWordCount = (lByteCount - (lByteCount % 4)) / 4;
- lBytePosition = (lByteCount % 4) * 8;
- lWordArray[lWordCount] = (lWordArray[lWordCount] | (string.charCodeAt(lByteCount) << lBytePosition));
- lByteCount++;
- }
- lWordCount = (lByteCount - (lByteCount % 4)) / 4;
- lBytePosition = (lByteCount % 4) * 8;
- lWordArray[lWordCount] = lWordArray[lWordCount] | (0x80 << lBytePosition);
- lWordArray[lNumberOfWords - 2] = lMessageLength << 3;
- lWordArray[lNumberOfWords - 1] = lMessageLength >>> 29;
- return lWordArray;
- };
-
- var wordToHex = function(lValue) {
- var WordToHexValue = "", WordToHexValueTemp = "", lByte, lCount;
- for (lCount = 0; lCount <= 3; lCount++) {
- lByte = (lValue >>> (lCount * 8)) & 255;
- WordToHexValueTemp = "0" + lByte.toString(16);
- WordToHexValue = WordToHexValue + WordToHexValueTemp.substr(WordToHexValueTemp.length - 2, 2);
- }
- return WordToHexValue;
- };
-
- var uTF8Encode = function(string) {
- string = string.replace(/\x0d\x0a/g, "\x0a");
- var output = "";
- for (var n = 0; n < string.length; n++) {
- var c = string.charCodeAt(n);
- if (c < 128) {
- output += String.fromCharCode(c);
- } else if ((c > 127) && (c < 2048)) {
- output += String.fromCharCode((c >> 6) | 192);
- output += String.fromCharCode((c & 63) | 128);
- } else {
- output += String.fromCharCode((c >> 12) | 224);
- output += String.fromCharCode(((c >> 6) & 63) | 128);
- output += String.fromCharCode((c & 63) | 128);
- }
- }
- return output;
- };
-
- $.extend({
- md5: function(string) {
- var x = Array();
- var k, AA, BB, CC, DD, a, b, c, d;
- var S11=7, S12=12, S13=17, S14=22;
- var S21=5, S22=9 , S23=14, S24=20;
- var S31=4, S32=11, S33=16, S34=23;
- var S41=6, S42=10, S43=15, S44=21;
- string = uTF8Encode(string);
- x = convertToWordArray(string);
- a = 0x67452301; b = 0xEFCDAB89; c = 0x98BADCFE; d = 0x10325476;
- for (k = 0; k < x.length; k += 16) {
- AA = a; BB = b; CC = c; DD = d;
- a = FF(a, b, c, d, x[k+0], S11, 0xD76AA478);
- d = FF(d, a, b, c, x[k+1], S12, 0xE8C7B756);
- c = FF(c, d, a, b, x[k+2], S13, 0x242070DB);
- b = FF(b, c, d, a, x[k+3], S14, 0xC1BDCEEE);
- a = FF(a, b, c, d, x[k+4], S11, 0xF57C0FAF);
- d = FF(d, a, b, c, x[k+5], S12, 0x4787C62A);
- c = FF(c, d, a, b, x[k+6], S13, 0xA8304613);
- b = FF(b, c, d, a, x[k+7], S14, 0xFD469501);
- a = FF(a, b, c, d, x[k+8], S11, 0x698098D8);
- d = FF(d, a, b, c, x[k+9], S12, 0x8B44F7AF);
- c = FF(c, d, a, b, x[k+10], S13, 0xFFFF5BB1);
- b = FF(b, c, d, a, x[k+11], S14, 0x895CD7BE);
- a = FF(a, b, c, d, x[k+12], S11, 0x6B901122);
- d = FF(d, a, b, c, x[k+13], S12, 0xFD987193);
- c = FF(c, d, a, b, x[k+14], S13, 0xA679438E);
- b = FF(b, c, d, a, x[k+15], S14, 0x49B40821);
- a = GG(a, b, c, d, x[k+1], S21, 0xF61E2562);
- d = GG(d, a, b, c, x[k+6], S22, 0xC040B340);
- c = GG(c, d, a, b, x[k+11], S23, 0x265E5A51);
- b = GG(b, c, d, a, x[k+0], S24, 0xE9B6C7AA);
- a = GG(a, b, c, d, x[k+5], S21, 0xD62F105D);
- d = GG(d, a, b, c, x[k+10], S22, 0x2441453);
- c = GG(c, d, a, b, x[k+15], S23, 0xD8A1E681);
- b = GG(b, c, d, a, x[k+4], S24, 0xE7D3FBC8);
- a = GG(a, b, c, d, x[k+9], S21, 0x21E1CDE6);
- d = GG(d, a, b, c, x[k+14], S22, 0xC33707D6);
- c = GG(c, d, a, b, x[k+3], S23, 0xF4D50D87);
- b = GG(b, c, d, a, x[k+8], S24, 0x455A14ED);
- a = GG(a, b, c, d, x[k+13], S21, 0xA9E3E905);
- d = GG(d, a, b, c, x[k+2], S22, 0xFCEFA3F8);
- c = GG(c, d, a, b, x[k+7], S23, 0x676F02D9);
- b = GG(b, c, d, a, x[k+12], S24, 0x8D2A4C8A);
- a = HH(a, b, c, d, x[k+5], S31, 0xFFFA3942);
- d = HH(d, a, b, c, x[k+8], S32, 0x8771F681);
- c = HH(c, d, a, b, x[k+11], S33, 0x6D9D6122);
- b = HH(b, c, d, a, x[k+14], S34, 0xFDE5380C);
- a = HH(a, b, c, d, x[k+1], S31, 0xA4BEEA44);
- d = HH(d, a, b, c, x[k+4], S32, 0x4BDECFA9);
- c = HH(c, d, a, b, x[k+7], S33, 0xF6BB4B60);
- b = HH(b, c, d, a, x[k+10], S34, 0xBEBFBC70);
- a = HH(a, b, c, d, x[k+13], S31, 0x289B7EC6);
- d = HH(d, a, b, c, x[k+0], S32, 0xEAA127FA);
- c = HH(c, d, a, b, x[k+3], S33, 0xD4EF3085);
- b = HH(b, c, d, a, x[k+6], S34, 0x4881D05);
- a = HH(a, b, c, d, x[k+9], S31, 0xD9D4D039);
- d = HH(d, a, b, c, x[k+12], S32, 0xE6DB99E5);
- c = HH(c, d, a, b, x[k+15], S33, 0x1FA27CF8);
- b = HH(b, c, d, a, x[k+2], S34, 0xC4AC5665);
- a = II(a, b, c, d, x[k+0], S41, 0xF4292244);
- d = II(d, a, b, c, x[k+7], S42, 0x432AFF97);
- c = II(c, d, a, b, x[k+14], S43, 0xAB9423A7);
- b = II(b, c, d, a, x[k+5], S44, 0xFC93A039);
- a = II(a, b, c, d, x[k+12], S41, 0x655B59C3);
- d = II(d, a, b, c, x[k+3], S42, 0x8F0CCC92);
- c = II(c, d, a, b, x[k+10], S43, 0xFFEFF47D);
- b = II(b, c, d, a, x[k+1], S44, 0x85845DD1);
- a = II(a, b, c, d, x[k+8], S41, 0x6FA87E4F);
- d = II(d, a, b, c, x[k+15], S42, 0xFE2CE6E0);
- c = II(c, d, a, b, x[k+6], S43, 0xA3014314);
- b = II(b, c, d, a, x[k+13], S44, 0x4E0811A1);
- a = II(a, b, c, d, x[k+4], S41, 0xF7537E82);
- d = II(d, a, b, c, x[k+11], S42, 0xBD3AF235);
- c = II(c, d, a, b, x[k+2], S43, 0x2AD7D2BB);
- b = II(b, c, d, a, x[k+9], S44, 0xEB86D391);
- a = addUnsigned(a, AA);
- b = addUnsigned(b, BB);
- c = addUnsigned(c, CC);
- d = addUnsigned(d, DD);
- }
- var tempValue = wordToHex(a) + wordToHex(b) + wordToHex(c) + wordToHex(d);
- return tempValue.toLowerCase();
- }
- });
- })(jQuery);
\ No newline at end of file
diff --git a/client/js/json.js b/client/js/json.js
index c52b92a..a1a3b17 100644
--- a/client/js/json.js
+++ b/client/js/json.js
@@ -479,4 +479,4 @@ replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
throw new SyntaxError('JSON.parse');
};
}
-}());
\ No newline at end of file
+}());
diff --git a/client/js/md5.js b/client/js/md5.js
new file mode 100644
index 0000000..ffa040e
--- /dev/null
+++ b/client/js/md5.js
@@ -0,0 +1,256 @@
+/*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002.
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info.
+ */
+
+var md5 = (function() {
+/*
+ * Calculate the MD5 of an array of little-endian words, and a bit length
+ */
+function core_md5(x, len) {
+ /* append padding */
+ x[len >> 5] |= 0x80 << ((len) % 32);
+ x[(((len + 64) >>> 9) << 4) + 14] = len;
+
+ var a = 1732584193;
+ var b = -271733879;
+ var c = -1732584194;
+ var d = 271733878;
+
+ for(var i = 0; i < x.length; i += 16) {
+ var olda = a;
+ var oldb = b;
+ var oldc = c;
+ var oldd = d;
+
+ a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936);
+ d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586);
+ c = md5_ff(c, d, a, b, x[i+ 2], 17, 606105819);
+ b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330);
+ a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897);
+ d = md5_ff(d, a, b, c, x[i+ 5], 12, 1200080426);
+ c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341);
+ b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983);
+ a = md5_ff(a, b, c, d, x[i+ 8], 7 , 1770035416);
+ d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417);
+ c = md5_ff(c, d, a, b, x[i+10], 17, -42063);
+ b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162);
+ a = md5_ff(a, b, c, d, x[i+12], 7 , 1804603682);
+ d = md5_ff(d, a, b, c, x[i+13], 12, -40341101);
+ c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290);
+ b = md5_ff(b, c, d, a, x[i+15], 22, 1236535329);
+
+ a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510);
+ d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
+ c = md5_gg(c, d, a, b, x[i+11], 14, 643717713);
+ b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302);
+ a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691);
+ d = md5_gg(d, a, b, c, x[i+10], 9 , 38016083);
+ c = md5_gg(c, d, a, b, x[i+15], 14, -660478335);
+ b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848);
+ a = md5_gg(a, b, c, d, x[i+ 9], 5 , 568446438);
+ d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690);
+ c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961);
+ b = md5_gg(b, c, d, a, x[i+ 8], 20, 1163531501);
+ a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467);
+ d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784);
+ c = md5_gg(c, d, a, b, x[i+ 7], 14, 1735328473);
+ b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734);
+
+ a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558);
+ d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463);
+ c = md5_hh(c, d, a, b, x[i+11], 16, 1839030562);
+ b = md5_hh(b, c, d, a, x[i+14], 23, -35309556);
+ a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
+ d = md5_hh(d, a, b, c, x[i+ 4], 11, 1272893353);
+ c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632);
+ b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640);
+ a = md5_hh(a, b, c, d, x[i+13], 4 , 681279174);
+ d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222);
+ c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979);
+ b = md5_hh(b, c, d, a, x[i+ 6], 23, 76029189);
+ a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487);
+ d = md5_hh(d, a, b, c, x[i+12], 11, -421815835);
+ c = md5_hh(c, d, a, b, x[i+15], 16, 530742520);
+ b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651);
+
+ a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844);
+ d = md5_ii(d, a, b, c, x[i+ 7], 10, 1126891415);
+ c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905);
+ b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055);
+ a = md5_ii(a, b, c, d, x[i+12], 6 , 1700485571);
+ d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606);
+ c = md5_ii(c, d, a, b, x[i+10], 15, -1051523);
+ b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799);
+ a = md5_ii(a, b, c, d, x[i+ 8], 6 , 1873313359);
+ d = md5_ii(d, a, b, c, x[i+15], 10, -30611744);
+ c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380);
+ b = md5_ii(b, c, d, a, x[i+13], 21, 1309151649);
+ a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070);
+ d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379);
+ c = md5_ii(c, d, a, b, x[i+ 2], 15, 718787259);
+ b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551);
+
+ a = safe_add(a, olda);
+ b = safe_add(b, oldb);
+ c = safe_add(c, oldc);
+ d = safe_add(d, oldd);
+ }
+ return [a, b, c, d];
+}
+
+/*
+ * These functions implement the four basic operations the algorithm uses.
+ */
+function md5_cmn(q, a, b, x, s, t) {
+ return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b);
+}
+function md5_ff(a, b, c, d, x, s, t) {
+ return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
+}
+function md5_gg(a, b, c, d, x, s, t) {
+ return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
+}
+function md5_hh(a, b, c, d, x, s, t) {
+ return md5_cmn(b ^ c ^ d, a, b, x, s, t);
+}
+function md5_ii(a, b, c, d, x, s, t) {
+ return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
+}
+
+/*
+ * Calculate the HMAC-MD5, of a key and some data
+ */
+function core_hmac_md5(key, data) {
+ var bkey = str2binl(key);
+ if(bkey.length > 16) bkey = core_md5(bkey, key.length * md5.chrsz);
+
+ var ipad = [], opad = [];
+ for(var i = 0; i < 16; i++) {
+ ipad[i] = bkey[i] ^ 0x36363636;
+ opad[i] = bkey[i] ^ 0x5C5C5C5C;
+ }
+
+ var hash = core_md5(ipad.concat(str2binl(data)), 512 + data.length * md5.chrsz);
+ return core_md5(opad.concat(hash), 512 + 128);
+}
+
+/*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+function safe_add(x, y) {
+ var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+ var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+ return (msw << 16) | (lsw & 0xFFFF);
+}
+
+/*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+function bit_rol(num, cnt) {
+ return (num << cnt) | (num >>> (32 - cnt));
+}
+
+/*
+ * Convert a string to an array of little-endian words
+ * If chrsz is ASCII, characters >255 have their hi-byte silently ignored.
+ */
+function str2binl(str) {
+ var bin = [], chrsz = md5.chrsz;
+ var mask = (1 << chrsz) - 1;
+ for(var i = 0; i < str.length * chrsz; i += chrsz)
+ bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (i%32);
+ return bin;
+}
+
+/*
+ * Convert an array of little-endian words to a string
+ */
+function binl2str(bin) {
+ var str = "", chrsz = md5.chrsz;
+ var mask = (1 << chrsz) - 1;
+ for(var i = 0; i < bin.length * 32; i += chrsz)
+ str += String.fromCharCode((bin[i>>5] >>> (i % 32)) & mask);
+ return str;
+}
+
+/*
+ * Convert an array of little-endian words to a hex string.
+ */
+function binl2hex(binarray) {
+ var hex_tab = md5.hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+ var str = "";
+ for(var i = 0; i < binarray.length * 4; i++) {
+ str += hex_tab.charAt((binarray[i>>2] >> ((i%4)*8+4)) & 0xF) +
+ hex_tab.charAt((binarray[i>>2] >> ((i%4)*8 )) & 0xF);
+ }
+ return str;
+}
+
+/*
+ * Convert an array of little-endian words to a base-64 string
+ */
+function binl2b64(binarray) {
+ var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ var str = "";
+ for(var i = 0; i < binarray.length * 4; i += 3) {
+ var triplet = (((binarray[i >> 2] >> 8 * ( i %4)) & 0xFF) << 16)
+ | (((binarray[i+1 >> 2] >> 8 * ((i+1)%4)) & 0xFF) << 8 )
+ | ((binarray[i+2 >> 2] >> 8 * ((i+2)%4)) & 0xFF);
+ for(var j = 0; j < 4; j++) {
+ if(i * 8 + j * 6 > binarray.length * 32) str += md5.b64pad;
+ else str += tab.charAt((triplet >> 6*(3-j)) & 0x3F);
+ }
+ }
+ return str;
+}
+
+ return {
+/*
+ * Configurable variables. You may need to tweak these to be compatible with
+ * the server-side, but the defaults work in most cases.
+ */
+ hexcase: 0, // hex output format. 0 - lowercase; 1 - uppercase
+ b64pad: "", // base-64 pad character. "=" for strict RFC compliance
+ chrsz: 8, // bits per input character. 8 - ASCII; 16 - Unicode
+
+/*
+ * These are the functions you'll usually want to call
+ * They take string arguments and return either hex or base-64 encoded strings
+ */
+ hex:function( s ) {
+ return binl2hex( core_md5( str2binl( s ), s.length * md5.chrsz ) );
+ },
+
+ base64:function( s ) {
+ return binl2b64( core_md5( str2binl( s ), s.length * md5.chrsz ) );
+ },
+
+ string:function( s ) {
+ return binl2str( core_md5( str2binl( s ), s.length * md5.chrsz ) );
+ },
+
+ hmac:{
+ hex:function( key, data ) {
+ return binl2hex( core_hmac_md5( key, data ) );
+ },
+
+ base64:function( key, data ) {
+ return binl2b64( core_hmac_md5( key, data ) );
+ },
+
+ string:function( key, data ) {
+ return binl2str( core_hmac_md5( key, data ) );
+ }
+ },
+
+ test:function() { // Perform a simple self-test to see if the VM is working
+ return this.hex("abc") == "900150983cd24fb0d6963f7d28e17f72";
+ }
+ };
+})();
diff --git a/client/js/outro.js b/client/js/outro.js
index 15576f0..0b7bd75 100644
--- a/client/js/outro.js
+++ b/client/js/outro.js
@@ -1 +1,2 @@
+
})(jQuery || $);
\ No newline at end of file
diff --git a/server/dev/views/chat.jade b/server/dev/views/chat.jade
index eaceee7..9673cb5 100644
--- a/server/dev/views/chat.jade
+++ b/server/dev/views/chat.jade
@@ -4,7 +4,7 @@ html
title Ajax IM
script(src: '/js/jquery-1.4.1.js', type: 'text/javascript')
script(src: '/js/jquery.jsonp-1.1.3.min.js', type: 'text/javascript')
- script(src: '/js/jquery.md5.js', type: 'text/javascript')
+ script(src: '/js/md5.js', type: 'text/javascript')
script(src: '/js/store.js', type: 'text/javascript')
script(src: '/js/cookies.js', type: 'text/javascript')
script(src: '/js/dateformat.js', type: 'text/javascript')