From 658d5ae84dd0851b4a72ac0f5ae8191df2591ba4 Mon Sep 17 00:00:00 2001 From: rugk Date: Mon, 12 Dec 2016 18:43:23 +0100 Subject: [PATCH 1/5] Fix style-ci errors --- lib/Configuration.php | 3 ++- lib/Data/AbstractData.php | 3 ++- lib/Data/Database.php | 3 ++- lib/Data/Filesystem.php | 3 ++- lib/Filter.php | 3 ++- lib/I18n.php | 3 ++- lib/Json.php | 3 ++- lib/Model.php | 3 ++- lib/Model/AbstractModel.php | 3 ++- lib/Model/Comment.php | 3 ++- lib/Model/Paste.php | 3 ++- lib/Persistence/AbstractPersistence.php | 3 ++- lib/Persistence/PurgeLimiter.php | 3 ++- lib/Persistence/ServerSalt.php | 3 ++- lib/Persistence/TrafficLimiter.php | 3 ++- lib/PrivateBin.php | 3 ++- lib/Request.php | 3 ++- lib/Sjcl.php | 3 ++- lib/View.php | 3 ++- lib/Vizhash16x16.php | 3 ++- 20 files changed, 40 insertions(+), 20 deletions(-) diff --git a/lib/Configuration.php b/lib/Configuration.php index 0024701a..9249a744 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin; + +namespace PrivateBin;; use Exception; use PDO; diff --git a/lib/Data/AbstractData.php b/lib/Data/AbstractData.php index 20008abd..95b40393 100644 --- a/lib/Data/AbstractData.php +++ b/lib/Data/AbstractData.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin\Data; + +namespace PrivateBin;\Data; use stdClass; diff --git a/lib/Data/Database.php b/lib/Data/Database.php index 601c8f67..bea75f27 100644 --- a/lib/Data/Database.php +++ b/lib/Data/Database.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin\Data; + +namespace PrivateBin;\Data; use Exception; use PDO; diff --git a/lib/Data/Filesystem.php b/lib/Data/Filesystem.php index 37f79860..1a371e89 100644 --- a/lib/Data/Filesystem.php +++ b/lib/Data/Filesystem.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin\Data; + +namespace PrivateBin;\Data; use PrivateBin\Json; use PrivateBin\Model\Paste; diff --git a/lib/Filter.php b/lib/Filter.php index 0ca1b1d7..141c3ce4 100644 --- a/lib/Filter.php +++ b/lib/Filter.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin; + +namespace PrivateBin;; use Exception; diff --git a/lib/I18n.php b/lib/I18n.php index 9410198a..60dbdd4e 100644 --- a/lib/I18n.php +++ b/lib/I18n.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin; + +namespace PrivateBin;; /** * I18n diff --git a/lib/Json.php b/lib/Json.php index a9ba09c7..ec27e6e3 100644 --- a/lib/Json.php +++ b/lib/Json.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin; + +namespace PrivateBin;; use Exception; diff --git a/lib/Model.php b/lib/Model.php index 8819d303..e53da6bc 100644 --- a/lib/Model.php +++ b/lib/Model.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin; + +namespace PrivateBin;; use PrivateBin\Model\Paste; use PrivateBin\Persistence\PurgeLimiter; diff --git a/lib/Model/AbstractModel.php b/lib/Model/AbstractModel.php index 180e6167..38cedfd4 100644 --- a/lib/Model/AbstractModel.php +++ b/lib/Model/AbstractModel.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin\Model; + +namespace PrivateBin;\Model; use Exception; use PrivateBin\Configuration; diff --git a/lib/Model/Comment.php b/lib/Model/Comment.php index c4a7dd5b..39d78733 100644 --- a/lib/Model/Comment.php +++ b/lib/Model/Comment.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin\Model; + +namespace PrivateBin;\Model; use Exception; use Identicon\Identicon; diff --git a/lib/Model/Paste.php b/lib/Model/Paste.php index 2502a4f9..0ee3232d 100644 --- a/lib/Model/Paste.php +++ b/lib/Model/Paste.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin\Model; + +namespace PrivateBin;\Model; use Exception; use PrivateBin\Persistence\ServerSalt; diff --git a/lib/Persistence/AbstractPersistence.php b/lib/Persistence/AbstractPersistence.php index c52024ba..7ec98caa 100644 --- a/lib/Persistence/AbstractPersistence.php +++ b/lib/Persistence/AbstractPersistence.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin\Persistence; + +namespace PrivateBin;\Persistence; use Exception; diff --git a/lib/Persistence/PurgeLimiter.php b/lib/Persistence/PurgeLimiter.php index a5111db2..90bc17ce 100644 --- a/lib/Persistence/PurgeLimiter.php +++ b/lib/Persistence/PurgeLimiter.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin\Persistence; + +namespace PrivateBin;\Persistence; use PrivateBin\Configuration; diff --git a/lib/Persistence/ServerSalt.php b/lib/Persistence/ServerSalt.php index 0b3c7902..734d037a 100644 --- a/lib/Persistence/ServerSalt.php +++ b/lib/Persistence/ServerSalt.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin\Persistence; + +namespace PrivateBin;\Persistence; use Exception; diff --git a/lib/Persistence/TrafficLimiter.php b/lib/Persistence/TrafficLimiter.php index 2545b280..e752a0c9 100644 --- a/lib/Persistence/TrafficLimiter.php +++ b/lib/Persistence/TrafficLimiter.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin\Persistence; + +namespace PrivateBin;\Persistence; use PrivateBin\Configuration; diff --git a/lib/PrivateBin.php b/lib/PrivateBin.php index 67d1f19d..54c296a2 100644 --- a/lib/PrivateBin.php +++ b/lib/PrivateBin.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin; + +namespace PrivateBin;; use Exception; use PrivateBin\Persistence\ServerSalt; diff --git a/lib/Request.php b/lib/Request.php index 59471f79..143b6047 100644 --- a/lib/Request.php +++ b/lib/Request.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin; + +namespace PrivateBin;; /** * Request diff --git a/lib/Sjcl.php b/lib/Sjcl.php index 69425875..5ed16fc8 100644 --- a/lib/Sjcl.php +++ b/lib/Sjcl.php @@ -9,7 +9,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin; + +namespace PrivateBin;; /** * Sjcl diff --git a/lib/View.php b/lib/View.php index 494bcd5f..6f8fdb74 100644 --- a/lib/View.php +++ b/lib/View.php @@ -9,7 +9,8 @@ * @license http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 1.0 */ -namespace PrivateBin; + +namespace PrivateBin;; use Exception; diff --git a/lib/Vizhash16x16.php b/lib/Vizhash16x16.php index 265c3e9b..282dac73 100644 --- a/lib/Vizhash16x16.php +++ b/lib/Vizhash16x16.php @@ -10,7 +10,8 @@ * @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @version 0.0.5 beta PrivateBin 1.0 */ -namespace PrivateBin; + +namespace PrivateBin;; /** * Vizhash16x16 From 61ee0ef7d31542b5d4777b1efd5837f8f5bbdf90 Mon Sep 17 00:00:00 2001 From: rugk Date: Mon, 12 Dec 2016 18:49:08 +0100 Subject: [PATCH 2/5] Fix typos --- lib/Data/AbstractData.php | 2 +- lib/Data/Database.php | 2 +- lib/Data/Filesystem.php | 2 +- lib/Model/AbstractModel.php | 2 +- lib/Model/Comment.php | 2 +- lib/Model/Paste.php | 2 +- lib/Persistence/AbstractPersistence.php | 2 +- lib/Persistence/PurgeLimiter.php | 2 +- lib/Persistence/ServerSalt.php | 2 +- lib/Persistence/TrafficLimiter.php | 2 +- patch.txt | 305 ++++++++++++++++++++++++ 11 files changed, 315 insertions(+), 10 deletions(-) create mode 100644 patch.txt diff --git a/lib/Data/AbstractData.php b/lib/Data/AbstractData.php index 95b40393..1f9d3f8e 100644 --- a/lib/Data/AbstractData.php +++ b/lib/Data/AbstractData.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;\Data; +namespace PrivateBin\Data; use stdClass; diff --git a/lib/Data/Database.php b/lib/Data/Database.php index bea75f27..16495754 100644 --- a/lib/Data/Database.php +++ b/lib/Data/Database.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;\Data; +namespace PrivateBin\Data; use Exception; use PDO; diff --git a/lib/Data/Filesystem.php b/lib/Data/Filesystem.php index 1a371e89..3ebc237b 100644 --- a/lib/Data/Filesystem.php +++ b/lib/Data/Filesystem.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;\Data; +namespace PrivateBin\Data; use PrivateBin\Json; use PrivateBin\Model\Paste; diff --git a/lib/Model/AbstractModel.php b/lib/Model/AbstractModel.php index 38cedfd4..43a5b3b4 100644 --- a/lib/Model/AbstractModel.php +++ b/lib/Model/AbstractModel.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;\Model; +namespace PrivateBin\Model; use Exception; use PrivateBin\Configuration; diff --git a/lib/Model/Comment.php b/lib/Model/Comment.php index 39d78733..36468d21 100644 --- a/lib/Model/Comment.php +++ b/lib/Model/Comment.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;\Model; +namespace PrivateBin\Model; use Exception; use Identicon\Identicon; diff --git a/lib/Model/Paste.php b/lib/Model/Paste.php index 0ee3232d..70140404 100644 --- a/lib/Model/Paste.php +++ b/lib/Model/Paste.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;\Model; +namespace PrivateBin\Model; use Exception; use PrivateBin\Persistence\ServerSalt; diff --git a/lib/Persistence/AbstractPersistence.php b/lib/Persistence/AbstractPersistence.php index 7ec98caa..d4dcd6c2 100644 --- a/lib/Persistence/AbstractPersistence.php +++ b/lib/Persistence/AbstractPersistence.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;\Persistence; +namespace PrivateBin\Persistence; use Exception; diff --git a/lib/Persistence/PurgeLimiter.php b/lib/Persistence/PurgeLimiter.php index 90bc17ce..d65eb320 100644 --- a/lib/Persistence/PurgeLimiter.php +++ b/lib/Persistence/PurgeLimiter.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;\Persistence; +namespace PrivateBin\Persistence; use PrivateBin\Configuration; diff --git a/lib/Persistence/ServerSalt.php b/lib/Persistence/ServerSalt.php index 734d037a..1aa50ec0 100644 --- a/lib/Persistence/ServerSalt.php +++ b/lib/Persistence/ServerSalt.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;\Persistence; +namespace PrivateBin\Persistence; use Exception; diff --git a/lib/Persistence/TrafficLimiter.php b/lib/Persistence/TrafficLimiter.php index e752a0c9..6c2ce42e 100644 --- a/lib/Persistence/TrafficLimiter.php +++ b/lib/Persistence/TrafficLimiter.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;\Persistence; +namespace PrivateBin\Persistence; use PrivateBin\Configuration; diff --git a/patch.txt b/patch.txt new file mode 100644 index 00000000..a029a5ec --- /dev/null +++ b/patch.txt @@ -0,0 +1,305 @@ +diff --git a/lib/Configuration.php b/lib/Configuration.php +index 9249a744ab32b422c313e5b71e32091d978f9969..62edd6760a7ab78e2e0a17dcf068e44c280f2572 100644 +--- a/lib/Configuration.php ++++ b/lib/Configuration.php +@@ -10,7 +10,7 @@ + * @version 1.0 + */ + +-namespace PrivateBin;; ++namespace PrivateBin; + + use Exception; + use PDO; +diff --git a/lib/Data/AbstractData.php b/lib/Data/AbstractData.php +index 95b403938fac4bdcf0f5e5b6a8fa7f1c842c84df..c5d336797b8b1884e877d8db71c108318bbd71d9 100644 +--- a/lib/Data/AbstractData.php ++++ b/lib/Data/AbstractData.php +@@ -10,7 +10,9 @@ + * @version 1.0 + */ + +-namespace PrivateBin;\Data; ++namespace PrivateBin; ++ ++\Data; + + use stdClass; + +diff --git a/lib/Data/Database.php b/lib/Data/Database.php +index bea75f2785245664f81fd0a3b2234397cc69b000..fbce6637535161892689ae18007fa2a98994dddf 100644 +--- a/lib/Data/Database.php ++++ b/lib/Data/Database.php +@@ -10,12 +10,13 @@ + * @version 1.0 + */ + +-namespace PrivateBin;\Data; ++namespace PrivateBin; ++ ++\Data; + + use Exception; + use PDO; + use PDOException; +-use PrivateBin\PrivateBin; + use stdClass; + + /** +diff --git a/lib/Data/Filesystem.php b/lib/Data/Filesystem.php +index 1a371e89f8686f4bd19fcb3b14ce1b0e228a07d0..456516fe978d59160436c0d90aed442e041e4b96 100644 +--- a/lib/Data/Filesystem.php ++++ b/lib/Data/Filesystem.php +@@ -10,9 +10,10 @@ + * @version 1.0 + */ + +-namespace PrivateBin;\Data; ++namespace PrivateBin; ++ ++\Data; + +-use PrivateBin\Json; + use PrivateBin\Model\Paste; + + /** +diff --git a/lib/Filter.php b/lib/Filter.php +index 141c3ce4ff3c6f48e8e87bb44aecfa1a5635c131..2ecc3b5896c516c7e36ea55fe6fdb0d664baef3f 100644 +--- a/lib/Filter.php ++++ b/lib/Filter.php +@@ -10,7 +10,7 @@ + * @version 1.0 + */ + +-namespace PrivateBin;; ++namespace PrivateBin; + + use Exception; + +diff --git a/lib/I18n.php b/lib/I18n.php +index 60dbdd4e377fa0ac8d5ff64442e726cbbbd897fc..df9f734b35fbc209bc81d3706e6b3f2877ae1d0b 100644 +--- a/lib/I18n.php ++++ b/lib/I18n.php +@@ -10,7 +10,7 @@ + * @version 1.0 + */ + +-namespace PrivateBin;; ++namespace PrivateBin; + + /** + * I18n +diff --git a/lib/Json.php b/lib/Json.php +index ec27e6e31aac7850d3e9f141e1a9f3a39acf2222..2f26956562f228e10a710b2526bd44ed72271d82 100644 +--- a/lib/Json.php ++++ b/lib/Json.php +@@ -10,7 +10,7 @@ + * @version 1.0 + */ + +-namespace PrivateBin;; ++namespace PrivateBin; + + use Exception; + +diff --git a/lib/Model.php b/lib/Model.php +index e53da6bcd65e1ec5bf7e547bee23846a9073d54e..6dbe0214074245e81a9863cae70ef9d0aab7cbae 100644 +--- a/lib/Model.php ++++ b/lib/Model.php +@@ -10,7 +10,7 @@ + * @version 1.0 + */ + +-namespace PrivateBin;; ++namespace PrivateBin; + + use PrivateBin\Model\Paste; + use PrivateBin\Persistence\PurgeLimiter; +diff --git a/lib/Model/AbstractModel.php b/lib/Model/AbstractModel.php +index 38cedfd4d7eaa648d778535314bc9268ef36299e..6e1a98a9b7ce217eaf343cece3a61efcd0033cf8 100644 +--- a/lib/Model/AbstractModel.php ++++ b/lib/Model/AbstractModel.php +@@ -10,12 +10,12 @@ + * @version 1.0 + */ + +-namespace PrivateBin;\Model; ++namespace PrivateBin; ++ ++\Model; + + use Exception; +-use PrivateBin\Configuration; + use PrivateBin\Data\AbstractData; +-use PrivateBin\Sjcl; + use stdClass; + + /** +diff --git a/lib/Model/Comment.php b/lib/Model/Comment.php +index 39d78733aa788f16489a0956cc0fb1f55d384238..dd3ce305ab1312b8be04c43306074f5151de50ad 100644 +--- a/lib/Model/Comment.php ++++ b/lib/Model/Comment.php +@@ -10,13 +10,13 @@ + * @version 1.0 + */ + +-namespace PrivateBin;\Model; ++namespace PrivateBin; ++ ++\Model; + + use Exception; + use Identicon\Identicon; + use PrivateBin\Persistence\TrafficLimiter; +-use PrivateBin\Sjcl; +-use PrivateBin\Vizhash16x16; + + /** + * Comment +diff --git a/lib/Model/Paste.php b/lib/Model/Paste.php +index 0ee3232d639ba189295b990f79e7909c7baf01b7..4e55b85c6bc4318039ab9d5d9c6a5fb08627d2e7 100644 +--- a/lib/Model/Paste.php ++++ b/lib/Model/Paste.php +@@ -10,12 +10,12 @@ + * @version 1.0 + */ + +-namespace PrivateBin;\Model; ++namespace PrivateBin; ++ ++\Model; + + use Exception; + use PrivateBin\Persistence\ServerSalt; +-use PrivateBin\PrivateBin; +-use PrivateBin\Sjcl; + + /** + * Paste +diff --git a/lib/Persistence/AbstractPersistence.php b/lib/Persistence/AbstractPersistence.php +index 7ec98caadeddbbadd61d2eda12f59a67dfd5e238..d5bebdda341e6abf77941f63fe399fc1e3917558 100644 +--- a/lib/Persistence/AbstractPersistence.php ++++ b/lib/Persistence/AbstractPersistence.php +@@ -10,7 +10,9 @@ + * @version 1.0 + */ + +-namespace PrivateBin;\Persistence; ++namespace PrivateBin; ++ ++\Persistence; + + use Exception; + +diff --git a/lib/Persistence/PurgeLimiter.php b/lib/Persistence/PurgeLimiter.php +index 90bc17ceb17fcb4a1ae5eb77668fe8461f55afc9..9c4f6ffcb7bf51a79ca0910f50343674f3074a5e 100644 +--- a/lib/Persistence/PurgeLimiter.php ++++ b/lib/Persistence/PurgeLimiter.php +@@ -10,9 +10,9 @@ + * @version 1.0 + */ + +-namespace PrivateBin;\Persistence; ++namespace PrivateBin; + +-use PrivateBin\Configuration; ++\Persistence; + + /** + * PurgeLimiter +diff --git a/lib/Persistence/ServerSalt.php b/lib/Persistence/ServerSalt.php +index 734d037a9b0a15c0bc0c2ad1438b38f8513eed43..1248555245ae107708b7e2a5d935689d120e4b2c 100644 +--- a/lib/Persistence/ServerSalt.php ++++ b/lib/Persistence/ServerSalt.php +@@ -10,7 +10,9 @@ + * @version 1.0 + */ + +-namespace PrivateBin;\Persistence; ++namespace PrivateBin; ++ ++\Persistence; + + use Exception; + +diff --git a/lib/Persistence/TrafficLimiter.php b/lib/Persistence/TrafficLimiter.php +index e752a0c9c4a8d89da0d25e068f526d8a1d815860..7d7fd0914f291df8da32af0eed2d56563399aef8 100644 +--- a/lib/Persistence/TrafficLimiter.php ++++ b/lib/Persistence/TrafficLimiter.php +@@ -10,9 +10,9 @@ + * @version 1.0 + */ + +-namespace PrivateBin;\Persistence; ++namespace PrivateBin; + +-use PrivateBin\Configuration; ++\Persistence; + + /** + * TrafficLimiter +diff --git a/lib/PrivateBin.php b/lib/PrivateBin.php +index 54c296a25823db32d62898f1b29de01f995769e8..29d21a9158125617ce80a87e49b94e34b88cd318 100644 +--- a/lib/PrivateBin.php ++++ b/lib/PrivateBin.php +@@ -10,7 +10,7 @@ + * @version 1.0 + */ + +-namespace PrivateBin;; ++namespace PrivateBin; + + use Exception; + use PrivateBin\Persistence\ServerSalt; +diff --git a/lib/Request.php b/lib/Request.php +index 143b6047ba499a8b4a0971436cc5c39b85f8010f..03cd100ecdc33b26b49634608a2131ce808012ac 100644 +--- a/lib/Request.php ++++ b/lib/Request.php +@@ -10,7 +10,7 @@ + * @version 1.0 + */ + +-namespace PrivateBin;; ++namespace PrivateBin; + + /** + * Request +diff --git a/lib/Sjcl.php b/lib/Sjcl.php +index 5ed16fc8adb8704bdf49c66d6157a676bdc17bd5..72be729476960d0db86814eb57827cd0c508e935 100644 +--- a/lib/Sjcl.php ++++ b/lib/Sjcl.php +@@ -10,7 +10,7 @@ + * @version 1.0 + */ + +-namespace PrivateBin;; ++namespace PrivateBin; + + /** + * Sjcl +diff --git a/lib/View.php b/lib/View.php +index 6f8fdb74b8ccfc62a0a724d5165d30e98bcbb34c..45d7b3a0b17ac2117806cd4343b5211772f3df23 100644 +--- a/lib/View.php ++++ b/lib/View.php +@@ -10,7 +10,7 @@ + * @version 1.0 + */ + +-namespace PrivateBin;; ++namespace PrivateBin; + + use Exception; + +diff --git a/lib/Vizhash16x16.php b/lib/Vizhash16x16.php +index 282dac736d32837c613d2d473e6d0b19662e5e01..be648f28d85c46adff32a69cd984532d0987ded6 100644 +--- a/lib/Vizhash16x16.php ++++ b/lib/Vizhash16x16.php +@@ -11,7 +11,7 @@ + * @version 0.0.5 beta PrivateBin 1.0 + */ + +-namespace PrivateBin;; ++namespace PrivateBin; + + /** + * Vizhash16x16 From da10a761c4d645d5a3b2780934e8dafb7d58c4da Mon Sep 17 00:00:00 2001 From: rugk Date: Mon, 12 Dec 2016 18:50:00 +0100 Subject: [PATCH 3/5] Fix more typos --- lib/Configuration.php | 2 +- lib/Filter.php | 2 +- lib/I18n.php | 2 +- lib/Json.php | 2 +- lib/Model.php | 2 +- lib/PrivateBin.php | 2 +- lib/Request.php | 2 +- lib/Sjcl.php | 2 +- lib/View.php | 2 +- lib/Vizhash16x16.php | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/Configuration.php b/lib/Configuration.php index 9249a744..62edd676 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;; +namespace PrivateBin; use Exception; use PDO; diff --git a/lib/Filter.php b/lib/Filter.php index 141c3ce4..2ecc3b58 100644 --- a/lib/Filter.php +++ b/lib/Filter.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;; +namespace PrivateBin; use Exception; diff --git a/lib/I18n.php b/lib/I18n.php index 60dbdd4e..df9f734b 100644 --- a/lib/I18n.php +++ b/lib/I18n.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;; +namespace PrivateBin; /** * I18n diff --git a/lib/Json.php b/lib/Json.php index ec27e6e3..2f269565 100644 --- a/lib/Json.php +++ b/lib/Json.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;; +namespace PrivateBin; use Exception; diff --git a/lib/Model.php b/lib/Model.php index e53da6bc..6dbe0214 100644 --- a/lib/Model.php +++ b/lib/Model.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;; +namespace PrivateBin; use PrivateBin\Model\Paste; use PrivateBin\Persistence\PurgeLimiter; diff --git a/lib/PrivateBin.php b/lib/PrivateBin.php index 54c296a2..29d21a91 100644 --- a/lib/PrivateBin.php +++ b/lib/PrivateBin.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;; +namespace PrivateBin; use Exception; use PrivateBin\Persistence\ServerSalt; diff --git a/lib/Request.php b/lib/Request.php index 143b6047..03cd100e 100644 --- a/lib/Request.php +++ b/lib/Request.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;; +namespace PrivateBin; /** * Request diff --git a/lib/Sjcl.php b/lib/Sjcl.php index 5ed16fc8..72be7294 100644 --- a/lib/Sjcl.php +++ b/lib/Sjcl.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;; +namespace PrivateBin; /** * Sjcl diff --git a/lib/View.php b/lib/View.php index 6f8fdb74..45d7b3a0 100644 --- a/lib/View.php +++ b/lib/View.php @@ -10,7 +10,7 @@ * @version 1.0 */ -namespace PrivateBin;; +namespace PrivateBin; use Exception; diff --git a/lib/Vizhash16x16.php b/lib/Vizhash16x16.php index 282dac73..be648f28 100644 --- a/lib/Vizhash16x16.php +++ b/lib/Vizhash16x16.php @@ -11,7 +11,7 @@ * @version 0.0.5 beta PrivateBin 1.0 */ -namespace PrivateBin;; +namespace PrivateBin; /** * Vizhash16x16 From 124d1de3eb4b734bfd8d1189d6cd26bd0d947104 Mon Sep 17 00:00:00 2001 From: rugk Date: Mon, 12 Dec 2016 19:09:08 +0100 Subject: [PATCH 4/5] Remove accidentially added file --- patch.txt | 305 ------------------------------------------------------ 1 file changed, 305 deletions(-) delete mode 100644 patch.txt diff --git a/patch.txt b/patch.txt deleted file mode 100644 index a029a5ec..00000000 --- a/patch.txt +++ /dev/null @@ -1,305 +0,0 @@ -diff --git a/lib/Configuration.php b/lib/Configuration.php -index 9249a744ab32b422c313e5b71e32091d978f9969..62edd6760a7ab78e2e0a17dcf068e44c280f2572 100644 ---- a/lib/Configuration.php -+++ b/lib/Configuration.php -@@ -10,7 +10,7 @@ - * @version 1.0 - */ - --namespace PrivateBin;; -+namespace PrivateBin; - - use Exception; - use PDO; -diff --git a/lib/Data/AbstractData.php b/lib/Data/AbstractData.php -index 95b403938fac4bdcf0f5e5b6a8fa7f1c842c84df..c5d336797b8b1884e877d8db71c108318bbd71d9 100644 ---- a/lib/Data/AbstractData.php -+++ b/lib/Data/AbstractData.php -@@ -10,7 +10,9 @@ - * @version 1.0 - */ - --namespace PrivateBin;\Data; -+namespace PrivateBin; -+ -+\Data; - - use stdClass; - -diff --git a/lib/Data/Database.php b/lib/Data/Database.php -index bea75f2785245664f81fd0a3b2234397cc69b000..fbce6637535161892689ae18007fa2a98994dddf 100644 ---- a/lib/Data/Database.php -+++ b/lib/Data/Database.php -@@ -10,12 +10,13 @@ - * @version 1.0 - */ - --namespace PrivateBin;\Data; -+namespace PrivateBin; -+ -+\Data; - - use Exception; - use PDO; - use PDOException; --use PrivateBin\PrivateBin; - use stdClass; - - /** -diff --git a/lib/Data/Filesystem.php b/lib/Data/Filesystem.php -index 1a371e89f8686f4bd19fcb3b14ce1b0e228a07d0..456516fe978d59160436c0d90aed442e041e4b96 100644 ---- a/lib/Data/Filesystem.php -+++ b/lib/Data/Filesystem.php -@@ -10,9 +10,10 @@ - * @version 1.0 - */ - --namespace PrivateBin;\Data; -+namespace PrivateBin; -+ -+\Data; - --use PrivateBin\Json; - use PrivateBin\Model\Paste; - - /** -diff --git a/lib/Filter.php b/lib/Filter.php -index 141c3ce4ff3c6f48e8e87bb44aecfa1a5635c131..2ecc3b5896c516c7e36ea55fe6fdb0d664baef3f 100644 ---- a/lib/Filter.php -+++ b/lib/Filter.php -@@ -10,7 +10,7 @@ - * @version 1.0 - */ - --namespace PrivateBin;; -+namespace PrivateBin; - - use Exception; - -diff --git a/lib/I18n.php b/lib/I18n.php -index 60dbdd4e377fa0ac8d5ff64442e726cbbbd897fc..df9f734b35fbc209bc81d3706e6b3f2877ae1d0b 100644 ---- a/lib/I18n.php -+++ b/lib/I18n.php -@@ -10,7 +10,7 @@ - * @version 1.0 - */ - --namespace PrivateBin;; -+namespace PrivateBin; - - /** - * I18n -diff --git a/lib/Json.php b/lib/Json.php -index ec27e6e31aac7850d3e9f141e1a9f3a39acf2222..2f26956562f228e10a710b2526bd44ed72271d82 100644 ---- a/lib/Json.php -+++ b/lib/Json.php -@@ -10,7 +10,7 @@ - * @version 1.0 - */ - --namespace PrivateBin;; -+namespace PrivateBin; - - use Exception; - -diff --git a/lib/Model.php b/lib/Model.php -index e53da6bcd65e1ec5bf7e547bee23846a9073d54e..6dbe0214074245e81a9863cae70ef9d0aab7cbae 100644 ---- a/lib/Model.php -+++ b/lib/Model.php -@@ -10,7 +10,7 @@ - * @version 1.0 - */ - --namespace PrivateBin;; -+namespace PrivateBin; - - use PrivateBin\Model\Paste; - use PrivateBin\Persistence\PurgeLimiter; -diff --git a/lib/Model/AbstractModel.php b/lib/Model/AbstractModel.php -index 38cedfd4d7eaa648d778535314bc9268ef36299e..6e1a98a9b7ce217eaf343cece3a61efcd0033cf8 100644 ---- a/lib/Model/AbstractModel.php -+++ b/lib/Model/AbstractModel.php -@@ -10,12 +10,12 @@ - * @version 1.0 - */ - --namespace PrivateBin;\Model; -+namespace PrivateBin; -+ -+\Model; - - use Exception; --use PrivateBin\Configuration; - use PrivateBin\Data\AbstractData; --use PrivateBin\Sjcl; - use stdClass; - - /** -diff --git a/lib/Model/Comment.php b/lib/Model/Comment.php -index 39d78733aa788f16489a0956cc0fb1f55d384238..dd3ce305ab1312b8be04c43306074f5151de50ad 100644 ---- a/lib/Model/Comment.php -+++ b/lib/Model/Comment.php -@@ -10,13 +10,13 @@ - * @version 1.0 - */ - --namespace PrivateBin;\Model; -+namespace PrivateBin; -+ -+\Model; - - use Exception; - use Identicon\Identicon; - use PrivateBin\Persistence\TrafficLimiter; --use PrivateBin\Sjcl; --use PrivateBin\Vizhash16x16; - - /** - * Comment -diff --git a/lib/Model/Paste.php b/lib/Model/Paste.php -index 0ee3232d639ba189295b990f79e7909c7baf01b7..4e55b85c6bc4318039ab9d5d9c6a5fb08627d2e7 100644 ---- a/lib/Model/Paste.php -+++ b/lib/Model/Paste.php -@@ -10,12 +10,12 @@ - * @version 1.0 - */ - --namespace PrivateBin;\Model; -+namespace PrivateBin; -+ -+\Model; - - use Exception; - use PrivateBin\Persistence\ServerSalt; --use PrivateBin\PrivateBin; --use PrivateBin\Sjcl; - - /** - * Paste -diff --git a/lib/Persistence/AbstractPersistence.php b/lib/Persistence/AbstractPersistence.php -index 7ec98caadeddbbadd61d2eda12f59a67dfd5e238..d5bebdda341e6abf77941f63fe399fc1e3917558 100644 ---- a/lib/Persistence/AbstractPersistence.php -+++ b/lib/Persistence/AbstractPersistence.php -@@ -10,7 +10,9 @@ - * @version 1.0 - */ - --namespace PrivateBin;\Persistence; -+namespace PrivateBin; -+ -+\Persistence; - - use Exception; - -diff --git a/lib/Persistence/PurgeLimiter.php b/lib/Persistence/PurgeLimiter.php -index 90bc17ceb17fcb4a1ae5eb77668fe8461f55afc9..9c4f6ffcb7bf51a79ca0910f50343674f3074a5e 100644 ---- a/lib/Persistence/PurgeLimiter.php -+++ b/lib/Persistence/PurgeLimiter.php -@@ -10,9 +10,9 @@ - * @version 1.0 - */ - --namespace PrivateBin;\Persistence; -+namespace PrivateBin; - --use PrivateBin\Configuration; -+\Persistence; - - /** - * PurgeLimiter -diff --git a/lib/Persistence/ServerSalt.php b/lib/Persistence/ServerSalt.php -index 734d037a9b0a15c0bc0c2ad1438b38f8513eed43..1248555245ae107708b7e2a5d935689d120e4b2c 100644 ---- a/lib/Persistence/ServerSalt.php -+++ b/lib/Persistence/ServerSalt.php -@@ -10,7 +10,9 @@ - * @version 1.0 - */ - --namespace PrivateBin;\Persistence; -+namespace PrivateBin; -+ -+\Persistence; - - use Exception; - -diff --git a/lib/Persistence/TrafficLimiter.php b/lib/Persistence/TrafficLimiter.php -index e752a0c9c4a8d89da0d25e068f526d8a1d815860..7d7fd0914f291df8da32af0eed2d56563399aef8 100644 ---- a/lib/Persistence/TrafficLimiter.php -+++ b/lib/Persistence/TrafficLimiter.php -@@ -10,9 +10,9 @@ - * @version 1.0 - */ - --namespace PrivateBin;\Persistence; -+namespace PrivateBin; - --use PrivateBin\Configuration; -+\Persistence; - - /** - * TrafficLimiter -diff --git a/lib/PrivateBin.php b/lib/PrivateBin.php -index 54c296a25823db32d62898f1b29de01f995769e8..29d21a9158125617ce80a87e49b94e34b88cd318 100644 ---- a/lib/PrivateBin.php -+++ b/lib/PrivateBin.php -@@ -10,7 +10,7 @@ - * @version 1.0 - */ - --namespace PrivateBin;; -+namespace PrivateBin; - - use Exception; - use PrivateBin\Persistence\ServerSalt; -diff --git a/lib/Request.php b/lib/Request.php -index 143b6047ba499a8b4a0971436cc5c39b85f8010f..03cd100ecdc33b26b49634608a2131ce808012ac 100644 ---- a/lib/Request.php -+++ b/lib/Request.php -@@ -10,7 +10,7 @@ - * @version 1.0 - */ - --namespace PrivateBin;; -+namespace PrivateBin; - - /** - * Request -diff --git a/lib/Sjcl.php b/lib/Sjcl.php -index 5ed16fc8adb8704bdf49c66d6157a676bdc17bd5..72be729476960d0db86814eb57827cd0c508e935 100644 ---- a/lib/Sjcl.php -+++ b/lib/Sjcl.php -@@ -10,7 +10,7 @@ - * @version 1.0 - */ - --namespace PrivateBin;; -+namespace PrivateBin; - - /** - * Sjcl -diff --git a/lib/View.php b/lib/View.php -index 6f8fdb74b8ccfc62a0a724d5165d30e98bcbb34c..45d7b3a0b17ac2117806cd4343b5211772f3df23 100644 ---- a/lib/View.php -+++ b/lib/View.php -@@ -10,7 +10,7 @@ - * @version 1.0 - */ - --namespace PrivateBin;; -+namespace PrivateBin; - - use Exception; - -diff --git a/lib/Vizhash16x16.php b/lib/Vizhash16x16.php -index 282dac736d32837c613d2d473e6d0b19662e5e01..be648f28d85c46adff32a69cd984532d0987ded6 100644 ---- a/lib/Vizhash16x16.php -+++ b/lib/Vizhash16x16.php -@@ -11,7 +11,7 @@ - * @version 0.0.5 beta PrivateBin 1.0 - */ - --namespace PrivateBin;; -+namespace PrivateBin; - - /** - * Vizhash16x16 From d6255f64e4a080a3c47234c7bb67ac21cd2e9a3e Mon Sep 17 00:00:00 2001 From: rugk Date: Tue, 13 Dec 2016 23:20:50 +0100 Subject: [PATCH 5/5] German translation: lower case for 'du' Writing 'Du' with a capital letter is an older style of writing it. 'du' is muich better. (Of course, we could also introduce a 'Sie' version, but that's another thing) --- i18n/de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/i18n/de.json b/i18n/de.json index 2bc8cdb5..4bee273a 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -67,7 +67,7 @@ "Never": "Nie", "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": - "Hinweis: Dies ist ein Versuchsdienst. Daten können jederzeit gelöscht werden. Kätzchen werden sterben wenn Du diesen Dienst missbrauchst.", + "Hinweis: Dies ist ein Versuchsdienst. Daten können jederzeit gelöscht werden. Kätzchen werden sterben wenn du diesen Dienst missbrauchst.", "This document will expire in %d seconds.": ["Dieses Dokument läuft in einer Sekunde ab.", "Dieses Dokument läuft in %d Sekunden ab."], "This document will expire in %d minutes.": @@ -123,7 +123,7 @@ "Could not create paste: %s": "Konnte Text nicht erstellen: %s", "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": - "Konnte Text nicht entschlüsseln: Der Schlüssel fehlt in der Adresse (Hast Du eine Umleitung oder einen URL-Verkürzer benutzt, der Teile der Adresse entfernt?)", + "Konnte Text nicht entschlüsseln: Der Schlüssel fehlt in der Adresse (Hast du eine Umleitung oder einen URL-Verkürzer benutzt, der Teile der Adresse entfernt?)", "Format": "Format", "Plain Text": "Nur Text", "Source Code": "Quellcode",