chalec
/
ctrlv-privatebin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
rugk 2016-07-19 12:39:56 +02:00
parent 327eba268d c3a114d923
commit 58f5c8601f
9 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tpl/bootstrap-compact.html
View File

@ -23,12 +23,12 @@
<!--[if lt IE 10]> <!--[if lt IE 10]>
<style type="text/css">#ienotice {display:block !important;} #oldienotice {display:block !important;}</style> <style type="text/css">#ienotice {display:block !important;} #oldienotice {display:block !important;}</style>
<![endif]--> <![endif]-->
<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png?{$VERSION|rawurlencode}"> <link rel="apple-touch-icon" href="apple-touch-icon.png?{$VERSION|rawurlencode}" sizes="180x180" />
<link rel="icon" type="image/png" href="favicon-32x32.png" sizes="32x32?{$VERSION|rawurlencode}"> <link rel="icon" type="image/png" href="favicon-32x32.png?{$VERSION|rawurlencode}" sizes="32x32" />
<link rel="icon" type="image/png" href="favicon-16x16.png" sizes="16x16?{$VERSION|rawurlencode}"> <link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}"> <link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00"> <link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
<meta name="theme-color" content="#ffe57e"> <meta name="theme-color" content="#ffe57e" />
</head> </head>
<body role="document" class="navbar-spacing"> <body role="document" class="navbar-spacing">
<nav class="navbar navbar-default navbar-fixed-top"> <nav class="navbar navbar-default navbar-fixed-top">

12
tpl/bootstrap-dark-page.html
View File

@ -23,12 +23,12 @@
<!--[if lt IE 10]> <!--[if lt IE 10]>
<style type="text/css">#ienotice {display:block !important;} #oldienotice {display:block !important;}</style> <style type="text/css">#ienotice {display:block !important;} #oldienotice {display:block !important;}</style>
<![endif]--> <![endif]-->
<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png?{$VERSION|rawurlencode}"> <link rel="apple-touch-icon" href="apple-touch-icon.png?{$VERSION|rawurlencode}" sizes="180x180" />
<link rel="icon" type="image/png" href="favicon-32x32.png" sizes="32x32?{$VERSION|rawurlencode}"> <link rel="icon" type="image/png" href="favicon-32x32.png?{$VERSION|rawurlencode}" sizes="32x32" />
<link rel="icon" type="image/png" href="favicon-16x16.png" sizes="16x16?{$VERSION|rawurlencode}"> <link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}"> <link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00"> <link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
<meta name="theme-color" content="#ffe57e"> <meta name="theme-color" content="#ffe57e" />
</head> </head>
<body role="document"> <body role="document">
<nav class="navbar navbar-inverse navbar-static-top"> <nav class="navbar navbar-inverse navbar-static-top">

12
tpl/bootstrap-dark.html
View File

@ -23,12 +23,12 @@
<!--[if lt IE 10]> <!--[if lt IE 10]>
<style type="text/css">#ienotice {display:block !important;} #oldienotice {display:block !important;}</style> <style type="text/css">#ienotice {display:block !important;} #oldienotice {display:block !important;}</style>
<![endif]--> <![endif]-->
<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png?{$VERSION|rawurlencode}"> <link rel="apple-touch-icon" href="apple-touch-icon.png?{$VERSION|rawurlencode}" sizes="180x180" />
<link rel="icon" type="image/png" href="favicon-32x32.png" sizes="32x32?{$VERSION|rawurlencode}"> <link rel="icon" type="image/png" href="favicon-32x32.png?{$VERSION|rawurlencode}" sizes="32x32" />
<link rel="icon" type="image/png" href="favicon-16x16.png" sizes="16x16?{$VERSION|rawurlencode}"> <link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}"> <link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00"> <link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
<meta name="theme-color" content="#ffe57e"> <meta name="theme-color" content="#ffe57e" />
</head> </head>
<body role="document"> <body role="document">
<nav class="navbar navbar-inverse navbar-static-top"> <nav class="navbar navbar-inverse navbar-static-top">

12
tpl/bootstrap-page.html
View File

@ -23,12 +23,12 @@
<!--[if lt IE 10]> <!--[if lt IE 10]>
<style type="text/css">#ienotice {display:block !important;} #oldienotice {display:block !important;}</style> <style type="text/css">#ienotice {display:block !important;} #oldienotice {display:block !important;}</style>
<![endif]--> <![endif]-->
<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png?{$VERSION|rawurlencode}"> <link rel="apple-touch-icon" href="apple-touch-icon.png?{$VERSION|rawurlencode}" sizes="180x180" />
<link rel="icon" type="image/png" href="favicon-32x32.png" sizes="32x32?{$VERSION|rawurlencode}"> <link rel="icon" type="image/png" href="favicon-32x32.png?{$VERSION|rawurlencode}" sizes="32x32" />
<link rel="icon" type="image/png" href="favicon-16x16.png" sizes="16x16?{$VERSION|rawurlencode}"> <link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}"> <link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00"> <link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
<meta name="theme-color" content="#ffe57e"> <meta name="theme-color" content="#ffe57e" />
</head> </head>
<body role="document"> <body role="document">
<nav class="navbar navbar-default navbar-static-top"> <nav class="navbar navbar-default navbar-static-top">

