Halaman utama Jelajahi Bantuan
Masuk
computer_glamour
/
privatebin-mirror
cermin dari https://github.com/PrivateBin/PrivateBin
1
0
Fork 0
Berkas Masalah 0 Wiki
Jelajahi Sumber

Merge remote-tracking branch 'origin/master' into webcrypto

El RIDO 8 tahun lalu
induk
30b7be0781 d66800b8ce
melakukan
b191e2c437
8 mengubah file dengan 4 tambahan dan 67 penghapusan
Tampilan Split Tampilkan Statistik Diff
  1. 0 18
      .dockerignore
  2. 0 26
      Dockerfile
  3. 0 15
      docker-compose.yml
  4. 0 4
      docker/entrypoint.sh
  5. 1 1
      i18n/no.json
  6. 1 1
      js/privatebin.js
  7. 1 1
      tpl/bootstrap.php
  8. 1 1
      tpl/page.php

+ 0 - 18
.dockerignore
Tampilan Berkas 

@@ -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

+ 0 - 26
Dockerfile
Tampilan Berkas 

@@ -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

+ 0 - 15
docker-compose.yml
Tampilan Berkas 

@@ -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:
 
-

+ 0 - 4
docker/entrypoint.sh
Tampilan Berkas 

@@ -1,4 +0,0 @@
 
-#! /bin/sh
 
-
 
-chown -R www-data /var/www/html/data
 
-apache2-foreground

+ 1 - 1
i18n/no.json
Tampilan Berkas 

@@ -153,5 +153,5 @@
 
         "Hvis denne meldingen ikke forsvinner kan du ta en titt på siden med <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">ofte stilte spørsmål</a> 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"
 
 }

+ 1 - 1
js/privatebin.js
Tampilan Berkas 

@@ -3092,7 +3092,7 @@ jQuery.PrivateBin = (function($, sjcl, RawDeflate) {
 
             for (var i = 0; i < $head.length; ++i) {
 
                 newDoc.write($head[i].outerHTML);
 
             }
 
-            newDoc.write('</head><body><pre>' + DOMPurify.sanitize(paste) + '</pre></body></html>');
 
+            newDoc.write('</head><body><pre>' + DOMPurify.sanitize($('<div />').text(paste).html()) + '</pre></body></html>');
 
             newDoc.close();
 
         }

+ 1 - 1
tpl/bootstrap.php
Tampilan Berkas 

@@ -71,7 +71,7 @@ if ($MARKDOWN):
 
 endif;
 
 ?>
 
 		<script type="text/javascript" data-cfasync="false" src="js/purify-1.0.7.js" integrity="sha512-VnKJHLosO8z2ojNvWk9BEKYqnhZyWK9rM90FgZUUEp/PRnUqR5OLLKE0a3BkVmn7YgB7LXRrjHgFHQYKd6DAIA==" crossorigin="anonymous"></script>
 
-		<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-EDc6J8fTVdA2igeEPWA+o0eJtt0C1Jc5MAWVwByI/ATpnkqaOGQd/699yb0kwFXpC4dG75/M/1wsZYCkGec1nA==" crossorigin="anonymous"></script>
 
+		<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-nh671EZTdx0Fa33bnMy0sNdIbkqrtMmUNPBfMOPlfkTlLz8o+8AhSzJGOUbaJL/3DdLREt8rBfiu5uOL7U96rw==" crossorigin="anonymous"></script>
 
 		<!--[if lt IE 10]>
 
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 
 		<![endif]-->

+ 1 - 1
tpl/page.php
Tampilan Berkas 

@@ -49,7 +49,7 @@ if ($MARKDOWN):
 
 endif;
 
 ?>
 
 		<script type="text/javascript" data-cfasync="false" src="js/purify-1.0.7.js" integrity="sha512-VnKJHLosO8z2ojNvWk9BEKYqnhZyWK9rM90FgZUUEp/PRnUqR5OLLKE0a3BkVmn7YgB7LXRrjHgFHQYKd6DAIA==" crossorigin="anonymous"></script>
 
-		<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-EDc6J8fTVdA2igeEPWA+o0eJtt0C1Jc5MAWVwByI/ATpnkqaOGQd/699yb0kwFXpC4dG75/M/1wsZYCkGec1nA==" crossorigin="anonymous"></script>
 
+		<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-nh671EZTdx0Fa33bnMy0sNdIbkqrtMmUNPBfMOPlfkTlLz8o+8AhSzJGOUbaJL/3DdLREt8rBfiu5uOL7U96rw==" crossorigin="anonymous"></script>
 
 		<!--[if lt IE 10]>
 
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 
 		<![endif]-->