use require_once for style classes, set 'theme' in view

This commit is contained in:
Uwe Steinmann 2021-04-18 07:02:01 +02:00
parent 91a98ac6c6
commit 888d75953e

View File

@ -95,6 +95,12 @@ class UI extends UI_Default {
if(file_exists($filename)) { if(file_exists($filename)) {
$httpbasedir = 'ext/'.$extname.'/'; $httpbasedir = 'ext/'.$extname.'/';
break; break;
} else {
$filename = $settings->_rootDir.'ext/'.$extname.'/views/bootstrap/class.'.$class.".php";
if(file_exists($filename)) {
$httpbasedir = 'ext/'.$extname.'/';
break;
}
} }
$filename = ''; $filename = '';
} }
@ -109,12 +115,13 @@ class UI extends UI_Default {
$filename = ''; $filename = '';
if($filename) { if($filename) {
/* Always include the base class which defines class SeedDMS_Theme_Style */ /* Always include the base class which defines class SeedDMS_Theme_Style */
require($settings->_rootDir."views/".$theme."/class.".ucfirst($theme).".php"); require_once($settings->_rootDir."views/".$theme."/class.".ucfirst($theme).".php");
require($filename); require_once($filename);
$view = new $classname($params, $theme); $view = new $classname($params, $theme);
/* Set some configuration parameters */ /* Set some configuration parameters */
$view->setParam('refferer', $_SERVER['REQUEST_URI']); $view->setParam('refferer', $_SERVER['REQUEST_URI']);
$view->setParam('absbaseprefix', $settings->_httpRoot.$httpbasedir); $view->setParam('absbaseprefix', $settings->_httpRoot.$httpbasedir);
$view->setParam('theme', $theme);
$view->setParam('class', $class); $view->setParam('class', $class);
$view->setParam('session', $session); $view->setParam('session', $session);
$view->setParam('settings', $settings); $view->setParam('settings', $settings);