Merge branch 'master' into drop-legacy-zerobin-support

CHANGELOG.md

@@ -11,6 +11,7 @@
 * CHANGED: Jdenticons are now used as the default icons
 * CHANGED: Upgrading libraries to: jdenticon 2.0.0
 * CHANGED: Minimum required PHP version is 7.4, due to a change in the jdenticon library
+* CHANGED: Set bootstrap5 template as default for PrivateBin (#1572)
 * FIXED: Name mismatches in attached files (#1584)
 * FIXED: Unable to paste attachments from clipboard (#1589)
 

README.md

@@ -79,7 +79,7 @@ file](https://github.com/PrivateBin/PrivateBin/wiki/Configuration):
 * File upload support, image, media and PDF preview (disabled by default, size
   limit adjustable)
 
-* Templates: By default there are bootstrap CSS, darkstrap and "classic ZeroBin"
+* Templates: By default there are bootstrap5, bootstrap CSS and darkstrap
   to choose from and it is easy to adapt these to your own websites layout or
   create your own.
 

cfg/conf.sample.php

@@ -42,7 +42,7 @@ defaultformatter = "plaintext"
 ; size limit per paste or comment in bytes, defaults to 10 Mebibytes
 sizelimit = 10485760
 
-; by default PrivateBin use "bootstrap" template (tpl/bootstrap.php).
+; by default PrivateBin use "bootstrap5" template (tpl/bootstrap5.php).
 ; Optionally you can enable the template selection menu, which uses
 ; a session cookie to store the choice until the browser is closed.
 templateselection = false
@@ -56,12 +56,12 @@ availabletemplates[] = "bootstrap-dark-page"
 availabletemplates[] = "bootstrap-compact"
 availabletemplates[] = "bootstrap-compact-page"
 
-; set the template your installs defaults to, defaults to "bootstrap" (tpl/bootstrap.php), also
-; bootstrap variants: "bootstrap-dark", "bootstrap-compact", "bootstrap-page",
+; set the template your installs defaults to, defaults to "bootstrap5" (tpl/bootstrap5.php), also
+; bootstrap template (tpl/bootstrap.php) and it's variants: "bootstrap-dark", "bootstrap-compact", "bootstrap-page",
 ; which can be combined with "-dark" and "-compact" for "bootstrap-dark-page",
-; "bootstrap-compact-page" and finally "bootstrap5" (tpl/bootstrap5.php) - previews at:
+; "bootstrap-compact-page" - previews at:
 ; https://privatebin.info/screenshots.html
-; template = "bootstrap"
+; template = "bootstrap5"
 
 ; (optional) info text to display
 ; use single, instead of double quotes for HTML attributes

lib/Configuration.php

@@ -46,7 +46,7 @@ class Configuration
             'syntaxhighlightingtheme'  => '',
             'sizelimit'                => 10485760,
             'templateselection'        => false,
-            'template'                 => 'bootstrap',
+            'template'                 => 'bootstrap5',
             'availabletemplates'       => array(
                 'bootstrap5',
                 'bootstrap',

lib/TemplateSwitcher.php

@@ -25,7 +25,7 @@ class TemplateSwitcher
      * @static
      * @var    string
      */
-    protected static $_templateFallback = 'bootstrap';
+    protected static $_templateFallback = 'bootstrap5';
 
     /**
      * available templates

tst/TemplateSwitcherTest.php

@@ -10,7 +10,7 @@ class TemplateSwitcherTest extends TestCase
     {
         $conf = new Configuration;
 
-        $defaultTemplateFallback        = 'bootstrap';
+        $defaultTemplateFallback        = 'bootstrap5';
         $existingTemplateFallback       = 'bootstrap-dark';
         $wrongBootstrapTemplateFallback = 'bootstrap-wrong';
         $wrongTemplateFallback          = 'wrong-template';
@@ -38,7 +38,7 @@ class TemplateSwitcherTest extends TestCase
 
     public function testGetTemplate()
     {
-        $defaultTemplateFallback = 'bootstrap';
+        $defaultTemplateFallback = 'bootstrap5';
         $customTemplate          = 'bootstrap-dark';
         $customWrongTemplate     = 'bootstrap-wrong';