Merge branch 'master' of github.com:PrivateBin/PrivateBin

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "privatebin/privatebin",
-    "description": "PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256 bit AES in Galois Counter mode.",
+    "description": "PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256 bit AES in Galois Counter mode (GCM).",
     "repositories": [
         {
             "type": "vcs",

img/icon.svg

@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="500"
+   height="500"
+   viewBox="0 0 500 500"
+   id="svg2">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient7636">
+      <stop
+         id="stop7664"
+         style="stop-color:#ffab00;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4188"
+         style="stop-color:#ffa500;stop-opacity:1"
+         offset="0.20623536" />
+      <stop
+         id="stop4190"
+         style="stop-color:#ffab00;stop-opacity:1"
+         offset="0.2469174" />
+      <stop
+         id="stop7666"
+         style="stop-color:#ff8800;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7620">
+      <stop
+         id="stop7622"
+         style="stop-color:#fcff00;stop-opacity:1"
+         offset="0" />
+    </linearGradient>
+    <radialGradient
+       cx="250"
+       cy="250.00003"
+       r="229.85291"
+       fx="250"
+       fy="250.00003"
+       id="radialGradient7642"
+       xlink:href="#linearGradient7636"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3983125,1.4831815e-7,-1.507182e-7,1.4209396,-99.578086,-105.23497)"
+       spreadMethod="pad" />
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter9316">
+      <feGaussianBlur
+         id="feGaussianBlur9318"
+         stdDeviation="3"
+         result="result1" />
+      <feBlend
+         in2="result1"
+         mode="multiply"
+         in="result1"
+         result="result5"
+         id="feBlend9320" />
+      <feGaussianBlur
+         id="feGaussianBlur9322"
+         stdDeviation="1"
+         result="result6"
+         in="result5" />
+      <feComposite
+         in2="result5"
+         operator="xor"
+         in="result6"
+         result="result8"
+         id="feComposite9324" />
+      <feComposite
+         in2="result8"
+         operator="xor"
+         in="result6"
+         result="fbSourceGraphic"
+         id="feComposite9326" />
+      <feSpecularLighting
+         id="feSpecularLighting9328"
+         specularExponent="55"
+         specularConstant="2.20000005"
+         surfaceScale="2"
+         lighting-color="#ffffff"
+         result="result1"
+         in="fbSourceGraphic">
+        <fePointLight
+           id="fePointLight9330"
+           z="20000"
+           y="-10000"
+           x="-5000" />
+      </feSpecularLighting>
+      <feComposite
+         in2="fbSourceGraphic"
+         operator="in"
+         in="result1"
+         result="result2"
+         id="feComposite9332" />
+      <feComposite
+         in2="result2"
+         operator="arithmetic"
+         k1="0"
+         k2="2"
+         k3="1"
+         k4="0"
+         in="fbSourceGraphic"
+         result="result4"
+         id="feComposite9334" />
+      <feComposite
+         in2="result4"
+         operator="in"
+         in="result4"
+         result="result91"
+         id="feComposite9336" />
+      <feBlend
+         in2="result91"
+         mode="darken"
+         id="feBlend9338" />
+    </filter>
+    <pattern
+       id="pattern9832"
+       patternTransform="translate(-105.5802,590.28444)"
+       height="75.64963"
+       width="150.00683"
+       patternUnits="userSpaceOnUse">
+      <rect
+         style="opacity:1;fill:#ebee00;fill-opacity:0.69724767;fill-rule:nonzero;stroke:#000000;stroke-width:5.46199989;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect9830"
+         width="144.54483"
+         height="70.18763"
+         x="2.7309999"
+         y="2.7309999" />
+    </pattern>
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter9316-8">
+      <feGaussianBlur
+         result="result1"
+         stdDeviation="3"
+         id="feGaussianBlur9318-0" />
+      <feBlend
+         in2="result1"
+         mode="multiply"
+         in="result1"
+         result="result5"
+         id="feBlend9320-6" />
+      <feGaussianBlur
+         in="result5"
+         result="result6"
+         stdDeviation="1"
+         id="feGaussianBlur9322-8" />
+      <feComposite
+         in2="result5"
+         operator="xor"
+         in="result6"
+         result="result8"
+         id="feComposite9324-0" />
+      <feComposite
+         in2="result8"
+         operator="xor"
+         in="result6"
+         result="fbSourceGraphic"
+         id="feComposite9326-9" />
+      <feSpecularLighting
+         in="fbSourceGraphic"
+         result="result1"
+         lighting-color="#ffffff"
+         surfaceScale="2"
+         specularConstant="2.20000005"
+         specularExponent="55"
+         id="feSpecularLighting9328-2">
+        <fePointLight
+           x="-5000"
+           y="-10000"
+           z="20000"
+           id="fePointLight9330-6" />
+      </feSpecularLighting>
+      <feComposite
+         in2="fbSourceGraphic"
+         operator="in"
+         in="result1"
+         result="result2"
+         id="feComposite9332-7" />
+      <feComposite
+         in2="result2"
+         operator="arithmetic"
+         k1="0"
+         k2="2"
+         k3="1"
+         k4="0"
+         in="fbSourceGraphic"
+         result="result4"
+         id="feComposite9334-8" />
+      <feComposite
+         in2="result4"
+         operator="in"
+         in="result4"
+         result="result91"
+         id="feComposite9336-2" />
+      <feBlend
+         in2="result91"
+         mode="darken"
+         id="feBlend9338-7" />
+    </filter>
+    <pattern
+       patternUnits="userSpaceOnUse"
+       width="150.00683"
+       height="75.64963"
+       patternTransform="translate(-105.5802,590.28444)"
+       id="pattern9832-3">
+      <rect
+         y="2.7309999"
+         x="2.7309999"
+         height="70.18763"
+         width="144.54483"
+         id="rect9830-3"
+         style="opacity:1;fill:#ebee00;fill-opacity:0.69724767;fill-rule:nonzero;stroke:#000000;stroke-width:5.46199989;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </pattern>
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="https://creativecommons.org/licenses/by/4.0/" />
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>rugk</dc:title>
+          </cc:Agent>
+        </dc:rights>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-552.36219)"
+     id="layer1">
+    <path
+       d="M 250.41797,3.1582031 23.300781,126.23828 22.880859,373.07812 249.58203,496.8418 476.69922,373.76172 477.11914,126.92188 z m -0.71094,97.8652369 0,0.006 c 3.78018,0 7.60386,0.29655 11.45703,0.875 41.10089,6.16576 72.18274,40.63955 66.38414,70.45619 -5.7986,29.81664 -33.27979,55.97822 -40.0849,61.67271 -6.80511,5.69448 37.09529,164.94336 37.09529,164.94336 l -74.07421,0 -1.06836,0 -73.97657,0 c 0,0 46.18084,-156.80132 36.48594,-164.94336 -9.69491,-8.14204 -41.19767,-36.87188 -36.38828,-68.93554 4.80939,-32.06366 37.62649,-63.97482 74.16992,-64.07422 z"
+       transform="matrix(0.95665359,0,0,0.95665359,10.836603,563.19879)"
+       id="path4140"
+       style="fill:url(#radialGradient7642);fill-opacity:1;stroke:#000000;stroke-width:15.67965698;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter9316)" />
+  </g>
+</svg>

