Merge branch 'security/rve-2026-8'

This commit is contained in:
Kijin Sung 2026-05-11 18:17:41 +09:00
commit a0af01c76a
16 changed files with 34 additions and 141 deletions

View file

@ -210,9 +210,10 @@ class ModuleObject extends BaseObject
return;
}
// Set admin layout
if(preg_match('/^disp[A-Z][a-z0-9\_]+Admin/', $this->act))
// Special treatment for admin actions
if(preg_match('/^disp(?:Admin[A-Z]|[A-Z][a-z0-9\_]+Admin)/', $this->act))
{
// Set admin layout
if(config('view.manager_layout') === 'admin')
{
$this->setLayoutPath('modules/admin/tpl');
@ -223,6 +224,16 @@ class ModuleObject extends BaseObject
$oTemplate = new Rhymix\Framework\Template('modules/admin/tpl', '_admin_common.html');
$oTemplate->compile();
}
// Refresh session
if (!isset($_SESSION['RHYMIX']['admin_accessed']) && !headers_sent())
{
if (!isset($_SESSION['RHYMIX']['last_refresh']) || $_SESSION['RHYMIX']['last_refresh'] < time() - 10)
{
$_SESSION['RHYMIX']['admin_accessed'] = \RX_TIME;
Rhymix\Framework\Session::refresh(true);
}
}
}
// Execute init