yetangitu/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2025-10-03 17:49:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix error when a custom template is not in the default available templates list

Browse source
This commit is contained in:
Ribas160 2025-06-18 14:51:11 +03:00
parent 4eb6555e3c
commit 44f8cfbfb8
4 changed files with 67 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/TemplateSwitcher.php
View file

@ -25,7 +25,7 @@ class TemplateSwitcher
* @static
* @var string
*/
protected static $_templateFallback;
protected static $_templateFallback = "bootstrap";
/**
* available templates
@ -59,6 +59,11 @@ class TemplateSwitcher
{
if (self::isTemplateAvailable($template)) {
self::$_templateFallback = $template;
if (!in_array($template, self::getAvailableTemplates())) {
// Add custom template to the available templates list
self::$_availableTemplates[] = $template;
}
}
}
@ -96,7 +101,14 @@ class TemplateSwitcher
*/
public static function isTemplateAvailable(string $template): bool
{
return in_array($template, self::getAvailableTemplates());
$available = in_array($template, self::getAvailableTemplates());
if (!$available && !View::isBootstrapTemplate($template)) {
$path = View::getTemplateFilePath($template);
$available = file_exists($path);
}
return $available;
}
/**

28
lib/View.php
View file

@ -49,8 +49,7 @@ class View
*/
public function draw($template)
{
$file = substr($template, 0, 10) === 'bootstrap-' ? 'bootstrap' : $template;
$path = PATH . 'tpl' . DIRECTORY_SEPARATOR . $file . '.php';
$path = self::getTemplateFilePath($template);
if (!file_exists($path)) {
throw new Exception('Template ' . $template . ' not found!', 80);
}
@ -58,6 +57,31 @@ class View
include $path;
}
/**
* Get template file path
*
* @access public
* @param string $template
* @return string
*/
public static function getTemplateFilePath(string $template): string
{
$file = self::isBootstrapTemplate($template) ? 'bootstrap' : $template;
return PATH . 'tpl' . DIRECTORY_SEPARATOR . $file . '.php';
}
/**
* Is the template a variation of the bootstrap template
*
* @access public
* @param string $template
* @return bool
*/
public static function isBootstrapTemplate(string $template): bool
{
return substr($template, 0, 10) === 'bootstrap-';
}
/**
* echo script tag incl. SRI hash for given script file
*

14
tst/TemplateSwitcherTest.php
View file

@ -10,15 +10,21 @@ class TemplateSwitcherTest extends TestCase
{
$conf = new Configuration;
$defaultTemplateFallback = 'bootstrap';
$existingTemplateFallback = 'bootstrap-dark';
$wrongTemplateFallback = 'bootstrap-wrong';
$wrongBootstrapTemplateFallback = 'bootstrap-wrong';
$wrongTemplateFallback = 'wrong-template';
TemplateSwitcher::setAvailableTemplates($conf->getKey('availabletemplates'));
TemplateSwitcher::setTemplateFallback($existingTemplateFallback);
$this->assertEquals($existingTemplateFallback, TemplateSwitcher::getTemplate(), 'Correct template fallback');
TemplateSwitcher::setTemplateFallback($wrongBootstrapTemplateFallback);
$this->assertEquals($defaultTemplateFallback, TemplateSwitcher::getTemplate(), 'Wrong bootstrap template fallback');
TemplateSwitcher::setTemplateFallback($wrongTemplateFallback);
$this->assertEquals($existingTemplateFallback, TemplateSwitcher::getTemplate(), 'Wrong template fallback');
$this->assertEquals($defaultTemplateFallback, TemplateSwitcher::getTemplate(), 'Wrong template fallback');
TemplateSwitcher::setTemplateFallback($existingTemplateFallback);
$this->assertEquals($existingTemplateFallback, TemplateSwitcher::getTemplate(), 'Correct template fallback');
}
public function testSetAvailableTemplates()

16
tst/ViewTest.php
View file

@ -142,4 +142,20 @@ class ViewTest extends TestCase
$this->expectExceptionCode(80);
$test->draw('123456789 does not exist!');
}
public function testTemplateFilePath()
{
$template = 'bootstrap';
$templatePath = PATH . 'tpl' . DIRECTORY_SEPARATOR . $template . '.php';
$path = View::getTemplateFilePath($template);
$this->assertEquals($templatePath, $path, 'Template file path');
}
public function testIsBootstrapTemplate()
{
$bootstrapTemplate = 'bootstrap-dark';
$nonBootstrapTemplate = 'page';
$this->assertTrue(View::isBootstrapTemplate($bootstrapTemplate), 'Is bootstrap template');
$this->assertFalse(View::isBootstrapTemplate($nonBootstrapTemplate), 'Is not bootstrap template');
}
}