robots.txt

@@ -1,4 +1,9 @@
-# Might as well keep robots away for performance and privacy reasons.
+# "A robots.txt a day keeps the robots away."
+# (for performance and privacy reasons)
+#
+# Note: To be effective this robots.txt must be put into the root of your server
+# directory.
+
 User-agent: *
 Allow: /index.php
 Disallow: /

tpl/bootstrap-compact.html

@@ -28,6 +28,8 @@
 		<link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
 		<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
 		<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
+		<link rel="shortcut icon" href="favicon.ico">
+		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
 	</head>
 	<body role="document" class="navbar-spacing">
@@ -164,10 +166,11 @@
 			<noscript><div id="noscript" role="alert" class="nonworking alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> {function="i18n::_('Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.')"}</div></noscript>
 			<div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {function="i18n::_('PrivateBin requires a modern browser to work.')"}</div>
 			<div id="ienotice" role="alert" class="hidden alert alert-warning"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span> {function="i18n::_('Still using Internet Explorer? Do yourself a favor, switch to a modern browser:')"}
-				<a href="http://www.mozilla.org/firefox/">Firefox</a>, 
-				<a href="http://www.opera.com/">Opera</a>, 
-				<a href="http://www.google.com/chrome">Chrome</a>, 
-				<a href="http://www.apple.com/safari">Safari</a>...
+				<a href="https://www.mozilla.org/firefox/">Firefox</a>,
+				<a href="https://www.opera.com/">Opera</a>,
+				<a href="https://www.google.com/chrome">Chrome</a>,
+				<a href="https://www.apple.com/safari">Safari</a>,
+				<a href="https://www.microsoft.com/edge">Edge</a>...
 			</div>
 			<div id="pasteresult" role="alert" class="hidden alert alert-success">
 				<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>

