arno
/
privatebin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

incrementing version, updating changelog, added missing phpdoc comments

Browse Source
pull/17/head
El RIDO 9 years ago
parent bba485ef6d
commit 24a4328c55
24 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File

13
CHANGELOG.md
Unescape View File

@ -1,5 +1,18 @@
# ZeroBin version history # # ZeroBin version history #
* **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
* 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
* 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)**: * **0.21.1 (2015-09-21)**:
* FIXING: lost meta data when using DB model instead of flat files * FIXING: lost meta data when using DB model instead of flat files
* FIXING: mobile navbar getting triggered on load * FIXING: mobile navbar getting triggered on load

2
cfg/conf.ini.sample
Unescape View File

@ -5,7 +5,7 @@
; @link http://sebsauvage.net/wiki/doku.php?id=php:zerobin ; @link http://sebsauvage.net/wiki/doku.php?id=php:zerobin
; @copyright 2012 Sébastien SAUVAGE (sebsauvage.net) ; @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
; @license http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License ; @license http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
; @version 0.21.1 ; @version 0.22
[main] [main]
; enable or disable the discussion feature, defaults to true ; enable or disable the discussion feature, defaults to true

2
css/bootstrap/zerobin.css
Unescape View File

@ -1,4 +1,4 @@
/* ZeroBin 0.21.1 - http://sebsauvage.net/wiki/doku.php?id=php:zerobin */ /* ZeroBin 0.22 - http://sebsauvage.net/wiki/doku.php?id=php:zerobin */
body { body {

2
css/zerobin.css
Unescape View File

@ -1,4 +1,4 @@
/* ZeroBin 0.21.1 - http://sebsauvage.net/wiki/doku.php?id=php:zerobin */ /* ZeroBin 0.22 - http://sebsauvage.net/wiki/doku.php?id=php:zerobin */
/* CSS Reset from YUI 3.4.1 (build 4118) - Copyright 2011 Yahoo! Inc. All rights reserved. /* CSS Reset from YUI 3.4.1 (build 4118) - Copyright 2011 Yahoo! Inc. All rights reserved.

4
js/zerobin.js
Unescape View File

@ -6,7 +6,7 @@
* @link http://sebsauvage.net/wiki/doku.php?id=php:zerobin * @link http://sebsauvage.net/wiki/doku.php?id=php:zerobin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net) * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @license http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
* @version 0.21.1 * @version 0.22
*/ */
'use strict'; 'use strict';
@ -583,7 +583,7 @@ $(function() {
helper.urls2links(this.clearText); helper.urls2links(this.clearText);
helper.urls2links(this.prettyPrint); helper.urls2links(this.prettyPrint);
this.clearText.addClass('hidden'); this.clearText.addClass('hidden');
if (format == 'plaintext') if (format == 'plaintext')
{ {
this.prettyPrint.css('white-space', 'pre-wrap'); this.prettyPrint.css('white-space', 'pre-wrap');
this.prettyPrint.css('word-break', 'normal'); this.prettyPrint.css('word-break', 'normal');

2
lib/auto.php
Unescape View File

@ -7,7 +7,7 @@
* @link http://sebsauvage.net/wiki/doku.php?id=php:zerobin * @link http://sebsauvage.net/wiki/doku.php?id=php:zerobin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net) * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @license http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
* @version 0.21.1 * @version 0.22
*/ */
spl_autoload_register('auto::loader'); spl_autoload_register('auto::loader');

2
lib/configuration.php
Unescape View File

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

2
lib/filter.php
Unescape View File

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

2
lib/i18n.php
Unescape View File

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

2
lib/model.php
Unescape View File

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

3
lib/model/abstract.php
Unescape View File

@ -7,7 +7,7 @@
* @link http://sebsauvage.net/wiki/doku.php?id=php:zerobin * @link http://sebsauvage.net/wiki/doku.php?id=php:zerobin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net) * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @license http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
* @version 0.21.1 * @version 0.22
*/ */
/** /**
@ -80,6 +80,7 @@ abstract class model_abstract
* Set ID. * Set ID.
* *
* @access public * @access public
* @param string $id
* @throws Exception * @throws Exception
* @return void * @return void
*/ */

10
lib/model/comment.php
Unescape View File

@ -7,7 +7,7 @@
* @link http://sebsauvage.net/wiki/doku.php?id=php:zerobin * @link http://sebsauvage.net/wiki/doku.php?id=php:zerobin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net) * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @license http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
* @version 0.21.1 * @version 0.22
*/ */
/** /**
@ -161,6 +161,14 @@ class model_comment extends model_abstract
return $this->_data->meta->parentid; return $this->_data->meta->parentid;
} }
/**
* Set nickname.
*
* @access public
* @param string $nickname
* @throws Exception
* @return void
*/
public function setNickname($nickname) public function setNickname($nickname)
{ {
if (!sjcl::isValid($nickname)) throw new Exception('Invalid data.', 66); if (!sjcl::isValid($nickname)) throw new Exception('Invalid data.', 66);

2
lib/model/paste.php
Unescape View File

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

2
lib/persistence.php
Unescape View File

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

4
lib/request.php
Unescape View File

@ -7,7 +7,7 @@
* @link http://sebsauvage.net/wiki/doku.php?id=php:zerobin * @link http://sebsauvage.net/wiki/doku.php?id=php:zerobin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net) * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License * @license http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
* @version 0.21.1 * @version 0.22
*/ */
/** /**
@ -162,7 +162,7 @@ class request
/** /**
* Override the default input stream source, used for unit testing. * Override the default input stream source, used for unit testing.
* *
* @param unknown $input * @param string $input
*/ */
public static function setInputStream($input) public static function setInputStream($input)
{ {

2
lib/serversalt.php
Unescape View File

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

2
lib/sjcl.php
Unescape View File

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

2
lib/trafficlimiter.php
Unescape View File

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

2
lib/vizhash16x16.php
Unescape View File

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

2
lib/zerobin.php
Unescape View File

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

2
lib/zerobin/abstract.php
Unescape View File

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

2
lib/zerobin/data.php
Unescape View File

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

2
lib/zerobin/db.php
Unescape View File

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

6
tst/configGenerator.php
Unescape View File

@ -463,7 +463,7 @@ class configurationTestGenerator
/** /**
* DO NOT EDIT: This file is generated automatically using configGenerator.php * DO NOT EDIT: This file is generated automatically using configGenerator.php
*/ */
class configurationTest extends PHPUnit_Framework_TestCase class configurationCombinationsTest extends PHPUnit_Framework_TestCase
{ {
private $_model; private $_model;
@ -539,6 +539,8 @@ EOT;
case 'Create': case 'Create':
$code .= PHP_EOL . <<<'EOT' $code .= PHP_EOL . <<<'EOT'
$_POST = helper::getPaste(); $_POST = helper::getPaste();
$_SERVER['HTTP_X_REQUESTED_WITH'] = 'JSONHttpRequest';
$_SERVER['REQUEST_METHOD'] = 'POST';
$_SERVER['REMOTE_ADDR'] = '::1'; $_SERVER['REMOTE_ADDR'] = '::1';
EOT; EOT;
break; break;
@ -580,7 +582,7 @@ EOT;
$this->assertTag( $this->assertTag(
array( array(
'id' => 'cipherdata', 'id' => 'cipherdata',
'content' => htmlspecialchars(json_encode(helper::getPaste()), ENT_NOQUOTES) 'content' => htmlspecialchars(helper::getPasteAsJson(), ENT_NOQUOTES)
), ),
$content, $content,
'outputs data correctly' 'outputs data correctly'

Write Preview
Loading…
Cancel
Save