diff --git a/lib/zerobin.css b/css/zerobin.css
similarity index 100%
rename from lib/zerobin.css
rename to css/zerobin.css
diff --git a/lib/busy.gif b/img/busy.gif
similarity index 100%
rename from lib/busy.gif
rename to img/busy.gif
diff --git a/lib/icon_clone.png b/img/icon_clone.png
similarity index 100%
rename from lib/icon_clone.png
rename to img/icon_clone.png
diff --git a/lib/icon_new.png b/img/icon_new.png
similarity index 100%
rename from lib/icon_new.png
rename to img/icon_new.png
diff --git a/lib/icon_send.png b/img/icon_send.png
similarity index 100%
rename from lib/icon_send.png
rename to img/icon_send.png
diff --git a/lib/icon_shorten.png b/img/icon_shorten.png
similarity index 100%
rename from lib/icon_shorten.png
rename to img/icon_shorten.png
diff --git a/lib/base64.js b/js/base64.js
similarity index 100%
rename from lib/base64.js
rename to js/base64.js
diff --git a/lib/jquery.js b/js/jquery.js
similarity index 100%
rename from lib/jquery.js
rename to js/jquery.js
diff --git a/lib/rawdeflate.js b/js/rawdeflate.js
similarity index 100%
rename from lib/rawdeflate.js
rename to js/rawdeflate.js
diff --git a/lib/rawinflate.js b/js/rawinflate.js
similarity index 100%
rename from lib/rawinflate.js
rename to js/rawinflate.js
diff --git a/lib/sjcl.js b/js/sjcl.js
similarity index 100%
rename from lib/sjcl.js
rename to js/sjcl.js
diff --git a/js/zerobin.js b/js/zerobin.js
new file mode 100644
index 00000000..f0e560fc
--- /dev/null
+++ b/js/zerobin.js
@@ -0,0 +1,462 @@
+/**
+ * ZeroBin 0.15
+ *
+ * @link http://sebsauvage.net/wiki/doku.php?id=php:zerobin
+ * @author sebsauvage
+ */
+
+// Immediately start random number generator collector.
+sjcl.random.startCollectors();
+
+/**
+ * Converts a duration (in seconds) into human readable format.
+ *
+ * @param int seconds
+ * @return string
+ */
+function secondsToHuman(seconds)
+{
+ if (seconds<60) { var v=Math.floor(seconds); return v+' second'+((v>1)?'s':''); }
+ if (seconds<60*60) { var v=Math.floor(seconds/60); return v+' minute'+((v>1)?'s':''); }
+ if (seconds<60*60*24) { var v=Math.floor(seconds/(60*60)); return v+' hour'+((v>1)?'s':''); }
+ // If less than 2 months, display in days:
+ if (seconds<60*60*24*60) { var v=Math.floor(seconds/(60*60*24)); return v+' day'+((v>1)?'s':''); }
+ var v=Math.floor(seconds/(60*60*24*30)); return v+' month'+((v>1)?'s':'');
+}
+
+/**
+ * Compress a message (deflate compression). Returns base64 encoded data.
+ *
+ * @param string message
+ * @return base64 string data
+ */
+function compress(message) {
+ return Base64.toBase64( RawDeflate.deflate( Base64.utob(message) ) );
+}
+
+/**
+ * Decompress a message compressed with compress().
+ */
+function decompress(data) {
+ return Base64.btou( RawDeflate.inflate( Base64.fromBase64(data) ) );
+}
+
+/**
+ * Compress, then encrypt message with key.
+ *
+ * @param string key
+ * @param string message
+ * @return encrypted string data
+ */
+function zeroCipher(key, message) {
+ return sjcl.encrypt(key,compress(message));
+}
+/**
+ * Decrypt message with key, then decompress.
+ *
+ * @param key
+ * @param encrypted string data
+ * @return string readable message
+ */
+function zeroDecipher(key, data) {
+ return decompress(sjcl.decrypt(key,data));
+}
+
+/**
+ * @return the current script location (without search or hash part of the URL).
+ * eg. http://server.com/zero/?aaaa#bbbb --> http://server.com/zero/
+ */
+function scriptLocation() {
+ return window.location.href.substring(0,window.location.href.length
+ -window.location.search.length -window.location.hash.length);
+}
+
+/**
+ * @return the paste unique identifier from the URL
+ * eg. 'c05354954c49a487'
+ */
+function pasteID() {
+ return window.location.search.substring(1);
+}
+
+/**
+ * Set text of a DOM element (required for IE)
+ * This is equivalent to element.text(text)
+ * @param object element : a DOM element.
+ * @param string text : the text to enter.
+ */
+function setElementText(element, text) {
+ // For IE<10.
+ if ($('div#oldienotice').is(":visible")) {
+ // IE<10 do not support white-space:pre-wrap; so we have to do this BIG UGLY STINKING THING.
+ element.text(text.replace(/\n/ig,'{BIG_UGLY_STINKING_THING__OH_GOD_I_HATE_IE}'));
+ element.html(element.text().replace(/{BIG_UGLY_STINKING_THING__OH_GOD_I_HATE_IE}/ig,"\r\n
"));
+ }
+ // for other (sane) browsers:
+ else {
+ element.text(text);
+ }
+}
+
+/**
+ * Show decrypted text in the display area, including discussion (if open)
+ *
+ * @param string key : decryption key
+ * @param array comments : Array of messages to display (items = array with keys ('data','meta')
+ */
+function displayMessages(key, comments) {
+ try { // Try to decrypt the paste.
+ var cleartext = zeroDecipher(key, comments[0].data);
+ } catch(err) {
+ $('div#cleartext').hide();
+ $('button#clonebutton').hide();
+ showError('Could not decrypt data (Wrong key ?)');
+ return;
+ }
+ setElementText($('div#cleartext'), cleartext);
+ urls2links($('div#cleartext')); // Convert URLs to clickable links.
+
+ // Display paste expiration.
+ if (comments[0].meta.expire_date) $('div#remainingtime').removeClass('foryoureyesonly').text('This document will expire in '+secondsToHuman(comments[0].meta.remaining_time)+'.').show();
+ if (comments[0].meta.burnafterreading) {
+ $('div#remainingtime').addClass('foryoureyesonly').text('FOR YOUR EYES ONLY. Don\'t close this window, this message can\'t be displayed again.').show();
+ $('button#clonebutton').hide(); // Discourage cloning (as it can't really be prevented).
+ }
+
+ // If the discussion is opened on this paste, display it.
+ if (comments[0].meta.opendiscussion) {
+ $('div#comments').html('');
+ // For each comment.
+ for (var i = 1; i < comments.length; i++) {
+ var comment=comments[i];
+ var cleartext="[Could not decrypt comment ; Wrong key ?]";
+ try {
+ cleartext = zeroDecipher(key, comment.data);
+ } catch(err) { }
+ var place = $('div#comments');
+ // If parent comment exists, display below (CSS will automatically shift it right.)
+ var cname = 'div#comment_'+comment.meta.parentid
+
+ // If the element exists in page
+ if ($(cname).length) {
+ place = $(cname);
+ }
+ var divComment = $('
';
+ $('div#status').prepend(img);
+ $('div#replystatus').prepend(img);
+ }
+}
+
+/**
+ * Generate link to URL shortener.
+ */
+function shortenUrl(url) {
+ return 'http://snipurl.com/site/snip?link=' + encodeURIComponent(url);
+}
+
+/**
+ * Convert URLs to clickable links.
+ * URLs to handle:
+ *
+ * magnet:?xt.1=urn:sha1:YNCKHTQCWBTRNJIV4WNAE52SJUQCZO5C&xt.2=urn:sha1:TXGCZQTH26NL6OUQAJJPFALHG2LTGBC7
+ * http://localhost:8800/zero/?6f09182b8ea51997#WtLEUO5Epj9UHAV9JFs+6pUQZp13TuspAUjnF+iM+dM=
+ * http://user:password@localhost:8800/zero/?6f09182b8ea51997#WtLEUO5Epj9UHAV9JFs+6pUQZp13TuspAUjnF+iM+dM=
+ *
+ *
+ * @param object element : a jQuery DOM element.
+ * @FIXME: add ppa & apt links.
+ */
+function urls2links(element) {
+ var re = /((http|https|ftp):\/\/[\w?=&.\/-;#@~%+-]+(?![\w\s?&.\/;#~%"=-]*>))/ig;
+ element.html(element.html().replace(re,'$1'));
+ var re = /((magnet):[\w?=&.\/-;#@~%+-]+)/ig;
+ element.html(element.html().replace(re,'$1'));
+}
+
+/**
+ * Return the deciphering key stored in anchor part of the URL
+ */
+function pageKey() {
+ var key = window.location.hash.substring(1); // Get key
+
+ // Some stupid web 2.0 services and redirectors add data AFTER the anchor
+ // (such as &utm_source=...).
+ // We will strip any additional data.
+
+ // First, strip everything after the equal sign (=) which signals end of base64 string.
+ i = key.indexOf('='); if (i>-1) { key = key.substring(0,i+1); }
+
+ // If the equal sign was not present, some parameters may remain:
+ i = key.indexOf('&'); if (i>-1) { key = key.substring(0,i); }
+
+ // Then add trailing equal sign if it's missing
+ if (key.charAt(key.length-1)!=='=') key+='=';
+
+ return key;
+}
+
+$(function() {
+ $('select#pasteExpiration').change(function() {
+ if ($(this).val() == 'burn') {
+ $('div#opendisc').addClass('buttondisabled');
+ $('input#opendiscussion').attr('disabled',true);
+ }
+ else {
+ $('div#opendisc').removeClass('buttondisabled');
+ $('input#opendiscussion').removeAttr('disabled');
+ }
+ });
+
+
+ // Display an existing paste
+ if ($('div#cipherdata').text().length > 1) {
+ // Missing decryption key in URL ?
+ if (window.location.hash.length == 0) {
+ showError('Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL ?)');
+ return;
+ }
+
+ // List of messages to display
+ var messages = jQuery.parseJSON($('div#cipherdata').text());
+
+ // Show proper elements on screen.
+ stateExistingPaste();
+
+ displayMessages(pageKey(), messages);
+ }
+ // Display error message from php code.
+ else if ($('div#errormessage').text().length>1) {
+ showError($('div#errormessage').text());
+ }
+ // Create a new paste.
+ else {
+ newPaste();
+ }
+});
diff --git a/lib/zerobin.js b/lib/zerobin.js
deleted file mode 100644
index 6b2b876e..00000000
--- a/lib/zerobin.js
+++ /dev/null
@@ -1,364 +0,0 @@
-/* ZeroBin 0.15 - http://sebsauvage.net/wiki/doku.php?id=php:zerobin */
-
-// Immediately start random number generator collector.
-sjcl.random.startCollectors();
-
-// Converts a duration (in seconds) into human readable format.
-function secondsToHuman(seconds)
-{
- if (seconds<60) { var v=Math.floor(seconds); return v+' second'+((v>1)?'s':''); }
- if (seconds<60*60) { var v=Math.floor(seconds/60); return v+' minute'+((v>1)?'s':''); }
- if (seconds<60*60*24) { var v=Math.floor(seconds/(60*60)); return v+' hour'+((v>1)?'s':''); }
- // If less than 2 months, display in days:
- if (seconds<60*60*24*60) { var v=Math.floor(seconds/(60*60*24)); return v+' day'+((v>1)?'s':''); }
- var v=Math.floor(seconds/(60*60*24*30)); return v+' month'+((v>1)?'s':'');
-}
-// Compress a message (deflate compression). Returns base64 encoded data.
-function compress(message) { return Base64.toBase64(RawDeflate.deflate(Base64.utob(message))); }
-
-// Decompress a message compressed with compress().
-function decompress(data) { return Base64.btou(RawDeflate.inflate(Base64.fromBase64(data))) }
-
-// Compress, then encrypt message with key.
-function zeroCipher(key,message)
-{
- return sjcl.encrypt(key,compress(message));
-}
-// Decrypt message with key, then decompress.
-function zeroDecipher(key,data)
-{
- return decompress(sjcl.decrypt(key,data));
-}
-
-// Returns the current script location (without search or hash part of the URL).
-// eg. http://server.com/zero/?aaaa#bbbb --> http://server.com/zero/
-function scriptLocation()
-{
- return window.location.href.substring(0,window.location.href.length
- -window.location.search.length -window.location.hash.length);
-}
-
-// Returns the paste unique identifier from the URL
-// eg. 'c05354954c49a487'
-function pasteID()
-{
- return window.location.search.substring(1);
-}
-
-// Set text of a DOM element (required for IE)
-// This is equivalent to element.text(text)
-// Input: element : a DOM element.
-// text : the text to enter.
-function setElementText(element,text)
-{
- if ($('div#oldienotice').is(":visible")) // For IE<10.
- {
- // IE<10 do not support white-space:pre-wrap; so we have to do this BIG UGLY STINKING THING.
- element.text(text.replace(/\n/ig,'{BIG_UGLY_STINKING_THING__OH_GOD_I_HATE_IE}'));
- element.html(element.text().replace(/{BIG_UGLY_STINKING_THING__OH_GOD_I_HATE_IE}/ig,"\r\n
';
- $('div#status').prepend(img);
- $('div#replystatus').prepend(img);
- }
-}
-
-// Generate link to URL shortener.
-function shortenUrl(url)
-{
- return 'http://snipurl.com/site/snip?link='+encodeURIComponent(url);
-}
-
-// Convert URLs to clickable links.
-// Input: element : a jQuery DOM element.
-// Example URLs to handle:
-// magnet:?xt.1=urn:sha1:YNCKHTQCWBTRNJIV4WNAE52SJUQCZO5C&xt.2=urn:sha1:TXGCZQTH26NL6OUQAJJPFALHG2LTGBC7
-// http://localhost:8800/zero/?6f09182b8ea51997#WtLEUO5Epj9UHAV9JFs+6pUQZp13TuspAUjnF+iM+dM=
-// http://user:password@localhost:8800/zero/?6f09182b8ea51997#WtLEUO5Epj9UHAV9JFs+6pUQZp13TuspAUjnF+iM+dM=
-// FIXME: add ppa & apt links.
-function urls2links(element)
-{
- var re = /((http|https|ftp):\/\/[\w?=&.\/-;#@~%+-]+(?![\w\s?&.\/;#~%"=-]*>))/ig;
- element.html(element.html().replace(re,'$1'));
- var re = /((magnet):[\w?=&.\/-;#@~%+-]+)/ig;
- element.html(element.html().replace(re,'$1'));
-}
-
-// Return the deciphering key stored in anchor part of the URL
-function pageKey()
-{
- var key = window.location.hash.substring(1); // Get key
-
- // Some stupid web 2.0 services and redirectors add data AFTER the anchor
- // (such as &utm_source=...).
- // We will strip any additional data.
-
- // First, strip everything after the equal sign (=) which signals end of base64 string.
- i = key.indexOf('='); if (i>-1) { key = key.substring(0,i+1); }
-
- // If the equal sign was not present, some parameters may remain:
- i = key.indexOf('&'); if (i>-1) { key = key.substring(0,i); }
-
- // Then add trailing equal sign if it's missing
- if (key.charAt(key.length-1)!=='=') key+='=';
-
- return key;
-}
-
-$(document).ready(function() {
-
- $('select#pasteExpiration').change(function() {
- if ($(this).val()=='burn') { $('div#opendisc').addClass('buttondisabled'); $('input#opendiscussion').attr('disabled',true); }
- else { $('div#opendisc').removeClass('buttondisabled'); $('input#opendiscussion').removeAttr('disabled'); }
- });
-
-
- if ($('div#cipherdata').text().length>1) // Display an existing paste
- {
- if (window.location.hash.length==0) // Missing decryption key in URL ?
- {
- showError('Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL ?)');
- return;
- }
- var messages = jQuery.parseJSON($('div#cipherdata').text()); // List of messages to display
- stateExistingPaste(); // Show proper elements on screen.
- displayMessages(pageKey(),messages);
- }
- else if ($('div#errormessage').text().length>1) // Display error message from php code.
- {
- showError($('div#errormessage').text());
- }
- else // Create a new paste.
- {
- newPaste();
- }
-});
diff --git a/tpl/page.html b/tpl/page.html
index 5ae1aec7..06873b03 100644
--- a/tpl/page.html
+++ b/tpl/page.html
@@ -1,13 +1,13 @@