tpl/bootstrap-dark-page.html

@@ -28,6 +28,8 @@
 		<link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
 		<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
 		<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
+		<link rel="shortcut icon" href="favicon.ico">
+		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
 	</head>
 	<body role="document">
@@ -160,10 +162,11 @@
 			<noscript><div id="noscript" role="alert" class="nonworking alert alert-error"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> {function="i18n::_('Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.')"}</div></noscript>
 			<div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {function="i18n::_('PrivateBin requires a modern browser to work.')"}</div>
 			<div id="ienotice" role="alert" class="hidden alert alert-error"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span> {function="i18n::_('Still using Internet Explorer? Do yourself a favor, switch to a modern browser:')"}
-				<a href="http://www.mozilla.org/firefox/">Firefox</a>, 
-				<a href="http://www.opera.com/">Opera</a>, 
-				<a href="http://www.google.com/chrome">Chrome</a>, 
-				<a href="http://www.apple.com/safari">Safari</a>...
+				<a href="https://www.mozilla.org/firefox/">Firefox</a>,
+				<a href="https://www.opera.com/">Opera</a>,
+				<a href="https://www.google.com/chrome">Chrome</a>,
+				<a href="https://www.apple.com/safari">Safari</a>,
+				<a href="https://www.microsoft.com/edge">Edge</a>...
 			</div>
 			<div id="pasteresult" role="alert" class="hidden alert alert-success">
 				<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>

tpl/bootstrap-dark.html

@@ -28,6 +28,8 @@
 		<link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
 		<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
 		<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
+		<link rel="shortcut icon" href="favicon.ico">
+		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
 	</head>
 	<body role="document">
@@ -160,10 +162,11 @@
 			<noscript><div id="noscript" role="alert" class="nonworking alert alert-error"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> {function="i18n::_('Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.')"}</div></noscript>
 			<div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {function="i18n::_('PrivateBin requires a modern browser to work.')"}</div>
 			<div id="ienotice" role="alert" class="hidden alert alert-error"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span> {function="i18n::_('Still using Internet Explorer? Do yourself a favor, switch to a modern browser:')"}
-				<a href="http://www.mozilla.org/firefox/">Firefox</a>, 
-				<a href="http://www.opera.com/">Opera</a>, 
-				<a href="http://www.google.com/chrome">Chrome</a>, 
-				<a href="http://www.apple.com/safari">Safari</a>...
+				<a href="https://www.mozilla.org/firefox/">Firefox</a>,
+				<a href="https://www.opera.com/">Opera</a>,
+				<a href="https://www.google.com/chrome">Chrome</a>,
+				<a href="https://www.apple.com/safari">Safari</a>,
+				<a href="https://www.microsoft.com/edge">Edge</a>...
 			</div>
 			<div id="pasteresult" role="alert" class="hidden alert alert-success">
 				<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>

tpl/bootstrap-page.html

