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

Fix #1228 #1243 thanks to @nemo9l

Browse source
This commit is contained in:
Kijin Sung 2020-02-14 16:27:10 +09:00
parent 4ac0a6bf66
commit 030f27d488
5 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -175,27 +175,27 @@ class DisplayHandler extends Handler
{
$data = Rhymix\Framework\Debug::getDebugData();
$display_content = array_fill_keys(config('debug.display_content'), true);
if (count($display_content) && !isset($display_content['entries']))
if (!isset($display_content['entries']))
{
$data->entries = null;
}
if (count($display_content) && !isset($display_content['queries']))
if (!isset($display_content['queries']))
{
unset($data->queries);
}
if (count($display_content) && !isset($display_content['slow_queries']))
if (!isset($display_content['slow_queries']))
{
unset($data->slow_queries);
}
if (count($display_content) && !isset($display_content['slow_triggers']))
if (!isset($display_content['slow_triggers']))
{
unset($data->slow_triggers);
}
if (count($display_content) && !isset($display_content['slow_widgets']))
if (!isset($display_content['slow_widgets']))
{
unset($data->slow_widgets);
}
if (count($display_content) && !isset($display_content['slow_remote_requests']))
if (!isset($display_content['slow_remote_requests']))
{
unset($data->slow_remote_requests);
}

10
common/defaults/config.php
View file

@ -88,13 +88,13 @@ return array(
),
'debug' => array(
'enabled' => true,
'log_slow_queries' => 0,
'log_slow_triggers' => 0,
'log_slow_widgets' => 0,
'log_slow_remote_requests' => 0,
'log_slow_queries' => 0.25,
'log_slow_triggers' => 0.25,
'log_slow_widgets' => 0.25,
'log_slow_remote_requests' => 1.25,
'log_filename' => null,
'display_type' => array('comment'),
'display_content' => array(),
'display_content' => array('request_info', 'entries', 'errors', 'queries'),
'display_to' => 'admin',
'write_error_log' => 'fatal',
'allow' => array(),

16
common/tpl/debug_comment.html
View file

@ -2,7 +2,7 @@
<?php echo '[' . $data->timestamp . ']' . "\n"; ?>
<?php if (!count($display_content) || isset($display_content['request_info'])): ?>
<?php if (isset($display_content['request_info'])): ?>
Request / Response
==================
Request URL: <?php echo $data->url . "\n"; ?>
@ -30,7 +30,7 @@ Peak Memory Usage: <?php echo sprintf('%0.1f MB', memory_get_peak_usage(true) /
Included Files: <?php echo count(get_included_files()) . "\n"; ?>
<?php endif; ?>
<?php if (!count($display_content) || isset($display_content['entries'])): ?>
<?php if (isset($display_content['entries'])): ?>
Debug Entries
=============
<?php
@ -58,7 +58,7 @@ Debug Entries
?>
<?php endif; ?>
<?php if (!count($display_content) || isset($display_content['errors'])): ?>
<?php if (isset($display_content['errors'])): ?>
PHP Errors and Warnings
=======================
<?php
@ -78,7 +78,7 @@ PHP Errors and Warnings
?>
<?php endif; ?>
<?php if (!count($display_content) || isset($display_content['queries'])): ?>
<?php if (isset($display_content['queries'])): ?>
Database Queries
================
<?php
@ -101,7 +101,7 @@ Database Queries
?>
<?php endif; ?>
<?php if (!count($display_content) || isset($display_content['slow_queries'])): ?>
<?php if (isset($display_content['slow_queries'])): ?>
Slow Queries
============
<?php
@ -124,7 +124,7 @@ Slow Queries
?>
<?php endif; ?>
<?php if (!count($display_content) || isset($display_content['slow_triggers'])): ?>
<?php if (isset($display_content['slow_triggers'])): ?>
Slow Triggers
=============
<?php
@ -142,7 +142,7 @@ Slow Triggers
?>
<?php endif; ?>
<?php if (!count($display_content) || isset($display_content['slow_widgets'])): ?>
<?php if (isset($display_content['slow_widgets'])): ?>
Slow Widgets
============
<?php
@ -159,7 +159,7 @@ Slow Widgets
?>
<?php endif; ?>
<?php if (!count($display_content) || isset($display_content['slow_remote_requests'])): ?>
<?php if (isset($display_content['slow_remote_requests'])): ?>
Slow Remote Requests
====================
<?php

2
modules/admin/admin.admin.controller.php
View file

@ -832,7 +832,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::set('debug.write_error_log', strval($vars->debug_write_error_log) ?: 'fatal');
// Debug content
$debug_content = array_values($vars->debug_display_content);
$debug_content = array_values($vars->debug_display_content ?: array());
Rhymix\Framework\Config::set('debug.display_content', $debug_content);
// Log filename

16
modules/admin/tpl/config_debug.html
View file

@ -56,14 +56,14 @@
<div class="x_control-group">
<label class="x_control-label" for="debug_log_slow_widgets">{$lang->debug_display_content}</label>
<div class="x_controls">
<label for="debug_display_content_request_info" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_request_info" value="request_info" checked="checked"|cond="!count($debug_display_content) || in_array('request_info', $debug_display_content)" /> {$lang->debug_display_content_request_info}</label>
<label for="debug_display_content_entries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_entries" value="entries" checked="checked"|cond="!count($debug_display_content) || in_array('entries', $debug_display_content)" /> {$lang->debug_display_content_entries}</label>
<label for="debug_display_content_errors" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_errors" value="errors" checked="checked"|cond="!count($debug_display_content) || in_array('errors', $debug_display_content)" /> {$lang->debug_display_content_errors}</label>
<label for="debug_display_content_queries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_queries" value="queries" checked="checked"|cond="!count($debug_display_content) || in_array('queries', $debug_display_content)" /> {$lang->debug_display_content_queries}</label>
<label for="debug_display_content_slow_queries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_queries" value="slow_queries" checked="checked"|cond="!count($debug_display_content) || in_array('slow_queries', $debug_display_content)" /> {$lang->debug_display_content_slow_queries}</label>
<label for="debug_display_content_slow_triggers" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_triggers" value="slow_triggers" checked="checked"|cond="!count($debug_display_content) || in_array('slow_triggers', $debug_display_content)" /> {$lang->debug_display_content_slow_triggers}</label>
<label for="debug_display_content_slow_widgets" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_widgets" value="slow_widgets" checked="checked"|cond="!count($debug_display_content) || in_array('slow_widgets', $debug_display_content)" /> {$lang->debug_display_content_slow_widgets}</label>
<label for="debug_display_content_slow_remote_requests" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_remote_requests" value="slow_remote_requests" checked="checked"|cond="!count($debug_display_content) || in_array('slow_remote_requests', $debug_display_content)" /> {$lang->debug_display_content_slow_remote_requests}</label>
<label for="debug_display_content_request_info" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_request_info" value="request_info" checked="checked"|cond="in_array('request_info', $debug_display_content)" /> {$lang->debug_display_content_request_info}</label>
<label for="debug_display_content_entries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_entries" value="entries" checked="checked"|cond="in_array('entries', $debug_display_content)" /> {$lang->debug_display_content_entries}</label>
<label for="debug_display_content_errors" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_errors" value="errors" checked="checked"|cond="in_array('errors', $debug_display_content)" /> {$lang->debug_display_content_errors}</label>
<label for="debug_display_content_queries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_queries" value="queries" checked="checked"|cond="in_array('queries', $debug_display_content)" /> {$lang->debug_display_content_queries}</label>
<label for="debug_display_content_slow_queries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_queries" value="slow_queries" checked="checked"|cond="in_array('slow_queries', $debug_display_content)" /> {$lang->debug_display_content_slow_queries}</label>
<label for="debug_display_content_slow_triggers" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_triggers" value="slow_triggers" checked="checked"|cond="in_array('slow_triggers', $debug_display_content)" /> {$lang->debug_display_content_slow_triggers}</label>
<label for="debug_display_content_slow_widgets" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_widgets" value="slow_widgets" checked="checked"|cond="in_array('slow_widgets', $debug_display_content)" /> {$lang->debug_display_content_slow_widgets}</label>
<label for="debug_display_content_slow_remote_requests" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_remote_requests" value="slow_remote_requests" checked="checked"|cond="in_array('slow_remote_requests', $debug_display_content)" /> {$lang->debug_display_content_slow_remote_requests}</label>
</div>
</div>
<div class="x_control-group">