implementing recommendations of scrutinizer
This commit is contained in:
parent
9b2af0abf5
commit
bbcc3e167b
|
@ -179,7 +179,7 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
*
|
*
|
||||||
* @name Helper.urls2links
|
* @name Helper.urls2links
|
||||||
* @function
|
* @function
|
||||||
* @param {Object} element - a jQuery DOM element
|
* @param {Object} $element - a jQuery DOM element
|
||||||
*/
|
*/
|
||||||
me.urls2links = function($element)
|
me.urls2links = function($element)
|
||||||
{
|
{
|
||||||
|
@ -675,7 +675,7 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
* @function
|
* @function
|
||||||
* @return {string} func
|
* @return {string} func
|
||||||
*/
|
*/
|
||||||
me.getSymmetricKey = function(func)
|
me.getSymmetricKey = function()
|
||||||
{
|
{
|
||||||
return sjcl.codec.base64.fromBits(sjcl.random.randomWords(8, 0), 0);
|
return sjcl.codec.base64.fromBits(sjcl.random.randomWords(8, 0), 0);
|
||||||
}
|
}
|
||||||
|
@ -903,8 +903,6 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
me.isVisible = function($element)
|
me.isVisible = function($element)
|
||||||
{
|
{
|
||||||
var elementTop = $element.offset().top;
|
var elementTop = $element.offset().top;
|
||||||
var elementBottom = elementTop + $element.outerHeight();
|
|
||||||
|
|
||||||
var viewportTop = $(window).scrollTop();
|
var viewportTop = $(window).scrollTop();
|
||||||
var viewportBottom = viewportTop + $(window).height();
|
var viewportBottom = viewportTop + $(window).height();
|
||||||
|
|
||||||
|
@ -985,11 +983,9 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
* Alert/error manager
|
* Alert/error manager
|
||||||
*
|
*
|
||||||
* @name Alert
|
* @name Alert
|
||||||
* @param {object} window
|
|
||||||
* @param {object} document
|
|
||||||
* @class
|
* @class
|
||||||
*/
|
*/
|
||||||
var Alert = (function (window, document) {
|
var Alert = (function () {
|
||||||
var me = {};
|
var me = {};
|
||||||
|
|
||||||
var $errorMessage,
|
var $errorMessage,
|
||||||
|
@ -1249,17 +1245,16 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
}
|
}
|
||||||
|
|
||||||
return me;
|
return me;
|
||||||
})(window, document);
|
})();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* handles paste status/result
|
* handles paste status/result
|
||||||
*
|
*
|
||||||
* @name PasteStatus
|
* @name PasteStatus
|
||||||
* @param {object} window
|
* @param {object} window
|
||||||
* @param {object} document
|
|
||||||
* @class
|
* @class
|
||||||
*/
|
*/
|
||||||
var PasteStatus = (function (window, document) {
|
var PasteStatus = (function (window) {
|
||||||
var me = {};
|
var me = {};
|
||||||
|
|
||||||
var $pasteSuccess,
|
var $pasteSuccess,
|
||||||
|
@ -1402,17 +1397,15 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
}
|
}
|
||||||
|
|
||||||
return me;
|
return me;
|
||||||
})(window, document);
|
})(window);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* password prompt
|
* password prompt
|
||||||
*
|
*
|
||||||
* @name Prompt
|
* @name Prompt
|
||||||
* @param {object} window
|
|
||||||
* @param {object} document
|
|
||||||
* @class
|
* @class
|
||||||
*/
|
*/
|
||||||
var Prompt = (function (window, document) {
|
var Prompt = (function () {
|
||||||
var me = {};
|
var me = {};
|
||||||
|
|
||||||
var $passwordDecrypt,
|
var $passwordDecrypt,
|
||||||
|
@ -1512,7 +1505,7 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
}
|
}
|
||||||
|
|
||||||
return me;
|
return me;
|
||||||
})(window, document);
|
})();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Manage paste/message input, and preview tab
|
* Manage paste/message input, and preview tab
|
||||||
|
@ -1520,11 +1513,9 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
* Note that the actual preview is handled by PasteViewer.
|
* Note that the actual preview is handled by PasteViewer.
|
||||||
*
|
*
|
||||||
* @name Editor
|
* @name Editor
|
||||||
* @param {object} window
|
|
||||||
* @param {object} document
|
|
||||||
* @class
|
* @class
|
||||||
*/
|
*/
|
||||||
var Editor = (function (window, document) {
|
var Editor = (function () {
|
||||||
var me = {};
|
var me = {};
|
||||||
|
|
||||||
var $editorTabs,
|
var $editorTabs,
|
||||||
|
@ -1728,17 +1719,15 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
}
|
}
|
||||||
|
|
||||||
return me;
|
return me;
|
||||||
})(window, document);
|
})();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (view) Parse and show paste.
|
* (view) Parse and show paste.
|
||||||
*
|
*
|
||||||
* @name PasteViewer
|
* @name PasteViewer
|
||||||
* @param {object} window
|
|
||||||
* @param {object} document
|
|
||||||
* @class
|
* @class
|
||||||
*/
|
*/
|
||||||
var PasteViewer = (function (window, document) {
|
var PasteViewer = (function () {
|
||||||
var me = {};
|
var me = {};
|
||||||
|
|
||||||
var $placeholder,
|
var $placeholder,
|
||||||
|
@ -1904,7 +1893,7 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
* @function
|
* @function
|
||||||
* @return {string}
|
* @return {string}
|
||||||
*/
|
*/
|
||||||
me.getText = function(newText)
|
me.getText = function()
|
||||||
{
|
{
|
||||||
return text;
|
return text;
|
||||||
}
|
}
|
||||||
|
@ -1981,7 +1970,7 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
}
|
}
|
||||||
|
|
||||||
return me;
|
return me;
|
||||||
})(window, document);
|
})();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (view) Show attachment and preview if possible
|
* (view) Show attachment and preview if possible
|
||||||
|
@ -1998,8 +1987,7 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
$attachmentPreview,
|
$attachmentPreview,
|
||||||
$attachment;
|
$attachment;
|
||||||
|
|
||||||
var attachmentChanged = false,
|
var attachmentHasPreview = false;
|
||||||
attachmentHasPreview = false;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sets the attachment but does not yet show it
|
* sets the attachment but does not yet show it
|
||||||
|
@ -2027,8 +2015,6 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
);
|
);
|
||||||
attachmentHasPreview = true;
|
attachmentHasPreview = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
attachmentChanged = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -3043,7 +3029,7 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
* @private
|
* @private
|
||||||
* @function
|
* @function
|
||||||
* @param {int} status
|
* @param {int} status
|
||||||
* @param {int} data - optional
|
* @param {int} result - optional
|
||||||
*/
|
*/
|
||||||
function success(status, result)
|
function success(status, result)
|
||||||
{
|
{
|
||||||
|
@ -3063,7 +3049,7 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
* @private
|
* @private
|
||||||
* @function
|
* @function
|
||||||
* @param {int} status - internal code
|
* @param {int} status - internal code
|
||||||
* @param {int} data - original error code
|
* @param {int} result - original error code
|
||||||
*/
|
*/
|
||||||
function fail(status, result)
|
function fail(status, result)
|
||||||
{
|
{
|
||||||
|
@ -3107,7 +3093,7 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
*
|
*
|
||||||
* @name Uploader.setUrl
|
* @name Uploader.setUrl
|
||||||
* @function
|
* @function
|
||||||
* @param {function} func
|
* @param {function} newUrl
|
||||||
*/
|
*/
|
||||||
me.setUrl = function(newUrl)
|
me.setUrl = function(newUrl)
|
||||||
{
|
{
|
||||||
|
@ -3236,17 +3222,18 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
* @return {array}
|
* @return {array}
|
||||||
*/
|
*/
|
||||||
me.parseUploadError = function(status, data, doThisThing) {
|
me.parseUploadError = function(status, data, doThisThing) {
|
||||||
var errorArray = ['Error while parsing error message.'];
|
var errorArray;
|
||||||
|
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case Uploader.error['custom']:
|
case me.error['custom']:
|
||||||
errorArray = ['Could not ' + doThisThing + ': %s', data.message];
|
errorArray = ['Could not ' + doThisThing + ': %s', data.message];
|
||||||
break;
|
break;
|
||||||
case Uploader.error['unknown']:
|
case me.error['unknown']:
|
||||||
errorArray = ['Could not ' + doThisThing + ': %s', I18n._('unknown status')];
|
errorArray = ['Could not ' + doThisThing + ': %s', I18n._('unknown status')];
|
||||||
break;
|
break;
|
||||||
case Uploader.error['serverError']:
|
case me.error['serverError']:
|
||||||
errorArray = ['Could not ' + doThisThing + ': %s', I18n._('server error or not responding')]; break;
|
errorArray = ['Could not ' + doThisThing + ': %s', I18n._('server error or not responding')];
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
errorArray = ['Could not ' + doThisThing + ': %s', I18n._('unknown error')];
|
errorArray = ['Could not ' + doThisThing + ': %s', I18n._('unknown error')];
|
||||||
break;
|
break;
|
||||||
|
@ -3884,7 +3871,6 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
|
||||||
|
|
||||||
// show proper elements on screen
|
// show proper elements on screen
|
||||||
PasteDecrypter.run();
|
PasteDecrypter.run();
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -58,7 +58,7 @@ abstract class AbstractData
|
||||||
* @access public
|
* @access public
|
||||||
* @static
|
* @static
|
||||||
* @param array $options
|
* @param array $options
|
||||||
* @return privatebin_abstract
|
* @return AbstractData
|
||||||
*/
|
*/
|
||||||
public static function getInstance($options)
|
public static function getInstance($options)
|
||||||
{
|
{
|
||||||
|
@ -88,7 +88,6 @@ abstract class AbstractData
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $pasteid
|
* @param string $pasteid
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
abstract public function delete($pasteid);
|
abstract public function delete($pasteid);
|
||||||
|
|
||||||
|
@ -147,7 +146,6 @@ abstract class AbstractData
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @param int $batchsize
|
* @param int $batchsize
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function purge($batchsize)
|
public function purge($batchsize)
|
||||||
{
|
{
|
||||||
|
|
|
@ -282,7 +282,6 @@ class Database extends AbstractData
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $pasteid
|
* @param string $pasteid
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function delete($pasteid)
|
public function delete($pasteid)
|
||||||
{
|
{
|
||||||
|
@ -375,11 +374,10 @@ class Database extends AbstractData
|
||||||
$comments[$i]->data = $row['data'];
|
$comments[$i]->data = $row['data'];
|
||||||
$comments[$i]->meta = new stdClass;
|
$comments[$i]->meta = new stdClass;
|
||||||
$comments[$i]->meta->postdate = (int) $row['postdate'];
|
$comments[$i]->meta->postdate = (int) $row['postdate'];
|
||||||
if (array_key_exists('nickname', $row) && !empty($row['nickname'])) {
|
foreach (array('nickname', 'vizhash') as $key) {
|
||||||
$comments[$i]->meta->nickname = $row['nickname'];
|
if (array_key_exists($key, $row) && !empty($row[$key])) {
|
||||||
}
|
$comments[$i]->meta->$key = $row[$key];
|
||||||
if (array_key_exists('vizhash', $row) && !empty($row['vizhash'])) {
|
}
|
||||||
$comments[$i]->meta->vizhash = $row['vizhash'];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ksort($comments);
|
ksort($comments);
|
||||||
|
@ -564,7 +562,6 @@ class Database extends AbstractData
|
||||||
*
|
*
|
||||||
* @access private
|
* @access private
|
||||||
* @static
|
* @static
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
private static function _createPasteTable()
|
private static function _createPasteTable()
|
||||||
{
|
{
|
||||||
|
@ -589,7 +586,6 @@ class Database extends AbstractData
|
||||||
*
|
*
|
||||||
* @access private
|
* @access private
|
||||||
* @static
|
* @static
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
private static function _createCommentTable()
|
private static function _createCommentTable()
|
||||||
{
|
{
|
||||||
|
@ -616,7 +612,6 @@ class Database extends AbstractData
|
||||||
*
|
*
|
||||||
* @access private
|
* @access private
|
||||||
* @static
|
* @static
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
private static function _createConfigTable()
|
private static function _createConfigTable()
|
||||||
{
|
{
|
||||||
|
@ -651,7 +646,6 @@ class Database extends AbstractData
|
||||||
* @access private
|
* @access private
|
||||||
* @static
|
* @static
|
||||||
* @param string $oldversion
|
* @param string $oldversion
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
private static function _upgradeDatabase($oldversion)
|
private static function _upgradeDatabase($oldversion)
|
||||||
{
|
{
|
||||||
|
|
|
@ -98,7 +98,6 @@ class Filesystem extends AbstractData
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $pasteid
|
* @param string $pasteid
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function delete($pasteid)
|
public function delete($pasteid)
|
||||||
{
|
{
|
||||||
|
|
|
@ -135,15 +135,17 @@ class I18n
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @static
|
* @static
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public static function loadTranslations()
|
public static function loadTranslations()
|
||||||
{
|
{
|
||||||
$availableLanguages = self::getAvailableLanguages();
|
$availableLanguages = self::getAvailableLanguages();
|
||||||
|
|
||||||
// check if the lang cookie was set and that language exists
|
// check if the lang cookie was set and that language exists
|
||||||
if (array_key_exists('lang', $_COOKIE) && in_array($_COOKIE['lang'], $availableLanguages)) {
|
if (
|
||||||
$match = $_COOKIE['lang'];
|
array_key_exists('lang', $_COOKIE) &&
|
||||||
|
($key = array_search($_COOKIE['lang'], $availableLanguages)) !== false
|
||||||
|
) {
|
||||||
|
$match = $availableLanguages[$key];
|
||||||
}
|
}
|
||||||
// find a translation file matching the browsers language preferences
|
// find a translation file matching the browsers language preferences
|
||||||
else {
|
else {
|
||||||
|
@ -256,7 +258,6 @@ class I18n
|
||||||
* @access public
|
* @access public
|
||||||
* @static
|
* @static
|
||||||
* @param string $lang
|
* @param string $lang
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public static function setLanguageFallback($lang)
|
public static function setLanguageFallback($lang)
|
||||||
{
|
{
|
||||||
|
|
|
@ -40,7 +40,6 @@ class Model
|
||||||
* Factory constructor.
|
* Factory constructor.
|
||||||
*
|
*
|
||||||
* @param configuration $conf
|
* @param configuration $conf
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function __construct(Configuration $conf)
|
public function __construct(Configuration $conf)
|
||||||
{
|
{
|
||||||
|
@ -64,8 +63,6 @@ class Model
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks if a purge is necessary and triggers it if yes.
|
* Checks if a purge is necessary and triggers it if yes.
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function purge()
|
public function purge()
|
||||||
{
|
{
|
||||||
|
|
|
@ -63,7 +63,6 @@ abstract class AbstractModel
|
||||||
* @access public
|
* @access public
|
||||||
* @param Configuration $configuration
|
* @param Configuration $configuration
|
||||||
* @param AbstractData $storage
|
* @param AbstractData $storage
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function __construct(Configuration $configuration, AbstractData $storage)
|
public function __construct(Configuration $configuration, AbstractData $storage)
|
||||||
{
|
{
|
||||||
|
@ -90,7 +89,6 @@ abstract class AbstractModel
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $id
|
* @param string $id
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function setId($id)
|
public function setId($id)
|
||||||
{
|
{
|
||||||
|
@ -106,7 +104,6 @@ abstract class AbstractModel
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $data
|
* @param string $data
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function setData($data)
|
public function setData($data)
|
||||||
{
|
{
|
||||||
|
@ -133,7 +130,6 @@ abstract class AbstractModel
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
abstract public function store();
|
abstract public function store();
|
||||||
|
|
||||||
|
@ -142,7 +138,6 @@ abstract class AbstractModel
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
abstract public function delete();
|
abstract public function delete();
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,6 @@ class Comment extends AbstractModel
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function store()
|
public function store()
|
||||||
{
|
{
|
||||||
|
@ -101,7 +100,6 @@ class Comment extends AbstractModel
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function delete()
|
public function delete()
|
||||||
{
|
{
|
||||||
|
@ -129,7 +127,6 @@ class Comment extends AbstractModel
|
||||||
* @access public
|
* @access public
|
||||||
* @param Paste $paste
|
* @param Paste $paste
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function setPaste(Paste $paste)
|
public function setPaste(Paste $paste)
|
||||||
{
|
{
|
||||||
|
@ -154,7 +151,6 @@ class Comment extends AbstractModel
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $id
|
* @param string $id
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function setParentId($id)
|
public function setParentId($id)
|
||||||
{
|
{
|
||||||
|
@ -184,7 +180,6 @@ class Comment extends AbstractModel
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $nickname
|
* @param string $nickname
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function setNickname($nickname)
|
public function setNickname($nickname)
|
||||||
{
|
{
|
||||||
|
|
|
@ -75,7 +75,6 @@ class Paste extends AbstractModel
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function store()
|
public function store()
|
||||||
{
|
{
|
||||||
|
@ -103,7 +102,6 @@ class Paste extends AbstractModel
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function delete()
|
public function delete()
|
||||||
{
|
{
|
||||||
|
@ -183,7 +181,6 @@ class Paste extends AbstractModel
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $attachment
|
* @param string $attachment
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function setAttachment($attachment)
|
public function setAttachment($attachment)
|
||||||
{
|
{
|
||||||
|
@ -199,7 +196,6 @@ class Paste extends AbstractModel
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $attachmentname
|
* @param string $attachmentname
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function setAttachmentName($attachmentname)
|
public function setAttachmentName($attachmentname)
|
||||||
{
|
{
|
||||||
|
@ -214,7 +210,6 @@ class Paste extends AbstractModel
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $expiration
|
* @param string $expiration
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function setExpiration($expiration)
|
public function setExpiration($expiration)
|
||||||
{
|
{
|
||||||
|
@ -236,7 +231,6 @@ class Paste extends AbstractModel
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $burnafterreading
|
* @param string $burnafterreading
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function setBurnafterreading($burnafterreading = '1')
|
public function setBurnafterreading($burnafterreading = '1')
|
||||||
{
|
{
|
||||||
|
@ -257,7 +251,6 @@ class Paste extends AbstractModel
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $opendiscussion
|
* @param string $opendiscussion
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function setOpendiscussion($opendiscussion = '1')
|
public function setOpendiscussion($opendiscussion = '1')
|
||||||
{
|
{
|
||||||
|
@ -281,7 +274,6 @@ class Paste extends AbstractModel
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $format
|
* @param string $format
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function setFormatter($format)
|
public function setFormatter($format)
|
||||||
{
|
{
|
||||||
|
|
|
@ -36,7 +36,6 @@ abstract class AbstractPersistence
|
||||||
* @access public
|
* @access public
|
||||||
* @static
|
* @static
|
||||||
* @param string $path
|
* @param string $path
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public static function setPath($path)
|
public static function setPath($path)
|
||||||
{
|
{
|
||||||
|
@ -80,7 +79,6 @@ abstract class AbstractPersistence
|
||||||
* @access protected
|
* @access protected
|
||||||
* @static
|
* @static
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
protected static function _initialize()
|
protected static function _initialize()
|
||||||
{
|
{
|
||||||
|
|
|
@ -36,7 +36,6 @@ class PurgeLimiter extends AbstractPersistence
|
||||||
* @access public
|
* @access public
|
||||||
* @static
|
* @static
|
||||||
* @param int $limit
|
* @param int $limit
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public static function setLimit($limit)
|
public static function setLimit($limit)
|
||||||
{
|
{
|
||||||
|
@ -49,7 +48,6 @@ class PurgeLimiter extends AbstractPersistence
|
||||||
* @access public
|
* @access public
|
||||||
* @static
|
* @static
|
||||||
* @param Configuration $conf
|
* @param Configuration $conf
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public static function setConfiguration(Configuration $conf)
|
public static function setConfiguration(Configuration $conf)
|
||||||
{
|
{
|
||||||
|
|
|
@ -95,7 +95,6 @@ class ServerSalt extends AbstractPersistence
|
||||||
* @access public
|
* @access public
|
||||||
* @static
|
* @static
|
||||||
* @param string $path
|
* @param string $path
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public static function setPath($path)
|
public static function setPath($path)
|
||||||
{
|
{
|
||||||
|
|
|
@ -45,7 +45,6 @@ class TrafficLimiter extends AbstractPersistence
|
||||||
* @access public
|
* @access public
|
||||||
* @static
|
* @static
|
||||||
* @param int $limit
|
* @param int $limit
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public static function setLimit($limit)
|
public static function setLimit($limit)
|
||||||
{
|
{
|
||||||
|
@ -58,7 +57,6 @@ class TrafficLimiter extends AbstractPersistence
|
||||||
* @access public
|
* @access public
|
||||||
* @static
|
* @static
|
||||||
* @param Configuration $conf
|
* @param Configuration $conf
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public static function setConfiguration(Configuration $conf)
|
public static function setConfiguration(Configuration $conf)
|
||||||
{
|
{
|
||||||
|
|
|
@ -123,7 +123,6 @@ class PrivateBin
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
|
@ -171,7 +170,6 @@ class PrivateBin
|
||||||
* initialize privatebin
|
* initialize privatebin
|
||||||
*
|
*
|
||||||
* @access private
|
* @access private
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
private function _init()
|
private function _init()
|
||||||
{
|
{
|
||||||
|
@ -320,7 +318,6 @@ class PrivateBin
|
||||||
* @access private
|
* @access private
|
||||||
* @param string $dataid
|
* @param string $dataid
|
||||||
* @param string $deletetoken
|
* @param string $deletetoken
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
private function _delete($dataid, $deletetoken)
|
private function _delete($dataid, $deletetoken)
|
||||||
{
|
{
|
||||||
|
@ -364,7 +361,6 @@ class PrivateBin
|
||||||
*
|
*
|
||||||
* @access private
|
* @access private
|
||||||
* @param string $dataid
|
* @param string $dataid
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
private function _read($dataid)
|
private function _read($dataid)
|
||||||
{
|
{
|
||||||
|
@ -397,7 +393,6 @@ class PrivateBin
|
||||||
* Display PrivateBin frontend.
|
* Display PrivateBin frontend.
|
||||||
*
|
*
|
||||||
* @access private
|
* @access private
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
private function _view()
|
private function _view()
|
||||||
{
|
{
|
||||||
|
@ -461,7 +456,6 @@ class PrivateBin
|
||||||
*
|
*
|
||||||
* @access private
|
* @access private
|
||||||
* @param string $type
|
* @param string $type
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
private function _jsonld($type)
|
private function _jsonld($type)
|
||||||
{
|
{
|
||||||
|
@ -494,7 +488,6 @@ class PrivateBin
|
||||||
* @param int $status
|
* @param int $status
|
||||||
* @param string $message
|
* @param string $message
|
||||||
* @param array $other
|
* @param array $other
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
private function _return_message($status, $message, $other = array())
|
private function _return_message($status, $message, $other = array())
|
||||||
{
|
{
|
||||||
|
|
|
@ -41,7 +41,7 @@ class Request
|
||||||
const MIME_XHTML = 'application/xhtml+xml';
|
const MIME_XHTML = 'application/xhtml+xml';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Input stream to use for PUT parameter parsing.
|
* Input stream to use for PUT parameter parsing
|
||||||
*
|
*
|
||||||
* @access private
|
* @access private
|
||||||
* @var string
|
* @var string
|
||||||
|
@ -49,7 +49,7 @@ class Request
|
||||||
private static $_inputStream = 'php://input';
|
private static $_inputStream = 'php://input';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Operation to perform.
|
* Operation to perform
|
||||||
*
|
*
|
||||||
* @access private
|
* @access private
|
||||||
* @var string
|
* @var string
|
||||||
|
@ -57,7 +57,7 @@ class Request
|
||||||
private $_operation = 'view';
|
private $_operation = 'view';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Request parameters.
|
* Request parameters
|
||||||
*
|
*
|
||||||
* @access private
|
* @access private
|
||||||
* @var array
|
* @var array
|
||||||
|
@ -65,7 +65,7 @@ class Request
|
||||||
private $_params = array();
|
private $_params = array();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If we are in a JSON API context.
|
* If we are in a JSON API context
|
||||||
*
|
*
|
||||||
* @access private
|
* @access private
|
||||||
* @var bool
|
* @var bool
|
||||||
|
@ -73,10 +73,9 @@ class Request
|
||||||
private $_isJsonApi = false;
|
private $_isJsonApi = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
|
@ -122,7 +121,7 @@ class Request
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get current operation.
|
* Get current operation
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @return string
|
* @return string
|
||||||
|
@ -133,7 +132,7 @@ class Request
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get a request parameter.
|
* Get a request parameter
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $param
|
* @param string $param
|
||||||
|
@ -146,7 +145,7 @@ class Request
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If we are in a JSON API context.
|
* If we are in a JSON API context
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @return bool
|
* @return bool
|
||||||
|
@ -157,7 +156,7 @@ class Request
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Override the default input stream source, used for unit testing.
|
* Override the default input stream source, used for unit testing
|
||||||
*
|
*
|
||||||
* @param string $input
|
* @param string $input
|
||||||
*/
|
*/
|
||||||
|
@ -167,7 +166,7 @@ class Request
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* detect the clients supported media type and decide if its a JSON API call or not
|
* 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
|
* Adapted from: https://stackoverflow.com/questions/3770513/detect-browser-language-in-php#3771447
|
||||||
*
|
*
|
||||||
|
|
|
@ -35,7 +35,6 @@ class View
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $name
|
* @param string $name
|
||||||
* @param mixed $value
|
* @param mixed $value
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function assign($name, $value)
|
public function assign($name, $value)
|
||||||
{
|
{
|
||||||
|
@ -48,7 +47,6 @@ class View
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $template
|
* @param string $template
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function draw($template)
|
public function draw($template)
|
||||||
{
|
{
|
||||||
|
|
|
@ -61,7 +61,6 @@ class Vizhash16x16
|
||||||
* constructor
|
* constructor
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
|
@ -210,7 +209,6 @@ class Vizhash16x16
|
||||||
* @param resource $image
|
* @param resource $image
|
||||||
* @param int $action
|
* @param int $action
|
||||||
* @param int $color
|
* @param int $color
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
private function drawshape($image, $action, $color)
|
private function drawshape($image, $action, $color)
|
||||||
{
|
{
|
||||||
|
|
|
@ -69,7 +69,7 @@ if ($MARKDOWN):
|
||||||
<?php
|
<?php
|
||||||
endif;
|
endif;
|
||||||
?>
|
?>
|
||||||
<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-7/bLmiTErcH3lMJi1JxXk/lb20NUO7TCqasWeFybnNhnfOUnJ9GQGqPVJxPf+7fnw9dgLa1s18FXQuRanLD8Hw==" crossorigin="anonymous"></script>
|
<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-LFVkwqqKQ1UWGc8TSC/YgsxhZGtJXG2hGChiBL7vM6v+MOPQsKyFMpNryAyR79d/7/hINgcjhrqBN2qkLwlxRA==" crossorigin="anonymous"></script>
|
||||||
<!--[if lt IE 10]>
|
<!--[if lt IE 10]>
|
||||||
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
|
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
|
|
|
@ -47,7 +47,7 @@ if ($MARKDOWN):
|
||||||
<?php
|
<?php
|
||||||
endif;
|
endif;
|
||||||
?>
|
?>
|
||||||
<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-7/bLmiTErcH3lMJi1JxXk/lb20NUO7TCqasWeFybnNhnfOUnJ9GQGqPVJxPf+7fnw9dgLa1s18FXQuRanLD8Hw==" crossorigin="anonymous"></script>
|
<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-LFVkwqqKQ1UWGc8TSC/YgsxhZGtJXG2hGChiBL7vM6v+MOPQsKyFMpNryAyR79d/7/hINgcjhrqBN2qkLwlxRA==" crossorigin="anonymous"></script>
|
||||||
<!--[if lt IE 10]>
|
<!--[if lt IE 10]>
|
||||||
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
|
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
|
|
Loading…
Reference in New Issue