@@ -65,7 +65,7 @@ public static function flattenParameters($array, $prefix = '')
6565 $ key = '[ ' . $ key . '] ' ;
6666 }
6767 if (is_array ($ value )) {
68- $ result = $ result+ static ::flattenParameters ($ value , $ prefix . $ key );
68+ $ result = $ result + static ::flattenParameters ($ value , $ prefix . $ key );
6969 } else {
7070 $ result [$ prefix . $ key ] = $ value ;
7171 }
@@ -136,6 +136,10 @@ public static function getExecutionTabPane($requestId, $request)
136136 $ html [] = htmlspecialchars ('Aborted: Exception, "die()" or "exit" encountered ' );
137137 } elseif ($ request ['type ' ] == 'ok ' ) {
138138 $ html [] = htmlspecialchars ('Rendered page: ' . $ request ['router ' ]['url ' ]);
139+ } elseif ($ request ['type ' ] == 'json ' ) {
140+ $ html [] = htmlspecialchars ('Rendered JSON: ' . $ request ['router ' ]['url ' ]);
141+ } elseif ($ request ['type ' ] == 'download ' ) {
142+ $ html [] = htmlspecialchars ('Rendered download: ' . $ request ['router ' ]['url ' ]);
139143 } elseif ($ request ['type ' ] == 'redirect ' ) {
140144 $ html [] = htmlspecialchars ('Redirected to: ' . $ request ['redirect ' ]);
141145 }
@@ -328,7 +332,9 @@ public static function getApiCallsTabPane($requestId, $request)
328332 $ tables ['details ' ]['data_received ' ] = $ call ['result ' ]['data ' ] ? '<a href="data:text/plain;base64, ' . base64_encode ($ call ['result ' ]['data ' ]) . '" target="_blank">View ( ' . strlen ($ call ['result ' ]['data ' ]) . ' bytes)</a> ' : '- ' ;
329333 $ tables ['details ' ]['headers_sent ' ] = $ call ['headers ' ] ? '<a href="data:text/plain;base64, ' . base64_encode (var_export ($ call ['headers ' ], true )) . '" target="_blank"> ' . count ($ call ['headers ' ]) . ' headers</a> ' : '- ' ;
330334 $ tables ['details ' ]['headers_received ' ] = $ call ['result ' ]['headers ' ] ? '<a href="data:text/plain;base64, ' . base64_encode (var_export ($ call ['result ' ]['headers ' ], true )) . '" target="_blank"> ' . count ($ call ['result ' ]['headers ' ]) . ' headers</a> ' : '- ' ;
331- $ tables ['timing ' ] = array_map (function ($ v ) {return sprintf ('%.2f ms ' , $ v * 1000 );}, $ call ['timing ' ]);
335+ $ tables ['timing ' ] = array_map (function ($ v ) {
336+ return sprintf ('%.2f ms ' , $ v * 1000 );
337+ }, $ call ['timing ' ]);
332338
333339 $ tables ['options ' ] = $ call ['options ' ];
334340 foreach ($ tables as $ table => $ fields ) {
@@ -398,7 +404,8 @@ public static function getLoggingTabPane($requestId, $request)
398404?>
399405<!DOCTYPE html>
400406<html>
401- <head>
407+
408+ <head>
402409 <base href="<?php echo Router::getBaseUrl (); ?> ">
403410 <title>MintyPHP Debugger</title>
404411 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -413,59 +420,61 @@ public static function getLoggingTabPane($requestId, $request)
413420 <!-- Include all compiled plugins (below), or include individual files as needed -->
414421 <script src="debugger/js/bootstrap.min.js"></script>
415422
416- </head>
417- <body>
418- <div class="container">
423+ </head>
419424
420- <div class="row">
421- <div class="col-md-4">
422- <h3>
423- <img src="debugger/img/minty_square.png" alt="MintyPHP logo" style="height: 24px; float:left; margin-right:10px;">
424- MintyPHP Debugger
425- </h3>
426- </div>
427- </div>
425+ <body>
426+ <div class="container">
428427
429- <div class="row">
430- <div class="col-md-4">
431- <?php echo DebugView::getRequestList (); ?>
432- </div>
433- <div class="col-md-8">
434- <div class="tab-content">
435- <?php $ last = count ($ _SESSION [Debugger::$ sessionKey ]) - 1 ;?>
436- <?php foreach ($ _SESSION [Debugger::$ sessionKey ] as $ i => $ request ): ?>
437- <div class="tab-pane <?php echo $ i == $ last ? 'active ' : '' ; ?> " id="debug-request-<?php echo $ i ?> ">
438- <?php echo DebugView::getTabList ($ i ); ?>
439- <div class="tab-content">
440- <?php echo DebugView::getRoutingTabPane ($ i , $ request ); ?>
441- <?php echo DebugView::getExecutionTabPane ($ i , $ request ); ?>
442- <?php echo DebugView::getSessionTabPane ($ i , $ request ); ?>
443- <?php echo DebugView::getQueriesTabPane ($ i , $ request ); ?>
444- <?php echo DebugView::getApiCallsTabPane ($ i , $ request ); ?>
445- <?php echo DebugView::getCacheTabPane ($ i , $ request ); ?>
446- <?php echo DebugView::getLoggingTabPane ($ i , $ request ); ?>
428+ <div class="row">
429+ <div class="col-md-4">
430+ <h3>
431+ <img src="debugger/img/minty_square.png" alt="MintyPHP logo" style="height: 24px; float:left; margin-right:10px;">
432+ MintyPHP Debugger
433+ </h3>
447434 </div>
448- </div>
449- <?php endforeach ;?>
450435 </div>
451- <script>
452- $(function () {
453- var classes=[];
454- $('#debug-request-<?php echo $ last ; ?> a[data-toggle="tab"]').each(function (e) {
455- classes.push($(this).attr('class'));
456- });
457- $(classes).each(function (i,c) {
458- $('a[data-toggle="tab"].'+c).on('shown.bs.tab', function () {
459- $('a[data-toggle="tab"].'+c).each(function () {
460- $(this).tab('show');
461- });
462- });
463- });
464- });
465- </script>
466- </div>
467- </div>
468436
469- </div>
437+ <div class="row">
438+ <div class="col-md-4">
439+ <?php echo DebugView::getRequestList (); ?>
440+ </div>
441+ <div class="col-md-8">
442+ <div class="tab-content">
443+ <?php $ last = count ($ _SESSION [Debugger::$ sessionKey ]) - 1 ; ?>
444+ <?php foreach ($ _SESSION [Debugger::$ sessionKey ] as $ i => $ request ) : ?>
445+ <div class="tab-pane <?php echo $ i == $ last ? 'active ' : '' ; ?> " id="debug-request-<?php echo $ i ?> ">
446+ <?php echo DebugView::getTabList ($ i ); ?>
447+ <div class="tab-content">
448+ <?php echo DebugView::getRoutingTabPane ($ i , $ request ); ?>
449+ <?php echo DebugView::getExecutionTabPane ($ i , $ request ); ?>
450+ <?php echo DebugView::getSessionTabPane ($ i , $ request ); ?>
451+ <?php echo DebugView::getQueriesTabPane ($ i , $ request ); ?>
452+ <?php echo DebugView::getApiCallsTabPane ($ i , $ request ); ?>
453+ <?php echo DebugView::getCacheTabPane ($ i , $ request ); ?>
454+ <?php echo DebugView::getLoggingTabPane ($ i , $ request ); ?>
455+ </div>
456+ </div>
457+ <?php endforeach ; ?>
458+ </div>
459+ <script>
460+ $(function() {
461+ var classes = [];
462+ $('#debug-request-<?php echo $ last ; ?> a[data-toggle="tab"]').each(function(e) {
463+ classes.push($(this).attr('class'));
464+ });
465+ $(classes).each(function(i, c) {
466+ $('a[data-toggle="tab"].' + c).on('shown.bs.tab', function() {
467+ $('a[data-toggle="tab"].' + c).each(function() {
468+ $(this).tab('show');
469+ });
470+ });
471+ });
472+ });
473+ </script>
474+ </div>
475+ </div>
476+
477+ </div>
470478</body>
471- </html>
479+
480+ </html>
0 commit comments