12
tpl/bootstrap.html
View File

@ -23,12 +23,12 @@
<!--[if lt IE 10]> <!--[if lt IE 10]>
<style type="text/css">#ienotice {display:block !important;} #oldienotice {display:block !important;}</style> <style type="text/css">#ienotice {display:block !important;} #oldienotice {display:block !important;}</style>
<![endif]--> <![endif]-->
<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png?{$VERSION|rawurlencode}"> <link rel="apple-touch-icon" href="apple-touch-icon.png?{$VERSION|rawurlencode}" sizes="180x180" />
<link rel="icon" type="image/png" href="favicon-32x32.png" sizes="32x32?{$VERSION|rawurlencode}"> <link rel="icon" type="image/png" href="favicon-32x32.png?{$VERSION|rawurlencode}" sizes="32x32" />
<link rel="icon" type="image/png" href="favicon-16x16.png" sizes="16x16?{$VERSION|rawurlencode}"> <link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}"> <link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00"> <link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
<meta name="theme-color" content="#ffe57e"> <meta name="theme-color" content="#ffe57e" />
</head> </head>
<body role="document"> <body role="document">
<nav class="navbar navbar-default navbar-static-top"> <nav class="navbar navbar-default navbar-static-top">

12
tpl/page.html
View File

@ -18,12 +18,12 @@
<!--[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]-->
<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png?{$VERSION|rawurlencode}"> <link rel="apple-touch-icon" href="apple-touch-icon.png?{$VERSION|rawurlencode}" sizes="180x180" />
<link rel="icon" type="image/png" href="favicon-32x32.png" sizes="32x32?{$VERSION|rawurlencode}"> <link rel="icon" type="image/png" href="favicon-32x32.png?{$VERSION|rawurlencode}" sizes="32x32" />
<link rel="icon" type="image/png" href="favicon-16x16.png" sizes="16x16?{$VERSION|rawurlencode}"> <link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}"> <link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00"> <link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
<meta name="theme-color" content="#ffe57e"> <meta name="theme-color" content="#ffe57e" />
</head> </head>
<body> <body>
<header> <header>

8
tst/model.php
View File

@ -236,16 +236,16 @@ class modelTest extends PHPUnit_Framework_TestCase
$this->assertTrue($store->exists($ids[$key]), "paste $key exists after storing it"); $this->assertTrue($store->exists($ids[$key]), "paste $key exists after storing it");
} }
$this->_model->purge(10); $this->_model->purge(10);
foreach (array_keys($ids) as $key) foreach ($ids as $key => $id)
{ {
if (in_array($key, array('x', 'y', 'z'))) if (in_array($key, array('x', 'y', 'z')))
{ {
$this->assertTrue($this->_model->getPaste($ids[$key])->exists(), "paste $key exists after purge"); $this->assertTrue($this->_model->getPaste($id)->exists(), "paste $key exists after purge");
$this->_model->getPaste($ids[$key])->delete(); $this->_model->getPaste($id)->delete();
} }
else else
{ {
$this->assertFalse($this->_model->getPaste($ids[$key])->exists(), "paste $key was purged"); $this->assertFalse($this->_model->getPaste($id)->exists(), "paste $key was purged");
} }
} }
} }

5
tst/privatebin/data.php
View File

@ -89,11 +89,12 @@ class privatebin_dataTest extends PHPUnit_Framework_TestCase
{ {
if (in_array($key, array('x', 'y', 'z'))) if (in_array($key, array('x', 'y', 'z')))
{ {
$this->assertTrue($this->_model->exists($ids[$key]), "paste $key exists after purge"); $this->assertTrue($this->_model->exists($id), "paste $key exists after purge");
$this->_model->delete($id);
} }
else else
{ {
$this->assertFalse($this->_model->exists($ids[$key]), "paste $key was purged"); $this->assertFalse($this->_model->exists($id), "paste $key was purged");
} }
} }
} }

6
tst/privatebin/db.php
View File

@ -95,12 +95,12 @@ class privatebin_dbTest extends PHPUnit_Framework_TestCase
{ {
if (in_array($key, array('x', 'y', 'z'))) if (in_array($key, array('x', 'y', 'z')))
{ {
$this->assertTrue($this->_model->exists($ids[$key]), "paste $key exists after purge"); $this->assertTrue($this->_model->exists($id), "paste $key exists after purge");
$this->_model->delete($ids[$key]); $this->_model->delete($id);
} }
else else
{ {
$this->assertFalse($this->_model->exists($ids[$key]), "paste $key was purged"); $this->assertFalse($this->_model->exists($id), "paste $key was purged");
} }
} }
} }