bumping version number to 1.0

whereas the other things are advantaged security features.

.codeclimate.yml

@@ -0,0 +1,39 @@
+---
+engines:
+  csslint:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - javascript
+      - php
+  eslint:
+    enabled: true
+  fixme:
+    enabled: true
+  phpmd:
+    enabled: true
+    checks:
+      Controversial/CamelCaseClassName:
+        enabled: false
+      Controversial/CamelCaseMethodName:
+        enabled: false
+      Controversial/CamelCasePropertyName:
+        enabled: false
+      Controversial/CamelCaseVariableName:
+        enabled: false
+      Controversial/Superglobals:
+        enabled: false
+      CleanCode/ElseExpression:
+        enabled: false
+      CleanCode/StaticAccess:
+        enabled: false
+ratings:
+  paths:
+  - "css/privatebin.css"
+  - "css/bootstrap/privatebin.css"
+  - "js/privatebin.js"
+  - "lib/**.php"
+  - "index.php"
+exclude_paths: []

.csslintrc

@@ -0,0 +1,2 @@
+--exclude-exts=.min.css
+--ignore=adjoining-classes,box-model,ids,order-alphabetical,unqualified-attributes

.editorconfig

@@ -0,0 +1,43 @@
+# editorconfig.org
+
+root = true
+
+[*]
+# Unix style files
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.css]
+indent_style = tab
+indent_size = 4
+
+[*.js]
+indent_style = space
+indent_size = 4
+
+[*.json]
+indent_style = space
+indent_size = 4
+
+[*.jsonld]
+indent_style = tab
+indent_size = 4
+
+[*.php]
+indent_style = space
+indent_size = 4
+
+[*.{htm,html}]
+indent_style = tab
+indent_size = 4
+
+[*.{md,markdown}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = false
+
+[.travis.yml]
+indent_style = space
+indent_size = 4

.eslintignore

@@ -0,0 +1 @@
+**/*{.,-}min.js

.eslintrc

@@ -0,0 +1,216 @@
+ecmaFeatures:
+  modules: true
+  jsx: true
+
+env:
+  amd: true
+  browser: true
+  es6: true
+  jquery: true
+  node: true
+
+globals:
+  sjcl: false
+
+# http://eslint.org/docs/rules/
+rules:
+  # Possible Errors
+  comma-dangle: [2, never]
+  no-cond-assign: 2
+  no-console: 0
+  no-constant-condition: 2
+  no-control-regex: 2
+  no-debugger: 2
+  no-dupe-args: 2
+  no-dupe-keys: 2
+  no-duplicate-case: 2
+  no-empty: 2
+  no-empty-character-class: 2
+  no-ex-assign: 2
+  no-extra-boolean-cast: 2
+  no-extra-parens: 0
+  no-extra-semi: 2
+  no-func-assign: 2
+  no-inner-declarations: [2, functions]
+  no-invalid-regexp: 2
+  no-irregular-whitespace: 2
+  no-negated-in-lhs: 2
+  no-obj-calls: 2
+  no-regex-spaces: 2
+  no-sparse-arrays: 2
+  no-unexpected-multiline: 2
+  no-unreachable: 2
+  use-isnan: 2
+  valid-jsdoc: 0
+  valid-typeof: 2
+
+  # Best Practices
+  accessor-pairs: 2
+  block-scoped-var: 0
+  complexity: [2, 6]
+  consistent-return: 0
+  curly: 0
+  default-case: 0
+  dot-location: 0
+  dot-notation: 0
+  eqeqeq: 2
+  guard-for-in: 2
+  no-alert: 0
+  no-caller: 2
+  no-case-declarations: 2
+  no-div-regex: 2
+  no-else-return: 0
+  no-empty-label: 2
+  no-empty-pattern: 2
+  no-eq-null: 2
+  no-eval: 2
+  no-extend-native: 2
+  no-extra-bind: 2
+  no-fallthrough: 2
+  no-floating-decimal: 0
+  no-implicit-coercion: 0
+  no-implied-eval: 2
+  no-invalid-this: 0
+  no-iterator: 2
+  no-labels: 0
+  no-lone-blocks: 2
+  no-loop-func: 2
+  no-magic-number: 0
+  no-multi-spaces: 0
+  no-multi-str: 0
+  no-native-reassign: 2
+  no-new-func: 2
+  no-new-wrappers: 2
+  no-new: 2
+  no-octal-escape: 2
+  no-octal: 2
+  no-proto: 2
+  no-redeclare: 2
+  no-return-assign: 2
+  no-script-url: 2
+  no-self-compare: 2
+  no-sequences: 0
+  no-throw-literal: 0
+  no-unused-expressions: 2
+  no-useless-call: 2
+  no-useless-concat: 2
+  no-void: 2
+  no-warning-comments: 0
+  no-with: 2
+  radix: 2
+  vars-on-top: 0
+  wrap-iife: 2
+  yoda: 0
+
+  # Strict
+  strict: 0
+
+  # Variables
+  init-declarations: 0
+  no-catch-shadow: 2
+  no-delete-var: 2
+  no-label-var: 2
+  no-shadow-restricted-names: 2
+  no-shadow: 0
+  no-undef-init: 2
+  no-undef: 0
+  no-undefined: 0
+  no-unused-vars: 0
+  no-use-before-define: 0
+
+  # Node.js and CommonJS
+  callback-return: 2
+  global-require: 2
+  handle-callback-err: 2
+  no-mixed-requires: 0
+  no-new-require: 0
+  no-path-concat: 2
+  no-process-exit: 2
+  no-restricted-modules: 0
+  no-sync: 0
+
+  # Stylistic Issues
+  array-bracket-spacing: 0
+  block-spacing: 0
+  brace-style: 0
+  camelcase: 0
+  comma-spacing: 0
+  comma-style: 0
+  computed-property-spacing: 0
+  consistent-this: 0
+  eol-last: 0
+  func-names: 0
+  func-style: 0
+  id-length: 0
+  id-match: 0
+  indent: 0
+  jsx-quotes: 0
+  key-spacing: 0
+  linebreak-style: 0
+  lines-around-comment: 0
+  max-depth: 0
+  max-len: 0
+  max-nested-callbacks: 0
+  max-params: 0
+  max-statements: [2, 30]
+  new-cap: 0
+  new-parens: 0
+  newline-after-var: 0
+  no-array-constructor: 0
+  no-bitwise: 0
+  no-continue: 0
+  no-inline-comments: 0
+  no-lonely-if: 0
+  no-mixed-spaces-and-tabs: 0
+  no-multiple-empty-lines: 0
+  no-negated-condition: 0
+  no-nested-ternary: 0
+  no-new-object: 0
+  no-plusplus: 0
+  no-restricted-syntax: 0
+  no-spaced-func: 0
+  no-ternary: 0
+  no-trailing-spaces: 0
+  no-underscore-dangle: 0
+  no-unneeded-ternary: 0
+  object-curly-spacing: 0
+  one-var: 0
+  operator-assignment: 0
+  operator-linebreak: 0
+  padded-blocks: 0
+  quote-props: 0
+  quotes: 0
+  require-jsdoc: 0
+  semi-spacing: 0
+  semi: 0
+  sort-vars: 0
+  space-after-keywords: 0
+  space-before-blocks: 0
+  space-before-function-paren: 0
+  space-before-keywords: 0
+  space-in-parens: 0
+  space-infix-ops: 0
+  space-return-throw-case: 0
+  space-unary-ops: 0
+  spaced-comment: 0
+  wrap-regex: 0
+
+  # ECMAScript 6
+  arrow-body-style: 0
+  arrow-parens: 0
+  arrow-spacing: 0
+  constructor-super: 0
+  generator-star-spacing: 0
+  no-arrow-condition: 0
+  no-class-assign: 0
+  no-const-assign: 0
+  no-dupe-class-members: 0
+  no-this-before-super: 0
+  no-var: 0
+  object-shorthand: 0
+  prefer-arrow-callback: 0
+  prefer-const: 0
+  prefer-reflect: 0
+  prefer-spread: 0
+  prefer-template: 0
+  require-yield: 0

.gitattributes

@@ -1,4 +1,12 @@
 doc/ export-ignore
 tst/ export-ignore
+.codeclimate.yml export-ignore
+.csslintrc export-ignore
+.editorconfig export-ignore
+.eslintignore export-ignore
+.eslintrc export-ignore
 .gitattributes export-ignore
+.github export-ignore
 .gitignore export-ignore
+.php_cs export-ignore
+.travis.yml export-ignore

.github/CONTRIBUTING.md

@@ -0,0 +1,8 @@
+# Contributing
+
+At first, awesome you take the time to make PrivateBin better! :tada: :+1:
+
+Have a look at our [contributing guide](https://github.com/PrivateBin/PrivateBin/wiki/Development) if you want to hack on the code.
+If you want to translate PrivateBin into your language have a look at the [translation guide](https://github.com/PrivateBin/PrivateBin/wiki/Translation).
+
+Except this also opening [issues](https://github.com/PrivateBin/PrivateBin/issues) helps much. Just describe your problem detailed enough and fill out our template.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,36 @@
+<!-- Please have a look at our FAQ before submitting an issue: https://github.com/PrivateBin/PrivateBin/wiki/FAQ -->
+<!-- This is a template for an bug report. If you would like to suggest a feature, feel free to delete the part below. -->
+
+## Steps to reproduce
+<!-- Tell us how to reproduce the problem. -->
+1. 
+2. 
+
+### What happens
+
+
+### What should happen
+
+
+## Additional information
+<!--
+Here you can add screenshots. If the issue is e.g. a client-side issue (= an issue, which happens in your browser) press F12 and copy and paste the console output or add a screenshot.
+If you have access to the server log files, also copy them here.
+-->
+
+## Basic information
+
+<!-- If you use a public server (or a private server where you like to get more vists) enter the address of it here. -->
+**Server address**: 
+
+<!-- The Operation System of your server -->
+**Server OS:** 
+
+<!-- The webserver running on your server, preferrably including the version -->
+**Webserver:** 
+
+<!-- The version of your browser (when it is a client-side issue) -->
+**Browser:** 
+
+<!-- The version of PrivateBin, if you use an unstable version paste the commit hash or the GitHub link to the commit here (you can get it by running `git rev-parse HEAD`) -->
+**PrivateBin version:** 

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,24 @@
+<!-- This is a template for your Pull Request. This are just some suggestions for you. You do not have to use all of them. -->
+
+<!-- **Attention:** Please tick this box to agree to release your code under the projects license. Otherwise your PR cannot be accepted. -->
+* [ ] I agree to release the changes in this PR under the Zlib/libpng license as shown in the  [LICENSE file](https://github.com/PrivateBin/PrivateBin/blob/master/LICENSE.md#zliblibpng-license-for-privatebin).
+
+<!-- Alternatively uncomment and tick this box to release your code under public domain:
+* [ ] To the extent possible under law, I have waived all copyright and related or neighboring rights to this PR and publish it as public domain.
+-->
+
+<!-- If your PR fixes an issue, mention it here. You can also just copy the URL - GitHub will convert it for you.
+If this PR fixes several issues, please prepend each issue url/number with the word "fix"/"fixes" or "close"/"closes" as this automatically closes the issues you metioned when the PR is merged.
+-->
+This PR fixes 
+
+## Changes
+<!-- List all the changes you have done -->
+* 
+* 
+
+## ToDo
+<!-- Add things, you still want to do. It is recommend to put "[DNM]", "[DONOTMERGE]", "[WIP]" or "[WORKINPROGRESS]" **into the title** of your PR if you still want to work on this PR, but just do not want to have it merged yet. -->
+* [ ] 
+* [ ] 
+* [ ] 

.gitignore

@@ -1,12 +1,32 @@
-# Ignore data/ and tmp/
-data/
-tmp/
-# Ignore for safety
+# Ignore server files for safety
 .htaccess
 .htpasswd
+
+# Ignore data/
+data/
+
+# Ignore PhpDoc
+doc/*
+!doc/*.md
+
+# Ignore vendor dir of Composer except PHP files
+vendor/*.*
+vendor/*/*.*
+vendor/*/*/*.*
+vendor/*/*/*/*.*
+vendor/*/*/*/*/*.*
+vendor/*/*/*/*/*/*.*
+vendor/**/LICENSE
+vendor/**/test
+vendor/**/tst
+vendor/**/tests
+vendor/**/build_phar.php
+!vendor/**/*.php
+
+composer.lock
+
 # Ignore unit testing logs, api docs and eclipse project files
 tst/log/
-doc/
 .settings
 .buildpath
 .project

.htaccess.disabled

@@ -0,0 +1,3 @@
+RewriteEngine on
+RewriteCond %{HTTP_USER_AGENT} ^.*(bot|spider|crawl|https?://|WhatsApp|SkypeUriPreview) [NC]
+RewriteRule .* - [R=403,L]

.php_cs

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Configuration file for PHP Coding Standards Fixer (php-cs-fixer).
+ *
+ * On GitHub: https://github.com/FriendsOfPhp/php-cs-fixer
+ * More information: http://cs.sensiolabs.org/
+ */
+
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->in('lib')
+;
+
+return Symfony\CS\Config\Config::create()
+    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
+    ->fixers(['concat_with_spaces', 'long_array_syntax', 'standardize_not_equal',
+              'operators_spaces', 'duplicate_semicolon',
+              'remove_leading_slash_use', 'align_equals',
+              'single_array_no_trailing_comma', 'phpdoc_indent', 'phpdoc_scalar',
+              'phpdoc_to_comment', 'phpdoc_trim',
+              'phpdoc_types', 'print_to_echo', 'self_accessor', 'single_quote',
+              'spaces_cast', 'ternary_spaces', 'phpdoc_order'])
+    ->finder($finder)
+;

.travis.yml

@@ -0,0 +1,17 @@
+language: php
+sudo: false
+php:
+  - 5.5
+  - 5.6
+  - 7.0
+
+before_script:
+  - composer install -n
+
+script:
+  - cd tst && phpunit
+
+after_script:
+  - cd ..
+  - vendor/bin/codacycoverage clover tst/log/coverage-clover.xml
+  - vendor/bin/test-reporter --coverage-report tst/log/coverage-clover.xml

CHANGELOG.md

@@ -1,5 +1,48 @@
-# ZeroBin version history #
+# PrivateBin version history
 
+  * **1.0 (2016-08-25)**
+    * ADDED: Translations for Slowene and Chinese
+    * ADDED: re-introduced (optional) URL shortener support, which was removed back in version 0.16 for privacy concerns
+    * ADDED: Preview tab, helpful for writing markdown code or check the source code rendering
+    * ADDED: Automatic purging of expired pastes, done on paste creation
+    * ADDED: Option to disable icons in discussions (will only affect newly created pastes)
+    * ADDED: Composer support
+    * CHANGED: Renamed the ZeroBin fork to PrivateBin
+    * CHANGED: Removed unmaintained RainTPL template engine, replacing the templates with straight forward PHP files
+    * CHANGED: New logo and favicons
+    * CHANGED: Upgrading SJCL library to 1.0.4
+    * CHANGED: Switched to GCM instead of CCM mode for AES encryption for newly created pastes
+    * CHANGED: Use backported random bytes function from PHP7 for older PHP versions instead of mcrypt
+    * CHANGED: Switched to a SHA256 HMAC of the IP in traffic limiter instead of storing it in plain text on the server
+    * CHANGED: Introduced content security policy header to reduce cross site scripting (XSS) risks
+    * CHANGED: Added SHA512 subresource integrity hashes for all javascript includes to reduce the risk of manipulated scripts and easier detection of such
+    * CHANGED: Refactored PHP code to conform to PSR-4 and PSR-2 standards
+    * CHANGED: Switched to Identicons as the default for comments with nicknames
+    * CHANGED: Vizhash is now optional and based on (128 byte) SHA512 HMAC instead of (144 byte) combination of MD5, SHA1 and a reversal of that string
+    * FIXED: Content-type negociation for HTML in certain uncommon browser configurations
+    * FIXED: JavaScript error displayed before page is loaded or during attachment load
+    * FIXED: Don't strip space characters at beginning or end of optional password
+    * FIXED: Various UI glitches in mobile version or on smaller desktops with language menu, button spacing and long URLs
+    * FIXED: Back button now works as expected after switching to raw text view of a paste
+    * FIXED: Reactivated second error message above send comment button to ensure its visibility when the main error message is outside the viewport
+    * FIXED: Raw text now displays original markdown instead of rendered HTML
+    * FIXED: Removed unused code detected with the help of various code review tools
+    * FIXED: Table format for PostgreSQL, making it possible to use PostgreSQL as backend in addition to MySQL, SQLite and flat files
+  * **0.22 (2015-11-09)**:
+    * ADDED: Tab character input support
+    * ADDED: Dark bootstrap theme
+    * ADDED: Option to hide clone button on expiring pastes
+    * ADDED: Option to set a different default language then English and/or enforce it as the only language
+    * ADDED: Database now contains version to allow automatic update of structure, only if necessary; removing database structure check on each request
+    * ADDED: Favicons
+    * FIXING: Regressions in database layer, prohibiting pastes from being stored
+    * FIXING: Fixing "missing" comments when they were posted during the same second to the same paste
+    * FIXING: JS failing when password input disabled
+    * CHANGED: Switching positions of "New" and "Send" button, highlighting the latter to improve workflow
+    * CHANGED: Renamed config file to make updates easier
+    * CHANGED: Switching to JSON-based REST-API
+    * CHANGED: Database structure to store attachments, allowing larger attachments to be stored (depending on maximum BLOB size of database backend)
+    * CHANGED: Refactored data model, traffic limiting & request handling
   * **0.21.1 (2015-09-21)**:
     * FIXING: lost meta data when using DB model instead of flat files
     * FIXING: mobile navbar getting triggered on load
@@ -18,10 +61,10 @@
       * for simpler maintenance the functions were grouped into objects: zerobin (display logic, event handling), filter (compression,
 encryption), i18n (translation, counterpart of i18n.php) and helper (stateless utilities)
     * Wiki pages were added to address common topics:
-      * [Upgrading from ZeroBin 0.19 Alpha](https://github.com/elrido/ZeroBin/wiki/Upgrading-from-ZeroBin-0.19-Alpha)
-      * [ZeroBin Directory of public servers](https://github.com/elrido/ZeroBin/wiki/ZeroBin-Directory)
-      * [Translation](https://github.com/elrido/ZeroBin/wiki/Translation)
-      * [Templates](https://github.com/elrido/ZeroBin/wiki/Templates)
+      * [Upgrading from ZeroBin 0.19 Alpha](https://github.com/PrivateBin/PrivateBin/wiki/Upgrading-from-ZeroBin-0.19-Alpha)
+      * [Directory of public PrivateBin servers](https://github.com/PrivateBin/PrivateBin/wiki/PrivateBin-Directory)
+      * [Translation](https://github.com/PrivateBin/PrivateBin/wiki/Translation)
+      * [Templates](https://github.com/PrivateBin/PrivateBin/wiki/Templates)
   * **0.20 (2015-09-03)**:
     * ADDED: Password protected pastes (optional)
     * ADDED: configuration options for highlighting, password, discussions, expiration times, rate limiting

CREDITS.md

@@ -1,16 +1,23 @@
-Credits
-=======
-Sébastien Sauvage - original idea and main developer
+# Credits
 
-Alexey Gladkov - syntax highlighting
-Greg Knaddison - robots.txt
-MrKooky - HTML5 markup, CSS cleanup
-Simon Rupf - MVC refactoring, configuration, i18n and unit tests
-Hexalyse - Password protection
-Viktor Stanchev - File upload support
+Sébastien Sauvage - original idea and main developer  
+Simon Rupf - current developer and maintainer
+
+* Alexey Gladkov - syntax highlighting
+* Greg Knaddison - robots.txt
+* MrKooky - HTML5 markup, CSS cleanup
+* Simon Rupf - MVC refactoring, configuration, i18n and unit tests
+* Hexalyse - Password protection
+* Viktor Stanchev - File upload support
+* azlux - Tab character input support
+* Adam Fisher - Favicons
+* rugk - various stuff, logo and icons
+* Sobak - PSR-4 and PSR-2 refactoring
 
 Translations:
-Hexalyse - French
-Kuba Niewiarowski - Polish
-Gabbalo - German
-Draky50110 - French
+* Hexalyse - French
+* Kuba Niewiarowski - Polish
+* Gabbalo - German
+* Draky50110 - French
+* Filip Muki Dobranić - Slovene
+* Jiawei Zhou - Chinese

INSTALL.md

@@ -1,31 +1,43 @@
-Installation
-============
+# Installation
+
+**TL;DR:** Download the
+[latest release archive](https://github.com/PrivateBin/PrivateBin/releases/latest)
+and extract it in your web hosts folder where you want to install your PrivateBin
+instance. We try to provide a safe default configuration, but advise you to check
+the options and adjust them as you see fit.
 
 ## Basic installation
 
-**TL;DR:** Download the [latest release archive](https://github.com/elrido/ZeroBin/releases/latest)
-and extract it in your web hosts folder were you want to install your ZeroBin instance.
-
 ### Requirements
 
-- PHP version 5.2.6 or above
+- PHP version 5.3 or above
+- _one_ of the following sources of cryptographically safe randomness is required:
+  - PHP 7 or higher
+  - [Libsodium](https://download.libsodium.org/libsodium/content/installation/) and it's [PHP extension](https://paragonie.com/book/pecl-libsodium/read/00-intro.md#installing-libsodium)
+  - open_basedir access to `/dev/urandom`
+  - mcrypt extension
+  - com_dotnet extension
+  
+  Mcrypt needs to be able to access `/dev/urandom`. This means if `open_basedir` is set, it must include this file.
 - GD extension
-- mcrypt extension (recommended)
-- some disk space or (optional) a database supported by PDO
+- (optional) a database supported by [PDO](https://secure.php.net/manual/book.pdo.php)
+- ability to create files and folders in the installation directory and the PATH
 - A web browser with javascript support
 
 ### Configuration
 
-In the file `cfg/conf.ini` you can configure ZeroBin. The config file is divided
-into multiple sections, which are enclosed in square brackets.
+In the file `cfg/conf.ini` you can configure PrivateBin. A `cfg/conf.ini.sample`
+is provided containing all options and default values. You can copy it to
+`cfg/conf.ini` and adapt it as needed. The config file is divided into multiple
+sections, which are enclosed in square brackets.
 
-In the `[main]` section you can enable or disable the discussion feature, set the
-limit of stored pastes and comments in bytes. The `[traffic]` section lets you
-set a time limit in seconds. Users may not post more often then this limit to
-your ZeroBin installation.
+In the `[main]` section you can enable or disable the discussion feature, set
+the limit of stored pastes and comments in bytes. The `[traffic]` section lets
+you set a time limit in seconds. Users may not post more often then this limit
+to your PrivateBin installation.
 
 More details can be found in the
-[configuration documentation](https://github.com/elrido/ZeroBin/wiki/Configuration).
+[configuration documentation](https://github.com/PrivateBin/PrivateBin/wiki/Configuration).
 
 ## Advanced installation
 
@@ -33,61 +45,93 @@ More details can be found in the
 
 In the index.php you can define a different `PATH`. This is useful to secure your
 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)).
+libraries (directories cfg, doc, data, lib, tpl, tst and vendor) outside of your
+document root. This new location must still be accessible to your webserver / PHP
+process (see also
+[open_basedir setting](https://secure.php.net/manual/en/ini.core.php#ini.open-basedir)).
 
 > #### PATH Example
-> Your zerobin installation lives in a subfolder called "paste" inside of your
-> document root. The URL looks like this:
+> Your PrivateBin installation lives in a subfolder called "paste" inside of
+> your document root. The URL looks like this:
 > http://example.com/paste/
-> The full path of ZeroBin on your webserver is:
+>
+> The full path of PrivateBin on your webserver is:
 > /home/example.com/htdocs/paste
 > 
 > When setting the path like this:
-> define('PATH', '../../secret/zerobin/');
-> ZeroBin will look for your includes here:
-> /home/example.com/secret/zerobin
+> define('PATH', '../../secret/privatebin/');
+>
+> PrivateBin will look for your includes / data here:
+> /home/example.com/secret/privatebin
+
+### Web server configuration
+
+A `robots.txt` file is provided in the root dir of PrivateBin. It disallows all
+robots from accessing your pastes. It is recommend to place it into the root of
+your web directory if you have installed PrivateBin in a subdirectory. Make sure
+to adjust it, so that the file paths match your installation. Of course also
+adjust the file if you already use a `robots.txt`.
+
+A `.htaccess.disabled` file is provided in the root dir of PrivateBin. It blocks
+some known robots and link-scanning bots. If you use Apache, you can rename the
+file to `.htaccess` to enable this feature. If you use another webserver, you
+have to configure it manually to do the same.
 
 ### Using a database instead of flat files
 
 In the configuration file the `[model]` and `[model_options]` sections let you
-configure your favourite way of storing the pastes and discussions on your server.
+configure your favourite way of storing the pastes and discussions on your
+server.
 
-`zerobin_data` is the default model, which stores everything in files in the data
-folder. This is the recommended setup for most sites.
+`Filesystem` is the default model, which stores everything in files in the
+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 `zerobin_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
+locally, you might want to switch to the `Database` model. This lets you
+store your data in a database. Basically all databases that are supported by
+[PDO](https://secure.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 zerobin database with another application. The table
-prefix option is called `tbl`.
+if you have to share the PrivateBin database with another application or you want
+to use a prefix for
+[security reasons](https://security.stackexchange.com/questions/119510/is-using-a-db-prefix-for-tables-more-secure).
+The table prefix option is called `tbl`.
 
 > #### Note
-> The "zerobin_db" model has only been tested with SQLite and MySQL, although it
-would not be recommended to use SQLite in a production environment. If you gain
-any experience running ZeroBin on other RDBMS, please let us know.
+> The `Database` model has only been tested with SQLite, MySQL and PostgreSQL,
+> although it would not be recommended to use SQLite in a production environment.
+> If you gain any experience running PrivateBin on other RDBMS, please let us
+> know.
 
-For reference or if you want to create the table schema for yourself:
+For reference or if you want to create the table schema for yourself (replace
+`prefix_` with your own table prefix):
 
     CREATE TABLE prefix_paste (
-        dataid CHAR(16),
-        data TEXT,
+        dataid CHAR(16) NOT NULL,
+        data BLOB,
         postdate INT,
         expiredate INT,
         opendiscussion INT,
-        burnafterreading INT
+        burnafterreading INT,
+        meta TEXT,
+        attachment MEDIUMBLOB,
+        attachmentname BLOB,
+        PRIMARY KEY (dataid)
     );
     
     CREATE TABLE prefix_comment (
         dataid CHAR(16),
         pasteid CHAR(16),
         parentid CHAR(16),
-        data TEXT,
-        nickname VARCHAR(255),
-        vizhash TEXT,
-        postdate INT
+        data BLOB,
+        nickname BLOB,
+        vizhash BLOB,
+        postdate INT,
+        PRIMARY KEY (dataid)
     );
+    CREATE INDEX parent ON prefix_comment(pasteid);
+    
+    CREATE TABLE prefix_config (
+        id CHAR(16) NOT NULL, value TEXT, PRIMARY KEY (id)
+    );
+    INSERT INTO prefix_config VALUES('VERSION', '0.22');

LICENSE.md

@@ -0,0 +1,954 @@
+# License
+
+PrivateBin consists of PHP and JS code which was originally written by Sébastien
+Sauvage in 2012 and falls unter the Zlib/libpng license. Also included are
+libraries that fall under the GPLv2 (SJCL, rawinflate, rawdeflate), BSD
+2-clause (SJCL), BSD 3-clause (base64.js version 2.1.9, Showdown), MIT
+(base64.js version 1.7, Bootstrap, Identicon, random_compat), Apache
+(prettify.js) and CC-BY (favicon, icon, logo) licenses. All of these license
+terms can be found here below:
+
+## Zlib/libpng license for PrivateBin
+
+Copyright © 2012 Sébastien Sauvage
+
+This software is provided 'as-is', without any express or implied warranty. In
+no event will the authors be held liable for any damages arising from the use
+of this software.
+
+Permission is granted to anyone to use this software for any purpose, including
+commercial applications, and to alter it and redistribute it freely, subject to
+the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim
+   that you wrote the original software. If you use this software in a product,
+   an acknowledgment in the product documentation would be appreciated but is
+   not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+## GNU General Public License, version 2.0, for SJCL, rawdeflate and rawinflate
+
+_Version 2, June 1991_
+_Copyright © 1989, 1991 Free Software Foundation, Inc.,_
+_51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA_
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+### Preamble
+
+The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+We protect your rights with two steps: **(1)** copyright the software, and
+**(2)** offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+**0.** This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The “Program”, below,
+refers to any such program or work, and a “work based on the Program”
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term “modification”.)  Each licensee is addressed as “you”.
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+**1.** You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+**2.** You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+* **a)** You must cause the modified files to carry prominent notices
+stating that you changed the files and the date of any change.
+* **b)** You must cause any work that you distribute or publish, that in
+whole or in part contains or is derived from the Program or any
+part thereof, to be licensed as a whole at no charge to all third
+parties under the terms of this License.
+* **c)** If the modified program normally reads commands interactively
+when run, you must cause it, when started running for such
+interactive use in the most ordinary way, to print or display an
+announcement including an appropriate copyright notice and a
+notice that there is no warranty (or else, saying that you provide
+a warranty) and that users may redistribute the program under
+these conditions, and telling the user how to view a copy of this
+License.  (Exception: if the Program itself is interactive but
+does not normally print such an announcement, your work based on
+the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+**3.** You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+* **a)** Accompany it with the complete corresponding machine-readable
+source code, which must be distributed under the terms of Sections
+1 and 2 above on a medium customarily used for software interchange; or,
+* **b)** Accompany it with a written offer, valid for at least three
+years, to give any third party, for a charge no more than your
+cost of physically performing source distribution, a complete
+machine-readable copy of the corresponding source code, to be
+distributed under the terms of Sections 1 and 2 above on a medium
+customarily used for software interchange; or,
+* **c)** Accompany it with the information you received as to the offer
+to distribute corresponding source code.  (This alternative is
+allowed only for noncommercial distribution and only if you
+received the program in object code or executable form with such
+an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+**4.** You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+**5.** You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+**6.** Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+**7.** If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+**8.** If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+**9.** The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and “any
+later version”, you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+**10.** If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+### NO WARRANTY
+
+**11.** BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+**12.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+## BSD 2-Clause License for SJCL
+
+_Copyright © 2009-2015, Emily Stark, Mike Hamburg and Dan Boneh at Stanford University._
+_All rights reserved._
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## BSD 3-Clause License for Showdown
+
+Showdown Copyright © 2007, John Fraser
+<http://www.attacklab.net/>
+All rights reserved.
+
+Original Markdown copyright © 2004, John Gruber
+<http://daringfireball.net/>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name "Markdown" nor the names of its contributors may be used
+  to endorse or promote products derived from this software without specific
+  prior written permission.
+
+This software is provided by the copyright holders and contributors "as is" and
+any express or implied warranties, including, but not limited to, the implied
+warranties of merchantability and fitness for a particular purpose are
+disclaimed. In no event shall the copyright owner or contributors be liable for
+any direct, indirect, incidental, special, exemplary, or consequential damages
+(including, but not limited to, procurement of substitute goods or services;
+loss of use, data, or profits; or business interruption) however caused and on
+any theory of liability, whether in contract, strict liability, or tort
+(including negligence or otherwise) arising in any way out of the use of this
+software, even if advised of the possibility of such damage.
+
+## BSD 3-Clause License for base64.js version 2.1.9
+
+Copyright © 2014, Dan Kogai
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of base64.js nor the names of its contributors may be used
+  to endorse or promote products derived from this software without specific
+  prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## MIT License for base64.js version 1.7
+
+Copyright © 2012 Dan Kogai
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+## MIT License for Bootstrap
+
+Copyright © 2011-2016 Twitter, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+## MIT License for Identicon
+
+Copyright © 2013 Benjamin Laugueux <benjamin@yzalis.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+## MIT License for random_compat
+
+Copyright © 2015 Paragon Initiative Enterprises
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+## MIT license for Composer
+
+Copyright (c) 2016 Nils Adermann, Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+## Apache License for prettify.js
+
+_Version 2.0, January 2004_
+_<http://www.apache.org/licenses/>_
+
+### Terms and Conditions for use, reproduction, and distribution
+
+#### 1. Definitions
+
+“License” shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+“Licensor” shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+“Legal Entity” shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, “control” means **(i)** the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
+outstanding shares, or **(iii)** beneficial ownership of such entity.
+
+“You” (or “Your”) shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+“Source” form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+“Object” form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+“Work” shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+“Derivative Works” shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+“Contribution” shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+“submitted” means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as “Not a Contribution.”
+
+“Contributor” shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+#### 2. Grant of Copyright License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+#### 3. Grant of Patent License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+#### 4. Redistribution
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+* **(a)** You must give any other recipients of the Work or Derivative Works a
+copy of this License; and
+* **(b)** You must cause any modified files to carry prominent notices stating
+that You changed the files; and
+* **(c)** You must retain, in the Source form of any Derivative Works that You
+distribute, all copyright, patent, trademark, and attribution notices from the
+Source form of the Work, excluding those notices that do not pertain to any part
+of the Derivative Works; and
+* **(d)** If the Work includes a “NOTICE” text file as part of its distribution,
+then any Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+#### 5. Submission of Contributions
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+#### 6. Trademarks
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+#### 7. Disclaimer of Warranty
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+#### 8. Limitation of Liability
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+#### 9. Accepting Warranty or Additional Liability
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+## [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/) for [PrivateBin favicons, icons & logos](https://github.com/PrivateBin/assets) by [rugk](https://github.com/rugk)
+
+By exercising the Licensed Rights (defined below), You accept and agree to be
+bound by the terms and conditions of this Creative Commons Attribution 4.0
+International Public License ("Public License"). To the extent this Public
+License may be interpreted as a contract, You are granted the Licensed Rights in
+consideration of Your acceptance of these terms and conditions, and the Licensor
+grants You such rights in consideration of benefits the Licensor receives from
+making the Licensed Material available under these terms and conditions.
+
+### Section 1 – Definitions.
+
+a. __Adapted Material__ means material subject to Copyright and Similar Rights
+that is derived from or based upon the Licensed Material and in which the
+Licensed Material is translated, altered, arranged, transformed, or otherwise
+modified in a manner requiring permission under the Copyright and Similar Rights
+held by the Licensor. For purposes of this Public License, where the Licensed
+Material is a musical work, performance, or sound recording, Adapted Material is
+always produced where the Licensed Material is synched in timed relation with a
+moving image.
+
+b. __Adapter's License__ means the license You apply to Your Copyright and
+Similar Rights in Your contributions to Adapted Material in accordance with the
+terms and conditions of this Public License.
+
+c. __Copyright and Similar Rights__ means copyright and/or similar rights
+closely related to copyright including, without limitation, performance,
+broadcast, sound recording, and Sui Generis Database Rights, without regard to
+how the rights are labeled or categorized. For purposes of this Public License,
+the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+
+d. __Effective Technological Measures__ means those measures that, in the
+absence of proper authority, may not be circumvented under laws fulfilling
+obligations under Article 11 of the WIPO Copyright Treaty adopted on December
+20, 1996, and/or similar international agreements.
+
+e. __Exceptions and Limitations__ means fair use, fair dealing, and/or any other
+exception or limitation to Copyright and Similar Rights that applies to Your use
+of the Licensed Material.
+
+f. __Licensed Material__ means the artistic or literary work, database, or other
+material to which the Licensor applied this Public License.
+
+g. __Licensed Rights__ means the rights granted to You subject to the terms and
+conditions of this Public License, which are limited to all Copyright and
+Similar Rights that apply to Your use of the Licensed Material and that the
+Licensor has authority to license.
+
+h. __Licensor__ means the individual(s) or entity(ies) granting rights under
+this Public License.
+
+i. __Share__ means to provide material to the public by any means or process
+that requires permission under the Licensed Rights, such as reproduction, public
+display, public performance, distribution, dissemination, communication, or
+importation, and to make material available to the public including in ways that
+members of the public may access the material from a place and at a time
+individually chosen by them.
+
+j. __Sui Generis Database Rights__ means rights other than copyright resulting
+from Directive 96/9/EC of the European Parliament and of the Council of 11 March
+1996 on the legal protection of databases, as amended and/or succeeded, as well
+as other essentially equivalent rights anywhere in the world.
+
+k. __You__ means the individual or entity exercising the Licensed Rights under
+this Public License. Your has a corresponding meaning.
+
+### Section 2 – Scope.
+
+a. ___License grant.___
+
+    1. Subject to the terms and conditions of this Public License, the Licensor
+       hereby grants You a worldwide, royalty-free, non-sublicensable,
+       non-exclusive, irrevocable license to exercise the Licensed Rights in the
+       Licensed Material to:
+
+        A. reproduce and Share the Licensed Material, in whole or in part; and
+
+        B. produce, reproduce, and Share Adapted Material.
+
+    2. __Exceptions and Limitations.__ For the avoidance of doubt, where
+       Exceptions and Limitations apply to Your use, this Public License does
+       not apply, and You do not need to comply with its terms and conditions.
+
+    3. __Term.__ The term of this Public License is specified in Section 6(a).
+
+    4. __Media and formats; technical modifications allowed.__ The Licensor
+       authorizes You to exercise the Licensed Rights in all media and formats
+       whether now known or hereafter created, and to make technical
+       modifications necessary to do so. The Licensor waives and/or agrees not
+       to assert any right or authority to forbid You from making technical
+       modifications necessary to exercise the Licensed Rights, including
+       technical modifications necessary to circumvent Effective Technological
+       Measures. For purposes of this Public License, simply making
+       modifications authorized by this Section 2(a)(4) never produces Adapted
+       Material.
+
+    5. __Downstream recipients.__
+
+        A. __Offer from the Licensor – Licensed Material.__ Every recipient of
+           the Licensed Material automatically receives an offer from the
+           Licensor to exercise the Licensed Rights under the terms and
+           conditions of this Public License.
+
+        B. __No downstream restrictions.__ You may not offer or impose any
+           additional or different terms or conditions on, or apply any
+           Effective Technological Measures to, the Licensed Material if doing
+           so restricts exercise of the Licensed Rights by any recipient of the
+           Licensed Material.
+
+    6. __No endorsement.__ Nothing in this Public License constitutes or may be
+       construed as permission to assert or imply that You are, or that Your use
+       of the Licensed Material is, connected with, or sponsored, endorsed, or
+       granted official status by, the Licensor or others designated to receive
+       attribution as provided in Section 3(a)(1)(A)(i).
+
+b. ___Other rights.___
+
+    1. Moral rights, such as the right of integrity, are not licensed under this
+       Public License, nor are publicity, privacy, and/or other similar
+       personality rights; however, to the extent possible, the Licensor waives
+       and/or agrees not to assert any such rights held by the Licensor to the
+       limited extent necessary to allow You to exercise the Licensed Rights,
+       but not otherwise.
+
+    2. Patent and trademark rights are not licensed under this Public License.
+
+    3. To the extent possible, the Licensor waives any right to collect
+       royalties from You for the exercise of the Licensed Rights, whether
+       directly or through a collecting society under any voluntary or waivable
+       statutory or compulsory licensing scheme. In all other cases the Licensor
+       expressly reserves any right to collect such royalties.
+
+### Section 3 – License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the following
+conditions.
+
+a. ___Attribution.___
+
+    1. If You Share the Licensed Material (including in modified form), You must:
+
+        A. retain the following if it is supplied by the Licensor with the
+           Licensed Material:
+
+            i. identification of the creator(s) of the Licensed Material and any
+               others designated to receive attribution, in any reasonable
+               manner requested by the Licensor (including by pseudonym if
+               designated);
+
+            ii. a copyright notice;
+
+            iii. a notice that refers to this Public License;
+
+            iv. a notice that refers to the disclaimer of warranties;
+
+            v. a URI or hyperlink to the Licensed Material to the extent
+               reasonably practicable;
+
+        B. indicate if You modified the Licensed Material and retain an
+           indication of any previous modifications; and
+
+        C. indicate the Licensed Material is licensed under this Public License,
+           and include the text of, or the URI or hyperlink to, this Public
+           License.
+
+    2. You may satisfy the conditions in Section 3(a)(1) in any reasonable
+       manner based on the medium, means, and context in which You Share the
+       Licensed Material. For example, it may be reasonable to satisfy the
+       conditions by providing a URI or hyperlink to a resource that includes
+       the required information.
+
+    3. If requested by the Licensor, You must remove any of the information
+       required by Section 3(a)(1)(A) to the extent reasonably practicable.
+
+    4. If You Share Adapted Material You produce, the Adapter's License You
+       apply must not prevent recipients of the Adapted Material from complying
+       with this Public License.
+
+### Section 4 – Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that apply to Your
+use of the Licensed Material:
+
+a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
+   reuse, reproduce, and Share all or a substantial portion of the contents of
+   the database;
+
+b. if You include all or a substantial portion of the database contents in a
+   database in which You have Sui Generis Database Rights, then the database in
+   which You have Sui Generis Database Rights (but not its individual contents)
+   is Adapted Material; and
+
+c. You must comply with the conditions in Section 3(a) if You Share all or a
+   substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not replace Your
+obligations under this Public License where the Licensed Rights include other
+Copyright and Similar Rights.
+
+### Section 5 – Disclaimer of Warranties and Limitation of Liability.
+
+a. __Unless otherwise separately undertaken by the Licensor, to the extent
+   possible, the Licensor offers the Licensed Material as-is and as-available,
+   and makes no representations or warranties of any kind concerning the
+   Licensed Material, whether express, implied, statutory, or other. This
+   includes, without limitation, warranties of title, merchantability, fitness
+   for a particular purpose, non-infringement, absence of latent or other
+   defects, accuracy, or the presence or absence of errors, whether or not known
+   or discoverable. Where disclaimers of warranties are not allowed in full or
+   in part, this disclaimer may not apply to You.__
+
+b. __To the extent possible, in no event will the Licensor be liable to You on
+   any legal theory (including, without limitation, negligence) or otherwise for
+   any direct, special, indirect, incidental, consequential, punitive,
+   exemplary, or other losses, costs, expenses, or damages arising out of this
+   Public License or use of the Licensed Material, even if the Licensor has been
+   advised of the possibility of such losses, costs, expenses, or damages. Where
+   a limitation of liability is not allowed in full or in part, this limitation
+   may not apply to You.__
+
+c. The disclaimer of warranties and limitation of liability provided above shall
+   be interpreted in a manner that, to the extent possible, most closely
+   approximates an absolute disclaimer and waiver of all liability.
+
+### Section 6 – Term and Termination.
+
+a. This Public License applies for the term of the Copyright and Similar Rights
+   licensed here. However, if You fail to comply with this Public License, then
+   Your rights under this Public License terminate automatically.
+
+b. Where Your right to use the Licensed Material has terminated under Section
+   6(a), it reinstates:
+
+    1. automatically as of the date the violation is cured, provided it is cured
+       within 30 days of Your discovery of the violation; or
+
+    2. upon express reinstatement by the Licensor.
+
+    For the avoidance of doubt, this Section 6(b) does not affect any right the
+    Licensor may have to seek remedies for Your violations of this Public
+    License.
+
+c. For the avoidance of doubt, the Licensor may also offer the Licensed Material
+   under separate terms or conditions or stop distributing the Licensed Material
+   at any time; however, doing so will not terminate this Public License.
+
+d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+
+### Section 7 – Other Terms and Conditions.
+
+a. The Licensor shall not be bound by any additional or different terms or
+   conditions communicated by You unless expressly agreed.
+
+b. Any arrangements, understandings, or agreements regarding the Licensed
+   Material not stated herein are separate from and independent of the terms and
+   conditions of this Public License.
+
+### Section 8 – Interpretation.
+
+a. For the avoidance of doubt, this Public License does not, and shall not be
+   interpreted to, reduce, limit, restrict, or impose conditions on any use of
+   the Licensed Material that could lawfully be made without permission under
+   this Public License.
+
+b. To the extent possible, if any provision of this Public License is deemed
+   unenforceable, it shall be automatically reformed to the minimum extent
+   necessary to make it enforceable. If the provision cannot be reformed, it
+   shall be severed from this Public License without affecting the
+   enforceability of the remaining terms and conditions.
+
+c. No term or condition of this Public License will be waived and no failure to
+   comply consented to unless expressly agreed to by the Licensor.
+
+d. Nothing in this Public License constitutes or may be interpreted as a
+   limitation upon, or waiver of, any privileges and immunities that apply to
+   the Licensor or You, including from the legal processes of any jurisdiction
+   or authority.

README.md

@@ -1,16 +1,27 @@
-# ZeroBin 0.21.1
+# [<img alt="PrivateBin" src="https://cdn.rawgit.com/PrivateBin/assets/master/images/minified/logo.svg" width="500" />](https://privatebin.info/)
+[![Build Status](https://travis-ci.org/PrivateBin/PrivateBin.svg?branch=master)](https://travis-ci.org/PrivateBin/PrivateBin) [![Build Status](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/badges/build.png?b=master)](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/build-status/master)  
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/094500f62abf4c9aa0c8a8a4520e4789)](https://www.codacy.com/app/PrivateBin/PrivateBin)
+[![Code Climate](https://codeclimate.com/github/PrivateBin/PrivateBin/badges/gpa.svg)](https://codeclimate.com/github/PrivateBin/PrivateBin)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/?branch=master)
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/57c9e74e-c6f9-4de6-a876-df66ec2ea1ff/mini.png)](https://insight.sensiolabs.com/projects/57c9e74e-c6f9-4de6-a876-df66ec2ea1ff)  
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/094500f62abf4c9aa0c8a8a4520e4789)](https://www.codacy.com/app/PrivateBin/PrivateBin)
+[![Test Coverage](https://codeclimate.com/github/PrivateBin/PrivateBin/badges/coverage.svg)](https://codeclimate.com/github/PrivateBin/PrivateBin/coverage) [![Code Coverage](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/?branch=master)
 
-ZeroBin is a minimalist, opensource online pastebin where the server has zero 
-knowledge of pasted data.
+*Current version: 1.0*
 
-Data is encrypted/decrypted in the browser using 256 bit AES.
+**PrivateBin** is a minimalist, open source online pastebin where the server has
+zero knowledge of pasted data.
 
-This fork of ZeroBin refactored the source code to allow easier and cleaner 
-extensions. It is still fully compatible to the original ZeroBin 0.19 data 
-storage scheme. Therefore such installations can be upgraded to this fork 
+Data is encrypted/decrypted in the browser using 256bit AES in [Galois Counter mode](https://en.wikipedia.org/wiki/Galois/Counter_Mode).
+
+This is a fork of ZeroBin, originally developed by
+[Sébastien Sauvage](https://github.com/sebsauvage/ZeroBin). It was refactored
+to allow easier and cleaner extensions and has now much more features than the
+original. It is however still fully compatible to the original ZeroBin 0.19
+data storage scheme. Therefore such installations can be upgraded to this fork
 without loosing any data.
 
-## What ZeroBin provides
+## What PrivateBin provides
 
 + As a server administrator you don't have to worry if your users post content
   that is considered illegal in your country. You have no knowledge of any
@@ -19,62 +30,87 @@ without loosing any data.
 
 + Pastebin-like system to store text documents, code samples, etc.
 
-+ Encryption of data sent to server, even if it does not provide HTTPS.
++ Encryption of data sent to server.
 
-+ Possibility to set a password which is required to read the paste. It further 
++ Possibility to set a password which is required to read the paste. It further
   protects a paste and prevents people stumbling upon your paste's link
   from being able to read it without the password.
 
 ## What it doesn't provide
 
-- As a user you have to trust the server administrator, your internet provider 
+- As a user you have to trust the server administrator, your internet provider
   and any country the traffic passes not to inject any malicious javascript code.
+  For a basic security the PrivateBin installation *has to provide HTTPS*!
+  Additionally it should be secured by
+  [HSTS](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) and
+  ideally by [HPKP](https://en.wikipedia.org/wiki/HTTP_Public_Key_Pinning) using a
+  certificate either validated by a trusted third party (check the certificate
+  when first using a new PrivateBin instance) or self-signed by the server
+  operator, validated using a
+  [DNSSEC](https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions)
+  protected
+  [DANE](https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities)
+  record.
 
 - The "key" used to encrypt the paste is part of the URL. If you publicly post
   the URL of a paste that is not password-protected, everybody can read it.
-  Use a password if you want your paste to be private.
+  Use a password if you want your paste to be private. In this case make sure to
+  use a strong password and do only share it privately and end-to-end-encrypted.
 
 - A server admin might be forced to hand over access logs to the authorities.
-  ZeroBin encrypts your text and the discussion contents, but who accessed it
+  PrivateBin encrypts your text and the discussion contents, but who accessed it
   first might still be disclosed via such access logs.
 
+- In case of a server breach your data is secure as it is only stored encrypted
+  on the server. However the server could be misused or the server admin could
+  be legally forced into sending malicious JavaScript to all web users, which
+  grabs the decryption key and send it to the server when a user accesses a
+  PrivateBin.  
+  Therefore do not access any PrivateBin instance if you think it has been
+  compromised. As long as no user accesses this instance with a previously
+  generated URL, the content can''t be decrypted.
+
 ## Options
 
 Some features are optional and can be enabled or disabled in the [configuration
-file](https://github.com/elrido/ZeroBin/wiki/Configuration):
+file](https://github.com/PrivateBin/PrivateBin/wiki/Configuration):
 
 * Password protection
 
-* Discussions
+* Discussions, anonymous or with nicknames and IP based identicons or vizhashes
 
 * Expiration times, including a "forever" and "burn after reading" option
 
-* Markdown format support for HTML formatted pastes
+* Markdown format support for HTML formatted pastes, including preview function
 
-* Syntax highlighting for source code using prettify.js, including 4 prettify themes
+* Syntax highlighting for source code using prettify.js, including 4 prettify
+  themes
 
-* File upload support, images get displayed (disabled by default, possibility to adjust size limit)
+* File upload support, images get displayed (disabled by default, possibility
+  to adjust size limit)
 
-* Templates: By default there is a bootstrap CSS and a "classic ZeroBin" theme
-  and it is easy to adapt these to your own websites layout or create your own.
+* Templates: By default there are bootstrap CSS, darkstrap and "classic ZeroBin"
+  themes and it is easy to adapt these to your own websites layout or create
+  your own.
 
-* Translation system and automatic browser language detection (if enabled in browser)
+* Translation system and automatic browser language detection (if enabled in
+  browser)
 
 * Language selection (disabled by default, as it uses a session cookie)
 
 ## Further resources
 
-* [Installation guide](https://github.com/elrido/ZeroBin/wiki/Installation)
+* [Installation guide](https://github.com/PrivateBin/PrivateBin/wiki/Installation)
 
-* [Upgrading from 0.19 Alpha](https://github.com/elrido/ZeroBin/wiki/Upgrading-from-ZeroBin-0.19-Alpha)
+* [Upgrading from ZeroBin 0.19 Alpha](https://github.com/PrivateBin/PrivateBin/wiki/Upgrading-from-ZeroBin-0.19-Alpha)
 
-* [Configuration guide](https://github.com/elrido/ZeroBin/wiki/Configuration)
+* [Configuration guide](https://github.com/PrivateBin/PrivateBin/wiki/Configuration)
 
-* [Templates](https://github.com/elrido/ZeroBin/wiki/Templates)
+* [Templates](https://github.com/PrivateBin/PrivateBin/wiki/Templates)
 
-* [Translation guide](https://github.com/elrido/ZeroBin/wiki/Translation)
+* [Translation guide](https://github.com/PrivateBin/PrivateBin/wiki/Translation)
 
-* [Developer guide](https://github.com/elrido/ZeroBin/wiki/Development)
+* [Developer guide](https://github.com/PrivateBin/PrivateBin/wiki/Development)
 
-Run into any issues? Have ideas for further developments? Please 
-[report](https://github.com/elrido/ZeroBin/issues) them!
+Run into any issues? Have ideas for further developments? Please
+[report](https://github.com/PrivateBin/PrivateBin/issues) them!

browserconfig.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+  <msapplication>
+    <tile>
+      <square150x150logo src="mstile-150x150.png"/>
+      <square310x310logo src="mstile-310x310.png"/>
+      <wide310x150logo src="mstile-310x150.png"/>
+      <TileColor>#ffc40d</TileColor>
+    </tile>
+  </msapplication>
+</browserconfig>

cfg/.gitignore

@@ -0,0 +1 @@
+/conf.ini

cfg/conf.ini

@@ -1,111 +0,0 @@
-; ZeroBin
-;
-; a zero-knowledge paste bin
-;
-; @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
-; @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
-; @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
-; @version   0.21.1
-
-[main]
-; enable or disable the discussion feature, defaults to true
-discussion = true
-
-; preselect the discussion feature, defaults to false
-opendiscussion = false
-
-; enable or disable the password feature, defaults to true
-password = true
-
-; enable or disable the file upload feature, defaults to false
-fileupload = false
-
-; preselect the burn-after-reading feature, defaults to false
-burnafterreadingselected = false
-
-; which display mode to preselect by default, defaults to "plaintext"
-; make sure the value exists in [formatter_options]
-defaultformatter = "plaintext"
-
-; (optional) set a syntax highlighting theme, as found in css/prettify/
-; syntaxhighlightingtheme = "sons-of-obsidian"
-
-; size limit per paste or comment in bytes, defaults to 2 Mibibytes
-sizelimit = 2097152
-
-; template to include, default is "bootstrap" (tpl/bootstrap.html)
-template = "bootstrap"
-
-; (optional) notice to display
-; notice = "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service."
-
-; base64.js library version, defaults to 2.1.9
-; use "1.7" if you are upgrading from a ZeroBin Alpha 0.19 installation
-base64version = "2.1.9"
-
-; by default ZeroBin will guess the visitors language based on the browsers
-; settings. Optionally you can enable the language selection menu, which uses
-; a session cookie to store the choice until the browser is closed.
-languageselection = false
-
-[expire]
-; expire value that is selected per default
-; make sure the value exists in [expire_options]
-default = "1week"
-
-[expire_options]
-; Set each one of these to the number of seconds in the expiration period,
-; or 0 if it should never expire
-5min = 300
-10min = 600
-1hour = 3600
-1day = 86400
-1week = 604800
-; Well this is not *exactly* one month, it's 30 days:
-1month = 2592000
-1year = 31536000
-never = 0
-
-[formatter_options]
-; Set available formatters, their order and their labels
-plaintext = "Plain Text"
-syntaxhighlighting = "Source Code"
-markdown = "Markdown"
-
-[traffic]
-; time limit between calls from the same IP address in seconds
-; Set this to 0 to disable rate limiting.
-limit = 10
-
-; (optional) if your website runs behind a reverse proxy or load balancer,
-; set the HTTP header containing the visitors IP address, i.e. X_FORWARDED_FOR
-; header = "X_FORWARDED_FOR"
-
-; directory to store the traffic limits in
-dir = PATH "data"
-
-[model]
-; name of data model class to load and directory for storage
-; the default model "zerobin_data" stores everything in the filesystem
-class = zerobin_data
-[model_options]
-dir = PATH "data"
-
-;[model]
-; example of DB configuration for MySQL
-;class = zerobin_db
-;[model_options]
-;dsn = "mysql:host=localhost;dbname=zerobin;charset=UTF8"
-;tbl = "zerobin_"	; table prefix
-;usr = "zerobin"
-;pwd = "Z3r0P4ss"
-;opt[12] = true	  ; PDO::ATTR_PERSISTENT
-
-;[model]
-; example of DB configuration for SQLite
-;class = zerobin_db
-;[model_options]
-;dsn = "sqlite:" PATH "data/db.sq3"
-;usr = null
-;pwd = null
-;opt[12] = true	; PDO::ATTR_PERSISTENT

cfg/conf.ini.sample

@@ -0,0 +1,148 @@
+; config file for PrivateBin
+; 
+; An explanation of each setting can be find online at https://github.com/PrivateBin/PrivateBin/wiki/Configuration.
+
+[main]
+; enable or disable the discussion feature, defaults to true
+discussion = true
+
+; preselect the discussion feature, defaults to false
+opendiscussion = false
+
+; enable or disable the password feature, defaults to true
+password = true
+
+; enable or disable the file upload feature, defaults to false
+fileupload = false
+
+; preselect the burn-after-reading feature, defaults to false
+burnafterreadingselected = false
+
+; which display mode to preselect by default, defaults to "plaintext"
+; make sure the value exists in [formatter_options]
+defaultformatter = "plaintext"
+
+; (optional) set a syntax highlighting theme, as found in css/prettify/
+; syntaxhighlightingtheme = "sons-of-obsidian"
+
+; size limit per paste or comment in bytes, defaults to 2 Mibibytes
+sizelimit = 2097152
+
+; template to include, default is "bootstrap" (tpl/bootstrap.html)
+template = "bootstrap"
+
+; (optional) notice to display
+; notice = "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service."
+
+; by default PrivateBin will guess the visitors language based on the browsers
+; settings. Optionally you can enable the language selection menu, which uses
+; a session cookie to store the choice until the browser is closed.
+languageselection = false
+
+; set the language your installs defaults to, defaults to English
+; if this is set and language selection is disabled, this will be the only language
+; languagedefault = "en"
+
+; (optional) URL shortener address to offer after a new paste is created
+; it is suggested to only use this with self-hosted shorteners as this will leak
+; the pastes encryption key
+; urlshortener = "https://shortener.example.com/api?link="
+
+; (optional) IP based icons are a weak mechanism to detect if a comment was from
+; a different user when the same username was used in a comment. It might be
+; used to get the IP of a non anonymous comment poster if the server salt is
+; leaked and a SHA256 HMAC rainbow table is generated for all (relevant) IPs.
+; Can be set to one these values: none / vizhash / identicon (default).
+; icon = none
+
+; Content Security Policy headers allow a website to restrict what sources are
+; allowed to be accessed in its context. You need to change this if you added
+; custom scripts from third-party domains to your templates, e.g. tracking
+; scripts or run your site behind certain DDoS-protection services.
+; Check the documentation at https://content-security-policy.com/
+cspheader = "default-src 'none'; connect-src *; script-src 'self'; style-src 'self'; font-src 'self'; img-src 'self' data:;"
+
+; stay compatible with PrivateBin Alpha 0.19, less secure
+; if enabled will use base64.js version 1.7 instead of 2.1.9 and sha1 instead of
+; sha256 in HMAC for the deletion token
+zerobincompatibility = false
+
+[expire]
+; expire value that is selected per default
+; make sure the value exists in [expire_options]
+default = "1week"
+
+; optionally the "clone" button can be disabled on expiring pastes
+; note that this only hides the button, copy & paste is still possible
+; clone = false
+
+[expire_options]
+; Set each one of these to the number of seconds in the expiration period,
+; or 0 if it should never expire
+5min = 300
+10min = 600
+1hour = 3600
+1day = 86400
+1week = 604800
+; Well this is not *exactly* one month, it's 30 days:
+1month = 2592000
+1year = 31536000
+never = 0
+
+[formatter_options]
+; Set available formatters, their order and their labels
+plaintext = "Plain Text"
+syntaxhighlighting = "Source Code"
+markdown = "Markdown"
+
+[traffic]
+; time limit between calls from the same IP address in seconds
+; Set this to 0 to disable rate limiting.
+limit = 10
+
+; (optional) if your website runs behind a reverse proxy or load balancer,
+; set the HTTP header containing the visitors IP address, i.e. X_FORWARDED_FOR
+; header = "X_FORWARDED_FOR"
+
+; directory to store the traffic limits in
+dir = PATH "data"
+
+[purge]
+; minimum time limit between two purgings of expired pastes, it is only
+; triggered when pastes are created
+; Set this to 0 to run a purge every time a paste is created.
+limit = 300
+
+; maximum amount of expired pastes to delete in one purge
+; Set this to 0 to disable purging. Set it higher, if you are running a large
+; site
+batchsize = 10
+
+; directory to store the purge limit in
+dir = PATH "data"
+
+[model]
+; name of data model class to load and directory for storage
+; the default model "Filesystem" stores everything in the filesystem
+class = Filesystem
+[model_options]
+dir = PATH "data"
+
+;[model]
+; example of DB configuration for MySQL
+;class = Database
+;[model_options]
+;dsn = "mysql:host=localhost;dbname=privatebin;charset=UTF8"
+;tbl = "privatebin_"	; table prefix
+;usr = "privatebin"
+;pwd = "Z3r0P4ss"
+;opt[12] = true	  ; PDO::ATTR_PERSISTENT
+
+;[model]
+; example of DB configuration for SQLite
+;class = Database
+;[model_options]
+;dsn = "sqlite:" PATH "data/db.sq3"
+;usr = null
+;pwd = null
+;opt[12] = true	; PDO::ATTR_PERSISTENT

composer.json

@@ -0,0 +1,37 @@
+{
+    "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 (GCM).",
+    "type": "project",
+    "keywords": ["private", "secure", "end-to-end-encrypted", "e2e", "paste", "pastebin", "zero", "zero-knowledge", "encryption", "encrypted", "AES"],
+    "homepage": "https://github.com/PrivateBin",
+    "license":"zlib-acknowledgement",
+    "support": {
+        "issues": "https://github.com/PrivateBin/PrivateBin/issues",
+        "wiki": "https://github.com/PrivateBin/PrivateBin/wiki",
+        "source": "https://github.com/PrivateBin/PrivateBin",
+        "docs": "https://zerobin.dssr.ch/documentation/"
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/PrivateBin/PrivateBin"
+        }
+    ],
+    "require": {
+        "php": "^5.2.6 || ^7.0",
+        "paragonie/random_compat": "^2.0",
+        "yzalis/identicon": "^1.1"
+    },
+    "require-dev": {
+        "codacy/coverage": "dev-master",
+        "codeclimate/php-test-reporter": "dev-master"
+    },
+    "autoload": {
+        "psr-4": {
+            "PrivateBin\\": "lib/"
+        }
+    },
+    "config": {
+        "autoloader-suffix": "DontChange"
+    }
+}

css/bootstrap/privatebin.css

@@ -1,5 +1,13 @@
-/* ZeroBin 0.21.1 - http://sebsauvage.net/wiki/doku.php?id=php:zerobin */
-
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
 
 body {
 	padding: 0 0 30px;
@@ -9,10 +17,26 @@ body.navbar-spacing {
 	padding-top: 70px;
 }
 
+.buttondisabled {
+	opacity: 0.3;
+}
+
 .navbar-nav {
 	margin: 0 8px;
 }
 
+.nav.navbar-nav > li {
+	margin-left: 8px;
+}
+
+.navbar-brand {
+	padding: 6px 4px 0 8px;
+}
+
+.navbar-form {
+	padding: 0;
+}
+
 .dropdown-menu > li > label, .dropdown-menu > li > div {
 	clear: both;
 	display: block;
@@ -32,6 +56,14 @@ body.navbar-spacing {
 	cursor: default;
 }
 
+.pull-right .dropdown-menu {
+	margin-left: -5em;
+}
+
+#language {
+	margin-right: 8px;
+}
+
 #image img {
 	max-width: 100%;
 	height: auto;
@@ -46,6 +78,14 @@ body.navbar-spacing {
 	display: inline;
 }
 
+#pastelink > a {
+	word-wrap: break-word;
+}
+
+#preview {
+	margin-bottom: 10px;
+}
+
 #message {
 	font-family: monospace;
 }
@@ -70,4 +110,4 @@ footer h4 {
 
 li.L0, li.L1, li.L2, li.L3, li.L5, li.L6, li.L7, li.L8 {
 	list-style-type: decimal !important;
-}
+}

css/prettify/doxy.css

@@ -1 +1 @@
-pre .str,code .str{color:#fec243}pre .kwd,code .kwd{color:#8470ff}pre .com,code .com{color:#32cd32;font-style:italic}pre .typ,code .typ{color:#6ecbcc}pre .lit,code .lit{color:#d06}pre .pun,code .pun{color:#8b8970}pre .pln,code .pln{color:#f0f0f0}pre .tag,code .tag{color:#9c9cff}pre .htm,code .htm{color:#dda0dd}pre .xsl,code .xsl{color:#d0a0d0}pre .atn,code .atn{color:#46eeee;font-weight:normal}pre .atv,code .atv{color:#eeb4b4}pre .dec,code .dec{color:#3387cc}a{text-decoration:none}pre.prettyprint,code.prettyprint{font-family:'Droid Sans Mono','CPMono_v07 Bold','Droid Sans';font-weight:bold;font-size:9pt;background-color:#0f0f0f;-moz-border-radius:8px;-webkit-border-radius:8px;-o-border-radius:8px;-ms-border-radius:8px;-khtml-border-radius:8px;border-radius:8px}pre.prettyprint{width:95%;margin:1em auto;padding:1em;white-space:pre-wrap}pre.prettyprint a,code.prettyprint a{text-decoration:none}ol.linenums{margin-top:0;margin-bottom:0;color:#8b8970}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}@media print{pre.prettyprint,code.prettyprint{background-color:#fff}pre .str,code .str{color:#088}pre .kwd,code .kwd{color:#006;font-weight:bold}pre .com,code .com{color:#oc3;font-style:italic}pre .typ,code .typ{color:#404;font-weight:bold}pre .lit,code .lit{color:#044}pre .pun,code .pun{color:#440}pre .pln,code .pln{color:#000}pre .tag,code .tag{color:#b66ff7;font-weight:bold}pre .htm,code .htm{color:#606;font-weight:bold}pre .xsl,code .xsl{color:#606;font-weight:bold}pre .atn,code .atn{color:#c71585;font-weight:normal}pre .atv,code .atv{color:#088;font-weight:normal}}
+pre .str,code .str{color:#fec243}pre .kwd,code .kwd{color:#8470ff}pre .com,code .com{color:#32cd32;font-style:italic}pre .typ,code .typ{color:#6ecbcc}pre .lit,code .lit{color:#d06}pre .pun,code .pun{color:#8b8970}pre .pln,code .pln{color:#f0f0f0}pre .tag,code .tag{color:#9c9cff}pre .htm,code .htm{color:#dda0dd}pre .xsl,code .xsl{color:#d0a0d0}pre .atn,code .atn{color:#46eeee;font-weight:normal}pre .atv,code .atv{color:#eeb4b4}pre .dec,code .dec{color:#3387cc}a{text-decoration:none}pre.prettyprint,code.prettyprint{font-family:'Droid Sans Mono','CPMono_v07 Bold','Droid Sans';font-weight:bold;font-size:9pt;background-color:#0f0f0f;-moz-border-radius:8px;-webkit-border-radius:8px;-o-border-radius:8px;-ms-border-radius:8px;-khtml-border-radius:8px;border-radius:8px}pre.prettyprint{width:95%;margin:1em auto;padding:1em;white-space:pre-wrap}pre.prettyprint a,code.prettyprint a{text-decoration:none}ol.linenums{margin-top:0;margin-bottom:0;color:#8b8970}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}@media print{pre.prettyprint,code.prettyprint{background-color:#fff}pre .str,code .str{color:#088}pre .kwd,code .kwd{color:#006;font-weight:bold}pre .com,code .com{color:#0c3;font-style:italic}pre .typ,code .typ{color:#404;font-weight:bold}pre .lit,code .lit{color:#044}pre .pun,code .pun{color:#440}pre .pln,code .pln{color:#000}pre .tag,code .tag{color:#b66ff7;font-weight:bold}pre .htm,code .htm{color:#606;font-weight:bold}pre .xsl,code .xsl{color:#606;font-weight:bold}pre .atn,code .atn{color:#c71585;font-weight:normal}pre .atv,code .atv{color:#088;font-weight:normal}}

css/privatebin.css

@@ -1,5 +1,13 @@
-/* ZeroBin 0.21.1 - http://sebsauvage.net/wiki/doku.php?id=php:zerobin */
-
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
 
 /*  CSS Reset from YUI 3.4.1 (build 4118) - Copyright 2011 Yahoo! Inc. All rights reserved.
 Licensed under the BSD License. - http://yuilibrary.com/license/    */
@@ -394,6 +402,10 @@ img.vizhash {
 	font-size: 1.2em;
 }
 
+#prettyprint.prettyprinted {
+	overflow: auto;
+}
+
 #cleartext {
 	padding: 10px;
 }

doc/README.md

@@ -6,14 +6,24 @@ packages and its dependencies:
 * phpdoc
 * graphviz
 
-Details about [installing phpDocumentor](http://phpdoc.org/docs/latest/getting-started/installing.html)
-can be found in its own documentation.
+Details about
+[installing phpDocumentor](https://phpdoc.org/docs/latest/getting-started/installing.html)
+can be found in that projects documentation.
 
 Example for Debian and Ubuntu:
-    $ sudo aptitude install php-pear graphviz
-    $ sudo pear channel-discover pear.phpdoc.org
-    $ sudo pear install phpdoc/phpDocumentor
+```console
+$ sudo aptitude install php-pear graphviz
+$ sudo pear channel-discover pear.phpdoc.org
+$ sudo pear install phpdoc/phpDocumentor
+```
 
 To generate the documentation, change into the main directory and run phpdoc:
-    $ cd ZeroBin
-    $ phpdoc -d lib/ -t doc/
+```console
+$ cd PrivateBin
+$ phpdoc -d lib/ -t doc/
+```
+
+**Note:** When used with PHP 7, the prerelease of phpDocumentator 2.9 needs to be
+manually installed by downloading it from
+[GitHub](https://github.com/phpDocumentor/phpDocumentor2/releases/download/v2.9.0/phpDocumentor.phar)
+and then manually moving it to e.g. `/usr/local/bin` and making it executable.

i18n/de.json

@@ -2,10 +2,10 @@
     "en": "de",
     "Paste does not exist, has expired or has been deleted.":
         "Diesen Text gibt es nicht, er ist abgelaufen oder wurde gelöscht.",
-    "ZeroBin requires php 5.2.6 or above to work. Sorry.":
-        "ZeroBin benötigt PHP 5.2.6 oder höher, um zu funktionieren. Sorry.",
-    "ZeroBin requires configuration section [%s] to be present in configuration file.":
-        "ZeroBin benötigt den Konfigurationsabschnitt [%s] in der Konfigurationsdatei um zu funktionieren.",
+    "PrivateBin requires php 5.3.0 or above to work. Sorry.":
+        "PrivateBin benötigt PHP 5.3.0 oder höher, um zu funktionieren. Sorry.",
+    "PrivateBin requires configuration section [%s] to be present in configuration file.":
+        "PrivateBin benötigt den Konfigurationsabschnitt [%s] in der Konfigurationsdatei um zu funktionieren.",
     "Please wait %d seconds between each post.":
         "Bitte warte %d Sekunden zwischen dem Absenden.",
     "Paste is limited to %s of encrypted data.":
@@ -26,15 +26,15 @@
         "Falscher Lösch-Code. Text wurde nicht gelöscht.",
     "Paste was properly deleted.":
         "Text wurde erfolgreich gelöscht.",
-    "ZeroBin": "ZeroBin",
-    "ZeroBin is a minimalist, opensource online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://github.com/elrido/ZeroBin/wiki\">project page</a>.":
-        "ZeroBin ist ein minimalistischer, quelloffener \"Pastebin\"-artiger Dienst, bei dem der Server keinerlei Kenntnis der Inhalte hat. Die Daten werden <i>im Browser</i> mit 256 Bit AES ver- und entschlüsselt. Weitere Informationen sind auf der <a href=\"https://github.com/elrido/ZeroBin/wiki\">Projektseite</a> zu finden.",
+    "PrivateBin": "PrivateBin",
+    "PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.":
+        "PrivateBin ist ein minimalistischer, quelloffener \"Pastebin\"-artiger Dienst, bei dem der Server keinerlei Kenntnis der Inhalte hat. Die Daten werden <i>im Browser</i> mit 256 Bit AES ver- und entschlüsselt. Weitere Informationen sind auf der <a href=\"https://privatebin.info/\">Projektseite</a> zu finden.",
     "Because ignorance is bliss":
         "Unwissenheit ist ein Segen",
-    "Javascript is required for ZeroBin to work.<br />Sorry for the inconvenience.":
-        "Javascript ist eine Voraussetzung, um ZeroBin zu nutzen.<br />Bitte entschuldige die Unannehmlichkeiten.",
-    "ZeroBin requires a modern browser to work.":
-        "ZeroBin setzt einen modernen Browser voraus, um funktionieren zu können.",
+    "Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
+        "Javascript ist eine Voraussetzung, um PrivateBin zu nutzen.<br />Bitte entschuldige die Unannehmlichkeiten.",
+    "PrivateBin requires a modern browser to work.":
+        "PrivateBin setzt einen modernen Browser voraus, um funktionieren zu können.",
     "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
         "Du benutzt immer noch den Internet Explorer? Tu Dir einen Gefallen und wechsle zu einem moderneren Browser:",
     "New":
@@ -135,5 +135,10 @@
     "Your browser does not support uploading encrypted files. Please use a newer browser.":
         "Dein Browser unterstützt das hochladen von verschlüsselten Dateien nicht. Bitte verwende einen neueren Browser.",
     "Invalid attachment.": "Ungültiger Datei-Anhang.",
-    "Options": "Optionen"
+    "Options": "Optionen",
+    "Shorten URL": "URL verkürzen",
+    "Editor": "Bearbeiten",
+    "Preview": "Vorschau",
+    "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
+        "Der PATH muss bei PrivateBin mit einem \"%s\" enden. Bitte passe Deinen PATH in Deiner index.php an."
 }

i18n/fr.json

@@ -2,10 +2,10 @@
     "en": "fr",
     "Paste does not exist, has expired or has been deleted.":
         "Le paste n'existe pas, a expiré, ou a été supprimé.",
-    "ZeroBin requires php 5.2.6 or above to work. Sorry.":
-        "Désolé, ZeroBin nécessite php 5.2.6 ou supérieur pour fonctionner.",
-    "ZeroBin requires configuration section [%s] to be present in configuration file.":
-        "ZeroBin a besoin de la section de configuration [%s] dans le fichier de configuration pour fonctionner.",
+    "PrivateBin requires php 5.3.0 or above to work. Sorry.":
+        "Désolé, PrivateBin nécessite php 5.3.0 ou supérieur pour fonctionner.",
+    "PrivateBin requires configuration section [%s] to be present in configuration file.":
+        "PrivateBin a besoin de la section de configuration [%s] dans le fichier de configuration pour fonctionner.",
     "Please wait %d seconds between each post.":
         "Merci d'attendre %d secondes entre chaque publication.",
     "Paste is limited to %s of encrypted data.":
@@ -26,15 +26,15 @@
         "Jeton de suppression incorrect. Le paste n'a pas été supprimé.",
     "Paste was properly deleted.":
         "Le paste a été correctement supprimé.",
-    "ZeroBin": "ZeroBin",
-    "ZeroBin is a minimalist, opensource online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://github.com/elrido/ZeroBin/wiki\">project page</a>.":
-        "Zerobin est un 'pastebin' (ou gestionnaire d'extraits de texte et de code source) minimaliste et open source, dans lequel le serveur n'a aucune connaissance des données envoyées. Les données sont chiffrées/déchiffrées <i>dans le navigateur</i> par un chiffrage AES 256 bits. Plus d'informations sur <a href=\"https://github.com/elrido/ZeroBin/wiki\">la page du projet</a>.",
+    "PrivateBin": "PrivateBin",
+    "PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.":
+        "PrivateBin est un 'pastebin' (ou gestionnaire d'extraits de texte et de code source) minimaliste et open source, dans lequel le serveur n'a aucune connaissance des données envoyées. Les données sont chiffrées/déchiffrées <i>dans le navigateur</i> par un chiffrage AES 256 bits. Plus d'informations sur <a href=\"https://privatebin.info/\">la page du projet</a>.",
     "Because ignorance is bliss":
         "Parce que l'ignorance est le bonheur",
-    "Javascript is required for ZeroBin to work.<br />Sorry for the inconvenience.":
-        "Javascript est requis pour faire fonctionner ZeroBin. <br />Désolé pour cet inconvénient.",
-    "ZeroBin requires a modern browser to work.":
-        "ZeroBin nécessite un navigateur moderne pour fonctionner.",
+    "Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
+        "Javascript est requis pour faire fonctionner PrivateBin. <br />Désolé pour cet inconvénient.",
+    "PrivateBin requires a modern browser to work.":
+        "PrivateBin nécessite un navigateur moderne pour fonctionner.",
     "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
         "Encore sur Internet Explorer ? Faites-vous une faveur, passez à un navigateur moderne :",
     "New":
@@ -144,5 +144,10 @@
     "Your browser does not support uploading encrypted files. Please use a newer browser.":
         "Votre navigateur ne supporte pas l'envoi de fichiers chiffrés. Merci d'utiliser un navigateur plus récent.",
     "Invalid attachment.": "Attachement invalide.",
-    "Options": "Options"
+    "Options": "Options",
+    "Shorten URL": "Raccourcir URL",
+    "Editor": "éditer",
+    "Preview": "avant-première",
+    "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
+        "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php."
 }

i18n/languages.json

@@ -122,7 +122,7 @@
     "pa": ["ਪੰਜਾਬੀ", "Punjabi"],
     "pi": ["पाऴि", "Pāli"],
     "fa": ["فارسی", "Persian"],
-    "pl": ["polszczyzna", "Polish"],
+    "pl": ["polski", "Polish"],
     "ps": ["پښتو", "Pashto"],
     "pt": ["português", "Portuguese"],
     "qu": ["Runa Simi", "Quechua"],

i18n/pl.json

@@ -2,10 +2,10 @@
     "en": "pl",
     "Paste does not exist, has expired or has been deleted.":
         "Wklejka nie istnieje, wygasła albo została usunięta.",
-    "ZeroBin requires php 5.2.6 or above to work. Sorry.":
-        "ZeroBin wymaga PHP w wersji 5.2.6 lub nowszej, sorry.",
-    "ZeroBin requires configuration section [%s] to be present in configuration file.":
-        "ZeroBin wymaga obecności sekcji [%s] w pliku konfiguracyjnym.",
+    "PrivateBin requires php 5.3.0 or above to work. Sorry.":
+        "PrivateBin wymaga PHP w wersji 5.3.0 lub nowszej, sorry.",
+    "PrivateBin requires configuration section [%s] to be present in configuration file.":
+        "PrivateBin wymaga obecności sekcji [%s] w pliku konfiguracyjnym.",
     "Please wait %d seconds between each post.":
         "Poczekaj %d sekund pomiędzy każdą wklejką.",
     "Paste is limited to %s of encrypted data.":
@@ -26,15 +26,15 @@
         "Nieprawidłowy token usuwania. Wklejka nie została usunięta.",
     "Paste was properly deleted.":
         "Wklejka usunięta poprawnie.",
-    "ZeroBin": "ZeroBin",
-    "ZeroBin is a minimalist, opensource online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://github.com/elrido/ZeroBin/wiki\">project page</a>.":
-        "ZeroBin jest minimalistycznym, otwartoźródłowym serwisem typu pastebin, w którym serwer nie ma jakichkolwiek informacji o tym, co jest wklejane. Dane są szyfrowane i deszyfrowane <i>w przeglądarce</i> z użyciem 256-bitowego klucza AES. Więcej informacji na <a href=\"https://github.com/elrido/ZeroBin/wiki\">stronie projektu</a>.",
+    "PrivateBin": "PrivateBin",
+    "PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.":
+        "PrivateBin jest minimalistycznym, otwartoźródłowym serwisem typu pastebin, w którym serwer nie ma jakichkolwiek informacji o tym, co jest wklejane. Dane są szyfrowane i deszyfrowane <i>w przeglądarce</i> z użyciem 256-bitowego klucza AES. Więcej informacji na <a href=\"https://privatebin.info/\">stronie projektu</a>.",
     "Because ignorance is bliss":
         "Ponieważ ignorancja jest cnotą",
-    "Javascript is required for ZeroBin to work.<br />Sorry for the inconvenience.":
-        "Do działania ZeroBina jest wymagany JavaScript. Przepraszamy za tę niedogodność.",
-    "ZeroBin requires a modern browser to work.":
-        "ZeroBin wymaga do działania nowoczesnej przeglądarki.",
+    "Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
+        "Do działania PrivateBina jest wymagany JavaScript. Przepraszamy za tę niedogodność.",
+    "PrivateBin requires a modern browser to work.":
+        "PrivateBin wymaga do działania nowoczesnej przeglądarki.",
     "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
         "Cały czas używasz Internet Explorera? Zrób sobie przysługę, przesiądź się na nowoczesną przeglądarkę:",
     "New":
@@ -46,7 +46,7 @@
     "Raw text":
         "Czysty tekst",
     "Expires":
-        "Wygasa",
+        "Wygasa za",
     "Burn after reading":
         "Zniszcz po przeczytaniu",
     "Open discussion":
@@ -59,81 +59,86 @@
         "Przełącz nawigację",
     "%d seconds": ["%d second", "%d second", "%d second"],
     "%d minutes": ["%d minut", "%d minut", "%d minut"],
-    "%d hours": ["%d godzina", "%d godzina", "%d godzina"],
+    "%d hours": ["%d godzina", "%d godzina", "godzinę"],
     "%d days": ["%d dzień", "%d dzień", "%d dzień"],
-    "%d weeks": ["%d tydzień", "%d tydzień", "%d tydzień"],
-    "%d months": ["%d miesiąc", "%d miesiąc", "%d miesiąc"],
-    "%d years": ["%d rok", "%d rok", "%d rok"],
+    "%d weeks": ["%d tydzień", "%d tydzień", "tydzień"],
+    "%d months": ["%d miesiąc", "%d miesiąc", "miesiąc"],
+    "%d years": ["%d rok", "%d rok", "rok"],
     "Never":
-        "Nigdy",
+        "nigdy",
     "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
         "Notka: To jest usługa testowa. Dane mogą zostać usunięte w dowolnym momencie. Kociątka umrą, jeśli nadużyjesz tej usługi.",
     "This document will expire in %d seconds.":
-        ["This document will expire in %d second.", "This document will expire in %d seconds."],
+        ["Ten dokument wygaśnie za %d sekundę.", "Ten dokument wygaśnie za %d sekund."],
     "This document will expire in %d minutes.":
-        ["This document will expire in %d minute.", "This document will expire in %d minutes."],
+        ["Ten dokument wygaśnie za %d minutę.", "Ten dokument wygaśnie za %d minut."],
     "This document will expire in %d hours.":
-        ["This document will expire in %d hour.", "This document will expire in %d hours."],
+        ["Ten dokument wygaśnie za godzinę.", "Ten dokument wygaśnie za %d godzin."],
     "This document will expire in %d days.":
-        ["This document will expire in %d day.", "This document will expire in %d days."],
+        ["Ten dokument wygaśnie za %d dzień.", "Ten dokument wygaśnie za %d dni."],
     "This document will expire in %d months.":
-        ["This document will expire in %d month.", "This document will expire in %d months."],
+        ["Ten dokument wygaśnie za miesiąc.", "Ten dokument wygaśnie za %d miesięcy."],
     "Please enter the password for this paste:":
-        "Please enter the password for this paste:",
+        "Wpisz hasło dla tej wklejki:",
     "Could not decrypt data (Wrong key?)":
-        "Could not decrypt data (Wrong key?)",
+        "Nie udało się odszyfrować danych (zły klucz?)",
     "Could not delete the paste, it was not stored in burn after reading mode.":
-        "Could not delete the paste, it was not stored in burn after reading mode.",
+        "Nie udało się usunąć wklejki, nie została zapisana w trybie zniszczenia po przeczytaniu.",
     "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.":
-        "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.",
+        "TYLKO DO TWOJEGO WGLĄDU. Nie zamykaj tego okna, ta wiadomość nie będzie mogła być wyświetlona ponownie.",
     "Could not decrypt comment; Wrong key?":
-        "Could not decrypt comment; Wrong key?",
+        "Nie udało się odszyfrować komentarza; zły klucz?",
     "Reply":
-        "Reply",
+        "Odpowiedz",
     "Anonymous":
-        "Anonymous",
+        "Anonim",
     "Anonymous avatar (Vizhash of the IP address)":
-        "Anonymous avatar (Vizhash of the IP address)",
+        "Anonimowy avatar (Vizhash z adresu IP)",
     "Add comment":
-        "Add comment",
+        "Dodaj komentarz",
     "Optional nickname...":
-        "Optional nickname...",
+        "Opcjonalny nick...",
     "Post comment":
-        "Post comment",
+        "Wyślij komentarz",
     "Sending comment...":
-        "Sending comment...",
+        "Wysyłanie komentarza...",
     "Comment posted.":
-        "Comment posted.",
+        "Wysłano komentarz.",
     "Could not refresh display: %s":
-        "Could not refresh display: %s",
+        "Nie można odświeżyć widoku: %s",
     "unknown status":
-        "unknown status",
+        "nieznany status",
     "server error or not responding":
-        "server error or not responding",
+        "bląd serwera lub brak odpowiedzi",
     "Could not post comment: %s":
-        "Could not post comment: %s",
+        "Nie udało się wysłać komentarza: %s",
     "Sending paste (Please move your mouse for more entropy)...":
-        "Sending paste (Please move your mouse for more entropy)...",
+        "Wysyłanie wklejki (proszę poruszać myszą aby uzyskać większą entropię)...",
     "Sending paste...":
-        "Sending paste...",
+        "Wysyłanie wklejki...",
     "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-        "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>",
+        "Twoja wklejka to <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(wciśnij [Ctrl]+[c] aby skopiować)</span>",
     "Delete data":
-        "Delete data",
+        "Skasuj dane",
     "Could not create paste: %s":
-        "Could not create paste: %s",
+        "Nie udało się utworzyć wklejki: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
-        "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
+        "Nie udało się odszyfrować wklejki - brak klucza deszyfrującego w adresie (użyłeś skracacza linków, który ucina część adresu?)",
     "Format": "Format",
-    "Plain Text": "Plain Text",
-    "Source Code": "Source Code",
+    "Plain Text": "Czysty tekst",
+    "Source Code": "Kod źródłowy",
     "Markdown": "Markdown",
-    "Download attachment": "Download attachment",
-    "Cloned file attached.": "Cloned file attached.",
-    "Attach a file": "Attach a file",
-    "Remove attachment": "Remove attachment",
+    "Download attachment": "Pobierz załącznik",
+    "Cloned file attached.": "Sklonowano załączony plik.",
+    "Attach a file": "Załącz plik",
+    "Remove attachment": "Usuń załącznik",
     "Your browser does not support uploading encrypted files. Please use a newer browser.":
-        "Your browser does not support uploading encrypted files. Please use a newer browser.",
-    "Invalid attachment.": "Invalid attachment.",
-    "Options": "Options"
+        "Twoja przeglądarka nie wspiera wysyłania zaszyfrowanych plików. Użyj nowszej przeglądarki.",
+    "Invalid attachment.": "Nieprawidłowy załącznik.",
+    "Options": "Opcje",
+    "Shorten URL": "Skróć adres URL",
+    "Editor": "Edytować",
+    "Preview": "Zapowiedź",
+    "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
+        "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php."
 }

i18n/sl.json

@@ -0,0 +1,153 @@
+{
+    "en": "sl",
+    "Paste does not exist, has expired or has been deleted.":
+        "Prilepek ne obstaja, mu je potekla življenjska doba, ali pa je izbrisan.",
+    "PrivateBin requires php 5.3.0 or above to work. Sorry.":
+        "Oprosti, PrivateBin za delovanje potrebuje vsaj php 5.3.0.",
+    "PrivateBin requires configuration section [%s] to be present in configuration file.":
+        "PrivateBin potrebuje sekcijo konfiguracij [%s] v konfiguracijski datoteki.",
+    "Please wait %d seconds between each post.":
+        "Prosim počakaj vsaj %d sekund pred vsako naslednjo objavo.",
+    "Paste is limited to %s of encrypted data.":
+        "Velikost prilepka je omejena na %s zakodiranih podatkov.",
+    "Invalid data.":
+        "Neveljavni podatki.",
+    "You are unlucky. Try again.":
+        "Nimaš sreče, poskusi ponovno.",
+    "Error saving comment. Sorry.":
+        "Nekaj je šlo narobe pri shranjevanju komentarja. Oprosti.",
+    "Error saving paste. Sorry.":
+        "Nekaj je šlo narobe pri shranjevanju prilepka. Oprosti.",
+    "Invalid paste ID.":
+        "Napačen ID prilepka.",
+    "Paste is not of burn-after-reading type.":
+        "Prilepek ni tipa zažgi-po-branju.",
+    "Wrong deletion token. Paste was not deleted.":
+        "Napačen token za izbris. Prilepek ni bil izbrisan..",
+    "Paste was properly deleted.":
+        "Prilepek je uspešno izbrisan.",
+    "PrivateBin": "PrivateBin",
+    "PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.":
+        "PrivateBin je minimalističen, odprtokodni spletni 'pastebin', kjer server ne ve ničesar o prilepljenih podatkih. Podatki so zakodirani/odkodirani <i>v brskalniku</i> z uporabo 256 bitnega AES. Več informacij na < href=\"https://privatebin.info/\">spletni strani projekta.</a>.",
+    "Because ignorance is bliss":
+        "Ker kar ne veš ne boli.",
+    "Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
+        "Da PrivateBin deluje, moraš vklopiti Javascript.<br />Oprosti za povročene nevšečnosti.",
+    "PrivateBin requires a modern browser to work.":
+        "PrivateBin za svoje delovanje potrebuje moderen brskalnik.",
+    "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
+        "Še vedno uporabljaš Internet Explorer? Naredi si uslugo, preklopi na moderen brskalnik:",
+    "New":
+        "Nov prilepek",
+    "Send":
+        "Pošlji",
+    "Clone":
+        "Kloniraj",
+    "Raw text":
+        "Surov tekst",
+    "Expires":
+        "Poteče",
+    "Burn after reading":
+        "Zažgi (pobriši) po branju",
+    "Open discussion":
+        "Dovoli razpravo",
+    "Password (recommended)":
+        "Geslo (priporočeno)",
+    "Discussion":
+        "Razprava",
+    "Toggle navigation":
+        "Preklopi navigacijo",
+    "%d seconds": ["%d sekunda", "%d sekundi", "%d sekunde", "%d sekund"],
+    "%d minutes": ["%d minuta", "%d minuti", "%d minute", "%d minut"],
+    "%d hours": ["%d ura", "%d uri", "%d ure", "%d ur"],
+    "%d days": ["%d dan", "%d dneva", "%d dnevi", "%d dni"],
+    "%d weeks": ["%d teden", "%d tedna", "%d tedni", "%d tednov"],
+    "%d months": ["%d mesec", "%d meseca", "%d meseci", "%d mesecev"],
+    "%d years": ["%d leto", "%d leti", "%d leta", "%d let"],
+    "Never":
+        "Nikoli",
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
+        "Ne pozabi: To je testna storitev: Podatki so lahko kadarkoli pobrisani. Mucki bodo umrli, če boš zlorabljala to storitev.",
+    "This document will expire in %d seconds.":
+        ["Ta dokument bo potekel čez %d sekundo.", "Ta dokument bo potekel čez %d sekundi.", "Ta dokument bo potekel čez %d sekunde.", "Ta dokument bo potekel čez %d sekund."],
+    "This document will expire in %d minutes.":
+        ["Ta dokument bo potekel čez %d minuto.", "Ta dokument bo potekel čez %d minuti.", "Ta dokument bo potekel čez %d minute.", "Ta dokument bo potekel čez %d minut."],
+    "This document will expire in %d hours.":
+        ["Ta dokument bo potekel čez %d uro.", "Ta dokument bo potekel čez %d uri.", "Ta dokument bo potekel čez %d ure.", "Ta dokument bo potekel čez %d ur."],
+    "This document will expire in %d days.":
+        ["Ta dokument bo potekel čez %d dan.", "Ta dokument bo potekel čez %d dni.", "Ta dokument bo potekel čez %d dni.", "Ta dokument bo potekel čez %d dni."],
+    "This document will expire in %d months.":
+        ["Ta dokument bo potekel čez %d mesec.", "Ta dokument bo potekel čez %d meseca.", "Ta dokument bo potekel čez %d mesece.", "Ta dokument bo potekel čez %d mesecev."],
+    "Please enter the password for this paste:":
+        "Prosim vnesi geslo tega prilepka:",
+    "Could not decrypt data (Wrong key?)":
+        "Nemogoče odkodirati podakte (Imaš napačen ključ?)",
+    "Could not delete the paste, it was not stored in burn after reading mode.":
+        "Prilepek je nemogoče izbrisati, ni bil shranjen v načinu \"zažgi po branju\".",
+    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.":
+        "SAMO ZA TVOJE OČI. Ne zapri tega okna (zavihka), to sporočilo ne bo prikazano nikoli več.",
+    "Could not decrypt comment; Wrong key?":
+        "Ne morem odkodirati komentarja: Imaš napačen ključ?",
+    "Reply":
+        "Odgovori",
+    "Anonymous":
+        "Aninomno",
+    "Anonymous avatar (Vizhash of the IP address)":
+        "Anonimen avatar (Vizhash IP naslova)",
+    "Add comment":
+        "Dodaj komentar",
+    "Optional nickname...":
+        "Uporabniško ime (lahko izpustiš)",
+    "Post comment":
+        "Objavi komentar",
+    "Sending comment...":
+        "Pošiljam komentar ...",
+    "Comment posted.":
+        "Komentar poslan.",
+    "Could not refresh display: %s":
+        "Ne morem osvežiti zaslona : %s",
+    "unknown status":
+        "neznan status",
+    "server error or not responding":
+        "napaka na strežniku, ali pa se strežnik ne odziva",
+    "Could not post comment: %s":
+        "Komentarja ni bilo mogoče objaviti : %s",
+    "Sending paste (Please move your mouse for more entropy)...":
+        "Pošiljam prilepek (prosim premakni svojo miško za več entropije) ...",
+    "Sending paste...":
+        "Pošiljam prilepek...",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
+        "Tvoj prilepek je dostopen na naslovu: <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Pritisni [Ctrl]+[c] ali [Cmd] + [c] in skopiraj)</span>",
+    "Delete data":
+        "Izbriši podatke",
+    "Could not create paste: %s":
+        "Ne morem ustvariti prilepka: %s",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
+        "Ne morem odkodirati prilepka: V URL-ju manjka ključ (A si uporabil krajšalnik URL-jev, ki odstrani del URL-ja?)",
+    "B": "o",
+    "KiB": "KB",
+    "MiB": "MB",
+    "GiB": "GB",
+    "TiB": "TB",
+    "PiB": "PB",
+    "EiB": "EB",
+    "ZiB": "ZB",
+    "YiB": "YB",
+    "Format": "Format",
+    "Plain Text": "Surov tekst",
+    "Source Code": "Odprta koda",
+    "Markdown": "Markdown",
+    "Download attachment": "Pretoči priponko",
+    "Cloned file attached.": "Pripeta datoteka klonirana",
+    "Attach a file": "Pripni datoteko",
+    "Remove attachment": "Odstrani priponko",
+    "Your browser does not support uploading encrypted files. Please use a newer browser.":
+        "Tvoj brskalnik ne omogoča nalaganje zakodiranih datotek. Prosim uporabi novejši brskalnik.",
+    "Invalid attachment.": "Neveljavna priponka.",
+    "Options": "Možnosti",
+    "Shorten URL": "Skrajšajte URL",
+    "Editor": "Uredi",
+    "Preview": "Predogled",
+    "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
+        "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php."
+}

i18n/zh.json

@@ -0,0 +1,144 @@
+{
+    "en": "zh",
+    "Paste does not exist, has expired or has been deleted.":
+        "粘贴不存在，已过期或者已被删除。",
+    "PrivateBin requires php 5.3.0 or above to work. Sorry.":
+        "PrivateBin需要工作于PHP 5.3.0及以上版本，抱歉。",
+    "PrivateBin requires configuration section [%s] to be present in configuration file.":
+        "PrivateBin需要设置配置文件中 [%s] 的部分。",
+    "Please wait %d seconds between each post.":
+        "每 %d 秒只能粘贴一次。",
+    "Paste is limited to %s of encrypted data.":
+        "粘贴受限于 %s 加密数据。",
+    "Invalid data.":
+        "无效的数据。",
+    "You are unlucky. Try again.":
+        "请再试一次。",
+    "Error saving comment. Sorry.":
+        "存储评论时出现错误，抱歉。",
+    "Error saving paste. Sorry.":
+        "存储粘贴时出现错误，抱歉。",
+    "Invalid paste ID.":
+        "无效的ID。",
+    "Paste is not of burn-after-reading type.":
+        "粘贴不是阅后即焚类型。",
+    "Wrong deletion token. Paste was not deleted.":
+        "错误的删除token，粘贴没有被删除。",
+    "Paste was properly deleted.":
+        "粘贴已被正确删除。",
+    "PrivateBin": "PrivateBin",
+    "PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.":
+        "PrivateBin是一个极简，开源，对粘贴内容毫不知情的在线粘贴板，数据<i>在浏览器内</i>进行AES-256加密。更多信息请查看<a href=\"https://privatebin.info/\">项目主页</a>。",
+    "Because ignorance is bliss":
+        "因为无知是福",
+    "Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.":
+        "PrivateBin需要JavaScript来进行加解密。<br />带来的不便敬请谅解。",
+    "PrivateBin requires a modern browser to work.":
+        "PrivateBin需要工作于现代化的浏览器。",
+    "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
+        "还在使用Internet Explorer？帮自己个忙，换上一个现代化的浏览器：",
+    "New":
+        "新建",
+    "Send":
+        "送出",
+    "Clone":
+        "克隆",
+    "Raw text":
+        "纯文本",
+    "Expires":
+        "有效期",
+    "Burn after reading":
+        "阅后即焚",
+    "Open discussion":
+        "开放讨论",
+    "Password (recommended)":
+        "密码 (推荐)",
+    "Discussion":
+        "讨论",
+    "Toggle navigation":
+        "切换导航栏",
+    "%d seconds": ["%d 秒", "%d 秒"],
+    "%d minutes": ["%d 分钟", "%d 分钟"],
+    "%d hours": ["%d 小时", "%d 小时"],
+    "%d days": ["%d 天", "%d 天"],
+    "%d weeks": ["%d 周", "%d 周"],
+    "%d months": ["%d 个月", "%d 个月"],
+    "%d years": ["%d 年", "%d 年"],
+    "Never":
+        "永不过期",
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
+        "注意：这是一个测试服务，数据随时可能被删除。如果你滥用这个服务的话，小猫咪会死的。",
+    "This document will expire in %d seconds.":
+        ["这份文档将在一秒后过期。", "这份文档将在 %d 秒后过期"],
+    "This document will expire in %d minutes.":
+        ["这份文档将在一分钟后过期。", "这份文档将在 %d 分钟后过期。"],
+    "This document will expire in %d hours.":
+        ["这份文档将在一小时后过期。", "这份文档将在 %d 小时后过期。"],
+    "This document will expire in %d days.":
+        ["这份文档将在一天后过期。", "这份文档将在 %d 天后过期。"],
+    "This document will expire in %d months.":
+        ["这份文档将在一个月后过期。", "这份文档将在 %d 个月后过期。"],
+    "Please enter the password for this paste:":
+        "请输入这份粘贴的密码：",
+    "Could not decrypt data (Wrong key?)":
+        "无法解密数据 (密钥错误？)",
+    "Could not delete the paste, it was not stored in burn after reading mode.":
+        "无法删除此粘贴，它没有以阅后即焚模式存储。",
+    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.":
+        "看！仔！细！了！ 不要关闭窗口，否则你再也见不到这条消息了。",
+    "Could not decrypt comment; Wrong key?":
+        "无法解密评论; 密钥错误？",
+    "Reply":
+        "回复",
+    "Anonymous":
+        "匿名",
+    "Anonymous avatar (Vizhash of the IP address)":
+        "匿名头像 (由IP地址生成Vizhash)",
+    "Add comment":
+        "添加评论",
+    "Optional nickname...":
+        "可选昵称...",
+    "Post comment":
+        "评论",
+    "Sending comment...":
+        "评论发送中...",
+    "Comment posted.":
+        "评论已发送。",
+    "Could not refresh display: %s":
+        "无法刷新显示： %s",
+    "unknown status":
+        "未知状态",
+    "server error or not responding":
+        "服务器错误或无回应",
+    "Could not post comment: %s":
+        "无法发送评论： %s",
+    "Sending paste (Please move your mouse for more entropy)...":
+        "粘贴提交中 (请移动鼠标以产生更多熵)...",
+    "Sending paste...":
+        "粘贴提交中...",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
+        "您的粘贴的链接是<a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(按下 [Ctrl]+[c] 以复制)</span>",
+    "Delete data":
+        "删除数据",
+    "Could not create paste: %s":
+        "无法创建粘贴： %s",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
+        "无法解密粘贴： URL中缺失解密密钥 (是否使用了重定向或者短链接导致密钥丢失？)",
+    "Format": "格式",
+    "Plain Text": "纯文本",
+    "Source Code": "源代码",
+    "Markdown": "Markdown",
+    "Download attachment": "下载附件",
+    "Cloned file attached.": "已附加克隆的文件",
+    "Attach a file": "添加一个附件",
+    "Remove attachment": "移除附件",
+    "Your browser does not support uploading encrypted files. Please use a newer browser.":
+        "您的浏览器不支持上传加密的文件，请使用更新的浏览器。",
+    "Invalid attachment.": "无效的附件",
+    "Options": "选项",
+    "Shorten URL": "缩短链接",
+    "Editor": "編輯",
+    "Preview": "預習",
+    "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
+        "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php."
+}

img/icon.svg

@@ -0,0 +1 @@
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="38" width="38" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 38 38" xmlns:dc="http://purl.org/dc/elements/1.1/"><defs><radialGradient id="a" gradientUnits="userSpaceOnUse" cx="261" cy="240" r="341" gradientTransform="matrix(1.3 .000949 -.00102 1.4 -89.2 -86.2)"><stop stop-color="#ff0" offset="0"/><stop stop-color="#fa0" offset="1"/></radialGradient></defs><path stroke-linejoin="round" d="m250 3.16-227 123-0.42 247 227 124 227-123 0.42-247zm-0.711 97.9v0.006c3.78 0 7.6 0.297 11.5 0.875 41.1 6.17 72.2 40.6 66.4 70.5-5.8 29.8-33.3 56-40.1 61.7s37.1 165 37.1 165h-149s46.2-157 36.5-165c-9.7-8.14-41.2-36.9-36.4-68.9 4.81-32.1 37.6-64 74.2-64.1z" transform="matrix(.0709 0 0 .0709 1.4 1.38)" stroke="#000" stroke-linecap="round" stroke-width="10.6" fill="url(#a)"/></svg>

img/logo.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 2500 500" height="500" width="2500"><defs><linearGradient id="a"><stop offset="0" stop-color="#ffab00"/><stop offset=".206" stop-color="orange"/><stop offset=".247" stop-color="#ffab00"/><stop offset="1" stop-color="#f80"/></linearGradient><radialGradient spreadMethod="pad" r="60%" fy="50%" fx="50%" id="b" xlink:href="#a"/><filter id="c" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="3" result="result1"/><feBlend in="result1" mode="multiply" result="result5" in2="result1"/><feGaussianBlur stdDeviation="1" result="result6" in="result5"/><feComposite operator="xor" in="result6" in2="result5" result="result8"/><feComposite in2="result8" operator="xor" result="fbSourceGraphic" in="result6"/><feSpecularLighting specularExponent="55" specularConstant="2.2" surfaceScale="2" lighting-color="#fff" result="result1" in="fbSourceGraphic"><fePointLight z="20000" y="-10000" x="-5000"/></feSpecularLighting><feComposite operator="in" result="result2" in="result1" in2="fbSourceGraphic"/><feComposite in2="result2" k3="1" k2="2" operator="arithmetic" result="result4" in="fbSourceGraphic"/><feComposite result="result91" operator="in" in="result4" in2="result4"/><feBlend in2="result91" mode="darken"/></filter></defs><g stroke="#000"><path transform="matrix(.95665 0 0 .95665 10.837 10.837)" d="M250.418 3.158L23.301 126.238l-.42 246.84 226.701 123.764 227.117-123.08.42-246.84zm-.711 97.865v.006c3.78 0 7.604.297 11.457.875 41.101 6.166 72.183 40.64 66.384 70.457-5.798 29.816-33.28 55.978-40.085 61.672-6.805 5.695 37.096 164.944 37.096 164.944h-149.12s46.181-156.802 36.486-164.944c-9.695-8.142-41.197-36.872-36.388-68.935 4.81-32.064 37.627-63.975 74.17-64.074z" fill="url(#b)" stroke-width="15.68" stroke-linecap="round" stroke-linejoin="round" filter="url(#c)"/><text y="949.388" x="1510.89" style="line-height:125%" font-weight="400" font-size="28.614" font-family="sans-serif" letter-spacing="0" word-spacing="0" fill="#ff920f" stroke-width="7" filter="url(#c)" transform="translate(0 -552.362)"><tspan rotate="0 0 0 0 0 0 0 0 0 0 0" dx="0" style="-inkscape-font-specification:Arial;text-align:center" y="949.388" x="1510.89" font-size="412.044" font-family="Arial" letter-spacing="-2.15" text-anchor="middle"><tspan letter-spacing="0"><tspan letter-spacing="-10">P</tspan><tspan letter-spacing="10">r</tspan><tspan letter-spacing="7">i</tspan><tspan letter-spacing="-7">v</tspan><tspan letter-spacing="-5">a</tspan><tspan letter-spacing="5">t</tspan><tspan letter-spacing="15">e</tspan>Bin</tspan></tspan></text></g></svg>

index.php

@@ -1,18 +1,18 @@
 <?php
 /**
- * ZeroBin
+ * PrivateBin
  *
  * a zero-knowledge paste bin
  *
- * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
+ * @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
- * @version   0.21
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
  */
 
 // change this, if your php files and data is outside of your webservers document root
 define('PATH', '');
 
-define('PUBLIC_PATH', dirname(__FILE__));
-require PATH . 'lib/auto.php';
-new zerobin;
+define('PUBLIC_PATH', __DIR__);
+require PATH . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
+new PrivateBin\PrivateBin;

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

@@ -0,0 +1,16 @@
+{
+	"@context": {
+		"so": "https://schema.org/",
+		"status": "so:Integer",
+		"id": "so:name",
+		"parentid": "so:name",
+		"url: {
+			"@id": "so:url",
+			"@type": "@id"
+		},
+		"data": "so:Text",
+		"meta": {
+			"@id": "?jsonld=commentmeta"
+		}
+	}
+}

js/commentmeta.jsonld

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

js/paste.jsonld

@@ -0,0 +1,24 @@
+{
+	"@context": {
+		"so": "https://schema.org/",
+		"status": {"@id": "so:Integer"},
+		"id": {"@id": "so:name"},
+		"deletetoken": {"@id": "so:Text"},
+		"url": {
+			"@type": "@id",
+			"@id": "so:url"
+		},
+		"data": {"@id": "so:Text"},
+		"attachment": {"@id": "so:Text"},
+		"attachmentname": {"@id": "so:Text"},
+		"meta": {
+			"@id": "?jsonld=pastemeta"
+		},
+		"comments": {
+			"@id": "?jsonld=comment",
+			"@container": "@list"
+		},
+		"comment_count": {"@id": "so:Integer"},
+		"comment_offset": {"@id": "so:Integer"}
+	}
+}

js/pastemeta.jsonld

@@ -0,0 +1,11 @@
+{
+	"@context": {
+		"so": "https://schema.org/",
+		"formatter": {"@id": "so:Text"},
+		"postdate": {"@id": "so:Integer"},
+		"opendiscussion": {"@id": "so:True"},
+		"burnafterreading": {"@id": "so:True"},
+		"expire_date": {"@id": "so:Integer"},
+		"remaining_time": {"@id": "so:Integer"}
+	}
+}

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
  */

js/sjcl-1.0.2.js

@@ -1,54 +0,0 @@
-"use strict";function q(a){throw a;}var s=void 0,u=!1;var sjcl={cipher:{},hash:{},keyexchange:{},mode:{},misc:{},codec:{},exception:{corrupt:function(a){this.toString=function(){return"CORRUPT: "+this.message};this.message=a},invalid:function(a){this.toString=function(){return"INVALID: "+this.message};this.message=a},bug:function(a){this.toString=function(){return"BUG: "+this.message};this.message=a},notReady:function(a){this.toString=function(){return"NOT READY: "+this.message};this.message=a}}};
-"undefined"!==typeof module&&module.exports&&(module.exports=sjcl);"function"===typeof define&&define([],function(){return sjcl});
-sjcl.cipher.aes=function(a){this.k[0][0][0]||this.D();var b,c,d,e,f=this.k[0][4],g=this.k[1];b=a.length;var h=1;4!==b&&(6!==b&&8!==b)&&q(new sjcl.exception.invalid("invalid aes key size"));this.b=[d=a.slice(0),e=[]];for(a=b;a<4*b+28;a++){c=d[a-1];if(0===a%b||8===b&&4===a%b)c=f[c>>>24]<<24^f[c>>16&255]<<16^f[c>>8&255]<<8^f[c&255],0===a%b&&(c=c<<8^c>>>24^h<<24,h=h<<1^283*(h>>7));d[a]=d[a-b]^c}for(b=0;a;b++,a--)c=d[b&3?a:a-4],e[b]=4>=a||4>b?c:g[0][f[c>>>24]]^g[1][f[c>>16&255]]^g[2][f[c>>8&255]]^g[3][f[c&
-255]]};
-sjcl.cipher.aes.prototype={encrypt:function(a){return w(this,a,0)},decrypt:function(a){return w(this,a,1)},k:[[[],[],[],[],[]],[[],[],[],[],[]]],D:function(){var a=this.k[0],b=this.k[1],c=a[4],d=b[4],e,f,g,h=[],l=[],k,n,m,p;for(e=0;0x100>e;e++)l[(h[e]=e<<1^283*(e>>7))^e]=e;for(f=g=0;!c[f];f^=k||1,g=l[g]||1){m=g^g<<1^g<<2^g<<3^g<<4;m=m>>8^m&255^99;c[f]=m;d[m]=f;n=h[e=h[k=h[f]]];p=0x1010101*n^0x10001*e^0x101*k^0x1010100*f;n=0x101*h[m]^0x1010100*m;for(e=0;4>e;e++)a[e][f]=n=n<<24^n>>>8,b[e][m]=p=p<<24^p>>>8}for(e=
-0;5>e;e++)a[e]=a[e].slice(0),b[e]=b[e].slice(0)}};
-function w(a,b,c){4!==b.length&&q(new sjcl.exception.invalid("invalid aes block size"));var d=a.b[c],e=b[0]^d[0],f=b[c?3:1]^d[1],g=b[2]^d[2];b=b[c?1:3]^d[3];var h,l,k,n=d.length/4-2,m,p=4,t=[0,0,0,0];h=a.k[c];a=h[0];var r=h[1],v=h[2],y=h[3],z=h[4];for(m=0;m<n;m++)h=a[e>>>24]^r[f>>16&255]^v[g>>8&255]^y[b&255]^d[p],l=a[f>>>24]^r[g>>16&255]^v[b>>8&255]^y[e&255]^d[p+1],k=a[g>>>24]^r[b>>16&255]^v[e>>8&255]^y[f&255]^d[p+2],b=a[b>>>24]^r[e>>16&255]^v[f>>8&255]^y[g&255]^d[p+3],p+=4,e=h,f=l,g=k;for(m=0;4>
-m;m++)t[c?3&-m:m]=z[e>>>24]<<24^z[f>>16&255]<<16^z[g>>8&255]<<8^z[b&255]^d[p++],h=e,e=f,f=g,g=b,b=h;return t}
-sjcl.bitArray={bitSlice:function(a,b,c){a=sjcl.bitArray.P(a.slice(b/32),32-(b&31)).slice(1);return c===s?a:sjcl.bitArray.clamp(a,c-b)},extract:function(a,b,c){var d=Math.floor(-b-c&31);return((b+c-1^b)&-32?a[b/32|0]<<32-d^a[b/32+1|0]>>>d:a[b/32|0]>>>d)&(1<<c)-1},concat:function(a,b){if(0===a.length||0===b.length)return a.concat(b);var c=a[a.length-1],d=sjcl.bitArray.getPartial(c);return 32===d?a.concat(b):sjcl.bitArray.P(b,d,c|0,a.slice(0,a.length-1))},bitLength:function(a){var b=a.length;return 0===
-b?0:32*(b-1)+sjcl.bitArray.getPartial(a[b-1])},clamp:function(a,b){if(32*a.length<b)return a;a=a.slice(0,Math.ceil(b/32));var c=a.length;b&=31;0<c&&b&&(a[c-1]=sjcl.bitArray.partial(b,a[c-1]&2147483648>>b-1,1));return a},partial:function(a,b,c){return 32===a?b:(c?b|0:b<<32-a)+0x10000000000*a},getPartial:function(a){return Math.round(a/0x10000000000)||32},equal:function(a,b){if(sjcl.bitArray.bitLength(a)!==sjcl.bitArray.bitLength(b))return u;var c=0,d;for(d=0;d<a.length;d++)c|=a[d]^b[d];return 0===
-c},P:function(a,b,c,d){var e;e=0;for(d===s&&(d=[]);32<=b;b-=32)d.push(c),c=0;if(0===b)return d.concat(a);for(e=0;e<a.length;e++)d.push(c|a[e]>>>b),c=a[e]<<32-b;e=a.length?a[a.length-1]:0;a=sjcl.bitArray.getPartial(e);d.push(sjcl.bitArray.partial(b+a&31,32<b+a?c:d.pop(),1));return d},l:function(a,b){return[a[0]^b[0],a[1]^b[1],a[2]^b[2],a[3]^b[3]]},byteswapM:function(a){var b,c;for(b=0;b<a.length;++b)c=a[b],a[b]=c>>>24|c>>>8&0xff00|(c&0xff00)<<8|c<<24;return a}};
-sjcl.codec.utf8String={fromBits:function(a){var b="",c=sjcl.bitArray.bitLength(a),d,e;for(d=0;d<c/8;d++)0===(d&3)&&(e=a[d/4]),b+=String.fromCharCode(e>>>24),e<<=8;return decodeURIComponent(escape(b))},toBits:function(a){a=unescape(encodeURIComponent(a));var b=[],c,d=0;for(c=0;c<a.length;c++)d=d<<8|a.charCodeAt(c),3===(c&3)&&(b.push(d),d=0);c&3&&b.push(sjcl.bitArray.partial(8*(c&3),d));return b}};
-sjcl.codec.hex={fromBits:function(a){var b="",c;for(c=0;c<a.length;c++)b+=((a[c]|0)+0xf00000000000).toString(16).substr(4);return b.substr(0,sjcl.bitArray.bitLength(a)/4)},toBits:function(a){var b,c=[],d;a=a.replace(/\s|0x/g,"");d=a.length;a+="00000000";for(b=0;b<a.length;b+=8)c.push(parseInt(a.substr(b,8),16)^0);return sjcl.bitArray.clamp(c,4*d)}};
-sjcl.codec.base64={J:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",fromBits:function(a,b,c){var d="",e=0,f=sjcl.codec.base64.J,g=0,h=sjcl.bitArray.bitLength(a);c&&(f=f.substr(0,62)+"-_");for(c=0;6*d.length<h;)d+=f.charAt((g^a[c]>>>e)>>>26),6>e?(g=a[c]<<6-e,e+=26,c++):(g<<=6,e-=6);for(;d.length&3&&!b;)d+="=";return d},toBits:function(a,b){a=a.replace(/\s|=/g,"");var c=[],d,e=0,f=sjcl.codec.base64.J,g=0,h;b&&(f=f.substr(0,62)+"-_");for(d=0;d<a.length;d++)h=f.indexOf(a.charAt(d)),
-0>h&&q(new sjcl.exception.invalid("this isn't base64!")),26<e?(e-=26,c.push(g^h>>>e),g=h<<32-e):(e+=6,g^=h<<32-e);e&56&&c.push(sjcl.bitArray.partial(e&56,g,1));return c}};sjcl.codec.base64url={fromBits:function(a){return sjcl.codec.base64.fromBits(a,1,1)},toBits:function(a){return sjcl.codec.base64.toBits(a,1)}};sjcl.hash.sha256=function(a){this.b[0]||this.D();a?(this.r=a.r.slice(0),this.o=a.o.slice(0),this.h=a.h):this.reset()};sjcl.hash.sha256.hash=function(a){return(new sjcl.hash.sha256).update(a).finalize()};
-sjcl.hash.sha256.prototype={blockSize:512,reset:function(){this.r=this.N.slice(0);this.o=[];this.h=0;return this},update:function(a){"string"===typeof a&&(a=sjcl.codec.utf8String.toBits(a));var b,c=this.o=sjcl.bitArray.concat(this.o,a);b=this.h;a=this.h=b+sjcl.bitArray.bitLength(a);for(b=512+b&-512;b<=a;b+=512)x(this,c.splice(0,16));return this},finalize:function(){var a,b=this.o,c=this.r,b=sjcl.bitArray.concat(b,[sjcl.bitArray.partial(1,1)]);for(a=b.length+2;a&15;a++)b.push(0);b.push(Math.floor(this.h/
-4294967296));for(b.push(this.h|0);b.length;)x(this,b.splice(0,16));this.reset();return c},N:[],b:[],D:function(){function a(a){return 0x100000000*(a-Math.floor(a))|0}var b=0,c=2,d;a:for(;64>b;c++){for(d=2;d*d<=c;d++)if(0===c%d)continue a;8>b&&(this.N[b]=a(Math.pow(c,0.5)));this.b[b]=a(Math.pow(c,1/3));b++}}};
-function x(a,b){var c,d,e,f=b.slice(0),g=a.r,h=a.b,l=g[0],k=g[1],n=g[2],m=g[3],p=g[4],t=g[5],r=g[6],v=g[7];for(c=0;64>c;c++)16>c?d=f[c]:(d=f[c+1&15],e=f[c+14&15],d=f[c&15]=(d>>>7^d>>>18^d>>>3^d<<25^d<<14)+(e>>>17^e>>>19^e>>>10^e<<15^e<<13)+f[c&15]+f[c+9&15]|0),d=d+v+(p>>>6^p>>>11^p>>>25^p<<26^p<<21^p<<7)+(r^p&(t^r))+h[c],v=r,r=t,t=p,p=m+d|0,m=n,n=k,k=l,l=d+(k&n^m&(k^n))+(k>>>2^k>>>13^k>>>22^k<<30^k<<19^k<<10)|0;g[0]=g[0]+l|0;g[1]=g[1]+k|0;g[2]=g[2]+n|0;g[3]=g[3]+m|0;g[4]=g[4]+p|0;g[5]=g[5]+t|0;g[6]=
-g[6]+r|0;g[7]=g[7]+v|0}
-sjcl.mode.ccm={name:"ccm",encrypt:function(a,b,c,d,e){var f,g=b.slice(0),h=sjcl.bitArray,l=h.bitLength(c)/8,k=h.bitLength(g)/8;e=e||64;d=d||[];7>l&&q(new sjcl.exception.invalid("ccm: iv must be at least 7 bytes"));for(f=2;4>f&&k>>>8*f;f++);f<15-l&&(f=15-l);c=h.clamp(c,8*(15-f));b=sjcl.mode.ccm.L(a,b,c,d,e,f);g=sjcl.mode.ccm.p(a,g,c,b,e,f);return h.concat(g.data,g.tag)},decrypt:function(a,b,c,d,e){e=e||64;d=d||[];var f=sjcl.bitArray,g=f.bitLength(c)/8,h=f.bitLength(b),l=f.clamp(b,h-e),k=f.bitSlice(b,
-h-e),h=(h-e)/8;7>g&&q(new sjcl.exception.invalid("ccm: iv must be at least 7 bytes"));for(b=2;4>b&&h>>>8*b;b++);b<15-g&&(b=15-g);c=f.clamp(c,8*(15-b));l=sjcl.mode.ccm.p(a,l,c,k,e,b);a=sjcl.mode.ccm.L(a,l.data,c,d,e,b);f.equal(l.tag,a)||q(new sjcl.exception.corrupt("ccm: tag doesn't match"));return l.data},L:function(a,b,c,d,e,f){var g=[],h=sjcl.bitArray,l=h.l;e/=8;(e%2||4>e||16<e)&&q(new sjcl.exception.invalid("ccm: invalid tag length"));(0xffffffff<d.length||0xffffffff<b.length)&&q(new sjcl.exception.bug("ccm: can't deal with 4GiB or more data"));
-f=[h.partial(8,(d.length?64:0)|e-2<<2|f-1)];f=h.concat(f,c);f[3]|=h.bitLength(b)/8;f=a.encrypt(f);if(d.length){c=h.bitLength(d)/8;65279>=c?g=[h.partial(16,c)]:0xffffffff>=c&&(g=h.concat([h.partial(16,65534)],[c]));g=h.concat(g,d);for(d=0;d<g.length;d+=4)f=a.encrypt(l(f,g.slice(d,d+4).concat([0,0,0])))}for(d=0;d<b.length;d+=4)f=a.encrypt(l(f,b.slice(d,d+4).concat([0,0,0])));return h.clamp(f,8*e)},p:function(a,b,c,d,e,f){var g,h=sjcl.bitArray;g=h.l;var l=b.length,k=h.bitLength(b);c=h.concat([h.partial(8,
-f-1)],c).concat([0,0,0]).slice(0,4);d=h.bitSlice(g(d,a.encrypt(c)),0,e);if(!l)return{tag:d,data:[]};for(g=0;g<l;g+=4)c[3]++,e=a.encrypt(c),b[g]^=e[0],b[g+1]^=e[1],b[g+2]^=e[2],b[g+3]^=e[3];return{tag:d,data:h.clamp(b,k)}}};
-sjcl.mode.ocb2={name:"ocb2",encrypt:function(a,b,c,d,e,f){128!==sjcl.bitArray.bitLength(c)&&q(new sjcl.exception.invalid("ocb iv must be 128 bits"));var g,h=sjcl.mode.ocb2.H,l=sjcl.bitArray,k=l.l,n=[0,0,0,0];c=h(a.encrypt(c));var m,p=[];d=d||[];e=e||64;for(g=0;g+4<b.length;g+=4)m=b.slice(g,g+4),n=k(n,m),p=p.concat(k(c,a.encrypt(k(c,m)))),c=h(c);m=b.slice(g);b=l.bitLength(m);g=a.encrypt(k(c,[0,0,0,b]));m=l.clamp(k(m.concat([0,0,0]),g),b);n=k(n,k(m.concat([0,0,0]),g));n=a.encrypt(k(n,k(c,h(c))));d.length&&
-(n=k(n,f?d:sjcl.mode.ocb2.pmac(a,d)));return p.concat(l.concat(m,l.clamp(n,e)))},decrypt:function(a,b,c,d,e,f){128!==sjcl.bitArray.bitLength(c)&&q(new sjcl.exception.invalid("ocb iv must be 128 bits"));e=e||64;var g=sjcl.mode.ocb2.H,h=sjcl.bitArray,l=h.l,k=[0,0,0,0],n=g(a.encrypt(c)),m,p,t=sjcl.bitArray.bitLength(b)-e,r=[];d=d||[];for(c=0;c+4<t/32;c+=4)m=l(n,a.decrypt(l(n,b.slice(c,c+4)))),k=l(k,m),r=r.concat(m),n=g(n);p=t-32*c;m=a.encrypt(l(n,[0,0,0,p]));m=l(m,h.clamp(b.slice(c),p).concat([0,0,0]));
-k=l(k,m);k=a.encrypt(l(k,l(n,g(n))));d.length&&(k=l(k,f?d:sjcl.mode.ocb2.pmac(a,d)));h.equal(h.clamp(k,e),h.bitSlice(b,t))||q(new sjcl.exception.corrupt("ocb: tag doesn't match"));return r.concat(h.clamp(m,p))},pmac:function(a,b){var c,d=sjcl.mode.ocb2.H,e=sjcl.bitArray,f=e.l,g=[0,0,0,0],h=a.encrypt([0,0,0,0]),h=f(h,d(d(h)));for(c=0;c+4<b.length;c+=4)h=d(h),g=f(g,a.encrypt(f(h,b.slice(c,c+4))));c=b.slice(c);128>e.bitLength(c)&&(h=f(h,d(h)),c=e.concat(c,[-2147483648,0,0,0]));g=f(g,c);return a.encrypt(f(d(f(h,
-d(h))),g))},H:function(a){return[a[0]<<1^a[1]>>>31,a[1]<<1^a[2]>>>31,a[2]<<1^a[3]>>>31,a[3]<<1^135*(a[0]>>>31)]}};
-sjcl.mode.gcm={name:"gcm",encrypt:function(a,b,c,d,e){var f=b.slice(0);b=sjcl.bitArray;d=d||[];a=sjcl.mode.gcm.p(!0,a,f,d,c,e||128);return b.concat(a.data,a.tag)},decrypt:function(a,b,c,d,e){var f=b.slice(0),g=sjcl.bitArray,h=g.bitLength(f);e=e||128;d=d||[];e<=h?(b=g.bitSlice(f,h-e),f=g.bitSlice(f,0,h-e)):(b=f,f=[]);a=sjcl.mode.gcm.p(u,a,f,d,c,e);g.equal(a.tag,b)||q(new sjcl.exception.corrupt("gcm: tag doesn't match"));return a.data},Z:function(a,b){var c,d,e,f,g,h=sjcl.bitArray.l;e=[0,0,0,0];f=b.slice(0);
-for(c=0;128>c;c++){(d=0!==(a[Math.floor(c/32)]&1<<31-c%32))&&(e=h(e,f));g=0!==(f[3]&1);for(d=3;0<d;d--)f[d]=f[d]>>>1|(f[d-1]&1)<<31;f[0]>>>=1;g&&(f[0]^=-0x1f000000)}return e},g:function(a,b,c){var d,e=c.length;b=b.slice(0);for(d=0;d<e;d+=4)b[0]^=0xffffffff&c[d],b[1]^=0xffffffff&c[d+1],b[2]^=0xffffffff&c[d+2],b[3]^=0xffffffff&c[d+3],b=sjcl.mode.gcm.Z(b,a);return b},p:function(a,b,c,d,e,f){var g,h,l,k,n,m,p,t,r=sjcl.bitArray;m=c.length;p=r.bitLength(c);t=r.bitLength(d);h=r.bitLength(e);g=b.encrypt([0,
-0,0,0]);96===h?(e=e.slice(0),e=r.concat(e,[1])):(e=sjcl.mode.gcm.g(g,[0,0,0,0],e),e=sjcl.mode.gcm.g(g,e,[0,0,Math.floor(h/0x100000000),h&0xffffffff]));h=sjcl.mode.gcm.g(g,[0,0,0,0],d);n=e.slice(0);d=h.slice(0);a||(d=sjcl.mode.gcm.g(g,h,c));for(k=0;k<m;k+=4)n[3]++,l=b.encrypt(n),c[k]^=l[0],c[k+1]^=l[1],c[k+2]^=l[2],c[k+3]^=l[3];c=r.clamp(c,p);a&&(d=sjcl.mode.gcm.g(g,h,c));a=[Math.floor(t/0x100000000),t&0xffffffff,Math.floor(p/0x100000000),p&0xffffffff];d=sjcl.mode.gcm.g(g,d,a);l=b.encrypt(e);d[0]^=l[0];
-d[1]^=l[1];d[2]^=l[2];d[3]^=l[3];return{tag:r.bitSlice(d,0,f),data:c}}};sjcl.misc.hmac=function(a,b){this.M=b=b||sjcl.hash.sha256;var c=[[],[]],d,e=b.prototype.blockSize/32;this.n=[new b,new b];a.length>e&&(a=b.hash(a));for(d=0;d<e;d++)c[0][d]=a[d]^909522486,c[1][d]=a[d]^1549556828;this.n[0].update(c[0]);this.n[1].update(c[1]);this.G=new b(this.n[0])};
-sjcl.misc.hmac.prototype.encrypt=sjcl.misc.hmac.prototype.mac=function(a){this.Q&&q(new sjcl.exception.invalid("encrypt on already updated hmac called!"));this.update(a);return this.digest(a)};sjcl.misc.hmac.prototype.reset=function(){this.G=new this.M(this.n[0]);this.Q=u};sjcl.misc.hmac.prototype.update=function(a){this.Q=!0;this.G.update(a)};sjcl.misc.hmac.prototype.digest=function(){var a=this.G.finalize(),a=(new this.M(this.n[1])).update(a).finalize();this.reset();return a};
-sjcl.misc.pbkdf2=function(a,b,c,d,e){c=c||1E3;(0>d||0>c)&&q(sjcl.exception.invalid("invalid params to pbkdf2"));"string"===typeof a&&(a=sjcl.codec.utf8String.toBits(a));"string"===typeof b&&(b=sjcl.codec.utf8String.toBits(b));e=e||sjcl.misc.hmac;a=new e(a);var f,g,h,l,k=[],n=sjcl.bitArray;for(l=1;32*k.length<(d||1);l++){e=f=a.encrypt(n.concat(b,[l]));for(g=1;g<c;g++){f=a.encrypt(f);for(h=0;h<f.length;h++)e[h]^=f[h]}k=k.concat(e)}d&&(k=n.clamp(k,d));return k};
-sjcl.prng=function(a){this.c=[new sjcl.hash.sha256];this.i=[0];this.F=0;this.s={};this.C=0;this.K={};this.O=this.d=this.j=this.W=0;this.b=[0,0,0,0,0,0,0,0];this.f=[0,0,0,0];this.A=s;this.B=a;this.q=u;this.w={progress:{},seeded:{}};this.m=this.V=0;this.t=1;this.u=2;this.S=0x10000;this.I=[0,48,64,96,128,192,0x100,384,512,768,1024];this.T=3E4;this.R=80};
-sjcl.prng.prototype={randomWords:function(a,b){var c=[],d;d=this.isReady(b);var e;d===this.m&&q(new sjcl.exception.notReady("generator isn't seeded"));if(d&this.u){d=!(d&this.t);e=[];var f=0,g;this.O=e[0]=(new Date).valueOf()+this.T;for(g=0;16>g;g++)e.push(0x100000000*Math.random()|0);for(g=0;g<this.c.length&&!(e=e.concat(this.c[g].finalize()),f+=this.i[g],this.i[g]=0,!d&&this.F&1<<g);g++);this.F>=1<<this.c.length&&(this.c.push(new sjcl.hash.sha256),this.i.push(0));this.d-=f;f>this.j&&(this.j=f);this.F++;
-this.b=sjcl.hash.sha256.hash(this.b.concat(e));this.A=new sjcl.cipher.aes(this.b);for(d=0;4>d&&!(this.f[d]=this.f[d]+1|0,this.f[d]);d++);}for(d=0;d<a;d+=4)0===(d+1)%this.S&&A(this),e=B(this),c.push(e[0],e[1],e[2],e[3]);A(this);return c.slice(0,a)},setDefaultParanoia:function(a,b){0===a&&"Setting paranoia=0 will ruin your security; use it only for testing"!==b&&q("Setting paranoia=0 will ruin your security; use it only for testing");this.B=a},addEntropy:function(a,b,c){c=c||"user";var d,e,f=(new Date).valueOf(),
-g=this.s[c],h=this.isReady(),l=0;d=this.K[c];d===s&&(d=this.K[c]=this.W++);g===s&&(g=this.s[c]=0);this.s[c]=(this.s[c]+1)%this.c.length;switch(typeof a){case "number":b===s&&(b=1);this.c[g].update([d,this.C++,1,b,f,1,a|0]);break;case "object":c=Object.prototype.toString.call(a);if("[object Uint32Array]"===c){e=[];for(c=0;c<a.length;c++)e.push(a[c]);a=e}else{"[object Array]"!==c&&(l=1);for(c=0;c<a.length&&!l;c++)"number"!==typeof a[c]&&(l=1)}if(!l){if(b===s)for(c=b=0;c<a.length;c++)for(e=a[c];0<e;)b++,
-e>>>=1;this.c[g].update([d,this.C++,2,b,f,a.length].concat(a))}break;case "string":b===s&&(b=a.length);this.c[g].update([d,this.C++,3,b,f,a.length]);this.c[g].update(a);break;default:l=1}l&&q(new sjcl.exception.bug("random: addEntropy only supports number, array of numbers or string"));this.i[g]+=b;this.d+=b;h===this.m&&(this.isReady()!==this.m&&C("seeded",Math.max(this.j,this.d)),C("progress",this.getProgress()))},isReady:function(a){a=this.I[a!==s?a:this.B];return this.j&&this.j>=a?this.i[0]>this.R&&
-(new Date).valueOf()>this.O?this.u|this.t:this.t:this.d>=a?this.u|this.m:this.m},getProgress:function(a){a=this.I[a?a:this.B];return this.j>=a?1:this.d>a?1:this.d/a},startCollectors:function(){this.q||(this.a={loadTimeCollector:D(this,this.aa),mouseCollector:D(this,this.ba),keyboardCollector:D(this,this.$),accelerometerCollector:D(this,this.U),touchCollector:D(this,this.da)},window.addEventListener?(window.addEventListener("load",this.a.loadTimeCollector,u),window.addEventListener("mousemove",this.a.mouseCollector,
-u),window.addEventListener("keypress",this.a.keyboardCollector,u),window.addEventListener("devicemotion",this.a.accelerometerCollector,u),window.addEventListener("touchmove",this.a.touchCollector,u)):document.attachEvent?(document.attachEvent("onload",this.a.loadTimeCollector),document.attachEvent("onmousemove",this.a.mouseCollector),document.attachEvent("keypress",this.a.keyboardCollector)):q(new sjcl.exception.bug("can't attach event")),this.q=!0)},stopCollectors:function(){this.q&&(window.removeEventListener?
-(window.removeEventListener("load",this.a.loadTimeCollector,u),window.removeEventListener("mousemove",this.a.mouseCollector,u),window.removeEventListener("keypress",this.a.keyboardCollector,u),window.removeEventListener("devicemotion",this.a.accelerometerCollector,u),window.removeEventListener("touchmove",this.a.touchCollector,u)):document.detachEvent&&(document.detachEvent("onload",this.a.loadTimeCollector),document.detachEvent("onmousemove",this.a.mouseCollector),document.detachEvent("keypress",
-this.a.keyboardCollector)),this.q=u)},addEventListener:function(a,b){this.w[a][this.V++]=b},removeEventListener:function(a,b){var c,d,e=this.w[a],f=[];for(d in e)e.hasOwnProperty(d)&&e[d]===b&&f.push(d);for(c=0;c<f.length;c++)d=f[c],delete e[d]},$:function(){E(1)},ba:function(a){var b,c;try{b=a.x||a.clientX||a.offsetX||0,c=a.y||a.clientY||a.offsetY||0}catch(d){c=b=0}0!=b&&0!=c&&sjcl.random.addEntropy([b,c],2,"mouse");E(0)},da:function(a){a=a.touches[0]||a.changedTouches[0];sjcl.random.addEntropy([a.pageX||
-a.clientX,a.pageY||a.clientY],1,"touch");E(0)},aa:function(){E(2)},U:function(a){a=a.accelerationIncludingGravity.x||a.accelerationIncludingGravity.y||a.accelerationIncludingGravity.z;if(window.orientation){var b=window.orientation;"number"===typeof b&&sjcl.random.addEntropy(b,1,"accelerometer")}a&&sjcl.random.addEntropy(a,2,"accelerometer");E(0)}};function C(a,b){var c,d=sjcl.random.w[a],e=[];for(c in d)d.hasOwnProperty(c)&&e.push(d[c]);for(c=0;c<e.length;c++)e[c](b)}
-function E(a){"undefined"!==typeof window&&window.performance&&"function"===typeof window.performance.now?sjcl.random.addEntropy(window.performance.now(),a,"loadtime"):sjcl.random.addEntropy((new Date).valueOf(),a,"loadtime")}function A(a){a.b=B(a).concat(B(a));a.A=new sjcl.cipher.aes(a.b)}function B(a){for(var b=0;4>b&&!(a.f[b]=a.f[b]+1|0,a.f[b]);b++);return a.A.encrypt(a.f)}function D(a,b){return function(){b.apply(a,arguments)}}sjcl.random=new sjcl.prng(6);
-a:try{var F,G,H,I;if(I="undefined"!==typeof module){var J;if(J=module.exports){var K;try{K=require("crypto")}catch(L){K=null}J=(G=K)&&G.randomBytes}I=J}if(I)F=G.randomBytes(128),F=new Uint32Array((new Uint8Array(F)).buffer),sjcl.random.addEntropy(F,1024,"crypto['randomBytes']");else if("undefined"!==typeof window&&"undefined"!==typeof Uint32Array){H=new Uint32Array(32);if(window.crypto&&window.crypto.getRandomValues)window.crypto.getRandomValues(H);else if(window.msCrypto&&window.msCrypto.getRandomValues)window.msCrypto.getRandomValues(H);
-else break a;sjcl.random.addEntropy(H,1024,"crypto['getRandomValues']")}}catch(M){"undefined"!==typeof window&&window.console&&(console.log("There was an error collecting entropy from the browser:"),console.log(M))}
-sjcl.json={defaults:{v:1,iter:1E3,ks:128,ts:64,mode:"ccm",adata:"",cipher:"aes"},Y:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json,f=e.e({iv:sjcl.random.randomWords(4,0)},e.defaults),g;e.e(f,c);c=f.adata;"string"===typeof f.salt&&(f.salt=sjcl.codec.base64.toBits(f.salt));"string"===typeof f.iv&&(f.iv=sjcl.codec.base64.toBits(f.iv));(!sjcl.mode[f.mode]||!sjcl.cipher[f.cipher]||"string"===typeof a&&100>=f.iter||64!==f.ts&&96!==f.ts&&128!==f.ts||128!==f.ks&&192!==f.ks&&0x100!==f.ks||2>f.iv.length||4<
-f.iv.length)&&q(new sjcl.exception.invalid("json encrypt: invalid parameters"));"string"===typeof a?(g=sjcl.misc.cachedPbkdf2(a,f),a=g.key.slice(0,f.ks/32),f.salt=g.salt):sjcl.ecc&&a instanceof sjcl.ecc.elGamal.publicKey&&(g=a.kem(),f.kemtag=g.tag,a=g.key.slice(0,f.ks/32));"string"===typeof b&&(b=sjcl.codec.utf8String.toBits(b));"string"===typeof c&&(f.adata=c=sjcl.codec.utf8String.toBits(c));g=new sjcl.cipher[f.cipher](a);e.e(d,f);d.key=a;f.ct=sjcl.mode[f.mode].encrypt(g,b,f.iv,c,f.ts);return f},
-encrypt:function(a,b,c,d){var e=sjcl.json,f=e.Y.apply(e,arguments);return e.encode(f)},X:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json;b=e.e(e.e(e.e({},e.defaults),b),c,!0);var f,g;f=b.adata;"string"===typeof b.salt&&(b.salt=sjcl.codec.base64.toBits(b.salt));"string"===typeof b.iv&&(b.iv=sjcl.codec.base64.toBits(b.iv));(!sjcl.mode[b.mode]||!sjcl.cipher[b.cipher]||"string"===typeof a&&100>=b.iter||64!==b.ts&&96!==b.ts&&128!==b.ts||128!==b.ks&&192!==b.ks&&0x100!==b.ks||!b.iv||2>b.iv.length||4<b.iv.length)&&
-q(new sjcl.exception.invalid("json decrypt: invalid parameters"));"string"===typeof a?(g=sjcl.misc.cachedPbkdf2(a,b),a=g.key.slice(0,b.ks/32),b.salt=g.salt):sjcl.ecc&&a instanceof sjcl.ecc.elGamal.secretKey&&(a=a.unkem(sjcl.codec.base64.toBits(b.kemtag)).slice(0,b.ks/32));"string"===typeof f&&(f=sjcl.codec.utf8String.toBits(f));g=new sjcl.cipher[b.cipher](a);f=sjcl.mode[b.mode].decrypt(g,b.ct,b.iv,f,b.ts);e.e(d,b);d.key=a;return 1===c.raw?f:sjcl.codec.utf8String.fromBits(f)},decrypt:function(a,b,
-c,d){var e=sjcl.json;return e.X(a,e.decode(b),c,d)},encode:function(a){var b,c="{",d="";for(b in a)if(a.hasOwnProperty(b))switch(b.match(/^[a-z0-9]+$/i)||q(new sjcl.exception.invalid("json encode: invalid property name")),c+=d+'"'+b+'":',d=",",typeof a[b]){case "number":case "boolean":c+=a[b];break;case "string":c+='"'+escape(a[b])+'"';break;case "object":c+='"'+sjcl.codec.base64.fromBits(a[b],0)+'"';break;default:q(new sjcl.exception.bug("json encode: unsupported type"))}return c+"}"},decode:function(a){a=
-a.replace(/\s/g,"");a.match(/^\{.*\}$/)||q(new sjcl.exception.invalid("json decode: this isn't json!"));a=a.replace(/^\{|\}$/g,"").split(/,/);var b={},c,d;for(c=0;c<a.length;c++)(d=a[c].match(/^\s*(?:(["']?)([a-z][a-z0-9]*)\1)\s*:\s*(?:(-?\d+)|"([a-z0-9+\/%*_.@=\-]*)"|(true|false))$/i))||q(new sjcl.exception.invalid("json decode: this isn't json!")),d[3]?b[d[2]]=parseInt(d[3],10):d[4]?b[d[2]]=d[2].match(/^(ct|adata|salt|iv)$/)?sjcl.codec.base64.toBits(d[4]):unescape(d[4]):d[5]&&(b[d[2]]="true"===
-d[5]);return b},e:function(a,b,c){a===s&&(a={});if(b===s)return a;for(var d in b)b.hasOwnProperty(d)&&(c&&(a[d]!==s&&a[d]!==b[d])&&q(new sjcl.exception.invalid("required parameter overridden")),a[d]=b[d]);return a},fa:function(a,b){var c={},d;for(d in a)a.hasOwnProperty(d)&&a[d]!==b[d]&&(c[d]=a[d]);return c},ea:function(a,b){var c={},d;for(d=0;d<b.length;d++)a[b[d]]!==s&&(c[b[d]]=a[b[d]]);return c}};sjcl.encrypt=sjcl.json.encrypt;sjcl.decrypt=sjcl.json.decrypt;sjcl.misc.ca={};
-sjcl.misc.cachedPbkdf2=function(a,b){var c=sjcl.misc.ca,d;b=b||{};d=b.iter||1E3;c=c[a]=c[a]||{};d=c[d]=c[d]||{firstSalt:b.salt&&b.salt.length?b.salt.slice(0):sjcl.random.randomWords(2,0)};c=b.salt===s?d.firstSalt:b.salt;d[c]=d[c]||sjcl.misc.pbkdf2(a,c,b.iter);return{key:d[c].slice(0),salt:c.slice(0)}};

js/sjcl-1.0.4.js

@@ -0,0 +1,58 @@
+"use strict";function q(a){throw a;}var s=void 0,u=!1;var sjcl={cipher:{},hash:{},keyexchange:{},mode:{},misc:{},codec:{},exception:{corrupt:function(a){this.toString=function(){return"CORRUPT: "+this.message};this.message=a},invalid:function(a){this.toString=function(){return"INVALID: "+this.message};this.message=a},bug:function(a){this.toString=function(){return"BUG: "+this.message};this.message=a},notReady:function(a){this.toString=function(){return"NOT READY: "+this.message};this.message=a}}};
+"undefined"!==typeof module&&module.exports&&(module.exports=sjcl);"function"===typeof define&&define([],function(){return sjcl});
+sjcl.cipher.aes=function(a){this.l[0][0][0]||this.G();var b,c,d,e,g=this.l[0][4],f=this.l[1];b=a.length;var h=1;4!==b&&(6!==b&&8!==b)&&q(new sjcl.exception.invalid("invalid aes key size"));this.b=[d=a.slice(0),e=[]];for(a=b;a<4*b+28;a++){c=d[a-1];if(0===a%b||8===b&&4===a%b)c=g[c>>>24]<<24^g[c>>16&255]<<16^g[c>>8&255]<<8^g[c&255],0===a%b&&(c=c<<8^c>>>24^h<<24,h=h<<1^283*(h>>7));d[a]=d[a-b]^c}for(b=0;a;b++,a--)c=d[b&3?a:a-4],e[b]=4>=a||4>b?c:f[0][g[c>>>24]]^f[1][g[c>>16&255]]^f[2][g[c>>8&255]]^f[3][g[c&
+255]]};
+sjcl.cipher.aes.prototype={encrypt:function(a){return w(this,a,0)},decrypt:function(a){return w(this,a,1)},l:[[[],[],[],[],[]],[[],[],[],[],[]]],G:function(){var a=this.l[0],b=this.l[1],c=a[4],d=b[4],e,g,f,h=[],l=[],k,m,n,p;for(e=0;0x100>e;e++)l[(h[e]=e<<1^283*(e>>7))^e]=e;for(g=f=0;!c[g];g^=k||1,f=l[f]||1){n=f^f<<1^f<<2^f<<3^f<<4;n=n>>8^n&255^99;c[g]=n;d[n]=g;m=h[e=h[k=h[g]]];p=0x1010101*m^0x10001*e^0x101*k^0x1010100*g;m=0x101*h[n]^0x1010100*n;for(e=0;4>e;e++)a[e][g]=m=m<<24^m>>>8,b[e][n]=p=p<<24^p>>>8}for(e=
+0;5>e;e++)a[e]=a[e].slice(0),b[e]=b[e].slice(0)}};
+function w(a,b,c){4!==b.length&&q(new sjcl.exception.invalid("invalid aes block size"));var d=a.b[c],e=b[0]^d[0],g=b[c?3:1]^d[1],f=b[2]^d[2];b=b[c?1:3]^d[3];var h,l,k,m=d.length/4-2,n,p=4,t=[0,0,0,0];h=a.l[c];a=h[0];var r=h[1],v=h[2],y=h[3],z=h[4];for(n=0;n<m;n++)h=a[e>>>24]^r[g>>16&255]^v[f>>8&255]^y[b&255]^d[p],l=a[g>>>24]^r[f>>16&255]^v[b>>8&255]^y[e&255]^d[p+1],k=a[f>>>24]^r[b>>16&255]^v[e>>8&255]^y[g&255]^d[p+2],b=a[b>>>24]^r[e>>16&255]^v[g>>8&255]^y[f&255]^d[p+3],p+=4,e=h,g=l,f=k;for(n=0;4>
+n;n++)t[c?3&-n:n]=z[e>>>24]<<24^z[g>>16&255]<<16^z[f>>8&255]<<8^z[b&255]^d[p++],h=e,e=g,g=f,f=b,b=h;return t}
+sjcl.bitArray={bitSlice:function(a,b,c){a=sjcl.bitArray.R(a.slice(b/32),32-(b&31)).slice(1);return c===s?a:sjcl.bitArray.clamp(a,c-b)},extract:function(a,b,c){var d=Math.floor(-b-c&31);return((b+c-1^b)&-32?a[b/32|0]<<32-d^a[b/32+1|0]>>>d:a[b/32|0]>>>d)&(1<<c)-1},concat:function(a,b){if(0===a.length||0===b.length)return a.concat(b);var c=a[a.length-1],d=sjcl.bitArray.getPartial(c);return 32===d?a.concat(b):sjcl.bitArray.R(b,d,c|0,a.slice(0,a.length-1))},bitLength:function(a){var b=a.length;return 0===
+b?0:32*(b-1)+sjcl.bitArray.getPartial(a[b-1])},clamp:function(a,b){if(32*a.length<b)return a;a=a.slice(0,Math.ceil(b/32));var c=a.length;b&=31;0<c&&b&&(a[c-1]=sjcl.bitArray.partial(b,a[c-1]&2147483648>>b-1,1));return a},partial:function(a,b,c){return 32===a?b:(c?b|0:b<<32-a)+0x10000000000*a},getPartial:function(a){return Math.round(a/0x10000000000)||32},equal:function(a,b){if(sjcl.bitArray.bitLength(a)!==sjcl.bitArray.bitLength(b))return u;var c=0,d;for(d=0;d<a.length;d++)c|=a[d]^b[d];return 0===
+c},R:function(a,b,c,d){var e;e=0;for(d===s&&(d=[]);32<=b;b-=32)d.push(c),c=0;if(0===b)return d.concat(a);for(e=0;e<a.length;e++)d.push(c|a[e]>>>b),c=a[e]<<32-b;e=a.length?a[a.length-1]:0;a=sjcl.bitArray.getPartial(e);d.push(sjcl.bitArray.partial(b+a&31,32<b+a?c:d.pop(),1));return d},g:function(a,b){return[a[0]^b[0],a[1]^b[1],a[2]^b[2],a[3]^b[3]]},byteswapM:function(a){var b,c;for(b=0;b<a.length;++b)c=a[b],a[b]=c>>>24|c>>>8&0xff00|(c&0xff00)<<8|c<<24;return a}};
+sjcl.codec.utf8String={fromBits:function(a){var b="",c=sjcl.bitArray.bitLength(a),d,e;for(d=0;d<c/8;d++)0===(d&3)&&(e=a[d/4]),b+=String.fromCharCode(e>>>24),e<<=8;return decodeURIComponent(escape(b))},toBits:function(a){a=unescape(encodeURIComponent(a));var b=[],c,d=0;for(c=0;c<a.length;c++)d=d<<8|a.charCodeAt(c),3===(c&3)&&(b.push(d),d=0);c&3&&b.push(sjcl.bitArray.partial(8*(c&3),d));return b}};
+sjcl.codec.hex={fromBits:function(a){var b="",c;for(c=0;c<a.length;c++)b+=((a[c]|0)+0xf00000000000).toString(16).substr(4);return b.substr(0,sjcl.bitArray.bitLength(a)/4)},toBits:function(a){var b,c=[],d;a=a.replace(/\s|0x/g,"");d=a.length;a+="00000000";for(b=0;b<a.length;b+=8)c.push(parseInt(a.substr(b,8),16)^0);return sjcl.bitArray.clamp(c,4*d)}};
+sjcl.codec.base32={p:"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567",O:"0123456789ABCDEFGHIJKLMNOPQRSTUV",BITS:32,BASE:5,REMAINING:27,fromBits:function(a,b,c){var d=sjcl.codec.base32.BASE,e=sjcl.codec.base32.REMAINING,g="",f=0,h=sjcl.codec.base32.p,l=0,k=sjcl.bitArray.bitLength(a);c&&(h=sjcl.codec.base32.O);for(c=0;g.length*d<k;)g+=h.charAt((l^a[c]>>>f)>>>e),f<d?(l=a[c]<<d-f,f+=e,c++):(l<<=d,f-=d);for(;g.length&7&&!b;)g+="=";return g},toBits:function(a,b){a=a.replace(/\s|=/g,"").toUpperCase();var c=sjcl.codec.base32.BITS,
+d=sjcl.codec.base32.BASE,e=sjcl.codec.base32.REMAINING,g=[],f,h=0,l=sjcl.codec.base32.p,k=0,m,n="base32";b&&(l=sjcl.codec.base32.O,n="base32hex");for(f=0;f<a.length;f++){m=l.indexOf(a.charAt(f));if(0>m){if(!b)try{return sjcl.codec.base32hex.toBits(a)}catch(p){}q(new sjcl.exception.invalid("this isn't "+n+"!"))}h>e?(h-=e,g.push(k^m>>>h),k=m<<c-h):(h+=d,k^=m<<c-h)}h&56&&g.push(sjcl.bitArray.partial(h&56,k,1));return g}};
+sjcl.codec.base32hex={fromBits:function(a,b){return sjcl.codec.base32.fromBits(a,b,1)},toBits:function(a){return sjcl.codec.base32.toBits(a,1)}};
+sjcl.codec.base64={p:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",fromBits:function(a,b,c){var d="",e=0,g=sjcl.codec.base64.p,f=0,h=sjcl.bitArray.bitLength(a);c&&(g=g.substr(0,62)+"-_");for(c=0;6*d.length<h;)d+=g.charAt((f^a[c]>>>e)>>>26),6>e?(f=a[c]<<6-e,e+=26,c++):(f<<=6,e-=6);for(;d.length&3&&!b;)d+="=";return d},toBits:function(a,b){a=a.replace(/\s|=/g,"");var c=[],d,e=0,g=sjcl.codec.base64.p,f=0,h;b&&(g=g.substr(0,62)+"-_");for(d=0;d<a.length;d++)h=g.indexOf(a.charAt(d)),
+0>h&&q(new sjcl.exception.invalid("this isn't base64!")),26<e?(e-=26,c.push(f^h>>>e),f=h<<32-e):(e+=6,f^=h<<32-e);e&56&&c.push(sjcl.bitArray.partial(e&56,f,1));return c}};sjcl.codec.base64url={fromBits:function(a){return sjcl.codec.base64.fromBits(a,1,1)},toBits:function(a){return sjcl.codec.base64.toBits(a,1)}};sjcl.hash.sha256=function(a){this.b[0]||this.G();a?(this.s=a.s.slice(0),this.o=a.o.slice(0),this.i=a.i):this.reset()};sjcl.hash.sha256.hash=function(a){return(new sjcl.hash.sha256).update(a).finalize()};
+sjcl.hash.sha256.prototype={blockSize:512,reset:function(){this.s=this.P.slice(0);this.o=[];this.i=0;return this},update:function(a){"string"===typeof a&&(a=sjcl.codec.utf8String.toBits(a));var b,c=this.o=sjcl.bitArray.concat(this.o,a);b=this.i;a=this.i=b+sjcl.bitArray.bitLength(a);for(b=512+b&-512;b<=a;b+=512)x(this,c.splice(0,16));return this},finalize:function(){var a,b=this.o,c=this.s,b=sjcl.bitArray.concat(b,[sjcl.bitArray.partial(1,1)]);for(a=b.length+2;a&15;a++)b.push(0);b.push(Math.floor(this.i/
+4294967296));for(b.push(this.i|0);b.length;)x(this,b.splice(0,16));this.reset();return c},P:[],b:[],G:function(){function a(a){return 0x100000000*(a-Math.floor(a))|0}var b=0,c=2,d;a:for(;64>b;c++){for(d=2;d*d<=c;d++)if(0===c%d)continue a;8>b&&(this.P[b]=a(Math.pow(c,0.5)));this.b[b]=a(Math.pow(c,1/3));b++}}};
+function x(a,b){var c,d,e,g=b.slice(0),f=a.s,h=a.b,l=f[0],k=f[1],m=f[2],n=f[3],p=f[4],t=f[5],r=f[6],v=f[7];for(c=0;64>c;c++)16>c?d=g[c]:(d=g[c+1&15],e=g[c+14&15],d=g[c&15]=(d>>>7^d>>>18^d>>>3^d<<25^d<<14)+(e>>>17^e>>>19^e>>>10^e<<15^e<<13)+g[c&15]+g[c+9&15]|0),d=d+v+(p>>>6^p>>>11^p>>>25^p<<26^p<<21^p<<7)+(r^p&(t^r))+h[c],v=r,r=t,t=p,p=n+d|0,n=m,m=k,k=l,l=d+(k&m^n&(k^m))+(k>>>2^k>>>13^k>>>22^k<<30^k<<19^k<<10)|0;f[0]=f[0]+l|0;f[1]=f[1]+k|0;f[2]=f[2]+m|0;f[3]=f[3]+n|0;f[4]=f[4]+p|0;f[5]=f[5]+t|0;f[6]=
+f[6]+r|0;f[7]=f[7]+v|0}
+sjcl.mode.ccm={name:"ccm",t:[],listenProgress:function(a){sjcl.mode.ccm.t.push(a)},unListenProgress:function(a){a=sjcl.mode.ccm.t.indexOf(a);-1<a&&sjcl.mode.ccm.t.splice(a,1)},X:function(a){var b=sjcl.mode.ccm.t.slice(),c;for(c=0;c<b.length;c+=1)b[c](a)},encrypt:function(a,b,c,d,e){var g,f=b.slice(0),h=sjcl.bitArray,l=h.bitLength(c)/8,k=h.bitLength(f)/8;e=e||64;d=d||[];7>l&&q(new sjcl.exception.invalid("ccm: iv must be at least 7 bytes"));for(g=2;4>g&&k>>>8*g;g++);g<15-l&&(g=15-l);c=h.clamp(c,8*(15-
+g));b=sjcl.mode.ccm.M(a,b,c,d,e,g);f=sjcl.mode.ccm.q(a,f,c,b,e,g);return h.concat(f.data,f.tag)},decrypt:function(a,b,c,d,e){e=e||64;d=d||[];var g=sjcl.bitArray,f=g.bitLength(c)/8,h=g.bitLength(b),l=g.clamp(b,h-e),k=g.bitSlice(b,h-e),h=(h-e)/8;7>f&&q(new sjcl.exception.invalid("ccm: iv must be at least 7 bytes"));for(b=2;4>b&&h>>>8*b;b++);b<15-f&&(b=15-f);c=g.clamp(c,8*(15-b));l=sjcl.mode.ccm.q(a,l,c,k,e,b);a=sjcl.mode.ccm.M(a,l.data,c,d,e,b);g.equal(l.tag,a)||q(new sjcl.exception.corrupt("ccm: tag doesn't match"));
+return l.data},ea:function(a,b,c,d,e,g){var f=[],h=sjcl.bitArray,l=h.g;d=[h.partial(8,(b.length?64:0)|d-2<<2|g-1)];d=h.concat(d,c);d[3]|=e;d=a.encrypt(d);if(b.length){c=h.bitLength(b)/8;65279>=c?f=[h.partial(16,c)]:0xffffffff>=c&&(f=h.concat([h.partial(16,65534)],[c]));f=h.concat(f,b);for(b=0;b<f.length;b+=4)d=a.encrypt(l(d,f.slice(b,b+4).concat([0,0,0])))}return d},M:function(a,b,c,d,e,g){var f=sjcl.bitArray,h=f.g;e/=8;(e%2||4>e||16<e)&&q(new sjcl.exception.invalid("ccm: invalid tag length"));(0xffffffff<
+d.length||0xffffffff<b.length)&&q(new sjcl.exception.bug("ccm: can't deal with 4GiB or more data"));c=sjcl.mode.ccm.ea(a,d,c,e,f.bitLength(b)/8,g);for(d=0;d<b.length;d+=4)c=a.encrypt(h(c,b.slice(d,d+4).concat([0,0,0])));return f.clamp(c,8*e)},q:function(a,b,c,d,e,g){var f,h=sjcl.bitArray;f=h.g;var l=b.length,k=h.bitLength(b),m=l/50,n=m;c=h.concat([h.partial(8,g-1)],c).concat([0,0,0]).slice(0,4);d=h.bitSlice(f(d,a.encrypt(c)),0,e);if(!l)return{tag:d,data:[]};for(f=0;f<l;f+=4)f>m&&(sjcl.mode.ccm.X(f/
+l),m+=n),c[3]++,e=a.encrypt(c),b[f]^=e[0],b[f+1]^=e[1],b[f+2]^=e[2],b[f+3]^=e[3];return{tag:d,data:h.clamp(b,k)}}};
+sjcl.mode.ocb2={name:"ocb2",encrypt:function(a,b,c,d,e,g){128!==sjcl.bitArray.bitLength(c)&&q(new sjcl.exception.invalid("ocb iv must be 128 bits"));var f,h=sjcl.mode.ocb2.J,l=sjcl.bitArray,k=l.g,m=[0,0,0,0];c=h(a.encrypt(c));var n,p=[];d=d||[];e=e||64;for(f=0;f+4<b.length;f+=4)n=b.slice(f,f+4),m=k(m,n),p=p.concat(k(c,a.encrypt(k(c,n)))),c=h(c);n=b.slice(f);b=l.bitLength(n);f=a.encrypt(k(c,[0,0,0,b]));n=l.clamp(k(n.concat([0,0,0]),f),b);m=k(m,k(n.concat([0,0,0]),f));m=a.encrypt(k(m,k(c,h(c))));d.length&&
+(m=k(m,g?d:sjcl.mode.ocb2.pmac(a,d)));return p.concat(l.concat(n,l.clamp(m,e)))},decrypt:function(a,b,c,d,e,g){128!==sjcl.bitArray.bitLength(c)&&q(new sjcl.exception.invalid("ocb iv must be 128 bits"));e=e||64;var f=sjcl.mode.ocb2.J,h=sjcl.bitArray,l=h.g,k=[0,0,0,0],m=f(a.encrypt(c)),n,p,t=sjcl.bitArray.bitLength(b)-e,r=[];d=d||[];for(c=0;c+4<t/32;c+=4)n=l(m,a.decrypt(l(m,b.slice(c,c+4)))),k=l(k,n),r=r.concat(n),m=f(m);p=t-32*c;n=a.encrypt(l(m,[0,0,0,p]));n=l(n,h.clamp(b.slice(c),p).concat([0,0,0]));
+k=l(k,n);k=a.encrypt(l(k,l(m,f(m))));d.length&&(k=l(k,g?d:sjcl.mode.ocb2.pmac(a,d)));h.equal(h.clamp(k,e),h.bitSlice(b,t))||q(new sjcl.exception.corrupt("ocb: tag doesn't match"));return r.concat(h.clamp(n,p))},pmac:function(a,b){var c,d=sjcl.mode.ocb2.J,e=sjcl.bitArray,g=e.g,f=[0,0,0,0],h=a.encrypt([0,0,0,0]),h=g(h,d(d(h)));for(c=0;c+4<b.length;c+=4)h=d(h),f=g(f,a.encrypt(g(h,b.slice(c,c+4))));c=b.slice(c);128>e.bitLength(c)&&(h=g(h,d(h)),c=e.concat(c,[-2147483648,0,0,0]));f=g(f,c);return a.encrypt(g(d(g(h,
+d(h))),f))},J:function(a){return[a[0]<<1^a[1]>>>31,a[1]<<1^a[2]>>>31,a[2]<<1^a[3]>>>31,a[3]<<1^135*(a[0]>>>31)]}};
+sjcl.mode.gcm={name:"gcm",encrypt:function(a,b,c,d,e){var g=b.slice(0);b=sjcl.bitArray;d=d||[];a=sjcl.mode.gcm.q(!0,a,g,d,c,e||128);return b.concat(a.data,a.tag)},decrypt:function(a,b,c,d,e){var g=b.slice(0),f=sjcl.bitArray,h=f.bitLength(g);e=e||128;d=d||[];e<=h?(b=f.bitSlice(g,h-e),g=f.bitSlice(g,0,h-e)):(b=g,g=[]);a=sjcl.mode.gcm.q(u,a,g,d,c,e);f.equal(a.tag,b)||q(new sjcl.exception.corrupt("gcm: tag doesn't match"));return a.data},ba:function(a,b){var c,d,e,g,f,h=sjcl.bitArray.g;e=[0,0,0,0];g=
+b.slice(0);for(c=0;128>c;c++){(d=0!==(a[Math.floor(c/32)]&1<<31-c%32))&&(e=h(e,g));f=0!==(g[3]&1);for(d=3;0<d;d--)g[d]=g[d]>>>1|(g[d-1]&1)<<31;g[0]>>>=1;f&&(g[0]^=-0x1f000000)}return e},h:function(a,b,c){var d,e=c.length;b=b.slice(0);for(d=0;d<e;d+=4)b[0]^=0xffffffff&c[d],b[1]^=0xffffffff&c[d+1],b[2]^=0xffffffff&c[d+2],b[3]^=0xffffffff&c[d+3],b=sjcl.mode.gcm.ba(b,a);return b},q:function(a,b,c,d,e,g){var f,h,l,k,m,n,p,t,r=sjcl.bitArray;n=c.length;p=r.bitLength(c);t=r.bitLength(d);h=r.bitLength(e);f=
+b.encrypt([0,0,0,0]);96===h?(e=e.slice(0),e=r.concat(e,[1])):(e=sjcl.mode.gcm.h(f,[0,0,0,0],e),e=sjcl.mode.gcm.h(f,e,[0,0,Math.floor(h/0x100000000),h&0xffffffff]));h=sjcl.mode.gcm.h(f,[0,0,0,0],d);m=e.slice(0);d=h.slice(0);a||(d=sjcl.mode.gcm.h(f,h,c));for(k=0;k<n;k+=4)m[3]++,l=b.encrypt(m),c[k]^=l[0],c[k+1]^=l[1],c[k+2]^=l[2],c[k+3]^=l[3];c=r.clamp(c,p);a&&(d=sjcl.mode.gcm.h(f,h,c));a=[Math.floor(t/0x100000000),t&0xffffffff,Math.floor(p/0x100000000),p&0xffffffff];d=sjcl.mode.gcm.h(f,d,a);l=b.encrypt(e);
+d[0]^=l[0];d[1]^=l[1];d[2]^=l[2];d[3]^=l[3];return{tag:r.bitSlice(d,0,g),data:c}}};sjcl.misc.hmac=function(a,b){this.N=b=b||sjcl.hash.sha256;var c=[[],[]],d,e=b.prototype.blockSize/32;this.n=[new b,new b];a.length>e&&(a=b.hash(a));for(d=0;d<e;d++)c[0][d]=a[d]^909522486,c[1][d]=a[d]^1549556828;this.n[0].update(c[0]);this.n[1].update(c[1]);this.I=new b(this.n[0])};
+sjcl.misc.hmac.prototype.encrypt=sjcl.misc.hmac.prototype.mac=function(a){this.S&&q(new sjcl.exception.invalid("encrypt on already updated hmac called!"));this.update(a);return this.digest(a)};sjcl.misc.hmac.prototype.reset=function(){this.I=new this.N(this.n[0]);this.S=u};sjcl.misc.hmac.prototype.update=function(a){this.S=!0;this.I.update(a)};sjcl.misc.hmac.prototype.digest=function(){var a=this.I.finalize(),a=(new this.N(this.n[1])).update(a).finalize();this.reset();return a};
+sjcl.misc.pbkdf2=function(a,b,c,d,e){c=c||1E3;(0>d||0>c)&&q(sjcl.exception.invalid("invalid params to pbkdf2"));"string"===typeof a&&(a=sjcl.codec.utf8String.toBits(a));"string"===typeof b&&(b=sjcl.codec.utf8String.toBits(b));e=e||sjcl.misc.hmac;a=new e(a);var g,f,h,l,k=[],m=sjcl.bitArray;for(l=1;32*k.length<(d||1);l++){e=g=a.encrypt(m.concat(b,[l]));for(f=1;f<c;f++){g=a.encrypt(g);for(h=0;h<g.length;h++)e[h]^=g[h]}k=k.concat(e)}d&&(k=m.clamp(k,d));return k};
+sjcl.prng=function(a){this.c=[new sjcl.hash.sha256];this.j=[0];this.H=0;this.u={};this.F=0;this.L={};this.Q=this.d=this.k=this.Z=0;this.b=[0,0,0,0,0,0,0,0];this.f=[0,0,0,0];this.C=s;this.D=a;this.r=u;this.B={progress:{},seeded:{}};this.m=this.Y=0;this.w=1;this.A=2;this.U=0x10000;this.K=[0,48,64,96,128,192,0x100,384,512,768,1024];this.V=3E4;this.T=80};
+sjcl.prng.prototype={randomWords:function(a,b){var c=[],d;d=this.isReady(b);var e;d===this.m&&q(new sjcl.exception.notReady("generator isn't seeded"));if(d&this.A){d=!(d&this.w);e=[];var g=0,f;this.Q=e[0]=(new Date).valueOf()+this.V;for(f=0;16>f;f++)e.push(0x100000000*Math.random()|0);for(f=0;f<this.c.length&&!(e=e.concat(this.c[f].finalize()),g+=this.j[f],this.j[f]=0,!d&&this.H&1<<f);f++);this.H>=1<<this.c.length&&(this.c.push(new sjcl.hash.sha256),this.j.push(0));this.d-=g;g>this.k&&(this.k=g);this.H++;
+this.b=sjcl.hash.sha256.hash(this.b.concat(e));this.C=new sjcl.cipher.aes(this.b);for(d=0;4>d&&!(this.f[d]=this.f[d]+1|0,this.f[d]);d++);}for(d=0;d<a;d+=4)0===(d+1)%this.U&&A(this),e=B(this),c.push(e[0],e[1],e[2],e[3]);A(this);return c.slice(0,a)},setDefaultParanoia:function(a,b){0===a&&"Setting paranoia=0 will ruin your security; use it only for testing"!==b&&q("Setting paranoia=0 will ruin your security; use it only for testing");this.D=a},addEntropy:function(a,b,c){c=c||"user";var d,e,g=(new Date).valueOf(),
+f=this.u[c],h=this.isReady(),l=0;d=this.L[c];d===s&&(d=this.L[c]=this.Z++);f===s&&(f=this.u[c]=0);this.u[c]=(this.u[c]+1)%this.c.length;switch(typeof a){case "number":b===s&&(b=1);this.c[f].update([d,this.F++,1,b,g,1,a|0]);break;case "object":c=Object.prototype.toString.call(a);if("[object Uint32Array]"===c){e=[];for(c=0;c<a.length;c++)e.push(a[c]);a=e}else{"[object Array]"!==c&&(l=1);for(c=0;c<a.length&&!l;c++)"number"!==typeof a[c]&&(l=1)}if(!l){if(b===s)for(c=b=0;c<a.length;c++)for(e=a[c];0<e;)b++,
+e>>>=1;this.c[f].update([d,this.F++,2,b,g,a.length].concat(a))}break;case "string":b===s&&(b=a.length);this.c[f].update([d,this.F++,3,b,g,a.length]);this.c[f].update(a);break;default:l=1}l&&q(new sjcl.exception.bug("random: addEntropy only supports number, array of numbers or string"));this.j[f]+=b;this.d+=b;h===this.m&&(this.isReady()!==this.m&&C("seeded",Math.max(this.k,this.d)),C("progress",this.getProgress()))},isReady:function(a){a=this.K[a!==s?a:this.D];return this.k&&this.k>=a?this.j[0]>this.T&&
+(new Date).valueOf()>this.Q?this.A|this.w:this.w:this.d>=a?this.A|this.m:this.m},getProgress:function(a){a=this.K[a?a:this.D];return this.k>=a?1:this.d>a?1:this.d/a},startCollectors:function(){this.r||(this.a={loadTimeCollector:D(this,this.da),mouseCollector:D(this,this.fa),keyboardCollector:D(this,this.ca),accelerometerCollector:D(this,this.W),touchCollector:D(this,this.ha)},window.addEventListener?(window.addEventListener("load",this.a.loadTimeCollector,u),window.addEventListener("mousemove",this.a.mouseCollector,
+u),window.addEventListener("keypress",this.a.keyboardCollector,u),window.addEventListener("devicemotion",this.a.accelerometerCollector,u),window.addEventListener("touchmove",this.a.touchCollector,u)):document.attachEvent?(document.attachEvent("onload",this.a.loadTimeCollector),document.attachEvent("onmousemove",this.a.mouseCollector),document.attachEvent("keypress",this.a.keyboardCollector)):q(new sjcl.exception.bug("can't attach event")),this.r=!0)},stopCollectors:function(){this.r&&(window.removeEventListener?
+(window.removeEventListener("load",this.a.loadTimeCollector,u),window.removeEventListener("mousemove",this.a.mouseCollector,u),window.removeEventListener("keypress",this.a.keyboardCollector,u),window.removeEventListener("devicemotion",this.a.accelerometerCollector,u),window.removeEventListener("touchmove",this.a.touchCollector,u)):document.detachEvent&&(document.detachEvent("onload",this.a.loadTimeCollector),document.detachEvent("onmousemove",this.a.mouseCollector),document.detachEvent("keypress",
+this.a.keyboardCollector)),this.r=u)},addEventListener:function(a,b){this.B[a][this.Y++]=b},removeEventListener:function(a,b){var c,d,e=this.B[a],g=[];for(d in e)e.hasOwnProperty(d)&&e[d]===b&&g.push(d);for(c=0;c<g.length;c++)d=g[c],delete e[d]},ca:function(){E(1)},fa:function(a){var b,c;try{b=a.x||a.clientX||a.offsetX||0,c=a.y||a.clientY||a.offsetY||0}catch(d){c=b=0}0!=b&&0!=c&&sjcl.random.addEntropy([b,c],2,"mouse");E(0)},ha:function(a){a=a.touches[0]||a.changedTouches[0];sjcl.random.addEntropy([a.pageX||
+a.clientX,a.pageY||a.clientY],1,"touch");E(0)},da:function(){E(2)},W:function(a){a=a.accelerationIncludingGravity.x||a.accelerationIncludingGravity.y||a.accelerationIncludingGravity.z;if(window.orientation){var b=window.orientation;"number"===typeof b&&sjcl.random.addEntropy(b,1,"accelerometer")}a&&sjcl.random.addEntropy(a,2,"accelerometer");E(0)}};function C(a,b){var c,d=sjcl.random.B[a],e=[];for(c in d)d.hasOwnProperty(c)&&e.push(d[c]);for(c=0;c<e.length;c++)e[c](b)}
+function E(a){"undefined"!==typeof window&&window.performance&&"function"===typeof window.performance.now?sjcl.random.addEntropy(window.performance.now(),a,"loadtime"):sjcl.random.addEntropy((new Date).valueOf(),a,"loadtime")}function A(a){a.b=B(a).concat(B(a));a.C=new sjcl.cipher.aes(a.b)}function B(a){for(var b=0;4>b&&!(a.f[b]=a.f[b]+1|0,a.f[b]);b++);return a.C.encrypt(a.f)}function D(a,b){return function(){b.apply(a,arguments)}}sjcl.random=new sjcl.prng(6);
+a:try{var F,G,H,I;if(I="undefined"!==typeof module){var J;if(J=module.exports){var K;try{K=require("crypto")}catch(L){K=null}J=(G=K)&&G.randomBytes}I=J}if(I)F=G.randomBytes(128),F=new Uint32Array((new Uint8Array(F)).buffer),sjcl.random.addEntropy(F,1024,"crypto['randomBytes']");else if("undefined"!==typeof window&&"undefined"!==typeof Uint32Array){H=new Uint32Array(32);if(window.crypto&&window.crypto.getRandomValues)window.crypto.getRandomValues(H);else if(window.msCrypto&&window.msCrypto.getRandomValues)window.msCrypto.getRandomValues(H);
+else break a;sjcl.random.addEntropy(H,1024,"crypto['getRandomValues']")}}catch(M){"undefined"!==typeof window&&window.console&&(console.log("There was an error collecting entropy from the browser:"),console.log(M))}
+sjcl.json={defaults:{v:1,iter:1E3,ks:128,ts:64,mode:"ccm",adata:"",cipher:"aes"},aa:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json,g=e.e({iv:sjcl.random.randomWords(4,0)},e.defaults),f;e.e(g,c);c=g.adata;"string"===typeof g.salt&&(g.salt=sjcl.codec.base64.toBits(g.salt));"string"===typeof g.iv&&(g.iv=sjcl.codec.base64.toBits(g.iv));(!sjcl.mode[g.mode]||!sjcl.cipher[g.cipher]||"string"===typeof a&&100>=g.iter||64!==g.ts&&96!==g.ts&&128!==g.ts||128!==g.ks&&192!==g.ks&&0x100!==g.ks||2>g.iv.length||
+4<g.iv.length)&&q(new sjcl.exception.invalid("json encrypt: invalid parameters"));"string"===typeof a?(f=sjcl.misc.cachedPbkdf2(a,g),a=f.key.slice(0,g.ks/32),g.salt=f.salt):sjcl.ecc&&a instanceof sjcl.ecc.elGamal.publicKey&&(f=a.kem(),g.kemtag=f.tag,a=f.key.slice(0,g.ks/32));"string"===typeof b&&(b=sjcl.codec.utf8String.toBits(b));"string"===typeof c&&(g.adata=c=sjcl.codec.utf8String.toBits(c));f=new sjcl.cipher[g.cipher](a);e.e(d,g);d.key=a;g.ct="ccm"===g.mode&&sjcl.arrayBuffer&&sjcl.arrayBuffer.ccm&&
+b instanceof ArrayBuffer?sjcl.arrayBuffer.ccm.encrypt(f,b,g.iv,c,g.ts):sjcl.mode[g.mode].encrypt(f,b,g.iv,c,g.ts);return g},encrypt:function(a,b,c,d){var e=sjcl.json,g=e.aa.apply(e,arguments);return e.encode(g)},$:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json;b=e.e(e.e(e.e({},e.defaults),b),c,!0);var g,f;g=b.adata;"string"===typeof b.salt&&(b.salt=sjcl.codec.base64.toBits(b.salt));"string"===typeof b.iv&&(b.iv=sjcl.codec.base64.toBits(b.iv));(!sjcl.mode[b.mode]||!sjcl.cipher[b.cipher]||"string"===
+typeof a&&100>=b.iter||64!==b.ts&&96!==b.ts&&128!==b.ts||128!==b.ks&&192!==b.ks&&0x100!==b.ks||!b.iv||2>b.iv.length||4<b.iv.length)&&q(new sjcl.exception.invalid("json decrypt: invalid parameters"));"string"===typeof a?(f=sjcl.misc.cachedPbkdf2(a,b),a=f.key.slice(0,b.ks/32),b.salt=f.salt):sjcl.ecc&&a instanceof sjcl.ecc.elGamal.secretKey&&(a=a.unkem(sjcl.codec.base64.toBits(b.kemtag)).slice(0,b.ks/32));"string"===typeof g&&(g=sjcl.codec.utf8String.toBits(g));f=new sjcl.cipher[b.cipher](a);g="ccm"===
+b.mode&&sjcl.arrayBuffer&&sjcl.arrayBuffer.ccm&&b.ct instanceof ArrayBuffer?sjcl.arrayBuffer.ccm.decrypt(f,b.ct,b.iv,b.tag,g,b.ts):sjcl.mode[b.mode].decrypt(f,b.ct,b.iv,g,b.ts);e.e(d,b);d.key=a;return 1===c.raw?g:sjcl.codec.utf8String.fromBits(g)},decrypt:function(a,b,c,d){var e=sjcl.json;return e.$(a,e.decode(b),c,d)},encode:function(a){var b,c="{",d="";for(b in a)if(a.hasOwnProperty(b))switch(b.match(/^[a-z0-9]+$/i)||q(new sjcl.exception.invalid("json encode: invalid property name")),c+=d+'"'+b+
+'":',d=",",typeof a[b]){case "number":case "boolean":c+=a[b];break;case "string":c+='"'+escape(a[b])+'"';break;case "object":c+='"'+sjcl.codec.base64.fromBits(a[b],0)+'"';break;default:q(new sjcl.exception.bug("json encode: unsupported type"))}return c+"}"},decode:function(a){a=a.replace(/\s/g,"");a.match(/^\{.*\}$/)||q(new sjcl.exception.invalid("json decode: this isn't json!"));a=a.replace(/^\{|\}$/g,"").split(/,/);var b={},c,d;for(c=0;c<a.length;c++)(d=a[c].match(/^\s*(?:(["']?)([a-z][a-z0-9]*)\1)\s*:\s*(?:(-?\d+)|"([a-z0-9+\/%*_.@=\-]*)"|(true|false))$/i))||
+q(new sjcl.exception.invalid("json decode: this isn't json!")),null!=d[3]?b[d[2]]=parseInt(d[3],10):null!=d[4]?b[d[2]]=d[2].match(/^(ct|adata|salt|iv)$/)?sjcl.codec.base64.toBits(d[4]):unescape(d[4]):null!=d[5]&&(b[d[2]]="true"===d[5]);return b},e:function(a,b,c){a===s&&(a={});if(b===s)return a;for(var d in b)b.hasOwnProperty(d)&&(c&&(a[d]!==s&&a[d]!==b[d])&&q(new sjcl.exception.invalid("required parameter overridden")),a[d]=b[d]);return a},ja:function(a,b){var c={},d;for(d in a)a.hasOwnProperty(d)&&
+a[d]!==b[d]&&(c[d]=a[d]);return c},ia:function(a,b){var c={},d;for(d=0;d<b.length;d++)a[b[d]]!==s&&(c[b[d]]=a[b[d]]);return c}};sjcl.encrypt=sjcl.json.encrypt;sjcl.decrypt=sjcl.json.decrypt;sjcl.misc.ga={};sjcl.misc.cachedPbkdf2=function(a,b){var c=sjcl.misc.ga,d;b=b||{};d=b.iter||1E3;c=c[a]=c[a]||{};d=c[d]=c[d]||{firstSalt:b.salt&&b.salt.length?b.salt.slice(0):sjcl.random.randomWords(2,0)};c=b.salt===s?d.firstSalt:b.salt;d[c]=d[c]||sjcl.misc.pbkdf2(a,c,b.iter);return{key:d[c].slice(0),salt:c.slice(0)}};

lib/Configuration.php

@@ -0,0 +1,247 @@
+<?php
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
+
+namespace PrivateBin;
+
+use PrivateBin\I18n;
+use Exception;
+use PDO;
+
+/**
+ * Configuration
+ *
+ * parses configuration file, ensures default values present
+ */
+class Configuration
+{
+    /**
+     * parsed configuration
+     *
+     * @var array
+     */
+    private $_configuration;
+
+    /**
+     * default configuration
+     *
+     * @var array
+     */
+    private static $_defaults = array(
+        'main' => array(
+            'discussion' => true,
+            'opendiscussion' => false,
+            'password' => true,
+            'fileupload' => false,
+            'burnafterreadingselected' => false,
+            'defaultformatter' => 'plaintext',
+            'syntaxhighlightingtheme' => null,
+            'sizelimit' => 2097152,
+            'template' => 'bootstrap',
+            'notice' => '',
+            'languageselection' => false,
+            'languagedefault' => '',
+            'urlshortener' => '',
+            'icon' => 'identicon',
+            'cspheader' => 'default-src \'none\'; connect-src *; script-src \'self\'; style-src \'self\'; font-src \'self\'; img-src \'self\' data:;',
+            'zerobincompatibility' => false,
+        ),
+        'expire' => array(
+            'default' => '1week',
+            'clone' => true,
+        ),
+        'expire_options' => array(
+            '5min' => 300,
+            '10min' => 600,
+            '1hour' => 3600,
+            '1day' => 86400,
+            '1week' => 604800,
+            '1month' => 2592000,
+            '1year' => 31536000,
+            'never' => 0,
+        ),
+        'formatter_options' => array(
+            'plaintext' => 'Plain Text',
+            'syntaxhighlighting' => 'Source Code',
+            'markdown' => 'Markdown',
+        ),
+        'traffic' => array(
+            'limit' => 10,
+            'header' => null,
+            'dir' => 'data',
+        ),
+        'purge' => array(
+            'limit' => 300,
+            'batchsize' => 10,
+            'dir' => 'data',
+        ),
+        'model' => array(
+            'class' => 'Filesystem',
+        ),
+        'model_options' => array(
+            'dir' => 'data',
+        ),
+    );
+
+    /**
+     * parse configuration file and ensure default configuration values are present
+     *
+     * @throws Exception
+     */
+    public function __construct()
+    {
+        $config     = array();
+        $configFile = PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.ini';
+        if (is_readable($configFile)) {
+            $config = parse_ini_file($configFile, true);
+            foreach (array('main', 'model', 'model_options') as $section) {
+                if (!array_key_exists($section, $config)) {
+                    throw new Exception(I18n::_('PrivateBin requires configuration section [%s] to be present in configuration file.', $section), 2);
+                }
+            }
+        }
+        $opts = '_options';
+        foreach (self::getDefaults() as $section => $values) {
+            // fill missing sections with default values
+            if (!array_key_exists($section, $config) || count($config[$section]) == 0) {
+                $this->_configuration[$section] = $values;
+                if (array_key_exists('dir', $this->_configuration[$section])) {
+                    $this->_configuration[$section]['dir'] = PATH . $this->_configuration[$section]['dir'];
+                }
+                continue;
+            }
+            // provide different defaults for database model
+            elseif (
+                $section == 'model_options' && in_array(
+                    $this->_configuration['model']['class'],
+                    array('Database', 'privatebin_db', 'zerobin_db')
+                )
+            ) {
+                $values = array(
+                    'dsn' => 'sqlite:' . PATH . 'data' . DIRECTORY_SEPARATOR . 'db.sq3',
+                    'tbl' => null,
+                    'usr' => null,
+                    'pwd' => null,
+                    'opt' => array(PDO::ATTR_PERSISTENT => true),
+                );
+            }
+
+            // "*_options" sections don't require all defaults to be set
+            if (
+                $section !== 'model_options' &&
+                ($from = strlen($section) - strlen($opts)) >= 0 &&
+                strpos($section, $opts, $from) !== false
+            ) {
+                if (is_int(current($values))) {
+                    $config[$section] = array_map('intval', $config[$section]);
+                }
+                $this->_configuration[$section] = $config[$section];
+            }
+            // check for missing keys and set defaults if necessary
+            else {
+                foreach ($values as $key => $val) {
+                    if ($key == 'dir') {
+                        $val = PATH . $val;
+                    }
+                    $result = $val;
+                    if (array_key_exists($key, $config[$section])) {
+                        if ($val === null) {
+                            $result = $config[$section][$key];
+                        } elseif (is_bool($val)) {
+                            $val = strtolower($config[$section][$key]);
+                            if (in_array($val, array('true', 'yes', 'on'))) {
+                                $result = true;
+                            } elseif (in_array($val, array('false', 'no', 'off'))) {
+                                $result = false;
+                            } else {
+                                $result = (bool) $config[$section][$key];
+                            }
+                        } elseif (is_int($val)) {
+                            $result = (int) $config[$section][$key];
+                        } elseif (is_string($val) && !empty($config[$section][$key])) {
+                            $result = (string) $config[$section][$key];
+                        }
+                    }
+                    $this->_configuration[$section][$key] = $result;
+                }
+            }
+        }
+
+        // support for old config file format, before the fork was renamed and PSR-4 introduced
+        $this->_configuration['model']['class'] = str_replace(
+            'zerobin_', 'privatebin_',
+            $this->_configuration['model']['class']
+        );
+
+        $this->_configuration['model']['class'] = str_replace(
+            array('privatebin_data', 'privatebin_db'),
+            array('Filesystem', 'Database'),
+            $this->_configuration['model']['class']
+        );
+
+        // ensure a valid expire default key is set
+        if (!array_key_exists($this->_configuration['expire']['default'], $this->_configuration['expire_options'])) {
+            $this->_configuration['expire']['default'] = key($this->_configuration['expire_options']);
+        }
+    }
+
+    /**
+     * get configuration as array
+     *
+     * return array
+     */
+    public function get()
+    {
+        return $this->_configuration;
+    }
+
+    /**
+     * get default configuration as array
+     *
+     * return array
+     */
+    public static function getDefaults()
+    {
+        return self::$_defaults;
+    }
+
+    /**
+     * get a key from the configuration, typically the main section or all keys
+     *
+     * @param string $key
+     * @param string $section defaults to main
+     * @throws Exception
+     * return mixed
+     */
+    public function getKey($key, $section = 'main')
+    {
+        $options = $this->getSection($section);
+        if (!array_key_exists($key, $options)) {
+            throw new Exception(I18n::_('Invalid data.') . " $section / $key", 4);
+        }
+        return $this->_configuration[$section][$key];
+    }
+
+    /**
+     * get a section from the configuration, must exist
+     *
+     * @param string $section
+     * @throws Exception
+     * return mixed
+     */
+    public function getSection($section)
+    {
+        if (!array_key_exists($section, $this->_configuration)) {
+            throw new Exception(I18n::_('PrivateBin requires configuration section [%s] to be present in configuration file.', $section), 3);
+        }
+        return $this->_configuration[$section];
+    }
+}

lib/Data/AbstractData.php

@@ -0,0 +1,185 @@
+<?php
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
+
+namespace PrivateBin\Data;
+
+use stdClass;
+
+/**
+ * AbstractData
+ *
+ * Abstract model for PrivateBin data access, implemented as a singleton.
+ */
+abstract class AbstractData
+{
+    /**
+     * singleton instance
+     *
+     * @access protected
+     * @static
+     * @var AbstractData
+     */
+    protected static $_instance = null;
+
+    /**
+     * enforce singleton, disable constructor
+     *
+     * Instantiate using {@link getInstance()}, privatebin is a singleton object.
+     *
+     * @access protected
+     */
+    protected function __construct()
+    {
+    }
+
+    /**
+     * enforce singleton, disable cloning
+     *
+     * Instantiate using {@link getInstance()}, privatebin is a singleton object.
+     *
+     * @access private
+     */
+    private function __clone()
+    {
+    }
+
+    /**
+     * get instance of singleton
+     *
+     * @access public
+     * @static
+     * @param  array $options
+     * @return privatebin_abstract
+     */
+    public static function getInstance($options)
+    {
+    }
+
+    /**
+     * Create a paste.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @param  array  $paste
+     * @return bool
+     */
+    abstract public function create($pasteid, $paste);
+
+    /**
+     * Read a paste.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @return stdClass|false
+     */
+    abstract public function read($pasteid);
+
+    /**
+     * Delete a paste and its discussion.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @return void
+     */
+    abstract public function delete($pasteid);
+
+    /**
+     * Test if a paste exists.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @return bool
+     */
+    abstract public function exists($pasteid);
+
+    /**
+     * Create a comment in a paste.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @param  string $parentid
+     * @param  string $commentid
+     * @param  array  $comment
+     * @return bool
+     */
+    abstract public function createComment($pasteid, $parentid, $commentid, $comment);
+
+    /**
+     * Read all comments of paste.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @return array
+     */
+    abstract public function readComments($pasteid);
+
+    /**
+     * Test if a comment exists.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @param  string $parentid
+     * @param  string $commentid
+     * @return bool
+     */
+    abstract public function existsComment($pasteid, $parentid, $commentid);
+
+    /**
+     * Returns up to batch size number of paste ids that have expired
+     *
+     * @access protected
+     * @param  int $batchsize
+     * @return array
+     */
+    abstract protected function _getExpiredPastes($batchsize);
+
+    /**
+     * Perform a purge of old pastes, at most the given batchsize is deleted.
+     *
+     * @access public
+     * @param  int $batchsize
+     * @return void
+     */
+    public function purge($batchsize)
+    {
+        if ($batchsize < 1) {
+            return;
+        }
+        $pastes = $this->_getExpiredPastes($batchsize);
+        if (count($pastes)) {
+            foreach ($pastes as $pasteid) {
+                $this->delete($pasteid);
+            }
+        }
+    }
+
+    /**
+     * Get next free slot for comment from postdate.
+     *
+     * @access public
+     * @param  array $comments
+     * @param  int|string $postdate
+     * @return int|string
+     */
+    protected function getOpenSlot(&$comments, $postdate)
+    {
+        if (array_key_exists($postdate, $comments)) {
+            $parts = explode('.', $postdate, 2);
+            if (!array_key_exists(1, $parts)) {
+                $parts[1] = 0;
+            }
+            ++$parts[1];
+            return $this->getOpenSlot($comments, implode('.', $parts));
+        }
+        return $postdate;
+    }
+}

lib/Data/Database.php

@@ -0,0 +1,711 @@
+<?php
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
+
+namespace PrivateBin\Data;
+
+use PrivateBin\PrivateBin;
+use Exception;
+use PDO;
+use PDOException;
+use stdClass;
+
+/**
+ * Database
+ *
+ * Model for database access, implemented as a singleton.
+ */
+class Database extends AbstractData
+{
+    /**
+     * cache for select queries
+     *
+     * @var array
+     */
+    private static $_cache = array();
+
+    /**
+     * instance of database connection
+     *
+     * @access private
+     * @static
+     * @var PDO
+     */
+    private static $_db;
+
+    /**
+     * table prefix
+     *
+     * @access private
+     * @static
+     * @var string
+     */
+    private static $_prefix = '';
+
+    /**
+     * database type
+     *
+     * @access private
+     * @static
+     * @var string
+     */
+    private static $_type = '';
+
+    /**
+     * get instance of singleton
+     *
+     * @access public
+     * @static
+     * @param  array $options
+     * @throws Exception
+     * @return Database
+     */
+    public static function getInstance($options = null)
+    {
+        // if needed initialize the singleton
+        if (!(self::$_instance instanceof self)) {
+            self::$_instance = new self;
+        }
+
+        if (is_array($options)) {
+            // set table prefix if given
+            if (array_key_exists('tbl', $options)) {
+                self::$_prefix = $options['tbl'];
+            }
+
+            // initialize the db connection with new options
+            if (
+                array_key_exists('dsn', $options) &&
+                array_key_exists('usr', $options) &&
+                array_key_exists('pwd', $options) &&
+                array_key_exists('opt', $options)
+            ) {
+                // set default options
+                $options['opt'][PDO::ATTR_ERRMODE]          = PDO::ERRMODE_EXCEPTION;
+                $options['opt'][PDO::ATTR_EMULATE_PREPARES] = false;
+                $options['opt'][PDO::ATTR_PERSISTENT]       = true;
+                $db_tables_exist                            = true;
+
+                // setup type and dabase connection
+                self::$_type = strtolower(
+                    substr($options['dsn'], 0, strpos($options['dsn'], ':'))
+                );
+                $tableQuery = self::_getTableQuery(self::$_type);
+                self::$_db  = new PDO(
+                    $options['dsn'],
+                    $options['usr'],
+                    $options['pwd'],
+                    $options['opt']
+                );
+
+                // check if the database contains the required tables
+                $tables = self::$_db->query($tableQuery)->fetchAll(PDO::FETCH_COLUMN, 0);
+
+                // create paste table if necessary
+                if (!in_array(self::_sanitizeIdentifier('paste'), $tables)) {
+                    self::_createPasteTable();
+                    $db_tables_exist = false;
+                }
+
+                // create comment table if necessary
+                if (!in_array(self::_sanitizeIdentifier('comment'), $tables)) {
+                    self::_createCommentTable();
+                    $db_tables_exist = false;
+                }
+
+                // create config table if necessary
+                $db_version = PrivateBin::VERSION;
+                if (!in_array(self::_sanitizeIdentifier('config'), $tables)) {
+                    self::_createConfigTable();
+                    // if we only needed to create the config table, the DB is older then 0.22
+                    if ($db_tables_exist) {
+                        $db_version = '0.21';
+                    }
+                } else {
+                    $db_version = self::_getConfig('VERSION');
+                }
+
+                // update database structure if necessary
+                if (version_compare($db_version, PrivateBin::VERSION, '<')) {
+                    self::_upgradeDatabase($db_version);
+                }
+            } else {
+                throw new Exception(
+                    'Missing configuration for key dsn, usr, pwd or opt in the section model_options, please check your configuration file', 6
+                );
+            }
+        }
+
+        return self::$_instance;
+    }
+
+    /**
+     * Create a paste.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @param  array  $paste
+     * @return bool
+     */
+    public function create($pasteid, $paste)
+    {
+        if (
+            array_key_exists($pasteid, self::$_cache)
+        ) {
+            if (false !== self::$_cache[$pasteid]) {
+                return false;
+            } else {
+                unset(self::$_cache[$pasteid]);
+            }
+        }
+
+        $opendiscussion = $burnafterreading = false;
+        $attachment     = $attachmentname     = '';
+        $meta           = $paste['meta'];
+        unset($meta['postdate']);
+        $expire_date = 0;
+        if (array_key_exists('expire_date', $paste['meta'])) {
+            $expire_date = (int) $paste['meta']['expire_date'];
+            unset($meta['expire_date']);
+        }
+        if (array_key_exists('opendiscussion', $paste['meta'])) {
+            $opendiscussion = (bool) $paste['meta']['opendiscussion'];
+            unset($meta['opendiscussion']);
+        }
+        if (array_key_exists('burnafterreading', $paste['meta'])) {
+            $burnafterreading = (bool) $paste['meta']['burnafterreading'];
+            unset($meta['burnafterreading']);
+        }
+        if (array_key_exists('attachment', $paste['meta'])) {
+            $attachment = $paste['meta']['attachment'];
+            unset($meta['attachment']);
+        }
+        if (array_key_exists('attachmentname', $paste['meta'])) {
+            $attachmentname = $paste['meta']['attachmentname'];
+            unset($meta['attachmentname']);
+        }
+        return self::_exec(
+            'INSERT INTO ' . self::_sanitizeIdentifier('paste') .
+            ' VALUES(?,?,?,?,?,?,?,?,?)',
+            array(
+                $pasteid,
+                $paste['data'],
+                $paste['meta']['postdate'],
+                $expire_date,
+                (int) $opendiscussion,
+                (int) $burnafterreading,
+                json_encode($meta),
+                $attachment,
+                $attachmentname,
+            )
+        );
+    }
+
+    /**
+     * Read a paste.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @return stdClass|false
+     */
+    public function read($pasteid)
+    {
+        if (
+            !array_key_exists($pasteid, self::$_cache)
+        ) {
+            self::$_cache[$pasteid] = false;
+            $paste                  = self::_select(
+                'SELECT * FROM ' . self::_sanitizeIdentifier('paste') .
+                ' WHERE dataid = ?', array($pasteid), true
+            );
+
+            if (false !== $paste) {
+                // create object
+                self::$_cache[$pasteid]       = new stdClass;
+                self::$_cache[$pasteid]->data = $paste['data'];
+
+                $meta = json_decode($paste['meta']);
+                if (!is_object($meta)) {
+                    $meta = new stdClass;
+                }
+
+                // support older attachments
+                if (property_exists($meta, 'attachment')) {
+                    self::$_cache[$pasteid]->attachment = $meta->attachment;
+                    unset($meta->attachment);
+                    if (property_exists($meta, 'attachmentname')) {
+                        self::$_cache[$pasteid]->attachmentname = $meta->attachmentname;
+                        unset($meta->attachmentname);
+                    }
+                }
+                // support current attachments
+                elseif (array_key_exists('attachment', $paste) && strlen($paste['attachment'])) {
+                    self::$_cache[$pasteid]->attachment = $paste['attachment'];
+                    if (array_key_exists('attachmentname', $paste) && strlen($paste['attachmentname'])) {
+                        self::$_cache[$pasteid]->attachmentname = $paste['attachmentname'];
+                    }
+                }
+                self::$_cache[$pasteid]->meta           = $meta;
+                self::$_cache[$pasteid]->meta->postdate = (int) $paste['postdate'];
+                $expire_date                            = (int) $paste['expiredate'];
+                if (
+                    $expire_date > 0
+                ) {
+                    self::$_cache[$pasteid]->meta->expire_date = $expire_date;
+                }
+                if (
+                    $paste['opendiscussion']
+                ) {
+                    self::$_cache[$pasteid]->meta->opendiscussion = true;
+                }
+                if (
+                    $paste['burnafterreading']
+                ) {
+                    self::$_cache[$pasteid]->meta->burnafterreading = true;
+                }
+            }
+        }
+
+        return self::$_cache[$pasteid];
+    }
+
+    /**
+     * Delete a paste and its discussion.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @return void
+     */
+    public function delete($pasteid)
+    {
+        self::_exec(
+            'DELETE FROM ' . self::_sanitizeIdentifier('paste') .
+            ' WHERE dataid = ?', array($pasteid)
+        );
+        self::_exec(
+            'DELETE FROM ' . self::_sanitizeIdentifier('comment') .
+            ' WHERE pasteid = ?', array($pasteid)
+        );
+        if (
+            array_key_exists($pasteid, self::$_cache)
+        ) {
+            unset(self::$_cache[$pasteid]);
+        }
+    }
+
+    /**
+     * Test if a paste exists.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @return bool
+     */
+    public function exists($pasteid)
+    {
+        if (
+            !array_key_exists($pasteid, self::$_cache)
+        ) {
+            self::$_cache[$pasteid] = $this->read($pasteid);
+        }
+        return (bool) self::$_cache[$pasteid];
+    }
+
+    /**
+     * Create a comment in a paste.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @param  string $parentid
+     * @param  string $commentid
+     * @param  array  $comment
+     * @return bool
+     */
+    public function createComment($pasteid, $parentid, $commentid, $comment)
+    {
+        foreach (array('nickname', 'vizhash') as $key) {
+            if (!array_key_exists($key, $comment['meta'])) {
+                $comment['meta'][$key] = null;
+            }
+        }
+        return self::_exec(
+            'INSERT INTO ' . self::_sanitizeIdentifier('comment') .
+            ' VALUES(?,?,?,?,?,?,?)',
+            array(
+                $commentid,
+                $pasteid,
+                $parentid,
+                $comment['data'],
+                $comment['meta']['nickname'],
+                $comment['meta']['vizhash'],
+                $comment['meta']['postdate'],
+            )
+        );
+    }
+
+    /**
+     * Read all comments of paste.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @return array
+     */
+    public function readComments($pasteid)
+    {
+        $rows = self::_select(
+            'SELECT * FROM ' . self::_sanitizeIdentifier('comment') .
+            ' WHERE pasteid = ?', array($pasteid)
+        );
+
+        // create comment list
+        $comments = array();
+        if (count($rows)) {
+            foreach ($rows as $row) {
+                $i                            = $this->getOpenSlot($comments, (int) $row['postdate']);
+                $comments[$i]                 = new stdClass;
+                $comments[$i]->id             = $row['dataid'];
+                $comments[$i]->parentid       = $row['parentid'];
+                $comments[$i]->data           = $row['data'];
+                $comments[$i]->meta           = new stdClass;
+                $comments[$i]->meta->postdate = (int) $row['postdate'];
+                if (array_key_exists('nickname', $row) && !empty($row['nickname'])) {
+                    $comments[$i]->meta->nickname = $row['nickname'];
+                }
+                if (array_key_exists('vizhash', $row) && !empty($row['vizhash'])) {
+                    $comments[$i]->meta->vizhash = $row['vizhash'];
+                }
+            }
+            ksort($comments);
+        }
+        return $comments;
+    }
+
+    /**
+     * Test if a comment exists.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @param  string $parentid
+     * @param  string $commentid
+     * @return bool
+     */
+    public function existsComment($pasteid, $parentid, $commentid)
+    {
+        return (bool) self::_select(
+            'SELECT dataid FROM ' . self::_sanitizeIdentifier('comment') .
+            ' WHERE pasteid = ? AND parentid = ? AND dataid = ?',
+            array($pasteid, $parentid, $commentid), true
+        );
+    }
+
+    /**
+     * Returns up to batch size number of paste ids that have expired
+     *
+     * @access private
+     * @param  int $batchsize
+     * @return array
+     */
+    protected function _getExpiredPastes($batchsize)
+    {
+        $pastes = array();
+        $rows   = self::_select(
+            'SELECT dataid FROM ' . self::_sanitizeIdentifier('paste') .
+            ' WHERE expiredate < ? LIMIT ?', array(time(), $batchsize)
+        );
+        if (count($rows)) {
+            foreach ($rows as $row) {
+                $pastes[] = $row['dataid'];
+            }
+        }
+        return $pastes;
+    }
+
+    /**
+     * execute a statement
+     *
+     * @access private
+     * @static
+     * @param  string $sql
+     * @param  array $params
+     * @throws PDOException
+     * @return bool
+     */
+    private static function _exec($sql, array $params)
+    {
+        $statement = self::$_db->prepare($sql);
+        $result    = $statement->execute($params);
+        $statement->closeCursor();
+        return $result;
+    }
+
+    /**
+     * run a select statement
+     *
+     * @access private
+     * @static
+     * @param  string $sql
+     * @param  array $params
+     * @param  bool $firstOnly if only the first row should be returned
+     * @throws PDOException
+     * @return array
+     */
+    private static function _select($sql, array $params, $firstOnly = false)
+    {
+        $statement = self::$_db->prepare($sql);
+        $statement->execute($params);
+        $result = $firstOnly ?
+            $statement->fetch(PDO::FETCH_ASSOC) :
+            $statement->fetchAll(PDO::FETCH_ASSOC);
+        $statement->closeCursor();
+        return $result;
+    }
+
+    /**
+     * get table list query, depending on the database type
+     *
+     * @access private
+     * @static
+     * @param  string $type
+     * @throws Exception
+     * @return string
+     */
+    private static function _getTableQuery($type)
+    {
+        switch ($type) {
+            case 'ibm':
+                $sql = 'SELECT tabname FROM SYSCAT.TABLES ';
+                break;
+            case 'informix':
+                $sql = 'SELECT tabname FROM systables ';
+                break;
+            case 'mssql':
+                $sql = 'SELECT name FROM sysobjects '
+                     . "WHERE type = 'U' ORDER BY name";
+                break;
+            case 'mysql':
+                $sql = 'SHOW TABLES';
+                break;
+            case 'oci':
+                $sql = 'SELECT table_name FROM all_tables';
+                break;
+            case 'pgsql':
+                $sql = 'SELECT c.relname AS table_name '
+                     . 'FROM pg_class c, pg_user u '
+                     . "WHERE c.relowner = u.usesysid AND c.relkind = 'r' "
+                     . 'AND NOT EXISTS (SELECT 1 FROM pg_views WHERE viewname = c.relname) '
+                     . "AND c.relname !~ '^(pg_|sql_)' "
+                     . 'UNION '
+                     . 'SELECT c.relname AS table_name '
+                     . 'FROM pg_class c '
+                     . "WHERE c.relkind = 'r' "
+                     . 'AND NOT EXISTS (SELECT 1 FROM pg_views WHERE viewname = c.relname) '
+                     . 'AND NOT EXISTS (SELECT 1 FROM pg_user WHERE usesysid = c.relowner) '
+                     . "AND c.relname !~ '^pg_'";
+                break;
+            case 'sqlite':
+                $sql = "SELECT name FROM sqlite_master WHERE type='table' "
+                     . 'UNION ALL SELECT name FROM sqlite_temp_master '
+                     . "WHERE type='table' ORDER BY name";
+                break;
+            default:
+                throw new Exception(
+                    "PDO type $type is currently not supported.", 5
+                );
+        }
+        return $sql;
+    }
+
+    /**
+     * get a value by key from the config table
+     *
+     * @access private
+     * @static
+     * @param  string $key
+     * @throws PDOException
+     * @return string
+     */
+    private static function _getConfig($key)
+    {
+        $row = self::_select(
+            'SELECT value FROM ' . self::_sanitizeIdentifier('config') .
+            ' WHERE id = ?', array($key), true
+        );
+        return $row['value'];
+    }
+
+    /**
+     * get the primary key clauses, depending on the database driver
+     *
+     * @access private
+     * @static
+     * @param string $key
+     * @return array
+     */
+    private static function _getPrimaryKeyClauses($key = 'dataid')
+    {
+        $main_key = $after_key = '';
+        if (self::$_type === 'mysql') {
+            $after_key = ", PRIMARY KEY ($key)";
+        } else {
+            $main_key = ' PRIMARY KEY';
+        }
+        return array($main_key, $after_key);
+    }
+
+    /**
+     * create the paste table
+     *
+     * @access private
+     * @static
+     * @return void
+     */
+    private static function _createPasteTable()
+    {
+        list($main_key, $after_key) = self::_getPrimaryKeyClauses();
+        $dataType                   = self::$_type === 'pgsql' ? 'TEXT' : 'BLOB';
+        self::$_db->exec(
+            'CREATE TABLE ' . self::_sanitizeIdentifier('paste') . ' ( ' .
+            "dataid CHAR(16) NOT NULL$main_key, " .
+            "data $dataType, " .
+            'postdate INT, ' .
+            'expiredate INT, ' .
+            'opendiscussion INT, ' .
+            'burnafterreading INT, ' .
+            'meta TEXT, ' .
+            'attachment ' . (self::$_type === 'pgsql' ? 'TEXT' : 'MEDIUMBLOB') . ', ' .
+            "attachmentname $dataType$after_key );"
+        );
+    }
+
+    /**
+     * create the paste table
+     *
+     * @access private
+     * @static
+     * @return void
+     */
+    private static function _createCommentTable()
+    {
+        list($main_key, $after_key) = self::_getPrimaryKeyClauses();
+        $dataType                   = self::$_type === 'pgsql' ? 'text' : 'BLOB';
+        self::$_db->exec(
+            'CREATE TABLE ' . self::_sanitizeIdentifier('comment') . ' ( ' .
+            "dataid CHAR(16) NOT NULL$main_key, " .
+            'pasteid CHAR(16), ' .
+            'parentid CHAR(16), ' .
+            "data $dataType, " .
+            "nickname $dataType, " .
+            "vizhash $dataType, " .
+            "postdate INT$after_key );"
+        );
+        self::$_db->exec(
+            'CREATE INDEX IF NOT EXISTS comment_parent ON ' .
+            self::_sanitizeIdentifier('comment') . '(pasteid);'
+        );
+    }
+
+    /**
+     * create the paste table
+     *
+     * @access private
+     * @static
+     * @return void
+     */
+    private static function _createConfigTable()
+    {
+        list($main_key, $after_key) = self::_getPrimaryKeyClauses('id');
+        self::$_db->exec(
+            'CREATE TABLE ' . self::_sanitizeIdentifier('config') .
+            " ( id CHAR(16) NOT NULL$main_key, value TEXT$after_key );"
+        );
+        self::_exec(
+            'INSERT INTO ' . self::_sanitizeIdentifier('config') .
+            ' VALUES(?,?)',
+            array('VERSION', PrivateBin::VERSION)
+        );
+    }
+
+    /**
+     * sanitizes identifiers
+     *
+     * @access private
+     * @static
+     * @param  string $identifier
+     * @return string
+     */
+    private static function _sanitizeIdentifier($identifier)
+    {
+        return preg_replace('/[^A-Za-z0-9_]+/', '', self::$_prefix . $identifier);
+    }
+
+    /**
+     * upgrade the database schema from an old version
+     *
+     * @access private
+     * @static
+     * @param  string $oldversion
+     * @return void
+     */
+    private static function _upgradeDatabase($oldversion)
+    {
+        $dataType = self::$_type === 'pgsql' ? 'TEXT' : 'BLOB';
+        switch ($oldversion) {
+            case '0.21':
+                // create the meta column if necessary (pre 0.21 change)
+                try {
+                    self::$_db->exec('SELECT meta FROM ' . self::_sanitizeIdentifier('paste') . ' LIMIT 1;');
+                } catch (PDOException $e) {
+                    self::$_db->exec('ALTER TABLE ' . self::_sanitizeIdentifier('paste') . ' ADD COLUMN meta TEXT;');
+                }
+                // SQLite only allows one ALTER statement at a time...
+                self::$_db->exec(
+                    'ALTER TABLE ' . self::_sanitizeIdentifier('paste') .
+                    ' ADD COLUMN attachment ' .
+                    (self::$_type === 'pgsql' ? 'TEXT' : 'MEDIUMBLOB') . ';'
+                );
+                self::$_db->exec(
+                    'ALTER TABLE ' . self::_sanitizeIdentifier('paste') . " ADD COLUMN attachmentname $dataType;"
+                );
+                // SQLite doesn't support MODIFY, but it allows TEXT of similar
+                // size as BLOB, so there is no need to change it there
+                if (self::$_type !== 'sqlite') {
+                    self::$_db->exec(
+                        'ALTER TABLE ' . self::_sanitizeIdentifier('paste') .
+                        ' ADD PRIMARY KEY (dataid), MODIFY COLUMN data $dataType;'
+                    );
+                    self::$_db->exec(
+                        'ALTER TABLE ' . self::_sanitizeIdentifier('comment') .
+                        " ADD PRIMARY KEY (dataid), MODIFY COLUMN data $dataType, " .
+                        "MODIFY COLUMN nickname $dataType, MODIFY COLUMN vizhash $dataType;"
+                    );
+                } else {
+                    self::$_db->exec(
+                        'CREATE UNIQUE INDEX IF NOT EXISTS paste_dataid ON ' .
+                        self::_sanitizeIdentifier('paste') . '(dataid);'
+                    );
+                    self::$_db->exec(
+                        'CREATE UNIQUE INDEX IF NOT EXISTS comment_dataid ON ' .
+                        self::_sanitizeIdentifier('comment') . '(dataid);'
+                    );
+                }
+                self::$_db->exec(
+                    'CREATE INDEX IF NOT EXISTS comment_parent ON ' .
+                    self::_sanitizeIdentifier('comment') . '(pasteid);'
+                );
+                // no break, continue with updates for 0.22
+            case '0.22':
+                self::_exec(
+                    'UPDATE ' . self::_sanitizeIdentifier('config') .
+                    ' SET value = ? WHERE id = ?',
+                    array('1.0', 'VERSION')
+                );
+        }
+    }
+}

lib/Data/Filesystem.php

@@ -0,0 +1,381 @@
+<?php
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
+
+namespace PrivateBin\Data;
+
+use PrivateBin\Model\Paste;
+use PrivateBin\Json;
+
+/**
+ * Filesystem
+ *
+ * Model for filesystem data access, implemented as a singleton.
+ */
+class Filesystem extends AbstractData
+{
+    /**
+     * directory where data is stored
+     *
+     * @access private
+     * @static
+     * @var string
+     */
+    private static $_dir = 'data/';
+
+    /**
+     * get instance of singleton
+     *
+     * @access public
+     * @static
+     * @param  array $options
+     * @return Filesystem
+     */
+    public static function getInstance($options = null)
+    {
+        // if given update the data directory
+        if (
+            is_array($options) &&
+            array_key_exists('dir', $options)
+        ) {
+            self::$_dir = $options['dir'] . DIRECTORY_SEPARATOR;
+        }
+        // if needed initialize the singleton
+        if (!(self::$_instance instanceof self)) {
+            self::$_instance = new self;
+            self::_init();
+        }
+        return self::$_instance;
+    }
+
+    /**
+     * Create a paste.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @param  array  $paste
+     * @throws Exception
+     * @return bool
+     */
+    public function create($pasteid, $paste)
+    {
+        $storagedir = self::_dataid2path($pasteid);
+        if (is_file($storagedir . $pasteid)) {
+            return false;
+        }
+        if (!is_dir($storagedir)) {
+            mkdir($storagedir, 0700, true);
+        }
+        return (bool) file_put_contents($storagedir . $pasteid, Json::encode($paste));
+    }
+
+    /**
+     * Read a paste.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @return stdClass|false
+     */
+    public function read($pasteid)
+    {
+        if (!$this->exists($pasteid)) {
+            return false;
+        }
+        $paste = json_decode(
+            file_get_contents(self::_dataid2path($pasteid) . $pasteid)
+        );
+        if (property_exists($paste->meta, 'attachment')) {
+            $paste->attachment = $paste->meta->attachment;
+            unset($paste->meta->attachment);
+            if (property_exists($paste->meta, 'attachmentname')) {
+                $paste->attachmentname = $paste->meta->attachmentname;
+                unset($paste->meta->attachmentname);
+            }
+        }
+        return $paste;
+    }
+
+    /**
+     * Delete a paste and its discussion.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @return void
+     */
+    public function delete($pasteid)
+    {
+        $pastedir = self::_dataid2path($pasteid);
+        if (is_dir($pastedir)) {
+            // Delete the paste itself.
+            if (is_file($pastedir . $pasteid)) {
+                unlink($pastedir . $pasteid);
+            }
+
+            // Delete discussion if it exists.
+            $discdir = self::_dataid2discussionpath($pasteid);
+            if (is_dir($discdir)) {
+                // Delete all files in discussion directory
+                $dir = dir($discdir);
+                while (false !== ($filename = $dir->read())) {
+                    if (is_file($discdir . $filename)) {
+                        unlink($discdir . $filename);
+                    }
+                }
+                $dir->close();
+                rmdir($discdir);
+            }
+        }
+    }
+
+    /**
+     * Test if a paste exists.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @return bool
+     */
+    public function exists($pasteid)
+    {
+        return is_file(self::_dataid2path($pasteid) . $pasteid);
+    }
+
+    /**
+     * Create a comment in a paste.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @param  string $parentid
+     * @param  string $commentid
+     * @param  array  $comment
+     * @throws Exception
+     * @return bool
+     */
+    public function createComment($pasteid, $parentid, $commentid, $comment)
+    {
+        $storagedir = self::_dataid2discussionpath($pasteid);
+        $filename   = $pasteid . '.' . $commentid . '.' . $parentid;
+        if (is_file($storagedir . $filename)) {
+            return false;
+        }
+        if (!is_dir($storagedir)) {
+            mkdir($storagedir, 0700, true);
+        }
+        return (bool) file_put_contents($storagedir . $filename, Json::encode($comment));
+    }
+
+    /**
+     * Read all comments of paste.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @return array
+     */
+    public function readComments($pasteid)
+    {
+        $comments = array();
+        $discdir  = self::_dataid2discussionpath($pasteid);
+        if (is_dir($discdir)) {
+            // Delete all files in discussion directory
+            $dir = dir($discdir);
+            while (false !== ($filename = $dir->read())) {
+                // Filename is in the form pasteid.commentid.parentid:
+                // - pasteid is the paste this reply belongs to.
+                // - commentid is the comment identifier itself.
+                // - parentid is the comment this comment replies to (It can be pasteid)
+                if (is_file($discdir . $filename)) {
+                    $comment = json_decode(file_get_contents($discdir . $filename));
+                    $items   = explode('.', $filename);
+                    // Add some meta information not contained in file.
+                    $comment->id       = $items[1];
+                    $comment->parentid = $items[2];
+
+                    // Store in array
+                    $key            = $this->getOpenSlot($comments, (int) $comment->meta->postdate);
+                    $comments[$key] = $comment;
+                }
+            }
+            $dir->close();
+
+            // Sort comments by date, oldest first.
+            ksort($comments);
+        }
+        return $comments;
+    }
+
+    /**
+     * Test if a comment exists.
+     *
+     * @access public
+     * @param  string $pasteid
+     * @param  string $parentid
+     * @param  string $commentid
+     * @return bool
+     */
+    public function existsComment($pasteid, $parentid, $commentid)
+    {
+        return is_file(
+            self::_dataid2discussionpath($pasteid) .
+            $pasteid . '.' . $commentid . '.' . $parentid
+        );
+    }
+
+    /**
+     * Returns up to batch size number of paste ids that have expired
+     *
+     * @access private
+     * @param  int $batchsize
+     * @return array
+     */
+    protected function _getExpiredPastes($batchsize)
+    {
+        $pastes     = array();
+        $firstLevel = array_filter(
+            scandir(self::$_dir),
+            'self::_isFirstLevelDir'
+        );
+        if (count($firstLevel) > 0) {
+            // try at most 10 times the $batchsize pastes before giving up
+            for ($i = 0, $max = $batchsize * 10; $i < $max; ++$i) {
+                $firstKey    = array_rand($firstLevel);
+                $secondLevel = array_filter(
+                    scandir(self::$_dir . $firstLevel[$firstKey]),
+                    'self::_isSecondLevelDir'
+                );
+
+                // skip this folder in the next checks if it is empty
+                if (count($secondLevel) == 0) {
+                    unset($firstLevel[$firstKey]);
+                    continue;
+                }
+
+                $secondKey = array_rand($secondLevel);
+                $path      = self::$_dir . $firstLevel[$firstKey] .
+                    DIRECTORY_SEPARATOR . $secondLevel[$secondKey];
+                if (!is_dir($path)) {
+                    continue;
+                }
+                $thirdLevel = array_filter(
+                    scandir($path),
+                    'PrivateBin\\Model\\Paste::isValidId'
+                );
+                if (count($thirdLevel) == 0) {
+                    continue;
+                }
+                $thirdKey = array_rand($thirdLevel);
+                $pasteid  = $thirdLevel[$thirdKey];
+                if (in_array($pasteid, $pastes)) {
+                    continue;
+                }
+
+                if ($this->exists($pasteid)) {
+                    $data = $this->read($pasteid);
+                    if (
+                        property_exists($data->meta, 'expire_date') &&
+                        $data->meta->expire_date < time()
+                    ) {
+                        $pastes[] = $pasteid;
+                        if (count($pastes) >= $batchsize) {
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        return $pastes;
+    }
+
+    /**
+     * initialize privatebin
+     *
+     * @access private
+     * @static
+     * @return void
+     */
+    private static function _init()
+    {
+        // Create storage directory if it does not exist.
+        if (!is_dir(self::$_dir)) {
+            mkdir(self::$_dir, 0700);
+        }
+        // Create .htaccess file if it does not exist.
+        if (!is_file(self::$_dir . '.htaccess')) {
+            file_put_contents(
+                self::$_dir . '.htaccess',
+                'Allow from none' . PHP_EOL .
+                'Deny from all' . PHP_EOL
+            );
+        }
+    }
+
+    /**
+     * Convert paste id to storage path.
+     *
+     * The idea is to creates subdirectories in order to limit the number of files per directory.
+     * (A high number of files in a single directory can slow things down.)
+     * eg. "f468483c313401e8" will be stored in "data/f4/68/f468483c313401e8"
+     * High-trafic websites may want to deepen the directory structure (like Squid does).
+     *
+     * eg. input 'e3570978f9e4aa90' --> output 'data/e3/57/'
+     *
+     * @access private
+     * @static
+     * @param  string $dataid
+     * @return string
+     */
+    private static function _dataid2path($dataid)
+    {
+        return self::$_dir . substr($dataid, 0, 2) . DIRECTORY_SEPARATOR .
+            substr($dataid, 2, 2) . DIRECTORY_SEPARATOR;
+    }
+
+    /**
+     * Convert paste id to discussion storage path.
+     *
+     * eg. input 'e3570978f9e4aa90' --> output 'data/e3/57/e3570978f9e4aa90.discussion/'
+     *
+     * @access private
+     * @static
+     * @param  string $dataid
+     * @return string
+     */
+    private static function _dataid2discussionpath($dataid)
+    {
+        return self::_dataid2path($dataid) . $dataid .
+            '.discussion' . DIRECTORY_SEPARATOR;
+    }
+
+    /**
+     * Check that the given element is a valid first level directory.
+     *
+     * @access private
+     * @static
+     * @param  string $element
+     * @return bool
+     */
+    private static function _isFirstLevelDir($element)
+    {
+        return self::_isSecondLevelDir($element) &&
+            is_dir(self::$_dir . DIRECTORY_SEPARATOR . $element);
+    }
+
+    /**
+     * Check that the given element is a valid second level directory.
+     *
+     * @access private
+     * @static
+     * @param  string $element
+     * @return bool
+     */
+    private static function _isSecondLevelDir($element)
+    {
+        return (bool) preg_match('/^[a-f0-9]{2}$/', $element);
+    }
+}

lib/Filter.php

@@ -1,21 +1,26 @@
 <?php
 /**
- * ZeroBin
+ * PrivateBin
  *
  * a zero-knowledge paste bin
  *
- * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
+ * @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
- * @version   0.21.1
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
  */
 
+namespace PrivateBin;
+
+use PrivateBin\I18n;
+use Exception;
+
 /**
- * filter
+ * Filter
  *
  * Provides data filtering functions.
  */
-class filter
+class Filter
 {
     /**
      * strips slashes deeply
@@ -25,10 +30,10 @@ class filter
      * @param  mixed $value
      * @return mixed
      */
-    public static function stripslashes_deep($value)
+    public static function stripslashesDeep($value)
     {
         return is_array($value) ?
-            array_map('filter::stripslashes_deep', $value) :
+            array_map('self::stripslashesDeep', $value) :
             stripslashes($value);
     }
 
@@ -43,7 +48,7 @@ class filter
      * @throws Exception
      * @return string
      */
-    public static function time_humanreadable($time)
+    public static function formatHumanReadableTime($time)
     {
         if (preg_match('/^(\d+) *(\w+)$/', $time, $matches) !== 1) {
             throw new Exception("Error parsing time format '$time'", 30);
@@ -58,7 +63,7 @@ class filter
             default:
                 $unit = rtrim($matches[2], 's');
         }
-        return i18n::_(array('%d ' . $unit, '%d ' . $unit . 's'), (int) $matches[1]);
+        return I18n::_(array('%d ' . $unit, '%d ' . $unit . 's'), (int) $matches[1]);
     }
 
     /**
@@ -69,28 +74,15 @@ class filter
      * @param  int $size
      * @return string
      */
-    public static function size_humanreadable($size)
+    public static function formatHumanReadableSize($size)
     {
         $iec = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB');
-        $i = 0;
-        while ( ( $size / 1024 ) >= 1 ) {
-                $size = $size / 1024;
-                $i++;
+        $i   = 0;
+        while (($size / 1024) >= 1) {
+            $size = $size / 1024;
+            $i++;
         }
-        return number_format($size, ($i ? 2 : 0), '.', ' ') . ' ' . i18n::_($iec[$i]);
-    }
-
-    /**
-     * validate paste ID
-     *
-     * @access public
-     * @static
-     * @param  string $dataid
-     * @return bool
-     */
-    public static function is_valid_paste_id($dataid)
-    {
-        return (bool) preg_match('#\A[a-f\d]{16}\z#', $dataid);
+        return number_format($size, ($i ? 2 : 0), '.', ' ') . ' ' . I18n::_($iec[$i]);
     }
 
     /**
@@ -103,13 +95,12 @@ class filter
      * @param  string $b
      * @return bool
      */
-    public static function slow_equals($a, $b)
+    public static function slowEquals($a, $b)
     {
         $diff = strlen($a) ^ strlen($b);
-        for($i = 0; $i < strlen($a) && $i < strlen($b); $i++)
-        {
+        for ($i = 0; $i < strlen($a) && $i < strlen($b); $i++) {
             $diff |= ord($a[$i]) ^ ord($b[$i]);
         }
         return $diff === 0;
-     }
+    }
 }

lib/I18n.php

@@ -1,21 +1,23 @@
 <?php
 /**
- * ZeroBin
+ * PrivateBin
  *
  * a zero-knowledge paste bin
  *
- * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
+ * @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
- * @version   0.21.1
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
  */
 
+namespace PrivateBin;
+
 /**
- * i18n
+ * I18n
  *
  * provides internationalization tools like translation, browser language detection, etc.
  */
-class i18n
+class I18n
 {
     /**
      * language
@@ -26,6 +28,15 @@ class i18n
      */
     protected static $_language = 'en';
 
+    /**
+     * language fallback
+     *
+     * @access protected
+     * @static
+     * @var    string
+     */
+    protected static $_languageFallback = 'en';
+
     /**
      * language labels
      *
@@ -73,7 +84,7 @@ class i18n
      */
     public static function _($messageId)
     {
-        return call_user_func_array(array('i18n', 'translate'), func_get_args());
+        return forward_static_call_array('self::translate', func_get_args());
     }
 
     /**
@@ -87,30 +98,31 @@ class i18n
      */
     public static function translate($messageId)
     {
-        if (empty($messageId)) return $messageId;
-        if (count(self::$_translations) === 0) self::loadTranslations();
+        if (empty($messageId)) {
+            return $messageId;
+        }
+        if (count(self::$_translations) === 0) {
+            self::loadTranslations();
+        }
         $messages = $messageId;
-        if (is_array($messageId))
-        {
+        if (is_array($messageId)) {
             $messageId = count($messageId) > 1 ? $messageId[1] : $messageId[0];
         }
-        if (!array_key_exists($messageId, self::$_translations))
-        {
+        if (!array_key_exists($messageId, self::$_translations)) {
             self::$_translations[$messageId] = $messages;
         }
         $args = func_get_args();
-        if (is_array(self::$_translations[$messageId]))
-        {
+        if (is_array(self::$_translations[$messageId])) {
             $number = (int) $args[1];
-            $key = self::_getPluralForm($number);
-            $max = count(self::$_translations[$messageId]) - 1;
-            if ($key > $max) $key = $max;
+            $key    = self::_getPluralForm($number);
+            $max    = count(self::$_translations[$messageId]) - 1;
+            if ($key > $max) {
+                $key = $max;
+            }
 
             $args[0] = self::$_translations[$messageId][$key];
             $args[1] = $number;
-        }
-        else
-        {
+        } else {
             $args[0] = self::$_translations[$messageId];
         }
         return call_user_func_array('sprintf', $args);
@@ -119,7 +131,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
@@ -130,20 +142,18 @@ class i18n
         $availableLanguages = self::getAvailableLanguages();
 
         // check if the lang cookie was set and that language exists
-        if (array_key_exists('lang', $_COOKIE) && in_array($_COOKIE['lang'], $availableLanguages))
-        {
+        if (array_key_exists('lang', $_COOKIE) && in_array($_COOKIE['lang'], $availableLanguages)) {
             $match = $_COOKIE['lang'];
         }
         // find a translation file matching the browsers language preferences
-        else
-        {
+        else {
             $match = self::_getMatchingLanguage(
                 self::getBrowserLanguages(), $availableLanguages
             );
         }
 
         // load translations
-        self::$_language = $match;
+        self::$_language     = $match;
         self::$_translations = ($match == 'en') ? array() : json_decode(
             file_get_contents(self::_getPath($match . '.json')),
             true
@@ -159,13 +169,10 @@ class i18n
      */
     public static function getAvailableLanguages()
     {
-        if (count(self::$_availableLanguages) == 0)
-        {
+        if (count(self::$_availableLanguages) == 0) {
             $i18n = dir(self::_getPath());
-            while (false !== ($file = $i18n->read()))
-            {
-                if (preg_match('/^([a-z]{2}).json$/', $file, $match) === 1)
-                {
+            while (false !== ($file = $i18n->read())) {
+                if (preg_match('/^([a-z]{2}).json$/', $file, $match) === 1) {
                     self::$_availableLanguages[] = $match[1];
                 }
             }
@@ -177,7 +184,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
@@ -186,25 +193,19 @@ class i18n
     public static function getBrowserLanguages()
     {
         $languages = array();
-        if (array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER))
-        {
+        if (array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) {
             $languageRanges = explode(',', trim($_SERVER['HTTP_ACCEPT_LANGUAGE']));
             foreach ($languageRanges as $languageRange) {
                 if (preg_match(
                     '/(\*|[a-zA-Z0-9]{1,8}(?:-[a-zA-Z0-9]{1,8})*)(?:\s*;\s*q\s*=\s*(0(?:\.\d{0,3})|1(?:\.0{0,3})))?/',
                     trim($languageRange), $match
-                ))
-                {
-                    if (!isset($match[2]))
-                    {
+                )) {
+                    if (!isset($match[2])) {
                         $match[2] = '1.0';
-                    }
-                    else
-                    {
+                    } else {
                         $match[2] = (string) floatval($match[2]);
                     }
-                    if (!isset($languages[$match[2]]))
-                    {
+                    if (!isset($languages[$match[2]])) {
                         $languages[$match[2]] = array();
                     }
                     $languages[$match[2]][] = strtolower($match[1]);
@@ -240,14 +241,30 @@ class i18n
     public static function getLanguageLabels($languages = array())
     {
         $file = self::_getPath('languages.json');
-        if (count(self::$_languageLabels) == 0 && is_readable($file))
-        {
+        if (count(self::$_languageLabels) == 0 && is_readable($file)) {
             self::$_languageLabels = json_decode(file_get_contents($file), true);
         }
-        if (count($languages) == 0) return self::$_languageLabels;
+        if (count($languages) == 0) {
+            return self::$_languageLabels;
+        }
         return array_intersect_key(self::$_languageLabels, array_flip($languages));
     }
 
+    /**
+     * set the default language
+     *
+     * @access public
+     * @static
+     * @param  string $lang
+     * @return void
+     */
+    public static function setLanguageFallback($lang)
+    {
+        if (in_array($lang, self::getAvailableLanguages())) {
+            self::$_languageFallback = $lang;
+        }
+    }
+
     /**
      * get language file path
      *
@@ -258,8 +275,7 @@ class i18n
      */
     protected static function _getPath($file = '')
     {
-        if (strlen(self::$_path) == 0)
-        {
+        if (strlen(self::$_path) == 0) {
             self::$_path = PUBLIC_PATH . DIRECTORY_SEPARATOR . 'i18n';
         }
         return self::$_path . (strlen($file) ? DIRECTORY_SEPARATOR . $file : '');
@@ -279,9 +295,10 @@ class i18n
     {
         switch (self::$_language) {
             case 'fr':
+            case 'zh':
                 return ($n > 1 ? 1 : 0);
             case 'pl':
-                return ($n == 1 ? 0 : $n%10 >= 2 && $n %10 <=4 && ($n%100 < 10 || $n%100 >= 20) ? 1 : 2);
+                return ($n == 1 ? 0 : $n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
             // en, de
             default:
                 return ($n != 1 ? 1 : 0);
@@ -291,7 +308,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
@@ -299,47 +316,41 @@ class i18n
      * @param  array $availableLanguages
      * @return string
      */
-    protected static function _getMatchingLanguage($acceptedLanguages, $availableLanguages) {
+    protected static function _getMatchingLanguage($acceptedLanguages, $availableLanguages)
+    {
         $matches = array();
-        $any = false;
+        $any     = false;
         foreach ($acceptedLanguages as $acceptedQuality => $acceptedValues) {
             $acceptedQuality = floatval($acceptedQuality);
-            if ($acceptedQuality === 0.0) continue;
-            foreach ($availableLanguages as $availableValue)
-            {
+            if ($acceptedQuality === 0.0) {
+                continue;
+            }
+            foreach ($availableLanguages as $availableValue) {
                 $availableQuality = 1.0;
-                foreach ($acceptedValues as $acceptedValue)
-                {
-                    if ($acceptedValue === '*')
-                    {
+                foreach ($acceptedValues as $acceptedValue) {
+                    if ($acceptedValue === '*') {
                         $any = true;
                     }
                     $matchingGrade = self::_matchLanguage($acceptedValue, $availableValue);
-                    if ($matchingGrade > 0)
-                    {
+                    if ($matchingGrade > 0) {
                         $q = (string) ($acceptedQuality * $availableQuality * $matchingGrade);
-                        if (!isset($matches[$q]))
-                        {
+                        if (!isset($matches[$q])) {
                             $matches[$q] = array();
                         }
-                        if (!in_array($availableValue, $matches[$q]))
-                        {
+                        if (!in_array($availableValue, $matches[$q])) {
                             $matches[$q][] = $availableValue;
                         }
                     }
                 }
             }
         }
-        if (count($matches) === 0 && $any)
-        {
-            if (count($availableLanguages) > 0)
-            {
+        if (count($matches) === 0 && $any) {
+            if (count($availableLanguages) > 0) {
                 $matches['1.0'] = $availableLanguages;
             }
         }
-        if (count($matches) === 0)
-        {
-            return 'en';
+        if (count($matches) === 0) {
+            return self::$_languageFallback;
         }
         krsort($matches);
         $topmatches = current($matches);
@@ -349,7 +360,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
@@ -357,12 +368,14 @@ class i18n
      * @param  string $b
      * @return float
      */
-    protected static function _matchLanguage($a, $b) {
+    protected static function _matchLanguage($a, $b)
+    {
         $a = explode('-', $a);
         $b = explode('-', $b);
-        for ($i=0, $n=min(count($a), count($b)); $i<$n; $i++)
-        {
-            if ($a[$i] !== $b[$i]) break;
+        for ($i = 0, $n = min(count($a), count($b)); $i < $n; ++$i) {
+            if ($a[$i] !== $b[$i]) {
+                break;
+            }
         }
         return $i === 0 ? 0 : (float) $i / count($a);
     }

lib/Json.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
+
+namespace PrivateBin;
+
+use Exception;
+
+/**
+ * Json
+ *
+ * Provides JSON functions in an object oriented way.
+ */
+class Json
+{
+    /**
+     * Returns a string containing the JSON representation of the given input
+     *
+     * @access public
+     * @static
+     * @param  mixed $input
+     * @throws Exception
+     * @return string
+     */
+    public static function encode($input)
+    {
+        $jsonString = json_encode($input);
+        $errorCode  = json_last_error();
+        if ($errorCode === JSON_ERROR_NONE) {
+            return $jsonString;
+        }
+
+        $message = 'A JSON error occurred';
+        if (function_exists('json_last_error_msg')) {
+            $message .= ': ' . json_last_error_msg();
+        }
+        $message .= ' (' . $errorCode . ')';
+        throw new Exception($message, 90);
+    }
+}

lib/Model.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
+
+namespace PrivateBin;
+
+use PrivateBin\Data;
+use PrivateBin\Model\Paste;
+use PrivateBin\Persistence\PurgeLimiter;
+
+/**
+ * Model
+ *
+ * Factory of PrivateBin instance models.
+ */
+class Model
+{
+    /**
+     * Configuration.
+     *
+     * @var Configuration
+     */
+    private $_conf;
+
+    /**
+     * Data storage.
+     *
+     * @var AbstractData
+     */
+    private $_store = null;
+
+    /**
+     * Factory constructor.
+     *
+     * @param configuration $conf
+     * @return void
+     */
+    public function __construct(Configuration $conf)
+    {
+        $this->_conf = $conf;
+    }
+
+    /**
+     * Get a paste, optionally a specific instance.
+     *
+     * @param string $pasteId
+     * @return Paste
+     */
+    public function getPaste($pasteId = null)
+    {
+        $paste = new Paste($this->_conf, $this->_getStore());
+        if ($pasteId !== null) {
+            $paste->setId($pasteId);
+        }
+        return $paste;
+    }
+
+    /**
+     * Checks if a purge is necessary and triggers it if yes.
+     *
+     * @return void
+     */
+    public function purge()
+    {
+        PurgeLimiter::setConfiguration($this->_conf);
+        if (PurgeLimiter::canPurge()) {
+            $this->_getStore()->purge($this->_conf->getKey('batchsize', 'purge'));
+        }
+    }
+
+    /**
+     * Gets, and creates if neccessary, a store object
+     *
+     * @return AbstractData
+     */
+    private function _getStore()
+    {
+        if ($this->_store === null) {
+            $this->_store = forward_static_call(
+                'PrivateBin\\Data\\' . $this->_conf->getKey('class', 'model') . '::getInstance',
+                $this->_conf->getSection('model_options')
+            );
+        }
+        return $this->_store;
+    }
+}

lib/Model/AbstractModel.php

@@ -0,0 +1,169 @@
+<?php
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
+
+namespace PrivateBin\Model;
+
+use PrivateBin\Configuration;
+use PrivateBin\Data\AbstractData;
+use PrivateBin\Sjcl;
+use Exception;
+use stdClass;
+
+/**
+ * AbstractModel
+ *
+ * Abstract model for PrivateBin objects.
+ */
+abstract class AbstractModel
+{
+    /**
+     * Instance ID.
+     *
+     * @access protected
+     * @var string
+     */
+    protected $_id = '';
+
+    /**
+     * Instance data.
+     *
+     * @access protected
+     * @var stdClass
+     */
+    protected $_data;
+
+    /**
+     * Configuration.
+     *
+     * @access protected
+     * @var Configuration
+     */
+    protected $_conf;
+
+    /**
+     * Data storage.
+     *
+     * @access protected
+     * @var AbstractData
+     */
+    protected $_store;
+
+    /**
+     * Instance constructor.
+     *
+     * @access public
+     * @param  Configuration $configuration
+     * @param  AbstractData $storage
+     * @return void
+     */
+    public function __construct(Configuration $configuration, AbstractData $storage)
+    {
+        $this->_conf       = $configuration;
+        $this->_store      = $storage;
+        $this->_data       = new stdClass;
+        $this->_data->meta = new stdClass;
+    }
+
+    /**
+     * Get ID.
+     *
+     * @access public
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->_id;
+    }
+
+    /**
+     * Set ID.
+     *
+     * @access public
+     * @param string $id
+     * @throws Exception
+     * @return void
+     */
+    public function setId($id)
+    {
+        if (!self::isValidId($id)) {
+            throw new Exception('Invalid paste ID.', 60);
+        }
+        $this->_id = $id;
+    }
+
+    /**
+     * Set data and recalculate ID.
+     *
+     * @access public
+     * @param string $data
+     * @throws Exception
+     * @return void
+     */
+    public function setData($data)
+    {
+        if (!Sjcl::isValid($data)) {
+            throw new Exception('Invalid data.', 61);
+        }
+        $this->_data->data = $data;
+
+        // We just want a small hash to avoid collisions:
+        // Half-MD5 (64 bits) will do the trick
+        $this->setId(substr(hash('md5', $data), 0, 16));
+    }
+
+    /**
+     * Get instance data.
+     *
+     * @access public
+     * @return stdClass
+     */
+    abstract public function get();
+
+    /**
+     * Store the instance's data.
+     *
+     * @access public
+     * @throws Exception
+     * @return void
+     */
+    abstract public function store();
+
+    /**
+     * Delete the current instance.
+     *
+     * @access public
+     * @throws Exception
+     * @return void
+     */
+    abstract public function delete();
+
+    /**
+     * Test if current instance exists in store.
+     *
+     * @access public
+     * @return bool
+     */
+    abstract public function exists();
+
+    /**
+     * Validate ID.
+     *
+     * @access public
+     * @static
+     * @param  string $id
+     * @return bool
+     */
+    public static function isValidId($id)
+    {
+        return (bool) preg_match('#\A[a-f\d]{16}\z#', (string) $id);
+    }
+}

lib/Model/Comment.php

@@ -0,0 +1,218 @@
+<?php
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
+
+namespace PrivateBin\Model;
+
+use PrivateBin\Sjcl;
+use PrivateBin\Persistence\TrafficLimiter;
+use PrivateBin\Vizhash16x16;
+use Identicon\Identicon;
+use Exception;
+
+/**
+ * Comment
+ *
+ * Model of a PrivateBin comment.
+ */
+class Comment extends AbstractModel
+{
+    /**
+     * Instance's parent.
+     *
+     * @access private
+     * @var Paste
+     */
+    private $_paste;
+
+    /**
+     * Get comment data.
+     *
+     * @access public
+     * @throws Exception
+     * @return stdClass
+     */
+    public function get()
+    {
+        // @todo add support to read specific comment
+        $comments = $this->_store->readComments($this->getPaste()->getId());
+        foreach ($comments as $comment) {
+            if (
+                $comment->parentid == $this->getParentId() &&
+                $comment->id == $this->getId()
+            ) {
+                $this->_data = $comment;
+                break;
+            }
+        }
+        return $this->_data;
+    }
+
+    /**
+     * Store the comment's data.
+     *
+     * @access public
+     * @throws Exception
+     * @return void
+     */
+    public function store()
+    {
+        // Make sure paste exists.
+        $pasteid = $this->getPaste()->getId();
+        if (!$this->getPaste()->exists()) {
+            throw new Exception('Invalid data.', 67);
+        }
+
+        // Make sure the discussion is opened in this paste and in configuration.
+        if (!$this->getPaste()->isOpendiscussion() || !$this->_conf->getKey('discussion')) {
+            throw new Exception('Invalid data.', 68);
+        }
+
+        // Check for improbable collision.
+        if ($this->exists()) {
+            throw new Exception('You are unlucky. Try again.', 69);
+        }
+
+        $this->_data->meta->postdate = time();
+
+        // store comment
+        if (
+            $this->_store->createComment(
+                $pasteid,
+                $this->getParentId(),
+                $this->getId(),
+                json_decode(json_encode($this->_data), true)
+            ) === false
+        ) {
+            throw new Exception('Error saving comment. Sorry.', 70);
+        }
+    }
+
+    /**
+     * Delete the comment.
+     *
+     * @access public
+     * @throws Exception
+     * @return void
+     */
+    public function delete()
+    {
+        throw new Exception('To delete a comment, delete its parent paste', 64);
+    }
+
+    /**
+     * Test if comment exists in store.
+     *
+     * @access public
+     * @return bool
+     */
+    public function exists()
+    {
+        return $this->_store->existsComment(
+            $this->getPaste()->getId(),
+            $this->getParentId(),
+            $this->getId()
+        );
+    }
+
+    /**
+     * Set paste.
+     *
+     * @access public
+     * @param Paste $paste
+     * @throws Exception
+     * @return void
+     */
+    public function setPaste(Paste $paste)
+    {
+        $this->_paste               = $paste;
+        $this->_data->meta->pasteid = $paste->getId();
+    }
+
+    /**
+     * Get paste.
+     *
+     * @access public
+     * @return Paste
+     */
+    public function getPaste()
+    {
+        return $this->_paste;
+    }
+
+    /**
+     * Set parent ID.
+     *
+     * @access public
+     * @param string $id
+     * @throws Exception
+     * @return void
+     */
+    public function setParentId($id)
+    {
+        if (!self::isValidId($id)) {
+            throw new Exception('Invalid paste ID.', 65);
+        }
+        $this->_data->meta->parentid = $id;
+    }
+
+    /**
+     * Get parent ID.
+     *
+     * @access public
+     * @return string
+     */
+    public function getParentId()
+    {
+        if (!property_exists($this->_data->meta, 'parentid')) {
+            $this->_data->meta->parentid = '';
+        }
+        return $this->_data->meta->parentid;
+    }
+
+    /**
+     * Set nickname.
+     *
+     * @access public
+     * @param string $nickname
+     * @throws Exception
+     * @return void
+     */
+    public function setNickname($nickname)
+    {
+        if (!Sjcl::isValid($nickname)) {
+            throw new Exception('Invalid data.', 66);
+        }
+        $this->_data->meta->nickname = $nickname;
+
+        // If a nickname is provided, we generate an icon based on a SHA512 HMAC
+        // of the users IP. (We assume that if the user did not enter a nickname,
+        // the user wants to be anonymous and we will not generate an icon.)
+        $icon = $this->_conf->getKey('icon');
+        if ($icon != 'none') {
+            $pngdata = '';
+            $hmac    = TrafficLimiter::getHash();
+            if ($icon == 'identicon') {
+                $identicon = new Identicon();
+                $pngdata   = $identicon->getImageDataUri($hmac, 16);
+            } elseif ($icon == 'vizhash') {
+                $vh      = new Vizhash16x16();
+                $pngdata = 'data:image/png;base64,' . base64_encode(
+                    $vh->generate($hmac)
+                );
+            }
+            if ($pngdata != '') {
+                $this->_data->meta->vizhash = $pngdata;
+            }
+        }
+        // Once the icon is generated, we do not keep the IP address hash.
+    }
+}

lib/Model/Paste.php

@@ -0,0 +1,326 @@
+<?php
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
+
+namespace PrivateBin\Model;
+
+use PrivateBin\PrivateBin;
+use PrivateBin\Persistence\ServerSalt;
+use PrivateBin\Sjcl;
+use Exception;
+
+/**
+ * Paste
+ *
+ * Model of a PrivateBin paste.
+ */
+class Paste extends AbstractModel
+{
+    /**
+     * Get paste data.
+     *
+     * @access public
+     * @throws Exception
+     * @return stdClass
+     */
+    public function get()
+    {
+        $data = $this->_store->read($this->getId());
+        if ($data === false) {
+            throw new Exception(PrivateBin::GENERIC_ERROR, 64);
+        }
+
+        // check if paste has expired and delete it if neccessary.
+        if (property_exists($data->meta, 'expire_date')) {
+            if ($data->meta->expire_date < time()) {
+                $this->delete();
+                throw new Exception(PrivateBin::GENERIC_ERROR, 63);
+            }
+            // We kindly provide the remaining time before expiration (in seconds)
+            $data->meta->remaining_time = $data->meta->expire_date - time();
+        }
+
+        // set formatter for for the view.
+        if (!property_exists($data->meta, 'formatter')) {
+            // support < 0.21 syntax highlighting
+            if (property_exists($data->meta, 'syntaxcoloring') && $data->meta->syntaxcoloring === true) {
+                $data->meta->formatter = 'syntaxhighlighting';
+            } else {
+                $data->meta->formatter = $this->_conf->getKey('defaultformatter');
+            }
+        }
+
+        // support old paste format with server wide salt
+        if (!property_exists($data->meta, 'salt')) {
+            $data->meta->salt = ServerSalt::get();
+        }
+        $data->comments       = array_values($this->getComments());
+        $data->comment_count  = count($data->comments);
+        $data->comment_offset = 0;
+        $data->{'@context'}   = 'js/paste.jsonld';
+        $this->_data          = $data;
+        return $this->_data;
+    }
+
+    /**
+     * Store the paste's data.
+     *
+     * @access public
+     * @throws Exception
+     * @return void
+     */
+    public function store()
+    {
+        // Check for improbable collision.
+        if ($this->exists()) {
+            throw new Exception('You are unlucky. Try again.', 75);
+        }
+
+        $this->_data->meta->postdate = time();
+        $this->_data->meta->salt     = serversalt::generate();
+
+        // store paste
+        if (
+            $this->_store->create(
+                $this->getId(),
+                json_decode(json_encode($this->_data), true)
+            ) === false
+        ) {
+            throw new Exception('Error saving paste. Sorry.', 76);
+        }
+    }
+
+    /**
+     * Delete the paste.
+     *
+     * @access public
+     * @throws Exception
+     * @return void
+     */
+    public function delete()
+    {
+        $this->_store->delete($this->getId());
+    }
+
+    /**
+     * Test if paste exists in store.
+     *
+     * @access public
+     * @return bool
+     */
+    public function exists()
+    {
+        return $this->_store->exists($this->getId());
+    }
+
+    /**
+     * Get a comment, optionally a specific instance.
+     *
+     * @access public
+     * @param string $parentId
+     * @param string $commentId
+     * @throws Exception
+     * @return Comment
+     */
+    public function getComment($parentId, $commentId = null)
+    {
+        if (!$this->exists()) {
+            throw new Exception('Invalid data.', 62);
+        }
+        $comment = new Comment($this->_conf, $this->_store);
+        $comment->setPaste($this);
+        $comment->setParentId($parentId);
+        if ($commentId !== null) {
+            $comment->setId($commentId);
+        }
+        return $comment;
+    }
+
+    /**
+     * Get all comments, if any.
+     *
+     * @access public
+     * @return array
+     */
+    public function getComments()
+    {
+        return $this->_store->readComments($this->getId());
+    }
+
+    /**
+     * Generate the "delete" token.
+     *
+     * The token is the hmac of the pastes ID signed with the server salt.
+     * The paste can be deleted by calling:
+     * http://example.com/privatebin/?pasteid=<pasteid>&deletetoken=<deletetoken>
+     *
+     * @access public
+     * @return string
+     */
+    public function getDeleteToken()
+    {
+        if (!property_exists($this->_data->meta, 'salt')) {
+            $this->get();
+        }
+        return hash_hmac(
+            $this->_conf->getKey('zerobincompatibility') ? 'sha1' : 'sha256',
+            $this->getId(),
+            $this->_data->meta->salt
+        );
+    }
+
+    /**
+     * Set paste's attachment.
+     *
+     * @access public
+     * @param string $attachment
+     * @throws Exception
+     * @return void
+     */
+    public function setAttachment($attachment)
+    {
+        if (!$this->_conf->getKey('fileupload') || !Sjcl::isValid($attachment)) {
+            throw new Exception('Invalid attachment.', 71);
+        }
+        $this->_data->meta->attachment = $attachment;
+    }
+
+    /**
+     * Set paste's attachment name.
+     *
+     * @access public
+     * @param string $attachmentname
+     * @throws Exception
+     * @return void
+     */
+    public function setAttachmentName($attachmentname)
+    {
+        if (!$this->_conf->getKey('fileupload') || !Sjcl::isValid($attachmentname)) {
+            throw new Exception('Invalid attachment.', 72);
+        }
+        $this->_data->meta->attachmentname = $attachmentname;
+    }
+
+    /**
+     * Set paste expiration.
+     *
+     * @access public
+     * @param string $expiration
+     * @return void
+     */
+    public function setExpiration($expiration)
+    {
+        $expire_options = $this->_conf->getSection('expire_options');
+        if (array_key_exists($expiration, $expire_options)) {
+            $expire = $expire_options[$expiration];
+        } else {
+            // using getKey() to ensure a default value is present
+            $expire = $this->_conf->getKey($this->_conf->getKey('default', 'expire'), 'expire_options');
+        }
+        if ($expire > 0) {
+            $this->_data->meta->expire_date = time() + $expire;
+        }
+    }
+
+    /**
+     * Set paste's burn-after-reading type.
+     *
+     * @access public
+     * @param string $burnafterreading
+     * @throws Exception
+     * @return void
+     */
+    public function setBurnafterreading($burnafterreading = '1')
+    {
+        if ($burnafterreading === '0') {
+            $this->_data->meta->burnafterreading = false;
+        } else {
+            if ($burnafterreading !== '1') {
+                throw new Exception('Invalid data.', 73);
+            }
+            $this->_data->meta->burnafterreading = true;
+            $this->_data->meta->opendiscussion   = false;
+        }
+    }
+
+    /**
+     * Set paste's discussion state.
+     *
+     * @access public
+     * @param string $opendiscussion
+     * @throws Exception
+     * @return void
+     */
+    public function setOpendiscussion($opendiscussion = '1')
+    {
+        if (
+            !$this->_conf->getKey('discussion') ||
+            $this->isBurnafterreading() ||
+            $opendiscussion === '0'
+        ) {
+            $this->_data->meta->opendiscussion = false;
+        } else {
+            if ($opendiscussion !== '1') {
+                throw new Exception('Invalid data.', 74);
+            }
+            $this->_data->meta->opendiscussion = true;
+        }
+    }
+
+    /**
+     * Set paste's format.
+     *
+     * @access public
+     * @param string $format
+     * @throws Exception
+     * @return void
+     */
+    public function setFormatter($format)
+    {
+        if (!array_key_exists($format, $this->_conf->getSection('formatter_options'))) {
+            $format = $this->_conf->getKey('defaultformatter');
+        }
+        $this->_data->meta->formatter = $format;
+    }
+
+    /**
+     * Check if paste is of burn-after-reading type.
+     *
+     * @access public
+     * @throws Exception
+     * @return bool
+     */
+    public function isBurnafterreading()
+    {
+        if (!property_exists($this->_data, 'data')) {
+            $this->get();
+        }
+        return property_exists($this->_data->meta, 'burnafterreading') &&
+               $this->_data->meta->burnafterreading === true;
+    }
+
+
+    /**
+     * Check if paste has discussions enabled.
+     *
+     * @access public
+     * @throws Exception
+     * @return bool
+     */
+    public function isOpendiscussion()
+    {
+        if (!property_exists($this->_data, 'data')) {
+            $this->get();
+        }
+        return property_exists($this->_data->meta, 'opendiscussion') &&
+               $this->_data->meta->opendiscussion === true;
+    }
+}

lib/Persistence/AbstractPersistence.php

@@ -1,21 +1,25 @@
 <?php
 /**
- * ZeroBin
+ * PrivateBin
  *
  * a zero-knowledge paste bin
  *
- * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
+ * @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
- * @version   0.21.1
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
  */
 
+namespace PrivateBin\Persistence;
+
+use Exception;
+
 /**
- * persistence
+ * AbstractPersistence
  *
  * persists data in PHP files
  */
-abstract class persistence
+abstract class AbstractPersistence
 {
     /**
      * path in which to persist something
@@ -45,11 +49,11 @@ abstract class persistence
      * @access public
      * @static
      * @param  string $filename
-     * @return void
+     * @return string
      */
     public static function getPath($filename = null)
     {
-        if(strlen($filename)) {
+        if (strlen($filename)) {
             return self::$_path . DIRECTORY_SEPARATOR . $filename;
         } else {
             return self::$_path;
@@ -81,18 +85,19 @@ abstract class persistence
     protected static function _initialize()
     {
         // Create storage directory if it does not exist.
-        if (!is_dir(self::$_path))
-            if (!@mkdir(self::$_path))
+        if (!is_dir(self::$_path)) {
+            if (!@mkdir(self::$_path)) {
                 throw new Exception('unable to create directory ' . self::$_path, 10);
+            }
+        }
 
         // Create .htaccess file if it does not exist.
         $file = self::$_path . DIRECTORY_SEPARATOR . '.htaccess';
-        if (!is_file($file))
-        {
+        if (!is_file($file)) {
             $writtenBytes = @file_put_contents(
                 $file,
                 'Allow from none' . PHP_EOL .
-                'Deny from all'. PHP_EOL,
+                'Deny from all' . PHP_EOL,
                 LOCK_EX
             );
             if ($writtenBytes === false || $writtenBytes < 30) {
@@ -114,11 +119,12 @@ abstract class persistence
     protected static function _store($filename, $data)
     {
         self::_initialize();
-        $file = self::$_path . DIRECTORY_SEPARATOR . $filename;
+        $file         = self::$_path . DIRECTORY_SEPARATOR . $filename;
         $writtenBytes = @file_put_contents($file, $data, LOCK_EX);
         if ($writtenBytes === false || $writtenBytes < strlen($data)) {
             throw new Exception('unable to write to file ' . $file, 13);
         }
+        @chmod($file, 0640); // protect file access
         return $file;
     }
 }

lib/Persistence/PurgeLimiter.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
+
+namespace PrivateBin\Persistence;
+
+use PrivateBin\Configuration;
+
+/**
+ * PurgeLimiter
+ *
+ * Handles purge limiting, so purging is not triggered too frequently.
+ */
+class PurgeLimiter extends AbstractPersistence
+{
+    /**
+     * time limit in seconds, defaults to 300s
+     *
+     * @access private
+     * @static
+     * @var    int
+     */
+    private static $_limit = 300;
+
+    /**
+     * set the time limit in seconds
+     *
+     * @access public
+     * @static
+     * @param  int $limit
+     * @return void
+     */
+    public static function setLimit($limit)
+    {
+        self::$_limit = $limit;
+    }
+
+    /**
+     * set configuration options of the traffic limiter
+     *
+     * @access public
+     * @static
+     * @param Configuration $conf
+     * @return void
+     */
+    public static function setConfiguration(Configuration $conf)
+    {
+        self::setLimit($conf->getKey('limit', 'purge'));
+        self::setPath($conf->getKey('dir', 'purge'));
+    }
+
+    /**
+     * check if the purge can be performed
+     *
+     * @access public
+     * @static
+     * @throws Exception
+     * @return bool
+     */
+    public static function canPurge()
+    {
+        // disable limits if set to less then 1
+        if (self::$_limit < 1) {
+            return true;
+        }
+
+        $file    = 'purge_limiter.php';
+        $now     = time();
+        $content = '<?php' . PHP_EOL . '$GLOBALS[\'purge_limiter\'] = ' . $now . ';' . PHP_EOL;
+        if (!self::_exists($file)) {
+            self::_store($file, $content);
+        }
+
+        $path = self::getPath($file);
+        require $path;
+        $pl = $GLOBALS['purge_limiter'];
+
+        if ($pl + self::$_limit >= $now) {
+            $result = false;
+        } else {
+            $result = true;
+            self::_store($file, $content);
+        }
+        return $result;
+    }
+}

lib/Persistence/ServerSalt.php

@@ -1,27 +1,40 @@
 <?php
 /**
- * ZeroBin
+ * PrivateBin
  *
  * a zero-knowledge paste bin
  *
- * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
+ * @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
- * @version   0.21.1
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
  */
 
+namespace PrivateBin\Persistence;
+
+use Exception;
+
 /**
- * serversalt
+ * ServerSalt
  *
- * This is a random string which is unique to each ZeroBin installation.
+ * This is a random string which is unique to each PrivateBin installation.
  * It is automatically created if not present.
  *
  * Salt is used:
- * - to generate unique VizHash in discussions (which are not reproductible across ZeroBin servers)
- * - to generate unique deletion token (which are not re-usable across ZeroBin servers)
+ * - to generate unique VizHash in discussions (which are not reproductible across PrivateBin servers)
+ * - to generate unique deletion token (which are not re-usable across PrivateBin servers)
  */
-class serversalt extends persistence
+class ServerSalt extends AbstractPersistence
 {
+    /**
+     * file where salt is saved to
+     *
+     * @access private
+     * @static
+     * @var    string
+     */
+    private static $_file = 'salt.php';
+
     /**
      * generated salt
      *
@@ -40,17 +53,7 @@ class serversalt extends persistence
      */
     public static function generate()
     {
-        $randomSalt = '';
-        if (function_exists('mcrypt_create_iv'))
-        {
-            $randomSalt = bin2hex(mcrypt_create_iv(256, MCRYPT_DEV_URANDOM));
-        }
-        else // fallback to mt_rand()
-        {
-            for($i = 0; $i < 256; ++$i) {
-                $randomSalt .= base_convert(mt_rand(), 10, 16);
-            }
-        }
+        $randomSalt = bin2hex(random_bytes(256));
         return $randomSalt;
     }
 
@@ -64,20 +67,23 @@ class serversalt extends persistence
      */
     public static function get()
     {
-        if (strlen(self::$_salt)) return self::$_salt;
+        if (strlen(self::$_salt)) {
+            return self::$_salt;
+        }
 
-        $file = 'salt.php';
-        if (self::_exists($file)) {
-            $items = explode('|', @file_get_contents(self::getPath($file)));
-            if (!is_array($items) || count($items) != 3) {
-                throw new Exception('unable to read file ' . self::getPath($file), 20);
+        if (self::_exists(self::$_file)) {
+            if (is_readable(self::getPath(self::$_file))) {
+                $items = explode('|', file_get_contents(self::getPath(self::$_file)));
+            }
+            if (!isset($items) || !is_array($items) || count($items) != 3) {
+                throw new Exception('unable to read file ' . self::getPath(self::$_file), 20);
             }
             self::$_salt = $items[1];
         } else {
             self::$_salt = self::generate();
             self::_store(
-                $file,
-                '<?php /* |'. self::$_salt . '| */ ?>'
+                self::$_file,
+                '<?php /* |' . self::$_salt . '| */ ?>'
             );
         }
         return self::$_salt;
@@ -93,7 +99,7 @@ class serversalt extends persistence
      */
     public static function setPath($path)
     {
-    	self::$_salt = '';
+        self::$_salt = '';
         parent::setPath($path);
     }
 }

lib/Persistence/TrafficLimiter.php

@@ -0,0 +1,142 @@
+<?php
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
+
+namespace PrivateBin\Persistence;
+
+use PrivateBin\Configuration;
+
+/**
+ * TrafficLimiter
+ *
+ * Handles traffic limiting, so no user does more than one call per 10 seconds.
+ */
+class TrafficLimiter extends AbstractPersistence
+{
+    /**
+     * time limit in seconds, defaults to 10s
+     *
+     * @access private
+     * @static
+     * @var    int
+     */
+    private static $_limit = 10;
+
+    /**
+     * key to fetch IP address
+     *
+     * @access private
+     * @static
+     * @var    string
+     */
+    private static $_ipKey = 'REMOTE_ADDR';
+
+    /**
+     * set the time limit in seconds
+     *
+     * @access public
+     * @static
+     * @param  int $limit
+     * @return void
+     */
+    public static function setLimit($limit)
+    {
+        self::$_limit = $limit;
+    }
+
+    /**
+     * set configuration options of the traffic limiter
+     *
+     * @access public
+     * @static
+     * @param Configuration $conf
+     * @return void
+     */
+    public static function setConfiguration(Configuration $conf)
+    {
+        self::setLimit($conf->getKey('limit', 'traffic'));
+        self::setPath($conf->getKey('dir', 'traffic'));
+        if (($option = $conf->getKey('header', 'traffic')) !== null) {
+            $httpHeader = 'HTTP_' . $option;
+            if (array_key_exists($httpHeader, $_SERVER) && !empty($_SERVER[$httpHeader])) {
+                self::$_ipKey = $httpHeader;
+            }
+        }
+    }
+
+    /**
+     * get a HMAC of the current visitors IP address
+     *
+     * @access public
+     * @static
+     * @param  string $algo
+     * @return string
+     */
+    public static function getHash($algo = 'sha512')
+    {
+        return hash_hmac($algo, $_SERVER[self::$_ipKey], ServerSalt::get());
+    }
+
+    /**
+     * traffic limiter
+     *
+     * Make sure the IP address makes at most 1 request every 10 seconds.
+     *
+     * @access public
+     * @static
+     * @throws Exception
+     * @return bool
+     */
+    public static function canPass()
+    {
+        // disable limits if set to less then 1
+        if (self::$_limit < 1) {
+            return true;
+        }
+
+        $file = 'traffic_limiter.php';
+        if (!self::_exists($file)) {
+            self::_store(
+                $file,
+                '<?php' . PHP_EOL .
+                '$GLOBALS[\'traffic_limiter\'] = array();' . PHP_EOL
+            );
+        }
+
+        $path = self::getPath($file);
+        require $path;
+        $now = time();
+        $tl  = $GLOBALS['traffic_limiter'];
+
+        // purge file of expired hashes to keep it small
+        foreach ($tl as $key => $time) {
+            if ($time + self::$_limit < $now) {
+                unset($tl[$key]);
+            }
+        }
+
+        // this hash is used as an array key, hence a shorter hash is used
+        $hash = self::getHash('sha256');
+        if (array_key_exists($hash, $tl) && ($tl[$hash] + self::$_limit >= $now)) {
+            $result = false;
+        } else {
+            $tl[$hash] = time();
+            $result    = true;
+        }
+        self::_store(
+            $file,
+            '<?php' . PHP_EOL .
+            '$GLOBALS[\'traffic_limiter\'] = ' .
+            var_export($tl, true) . ';' . PHP_EOL
+        );
+        return $result;
+    }
+}

lib/PrivateBin.php

@@ -0,0 +1,505 @@
+<?php
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
+
+namespace PrivateBin;
+
+use PrivateBin\Persistence\TrafficLimiter;
+use Exception;
+
+/**
+ * PrivateBin
+ *
+ * Controller, puts it all together.
+ */
+class PrivateBin
+{
+    /**
+     * version
+     *
+     * @const string
+     */
+    const VERSION = '1.0';
+
+    /**
+     * show the same error message if the paste expired or does not exist
+     *
+     * @const string
+     */
+    const GENERIC_ERROR = 'Paste does not exist, has expired or has been deleted.';
+
+    /**
+     * configuration
+     *
+     * @access private
+     * @var    Configuration
+     */
+    private $_conf;
+
+    /**
+     * data
+     *
+     * @access private
+     * @var    string
+     */
+    private $_data = '';
+
+    /**
+     * does the paste expire
+     *
+     * @access private
+     * @var    bool
+     */
+    private $_doesExpire = false;
+
+    /**
+     * error message
+     *
+     * @access private
+     * @var    string
+     */
+    private $_error = '';
+
+    /**
+     * status message
+     *
+     * @access private
+     * @var    string
+     */
+    private $_status = '';
+
+    /**
+     * JSON message
+     *
+     * @access private
+     * @var    string
+     */
+    private $_json = '';
+
+    /**
+     * Factory of instance models
+     *
+     * @access private
+     * @var    model
+     */
+    private $_model;
+
+    /**
+     * request
+     *
+     * @access private
+     * @var    request
+     */
+    private $_request;
+
+    /**
+     * URL base
+     *
+     * @access private
+     * @var    string
+     */
+    private $_urlBase;
+
+    /**
+     * constructor
+     *
+     * initializes and runs PrivateBin
+     *
+     * @access public
+     * @throws Exception
+     * @return void
+     */
+    public function __construct()
+    {
+        if (version_compare(PHP_VERSION, '5.3.0') < 0) {
+            throw new Exception(I18n::_('PrivateBin requires php 5.3.0 or above to work. Sorry.'), 1);
+        }
+        if (strlen(PATH) < 0 && substr(PATH, -1) !== DIRECTORY_SEPARATOR) {
+            throw new Exception(I18n::_('PrivateBin requires the PATH to end in a "%s". Please update the PATH in your index.php.', DIRECTORY_SEPARATOR), 5);
+        }
+
+        // load config from ini file, initialize required classes
+        $this->_init();
+
+        switch ($this->_request->getOperation()) {
+            case 'create':
+                $this->_create();
+                break;
+            case 'delete':
+                $this->_delete(
+                    $this->_request->getParam('pasteid'),
+                    $this->_request->getParam('deletetoken')
+                );
+                break;
+            case 'read':
+                $this->_read($this->_request->getParam('pasteid'));
+                break;
+            case 'jsonld':
+                $this->_jsonld($this->_request->getParam('jsonld'));
+                return;
+        }
+
+        // output JSON or HTML
+        if ($this->_request->isJsonApiCall()) {
+            header('Content-type: ' . Request::MIME_JSON);
+            header('Access-Control-Allow-Origin: *');
+            header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
+            header('Access-Control-Allow-Headers: X-Requested-With, Content-Type');
+            echo $this->_json;
+        } else {
+            $this->_view();
+        }
+    }
+
+    /**
+     * initialize privatebin
+     *
+     * @access private
+     * @return void
+     */
+    private function _init()
+    {
+        foreach (array('cfg', 'lib') as $dir) {
+            if (!is_file(PATH . $dir . DIRECTORY_SEPARATOR . '.htaccess')) {
+                file_put_contents(
+                PATH . $dir . DIRECTORY_SEPARATOR . '.htaccess',
+                'Allow from none' . PHP_EOL .
+                'Deny from all' . PHP_EOL,
+                LOCK_EX
+            );
+            }
+        }
+
+        $this->_conf    = new Configuration;
+        $this->_model   = new Model($this->_conf);
+        $this->_request = new Request;
+        $this->_urlBase = array_key_exists('REQUEST_URI', $_SERVER) ?
+            htmlspecialchars($_SERVER['REQUEST_URI']) : '/';
+
+        // set default language
+        $lang = $this->_conf->getKey('languagedefault');
+        I18n::setLanguageFallback($lang);
+        // force default language, if language selection is disabled and a default is set
+        if (!$this->_conf->getKey('languageselection') && strlen($lang) == 2) {
+            $_COOKIE['lang'] = $lang;
+            setcookie('lang', $lang);
+        }
+    }
+
+    /**
+     * Store new paste or comment
+     *
+     * POST contains one or both:
+     * data = json encoded SJCL encrypted text (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
+     * attachment = json encoded SJCL encrypted text (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
+     *
+     * All optional data will go to meta information:
+     * expire (optional) = expiration delay (never,5min,10min,1hour,1day,1week,1month,1year,burn) (default:never)
+     * formatter (optional) = format to display the paste as (plaintext,syntaxhighlighting,markdown) (default:syntaxhighlighting)
+     * burnafterreading (optional) = if this paste may only viewed once ? (0/1) (default:0)
+     * opendiscusssion (optional) = is the discussion allowed on this paste ? (0/1) (default:0)
+     * attachmentname = json encoded SJCL encrypted text (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
+     * nickname (optional) = in discussion, encoded SJCL encrypted text nickname of author of comment (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
+     * parentid (optional) = in discussion, which comment this comment replies to.
+     * pasteid (optional) = in discussion, which paste this comment belongs to.
+     *
+     * @access private
+     * @return string
+     */
+    private function _create()
+    {
+        // Ensure last paste from visitors IP address was more than configured amount of seconds ago.
+        TrafficLimiter::setConfiguration($this->_conf);
+        if (!TrafficLimiter::canPass()) {
+            return $this->_return_message(
+            1, I18n::_(
+                'Please wait %d seconds between each post.',
+                $this->_conf->getKey('limit', 'traffic')
+            )
+        );
+        }
+
+        $data           = $this->_request->getParam('data');
+        $attachment     = $this->_request->getParam('attachment');
+        $attachmentname = $this->_request->getParam('attachmentname');
+
+        // Ensure content is not too big.
+        $sizelimit = $this->_conf->getKey('sizelimit');
+        if (
+            strlen($data) + strlen($attachment) + strlen($attachmentname) > $sizelimit
+        ) {
+            return $this->_return_message(
+            1,
+            I18n::_(
+                'Paste is limited to %s of encrypted data.',
+                Filter::formatHumanReadableSize($sizelimit)
+            )
+        );
+        }
+
+        // Ensure attachment did not get lost due to webserver limits or Suhosin
+        if (strlen($attachmentname) > 0 && strlen($attachment) == 0) {
+            return $this->_return_message(1, 'Attachment missing in data received by server. Please check your webserver or suhosin configuration for maximum POST parameter limitations.');
+        }
+
+        // The user posts a comment.
+        $pasteid  = $this->_request->getParam('pasteid');
+        $parentid = $this->_request->getParam('parentid');
+        if (!empty($pasteid) && !empty($parentid)) {
+            $paste = $this->_model->getPaste($pasteid);
+            if ($paste->exists()) {
+                try {
+                    $comment = $paste->getComment($parentid);
+
+                    $nickname = $this->_request->getParam('nickname');
+                    if (!empty($nickname)) {
+                        $comment->setNickname($nickname);
+                    }
+
+                    $comment->setData($data);
+                    $comment->store();
+                } catch (Exception $e) {
+                    return $this->_return_message(1, $e->getMessage());
+                }
+                $this->_return_message(0, $comment->getId());
+            } else {
+                $this->_return_message(1, 'Invalid data.');
+            }
+        }
+        // The user posts a standard paste.
+        else {
+            $this->_model->purge();
+            $paste = $this->_model->getPaste();
+            try {
+                $paste->setData($data);
+
+                if (!empty($attachment)) {
+                    $paste->setAttachment($attachment);
+                    if (!empty($attachmentname)) {
+                        $paste->setAttachmentName($attachmentname);
+                    }
+                }
+
+                $expire = $this->_request->getParam('expire');
+                if (!empty($expire)) {
+                    $paste->setExpiration($expire);
+                }
+
+                $burnafterreading = $this->_request->getParam('burnafterreading');
+                if (!empty($burnafterreading)) {
+                    $paste->setBurnafterreading($burnafterreading);
+                }
+
+                $opendiscussion = $this->_request->getParam('opendiscussion');
+                if (!empty($opendiscussion)) {
+                    $paste->setOpendiscussion($opendiscussion);
+                }
+
+                $formatter = $this->_request->getParam('formatter');
+                if (!empty($formatter)) {
+                    $paste->setFormatter($formatter);
+                }
+
+                $paste->store();
+            } catch (Exception $e) {
+                return $this->_return_message(1, $e->getMessage());
+            }
+            $this->_return_message(0, $paste->getId(), array('deletetoken' => $paste->getDeleteToken()));
+        }
+    }
+
+    /**
+     * Delete an existing paste
+     *
+     * @access private
+     * @param  string $dataid
+     * @param  string $deletetoken
+     * @return void
+     */
+    private function _delete($dataid, $deletetoken)
+    {
+        try {
+            $paste = $this->_model->getPaste($dataid);
+            if ($paste->exists()) {
+                // accessing this property ensures that the paste would be
+                // deleted if it has already expired
+                $burnafterreading = $paste->isBurnafterreading();
+                if ($deletetoken == 'burnafterreading') {
+                    if ($burnafterreading) {
+                        $paste->delete();
+                        $this->_return_message(0, $dataid);
+                    } else {
+                        $this->_return_message(1, 'Paste is not of burn-after-reading type.');
+                    }
+                } else {
+                    // Make sure the token is valid.
+                    if (Filter::slowEquals($deletetoken, $paste->getDeleteToken())) {
+                        // Paste exists and deletion token is valid: Delete the paste.
+                        $paste->delete();
+                        $this->_status = 'Paste was properly deleted.';
+                    } else {
+                        $this->_error = 'Wrong deletion token. Paste was not deleted.';
+                    }
+                }
+            } else {
+                $this->_error = self::GENERIC_ERROR;
+            }
+        } catch (Exception $e) {
+            $this->_error = $e->getMessage();
+        }
+    }
+
+    /**
+     * Read an existing paste or comment
+     *
+     * @access private
+     * @param  string $dataid
+     * @return void
+     */
+    private function _read($dataid)
+    {
+        try {
+            $paste = $this->_model->getPaste($dataid);
+            if ($paste->exists()) {
+                $data              = $paste->get();
+                $this->_doesExpire = property_exists($data, 'meta') && property_exists($data->meta, 'expire_date');
+                if (property_exists($data->meta, 'salt')) {
+                    unset($data->meta->salt);
+                }
+                $this->_data = json_encode($data);
+            } else {
+                $this->_error = self::GENERIC_ERROR;
+            }
+        } catch (Exception $e) {
+            $this->_error = $e->getMessage();
+        }
+
+        if ($this->_request->isJsonApiCall()) {
+            if (strlen($this->_error)) {
+                $this->_return_message(1, $this->_error);
+            } else {
+                $this->_return_message(0, $dataid, json_decode($this->_data, true));
+            }
+        }
+    }
+
+    /**
+     * Display PrivateBin frontend.
+     *
+     * @access private
+     * @return void
+     */
+    private function _view()
+    {
+        // set headers to disable caching
+        $time = gmdate('D, d M Y H:i:s \G\M\T');
+        header('Cache-Control: no-store, no-cache, must-revalidate');
+        header('Pragma: no-cache');
+        header('Expires: ' . $time);
+        header('Last-Modified: ' . $time);
+        header('Vary: Accept');
+        header('Content-Security-Policy: ' . $this->_conf->getKey('cspheader'));
+
+        // label all the expiration options
+        $expire = array();
+        foreach ($this->_conf->getSection('expire_options') as $time => $seconds) {
+            $expire[$time] = ($seconds == 0) ? I18n::_(ucfirst($time)) : Filter::formatHumanReadableTime($time);
+        }
+
+        // translate all the formatter options
+        $formatters = array_map('PrivateBin\\I18n::_', $this->_conf->getSection('formatter_options'));
+
+        // set language cookie if that functionality was enabled
+        $languageselection = '';
+        if ($this->_conf->getKey('languageselection')) {
+            $languageselection = I18n::getLanguage();
+            setcookie('lang', $languageselection);
+        }
+
+        $page = new View;
+        $page->assign('CIPHERDATA', $this->_data);
+        $page->assign('ERROR', I18n::_($this->_error));
+        $page->assign('STATUS', I18n::_($this->_status));
+        $page->assign('VERSION', self::VERSION);
+        $page->assign('DISCUSSION', $this->_conf->getKey('discussion'));
+        $page->assign('OPENDISCUSSION', $this->_conf->getKey('opendiscussion'));
+        $page->assign('MARKDOWN', array_key_exists('markdown', $formatters));
+        $page->assign('SYNTAXHIGHLIGHTING', array_key_exists('syntaxhighlighting', $formatters));
+        $page->assign('SYNTAXHIGHLIGHTINGTHEME', $this->_conf->getKey('syntaxhighlightingtheme'));
+        $page->assign('FORMATTER', $formatters);
+        $page->assign('FORMATTERDEFAULT', $this->_conf->getKey('defaultformatter'));
+        $page->assign('NOTICE', I18n::_($this->_conf->getKey('notice')));
+        $page->assign('BURNAFTERREADINGSELECTED', $this->_conf->getKey('burnafterreadingselected'));
+        $page->assign('PASSWORD', $this->_conf->getKey('password'));
+        $page->assign('FILEUPLOAD', $this->_conf->getKey('fileupload'));
+        $page->assign('ZEROBINCOMPATIBILITY', $this->_conf->getKey('zerobincompatibility'));
+        $page->assign('LANGUAGESELECTION', $languageselection);
+        $page->assign('LANGUAGES', I18n::getLanguageLabels(I18n::getAvailableLanguages()));
+        $page->assign('EXPIRE', $expire);
+        $page->assign('EXPIREDEFAULT', $this->_conf->getKey('default', 'expire'));
+        $page->assign('EXPIRECLONE', !$this->_doesExpire || ($this->_doesExpire && $this->_conf->getKey('clone', 'expire')));
+        $page->assign('URLSHORTENER', $this->_conf->getKey('urlshortener'));
+        $page->draw($this->_conf->getKey('template'));
+    }
+
+    /**
+     * outputs requested JSON-LD context
+     *
+     * @access private
+     * @param string $type
+     * @return void
+     */
+    private function _jsonld($type)
+    {
+        if (
+            $type !== 'paste' && $type !== 'comment' &&
+            $type !== 'pastemeta' && $type !== 'commentmeta'
+        ) {
+            $type = '';
+        }
+        $content = '{}';
+        $file    = PUBLIC_PATH . DIRECTORY_SEPARATOR . 'js' . DIRECTORY_SEPARATOR . $type . '.jsonld';
+        if (is_readable($file)) {
+            $content = str_replace(
+                '?jsonld=',
+                $this->_urlBase . '?jsonld=',
+                file_get_contents($file)
+            );
+        }
+
+        header('Content-type: application/ld+json');
+        header('Access-Control-Allow-Origin: *');
+        header('Access-Control-Allow-Methods: GET');
+        echo $content;
+    }
+
+    /**
+     * prepares JSON encoded status message
+     *
+     * @access private
+     * @param  int $status
+     * @param  string $message
+     * @param  array $other
+     * @return void
+     */
+    private function _return_message($status, $message, $other = array())
+    {
+        $result = array('status' => $status);
+        if ($status) {
+            $result['message'] = I18n::_($message);
+        } else {
+            $result['id']  = $message;
+            $result['url'] = $this->_urlBase . '?' . $message;
+        }
+        $result += $other;
+        $this->_json = json_encode($result);
+    }
+}

lib/Request.php

@@ -0,0 +1,240 @@
+<?php
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
+ */
+
+namespace PrivateBin;
+
+/**
+ * Request
+ *
+ * parses request parameters and provides helper functions for routing
+ */
+class Request
+{
+    /**
+     * MIME type for JSON
+     *
+     * @const string
+     */
+    const MIME_JSON = 'application/json';
+
+    /**
+     * MIME type for HTML
+     *
+     * @const string
+     */
+    const MIME_HTML = 'text/html';
+
+    /**
+     * MIME type for XHTML
+     *
+     * @const string
+     */
+    const MIME_XHTML = 'application/xhtml+xml';
+
+    /**
+     * Input stream to use for PUT parameter parsing.
+     *
+     * @access private
+     * @var string
+     */
+    private static $_inputStream = 'php://input';
+
+    /**
+     * Operation to perform.
+     *
+     * @access private
+     * @var string
+     */
+    private $_operation = 'view';
+
+    /**
+     * Request parameters.
+     *
+     * @access private
+     * @var array
+     */
+    private $_params = array();
+
+    /**
+     * If we are in a JSON API context.
+     *
+     * @access private
+     * @var bool
+     */
+    private $_isJsonApi = false;
+
+    /**
+     * Constructor.
+     *
+     * @access public
+     * @return void
+     */
+    public function __construct()
+    {
+        // in case stupid admin has left magic_quotes enabled in php.ini (for PHP < 5.4)
+        if (version_compare(PHP_VERSION, '5.4.0') < 0 && get_magic_quotes_gpc()) {
+            $_POST   = array_map('PrivateBin\\Filter::stripslashesDeep', $_POST);
+            $_GET    = array_map('PrivateBin\\Filter::stripslashesDeep', $_GET);
+            $_COOKIE = array_map('PrivateBin\\Filter::stripslashesDeep', $_COOKIE);
+        }
+
+        // decide if we are in JSON API or HTML context
+        $this->_isJsonApi = $this->_detectJsonRequest();
+
+        // parse parameters, depending on request type
+        switch (array_key_exists('REQUEST_METHOD', $_SERVER) ? $_SERVER['REQUEST_METHOD'] : 'GET') {
+            case 'DELETE':
+            case 'PUT':
+                parse_str(file_get_contents(self::$_inputStream), $this->_params);
+                break;
+            case 'POST':
+                $this->_params = $_POST;
+                break;
+            default:
+                $this->_params = $_GET;
+        }
+        if (
+            !array_key_exists('pasteid', $this->_params) &&
+            !array_key_exists('jsonld', $this->_params) &&
+            array_key_exists('QUERY_STRING', $_SERVER) &&
+            !empty($_SERVER['QUERY_STRING'])
+        ) {
+            $this->_params['pasteid'] = $_SERVER['QUERY_STRING'];
+        }
+
+        // prepare operation, depending on current parameters
+        if (
+            (array_key_exists('data', $this->_params) && !empty($this->_params['data'])) ||
+            (array_key_exists('attachment', $this->_params) && !empty($this->_params['attachment']))
+        ) {
+            $this->_operation = 'create';
+        } elseif (array_key_exists('pasteid', $this->_params) && !empty($this->_params['pasteid'])) {
+            if (array_key_exists('deletetoken', $this->_params) && !empty($this->_params['deletetoken'])) {
+                $this->_operation = 'delete';
+            } else {
+                $this->_operation = 'read';
+            }
+        } elseif (array_key_exists('jsonld', $this->_params) && !empty($this->_params['jsonld'])) {
+            $this->_operation = 'jsonld';
+        }
+    }
+
+    /**
+     * Get current operation.
+     *
+     * @access public
+     * @return string
+     */
+    public function getOperation()
+    {
+        return $this->_operation;
+    }
+
+    /**
+     * Get a request parameter.
+     *
+     * @access public
+     * @param  string $param
+     * @param  string $default
+     * @return string
+     */
+    public function getParam($param, $default = '')
+    {
+        return array_key_exists($param, $this->_params) ? $this->_params[$param] : $default;
+    }
+
+    /**
+     * If we are in a JSON API context.
+     *
+     * @access public
+     * @return bool
+     */
+    public function isJsonApiCall()
+    {
+        return $this->_isJsonApi;
+    }
+
+    /**
+     * Override the default input stream source, used for unit testing.
+     *
+     * @param string $input
+     */
+    public static function setInputStream($input)
+    {
+        self::$_inputStream = $input;
+    }
+
+    /**
+     * detect the clients supported media type and decide if its a JSON API call or not
+     *
+     * Adapted from: https://stackoverflow.com/questions/3770513/detect-browser-language-in-php#3771447
+     *
+     * @access private
+     * @return bool
+     */
+    private function _detectJsonRequest()
+    {
+        $hasAcceptHeader = array_key_exists('HTTP_ACCEPT', $_SERVER);
+        $acceptHeader    = $hasAcceptHeader ? $_SERVER['HTTP_ACCEPT'] : '';
+
+        // simple cases
+        if (
+            (array_key_exists('HTTP_X_REQUESTED_WITH', $_SERVER) &&
+                $_SERVER['HTTP_X_REQUESTED_WITH'] == 'JSONHttpRequest') ||
+            ($hasAcceptHeader &&
+                strpos($acceptHeader, self::MIME_JSON) !== false &&
+                strpos($acceptHeader, self::MIME_HTML) === false &&
+                strpos($acceptHeader, self::MIME_XHTML) === false)
+        ) {
+            return true;
+        }
+
+        // advanced case: media type negotiation
+        $mediaTypes = array();
+        if ($hasAcceptHeader) {
+            $mediaTypeRanges = explode(',', trim($acceptHeader));
+            foreach ($mediaTypeRanges as $mediaTypeRange) {
+                if (preg_match(
+                    '#(\*/\*|[a-z\-]+/[a-z\-+*]+(?:\s*;\s*[^q]\S*)*)(?:\s*;\s*q\s*=\s*(0(?:\.\d{0,3})|1(?:\.0{0,3})))?#',
+                    trim($mediaTypeRange), $match
+                )) {
+                    if (!isset($match[2])) {
+                        $match[2] = '1.0';
+                    } else {
+                        $match[2] = (string) floatval($match[2]);
+                    }
+                    if (!isset($mediaTypes[$match[2]])) {
+                        $mediaTypes[$match[2]] = array();
+                    }
+                    $mediaTypes[$match[2]][] = strtolower($match[1]);
+                }
+            }
+            krsort($mediaTypes);
+            foreach ($mediaTypes as $acceptedQuality => $acceptedValues) {
+                if ($acceptedQuality === 0.0) {
+                    continue;
+                }
+                foreach ($acceptedValues as $acceptedValue) {
+                    if (
+                        strpos($acceptedValue, self::MIME_HTML) === 0 ||
+                        strpos($acceptedValue, self::MIME_XHTML) === 0
+                    ) {
+                        return false;
+                    } elseif (strpos($acceptedValue, self::MIME_JSON) === 0) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+}

lib/Sjcl.php

@@ -1,21 +1,23 @@
 <?php
 /**
- * ZeroBin
+ * PrivateBin
  *
  * a zero-knowledge paste bin
  *
- * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
+ * @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
- * @version   0.21.1
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.0
  */
 
+namespace PrivateBin;
+
 /**
- * sjcl
+ * Sjcl
  *
  * Provides SJCL validation function.
  */
-class sjcl
+class Sjcl
 {
     /**
      * SJCL validator
@@ -33,39 +35,68 @@ class sjcl
 
         // Make sure content is valid json
         $decoded = json_decode($encoded);
-        if (is_null($decoded)) return false;
+        if (is_null($decoded)) {
+            return false;
+        }
         $decoded = (array) $decoded;
 
         // Make sure no additionnal keys were added.
         if (
             count(array_keys($decoded)) != count($accepted_keys)
-        ) return false;
+        ) {
+            return false;
+        }
 
         // Make sure required fields are present and contain base64 data.
-        foreach($accepted_keys as $k)
-        {
-            if (!array_key_exists($k, $decoded)) return false;
+        foreach ($accepted_keys as $k) {
+            if (!array_key_exists($k, $decoded)) {
+                return false;
+            }
         }
 
         // Make sure some fields are base64 data.
-        if (!base64_decode($decoded['iv'], true)) return false;
-        if (!base64_decode($decoded['salt'], true)) return false;
-        if (!($ct = base64_decode($decoded['ct'], true))) return false;
+        if (!base64_decode($decoded['iv'], true)) {
+            return false;
+        }
+        if (!base64_decode($decoded['salt'], true)) {
+            return false;
+        }
+        if (!($ct = base64_decode($decoded['ct'], true))) {
+            return false;
+        }
 
         // Make sure some fields have a reasonable size.
-        if (strlen($decoded['iv']) > 24) return false;
-        if (strlen($decoded['salt']) > 14) return false;
+        if (strlen($decoded['iv']) > 24) {
+            return false;
+        }
+        if (strlen($decoded['salt']) > 14) {
+            return false;
+        }
 
         // Make sure some fields contain no unsupported values.
-        if (!(is_int($decoded['v']) || is_float($decoded['v'])) || (float) $decoded['v'] < 1) return false;
-        if (!is_int($decoded['iter']) || $decoded['iter'] <= 100) return false;
-        if (!in_array($decoded['ks'], array(128, 192, 256), true)) return false;
-        if (!in_array($decoded['ts'], array(64, 96, 128), true)) return false;
-        if (!in_array($decoded['mode'], array('ccm', 'ocb2', 'gcm'), true)) return false;
-        if ($decoded['cipher'] !== 'aes') return false;
+        if (!(is_int($decoded['v']) || is_float($decoded['v'])) || (float) $decoded['v'] < 1) {
+            return false;
+        }
+        if (!is_int($decoded['iter']) || $decoded['iter'] <= 100) {
+            return false;
+        }
+        if (!in_array($decoded['ks'], array(128, 192, 256), true)) {
+            return false;
+        }
+        if (!in_array($decoded['ts'], array(64, 96, 128), true)) {
+            return false;
+        }
+        if (!in_array($decoded['mode'], array('ccm', 'ocb2', 'gcm'), true)) {
+            return false;
+        }
+        if ($decoded['cipher'] !== 'aes') {
+            return false;
+        }
 
         // Reject data if entropy is too low
-        if (strlen($ct) > strlen(gzdeflate($ct))) return false;
+        if (strlen($ct) > strlen(gzdeflate($ct))) {
+            return false;
+        }
 
         return true;
     }

lib/View.php

@@ -0,0 +1,62 @@
+<?php
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @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
+ * @version   1.0
+ */
+
+namespace PrivateBin;
+
+use Exception;
+
+/**
+ * View
+ *
+ * Displays the templates
+ */
+class View
+{
+    /**
+     * variables available in the template
+     *
+     * @access private
+     * @var    array
+     */
+    private $_variables = array();
+
+    /**
+     * assign variables to be used inside of the template
+     *
+     * @access public
+     * @param  string $name
+     * @param  mixed  $value
+     * @return void
+     */
+    public function assign($name, $value)
+    {
+        $this->_variables[$name] = $value;
+    }
+
+    /**
+     * render a template
+     *
+     * @access public
+     * @param  string $template
+     * @throws Exception
+     * @return void
+     */
+    public function draw($template)
+    {
+        $path = PATH . 'tpl' . DIRECTORY_SEPARATOR . $template . '.php';
+        if (!file_exists($path)) {
+            throw new Exception('Template ' . $template . ' not found!', 80);
+        }
+        extract($this->_variables);
+        include $path;
+    }
+}

lib/Vizhash16x16.php

@@ -0,0 +1,236 @@
+<?php
+/**
+ * VizHash_GD
+ *
+ * Visual Hash implementation in php4+GD,
+ * stripped down and modified version for PrivateBin
+ *
+ * @link      http://sebsauvage.net/wiki/doku.php?id=php:vizhash_gd
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   0.0.5 beta PrivateBin 1.0
+ */
+
+namespace PrivateBin;
+
+/**
+ * Vizhash16x16
+ *
+ * Example:
+ * $vz = new Vizhash16x16();
+ * $data = $vz->generate(sha512('hello'));
+ * header('Content-type: image/png');
+ * echo $data;
+ * exit;
+ */
+
+class Vizhash16x16
+{
+    /**
+     * hash values
+     *
+     * @access private
+     * @var    array
+     */
+    private $VALUES;
+
+    /**
+     * index of current value
+     *
+     * @access private
+     * @var    int
+     */
+    private $VALUES_INDEX;
+
+    /**
+     * image width
+     *
+     * @access private
+     * @var    int
+     */
+    private $width;
+
+    /**
+     * image height
+     *
+     * @access private
+     * @var    int
+     */
+    private $height;
+
+    /**
+     * constructor
+     *
+     * @access public
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->width  = 16;
+        $this->height = 16;
+    }
+
+    /**
+     * Generate a 16x16 png corresponding to $text.
+     *
+     * The given text should to be 128 to 150 characters long
+     *
+     * @access public
+     * @param  string $text
+     * @return string PNG data. Or empty string if GD is not available.
+     */
+    public function generate($text)
+    {
+        if (!function_exists('gd_info')) {
+            return '';
+        }
+
+        $textlen = strlen($text);
+
+        // We convert the hash into an array of integers.
+        $this->VALUES = array();
+        for ($i = 0; $i < $textlen; $i = $i + 2) {
+            array_push($this->VALUES, hexdec(substr($text, $i, 2)));
+        }
+        $this->VALUES_INDEX = 0; // to walk the array.
+
+        // Then use these integers to drive the creation of an image.
+        $image = imagecreatetruecolor($this->width, $this->height);
+
+        $r = $r0 = $this->getInt();
+        $g = $g0 = $this->getInt();
+        $b = $b0 = $this->getInt();
+
+        // First, create an image with a specific gradient background.
+        $op = 'v';
+        if (($this->getInt() % 2) == 0) {
+            $op = 'h';
+        };
+        $image = $this->degrade($image, $op, array($r0, $g0, $b0), array(0, 0, 0));
+
+        for ($i = 0; $i < 7; ++$i) {
+            $action = $this->getInt();
+            $color  = imagecolorallocate($image, $r, $g, $b);
+            $r      = $r0      = ($r0 + $this->getInt() / 25) % 256;
+            $g      = $g0      = ($g0 + $this->getInt() / 25) % 256;
+            $b      = $b0      = ($b0 + $this->getInt() / 25) % 256;
+            $this->drawshape($image, $action, $color);
+        }
+
+        $color = imagecolorallocate($image, $this->getInt(), $this->getInt(), $this->getInt());
+        $this->drawshape($image, $this->getInt(), $color);
+        ob_start();
+        imagepng($image);
+        $imagedata = ob_get_contents();
+        ob_end_clean();
+        imagedestroy($image);
+
+        return $imagedata;
+    }
+
+    /**
+     * Returns a single integer from the $VALUES array (0...255)
+     *
+     * @access private
+     * @return int
+     */
+    private function getInt()
+    {
+        $v = $this->VALUES[$this->VALUES_INDEX];
+        ++$this->VALUES_INDEX;
+        $this->VALUES_INDEX %= count($this->VALUES); // Warp around the array
+        return $v;
+    }
+
+    /**
+     * Returns a single integer from the array (roughly mapped to image width)
+     *
+     * @access private
+     * @return int
+     */
+    private function getX()
+    {
+        return $this->width * $this->getInt() / 256;
+    }
+
+    /**
+     * Returns a single integer from the array (roughly mapped to image height)
+     *
+     * @access private
+     * @return int
+     */
+    private function getY()
+    {
+        return $this->height * $this->getInt() / 256;
+    }
+
+    /**
+     * Gradient function
+     *
+     * taken from:
+     * http://www.supportduweb.com/scripts_tutoriaux-code-source-41-gd-faire-un-degrade-en-php-gd-fonction-degrade-imagerie.html
+     *
+     * @access private
+     * @param  resource $img
+     * @param  string $direction
+     * @param  array $color1
+     * @param  array $color2
+     * @return resource
+     */
+    private function degrade($img, $direction, $color1, $color2)
+    {
+        if ($direction == 'h') {
+            $size    = imagesx($img);
+            $sizeinv = imagesy($img);
+        } else {
+            $size    = imagesy($img);
+            $sizeinv = imagesx($img);
+        }
+        $diffs = array(
+            (($color2[0] - $color1[0]) / $size),
+            (($color2[1] - $color1[1]) / $size),
+            (($color2[2] - $color1[2]) / $size)
+        );
+        for ($i = 0; $i < $size; ++$i) {
+            $r = $color1[0] + ($diffs[0] * $i);
+            $g = $color1[1] + ($diffs[1] * $i);
+            $b = $color1[2] + ($diffs[2] * $i);
+            if ($direction == 'h') {
+                imageline($img, $i, 0, $i, $sizeinv, imagecolorallocate($img, $r, $g, $b));
+            } else {
+                imageline($img, 0, $i, $sizeinv, $i, imagecolorallocate($img, $r, $g, $b));
+            }
+        }
+        return $img;
+    }
+
+    /**
+     * Draw a shape
+     *
+     * @access private
+     * @param  resource $image
+     * @param  int $action
+     * @param  int $color
+     * @return void
+     */
+    private function drawshape($image, $action, $color)
+    {
+        switch ($action % 7) {
+            case 0:
+                ImageFilledRectangle($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(), $color);
+                break;
+            case 1:
+            case 2:
+                ImageFilledEllipse($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(), $color);
+                break;
+            case 3:
+                $points = array($this->getX(), $this->getY(), $this->getX(), $this->getY(), $this->getX(), $this->getY(), $this->getX(), $this->getY());
+                ImageFilledPolygon($image, $points, 4, $color);
+                break;
+            default:
+                $start = $this->getInt() * 360 / 256;
+                $end   = $start + $this->getInt() * 180 / 256;
+                ImageFilledArc($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(), $start, $end, $color, IMG_ARC_PIE);
+        }
+    }
+}

lib/auto.php

@@ -1,38 +0,0 @@
-<?php
-/**
- * ZeroBin
- *
- * a zero-knowledge paste bin
- *
- * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
- * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21.1
- */
-
-spl_autoload_register('auto::loader');
-
-/**
- * auto
- *
- * provides autoloading functionality
- */
-class auto
-{
-    /**
-     * strips slashes deeply
-     *
-     * @access public
-     * @static
-     * @param  mixed $value
-     * @return mixed
-     */
-    public static function loader($class_name)
-    {
-        $filename = PATH . 'lib/' . str_replace('_', '/', $class_name) . '.php';
-        if(is_readable($filename)) {
-            return include $filename;
-        }
-        return false;
-    }
-}

lib/trafficlimiter.php

@@ -1,97 +0,0 @@
-<?php
-/**
- * ZeroBin
- *
- * a zero-knowledge paste bin
- *
- * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
- * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21.1
- */
-
-/**
- * trafficlimiter
- *
- * Handles traffic limiting, so no user does more than one call per 10 seconds.
- */
-class trafficlimiter extends persistence
-{
-    /**
-     * time limit in seconds, defaults to 10s
-     *
-     * @access private
-     * @static
-     * @var    int
-     */
-    private static $_limit = 10;
-
-    /**
-     * set the time limit in seconds
-     *
-     * @access public
-     * @static
-     * @param  int $limit
-     * @return void
-     */
-    public static function setLimit($limit)
-    {
-        self::$_limit = $limit;
-    }
-
-    /**
-     * traffic limiter
-     *
-     * Make sure the IP address makes at most 1 request every 10 seconds.
-     *
-     * @access public
-     * @static
-     * @param  string $ip
-     * @throws Exception
-     * @return bool
-     */
-    public static function canPass($ip)
-    {
-    	// disable limits if set to less then 1
-    	if (self::$_limit < 1) return true;
-
-        $file = 'traffic_limiter.php';
-        if (!self::_exists($file))
-        {
-            self::_store(
-                $file,
-                '<?php' . PHP_EOL .
-                '$GLOBALS[\'traffic_limiter\'] = array();' . PHP_EOL
-            );
-        }
-
-        $path = self::getPath($file);
-        require $path;
-        $now = time();
-        $tl = $GLOBALS['traffic_limiter'];
-
-        // purge file of expired IPs to keep it small
-        foreach($tl as $key => $time)
-        {
-            if ($time + self::$_limit < $now)
-            {
-                unset($tl[$key]);
-            }
-        }
-
-        if (array_key_exists($ip, $tl) && ($tl[$ip] + self::$_limit >= $now))
-        {
-            $result = false;
-        } else {
-            $tl[$ip] = time();
-            $result = true;
-        }
-        self::_store(
-            $file,
-            '<?php' . PHP_EOL .
-            '$GLOBALS[\'traffic_limiter\'] = ' .
-            var_export($tl, true) . ';' . PHP_EOL
-        );
-        return $result;
-    }
-}

lib/vizhash16x16.php

@@ -1,231 +0,0 @@
-<?php
-/**
- * VizHash_GD
- *
- * Visual Hash implementation in php4+GD,
- * stripped down and modified version for ZeroBin
- *
- * @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
- * @version   0.0.4 beta ZeroBin 0.21.1
- */
-
-/**
- * vizhash16x16
- *
- * Example:
- * $vz = new vizhash16x16();
- * $data = $vz->generate('hello');
- * header('Content-type: image/png');
- * echo $data;
- * exit;
- */
-
-class vizhash16x16
-{
-    /**
-     * hash values
-     *
-     * @access private
-     * @var    array
-     */
-    private $VALUES;
-
-    /**
-     * index of current value
-     *
-     * @access private
-     * @var    int
-     */
-    private $VALUES_INDEX;
-
-    /**
-     * image width
-     *
-     * @access private
-     * @var    int
-     */
-    private $width;
-
-    /**
-     * image height
-     *
-     * @access private
-     * @var    int
-     */
-    private $height;
-
-    /**
-     * salt used when generating the image
-     *
-     * @access private
-     * @var    string
-     */
-    private $salt;
-
-    /**
-     * constructor
-     *
-     * @access public
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->width  = 16;
-        $this->height = 16;
-        $this->salt   = serversalt::get();
-    }
-
-    /**
-     * Generate a 16x16 png corresponding to $text.
-     *
-     * @access public
-     * @param  string $text
-     * @return string PNG data. Or empty string if GD is not available.
-     */
-    public function generate($text)
-    {
-        if (!function_exists('gd_info')) return '';
-
-        // We hash the input string.
-        $hash=hash('sha1',$text.$this->salt).hash('md5',$text.$this->salt);
-        $hash=$hash.strrev($hash);  # more data to make graphics
-
-        // We convert the hash into an array of integers.
-        $this->VALUES=array();
-        for($i=0; $i<strlen($hash); $i=$i+2){ array_push($this->VALUES,hexdec(substr($hash,$i,2))); }
-        $this->VALUES_INDEX=0; // to walk the array.
-
-        // Then use these integers to drive the creation of an image.
-        $image = imagecreatetruecolor($this->width,$this->height);
-
-        $r0 = $this->getInt();$r=$r0;
-        $g0 = $this->getInt();$g=$g0;
-        $b0 = $this->getInt();$b=$b0;
-
-        // First, create an image with a specific gradient background.
-        $op='v'; if (($this->getInt()%2)==0) { $op='h'; };
-        $image = $this->degrade($image,$op,array($r0,$g0,$b0),array(0,0,0));
-
-        for($i=0; $i<7; $i=$i+1)
-        {
-            $action=$this->getInt();
-            $color = imagecolorallocate($image, $r,$g,$b);
-            $r = ($r0 + $this->getInt()/25)%256;
-            $g = ($g0 + $this->getInt()/25)%256;
-            $b = ($b0 + $this->getInt()/25)%256;
-            $r0=$r; $g0=$g; $b0=$b;
-            $this->drawshape($image,$action,$color);
-        }
-
-        $color = imagecolorallocate($image,$this->getInt(),$this->getInt(),$this->getInt());
-        $this->drawshape($image,$this->getInt(),$color);
-        ob_start();
-        imagepng($image);
-        $imagedata = ob_get_contents();
-        ob_end_clean();
-        imagedestroy($image);
-
-        return $imagedata;
-    }
-
-    /**
-     * Returns a single integer from the $VALUES array (0...255)
-     *
-     * @access private
-     * @return int
-     */
-    private function getInt()
-    {
-        $v= $this->VALUES[$this->VALUES_INDEX];
-        $this->VALUES_INDEX++;
-        $this->VALUES_INDEX %= count($this->VALUES); // Warp around the array
-        return $v;
-    }
-
-    /**
-     * Returns a single integer from the array (roughly mapped to image width)
-     *
-     * @access private
-     * @return int
-     */
-    private function getX()
-    {
-        return $this->width*$this->getInt()/256;
-    }
-
-    /**
-     * Returns a single integer from the array (roughly mapped to image height)
-     *
-     * @access private
-     * @return int
-     */
-    private function getY()
-    {
-        return $this->height*$this->getInt()/256;
-    }
-
-    /**
-     * Gradient function
-     *
-     * taken from:
-     * http://www.supportduweb.com/scripts_tutoriaux-code-source-41-gd-faire-un-degrade-en-php-gd-fonction-degrade-imagerie.html
-     *
-     * @access private
-     * @param  resource $img
-     * @param  string $direction
-     * @param  array $color1
-     * @param  array $color2
-     * @return resource
-     */
-    private function degrade($img,$direction,$color1,$color2)
-    {
-            if($direction=='h') { $size = imagesx($img); $sizeinv = imagesy($img); }
-            else { $size = imagesy($img); $sizeinv = imagesx($img);}
-            $diffs = array(
-                    (($color2[0]-$color1[0])/$size),
-                    (($color2[1]-$color1[1])/$size),
-                    (($color2[2]-$color1[2])/$size)
-            );
-            for($i=0;$i<$size;$i++)
-            {
-                    $r = $color1[0]+($diffs[0]*$i);
-                    $g = $color1[1]+($diffs[1]*$i);
-                    $b = $color1[2]+($diffs[2]*$i);
-                    if($direction=='h') { imageline($img,$i,0,$i,$sizeinv,imagecolorallocate($img,$r,$g,$b)); }
-                    else { imageline($img,0,$i,$sizeinv,$i,imagecolorallocate($img,$r,$g,$b)); }
-            }
-            return $img;
-    }
-
-    /**
-     * Draw a shape
-     *
-     * @access private
-     * @param  resource $image
-     * @param  int $action
-     * @param  int $color
-     * @return void
-     */
-    private function drawshape($image,$action,$color)
-    {
-        switch($action%7)
-        {
-            case 0:
-                ImageFilledRectangle ($image,$this->getX(),$this->getY(),$this->getX(),$this->getY(),$color);
-                break;
-            case 1:
-            case 2:
-                ImageFilledEllipse ($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(), $color);
-                break;
-            case 3:
-                $points = array($this->getX(), $this->getY(), $this->getX(), $this->getY(), $this->getX(), $this->getY(),$this->getX(), $this->getY());
-                ImageFilledPolygon ($image, $points, 4, $color);
-                break;
-            default:
-                $start=$this->getInt()*360/256; $end=$start+$this->getInt()*180/256;
-                ImageFilledArc ($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(),$start,$end,$color,IMG_ARC_PIE);
-        }
-    }
-}

lib/zerobin.php

@@ -1,696 +0,0 @@
-<?php
-/**
- * ZeroBin
- *
- * a zero-knowledge paste bin
- *
- * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
- * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21.1
- */
-
-/**
- * zerobin
- *
- * Controller, puts it all together.
- */
-class zerobin
-{
-    /**
-     * version
-     *
-     * @const string
-     */
-    const VERSION = '0.21.1';
-
-    /**
-     * show the same error message if the paste expired or does not exist
-     *
-     * @const string
-     */
-    const GENERIC_ERROR = 'Paste does not exist, has expired or has been deleted.';
-
-    /**
-     * configuration array
-     *
-     * @access private
-     * @var    array
-     */
-    private $_conf = array(
-        'model' => 'zerobin_data',
-    );
-
-    /**
-     * data
-     *
-     * @access private
-     * @var    string
-     */
-    private $_data = '';
-
-    /**
-     * formatter
-     *
-     * @access private
-     * @var    string
-     */
-    private $_formatter = 'plaintext';
-
-    /**
-     * error message
-     *
-     * @access private
-     * @var    string
-     */
-    private $_error = '';
-
-    /**
-     * status message
-     *
-     * @access private
-     * @var    string
-     */
-    private $_status = '';
-
-    /**
-     * JSON message
-     *
-     * @access private
-     * @var    string
-     */
-    private $_json = '';
-
-    /**
-     * data storage model
-     *
-     * @access private
-     * @var    zerobin_abstract
-     */
-    private $_model;
-
-    /**
-     * constructor
-     *
-     * initializes and runs ZeroBin
-     *
-     * @access public
-     * @return void
-     */
-    public function __construct()
-    {
-        if (version_compare(PHP_VERSION, '5.2.6') < 0)
-        {
-            throw new Exception(i18n::_('ZeroBin requires php 5.2.6 or above to work. Sorry.'), 1);
-        }
-
-        // in case stupid admin has left magic_quotes enabled in php.ini
-        if (get_magic_quotes_gpc())
-        {
-            $_POST   = array_map('filter::stripslashes_deep', $_POST);
-            $_GET    = array_map('filter::stripslashes_deep', $_GET);
-            $_COOKIE = array_map('filter::stripslashes_deep', $_COOKIE);
-        }
-
-        // load config from ini file
-        $this->_init();
-
-        // create new paste or comment
-        if (
-            (array_key_exists('data', $_POST) && !empty($_POST['data'])) ||
-            (array_key_exists('attachment', $_POST) && !empty($_POST['attachment']))
-        )
-        {
-            $this->_create();
-        }
-        // delete an existing paste
-        elseif (!empty($_GET['deletetoken']) && !empty($_GET['pasteid']))
-        {
-            $this->_delete($_GET['pasteid'], $_GET['deletetoken']);
-        }
-        // display an existing paste
-        elseif (!empty($_SERVER['QUERY_STRING']))
-        {
-            $this->_read($_SERVER['QUERY_STRING']);
-        }
-
-        // output JSON or HTML
-        if (strlen($this->_json))
-        {
-            header('Content-type: application/json');
-            echo $this->_json;
-        }
-        else
-        {
-            $this->_view();
-        }
-    }
-
-    /**
-     * initialize zerobin
-     *
-     * @access private
-     * @return void
-     */
-    private function _init()
-    {
-        foreach (array('cfg', 'lib') as $dir)
-        {
-            if (!is_file(PATH . $dir . DIRECTORY_SEPARATOR . '.htaccess')) file_put_contents(
-                PATH . $dir . DIRECTORY_SEPARATOR . '.htaccess',
-                'Allow from none' . PHP_EOL .
-                'Deny from all'. PHP_EOL,
-                LOCK_EX
-            );
-        }
-
-        $this->_conf = parse_ini_file(PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.ini', true);
-        foreach (array('main', 'model') as $section) {
-            if (!array_key_exists($section, $this->_conf)) {
-                throw new Exception(i18n::_('ZeroBin requires configuration section [%s] to be present in configuration file.', $section), 2);
-            }
-        }
-        $this->_model = $this->_conf['model']['class'];
-    }
-
-    /**
-     * get the model, create one if needed
-     *
-     * @access private
-     * @return zerobin_abstract
-     */
-    private function _model()
-    {
-        // if needed, initialize the model
-        if(is_string($this->_model)) {
-            $this->_model = forward_static_call(
-                array($this->_model, 'getInstance'),
-                $this->_conf['model_options']
-            );
-        }
-        return $this->_model;
-    }
-
-    /**
-     * Store new paste or comment
-     *
-     * POST contains one or both:
-     * data = json encoded SJCL encrypted text (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
-     * attachment = json encoded SJCL encrypted text (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
-     *
-     * All optional data will go to meta information:
-     * expire (optional) = expiration delay (never,5min,10min,1hour,1day,1week,1month,1year,burn) (default:never)
-     * formatter (optional) = format to display the paste as (plaintext,syntaxhighlighting,markdown) (default:syntaxhighlighting)
-     * burnafterreading (optional) = if this paste may only viewed once ? (0/1) (default:0)
-     * opendiscusssion (optional) = is the discussion allowed on this paste ? (0/1) (default:0)
-     * attachmentname = json encoded SJCL encrypted text (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
-     * nickname (optional) = in discussion, encoded SJCL encrypted text nickname of author of comment (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
-     * parentid (optional) = in discussion, which comment this comment replies to.
-     * pasteid (optional) = in discussion, which paste this comment belongs to.
-     *
-     * @access private
-     * @return string
-     */
-    private function _create()
-    {
-        $error = false;
-
-        $has_attachment = array_key_exists('attachment', $_POST);
-        $has_attachmentname = $has_attachment && array_key_exists('attachmentname', $_POST) && !empty($_POST['attachmentname']);
-        $data = array_key_exists('data', $_POST) ? $_POST['data'] : '';
-        $attachment = $has_attachment ? $_POST['attachment'] : '';
-        $attachmentname = $has_attachmentname ? $_POST['attachmentname'] : '';
-
-        // Make sure last paste from the IP address was more than X seconds ago.
-        trafficlimiter::setLimit($this->_conf['traffic']['limit']);
-        trafficlimiter::setPath($this->_conf['traffic']['dir']);
-        $ipKey = 'REMOTE_ADDR';
-        if (array_key_exists('header', $this->_conf['traffic']))
-        {
-            $header = 'HTTP_' . $this->_conf['traffic']['header'];
-            if (array_key_exists($header, $_SERVER) && !empty($_SERVER[$header]))
-            {
-                $ipKey = $header;
-            }
-        }
-        if (!trafficlimiter::canPass($_SERVER[$ipKey])) return $this->_return_message(
-            1,
-            i18n::_(
-                'Please wait %d seconds between each post.',
-                $this->_conf['traffic']['limit']
-            )
-        );
-
-        // Make sure content is not too big.
-        $sizelimit = (int) $this->_getMainConfig('sizelimit', 2097152);
-        if (
-            strlen($data) + strlen($attachment) + strlen($attachmentname) > $sizelimit
-        ) return $this->_return_message(
-            1,
-            i18n::_(
-                'Paste is limited to %s of encrypted data.',
-                filter::size_humanreadable($sizelimit)
-            )
-        );
-
-        // Make sure format is correct.
-        if (!sjcl::isValid($data)) return $this->_return_message(1, 'Invalid data.');
-
-        // Make sure attachments are enabled and format is correct.
-        if($has_attachment)
-        {
-            if (
-                !$this->_getMainConfig('fileupload', false) ||
-                !sjcl::isValid($attachment) ||
-                !($has_attachmentname && sjcl::isValid($attachmentname))
-            ) return $this->_return_message(1, 'Invalid attachment.');
-        }
-
-        // Read additional meta-information.
-        $meta = array();
-
-        // Read expiration date
-        if (array_key_exists('expire', $_POST) && !empty($_POST['expire']))
-        {
-            $selected_expire = (string) $_POST['expire'];
-            if (array_key_exists($selected_expire, $this->_conf['expire_options']))
-            {
-                $expire = $this->_conf['expire_options'][$selected_expire];
-            }
-            else
-            {
-                $expire = $this->_conf['expire_options'][$this->_conf['expire']['default']];
-            }
-            if ($expire > 0) $meta['expire_date'] = time() + $expire;
-        }
-
-        // Destroy the paste when it is read.
-        if (array_key_exists('burnafterreading', $_POST) && !empty($_POST['burnafterreading']))
-        {
-            $burnafterreading = $_POST['burnafterreading'];
-            if ($burnafterreading !== '0')
-            {
-                if ($burnafterreading !== '1') $error = true;
-                $meta['burnafterreading'] = true;
-            }
-        }
-
-        // Read open discussion flag.
-        if (
-            $this->_getMainConfig('discussion', true) &&
-            array_key_exists('opendiscussion', $_POST) &&
-            !empty($_POST['opendiscussion'])
-        )
-        {
-            $opendiscussion = $_POST['opendiscussion'];
-            if ($opendiscussion !== '0')
-            {
-                if ($opendiscussion !== '1') $error = true;
-                $meta['opendiscussion'] = true;
-            }
-        }
-
-        // Read formatter flag.
-        if (array_key_exists('formatter', $_POST) && !empty($_POST['formatter']))
-        {
-            $formatter = $_POST['formatter'];
-            if (!array_key_exists($formatter, $this->_conf['formatter_options']))
-            {
-                $formatter = $this->_getMainConfig('defaultformatter', 'plaintext');
-            }
-            $meta['formatter'] = $formatter;
-        }
-
-        // You can't have an open discussion on a "Burn after reading" paste:
-        if (isset($meta['burnafterreading'])) unset($meta['opendiscussion']);
-
-        // Optional nickname for comments
-        if (!empty($_POST['nickname']))
-        {
-            // Generation of the anonymous avatar (Vizhash):
-            // If a nickname is provided, we generate a Vizhash.
-            // (We assume that if the user did not enter a nickname, he/she wants
-            // to be anonymous and we will not generate the vizhash.)
-            $nick = $_POST['nickname'];
-            if (!sjcl::isValid($nick))
-            {
-                $error = true;
-            }
-            else
-            {
-                $meta['nickname'] = $nick;
-                $vz = new vizhash16x16();
-                $pngdata = $vz->generate($_SERVER['REMOTE_ADDR']);
-                if ($pngdata != '')
-                {
-                    $meta['vizhash'] = 'data:image/png;base64,' . base64_encode($pngdata);
-                }
-                // Once the avatar is generated, we do not keep the IP address, nor its hash.
-            }
-        }
-
-        if ($error) return $this->_return_message(1, 'Invalid data.');
-
-        // Add post date to meta.
-        $meta['postdate'] = time();
-
-        // We just want a small hash to avoid collisions:
-        // Half-MD5 (64 bits) will do the trick
-        $dataid = substr(hash('md5', $data), 0, 16);
-
-        $storage = array('data' => $data);
-
-        // Add meta-information only if necessary.
-        if (count($meta)) $storage['meta'] = $meta;
-
-        // The user posts a comment.
-        if (
-            !empty($_POST['parentid']) &&
-            !empty($_POST['pasteid'])
-        )
-        {
-            $pasteid  = (string) $_POST['pasteid'];
-            $parentid = (string) $_POST['parentid'];
-            if (
-                !filter::is_valid_paste_id($pasteid) ||
-                !filter::is_valid_paste_id($parentid)
-            ) return $this->_return_message(1, 'Invalid data.');
-
-            // Comments do not expire (it's the paste that expires)
-            unset($storage['expire_date']);
-            unset($storage['opendiscussion']);
-
-            // Make sure paste exists.
-            if (
-                !$this->_model()->exists($pasteid)
-            ) return $this->_return_message(1, 'Invalid data.');
-
-            // Make sure the discussion is opened in this paste.
-            $paste = $this->_model()->read($pasteid);
-            if (
-                !$paste->meta->opendiscussion
-            ) return $this->_return_message(1, 'Invalid data.');
-
-            // Check for improbable collision.
-            if (
-                $this->_model()->existsComment($pasteid, $parentid, $dataid)
-            ) return $this->_return_message(1, 'You are unlucky. Try again.');
-
-            // New comment
-            if (
-                $this->_model()->createComment($pasteid, $parentid, $dataid, $storage) === false
-            ) return $this->_return_message(1, 'Error saving comment. Sorry.');
-
-            // 0 = no error
-            return $this->_return_message(0, $dataid);
-        }
-        // The user posts a standard paste.
-        else
-        {
-            // Check for improbable collision.
-            if (
-                $this->_model()->exists($dataid)
-            ) return $this->_return_message(1, 'You are unlucky. Try again.');
-
-            // Add attachment and its name, if one was sent
-            if ($has_attachment) $storage['attachment'] = $attachment;
-            if ($has_attachmentname) $storage['attachmentname'] = $attachmentname;
-
-            // New paste
-            if (
-                $this->_model()->create($dataid, $storage) === false
-            ) return $this->_return_message(1, 'Error saving paste. Sorry.');
-
-            // Generate the "delete" token.
-            // The token is the hmac of the pasteid signed with the server salt.
-            // The paste can be delete by calling http://example.com/zerobin/?pasteid=<pasteid>&deletetoken=<deletetoken>
-            $deletetoken = hash_hmac('sha1', $dataid, serversalt::get());
-
-            // 0 = no error
-            return $this->_return_message(0, $dataid, array('deletetoken' => $deletetoken));
-        }
-    }
-
-    /**
-     * Delete an existing paste
-     *
-     * @access private
-     * @param  string $dataid
-     * @param  string $deletetoken
-     * @return void
-     */
-    private function _delete($dataid, $deletetoken)
-    {
-        // Is this a valid paste identifier?
-        if (!filter::is_valid_paste_id($dataid))
-        {
-            $this->_error = 'Invalid paste ID.';
-            return;
-        }
-
-        // Check that paste exists.
-        if (!$this->_model()->exists($dataid))
-        {
-            $this->_error = self::GENERIC_ERROR;
-            return;
-        }
-
-        // Get the paste itself.
-        $paste = $this->_model()->read($dataid);
-
-        // See if paste has expired.
-        if (
-            isset($paste->meta->expire_date) &&
-            $paste->meta->expire_date < time()
-        )
-        {
-            // Delete the paste
-            $this->_model()->delete($dataid);
-            $this->_error = self::GENERIC_ERROR;
-            return;
-        }
-
-        if ($deletetoken == 'burnafterreading') {
-            if (
-                isset($paste->meta->burnafterreading) &&
-                $paste->meta->burnafterreading
-            )
-            {
-                // Delete the paste
-                $this->_model()->delete($dataid);
-                $this->_return_message(0, $dataid);
-            }
-            else
-            {
-                $this->_return_message(1, 'Paste is not of burn-after-reading type.');
-            }
-            return;
-        }
-
-        // Make sure token is valid.
-        serversalt::setPath($this->_conf['traffic']['dir']);
-        if (!filter::slow_equals($deletetoken, hash_hmac('sha1', $dataid, serversalt::get())))
-        {
-            $this->_error = 'Wrong deletion token. Paste was not deleted.';
-            return;
-        }
-
-        // Paste exists and deletion token is valid: Delete the paste.
-        $this->_model()->delete($dataid);
-        $this->_status = 'Paste was properly deleted.';
-    }
-
-    /**
-     * Read an existing paste or comment
-     *
-     * @access private
-     * @param  string $dataid
-     * @return void
-     */
-    private function _read($dataid)
-    {
-        $isJson = false;
-        if (($pos = strpos($dataid, '&json')) !== false) {
-            $isJson = true;
-            $dataid = substr($dataid, 0, $pos);
-        }
-
-        // Is this a valid paste identifier?
-        if (!filter::is_valid_paste_id($dataid))
-        {
-            $this->_error = 'Invalid paste ID.';
-            return;
-        }
-
-        // Check that paste exists.
-        if ($this->_model()->exists($dataid))
-        {
-            // Get the paste itself.
-            $paste = $this->_model()->read($dataid);
-
-            // See if paste has expired.
-            if (
-                isset($paste->meta->expire_date) &&
-                $paste->meta->expire_date < time()
-            )
-            {
-                // Delete the paste
-                $this->_model()->delete($dataid);
-                $this->_error = self::GENERIC_ERROR;
-            }
-            // If no error, return the paste.
-            else
-            {
-                // We kindly provide the remaining time before expiration (in seconds)
-                if (
-                    property_exists($paste->meta, 'expire_date')
-                ) $paste->meta->remaining_time = $paste->meta->expire_date - time();
-
-                // The paste itself is the first in the list of encrypted messages.
-                $messages = array($paste);
-
-                // If it's a discussion, get all comments.
-                if (
-                    property_exists($paste->meta, 'opendiscussion') &&
-                    $paste->meta->opendiscussion
-                )
-                {
-                    $messages = array_merge(
-                        $messages,
-                        $this->_model()->readComments($dataid)
-                    );
-                }
-
-                // set formatter for for the view.
-                if (!property_exists($paste->meta, 'formatter'))
-                {
-                    // support < 0.21 syntax highlighting
-                    if (property_exists($paste->meta, 'syntaxcoloring') && $paste->meta->syntaxcoloring === true)
-                    {
-                        $paste->meta->formatter = 'syntaxhighlighting';
-                    }
-                    else
-                    {
-                        $paste->meta->formatter = $this->_getMainConfig('defaultformatter', 'plaintext');
-                    }
-                }
-
-                $this->_data = json_encode($messages);
-            }
-        }
-        else
-        {
-            $this->_error = self::GENERIC_ERROR;
-        }
-        if ($isJson)
-        {
-            if (strlen($this->_error))
-            {
-                $this->_return_message(1, $this->_error);
-            }
-            else
-            {
-                $this->_return_message(0, $dataid, array('messages' => $messages));
-            }
-        }
-    }
-
-    /**
-     * Display ZeroBin frontend.
-     *
-     * @access private
-     * @return void
-     */
-    private function _view()
-    {
-        // set headers to disable caching
-        $time = gmdate('D, d M Y H:i:s \G\M\T');
-        header('Cache-Control: no-store, no-cache, must-revalidate');
-        header('Pragma: no-cache');
-        header('Expires: ' . $time);
-        header('Last-Modified: ' . $time);
-        header('Vary: Accept');
-
-        // label all the expiration options
-        $expire = array();
-        foreach ($this->_conf['expire_options'] as $time => $seconds)
-        {
-            $expire[$time] = ($seconds == 0) ? i18n::_(ucfirst($time)): filter::time_humanreadable($time);
-        }
-
-        // translate all the formatter options
-        $formatters = array_map(array('i18n', 'translate'), $this->_conf['formatter_options']);
-
-        // set language cookie if that functionality was enabled
-        $languageselection = '';
-        if ($this->_getMainConfig('languageselection', false))
-        {
-            $languageselection = i18n::getLanguage();
-            setcookie('lang', $languageselection);
-        }
-
-        $page = new RainTPL;
-        $page::$path_replace = false;
-        // we escape it here because ENT_NOQUOTES can't be used in RainTPL templates
-        $page->assign('CIPHERDATA', htmlspecialchars($this->_data, ENT_NOQUOTES));
-        $page->assign('ERROR', i18n::_($this->_error));
-        $page->assign('STATUS', i18n::_($this->_status));
-        $page->assign('VERSION', self::VERSION);
-        $page->assign('DISCUSSION', $this->_getMainConfig('discussion', true));
-        $page->assign('OPENDISCUSSION', $this->_getMainConfig('opendiscussion', true));
-        $page->assign('MARKDOWN', array_key_exists('markdown', $formatters));
-        $page->assign('SYNTAXHIGHLIGHTING', array_key_exists('syntaxhighlighting', $formatters));
-        $page->assign('SYNTAXHIGHLIGHTINGTHEME', $this->_getMainConfig('syntaxhighlightingtheme', ''));
-        $page->assign('FORMATTER', $formatters);
-        $page->assign('FORMATTERDEFAULT', $this->_getMainConfig('defaultformatter', 'plaintext'));
-        $page->assign('NOTICE', i18n::_($this->_getMainConfig('notice', '')));
-        $page->assign('BURNAFTERREADINGSELECTED', $this->_getMainConfig('burnafterreadingselected', false));
-        $page->assign('PASSWORD', $this->_getMainConfig('password', true));
-        $page->assign('FILEUPLOAD', $this->_getMainConfig('fileupload', false));
-        $page->assign('BASE64JSVERSION', $this->_getMainConfig('base64version', '2.1.9'));
-        $page->assign('LANGUAGESELECTION', $languageselection);
-        $page->assign('LANGUAGES', i18n::getLanguageLabels(i18n::getAvailableLanguages()));
-        $page->assign('EXPIRE', $expire);
-        $page->assign('EXPIREDEFAULT', $this->_conf['expire']['default']);
-        $page->draw($this->_getMainConfig('template', 'page'));
-    }
-
-    /**
-     * get configuration option from [main] section, optionally set a default
-     *
-     * @access private
-     * @param  string $option
-     * @param  mixed $default (optional)
-     * @return mixed
-     */
-    private function _getMainConfig($option, $default = false)
-    {
-        return array_key_exists($option, $this->_conf['main']) ?
-            $this->_conf['main'][$option] :
-            $default;
-    }
-
-    /**
-     * return JSON encoded message and exit
-     *
-     * @access private
-     * @param  bool $status
-     * @param  string $message
-     * @param  array $other
-     * @return void
-     */
-    private function _return_message($status, $message, $other = array())
-    {
-        $result = array('status' => $status);
-        if ($status)
-        {
-            $result['message'] = i18n::_($message);
-        }
-        else
-        {
-            $result['id'] = $message;
-        }
-        $result += $other;
-        $this->_json = json_encode($result);
-    }
-}

lib/zerobin/abstract.php

@@ -1,125 +0,0 @@
-<?php
-/**
- * ZeroBin
- *
- * a zero-knowledge paste bin
- *
- * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
- * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21.1
- */
-
-/**
- * zerobin_abstract
- *
- * Abstract model for ZeroBin data access, implemented as a singleton.
- */
-abstract class zerobin_abstract
-{
-	/**
-     * singleton instance
-     *
-     * @access protected
-     * @static
-     * @var zerobin
-     */
-    protected static $_instance = null;
-
-    /**
-     * enforce singleton, disable constructor
-     *
-     * Instantiate using {@link getInstance()}, zerobin is a singleton object.
-     *
-     * @access protected
-     */
-    protected function __construct() {}
-
-    /**
-     * enforce singleton, disable cloning
-     *
-     * Instantiate using {@link getInstance()}, zerobin is a singleton object.
-     *
-     * @access private
-     */
-    private function __clone() {}
-
-    /**
-     * get instance of singleton
-     *
-     * @access public
-     * @static
-     * @param  array $options
-     * @return zerobin_abstract
-     */
-    public static function getInstance($options) {}
-
-    /**
-     * Create a paste.
-     *
-     * @access public
-     * @param  string $pasteid
-     * @param  array  $paste
-     * @return bool
-     */
-    abstract public function create($pasteid, $paste);
-
-    /**
-     * Read a paste.
-     *
-     * @access public
-     * @param  string $pasteid
-     * @return string
-     */
-    abstract public function read($pasteid);
-
-    /**
-     * Delete a paste and its discussion.
-     *
-     * @access public
-     * @param  string $pasteid
-     * @return void
-     */
-    abstract public function delete($pasteid);
-
-    /**
-     * Test if a paste exists.
-     *
-     * @access public
-     * @param  string $dataid
-     * @return void
-     */
-    abstract public function exists($pasteid);
-
-    /**
-     * Create a comment in a paste.
-     *
-     * @access public
-     * @param  string $pasteid
-     * @param  string $parentid
-     * @param  string $commentid
-     * @param  array  $comment
-     * @return bool
-     */
-    abstract public function createComment($pasteid, $parentid, $commentid, $comment);
-
-    /**
-     * Read all comments of paste.
-     *
-     * @access public
-     * @param  string $pasteid
-     * @return array
-     */
-    abstract public function readComments($pasteid);
-
-    /**
-     * Test if a comment exists.
-     *
-     * @access public
-     * @param  string $dataid
-     * @param  string $parentid
-     * @param  string $commentid
-     * @return void
-     */
-    abstract public function existsComment($pasteid, $parentid, $commentid);
-}

lib/zerobin/data.php

@@ -1,257 +0,0 @@
-<?php
-/**
- * ZeroBin
- *
- * a zero-knowledge paste bin
- *
- * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
- * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21.1
- */
-
-/**
- * zerobin_data
- *
- * Model for data access, implemented as a singleton.
- */
-class zerobin_data extends zerobin_abstract
-{
-    /**
-     * directory where data is stored
-     *
-     * @access private
-     * @static
-     * @var string
-     */
-    private static $_dir = 'data/';
-
-    /**
-     * get instance of singleton
-     *
-     * @access public
-     * @static
-     * @param  array $options
-     * @return zerobin_data
-     */
-    public static function getInstance($options = null)
-    {
-        // if given update the data directory
-        if (
-            is_array($options) &&
-            array_key_exists('dir', $options)
-        ) self::$_dir = $options['dir'] . DIRECTORY_SEPARATOR;
-        // if needed initialize the singleton
-        if(!(self::$_instance instanceof zerobin_data)) {
-            self::$_instance = new self;
-            self::_init();
-        }
-        return self::$_instance;
-    }
-
-    /**
-     * Create a paste.
-     *
-     * @access public
-     * @param  string $pasteid
-     * @param  array  $paste
-     * @return bool
-     */
-    public function create($pasteid, $paste)
-    {
-        $storagedir = self::_dataid2path($pasteid);
-        if (is_file($storagedir . $pasteid)) return false;
-        if (!is_dir($storagedir)) mkdir($storagedir, 0705, true);
-        return (bool) @file_put_contents($storagedir . $pasteid, json_encode($paste));
-    }
-
-    /**
-     * Read a paste.
-     *
-     * @access public
-     * @param  string $pasteid
-     * @return stdClass|false
-     */
-    public function read($pasteid)
-    {
-        if(!$this->exists($pasteid)) return false;
-        return json_decode(
-            file_get_contents(self::_dataid2path($pasteid) . $pasteid)
-        );
-    }
-
-    /**
-     * Delete a paste and its discussion.
-     *
-     * @access public
-     * @param  string $pasteid
-     * @return void
-     */
-    public function delete($pasteid)
-    {
-        // Delete the paste itself.
-        unlink(self::_dataid2path($pasteid) . $pasteid);
-
-        // Delete discussion if it exists.
-        $discdir = self::_dataid2discussionpath($pasteid);
-        if (is_dir($discdir))
-        {
-            // Delete all files in discussion directory
-            $dir = dir($discdir);
-            while (false !== ($filename = $dir->read()))
-            {
-                if (is_file($discdir.$filename)) unlink($discdir.$filename);
-            }
-            $dir->close();
-
-            // Delete the discussion directory.
-            @rmdir($discdir);
-        }
-    }
-
-    /**
-     * Test if a paste exists.
-     *
-     * @access public
-     * @param  string $dataid
-     * @return void
-     */
-    public function exists($pasteid)
-    {
-        return is_file(self::_dataid2path($pasteid) . $pasteid);
-    }
-
-    /**
-     * Create a comment in a paste.
-     *
-     * @access public
-     * @param  string $pasteid
-     * @param  string $parentid
-     * @param  string $commentid
-     * @param  array  $comment
-     * @return bool
-     */
-    public function createComment($pasteid, $parentid, $commentid, $comment)
-    {
-        $storagedir = self::_dataid2discussionpath($pasteid);
-        $filename = $pasteid . '.' . $commentid . '.' . $parentid;
-        if (is_file($storagedir . $filename)) return false;
-        if (!is_dir($storagedir)) mkdir($storagedir, 0705, true);
-        return (bool) @file_put_contents($storagedir . $filename, json_encode($comment));
-    }
-
-    /**
-     * Read all comments of paste.
-     *
-     * @access public
-     * @param  string $pasteid
-     * @return array
-     */
-    public function readComments($pasteid)
-    {
-        $comments = array();
-        $discdir = self::_dataid2discussionpath($pasteid);
-        if (is_dir($discdir))
-        {
-            // Delete all files in discussion directory
-            $dir = dir($discdir);
-            while (false !== ($filename = $dir->read()))
-            {
-                // Filename is in the form pasteid.commentid.parentid:
-                // - pasteid is the paste this reply belongs to.
-                // - commentid is the comment identifier itself.
-                // - parentid is the comment this comment replies to (It can be pasteid)
-                if (is_file($discdir.$filename))
-                {
-                    $comment = json_decode(file_get_contents($discdir.$filename));
-                    $items = explode('.', $filename);
-                    // Add some meta information not contained in file.
-                    $comment->meta->commentid=$items[1];
-                    $comment->meta->parentid=$items[2];
-
-                    // Store in array
-                    $comments[$comment->meta->postdate]=$comment;
-                }
-            }
-            $dir->close();
-
-            // Sort comments by date, oldest first.
-            ksort($comments);
-        }
-        return $comments;
-    }
-
-    /**
-     * Test if a comment exists.
-     *
-     * @access public
-     * @param  string $dataid
-     * @param  string $parentid
-     * @param  string $commentid
-     * @return void
-     */
-    public function existsComment($pasteid, $parentid, $commentid)
-    {
-        return is_file(
-            self::_dataid2discussionpath($pasteid) .
-            $pasteid . '.' . $commentid . '.' . $parentid
-        );
-    }
-
-    /**
-     * initialize zerobin
-     *
-     * @access private
-     * @static
-     * @return void
-     */
-    private static function _init()
-    {
-        // Create storage directory if it does not exist.
-        if (!is_dir(self::$_dir)) mkdir(self::$_dir, 0705);
-        // Create .htaccess file if it does not exist.
-        if (!is_file(self::$_dir . '.htaccess'))
-        {
-            file_put_contents(
-                self::$_dir . '.htaccess',
-                'Allow from none' . PHP_EOL .
-                'Deny from all'. PHP_EOL
-            );
-        }
-    }
-
-    /**
-     * Convert paste id to storage path.
-     *
-     * The idea is to creates subdirectories in order to limit the number of files per directory.
-     * (A high number of files in a single directory can slow things down.)
-     * eg. "f468483c313401e8" will be stored in "data/f4/68/f468483c313401e8"
-     * High-trafic websites may want to deepen the directory structure (like Squid does).
-     *
-     * eg. input 'e3570978f9e4aa90' --> output 'data/e3/57/'
-     *
-     * @access private
-     * @static
-     * @param  string $dataid
-     * @return void
-     */
-    private static function _dataid2path($dataid)
-    {
-        return self::$_dir . substr($dataid,0,2) . '/' . substr($dataid,2,2) . '/';
-    }
-
-    /**
-     * Convert paste id to discussion storage path.
-     *
-     * eg. input 'e3570978f9e4aa90' --> output 'data/e3/57/e3570978f9e4aa90.discussion/'
-     *
-     * @access private
-     * @static
-     * @param  string $dataid
-     * @return void
-     */
-    private static function _dataid2discussionpath($dataid)
-    {
-        return self::_dataid2path($dataid) . $dataid . '.discussion/';
-    }
-}

lib/zerobin/db.php

@@ -1,431 +0,0 @@
-<?php
-/**
- * ZeroBin
- *
- * a zero-knowledge paste bin
- *
- * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
- * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
- * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21.1
- */
-
-/**
- * zerobin_db
- *
- * Model for DB access, implemented as a singleton.
- */
-class zerobin_db extends zerobin_abstract
-{
-    /**
-     * cache for select queries
-     *
-     * @var array
-     */
-    private static $_cache = array();
-
-    /**
-     * instance of database connection
-     *
-     * @access private
-     * @static
-     * @var PDO
-     */
-    private static $_db;
-
-    /**
-     * table prefix
-     *
-     * @access private
-     * @static
-     * @var string
-     */
-    private static $_prefix = '';
-
-    /**
-     * database type
-     *
-     * @access private
-     * @static
-     * @var string
-     */
-    private static $_type = '';
-
-    /**
-     * get instance of singleton
-     *
-     * @access public
-     * @static
-     * @param  array $options
-     * @throws Exception
-     * @return zerobin_db
-     */
-    public static function getInstance($options = null)
-    {
-        // if needed initialize the singleton
-        if(!(self::$_instance instanceof zerobin_db)) {
-            self::$_instance = new self;
-        }
-
-        if (is_array($options))
-        {
-            // set table prefix if given
-            if (array_key_exists('tbl', $options)) self::$_prefix = $options['tbl'];
-
-            // initialize the db connection with new options
-            if (
-                array_key_exists('dsn', $options) &&
-                array_key_exists('usr', $options) &&
-                array_key_exists('pwd', $options) &&
-                array_key_exists('opt', $options)
-            )
-            {
-                // check if the database contains the required tables
-                self::$_type = strtolower(
-                    substr($options['dsn'], 0, strpos($options['dsn'], ':'))
-                );
-                switch(self::$_type)
-                {
-                    case 'ibm':
-                        $sql = 'SELECT tabname FROM SYSCAT.TABLES ';
-                        break;
-                    case 'informix':
-                        $sql = 'SELECT tabname FROM systables ';
-                        break;
-                    case 'mssql':
-                        $sql = "SELECT name FROM sysobjects "
-                             . "WHERE type = 'U' ORDER BY name";
-                        break;
-                    case 'mysql':
-                        $sql = 'SHOW TABLES';
-                        break;
-                    case 'oci':
-                        $sql = 'SELECT table_name FROM all_tables';
-                        break;
-                    case 'pgsql':
-                        $sql = "SELECT c.relname AS table_name "
-                             . "FROM pg_class c, pg_user u "
-                             . "WHERE c.relowner = u.usesysid AND c.relkind = 'r' "
-                             . "AND NOT EXISTS (SELECT 1 FROM pg_views WHERE viewname = c.relname) "
-                             . "AND c.relname !~ '^(pg_|sql_)' "
-                             . "UNION "
-                             . "SELECT c.relname AS table_name "
-                             . "FROM pg_class c "
-                             . "WHERE c.relkind = 'r' "
-                             . "AND NOT EXISTS (SELECT 1 FROM pg_views WHERE viewname = c.relname) "
-                             . "AND NOT EXISTS (SELECT 1 FROM pg_user WHERE usesysid = c.relowner) "
-                             . "AND c.relname !~ '^pg_'";
-                        break;
-                    case 'sqlite':
-                        $sql = "SELECT name FROM sqlite_master WHERE type='table' "
-                             . "UNION ALL SELECT name FROM sqlite_temp_master "
-                             . "WHERE type='table' ORDER BY name";
-                        break;
-                    default:
-                        throw new Exception(
-                            'PDO type ' .
-                            self::$_type .
-                            ' is currently not supported.',
-                            5
-                        );
-                }
-                self::$_db = new PDO(
-                    $options['dsn'],
-                    $options['usr'],
-                    $options['pwd'],
-                    $options['opt']
-                );
-                $statement = self::$_db->query($sql);
-                $tables = $statement->fetchAll(PDO::FETCH_COLUMN, 0);
-
-                // create paste table if needed
-                if (!array_key_exists(self::$_prefix . 'paste', $tables))
-                {
-                    self::$_db->exec(
-                        'CREATE TABLE ' . self::$_prefix . 'paste ( ' .
-                        'dataid CHAR(16), ' .
-                        'data TEXT, ' .
-                        'postdate INT, ' .
-                        'expiredate INT, ' .
-                        'opendiscussion INT, ' .
-                        'burnafterreading INT, ' .
-                        'meta TEXT );'
-                    );
-                }
-                // check if the meta column exists
-                else
-                {
-                    try {
-                        self::$_db->exec('SELECT meta FROM ' . self::$_prefix . 'paste LIMIT 1;');
-                    } catch (PDOException $e) {
-                        if ($e->getCode() == 'HY000')
-                        {
-                            self::$_db->exec('ALTER TABLE ' . self::$_prefix . 'paste ADD COLUMN meta TEXT;');
-                        }
-                    }
-                }
-
-                // create comment table if needed
-                if (!array_key_exists(self::$_prefix . 'comment', $tables))
-                {
-                    self::$_db->exec(
-                        'CREATE TABLE ' . self::$_prefix . 'comment ( ' .
-                        'dataid CHAR(16), ' .
-                        'pasteid CHAR(16), ' .
-                        'parentid CHAR(16), ' .
-                        'data TEXT, ' .
-                        'nickname VARCHAR(255), ' .
-                        'vizhash TEXT, ' .
-                        'postdate INT );'
-                    );
-                }
-            }
-        }
-
-        return parent::$_instance;
-    }
-
-    /**
-     * Create a paste.
-     *
-     * @access public
-     * @param  string $pasteid
-     * @param  array  $paste
-     * @return bool
-     */
-    public function create($pasteid, $paste)
-    {
-        if (
-            array_key_exists($pasteid, self::$_cache)
-        ) {
-            if(false !== self::$_cache[$pasteid]) {
-                return false;
-            } else {
-                unset(self::$_cache[$pasteid]);
-            }
-        }
-
-        $opendiscussion = $burnafterreading = false;
-        $meta = $paste['meta'];
-        unset($meta['postdate']);
-        unset($meta['expire_date']);
-        if (array_key_exists('opendiscussion', $paste['meta']))
-        {
-            $opendiscussion = (bool) $paste['meta']['opendiscussion'];
-            unset($meta['opendiscussion']);
-        }
-        if (array_key_exists('burnafterreading', $paste['meta']))
-        {
-            $burnafterreading = (bool) $paste['meta']['burnafterreading'];
-            unset($meta['burnafterreading']);
-        }
-        return self::_exec(
-            'INSERT INTO ' . self::$_prefix . 'paste VALUES(?,?,?,?,?,?,?)',
-            array(
-                $pasteid,
-                $paste['data'],
-                $paste['meta']['postdate'],
-                $paste['meta']['expire_date'],
-                (int) $opendiscussion,
-                (int) $burnafterreading,
-                json_encode($meta),
-            )
-        );
-    }
-
-    /**
-     * Read a paste.
-     *
-     * @access public
-     * @param  string $pasteid
-     * @return stdClass|false
-     */
-    public function read($pasteid)
-    {
-        if (
-            !array_key_exists($pasteid, self::$_cache)
-        ) {
-            self::$_cache[$pasteid] = false;
-            $paste = self::_select(
-                'SELECT * FROM ' . self::$_prefix . 'paste WHERE dataid = ?',
-                array($pasteid), true
-            );
-
-            if(false !== $paste) {
-                // create object
-                self::$_cache[$pasteid] = new stdClass;
-                self::$_cache[$pasteid]->data = $paste['data'];
-                self::$_cache[$pasteid]->meta = json_decode($paste['meta']);
-                self::$_cache[$pasteid]->meta->postdate = (int) $paste['postdate'];
-                self::$_cache[$pasteid]->meta->expire_date = (int) $paste['expiredate'];
-                if (
-                    $paste['opendiscussion']
-                ) self::$_cache[$pasteid]->meta->opendiscussion = true;
-                if (
-                    $paste['burnafterreading']
-                ) self::$_cache[$pasteid]->meta->burnafterreading = true;
-            }
-        }
-
-        return self::$_cache[$pasteid];
-    }
-
-    /**
-     * Delete a paste and its discussion.
-     *
-     * @access public
-     * @param  string $pasteid
-     * @return void
-     */
-    public function delete($pasteid)
-    {
-        self::_exec(
-            'DELETE FROM ' . self::$_prefix . 'paste WHERE dataid = ?',
-            array($pasteid)
-        );
-        self::_exec(
-            'DELETE FROM ' . self::$_prefix . 'comment WHERE pasteid = ?',
-            array($pasteid)
-        );
-        if (
-            array_key_exists($pasteid, self::$_cache)
-        ) unset(self::$_cache[$pasteid]);
-    }
-
-    /**
-     * Test if a paste exists.
-     *
-     * @access public
-     * @param  string $dataid
-     * @return void
-     */
-    public function exists($pasteid)
-    {
-        if (
-            !array_key_exists($pasteid, self::$_cache)
-        ) self::$_cache[$pasteid] = $this->read($pasteid);
-        return (bool) self::$_cache[$pasteid];
-    }
-
-    /**
-     * Create a comment in a paste.
-     *
-     * @access public
-     * @param  string $pasteid
-     * @param  string $parentid
-     * @param  string $commentid
-     * @param  array  $comment
-     * @return int|false
-     */
-    public function createComment($pasteid, $parentid, $commentid, $comment)
-    {
-        return self::_exec(
-            'INSERT INTO ' . self::$_prefix . 'comment VALUES(?,?,?,?,?,?,?)',
-            array(
-                $commentid,
-                $pasteid,
-                $parentid,
-                $comment['data'],
-                $comment['meta']['nickname'],
-                $comment['meta']['vizhash'],
-                $comment['meta']['postdate'],
-            )
-        );
-    }
-
-    /**
-     * Read all comments of paste.
-     *
-     * @access public
-     * @param  string $pasteid
-     * @return array
-     */
-    public function readComments($pasteid)
-    {
-        $rows = self::_select(
-            'SELECT * FROM ' . self::$_prefix . 'comment WHERE pasteid = ?',
-            array($pasteid)
-        );
-
-        // create object
-        $commentTemplate = new stdClass;
-        $commentTemplate->meta = new stdClass;
-
-        // create comment list
-        $comments = array();
-        if (count($rows))
-        {
-            foreach ($rows as $row)
-            {
-                $i = (int) $row['postdate'];
-                $comments[$i] = clone $commentTemplate;
-                $comments[$i]->data = $row['data'];
-                $comments[$i]->meta->nickname = $row['nickname'];
-                $comments[$i]->meta->vizhash = $row['vizhash'];
-                $comments[$i]->meta->postdate = $i;
-                $comments[$i]->meta->commentid = $row['dataid'];
-                $comments[$i]->meta->parentid = $row['parentid'];
-            }
-            ksort($comments);
-        }
-        return $comments;
-    }
-
-    /**
-     * Test if a comment exists.
-     *
-     * @access public
-     * @param  string $dataid
-     * @param  string $parentid
-     * @param  string $commentid
-     * @return void
-     */
-    public function existsComment($pasteid, $parentid, $commentid)
-    {
-        return (bool) self::_select(
-            'SELECT dataid FROM ' . self::$_prefix . 'comment ' .
-            'WHERE pasteid = ? AND parentid = ? AND dataid = ?',
-            array($pasteid, $parentid, $commentid), true
-        );
-    }
-
-    /**
-     * execute a statement
-     *
-     * @access private
-     * @static
-     * @param  string $sql
-     * @param  array $params
-     * @throws PDOException
-     * @return array
-     */
-    private static function _exec($sql, array $params)
-    {
-        $statement = self::$_db->prepare($sql);
-        $result = $statement->execute($params);
-        $statement->closeCursor();
-        return $result;
-    }
-
-    /**
-     * run a select statement
-     *
-     * @access private
-     * @static
-     * @param  string $sql
-     * @param  array $params
-     * @param  bool $firstOnly if only the first row should be returned
-     * @throws PDOException
-     * @return array
-     */
-    private static function _select($sql, array $params, $firstOnly = false)
-    {
-        $statement = self::$_db->prepare($sql);
-        $statement->execute($params);
-        $result = $firstOnly ?
-            $statement->fetch(PDO::FETCH_ASSOC) :
-            $statement->fetchAll(PDO::FETCH_ASSOC);
-        $statement->closeCursor();
-        return $result;
-    }
-}

manifest.json

@@ -0,0 +1,17 @@
+{
+	"name": "PrivateBin",
+	"icons": [
+		{
+			"src": "android-chrome-192x192.png",
+			"sizes": "192x192",
+			"type": "image\/png"
+		},
+		{
+			"src": "android-chrome-512x512.png",
+			"sizes": "512x512",
+			"type": "image\/png"
+		}
+	],
+	"theme_color": "#ffe57e",
+	"display": "standalone"
+}

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

safari-pinned-tab.svg

@@ -0,0 +1 @@
+<svg version="1" xmlns="http://www.w3.org/2000/svg" width="933.333" height="933.333" viewBox="0 0 700.000000 700.000000"><path d="M339 3.3c-7.3 3-301.3 158.2-306.7 161.8-5.9 4.1-10.1 9.6-11.8 15.4-1.1 4.2-1.4 32-1.7 170l-.3 165 2.3 5c3 6.5 7.2 10.8 15.2 15.5 8.1 4.8 291.3 155.3 299.4 159.1 7.4 3.5 14.5 4.4 21.2 2.6 5.1-1.3 301.3-156.9 311.2-163.5 3-1.9 6.4-5.1 7.8-7.1 5.5-8.3 5.1 1.5 5.5-177.2l.4-165.4-2.3-5c-3-6.5-7.2-10.8-15.2-15.5-3.6-2.1-42.3-22.8-86-46s-83.1-44.2-87.5-46.5c-4.4-2.4-22.2-11.8-39.5-21S416.4 32.1 412.5 30c-29.8-16-46.6-24.7-51.4-26.7-7.3-3-14.9-3-22.1 0zm9.3 1.2c-6.6 1.2-20.7 8.4-160.3 82.1-98.2 51.8-154.6 82.1-157.4 84.5-2.4 2.1-5.1 5.3-6 7.1l-1.7 3.3.6-3c.8-3.7 4.5-8.6 8.6-11.6 3.1-2.2 299-158.6 306.4-162 2.6-1.1 6.3-1.8 10.5-1.7h6.5l-7.2 1.3zm1 3.1c-3.4.7-9 2.7-12.3 4.4-6.1 3.1-263.3 138.7-288.8 152.3-10.3 5.4-14.4 8.3-18.2 12.4-3.3 3.6-4.6 4.6-4.2 3 .3-1.2 2.8-4.4 5.6-7.1 4.4-4.3 23.5-14.7 138.6-75.3C355.4-.5 342.6 6 349.7 6.1l5.8.1-6.2 1.4zm7.2 4.6c3.9 1.8 3 2.4-3.9 2.6-3.6.1-7.6.6-9.1 1.2-3.9 1.5-296.2 155.7-301.8 159.3-2.7 1.7-6 4.8-7.4 6.9-4 6-5.8 4.4-2.9-2.7 1.9-4.4 6.8-7.8 24.5-17.1 15.3-8 26.9-14.2 38.6-20.4 3.9-2.1 12.4-6.6 19-10 6.6-3.5 14.7-7.7 18-9.5 3.3-1.8 11.9-6.3 19-10 7.2-3.7 19.1-10 26.5-14 7.4-4 19.8-10.5 27.5-14.5 7.7-4 14.5-7.6 15-8 .6-.4 9.1-4.9 19-10s18.5-9.6 19-10c.6-.4 8.7-4.7 18-9.5 9.4-4.8 17.5-9.1 18-9.5.6-.4 9.1-4.9 19-10s19.5-10.2 21.3-11.3c9.2-5.5 16.1-6.5 22.7-3.5zm7.1 4.4c1.8 1.4 1.8 1.4-.6.3-3.1-1.4-3.6-1.9-2.4-1.9.6 0 1.9.7 3 1.6zm5.5 3.1c1.3 1.5 1.2 1.5-.8.4-2.4-1.2-2.9-2.1-1.4-2.1.5 0 1.5.7 2.2 1.7zm12.4 6.3c.3.6-.1.7-.9.4-1.8-.7-2.1-1.4-.7-1.4.6 0 1.3.4 1.6 1zm15 8c.3.6-.1.7-.9.4-1.8-.7-2.1-1.4-.7-1.4.6 0 1.3.4 1.6 1zm-9 36.7c49.4 26.2 218.7 116.4 230.9 123 6 3.2 11.9 7.1 13 8.7 2 2.6 2.1 4 2.4 37.4.1 19.1-.1 84.8-.5 145.9l-.8 111.3-2.5 2.4c-1.4 1.4-40.7 22.7-87.5 47.4-189.1 99.9-188.7 99.7-193 99.7-4.3 0-1 1.7-88.5-44.8-160.9-85.3-190.4-101.3-192.4-104l-2.1-2.9.1-144.3c.1-113.5.4-145.1 1.4-147.4.7-1.7 2.6-3.9 4.4-5 3.2-2 78.3-41.7 188.6-99.8 95.1-50.2 85.9-45.6 90.5-45 2.7.3 14.7 6.1 36 17.4zm88 5.3c.3.6-.1.7-.9.4-1.8-.7-2.1-1.4-.7-1.4.6 0 1.3.4 1.6 1z"/><path d="M327.5 137c-40.4 8.7-76.5 38.9-91.6 76.7-15.4 38.4-5 75.7 32.3 115 11 11.6 11.6 13.1 9.9 24.5-4.4 28.5-24.5 106.7-43.2 168.1-6.8 22.2-6.9 28.9-.3 36.5 7 8.2-.3 7.7 115.4 7.7 96.9 0 102.8-.1 107.2-1.8 9.5-3.7 14.9-13.9 12.9-24.4-.5-2.6-3-12-5.5-20.8-14.7-52.3-28.9-107.3-36.6-142-5.4-23.8-6.7-32.5-5.6-36.8.3-1.4 4.2-6.5 8.7-11.3 17.3-18.9 31.1-39.9 37.9-57.6 6.7-17.5 8.2-35.9 4.1-51.2-9.1-34-41.4-65-81.4-78-14.1-4.6-21.5-5.8-38.7-6.2-13.6-.3-18.1 0-25.5 1.6zm35.8 46.5c30.9 5.4 59 27.2 63.7 49.5 1.1 5.2 1.1 7-.4 12.8-4 16.3-15.1 33.4-34.7 53.7-9.5 9.8-14.7 16-16.1 19.2-3 6.6-3.5 19.9-1.4 33.4C377.9 373.9 390 425 406 485c3.8 14.5 7 27.7 7 29.2 0 2.3-.5 2.8-3.2 3.3-4.8.9-121.5.1-122.4-.8-.9-.9-.1-4.2 8.6-35.2 13.6-48.4 25.7-99.3 29.5-123.9 1.1-7 1.6-14.6 1.3-21.5-.5-15.4-2.5-19.1-17.4-33.4-13.7-13.2-22.2-24.1-27.7-35.6-3.5-7.2-4.1-9.5-4.5-16.6-.8-15 5.1-28.4 18.8-42.8 19.4-20.5 41.9-28.6 67.3-24.2zm75 68.9c-5 17.3-17.2 36.2-36.3 56-8.1 8.4-14.7 16.3-15.9 18.8l-2 4.3-.1-3.3c0-6 2.8-10.2 16.2-24 7.3-7.6 15.9-17.4 19.1-21.9 6.6-9.3 14.7-24.4 17.2-32.2 2.2-6.9 3.9-4.8 1.8 2.3zm-14.7 10.3c-6.5 13.1-15.7 25.4-29.2 39.2-7.2 7.5-14.1 15.2-15.3 17.1-1.8 2.8-2.1 3-1.6 1 1.3-4.6 4.3-8.4 14.5-18.5 5.6-5.5 12.9-13.5 16.3-17.8 6.1-7.8 17.7-26.1 17.7-28 0-.6.3-.8.6-.5.3.3-1 3.7-3 7.5zm2.1 2.6c-6.7 13.5-15.4 25.3-30.7 41.2-7.4 7.7-14 15-14.7 16-1.2 2-1.2 2-.6 0 1.3-4 3.9-7.2 16.3-20 13.9-14.4 23.1-26.8 29.3-39.2 2.3-4.5 4.3-8 4.6-7.8.2.3-1.6 4.7-4.2 9.8zM416 517.8c0 3.1-2.7 3.2-65.2 3.2-41.2 0-62.8-.3-62.8-1s21.5-1 62.4-1c40.6 0 62.7-.4 63.1-1 .7-1.2 2.5-1.3 2.5-.2zm4 3.8c0 1.1.6 1.5 1.8 1.1 4.5-1.2 4.7-1.2 4.7 1.2 0 1.5-1.1 3.2-2.8 4.5-2.8 2.1-3.2 2.1-72 2.1-64.3 0-69.4-.1-71.7-1.8-2.3-1.6.5-1.7 66.2-1.7 37.7 0 69.3-.3 70.2-.6.9-.3 1.6-1 1.6-1.5s-28.1-.9-66.4-.9c-36.6 0-66.7-.3-66.9-.8-.3-.4 29.1-.7 65.3-.7 51.4 0 66.2-.3 67.2-1.3 1.7-1.7 2.8-1.5 2.8.4z"/></svg>

tpl/bootstrap-compact.html

@@ -1,197 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<meta charset="utf-8" />
-		<meta http-equiv="X-UA-Compatible" content="IE=edge">
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<meta name="robots" content="noindex" />
-		<title>{function="t('ZeroBin')"}</title>
-		<link type="text/css" rel="stylesheet" href="css/bootstrap/bootstrap-3.3.5.css" />
-		<link type="text/css" rel="stylesheet" href="css/bootstrap/bootstrap-theme-3.3.5.css" />
-		<link type="text/css" rel="stylesheet" href="css/bootstrap/zerobin.css?{$VERSION|rawurlencode}" />{if="$SYNTAXHIGHLIGHTING"}
-		<link type="text/css" rel="stylesheet" href="css/prettify/prettify.css?{$VERSION|rawurlencode}" />{if="strlen($SYNTAXHIGHLIGHTINGTHEME)"}
-		<link type="text/css" rel="stylesheet" href="css/prettify/{$SYNTAXHIGHLIGHTINGTHEME}.css?{$VERSION|rawurlencode}" />{/if}{/if}
-		<script type="text/javascript" src="js/jquery-1.11.3.js"></script>
-		<script type="text/javascript" src="js/sjcl-1.0.2.js"></script>
-		<script type="text/javascript" src="js/base64-{$BASE64JSVERSION}.js"></script>
-		<script type="text/javascript" src="js/rawdeflate-0.5.js"></script>
-		<script type="text/javascript" src="js/rawinflate-0.3.js"></script>
-		<script type="text/javascript" src="js/bootstrap-3.3.5.js"></script>{if="$SYNTAXHIGHLIGHTING"}
-		<script type="text/javascript" src="js/prettify.js?{$VERSION|rawurlencode}"></script>{/if}{if="$MARKDOWN"}
-		<script type="text/javascript" src="js/showdown.js?{$VERSION|rawurlencode}"></script>{/if}
-		<script type="text/javascript" src="js/zerobin.js?{$VERSION|rawurlencode}"></script>
-		<!--[if lt IE 10]>
-		<style type="text/css">#ienotice {display:block !important;} #oldienotice {display:block !important;}</style>
-		<![endif]-->
-	</head>
-	<body role="document" class="navbar-spacing">
-		<nav class="navbar navbar-default navbar-fixed-top">
-			<div class="container">
-				<div class="navbar-header">
-					<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-						<span class="sr-only">{function="t('Toggle navigation')"}</span>
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-					</button>
-				<a class="reloadlink navbar-brand" href="/">{function="t('ZeroBin')"}</a>
-				</div>
-				<div id="navbar" class="navbar-collapse collapse">
-					<ul class="nav navbar-nav">
-						<li>
-							<button id="sendbutton" type="button" class="hidden btn btn-default navbar-btn">
-								<span class="glyphicon glyphicon-upload" aria-hidden="true"></span> {function="t('Send')"}
-							</button>
-							<button id="clonebutton" type="button" class="hidden btn btn-default navbar-btn">
-								<span class="glyphicon glyphicon-duplicate" aria-hidden="true"></span> {function="t('Clone')"}
-							</button>
-							<button id="rawtextbutton" type="button" class="hidden btn btn-default navbar-btn">
-								<span class="glyphicon glyphicon-text-background" aria-hidden="true"></span> {function="t('Raw text')"}
-							</button>
-						</li>
-						<li class="dropdown">
-							<select id="pasteExpiration" name="pasteExpiration" class="hidden">
-{loop="EXPIRE"}
-								<option value="{$key}"{if="$key == $EXPIREDEFAULT"} selected="selected"{/if}>{$value}</option>{/loop}
-							</select>
-							<a id="expiration" href="#" class="hidden dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{function="t('Expires')"}: <span id="pasteExpirationDisplay">{$EXPIRE[$EXPIREDEFAULT]}</span> <span class="caret"></span></a>
-							<ul class="dropdown-menu">
-{loop="EXPIRE"}
-								<li>
-									<a href="#" onclick="$('#pasteExpiration').val('{$key}');$('#pasteExpirationDisplay').text('{$value}');return false;">
-										{$value}
-									</a>
-								</li>{/loop}
-							</ul>
-						</li>
-						<li id="formatter" class="dropdown">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{function="t('Options')"} <span class="caret"></span></a>
-							<ul class="dropdown-menu">
-								<li id="burnafterreadingoption" class="checkbox hidden">
-									<label>
-										<input type="checkbox" id="burnafterreading" name="burnafterreading" {if="$BURNAFTERREADINGSELECTED"} checked="checked"{/if} />
-										{function="t('Burn after reading')"}
-									</label>
-								</li>{if="$DISCUSSION"}
-								<li id="opendisc" class="checkbox hidden">
-									<label>
-										<input type="checkbox" id="opendiscussion" name="opendiscussion" {if="$OPENDISCUSSION"} checked="checked"{/if} />
-										{function="t('Open discussion')"}
-									</label>
-								</li>{/if}
-								<li role="separator" class="divider"></li>
-								<li>
-									<div>
-										{function="t('Format')"}: <span id="pasteFormatterDisplay">{$FORMATTER[$FORMATTERDEFAULT]}</span> <span class="caret"></span>
-									</div>
-								</li>
-{loop="FORMATTER"}
-								<li>
-									<a href="#" onclick="$('#pasteFormatter').val('{$key}');$('#pasteFormatterDisplay').text('{$value}');return false;">
-										{$value}
-									</a>
-								</li>{/loop}
-							</ul>
-							<select id="pasteFormatter" name="pasteFormatter" class="hidden">
-{loop="FORMATTER"}
-								<option value="{$key}"{if="$key == $FORMATTERDEFAULT"} selected="selected"{/if}>{$value}</option>{/loop}
-							</select>
-						</li>{if="$PASSWORD"}
-						<li>
-							<div id="password" class="navbar-form hidden">
-								<input type="password" id="passwordinput" placeholder="{function="t('Password (recommended)')"}" class="form-control" size="19"/>
-							</div>
-						</li>{/if}{if="$FILEUPLOAD"}
-						<li id="attach" class="hidden dropdown">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{function="t('Attach a file')"} <span class="caret"></span></a>
-							<ul class="dropdown-menu">
-								<li id="filewrap">
-									<div>
-										<input type="file" id="file" name="file" />
-									</div>
-								</li>
-								<li>
-									<a id="fileremovebutton"  href="#">
-										{function="t('Remove attachment')"}
-									</a>
-								</li>
-							</ul>
-						</li>{/if}
-					</ul>
-					<ul class="nav navbar-nav pull-right">{if="strlen($LANGUAGESELECTION)"}
-						<li id="language" class="dropdown">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-flag" aria-hidden="true"></span> {$LANGUAGES[$LANGUAGESELECTION][0]} <span class="caret"></span></a>
-							<ul class="dropdown-menu">
-{loop="LANGUAGES"}
-								<li>
-									<a href="#" class="reloadlink" onclick="document.cookie='lang={$key}';">
-										{$value[0]} ({$value[1]})
-									</a>
-								</li>{/loop}
-							</ul>
-						</li>{/if}
-						<li>
-							<button id="newbutton" type="button" class="reloadlink hidden btn btn-default navbar-btn">
-								<span class="glyphicon glyphicon-file" aria-hidden="true"></span> {function="t('New')"}
-							</button>
-						</li>
-					</ul>
-				</div>
-			</div>
-		</nav>
-		<header class="container">{if="strlen($NOTICE)"}
-			<div role="alert" class="alert alert-info">
-				<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> {$NOTICE|htmlspecialchars}
-			</div>{/if}
-			<div id="remainingtime" role="alert" class="hidden alert alert-info">
-				<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
-			</div>{if="$FILEUPLOAD"}
-			<div id="attachment" role="alert" class="hidden alert alert-info">
-				<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> <a>{function="t('Download attachment')"}</a> <span id="clonedfile" class="hidden">{function="t('Cloned file attached.')"}</span>
-			</div>{/if}{if="strlen($STATUS)"}
-			<div id="status" role="alert" class="alert alert-success">
-				<span class="glyphicon glyphicon-ok" aria-hidden="true"></span> {$STATUS|htmlspecialchars}
-			</div>{/if}
-			<div id="errormessage" role="alert" class="{if="!strlen($ERROR)"}hidden {/if}alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {$ERROR|htmlspecialchars}</div>
-			<div id="noscript" role="alert" class="nonworking alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> {function="t('Javascript is required for ZeroBin to work.<br />Sorry for the inconvenience.')"}</div>
-			<div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {function="t('ZeroBin 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="t('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>...
-			</div>
-			<div id="pasteresult" role="alert" class="hidden alert alert-success">
-				<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
-				<div id="deletelink"></div>
-				<div id="pastelink"></div>
-			</div>
-		</header>
-		<section class="container">
-			<article class="row">
-				<div id="image" class="col-md-12 text-center hidden"></div>
-				<div id="prettymessage" class="col-md-12 hidden">
-					<pre id="prettyprint" class="col-md-12 prettyprint linenums:1"></pre>
-				</div>
-				<div id="cleartext" class="col-md-12 hidden"></div>
-				<p class="col-md-12"><textarea id="message" name="message" cols="80" rows="25" class="form-control hidden"></textarea></p>
-			</article>
-		</section>
-		<section class="container">
-			<div id="discussion" class="hidden">
-				<h4>{function="t('Discussion')"}</h4>
-				<div id="comments"></div>
-			</div>
-		</section>
-		<footer class="container">
-			<div class="row">
-				<h4 class="col-md-5 col-xs-8">{function="t('ZeroBin')"} <small>- {function="t('Because ignorance is bliss')"}</small></h4>
-				<p class="col-md-1 col-xs-4 text-center">{$VERSION}</p>
-				<p id="aboutbox" class="col-md-6 col-xs-12">
-					{function="t('ZeroBin is a minimalist, opensource online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href="https://github.com/elrido/ZeroBin/wiki">project page</a>.')"}
-				</p>
-			</div>
-		</footer>
-		<div id="cipherdata" class="hidden">{$CIPHERDATA}</div>
-	</body>
-</html>