diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 78442ed1..00000000 --- a/.dockerignore +++ /dev/null @@ -1,18 +0,0 @@ -# Documentation, might leak version number -CHANGELOG.md -LICENSE.md -CREDITS.md -INSTALL.md -README.md -doc/ - -# Dotfiles, pointless -.codeclimate.yml -.csslintrc -.editorconfig -.eslint* -.git* -.php_cs -.styleci.yml -.travis.yml -.github diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 7bc9e127..00000000 --- a/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM php:apache - -RUN apt-get update && apt-get install -y \ - libfreetype6-dev \ - libjpeg62-turbo-dev \ - libpng-dev \ - wget \ - zip \ - unzip && \ - # We install and enable php-gd - docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ &&\ - docker-php-ext-install -j$(nproc) gd && \ - # We enable Apache's mod_rewrite - a2enmod rewrite - - -# Copy app content -COPY . /var/www/html - -# Copy start script -RUN mv /var/www/html/docker/entrypoint.sh / && \ - rm -r /var/www/html/docker - -VOLUME /var/www/html/data - -CMD /entrypoint.sh diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 31432216..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: '3' - -services: - privatebin: - build: . - ports: - - "3000:80" - volumes: - - data:/var/www/html/data - # Optionally mount a custom config file - #- /srv/docker/privatebin/conf.php:/var/www/html/cfg/conf.php - -volumes: - data: - diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh deleted file mode 100755 index 124f2ea4..00000000 --- a/docker/entrypoint.sh +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh - -chown -R www-data /var/www/html/data -apache2-foreground diff --git a/i18n/no.json b/i18n/no.json index 087a067c..0a3c3d1c 100644 --- a/i18n/no.json +++ b/i18n/no.json @@ -153,5 +153,5 @@ "Hvis denne meldingen ikke forsvinner kan du ta en titt på siden med ofte stilte spørsmål for informasjon om feilsøking.", "+++ no paste text +++": "+++ ingen innleggstekst +++", "Could not get paste data: %s": - "Could not get paste data: %s" + "Kunne ikke hente utklippsdata: %s" } diff --git a/js/privatebin.js b/js/privatebin.js index c125f0b3..b4a7548a 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -3092,7 +3092,7 @@ jQuery.PrivateBin = (function($, sjcl, RawDeflate) { for (var i = 0; i < $head.length; ++i) { newDoc.write($head[i].outerHTML); } - newDoc.write('
' + DOMPurify.sanitize(paste) + '
'); + newDoc.write('
' + DOMPurify.sanitize($('
').text(paste).html()) + '
'); newDoc.close(); } diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index 83de5f4a..81e1d241 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -71,7 +71,7 @@ if ($MARKDOWN): endif; ?> - + diff --git a/tpl/page.php b/tpl/page.php index 87af603d..591f6a26 100644 --- a/tpl/page.php +++ b/tpl/page.php @@ -49,7 +49,7 @@ if ($MARKDOWN): endif; ?> - +