mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-21 05:02:02 +02:00
Code Issues Releases Wiki Activity

3rd party legacy code fix attempt

Browse Source
This commit is contained in:
SecretR 2012-11-28 09:35:06 +02:00
parent e2c2c48511
commit 6c49eddcba
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
e107_admin/auth.php
View File

@ -36,7 +36,8 @@ if (ADMIN)
$asuser = e107::getSystemUser(e107::getUser()->getSessionDataAs(), false);
e107::getMessage()->addInfo('Successfully logged in as '.($asuser && $asuser->getValue('name') ? $asuser->getValue('name') : 'unknown'). ' <a href="'.e_ADMIN_ABS.'users.php?logoutas">[logout]</a>');
}
require_once (e_ADMIN."header.php");
// NEW, legacy 3rd party code fix, header called inside the footer o.O
if(deftrue('e_ADMIN_UI')) require_once (e_ADMIN."header.php");
}
/*

12
e107_admin/footer.php
View File

@ -21,6 +21,18 @@ $In_e107_Footer = TRUE; // For registered shutdown function
global $error_handler,$db_time,$ADMIN_FOOTER;
// Legacy fix - call header if not already done, mainly fixing left side menus to work proper
if(!deftrue('e_ADMIN_UI') && !deftrue('ADMIN_AREA'))
{
// close the old buffer
$content = ob_get_contents();
ob_get_clean();
// open new
ob_start();
require_once(e_ADMIN.'header.php');
echo $content;
}
// Clean session shutdown
e107::getSession()->shutdown();

5
e107_handlers/admin_ui.php
View File

@ -1011,6 +1011,11 @@ class e_admin_dispatcher
*/
public function __construct($request = null, $response = null, $auto_observe = true)
{
// we let know some admin routines we are in UI mod - related with some legacy checks and fixes
if(!defined('e_ADMIN_UI'))
{
define('e_ADMIN_UI', true);
}
if(null === $request || !is_object($request))
{
$request = new e_admin_request($request);