From e5b254d5b406a2ed6c15e27aa3d05e6f729178ca Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sat, 8 Jan 2011 21:06:46 +0100 Subject: [PATCH] Cleanup javascript again. * include core.js * fix line encoding of sha1.js/secure_hash.js and merge the files * update code to use $.dynPost() instead of dynpost and dynpostkv Signed-off-by: Florent Bruneau --- Makefile | 5 +- classes/xnetpage.php | 2 +- classes/xorgpage.php | 3 +- core | 2 +- htdocs/javascript/secure_hash.js | 307 ++++++++++++++++++++++++++++++++------- htdocs/javascript/sha1.js | 203 -------------------------- htdocs/javascript/wiki.js | 48 ------ htdocs/javascript/xorg.js | 198 ------------------------- include/banana/forum.inc.php | 2 +- templates/platal/skins.tpl | 2 +- templates/xnetevents/index.tpl | 4 +- 11 files changed, 268 insertions(+), 508 deletions(-) delete mode 100644 htdocs/javascript/sha1.js delete mode 100644 htdocs/javascript/wiki.js diff --git a/Makefile b/Makefile index d7ee751..509ab88 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,10 @@ htdocs/.htaccess: htdocs/.htaccess.in Makefile ## ## static content ## -static: htdocs/javascript@VERSION +static: htdocs/javascript/core.js htdocs/javascript@VERSION + +htdocs/javascript/core.js: + cd htdocs/javascript/ && ln -s ../../core/htdocs/javascript/core.js %@VERSION: % Makefile ChangeLog cd $< && rm -f $(VERSION) && ln -sf . $(VERSION) diff --git a/classes/xnetpage.php b/classes/xnetpage.php index 0ef5cfb..022ab4e 100644 --- a/classes/xnetpage.php +++ b/classes/xnetpage.php @@ -43,7 +43,7 @@ class XnetPage extends PlPage } $this->addJsLink('jquery.js'); $this->addJsLink('overlib.js'); - $this->addJsLink('wiki.js'); + $this->addJsLink('core.js'); $this->addJsLink('xorg.js'); $this->setTitle('Les associations polytechniciennes'); } diff --git a/classes/xorgpage.php b/classes/xorgpage.php index f831b54..a1a465e 100644 --- a/classes/xorgpage.php +++ b/classes/xorgpage.php @@ -30,8 +30,7 @@ class XorgPage extends PlPage $this->addJsLink('jquery.js'); $this->addJsLink('overlib.js'); $this->addJsLink('secure_hash.js'); - $this->addJsLink('sha1.js'); - $this->addJsLink('wiki.js'); + $this->addJsLink('core.js'); $this->addJsLink('xorg.js'); $this->setTitle('le site des élèves et anciens élèves de l\'École polytechnique'); if (S::logged() && S::user()->checkPerms('admin')) { diff --git a/core b/core index d57eed5..819c613 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit d57eed5e4f3e05e4987e3db755f78d5d2c91d9bf +Subproject commit 819c6139e64956914003d1212d5c9f82332793e2 diff --git a/htdocs/javascript/secure_hash.js b/htdocs/javascript/secure_hash.js index 6053109..56ece48 100644 --- a/htdocs/javascript/secure_hash.js +++ b/htdocs/javascript/secure_hash.js @@ -1,51 +1,258 @@ -/*************************************************************************** - * Copyright (C) 2003-2011 Polytechnique.org * - * http://opensource.polytechnique.org/ * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software * - * Foundation, Inc., * - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - ***************************************************************************/ - -function hash_encrypt(a) { - return hex_sha1(a); -} - -var hexa_h = "0123456789abcdef"; - -function dechex(a) { - return hexa_h.charAt(a); -} - -function hexdec(a) { - return hexa_h.indexOf(a); -} - -function hash_xor(a, b) { - var c,i,j,k; - c = ""; - i = a.length; - j = b.length; - if (i < j) { - var d; - d = a; a = b; b = d; - k = i; i = j; j = k; - } - for (k = 0; k < j; k++) - c += dechex(hexdec(a.charAt(k)) ^ hexdec(b.charAt(k))); - for (; k < i; k++) - c += a.charAt(k); - return c; -} +/*************************************************************************** + * Copyright (C) 2003-2011 Polytechnique.org * + * http://opensource.polytechnique.org/ * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the Free Software * + * Foundation, Inc., * + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + ***************************************************************************/ + +/* {{{ SHA1 Implementation */ + +/* + * A JavaScript implementation of the Secure Hash Algorithm, SHA-1, as defined + * in FIPS PUB 180-1 + * Version 2.1a Copyright Paul Johnston 2000 - 2002. + * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet + * Distributed under the BSD License + * See http://pajhome.org.uk/crypt/md5 for details. + */ + +/* + * Configurable variables. You may need to tweak these to be compatible with + * the server-side, but the defaults work in most cases. + */ +var hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase */ +var b64pad = ""; /* base-64 pad character. "=" for strict RFC compliance */ +var 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 + */ +function hex_sha1(s){return binb2hex(core_sha1(str2binb(s),s.length * chrsz));} +function b64_sha1(s){return binb2b64(core_sha1(str2binb(s),s.length * chrsz));} +function str_sha1(s){return binb2str(core_sha1(str2binb(s),s.length * chrsz));} +function hex_hmac_sha1(key, data){ return binb2hex(core_hmac_sha1(key, data));} +function b64_hmac_sha1(key, data){ return binb2b64(core_hmac_sha1(key, data));} +function str_hmac_sha1(key, data){ return binb2str(core_hmac_sha1(key, data));} + +/* + * Perform a simple self-test to see if the VM is working + */ +function sha1_vm_test() +{ + return hex_sha1("abc") == "a9993e364706816aba3e25717850c26c9cd0d89d"; +} + +/* + * Calculate the SHA-1 of an array of big-endian words, and a bit length + */ +function core_sha1(x, len) +{ + /* append padding */ + x[len >> 5] |= 0x80 << (24 - len % 32); + x[((len + 64 >> 9) << 4) + 15] = len; + + var w = Array(80); + var a = 1732584193; + var b = -271733879; + var c = -1732584194; + var d = 271733878; + var e = -1009589776; + + for(var i = 0; i < x.length; i += 16) + { + var olda = a; + var oldb = b; + var oldc = c; + var oldd = d; + var olde = e; + + for(var j = 0; j < 80; j++) + { + if(j < 16) w[j] = x[i + j]; + else w[j] = rol(w[j-3] ^ w[j-8] ^ w[j-14] ^ w[j-16], 1); + var t = safe_add(safe_add(rol(a, 5), sha1_ft(j, b, c, d)), + safe_add(safe_add(e, w[j]), sha1_kt(j))); + e = d; + d = c; + c = rol(b, 30); + b = a; + a = t; + } + + a = safe_add(a, olda); + b = safe_add(b, oldb); + c = safe_add(c, oldc); + d = safe_add(d, oldd); + e = safe_add(e, olde); + } + return Array(a, b, c, d, e); + +} + +/* + * Perform the appropriate triplet combination function for the current + * iteration + */ +function sha1_ft(t, b, c, d) +{ + if(t < 20) return (b & c) | ((~b) & d); + if(t < 40) return b ^ c ^ d; + if(t < 60) return (b & c) | (b & d) | (c & d); + return b ^ c ^ d; +} + +/* + * Determine the appropriate additive constant for the current iteration + */ +function sha1_kt(t) +{ + return (t < 20) ? 1518500249 : (t < 40) ? 1859775393 : + (t < 60) ? -1894007588 : -899497514; +} + +/* + * Calculate the HMAC-SHA1 of a key and some data + */ +function core_hmac_sha1(key, data) +{ + var bkey = str2binb(key); + if(bkey.length > 16) bkey = core_sha1(bkey, key.length * chrsz); + + var ipad = Array(16), opad = Array(16); + for(var i = 0; i < 16; i++) + { + ipad[i] = bkey[i] ^ 0x36363636; + opad[i] = bkey[i] ^ 0x5C5C5C5C; + } + + var hash = core_sha1(ipad.concat(str2binb(data)), 512 + data.length * chrsz); + return core_sha1(opad.concat(hash), 512 + 160); +} + +/* + * 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 rol(num, cnt) +{ + return (num << cnt) | (num >>> (32 - cnt)); +} + +/* + * Convert an 8-bit or 16-bit string to an array of big-endian words + * In 8-bit function, characters >255 have their hi-byte silently ignored. + */ +function str2binb(str) +{ + var bin = Array(); + var mask = (1 << chrsz) - 1; + for(var i = 0; i < str.length * chrsz; i += chrsz) + bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (32 - chrsz - i%32); + return bin; +} + +/* + * Convert an array of big-endian words to a string + */ +function binb2str(bin) +{ + var str = ""; + var mask = (1 << chrsz) - 1; + for(var i = 0; i < bin.length * 32; i += chrsz) + str += String.fromCharCode((bin[i>>5] >>> (32 - chrsz - i%32)) & mask); + return str; +} + +/* + * Convert an array of big-endian words to a hex string. + */ +function binb2hex(binarray) +{ + var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef"; + var str = ""; + for(var i = 0; i < binarray.length * 4; i++) + { + str += hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8+4)) & 0xF) + + hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8 )) & 0xF); + } + return str; +} + +/* + * Convert an array of big-endian words to a base-64 string + */ +function binb2b64(binarray) +{ + var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + var str = ""; + for(var i = 0; i < binarray.length * 4; i += 3) + { + var triplet = (((binarray[i >> 2] >> 8 * (3 - i %4)) & 0xFF) << 16) + | (((binarray[i+1 >> 2] >> 8 * (3 - (i+1)%4)) & 0xFF) << 8 ) + | ((binarray[i+2 >> 2] >> 8 * (3 - (i+2)%4)) & 0xFF); + for(var j = 0; j < 4; j++) + { + if(i * 8 + j * 6 > binarray.length * 32) str += b64pad; + else str += tab.charAt((triplet >> 6*(3-j)) & 0x3F); + } + } + return str; +} + +/* }}} */ + +function hash_encrypt(a) { + return hex_sha1(a); +} + +var hexa_h = "0123456789abcdef"; + +function dechex(a) { + return hexa_h.charAt(a); +} + +function hexdec(a) { + return hexa_h.indexOf(a); +} + +function hash_xor(a, b) { + var c,i,j,k; + c = ""; + i = a.length; + j = b.length; + if (i < j) { + var d; + d = a; a = b; b = d; + k = i; i = j; j = k; + } + for (k = 0; k < j; k++) + c += dechex(hexdec(a.charAt(k)) ^ hexdec(b.charAt(k))); + for (; k < i; k++) + c += a.charAt(k); + return c; +} // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: diff --git a/htdocs/javascript/sha1.js b/htdocs/javascript/sha1.js deleted file mode 100644 index a546ee3..0000000 --- a/htdocs/javascript/sha1.js +++ /dev/null @@ -1,203 +0,0 @@ -/* - * A JavaScript implementation of the Secure Hash Algorithm, SHA-1, as defined - * in FIPS PUB 180-1 - * Version 2.1a Copyright Paul Johnston 2000 - 2002. - * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet - * Distributed under the BSD License - * See http://pajhome.org.uk/crypt/md5 for details. - */ - -/* - * Configurable variables. You may need to tweak these to be compatible with - * the server-side, but the defaults work in most cases. - */ -var hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase */ -var b64pad = ""; /* base-64 pad character. "=" for strict RFC compliance */ -var 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 - */ -function hex_sha1(s){return binb2hex(core_sha1(str2binb(s),s.length * chrsz));} -function b64_sha1(s){return binb2b64(core_sha1(str2binb(s),s.length * chrsz));} -function str_sha1(s){return binb2str(core_sha1(str2binb(s),s.length * chrsz));} -function hex_hmac_sha1(key, data){ return binb2hex(core_hmac_sha1(key, data));} -function b64_hmac_sha1(key, data){ return binb2b64(core_hmac_sha1(key, data));} -function str_hmac_sha1(key, data){ return binb2str(core_hmac_sha1(key, data));} - -/* - * Perform a simple self-test to see if the VM is working - */ -function sha1_vm_test() -{ - return hex_sha1("abc") == "a9993e364706816aba3e25717850c26c9cd0d89d"; -} - -/* - * Calculate the SHA-1 of an array of big-endian words, and a bit length - */ -function core_sha1(x, len) -{ - /* append padding */ - x[len >> 5] |= 0x80 << (24 - len % 32); - x[((len + 64 >> 9) << 4) + 15] = len; - - var w = Array(80); - var a = 1732584193; - var b = -271733879; - var c = -1732584194; - var d = 271733878; - var e = -1009589776; - - for(var i = 0; i < x.length; i += 16) - { - var olda = a; - var oldb = b; - var oldc = c; - var oldd = d; - var olde = e; - - for(var j = 0; j < 80; j++) - { - if(j < 16) w[j] = x[i + j]; - else w[j] = rol(w[j-3] ^ w[j-8] ^ w[j-14] ^ w[j-16], 1); - var t = safe_add(safe_add(rol(a, 5), sha1_ft(j, b, c, d)), - safe_add(safe_add(e, w[j]), sha1_kt(j))); - e = d; - d = c; - c = rol(b, 30); - b = a; - a = t; - } - - a = safe_add(a, olda); - b = safe_add(b, oldb); - c = safe_add(c, oldc); - d = safe_add(d, oldd); - e = safe_add(e, olde); - } - return Array(a, b, c, d, e); - -} - -/* - * Perform the appropriate triplet combination function for the current - * iteration - */ -function sha1_ft(t, b, c, d) -{ - if(t < 20) return (b & c) | ((~b) & d); - if(t < 40) return b ^ c ^ d; - if(t < 60) return (b & c) | (b & d) | (c & d); - return b ^ c ^ d; -} - -/* - * Determine the appropriate additive constant for the current iteration - */ -function sha1_kt(t) -{ - return (t < 20) ? 1518500249 : (t < 40) ? 1859775393 : - (t < 60) ? -1894007588 : -899497514; -} - -/* - * Calculate the HMAC-SHA1 of a key and some data - */ -function core_hmac_sha1(key, data) -{ - var bkey = str2binb(key); - if(bkey.length > 16) bkey = core_sha1(bkey, key.length * chrsz); - - var ipad = Array(16), opad = Array(16); - for(var i = 0; i < 16; i++) - { - ipad[i] = bkey[i] ^ 0x36363636; - opad[i] = bkey[i] ^ 0x5C5C5C5C; - } - - var hash = core_sha1(ipad.concat(str2binb(data)), 512 + data.length * chrsz); - return core_sha1(opad.concat(hash), 512 + 160); -} - -/* - * 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 rol(num, cnt) -{ - return (num << cnt) | (num >>> (32 - cnt)); -} - -/* - * Convert an 8-bit or 16-bit string to an array of big-endian words - * In 8-bit function, characters >255 have their hi-byte silently ignored. - */ -function str2binb(str) -{ - var bin = Array(); - var mask = (1 << chrsz) - 1; - for(var i = 0; i < str.length * chrsz; i += chrsz) - bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (32 - chrsz - i%32); - return bin; -} - -/* - * Convert an array of big-endian words to a string - */ -function binb2str(bin) -{ - var str = ""; - var mask = (1 << chrsz) - 1; - for(var i = 0; i < bin.length * 32; i += chrsz) - str += String.fromCharCode((bin[i>>5] >>> (32 - chrsz - i%32)) & mask); - return str; -} - -/* - * Convert an array of big-endian words to a hex string. - */ -function binb2hex(binarray) -{ - var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef"; - var str = ""; - for(var i = 0; i < binarray.length * 4; i++) - { - str += hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8+4)) & 0xF) + - hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8 )) & 0xF); - } - return str; -} - -/* - * Convert an array of big-endian words to a base-64 string - */ -function binb2b64(binarray) -{ - var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - var str = ""; - for(var i = 0; i < binarray.length * 4; i += 3) - { - var triplet = (((binarray[i >> 2] >> 8 * (3 - i %4)) & 0xFF) << 16) - | (((binarray[i+1 >> 2] >> 8 * (3 - (i+1)%4)) & 0xFF) << 8 ) - | ((binarray[i+2 >> 2] >> 8 * (3 - (i+2)%4)) & 0xFF); - for(var j = 0; j < 4; j++) - { - if(i * 8 + j * 6 > binarray.length * 32) str += b64pad; - else str += tab.charAt((triplet >> 6*(3-j)) & 0x3F); - } - } - return str; -} -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: diff --git a/htdocs/javascript/wiki.js b/htdocs/javascript/wiki.js deleted file mode 100644 index b1bf1a6..0000000 --- a/htdocs/javascript/wiki.js +++ /dev/null @@ -1,48 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003-2011 Polytechnique.org * - * http://opensource.polytechnique.org/ * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software * - * Foundation, Inc., * - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - ***************************************************************************/ - - -Nix = { - map: null, - convert: function(a) { - Nix.init(); - var s = ''; - for (i = 0; i < a.length ; i++) { - var b = a.charAt(i); - s += ((b >= 'A' && b <= 'Z') || (b >= 'a' && b <= 'z') ? Nix.map[b] : b); - } - return s; - }, - init: function() { - if (Nix.map != null) - return; - var map = new Array(); - var s='abcdefghijklmnopqrstuvwxyz'; - for (i = 0; i < s.length; i++) - map[s.charAt(i)] = s.charAt((i+13)%26); - for (i=0; i " + message) - .css('color', 'green'); - } else { - this.html(" " + message) - .css('color', 'red'); - } - return this.css('fontWeight', 'bold') - .show() - .delay(1000) - .fadeOut(500); - }, - - updateHtml: function(source, callback) { - var elements = this; - function handler(data) { - elements.html(data); - if (callback) { - callback(data); - } - } - $.xget(source, handler, 'text'); - return this; - }, - - successMessage: function(source, message) { - var elements = this; - $.xget(source, function() { - elements.tmpMessage(message, true); - }); - return this; - }, - - wiki: function(text, withTitle) { - if (text == '') { - return this.html(''); - } - var url = 'wiki_preview'; - if (!withTitle) { - url += '/notitile'; - } - var $this = this; - $.post(url, { text: text }, - function (data) { - $this.html(data); - }, 'text'); - return this; - }, - - popWin: function(w, h) { - return this.click(function() { - window.open(this.href, '_blank', - 'toolbar=0,location=0,directories=0,status=0,' - +'menubar=0,scrollbars=1,resizable=1,' - +'width='+w+',height='+h); - return false; - }); - } - }); -})(jQuery); - -// }}} -// {{{ preview wiki - -function previewWiki(idFrom, idTo, withTitle, idShow) -{ - $('#' + idTo).wiki($('#' + idFrom).val(), withTitle); - if (idShow != null) { - $('#' + idShow).show(); - } -} - -// }}} // {{{ send test email function sendTestEmail(token, hruid) diff --git a/include/banana/forum.inc.php b/include/banana/forum.inc.php index 74bd27f..e81fd2b 100644 --- a/include/banana/forum.inc.php +++ b/include/banana/forum.inc.php @@ -147,7 +147,7 @@ class ForumsBanana extends Banana } else { // Register custom Banana links and tabs if (!Banana::$profile['autoup']) { - Banana::$page->registerAction('registerAction('path . '", "updateall", ' . time() . ')\'>' . 'Marquer tous les messages comme lus' . '', array('forums', 'thread', 'message')); diff --git a/templates/platal/skins.tpl b/templates/platal/skins.tpl index 4556f89..e5bea8d 100644 --- a/templates/platal/skins.tpl +++ b/templates/platal/skins.tpl @@ -37,7 +37,7 @@ Pour toute information complémentaire, n'hésite pas à écrire à + onclick="$.dynPost('prefs/skin', 'newskin', {$skin.id})" /> {$skin.name} diff --git a/templates/xnetevents/index.tpl b/templates/xnetevents/index.tpl index e60d478..21940e7 100644 --- a/templates/xnetevents/index.tpl +++ b/templates/xnetevents/index.tpl @@ -73,7 +73,7 @@ modifier {icon name=date_edit title="Édition de l'événement"}]   - [ + [ {if !$archive} archiver {icon name=package_add title="Archivage"}] @@ -82,7 +82,7 @@ {icon name=package_delete title="Désarchivage"}] {/if}   - [ supprimer {icon name=delete title='Suppression'}] -- 2.1.4