fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 11:11:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnecessary duplicate method calls

Browse source
This commit is contained in:
Kijin Sung 2020-12-13 22:17:50 +09:00
parent bca7a9ae72
commit 88d31de75d
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,20 +31,21 @@ class DisplayHandler extends Handler
$this->gz_enabled = TRUE; $this->gz_enabled = TRUE;
} }
// Extract contents to display by the request method // Extract contents to display by the response method
$responseMethod = Context::getResponseMethod();
if(Context::get('xeVirtualRequestMethod') == 'xml') if(Context::get('xeVirtualRequestMethod') == 'xml')
{ {
$handler = new VirtualXMLDisplayHandler(); $handler = new VirtualXMLDisplayHandler();
} }
elseif(Context::getResponseMethod() == 'JSON' || isset($_POST['_rx_ajax_compat'])) elseif($responseMethod == 'JSON' || isset($_POST['_rx_ajax_compat']))
{ {
$handler = new JSONDisplayHandler(); $handler = new JSONDisplayHandler();
} }
elseif(Context::getResponseMethod() == 'JS_CALLBACK') elseif($responseMethod == 'JS_CALLBACK')
{ {
$handler = new JSCallbackDisplayHandler(); $handler = new JSCallbackDisplayHandler();
} }
elseif(Context::getResponseMethod() == 'XMLRPC') elseif($responseMethod == 'XMLRPC')
{ {
$handler = new XMLDisplayHandler(); $handler = new XMLDisplayHandler();
if(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE) if(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
@ -52,7 +53,7 @@ class DisplayHandler extends Handler
$this->gz_enabled = FALSE; $this->gz_enabled = FALSE;
} }
} }
elseif(Context::getResponseMethod() == 'RAW') elseif($responseMethod == 'RAW')
{ {
$handler = new RawDisplayHandler(); $handler = new RawDisplayHandler();
} }
@ -104,21 +105,22 @@ class DisplayHandler extends Handler
// header output // header output
$httpStatusCode = $oModule->getHttpStatusCode(); $httpStatusCode = $oModule->getHttpStatusCode();
if($httpStatusCode !== 200 && !in_array(Context::getResponseMethod(), array('XMLRPC', 'JSON', 'JS_CALLBACK'))) $responseMethod = Context::getResponseMethod();
if($httpStatusCode !== 200 && !in_array($responseMethod, array('XMLRPC', 'JSON', 'JS_CALLBACK')))
{ {
self::_printHttpStatusCode($httpStatusCode); self::_printHttpStatusCode($httpStatusCode);
} }
else else
{ {
if(Context::getResponseMethod() == 'JSON' || Context::getResponseMethod() == 'JS_CALLBACK' || isset($_POST['_rx_ajax_compat'])) if($responseMethod == 'JSON' || $responseMethod == 'JS_CALLBACK' || isset($_POST['_rx_ajax_compat']))
{ {
self::_printJSONHeader(); self::_printJSONHeader();
} }
elseif(Context::getResponseMethod() == 'XMLRPC') elseif($responseMethod == 'XMLRPC')
{ {
self::_printXMLHeader(); self::_printXMLHeader();
} }
elseif(Context::getResponseMethod() == 'RAW' && $content_type = Context::get('response_content_type')) elseif($responseMethod == 'RAW' && $content_type = Context::get('response_content_type'))
{ {
self::_printCustomContentTypeHeader($content_type); self::_printCustomContentTypeHeader($content_type);
} }
@ -191,6 +193,7 @@ class DisplayHandler extends Handler
// Print debug information. // Print debug information.
$debug_output = ''; $debug_output = '';
$response_type = Context::getResponseMethod();
foreach ($display_types as $display_type) foreach ($display_types as $display_type)
{ {
if ($display_type === 'panel') if ($display_type === 'panel')
@ -235,7 +238,8 @@ class DisplayHandler extends Handler
} }
} }
} }
switch (Context::getResponseMethod())
switch ($response_type)
{ {
case 'HTML': case 'HTML':
$json_options = defined('JSON_PRETTY_PRINT') ? (JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) : 0; $json_options = defined('JSON_PRETTY_PRINT') ? (JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) : 0;
@ -271,7 +275,7 @@ class DisplayHandler extends Handler
} }
else else
{ {
if ($display_type === 'comment' && Context::getResponseMethod() !== 'HTML') if ($display_type === 'comment' && $response_type !== 'HTML')
{ {
continue; continue;
} }