@@ -28,6 +28,8 @@
 		<link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
 		<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
 		<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
+		<link rel="shortcut icon" href="favicon.ico">
+		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
 	</head>
 	<body role="document">
@@ -160,10 +162,11 @@
 			<noscript><div id="noscript" role="alert" class="nonworking alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> {function="i18n::_('Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.')"}</div></noscript>
 			<div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {function="i18n::_('PrivateBin requires a modern browser to work.')"}</div>
 			<div id="ienotice" role="alert" class="hidden alert alert-warning"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span> {function="i18n::_('Still using Internet Explorer? Do yourself a favor, switch to a modern browser:')"}
-				<a href="http://www.mozilla.org/firefox/">Firefox</a>, 
-				<a href="http://www.opera.com/">Opera</a>, 
-				<a href="http://www.google.com/chrome">Chrome</a>, 
-				<a href="http://www.apple.com/safari">Safari</a>...
+				<a href="https://www.mozilla.org/firefox/">Firefox</a>,
+				<a href="https://www.opera.com/">Opera</a>,
+				<a href="https://www.google.com/chrome">Chrome</a>,
+				<a href="https://www.apple.com/safari">Safari</a>,
+				<a href="https://www.microsoft.com/edge">Edge</a>...
 			</div>
 			<div id="pasteresult" role="alert" class="hidden alert alert-success">
 				<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>

tpl/bootstrap.html

@@ -28,6 +28,8 @@
 		<link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
 		<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
 		<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
+		<link rel="shortcut icon" href="favicon.ico">
+		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
 	</head>
 	<body role="document">
@@ -160,10 +162,11 @@
 			<noscript><div id="noscript" role="alert" class="nonworking alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> {function="i18n::_('Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.')"}</div></noscript>
 			<div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {function="i18n::_('PrivateBin requires a modern browser to work.')"}</div>
 			<div id="ienotice" role="alert" class="hidden alert alert-warning"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span> {function="i18n::_('Still using Internet Explorer? Do yourself a favor, switch to a modern browser:')"}
-				<a href="http://www.mozilla.org/firefox/">Firefox</a>, 
-				<a href="http://www.opera.com/">Opera</a>, 
-				<a href="http://www.google.com/chrome">Chrome</a>, 
-				<a href="http://www.apple.com/safari">Safari</a>...
+				<a href="https://www.mozilla.org/firefox/">Firefox</a>,
+				<a href="https://www.opera.com/">Opera</a>,
+				<a href="https://www.google.com/chrome">Chrome</a>,
+				<a href="https://www.apple.com/safari">Safari</a>,
+				<a href="https://www.microsoft.com/edge">Edge</a>...
 			</div>
 			<div id="pasteresult" role="alert" class="hidden alert alert-success">
 				<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>

tpl/page.html

@@ -23,6 +23,8 @@
 		<link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
 		<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
 		<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
+		<link rel="shortcut icon" href="favicon.ico">
+		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
 	</head>
 	<body>
@@ -37,10 +39,11 @@
 			<noscript><div id="noscript" class="nonworking">{function="i18n::_('Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.')"}</div></noscript>
 			<div id="oldienotice" class="nonworking">{function="i18n::_('PrivateBin requires a modern browser to work.')"}</div>
 			<div id="ienotice">{function="i18n::_('Still using Internet Explorer? Do yourself a favor, switch to a modern browser:')"}
-				<a href="http://www.mozilla.org/firefox/">Firefox</a>, 
-				<a href="http://www.opera.com/">Opera</a>, 
-				<a href="http://www.google.com/chrome">Chrome</a>, 
-				<a href="http://www.apple.com/safari">Safari</a>...
+				<a href="https://www.mozilla.org/firefox/">Firefox</a>,
+				<a href="https://www.opera.com/">Opera</a>,
+				<a href="https://www.google.com/chrome">Chrome</a>,
+				<a href="https://www.apple.com/safari">Safari</a>,
+				<a href="https://www.microsoft.com/edge">Edge</a>...
 			</div>
 		</header>
 		<section>