diff --git a/cfg/conf.ini b/cfg/conf.ini index ef7a178..4169c1e 100644 --- a/cfg/conf.ini +++ b/cfg/conf.ini @@ -53,7 +53,6 @@ never = 0 1year = "1 year" never = "Never" - [traffic] ; time limit between calls from the same IP address in seconds ; Set this to 0 to disable rate limiting. diff --git a/js/zerobin.js b/js/zerobin.js index bcd86fd..96ed235 100644 --- a/js/zerobin.js +++ b/js/zerobin.js @@ -335,7 +335,7 @@ function send_data() { $('div#pastelink').html('Your paste is ' + url + ' (Hit CTRL+C to copy)'); $('div#deletelink').html('Delete link'); - $('div#pasteresult').show(); + $('div#pasteresult').removeClass('hidden'); selectText('pasteurl'); // We pre-select the link so that the user only has to CTRL+C the link. setElementText($('div#cleartext'), $('textarea#message').val()); @@ -409,7 +409,7 @@ function stateExistingPaste() { else { $('button#clonebutton').removeClass('hidden'); } - $('button#rawtextbutton').show(); + $('button#rawtextbutton').removeClass('hidden'); $('div#expiration').addClass('hidden'); $('div#burnafterreadingoption').addClass('hidden'); diff --git a/lib/zerobin.php b/lib/zerobin.php index 821ff74..17efa4f 100644 --- a/lib/zerobin.php +++ b/lib/zerobin.php @@ -372,7 +372,7 @@ class zerobin private function _read($dataid) { // Is this a valid paste identifier? - if (preg_match('\A[a-f\d]{16}\z', $dataid)) + if (preg_match('#\A[a-f\d]{16}\z#', $dataid)) { // Check that paste exists. if ($this->_model()->exists($dataid)) @@ -452,6 +452,7 @@ class zerobin $key; } + RainTPL::$path_replace = false; $page = new RainTPL; // we escape it here because ENT_NOQUOTES can't be used in RainTPL templates $page->assign('CIPHERDATA', htmlspecialchars($this->_data, ENT_NOQUOTES)); diff --git a/tpl/page.html b/tpl/page.html index c278b43..ecddbb4 100644 --- a/tpl/page.html +++ b/tpl/page.html @@ -57,17 +57,16 @@
- -