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

INSTALL.md

@@ -38,7 +38,7 @@ In the index.php you can define a different `PATH`. This is useful to secure you
 installation. You can move the configuration, data files, templates and PHP
 libraries (directories cfg, data, lib, tpl, tmp and tst) outside of your document
 root. This new location must still be accessible to your webserver / PHP process
-([open_basedir setting](http://php.net/manual/en/ini.core.php#ini.open-basedir)).
+([open_basedir setting](https://php.net/manual/en/ini.core.php#ini.open-basedir)).
 
 > #### PATH Example
 > Your PrivateBin installation lives in a subfolder called "paste" inside of
@@ -79,7 +79,7 @@ data folder. This is the recommended setup for most sites.
 Under high load, in distributed setups or if you are not allowed to store files
 locally, you might want to switch to the `privatebin_db` model. This lets you
 store your data in a database. Basically all databases that are supported by
-[PDO](http://php.net/manual/en/book.pdo.php) may be used. Automatic table
+[PDO](https://php.net/manual/en/book.pdo.php) may be used. Automatic table
 creation is provided for `pdo_ibm`, `pdo_informix`, `pdo_mssql`, `pdo_mysql`,
 `pdo_oci`, `pdo_pgsql` and `pdo_sqlite`. You may want to provide a table prefix,
 if you have to share the PrivateBin database with another application or you want

LICENSE.md

@@ -32,7 +32,7 @@ the following restrictions:
 ## GNU Lesser General Public License, version 3.0, for RainTPL
 
 _Version 3, 29 June 2007_
-_Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
+_Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

cfg/conf.ini.sample

@@ -4,7 +4,7 @@
 ;
 ; @link      https://github.com/PrivateBin/PrivateBin
 ; @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
-; @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+; @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
 ; @version   0.22
 
 [main]

css/bootstrap/darkstrap-0.9.3.css

@@ -1,11 +1,11 @@
 @charset "UTF-8";
 /* 
  * Darkstrap v0.9.3
- * By danneu (http://github.com/danneu/darkstrap)
+ * By danneu (https://github.com/danneu/darkstrap)
  * Based off Twitter Bootstrap v3.3.5
  */
 /*!
- * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Bootstrap v3.3.5 (https://getbootstrap.com)
  * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */

img/icon.svg

@@ -3,7 +3,7 @@
 
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:cc="https://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"

index.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

js/base64-1.7.js

@@ -2,10 +2,10 @@
  * $Id: base64.js,v 1.7 2012/08/23 10:30:18 dankogai Exp dankogai $
  *
  *  Licensed under the MIT license.
- *  http://www.opensource.org/licenses/mit-license.php
+ *  https://www.opensource.org/licenses/mit-license.php
  *
  *  References:
- *    http://en.wikipedia.org/wiki/Base64
+ *    https://en.wikipedia.org/wiki/Base64
  */
 
 (function(global){

js/bootstrap-3.3.5.js

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Bootstrap v3.3.5 (https://getbootstrap.com)
  * Copyright 2011-2015 Twitter, Inc.
  * Licensed under the MIT license
  */

js/comment.jsonld

@@ -1,6 +1,6 @@
 {
 	"@context": {
-		"so": "http://schema.org/",
+		"so": "https://schema.org/",
 		"status": "so:Integer",
 		"id": "so:name",
 		"parentid": "so:name",

js/commentmeta.jsonld

@@ -1,6 +1,6 @@
 {
 	"@context": {
-		"so": "http://schema.org/",
+		"so": "https://schema.org/",
 		"postdate": "so:Integer",
 		"nickname": "so:Text",
 		"vizhash": "so:Text"

js/paste.jsonld

@@ -1,6 +1,6 @@
 {
 	"@context": {
-		"so": "http://schema.org/",
+		"so": "https://schema.org/",
 		"status": {"@id": "so:Integer"},
 		"id": {"@id": "so:name"},
 		"deletetoken": {"@id": "so:Text"},

js/pastemeta.jsonld

@@ -1,6 +1,6 @@
 {
 	"@context": {
-		"so": "http://schema.org/",
+		"so": "https://schema.org/",
 		"formatter": {"@id": "so:Text"},
 		"postdate": {"@id": "so:Integer"},
 		"opendiscussion": {"@id": "so:True"},

js/privatebin.js

@@ -5,7 +5,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 
@@ -143,7 +143,7 @@ $(function() {
 
         /**
          * Text range selection.
-         * From: http://stackoverflow.com/questions/985272/jquery-selecting-text-in-an-element-akin-to-highlighting-with-your-mouse
+         * From: https://stackoverflow.com/questions/985272/jquery-selecting-text-in-an-element-akin-to-highlighting-with-your-mouse
          *
          * @param string element : Indentifier of the element to select (id="").
          */
@@ -242,7 +242,7 @@ $(function() {
 
         /**
          * minimal sprintf emulation for %s and %d formats
-         * From: http://stackoverflow.com/questions/610406/javascript-equivalent-to-printf-string-format#4795914
+         * From: https://stackoverflow.com/questions/610406/javascript-equivalent-to-printf-string-format#4795914
          *
          * @param string format
          * @param mixed args one or multiple parameters injected into format string

js/rawdeflate-0.5.js

@@ -2,7 +2,7 @@
  * $Id: rawdeflate.js,v 0.5 2013/04/09 14:25:38 dankogai Exp dankogai $
  *
  * GNU General Public License, version 2 (GPL-2.0)
- *   http://opensource.org/licenses/GPL-2.0
+ *   https://opensource.org/licenses/GPL-2.0
  * Original:
  *  http://www.onicos.com/staff/iz/amuse/javascript/expert/deflate.txt
  */

js/rawinflate-0.3.js

@@ -2,7 +2,7 @@
  * $Id: rawinflate.js,v 0.3 2013/04/09 14:25:38 dankogai Exp dankogai $
  *
  * GNU General Public License, version 2 (GPL-2.0)
- *   http://opensource.org/licenses/GPL-2.0
+ *   https://opensource.org/licenses/GPL-2.0
  * original:
  *   http://www.onicos.com/staff/iz/amuse/javascript/expert/inflate.txt
  */

lib/auto.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/configuration.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/filter.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/i18n.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 
@@ -128,7 +128,7 @@ class i18n
     /**
      * loads translations
      *
-     * From: http://stackoverflow.com/questions/3770513/detect-browser-language-in-php#3771447
+     * From: https://stackoverflow.com/questions/3770513/detect-browser-language-in-php#3771447
      *
      * @access public
      * @static
@@ -186,7 +186,7 @@ class i18n
     /**
      * detect the clients supported languages and return them ordered by preference
      *
-     * From: http://stackoverflow.com/questions/3770513/detect-browser-language-in-php#3771447
+     * From: https://stackoverflow.com/questions/3770513/detect-browser-language-in-php#3771447
      *
      * @access public
      * @static
@@ -316,7 +316,7 @@ class i18n
     /**
      * compares two language preference arrays and returns the preferred match
      *
-     * From: http://stackoverflow.com/questions/3770513/detect-browser-language-in-php#3771447
+     * From: https://stackoverflow.com/questions/3770513/detect-browser-language-in-php#3771447
      *
      * @access protected
      * @static
@@ -375,7 +375,7 @@ class i18n
     /**
      * compare two language IDs and return the degree they match
      *
-     * From: http://stackoverflow.com/questions/3770513/detect-browser-language-in-php#3771447
+     * From: https://stackoverflow.com/questions/3770513/detect-browser-language-in-php#3771447
      *
      * @access protected
      * @static

lib/model.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/model/abstract.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/model/comment.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/model/paste.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/persistence.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/privatebin.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/privatebin/abstract.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/privatebin/data.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/privatebin/db.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/purgelimiter.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/request.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 
@@ -185,7 +185,7 @@ class request
     /**
      * detect the clients supported media type and decide if its a JSON API call or not
      *
-     * Adapted from: http://stackoverflow.com/questions/3770513/detect-browser-language-in-php#3771447
+     * Adapted from: https://stackoverflow.com/questions/3770513/detect-browser-language-in-php#3771447
      *
      * @access private
      * @return bool

lib/serversalt.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/sjcl.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/trafficlimiter.php

@@ -6,7 +6,7 @@
  *
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.22
  */
 

lib/vizhash16x16.php

@@ -7,7 +7,7 @@
  *
  * @link      http://sebsauvage.net/wiki/doku.php?id=php:vizhash_gd
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
  * @version   0.0.4 beta PrivateBin 0.22
  */