chalec
/
ctrlv-privatebin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix-anon-comments'

This commit is contained in:
El RIDO 2018-07-01 09:30:40 +02:00
parent 5eebd27e82 c22537c979
commit 641abe99d2
No known key found for this signature in database
GPG Key ID: 0F5C940A6BD81F92
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -30,7 +30,7 @@ vendor/**/tests
vendor/**/build_phar.php vendor/**/build_phar.php
!vendor/**/*.php !vendor/**/*.php
# Ignore local node modules, unit testing logs, api docs and eclipse project files # Ignore local node modules, unit testing logs, api docs and IDE project files
js/node_modules/ js/node_modules/
js/test.log js/test.log
tst/log/ tst/log/
@ -39,3 +39,4 @@ tst/ConfigurationCombinationsTest.php
.buildpath .buildpath
.project .project
.externalToolBuilders .externalToolBuilders
.c9

2
js/privatebin.js
View File

@ -4099,7 +4099,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
DiscussionViewer.addComment( DiscussionViewer.addComment(
comment, comment,
CryptTool.decipher(key, password, comment.data), CryptTool.decipher(key, password, comment.data),
CryptTool.decipher(key, password, comment.meta.nickname) comment.meta.nickname ? CryptTool.decipher(key, password, comment.meta.nickname) : ''
); );
} }

2
tpl/bootstrap.php
View File

@ -75,7 +75,7 @@ if ($MARKDOWN):
<?php <?php
endif; endif;
?> ?>
<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-19QipeKjOhdFEn7KpfTd9p1YJqXIxSDm+KrTTIQKRhKErCq82AtFkOUVf2+qXDi/xJoYXW5QVIksKK6w2hgFXQ==" crossorigin="anonymous"></script> <script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-58qLFLcas6iQt7PWb4HcjAQlhKEi+XyZfYALB9VFkoeXR2vhpbQh1DuHc9jardc/HcDkr1hMkQfTlCjyWuTB8g==" crossorigin="anonymous"></script>
<!--[if lt IE 10]> <!--[if lt IE 10]>
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style> <style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
<![endif]--> <![endif]-->

2
tpl/page.php
View File

@ -54,7 +54,7 @@ if ($QRCODE):
<?php <?php
endif; endif;
?> ?>
<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-19QipeKjOhdFEn7KpfTd9p1YJqXIxSDm+KrTTIQKRhKErCq82AtFkOUVf2+qXDi/xJoYXW5QVIksKK6w2hgFXQ==" crossorigin="anonymous"></script> <script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-58qLFLcas6iQt7PWb4HcjAQlhKEi+XyZfYALB9VFkoeXR2vhpbQh1DuHc9jardc/HcDkr1hMkQfTlCjyWuTB8g==" crossorigin="anonymous"></script>
<!--[if lt IE 10]> <!--[if lt IE 10]>
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style> <style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
<![endif]--> <![endif]-->