Browse Source

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

rugk 3 years ago
parent
commit
58f5c8601f

+ 6 - 6
tpl/bootstrap-compact.html

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

+ 6 - 6
tpl/bootstrap-dark-page.html

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

+ 6 - 6
tpl/bootstrap-dark.html

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

+ 6 - 6
tpl/bootstrap-page.html

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

+ 6 - 6
tpl/bootstrap.html

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

+ 6 - 6
tpl/page.html

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

+ 4 - 4
tst/model.php

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

+ 3 - 2
tst/privatebin/data.php

@@ -89,11 +89,12 @@ class privatebin_dataTest extends PHPUnit_Framework_TestCase
         {
             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
             {
-                $this->assertFalse($this->_model->exists($ids[$key]), "paste $key was purged");
+                $this->assertFalse($this->_model->exists($id), "paste $key was purged");
             }
         }
     }

+ 3 - 3
tst/privatebin/db.php

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