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

2016-07-19 14:02:45 +02:00
parent c5606a47fe 38ab755733
commit be4c845129
36 changed files with 48 additions and 48 deletions
--- a/lib/auto.php
+++ b/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
 */

--- a/lib/configuration.php
+++ b/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
 */

--- a/lib/filter.php
+++ b/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
 */

--- a/lib/i18n.php
+++ b/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
--- a/lib/model.php
+++ b/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
 */

--- a/lib/model/abstract.php
+++ b/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
 */

--- a/lib/model/comment.php
+++ b/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
 */

--- a/lib/model/paste.php
+++ b/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
 */

--- a/lib/persistence.php
+++ b/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
 */

--- a/lib/privatebin.php
+++ b/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
 */

--- a/lib/privatebin/abstract.php
+++ b/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
 */

--- a/lib/privatebin/data.php
+++ b/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
 */

--- a/lib/privatebin/db.php
+++ b/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
 */

--- a/lib/purgelimiter.php
+++ b/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
 */

--- a/lib/request.php
+++ b/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
--- a/lib/serversalt.php
+++ b/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
 */

--- a/lib/sjcl.php
+++ b/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
 */

--- a/lib/trafficlimiter.php
+++ b/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
 */

--- a/lib/vizhash16x16.php
+++ b/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
 */