From 42c20032204faf494cdb6e2d3cf99675b66c96ed Mon Sep 17 00:00:00 2001 From: El RIDO Date: Mon, 17 Jun 2019 21:40:37 +0200 Subject: [PATCH] made notice configurable, fixing a few CSS glitches --- cfg/conf.sample.php | 3 +++ css/bootstrap/privatebin.css | 7 +++---- css/privatebin.css | 4 ++-- js/privatebin.js | 3 +-- lib/Configuration.php | 1 + lib/Controller.php | 1 + tpl/bootstrap.php | 18 ++++++++++++++---- tpl/page.php | 9 ++++++++- tst/ViewTest.php | 1 + 9 files changed, 34 insertions(+), 13 deletions(-) diff --git a/cfg/conf.sample.php b/cfg/conf.sample.php index fba5df8..b195e2a 100644 --- a/cfg/conf.sample.php +++ b/cfg/conf.sample.php @@ -77,6 +77,9 @@ languageselection = false ; sha256 in HMAC for the deletion token zerobincompatibility = false +; enable or disable the warning message when the site is served over HTTP instead of HTTPS, defaults to true +httpwarning = true + [expire] ; expire value that is selected per default ; make sure the value exists in [expire_options] diff --git a/css/bootstrap/privatebin.css b/css/bootstrap/privatebin.css index 8355ac3..1c7bc28 100644 --- a/css/bootstrap/privatebin.css +++ b/css/bootstrap/privatebin.css @@ -81,12 +81,11 @@ body.loading { } .dragAndDropFile{ - color:#777; - font-size:1em; - display:inline; + color:#777; + font-size:1em; + display:inline; } - #deletelink { float: right; margin-left: 5px; diff --git a/css/privatebin.css b/css/privatebin.css index 5dab6c0..c7124e2 100644 --- a/css/privatebin.css +++ b/css/privatebin.css @@ -290,9 +290,9 @@ input { #ienotice a { color: #000; } -#oldienotice { display: none; } +#oldnotice, #httpnotice { display: none; } -.errorMessage { +#errormessage, .errorMessage { background-color: #f77 !important; color:#ff0; } diff --git a/js/privatebin.js b/js/privatebin.js index ca57eb5..5b39658 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -1651,7 +1651,6 @@ jQuery.PrivateBin = (function($, RawDeflate) { */ me.hideMessages = function() { - // also possible: $('.statusmessage').addClass('hidden'); $statusMessage.addClass('hidden'); $errorMessage.addClass('hidden'); }; @@ -4672,7 +4671,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { } if (isInsecureConnection()) { - Alert.showError('This website is using an insecure HTTP connection! Please use it only for testing.'); + $('#httpnotice').toggle(true); } return true; diff --git a/lib/Configuration.php b/lib/Configuration.php index b6d7c41..8202c93 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -55,6 +55,7 @@ class Configuration 'icon' => 'identicon', 'cspheader' => 'default-src \'none\'; manifest-src \'self\'; connect-src *; script-src \'self\' \'unsafe-eval\'; style-src \'self\'; font-src \'self\'; img-src \'self\' data: blob:; media-src blob:; object-src blob:; Referrer-Policy: \'no-referrer\'; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals', 'zerobincompatibility' => false, + 'httpwarning' => true, ), 'expire' => array( 'default' => '1week', diff --git a/lib/Controller.php b/lib/Controller.php index 142bb5b..09b257a 100644 --- a/lib/Controller.php +++ b/lib/Controller.php @@ -386,6 +386,7 @@ class Controller $page->assign('EXPIREDEFAULT', $this->_conf->getKey('default', 'expire')); $page->assign('URLSHORTENER', $this->_conf->getKey('urlshortener')); $page->assign('QRCODE', $this->_conf->getKey('qrcode')); + $page->assign('HTTPWARNING', $this->_conf->getKey('httpwarning')); $page->draw($this->_conf->getKey('template')); } diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index 9f2ff4f..c908cae 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -72,7 +72,7 @@ if ($MARKDOWN): endif; ?> - + @@ -440,11 +440,11 @@ if ($FILEUPLOAD): -