fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 04:24:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #881 disable display.before triggers if site is locked and visitor is not admin

Browse source
This commit is contained in:
Kijin Sung 2017-07-23 22:21:28 +09:00
parent 468b1cc00f
commit 44be0468ab
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
classes/display/DisplayHandler.class.php
View file

@ -15,7 +15,6 @@ class DisplayHandler extends Handler
public static $debug_printed = 0; public static $debug_printed = 0;
var $content_size = 0; // /< The size of displaying contents var $content_size = 0; // /< The size of displaying contents
var $gz_enabled = FALSE; // / <a flog variable whether to call contents after compressing by gzip var $gz_enabled = FALSE; // / <a flog variable whether to call contents after compressing by gzip
var $handler = NULL;
/** /**
* print either html or xml content given oModule object * print either html or xml content given oModule object
@ -59,18 +58,22 @@ class DisplayHandler extends Handler
$output = $handler->toDoc($oModule); $output = $handler->toDoc($oModule);
// call a trigger before display // Skip the following if site lock is effective
ModuleHandler::triggerCall('display', 'before', $output); if(!config('lock.locked') || Context::get('logged_info')->is_admin === 'Y')
$original_output = $output;
// execute add-on
$called_position = 'before_display_content';
$oAddonController = getController('addon');
$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
if(file_exists($addon_file)) include($addon_file);
if($output === false || $output === null || $output instanceof Object)
{ {
$output = $original_output; // call a trigger before display
ModuleHandler::triggerCall('display', 'before', $output);
$original_output = $output;
// execute add-on
$called_position = 'before_display_content';
$oAddonController = getController('addon');
$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
if(file_exists($addon_file)) include($addon_file);
if($output === false || $output === null || $output instanceof Object)
{
$output = $original_output;
}
} }
if(method_exists($handler, "prepareToPrint")) if(method_exists($handler, "prepareToPrint"))
@ -140,7 +143,6 @@ class DisplayHandler extends Handler
public function getDebugInfo(&$output = null) public function getDebugInfo(&$output = null)
{ {
// Check if debugging information has already been printed. // Check if debugging information has already been printed.
if (self::$debug_printed) if (self::$debug_printed)
{ {
return; return;