Version Description
- Fix two fundamental stability and compatibility issues (great news)
- Various visual tweaks
- Handle some uncommon use cases of the HTTP API
Download this release
Release Info
| Developer | johnbillion |
| Plugin |  Query Monitor |
| Version | 2.6.2 |
| Comparing to | |
| See all releases | |
Code changes from version 2.6.1 to 2.6.2
- Backtrace.php +94 -13
- LICENSE +339 -0
- Util.php +9 -40
- assets/query-monitor.css +10 -15
- collectors/db_queries.php +7 -5
- collectors/hooks.php +4 -7
- collectors/http.php +56 -10
- collectors/php_errors.php +2 -0
- dispatchers/Html.php +0 -7
- output/headers/php_errors.php +1 -1
- output/html/db_queries.php +5 -3
- output/html/environment.php +48 -17
- output/html/http.php +25 -35
- output/html/overview.php +3 -3
- output/html/php_errors.php +2 -2
- output/html/transients.php +2 -2
- query-monitor.php +9 -9
- readme.txt +6 -1
- screenshot-1.png +0 -0
- screenshot-2.png +0 -0
- screenshot-3.png +0 -0
- screenshot-4.png +0 -0
- screenshot-5.png +0 -0
- screenshot-6.png +0 -0
- screenshot-7.png +0 -0
Backtrace.php
CHANGED
|
@@ -52,6 +52,8 @@ class QM_Backtrace {
|
|
| 52 |
'get_footer' => 1,
|
| 53 |
);
|
| 54 |
protected static $filtered = false;
|
|
|
|
|
|
|
| 55 |
|
| 56 |
public function __construct( array $args = array() ) {
|
| 57 |
$args = array_merge( array(
|
|
@@ -69,17 +71,87 @@ class QM_Backtrace {
|
|
| 69 |
}
|
| 70 |
|
| 71 |
public function get_stack() {
|
| 72 |
-
|
| 73 |
-
$trace =
|
| 74 |
-
|
| 75 |
-
|
| 76 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 77 |
}
|
| 78 |
|
| 79 |
public function get_trace() {
|
| 80 |
return $this->trace;
|
| 81 |
}
|
| 82 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 83 |
public function ignore( $num ) {
|
| 84 |
for ( $i = 0; $i < absint( $num ); $i++ )
|
| 85 |
unset( $this->trace[$i] );
|
|
@@ -111,14 +183,17 @@ class QM_Backtrace {
|
|
| 111 |
|
| 112 |
if ( isset( $trace['class'] ) ) {
|
| 113 |
|
| 114 |
-
if ( isset( self::$ignore_class[$trace['class']] ) )
|
| 115 |
return null;
|
| 116 |
-
else if ( isset( self::$ignore_method[$trace['class']][$trace['function']] ) )
|
| 117 |
return null;
|
| 118 |
-
else if ( 0 === strpos( $trace['class'], 'QM_' ) )
|
| 119 |
return null;
|
| 120 |
-
else
|
| 121 |
-
|
|
|
|
|
|
|
|
|
|
| 122 |
|
| 123 |
} else {
|
| 124 |
|
|
@@ -132,7 +207,9 @@ class QM_Backtrace {
|
|
| 132 |
if ( 'dir' === $show ) {
|
| 133 |
if ( isset( $trace['args'][0] ) ) {
|
| 134 |
$arg = QM_Util::standard_dir( $trace['args'][0], '…/' );
|
| 135 |
-
|
|
|
|
|
|
|
| 136 |
}
|
| 137 |
} else {
|
| 138 |
$args = array();
|
|
@@ -140,12 +217,16 @@ class QM_Backtrace {
|
|
| 140 |
if ( isset( $trace['args'][$i] ) )
|
| 141 |
$args[] = sprintf( "'%s'", $trace['args'][$i] );
|
| 142 |
}
|
| 143 |
-
|
|
|
|
|
|
|
| 144 |
}
|
| 145 |
|
| 146 |
}
|
| 147 |
|
| 148 |
-
|
|
|
|
|
|
|
| 149 |
|
| 150 |
}
|
| 151 |
|
| 52 |
'get_footer' => 1,
|
| 53 |
);
|
| 54 |
protected static $filtered = false;
|
| 55 |
+
protected $trace = null;
|
| 56 |
+
protected $filtered_trace = null;
|
| 57 |
|
| 58 |
public function __construct( array $args = array() ) {
|
| 59 |
$args = array_merge( array(
|
| 71 |
}
|
| 72 |
|
| 73 |
public function get_stack() {
|
| 74 |
+
|
| 75 |
+
$trace = $this->get_filtered_trace();
|
| 76 |
+
$stack = array();
|
| 77 |
+
|
| 78 |
+
if ( empty( $trace ) ) {
|
| 79 |
+
if ( isset( $this->trace[0]['file'] ) ) {
|
| 80 |
+
$stack[] = QM_Util::standard_dir( $this->trace[0]['file'], '' );
|
| 81 |
+
} else {
|
| 82 |
+
$stack[] = __( 'Unknown', 'query-monitor' );
|
| 83 |
+
}
|
| 84 |
+
} else {
|
| 85 |
+
$stack = wp_list_pluck( $trace, 'display' );
|
| 86 |
+
}
|
| 87 |
+
|
| 88 |
+
return $stack;
|
| 89 |
+
|
| 90 |
+
}
|
| 91 |
+
|
| 92 |
+
public function get_caller() {
|
| 93 |
+
|
| 94 |
+
$trace = $this->get_filtered_trace();
|
| 95 |
+
|
| 96 |
+
if ( empty( $trace ) ) {
|
| 97 |
+
return reset( $this->trace );
|
| 98 |
+
} else {
|
| 99 |
+
return reset( $trace );
|
| 100 |
+
}
|
| 101 |
+
|
| 102 |
+
}
|
| 103 |
+
|
| 104 |
+
public function get_component() {
|
| 105 |
+
|
| 106 |
+
$components = array();
|
| 107 |
+
|
| 108 |
+
foreach ( $this->trace as $item ) {
|
| 109 |
+
|
| 110 |
+
try {
|
| 111 |
+
|
| 112 |
+
if ( isset( $item['file'] ) ) {
|
| 113 |
+
$file = $item['file'];
|
| 114 |
+
} else if ( isset( $item['class'] ) ) {
|
| 115 |
+
$ref = new ReflectionMethod( $item['class'], $item['function'] );
|
| 116 |
+
$file = $ref->getFileName();
|
| 117 |
+
} else {
|
| 118 |
+
$ref = new ReflectionFunction( $item['function'] );
|
| 119 |
+
$file = $ref->getFileName();
|
| 120 |
+
}
|
| 121 |
+
|
| 122 |
+
$comp = QM_Util::get_file_component( $file );
|
| 123 |
+
$components[$comp->type] = $comp;
|
| 124 |
+
} catch ( ReflectionException $e ) {
|
| 125 |
+
# nothing
|
| 126 |
+
}
|
| 127 |
+
|
| 128 |
+
}
|
| 129 |
+
|
| 130 |
+
foreach ( QM_Util::get_file_dirs() as $type => $dir ) {
|
| 131 |
+
if ( isset( $components[$type] ) )
|
| 132 |
+
return $components[$type];
|
| 133 |
+
}
|
| 134 |
+
|
| 135 |
+
# This should not happen
|
| 136 |
+
|
| 137 |
}
|
| 138 |
|
| 139 |
public function get_trace() {
|
| 140 |
return $this->trace;
|
| 141 |
}
|
| 142 |
|
| 143 |
+
public function get_filtered_trace() {
|
| 144 |
+
|
| 145 |
+
if ( !isset( $this->filtered_trace ) ) {
|
| 146 |
+
$trace = array_map( 'QM_Backtrace::filter_trace', $this->trace );
|
| 147 |
+
$trace = array_values( array_filter( $trace ) );
|
| 148 |
+
$this->filtered_trace = $trace;
|
| 149 |
+
}
|
| 150 |
+
|
| 151 |
+
return $this->filtered_trace;
|
| 152 |
+
|
| 153 |
+
}
|
| 154 |
+
|
| 155 |
public function ignore( $num ) {
|
| 156 |
for ( $i = 0; $i < absint( $num ); $i++ )
|
| 157 |
unset( $this->trace[$i] );
|
| 183 |
|
| 184 |
if ( isset( $trace['class'] ) ) {
|
| 185 |
|
| 186 |
+
if ( isset( self::$ignore_class[$trace['class']] ) ) {
|
| 187 |
return null;
|
| 188 |
+
} else if ( isset( self::$ignore_method[$trace['class']][$trace['function']] ) ) {
|
| 189 |
return null;
|
| 190 |
+
} else if ( 0 === strpos( $trace['class'], 'QM_' ) ) {
|
| 191 |
return null;
|
| 192 |
+
} else {
|
| 193 |
+
$trace['id'] = $trace['class'] . $trace['type'] . $trace['function'] . '()';
|
| 194 |
+
$trace['display'] = $trace['class'] . $trace['type'] . $trace['function'] . '()';
|
| 195 |
+
return $trace;
|
| 196 |
+
}
|
| 197 |
|
| 198 |
} else {
|
| 199 |
|
| 207 |
if ( 'dir' === $show ) {
|
| 208 |
if ( isset( $trace['args'][0] ) ) {
|
| 209 |
$arg = QM_Util::standard_dir( $trace['args'][0], '…/' );
|
| 210 |
+
$trace['id'] = $trace['function'] . '()';
|
| 211 |
+
$trace['display'] = $trace['function'] . "('{$arg}')";
|
| 212 |
+
return $trace;
|
| 213 |
}
|
| 214 |
} else {
|
| 215 |
$args = array();
|
| 217 |
if ( isset( $trace['args'][$i] ) )
|
| 218 |
$args[] = sprintf( "'%s'", $trace['args'][$i] );
|
| 219 |
}
|
| 220 |
+
$trace['id'] = $trace['function'] . '()';
|
| 221 |
+
$trace['display'] = $trace['function'] . '(' . implode( ',', $args ) . ')';
|
| 222 |
+
return $trace;
|
| 223 |
}
|
| 224 |
|
| 225 |
}
|
| 226 |
|
| 227 |
+
$trace['id'] = $trace['function'] . '()';
|
| 228 |
+
$trace['display'] = $trace['function'] . '()';
|
| 229 |
+
return $trace;
|
| 230 |
|
| 231 |
}
|
| 232 |
|
LICENSE
ADDED
|
@@ -0,0 +1,339 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
GNU GENERAL PUBLIC LICENSE
|
| 2 |
+
Version 2, June 1991
|
| 3 |
+
|
| 4 |
+
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
| 5 |
+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
| 6 |
+
Everyone is permitted to copy and distribute verbatim copies
|
| 7 |
+
of this license document, but changing it is not allowed.
|
| 8 |
+
|
| 9 |
+
Preamble
|
| 10 |
+
|
| 11 |
+
The licenses for most software are designed to take away your
|
| 12 |
+
freedom to share and change it. By contrast, the GNU General Public
|
| 13 |
+
License is intended to guarantee your freedom to share and change free
|
| 14 |
+
software--to make sure the software is free for all its users. This
|
| 15 |
+
General Public License applies to most of the Free Software
|
| 16 |
+
Foundation's software and to any other program whose authors commit to
|
| 17 |
+
using it. (Some other Free Software Foundation software is covered by
|
| 18 |
+
the GNU Lesser General Public License instead.) You can apply it to
|
| 19 |
+
your programs, too.
|
| 20 |
+
|
| 21 |
+
When we speak of free software, we are referring to freedom, not
|
| 22 |
+
price. Our General Public Licenses are designed to make sure that you
|
| 23 |
+
have the freedom to distribute copies of free software (and charge for
|
| 24 |
+
this service if you wish), that you receive source code or can get it
|
| 25 |
+
if you want it, that you can change the software or use pieces of it
|
| 26 |
+
in new free programs; and that you know you can do these things.
|
| 27 |
+
|
| 28 |
+
To protect your rights, we need to make restrictions that forbid
|
| 29 |
+
anyone to deny you these rights or to ask you to surrender the rights.
|
| 30 |
+
These restrictions translate to certain responsibilities for you if you
|
| 31 |
+
distribute copies of the software, or if you modify it.
|
| 32 |
+
|
| 33 |
+
For example, if you distribute copies of such a program, whether
|
| 34 |
+
gratis or for a fee, you must give the recipients all the rights that
|
| 35 |
+
you have. You must make sure that they, too, receive or can get the
|
| 36 |
+
source code. And you must show them these terms so they know their
|
| 37 |
+
rights.
|
| 38 |
+
|
| 39 |
+
We protect your rights with two steps: (1) copyright the software, and
|
| 40 |
+
(2) offer you this license which gives you legal permission to copy,
|
| 41 |
+
distribute and/or modify the software.
|
| 42 |
+
|
| 43 |
+
Also, for each author's protection and ours, we want to make certain
|
| 44 |
+
that everyone understands that there is no warranty for this free
|
| 45 |
+
software. If the software is modified by someone else and passed on, we
|
| 46 |
+
want its recipients to know that what they have is not the original, so
|
| 47 |
+
that any problems introduced by others will not reflect on the original
|
| 48 |
+
authors' reputations.
|
| 49 |
+
|
| 50 |
+
Finally, any free program is threatened constantly by software
|
| 51 |
+
patents. We wish to avoid the danger that redistributors of a free
|
| 52 |
+
program will individually obtain patent licenses, in effect making the
|
| 53 |
+
program proprietary. To prevent this, we have made it clear that any
|
| 54 |
+
patent must be licensed for everyone's free use or not licensed at all.
|
| 55 |
+
|
| 56 |
+
The precise terms and conditions for copying, distribution and
|
| 57 |
+
modification follow.
|
| 58 |
+
|
| 59 |
+
GNU GENERAL PUBLIC LICENSE
|
| 60 |
+
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
| 61 |
+
|
| 62 |
+
0. This License applies to any program or other work which contains
|
| 63 |
+
a notice placed by the copyright holder saying it may be distributed
|
| 64 |
+
under the terms of this General Public License. The "Program", below,
|
| 65 |
+
refers to any such program or work, and a "work based on the Program"
|
| 66 |
+
means either the Program or any derivative work under copyright law:
|
| 67 |
+
that is to say, a work containing the Program or a portion of it,
|
| 68 |
+
either verbatim or with modifications and/or translated into another
|
| 69 |
+
language. (Hereinafter, translation is included without limitation in
|
| 70 |
+
the term "modification".) Each licensee is addressed as "you".
|
| 71 |
+
|
| 72 |
+
Activities other than copying, distribution and modification are not
|
| 73 |
+
covered by this License; they are outside its scope. The act of
|
| 74 |
+
running the Program is not restricted, and the output from the Program
|
| 75 |
+
is covered only if its contents constitute a work based on the
|
| 76 |
+
Program (independent of having been made by running the Program).
|
| 77 |
+
Whether that is true depends on what the Program does.
|
| 78 |
+
|
| 79 |
+
1. You may copy and distribute verbatim copies of the Program's
|
| 80 |
+
source code as you receive it, in any medium, provided that you
|
| 81 |
+
conspicuously and appropriately publish on each copy an appropriate
|
| 82 |
+
copyright notice and disclaimer of warranty; keep intact all the
|
| 83 |
+
notices that refer to this License and to the absence of any warranty;
|
| 84 |
+
and give any other recipients of the Program a copy of this License
|
| 85 |
+
along with the Program.
|
| 86 |
+
|
| 87 |
+
You may charge a fee for the physical act of transferring a copy, and
|
| 88 |
+
you may at your option offer warranty protection in exchange for a fee.
|
| 89 |
+
|
| 90 |
+
2. You may modify your copy or copies of the Program or any portion
|
| 91 |
+
of it, thus forming a work based on the Program, and copy and
|
| 92 |
+
distribute such modifications or work under the terms of Section 1
|
| 93 |
+
above, provided that you also meet all of these conditions:
|
| 94 |
+
|
| 95 |
+
a) You must cause the modified files to carry prominent notices
|
| 96 |
+
stating that you changed the files and the date of any change.
|
| 97 |
+
|
| 98 |
+
b) You must cause any work that you distribute or publish, that in
|
| 99 |
+
whole or in part contains or is derived from the Program or any
|
| 100 |
+
part thereof, to be licensed as a whole at no charge to all third
|
| 101 |
+
parties under the terms of this License.
|
| 102 |
+
|
| 103 |
+
c) If the modified program normally reads commands interactively
|
| 104 |
+
when run, you must cause it, when started running for such
|
| 105 |
+
interactive use in the most ordinary way, to print or display an
|
| 106 |
+
announcement including an appropriate copyright notice and a
|
| 107 |
+
notice that there is no warranty (or else, saying that you provide
|
| 108 |
+
a warranty) and that users may redistribute the program under
|
| 109 |
+
these conditions, and telling the user how to view a copy of this
|
| 110 |
+
License. (Exception: if the Program itself is interactive but
|
| 111 |
+
does not normally print such an announcement, your work based on
|
| 112 |
+
the Program is not required to print an announcement.)
|
| 113 |
+
|
| 114 |
+
These requirements apply to the modified work as a whole. If
|
| 115 |
+
identifiable sections of that work are not derived from the Program,
|
| 116 |
+
and can be reasonably considered independent and separate works in
|
| 117 |
+
themselves, then this License, and its terms, do not apply to those
|
| 118 |
+
sections when you distribute them as separate works. But when you
|
| 119 |
+
distribute the same sections as part of a whole which is a work based
|
| 120 |
+
on the Program, the distribution of the whole must be on the terms of
|
| 121 |
+
this License, whose permissions for other licensees extend to the
|
| 122 |
+
entire whole, and thus to each and every part regardless of who wrote it.
|
| 123 |
+
|
| 124 |
+
Thus, it is not the intent of this section to claim rights or contest
|
| 125 |
+
your rights to work written entirely by you; rather, the intent is to
|
| 126 |
+
exercise the right to control the distribution of derivative or
|
| 127 |
+
collective works based on the Program.
|
| 128 |
+
|
| 129 |
+
In addition, mere aggregation of another work not based on the Program
|
| 130 |
+
with the Program (or with a work based on the Program) on a volume of
|
| 131 |
+
a storage or distribution medium does not bring the other work under
|
| 132 |
+
the scope of this License.
|
| 133 |
+
|
| 134 |
+
3. You may copy and distribute the Program (or a work based on it,
|
| 135 |
+
under Section 2) in object code or executable form under the terms of
|
| 136 |
+
Sections 1 and 2 above provided that you also do one of the following:
|
| 137 |
+
|
| 138 |
+
a) Accompany it with the complete corresponding machine-readable
|
| 139 |
+
source code, which must be distributed under the terms of Sections
|
| 140 |
+
1 and 2 above on a medium customarily used for software interchange; or,
|
| 141 |
+
|
| 142 |
+
b) Accompany it with a written offer, valid for at least three
|
| 143 |
+
years, to give any third party, for a charge no more than your
|
| 144 |
+
cost of physically performing source distribution, a complete
|
| 145 |
+
machine-readable copy of the corresponding source code, to be
|
| 146 |
+
distributed under the terms of Sections 1 and 2 above on a medium
|
| 147 |
+
customarily used for software interchange; or,
|
| 148 |
+
|
| 149 |
+
c) Accompany it with the information you received as to the offer
|
| 150 |
+
to distribute corresponding source code. (This alternative is
|
| 151 |
+
allowed only for noncommercial distribution and only if you
|
| 152 |
+
received the program in object code or executable form with such
|
| 153 |
+
an offer, in accord with Subsection b above.)
|
| 154 |
+
|
| 155 |
+
The source code for a work means the preferred form of the work for
|
| 156 |
+
making modifications to it. For an executable work, complete source
|
| 157 |
+
code means all the source code for all modules it contains, plus any
|
| 158 |
+
associated interface definition files, plus the scripts used to
|
| 159 |
+
control compilation and installation of the executable. However, as a
|
| 160 |
+
special exception, the source code distributed need not include
|
| 161 |
+
anything that is normally distributed (in either source or binary
|
| 162 |
+
form) with the major components (compiler, kernel, and so on) of the
|
| 163 |
+
operating system on which the executable runs, unless that component
|
| 164 |
+
itself accompanies the executable.
|
| 165 |
+
|
| 166 |
+
If distribution of executable or object code is made by offering
|
| 167 |
+
access to copy from a designated place, then offering equivalent
|
| 168 |
+
access to copy the source code from the same place counts as
|
| 169 |
+
distribution of the source code, even though third parties are not
|
| 170 |
+
compelled to copy the source along with the object code.
|
| 171 |
+
|
| 172 |
+
4. You may not copy, modify, sublicense, or distribute the Program
|
| 173 |
+
except as expressly provided under this License. Any attempt
|
| 174 |
+
otherwise to copy, modify, sublicense or distribute the Program is
|
| 175 |
+
void, and will automatically terminate your rights under this License.
|
| 176 |
+
However, parties who have received copies, or rights, from you under
|
| 177 |
+
this License will not have their licenses terminated so long as such
|
| 178 |
+
parties remain in full compliance.
|
| 179 |
+
|
| 180 |
+
5. You are not required to accept this License, since you have not
|
| 181 |
+
signed it. However, nothing else grants you permission to modify or
|
| 182 |
+
distribute the Program or its derivative works. These actions are
|
| 183 |
+
prohibited by law if you do not accept this License. Therefore, by
|
| 184 |
+
modifying or distributing the Program (or any work based on the
|
| 185 |
+
Program), you indicate your acceptance of this License to do so, and
|
| 186 |
+
all its terms and conditions for copying, distributing or modifying
|
| 187 |
+
the Program or works based on it.
|
| 188 |
+
|
| 189 |
+
6. Each time you redistribute the Program (or any work based on the
|
| 190 |
+
Program), the recipient automatically receives a license from the
|
| 191 |
+
original licensor to copy, distribute or modify the Program subject to
|
| 192 |
+
these terms and conditions. You may not impose any further
|
| 193 |
+
restrictions on the recipients' exercise of the rights granted herein.
|
| 194 |
+
You are not responsible for enforcing compliance by third parties to
|
| 195 |
+
this License.
|
| 196 |
+
|
| 197 |
+
7. If, as a consequence of a court judgment or allegation of patent
|
| 198 |
+
infringement or for any other reason (not limited to patent issues),
|
| 199 |
+
conditions are imposed on you (whether by court order, agreement or
|
| 200 |
+
otherwise) that contradict the conditions of this License, they do not
|
| 201 |
+
excuse you from the conditions of this License. If you cannot
|
| 202 |
+
distribute so as to satisfy simultaneously your obligations under this
|
| 203 |
+
License and any other pertinent obligations, then as a consequence you
|
| 204 |
+
may not distribute the Program at all. For example, if a patent
|
| 205 |
+
license would not permit royalty-free redistribution of the Program by
|
| 206 |
+
all those who receive copies directly or indirectly through you, then
|
| 207 |
+
the only way you could satisfy both it and this License would be to
|
| 208 |
+
refrain entirely from distribution of the Program.
|
| 209 |
+
|
| 210 |
+
If any portion of this section is held invalid or unenforceable under
|
| 211 |
+
any particular circumstance, the balance of the section is intended to
|
| 212 |
+
apply and the section as a whole is intended to apply in other
|
| 213 |
+
circumstances.
|
| 214 |
+
|
| 215 |
+
It is not the purpose of this section to induce you to infringe any
|
| 216 |
+
patents or other property right claims or to contest validity of any
|
| 217 |
+
such claims; this section has the sole purpose of protecting the
|
| 218 |
+
integrity of the free software distribution system, which is
|
| 219 |
+
implemented by public license practices. Many people have made
|
| 220 |
+
generous contributions to the wide range of software distributed
|
| 221 |
+
through that system in reliance on consistent application of that
|
| 222 |
+
system; it is up to the author/donor to decide if he or she is willing
|
| 223 |
+
to distribute software through any other system and a licensee cannot
|
| 224 |
+
impose that choice.
|
| 225 |
+
|
| 226 |
+
This section is intended to make thoroughly clear what is believed to
|
| 227 |
+
be a consequence of the rest of this License.
|
| 228 |
+
|
| 229 |
+
8. If the distribution and/or use of the Program is restricted in
|
| 230 |
+
certain countries either by patents or by copyrighted interfaces, the
|
| 231 |
+
original copyright holder who places the Program under this License
|
| 232 |
+
may add an explicit geographical distribution limitation excluding
|
| 233 |
+
those countries, so that distribution is permitted only in or among
|
| 234 |
+
countries not thus excluded. In such case, this License incorporates
|
| 235 |
+
the limitation as if written in the body of this License.
|
| 236 |
+
|
| 237 |
+
9. The Free Software Foundation may publish revised and/or new versions
|
| 238 |
+
of the General Public License from time to time. Such new versions will
|
| 239 |
+
be similar in spirit to the present version, but may differ in detail to
|
| 240 |
+
address new problems or concerns.
|
| 241 |
+
|
| 242 |
+
Each version is given a distinguishing version number. If the Program
|
| 243 |
+
specifies a version number of this License which applies to it and "any
|
| 244 |
+
later version", you have the option of following the terms and conditions
|
| 245 |
+
either of that version or of any later version published by the Free
|
| 246 |
+
Software Foundation. If the Program does not specify a version number of
|
| 247 |
+
this License, you may choose any version ever published by the Free Software
|
| 248 |
+
Foundation.
|
| 249 |
+
|
| 250 |
+
10. If you wish to incorporate parts of the Program into other free
|
| 251 |
+
programs whose distribution conditions are different, write to the author
|
| 252 |
+
to ask for permission. For software which is copyrighted by the Free
|
| 253 |
+
Software Foundation, write to the Free Software Foundation; we sometimes
|
| 254 |
+
make exceptions for this. Our decision will be guided by the two goals
|
| 255 |
+
of preserving the free status of all derivatives of our free software and
|
| 256 |
+
of promoting the sharing and reuse of software generally.
|
| 257 |
+
|
| 258 |
+
NO WARRANTY
|
| 259 |
+
|
| 260 |
+
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
| 261 |
+
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
| 262 |
+
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
| 263 |
+
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
| 264 |
+
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
| 265 |
+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
| 266 |
+
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
| 267 |
+
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
| 268 |
+
REPAIR OR CORRECTION.
|
| 269 |
+
|
| 270 |
+
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
| 271 |
+
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
| 272 |
+
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
| 273 |
+
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
| 274 |
+
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
| 275 |
+
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
| 276 |
+
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
| 277 |
+
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
| 278 |
+
POSSIBILITY OF SUCH DAMAGES.
|
| 279 |
+
|
| 280 |
+
END OF TERMS AND CONDITIONS
|
| 281 |
+
|
| 282 |
+
How to Apply These Terms to Your New Programs
|
| 283 |
+
|
| 284 |
+
If you develop a new program, and you want it to be of the greatest
|
| 285 |
+
possible use to the public, the best way to achieve this is to make it
|
| 286 |
+
free software which everyone can redistribute and change under these terms.
|
| 287 |
+
|
| 288 |
+
To do so, attach the following notices to the program. It is safest
|
| 289 |
+
to attach them to the start of each source file to most effectively
|
| 290 |
+
convey the exclusion of warranty; and each file should have at least
|
| 291 |
+
the "copyright" line and a pointer to where the full notice is found.
|
| 292 |
+
|
| 293 |
+
{{description}}
|
| 294 |
+
Copyright (C) {{year}} {{fullname}}
|
| 295 |
+
|
| 296 |
+
This program is free software; you can redistribute it and/or modify
|
| 297 |
+
it under the terms of the GNU General Public License as published by
|
| 298 |
+
the Free Software Foundation; either version 2 of the License, or
|
| 299 |
+
(at your option) any later version.
|
| 300 |
+
|
| 301 |
+
This program is distributed in the hope that it will be useful,
|
| 302 |
+
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
| 303 |
+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
| 304 |
+
GNU General Public License for more details.
|
| 305 |
+
|
| 306 |
+
You should have received a copy of the GNU General Public License along
|
| 307 |
+
with this program; if not, write to the Free Software Foundation, Inc.,
|
| 308 |
+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
| 309 |
+
|
| 310 |
+
Also add information on how to contact you by electronic and paper mail.
|
| 311 |
+
|
| 312 |
+
If the program is interactive, make it output a short notice like this
|
| 313 |
+
when it starts in an interactive mode:
|
| 314 |
+
|
| 315 |
+
Gnomovision version 69, Copyright (C) year name of author
|
| 316 |
+
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
| 317 |
+
This is free software, and you are welcome to redistribute it
|
| 318 |
+
under certain conditions; type `show c' for details.
|
| 319 |
+
|
| 320 |
+
The hypothetical commands `show w' and `show c' should show the appropriate
|
| 321 |
+
parts of the General Public License. Of course, the commands you use may
|
| 322 |
+
be called something other than `show w' and `show c'; they could even be
|
| 323 |
+
mouse-clicks or menu items--whatever suits your program.
|
| 324 |
+
|
| 325 |
+
You should also get your employer (if you work as a programmer) or your
|
| 326 |
+
school, if any, to sign a "copyright disclaimer" for the program, if
|
| 327 |
+
necessary. Here is a sample; alter the names:
|
| 328 |
+
|
| 329 |
+
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
| 330 |
+
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
| 331 |
+
|
| 332 |
+
{signature of Ty Coon}, 1 April 1989
|
| 333 |
+
Ty Coon, President of Vice
|
| 334 |
+
|
| 335 |
+
This General Public License does not permit incorporating your program into
|
| 336 |
+
proprietary programs. If your program is a subroutine library, you may
|
| 337 |
+
consider it more useful to permit linking proprietary applications with the
|
| 338 |
+
library. If this is what you want to do, use the GNU Lesser General
|
| 339 |
+
Public License instead of this License.
|
Util.php
CHANGED
|
@@ -66,6 +66,10 @@ class QM_Util {
|
|
| 66 |
|
| 67 |
}
|
| 68 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 69 |
public static function get_file_component( $file ) {
|
| 70 |
|
| 71 |
# @TODO turn this into a class (eg QM_File_Component)
|
|
@@ -118,43 +122,6 @@ class QM_Util {
|
|
| 118 |
|
| 119 |
}
|
| 120 |
|
| 121 |
-
public static function get_backtrace_component( QM_Backtrace $backtrace ) {
|
| 122 |
-
|
| 123 |
-
# @TODO turn this into a class (eg QM_Trace_Component)
|
| 124 |
-
|
| 125 |
-
$components = array();
|
| 126 |
-
|
| 127 |
-
foreach ( $backtrace->get_trace() as $item ) {
|
| 128 |
-
|
| 129 |
-
try {
|
| 130 |
-
|
| 131 |
-
if ( isset( $item['file'] ) ) {
|
| 132 |
-
$file = $item['file'];
|
| 133 |
-
} else if ( isset( $item['class'] ) ) {
|
| 134 |
-
$ref = new ReflectionMethod( $item['class'], $item['function'] );
|
| 135 |
-
$file = $ref->getFileName();
|
| 136 |
-
} else {
|
| 137 |
-
$ref = new ReflectionFunction( $item['function'] );
|
| 138 |
-
$file = $ref->getFileName();
|
| 139 |
-
}
|
| 140 |
-
|
| 141 |
-
$comp = self::get_file_component( $file );
|
| 142 |
-
$components[$comp->type] = $comp;
|
| 143 |
-
} catch ( ReflectionException $e ) {
|
| 144 |
-
# nothing
|
| 145 |
-
}
|
| 146 |
-
|
| 147 |
-
}
|
| 148 |
-
|
| 149 |
-
foreach ( self::$file_dirs as $type => $dir ) {
|
| 150 |
-
if ( isset( $components[$type] ) )
|
| 151 |
-
return $components[$type];
|
| 152 |
-
}
|
| 153 |
-
|
| 154 |
-
# This should not happen
|
| 155 |
-
|
| 156 |
-
}
|
| 157 |
-
|
| 158 |
public static function populate_callback( array $callback ) {
|
| 159 |
|
| 160 |
$access = '->';
|
|
@@ -189,6 +156,8 @@ class QM_Util {
|
|
| 189 |
|
| 190 |
}
|
| 191 |
|
|
|
|
|
|
|
| 192 |
$callback['component'] = self::get_file_component( $ref->getFileName() );
|
| 193 |
|
| 194 |
} catch ( ReflectionException $e ) {
|
|
@@ -229,7 +198,7 @@ class QM_Util {
|
|
| 229 |
'HAVING', 'INNER', 'INSERT', 'LIMIT', 'ON', 'OR', 'ORDER', 'REPLACE', 'ROLLBACK', 'SELECT', 'SET',
|
| 230 |
'SHOW', 'START', 'THEN', 'TRUNCATE', 'UPDATE', 'VALUES', 'WHEN', 'WHERE'
|
| 231 |
) as $cmd )
|
| 232 |
-
$sql = trim( str_replace( " $cmd ", "<br
|
| 233 |
|
| 234 |
return $sql;
|
| 235 |
|
|
@@ -249,8 +218,8 @@ class QM_Util {
|
|
| 249 |
'?',
|
| 250 |
), array(
|
| 251 |
'<span class="qm-equals">=</span>',
|
| 252 |
-
'<br
|
| 253 |
-
'<br
|
| 254 |
), $url );
|
| 255 |
return $url;
|
| 256 |
}
|
| 66 |
|
| 67 |
}
|
| 68 |
|
| 69 |
+
public static function get_file_dirs() {
|
| 70 |
+
return self::$file_dirs;
|
| 71 |
+
}
|
| 72 |
+
|
| 73 |
public static function get_file_component( $file ) {
|
| 74 |
|
| 75 |
# @TODO turn this into a class (eg QM_File_Component)
|
| 122 |
|
| 123 |
}
|
| 124 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 125 |
public static function populate_callback( array $callback ) {
|
| 126 |
|
| 127 |
$access = '->';
|
| 156 |
|
| 157 |
}
|
| 158 |
|
| 159 |
+
$callback['file'] = $ref->getFileName();
|
| 160 |
+
$callback['line'] = $ref->getStartLine();
|
| 161 |
$callback['component'] = self::get_file_component( $ref->getFileName() );
|
| 162 |
|
| 163 |
} catch ( ReflectionException $e ) {
|
| 198 |
'HAVING', 'INNER', 'INSERT', 'LIMIT', 'ON', 'OR', 'ORDER', 'REPLACE', 'ROLLBACK', 'SELECT', 'SET',
|
| 199 |
'SHOW', 'START', 'THEN', 'TRUNCATE', 'UPDATE', 'VALUES', 'WHEN', 'WHERE'
|
| 200 |
) as $cmd )
|
| 201 |
+
$sql = trim( str_replace( " $cmd ", "<br>$cmd ", $sql ) );
|
| 202 |
|
| 203 |
return $sql;
|
| 204 |
|
| 218 |
'?',
|
| 219 |
), array(
|
| 220 |
'<span class="qm-equals">=</span>',
|
| 221 |
+
'<br><span class="qm-param">&</span>',
|
| 222 |
+
'<br><span class="qm-param">?</span>',
|
| 223 |
), $url );
|
| 224 |
return $url;
|
| 225 |
}
|
assets/query-monitor.css
CHANGED
|
@@ -110,7 +110,6 @@ body:not(.mp6) #wp-admin-bar-query-monitor.qm-wp-37.hover a .ab-label {
|
|
| 110 |
#wp-admin-bar-query-monitor.hover a small,
|
| 111 |
#wp-admin-bar-query-monitor.hover a .ab-label {
|
| 112 |
text-shadow: none !important;
|
| 113 |
-
color: #2ea2cc !important;
|
| 114 |
}
|
| 115 |
|
| 116 |
#wp-admin-bar-query-monitor-placeholder,
|
|
@@ -124,7 +123,6 @@ body:not(.mp6) #wp-admin-bar-query-monitor.qm-wp-37.hover a .ab-label {
|
|
| 124 |
padding: 0 10px !important;
|
| 125 |
color: #aaa !important;
|
| 126 |
display: none !important;
|
| 127 |
-
background: red !important;
|
| 128 |
}
|
| 129 |
/* for mp6 on 3.7, reduce the menu icon line height */
|
| 130 |
body.mp6 #wpadminbar #wp-admin-bar-query-monitor.qm-wp-37 .ab-icon {
|
|
@@ -157,7 +155,7 @@ body.mp6 #wpadminbar #wp-admin-bar-query-monitor.qm-wp-37 .ab-icon {
|
|
| 157 |
|
| 158 |
#qm {
|
| 159 |
clear: both !important;
|
| 160 |
-
background: #
|
| 161 |
margin: 25px 0 0 !important;
|
| 162 |
border-top: 1px solid #ccc !important;
|
| 163 |
padding: 0 0 35px !important;
|
|
@@ -183,7 +181,7 @@ body.wp-admin #qm {
|
|
| 183 |
}
|
| 184 |
|
| 185 |
body:not(.iframe).sticky-menu #qm {
|
| 186 |
-
margin-left:
|
| 187 |
}
|
| 188 |
|
| 189 |
body:not(.iframe).sticky-menu.folded #qm {
|
|
@@ -214,13 +212,17 @@ body:not(.iframe).sticky-menu.folded #qm {
|
|
| 214 |
clear: none !important;
|
| 215 |
}
|
| 216 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 217 |
.qm>table {
|
| 218 |
border-collapse: collapse !important;
|
| 219 |
color: #555 !important;
|
| 220 |
border-style: hidden !important;
|
| 221 |
-
box-shadow: 0 1px
|
| 222 |
width: 100% !important;
|
| 223 |
-
|
| 224 |
}
|
| 225 |
|
| 226 |
.qm td,
|
|
@@ -232,7 +234,7 @@ body:not(.iframe).sticky-menu.folded #qm {
|
|
| 232 |
font-weight: normal !important;
|
| 233 |
font-style: normal !important;
|
| 234 |
line-height: 16px !important;
|
| 235 |
-
border: 1px solid #
|
| 236 |
padding: 5px 8px 4px !important;
|
| 237 |
vertical-align: top !important;
|
| 238 |
text-shadow: none !important;
|
|
@@ -316,10 +318,6 @@ body:not(.iframe).sticky-menu.folded #qm {
|
|
| 316 |
color: #999 !important;
|
| 317 |
}
|
| 318 |
|
| 319 |
-
.qm td.qm-has-toggle {
|
| 320 |
-
position: relative !important;
|
| 321 |
-
padding-right: 21px !important;
|
| 322 |
-
}
|
| 323 |
.qm td .qm-toggled {
|
| 324 |
display: none;
|
| 325 |
}
|
|
@@ -341,11 +339,8 @@ body:not(.iframe).sticky-menu.folded #qm {
|
|
| 341 |
}
|
| 342 |
|
| 343 |
.qm a.qm-toggle {
|
| 344 |
-
position: absolute !important;
|
| 345 |
-
top: 2px !important;
|
| 346 |
-
right: 2px !important;
|
| 347 |
color: #ddd !important;
|
| 348 |
-
padding:
|
| 349 |
border: 1px solid transparent !important;
|
| 350 |
}
|
| 351 |
|
| 110 |
#wp-admin-bar-query-monitor.hover a small,
|
| 111 |
#wp-admin-bar-query-monitor.hover a .ab-label {
|
| 112 |
text-shadow: none !important;
|
|
|
|
| 113 |
}
|
| 114 |
|
| 115 |
#wp-admin-bar-query-monitor-placeholder,
|
| 123 |
padding: 0 10px !important;
|
| 124 |
color: #aaa !important;
|
| 125 |
display: none !important;
|
|
|
|
| 126 |
}
|
| 127 |
/* for mp6 on 3.7, reduce the menu icon line height */
|
| 128 |
body.mp6 #wpadminbar #wp-admin-bar-query-monitor.qm-wp-37 .ab-icon {
|
| 155 |
|
| 156 |
#qm {
|
| 157 |
clear: both !important;
|
| 158 |
+
background: #f3f3f3 !important;
|
| 159 |
margin: 25px 0 0 !important;
|
| 160 |
border-top: 1px solid #ccc !important;
|
| 161 |
padding: 0 0 35px !important;
|
| 181 |
}
|
| 182 |
|
| 183 |
body:not(.iframe).sticky-menu #qm {
|
| 184 |
+
margin-left: 160px !important;
|
| 185 |
}
|
| 186 |
|
| 187 |
body:not(.iframe).sticky-menu.folded #qm {
|
| 212 |
clear: none !important;
|
| 213 |
}
|
| 214 |
|
| 215 |
+
.qm-clear {
|
| 216 |
+
clear: left !important;
|
| 217 |
+
}
|
| 218 |
+
|
| 219 |
.qm>table {
|
| 220 |
border-collapse: collapse !important;
|
| 221 |
color: #555 !important;
|
| 222 |
border-style: hidden !important;
|
| 223 |
+
box-shadow: 0 1px 2px 1px rgba(0,0,0,0.05) !important;
|
| 224 |
width: 100% !important;
|
| 225 |
+
outline: 1px solid #ddd !important;
|
| 226 |
}
|
| 227 |
|
| 228 |
.qm td,
|
| 234 |
font-weight: normal !important;
|
| 235 |
font-style: normal !important;
|
| 236 |
line-height: 16px !important;
|
| 237 |
+
border: 1px solid #eee !important;
|
| 238 |
padding: 5px 8px 4px !important;
|
| 239 |
vertical-align: top !important;
|
| 240 |
text-shadow: none !important;
|
| 318 |
color: #999 !important;
|
| 319 |
}
|
| 320 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 321 |
.qm td .qm-toggled {
|
| 322 |
display: none;
|
| 323 |
}
|
| 339 |
}
|
| 340 |
|
| 341 |
.qm a.qm-toggle {
|
|
|
|
|
|
|
|
|
|
| 342 |
color: #ddd !important;
|
| 343 |
+
padding: 0 3px !important;
|
| 344 |
border: 1px solid transparent !important;
|
| 345 |
}
|
| 346 |
|
collectors/db_queries.php
CHANGED
|
@@ -157,10 +157,13 @@ class QM_Collector_DB_Queries extends QM_Collector {
|
|
| 157 |
|
| 158 |
$total_time += $ltime;
|
| 159 |
|
| 160 |
-
if ( isset( $query['trace'] ) )
|
| 161 |
-
$component =
|
| 162 |
-
|
|
|
|
| 163 |
$component = null;
|
|
|
|
|
|
|
| 164 |
|
| 165 |
# @TODO we should grab this from the trace instead for increased accuracy in case
|
| 166 |
# the caller contains multiple comma separated arguments (see QM_Backtrace::$show_args)
|
|
@@ -172,8 +175,7 @@ class QM_Collector_DB_Queries extends QM_Collector {
|
|
| 172 |
else
|
| 173 |
$caller_name = $caller;
|
| 174 |
|
| 175 |
-
|
| 176 |
-
$sql = QM_Util::format_sql( $sql );
|
| 177 |
$type = preg_split( '/\b/', $sql );
|
| 178 |
$type = strtoupper( $type[1] );
|
| 179 |
|
| 157 |
|
| 158 |
$total_time += $ltime;
|
| 159 |
|
| 160 |
+
if ( isset( $query['trace'] ) ) {
|
| 161 |
+
$component = $query['trace']->get_component();
|
| 162 |
+
$trace = $query['trace'];
|
| 163 |
+
} else {
|
| 164 |
$component = null;
|
| 165 |
+
$trace = null;
|
| 166 |
+
}
|
| 167 |
|
| 168 |
# @TODO we should grab this from the trace instead for increased accuracy in case
|
| 169 |
# the caller contains multiple comma separated arguments (see QM_Backtrace::$show_args)
|
| 175 |
else
|
| 176 |
$caller_name = $caller;
|
| 177 |
|
| 178 |
+
$sql = trim( $sql );
|
|
|
|
| 179 |
$type = preg_split( '/\b/', $sql );
|
| 180 |
$type = strtoupper( $type[1] );
|
| 181 |
|
collectors/hooks.php
CHANGED
|
@@ -30,12 +30,6 @@ class QM_Collector_Hooks extends QM_Collector {
|
|
| 30 |
|
| 31 |
global $wp_actions, $wp_filter;
|
| 32 |
|
| 33 |
-
# @TODO this is a band-aid for a deeper problem which I haven't had time to look
|
| 34 |
-
# into. The customizer hooks onto 'shutdown' at priority 1000 and the act of
|
| 35 |
-
# looping over the filters below kills it somehow. Argh. Look into it.
|
| 36 |
-
if ( '/wp-admin/customize.php' == $_SERVER['REQUEST_URI'] )
|
| 37 |
-
return;
|
| 38 |
-
|
| 39 |
if ( is_admin() and ( $admin = QueryMonitor::get_collector( 'admin' ) ) )
|
| 40 |
$this->data['screen'] = $admin->data['base'];
|
| 41 |
else
|
|
@@ -51,7 +45,10 @@ class QM_Collector_Hooks extends QM_Collector {
|
|
| 51 |
|
| 52 |
if ( isset( $wp_filter[$name] ) ) {
|
| 53 |
|
| 54 |
-
|
|
|
|
|
|
|
|
|
|
| 55 |
|
| 56 |
foreach ( $callbacks as $callback ) {
|
| 57 |
|
| 30 |
|
| 31 |
global $wp_actions, $wp_filter;
|
| 32 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 33 |
if ( is_admin() and ( $admin = QueryMonitor::get_collector( 'admin' ) ) )
|
| 34 |
$this->data['screen'] = $admin->data['base'];
|
| 35 |
else
|
| 45 |
|
| 46 |
if ( isset( $wp_filter[$name] ) ) {
|
| 47 |
|
| 48 |
+
# http://core.trac.wordpress.org/ticket/17817
|
| 49 |
+
$action = $wp_filter[$name];
|
| 50 |
+
|
| 51 |
+
foreach ( $action as $priority => $callbacks ) {
|
| 52 |
|
| 53 |
foreach ( $callbacks as $callback ) {
|
| 54 |
|
collectors/http.php
CHANGED
|
@@ -30,18 +30,27 @@ class QM_Collector_HTTP extends QM_Collector {
|
|
| 30 |
add_filter( 'http_request_args', array( $this, 'filter_http_request' ), 99, 2 );
|
| 31 |
add_filter( 'http_response', array( $this, 'filter_http_response' ), 99, 3 );
|
| 32 |
# http://core.trac.wordpress.org/ticket/25747
|
| 33 |
-
add_filter( 'pre_http_request', array( $this, '
|
| 34 |
|
| 35 |
}
|
| 36 |
|
| 37 |
public function filter_http_request( array $args, $url ) {
|
| 38 |
-
$
|
| 39 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
$this->data['http'][$key] = array(
|
| 41 |
'url' => $url,
|
| 42 |
'args' => $args,
|
| 43 |
'start' => $m_start,
|
| 44 |
-
'trace' =>
|
| 45 |
);
|
| 46 |
$args['_qm_key'] = $key;
|
| 47 |
return $args;
|
|
@@ -83,19 +92,56 @@ class QM_Collector_HTTP extends QM_Collector {
|
|
| 83 |
|
| 84 |
}
|
| 85 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 86 |
public function filter_http_response( $response, array $args, $url ) {
|
| 87 |
$this->data['http'][$args['_qm_key']]['end'] = microtime( true );
|
| 88 |
$this->data['http'][$args['_qm_key']]['response'] = $response;
|
| 89 |
-
|
| 90 |
-
|
| 91 |
-
$this->data['
|
| 92 |
-
} else {
|
| 93 |
-
if ( intval( wp_remote_retrieve_response_code( $response ) ) >= 400 )
|
| 94 |
-
$this->data['errors']['warning'][] = $args['_qm_key'];
|
| 95 |
}
|
|
|
|
| 96 |
return $response;
|
| 97 |
}
|
| 98 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 99 |
}
|
| 100 |
|
| 101 |
function register_qm_collector_http( array $qm ) {
|
| 30 |
add_filter( 'http_request_args', array( $this, 'filter_http_request' ), 99, 2 );
|
| 31 |
add_filter( 'http_response', array( $this, 'filter_http_response' ), 99, 3 );
|
| 32 |
# http://core.trac.wordpress.org/ticket/25747
|
| 33 |
+
add_filter( 'pre_http_request', array( $this, 'filter_pre_http_request' ), 99, 3 );
|
| 34 |
|
| 35 |
}
|
| 36 |
|
| 37 |
public function filter_http_request( array $args, $url ) {
|
| 38 |
+
$trace = new QM_Backtrace;
|
| 39 |
+
if ( isset( $args['_qm_key'] ) ) {
|
| 40 |
+
// Something has triggered another HTTP request from within the `pre_http_request` filter
|
| 41 |
+
// (eg. WordPress Beta Tester does this). This allows for one level of nested queries.
|
| 42 |
+
$args['_qm_original_key'] = $args['_qm_key'];
|
| 43 |
+
$m_start = $this->data['http'][$args['_qm_key']]['start'];
|
| 44 |
+
} else {
|
| 45 |
+
$m_start = microtime( true );
|
| 46 |
+
}
|
| 47 |
+
$x_start = microtime( true );
|
| 48 |
+
$key = $x_start . $url;
|
| 49 |
$this->data['http'][$key] = array(
|
| 50 |
'url' => $url,
|
| 51 |
'args' => $args,
|
| 52 |
'start' => $m_start,
|
| 53 |
+
'trace' => $trace,
|
| 54 |
);
|
| 55 |
$args['_qm_key'] = $key;
|
| 56 |
return $args;
|
| 92 |
|
| 93 |
}
|
| 94 |
|
| 95 |
+
public function filter_pre_http_request( $response, array $args, $url ) {
|
| 96 |
+
|
| 97 |
+
// All is well:
|
| 98 |
+
if ( false === $response ) {
|
| 99 |
+
return $response;
|
| 100 |
+
}
|
| 101 |
+
|
| 102 |
+
// Something has filtered `pre_http_request` and short-circuited the request.
|
| 103 |
+
$this->data['http'][$args['_qm_key']]['end'] = $this->data['http'][$args['_qm_original_key']]['start'];
|
| 104 |
+
$this->data['http'][$args['_qm_key']]['response'] = new WP_Error( 'http_request_not_executed', __( 'Request not executed due to a filter on pre_http_request', 'query-monitor' ) );
|
| 105 |
+
|
| 106 |
+
return $response;
|
| 107 |
+
}
|
| 108 |
+
|
| 109 |
public function filter_http_response( $response, array $args, $url ) {
|
| 110 |
$this->data['http'][$args['_qm_key']]['end'] = microtime( true );
|
| 111 |
$this->data['http'][$args['_qm_key']]['response'] = $response;
|
| 112 |
+
if ( isset( $args['_qm_original_key'] ) ) {
|
| 113 |
+
$this->data['http'][$args['_qm_original_key']]['end'] = $this->data['http'][$args['_qm_original_key']]['start'];
|
| 114 |
+
$this->data['http'][$args['_qm_original_key']]['response'] = new WP_Error( 'http_request_not_executed', __( 'Request not executed due to a filter on pre_http_request', 'query-monitor' ) );
|
|
|
|
|
|
|
|
|
|
| 115 |
}
|
| 116 |
+
|
| 117 |
return $response;
|
| 118 |
}
|
| 119 |
|
| 120 |
+
public function process() {
|
| 121 |
+
|
| 122 |
+
if ( ! isset( $this->data['http'] ) )
|
| 123 |
+
return;
|
| 124 |
+
|
| 125 |
+
foreach ( $this->data['http'] as $key => & $http ) {
|
| 126 |
+
|
| 127 |
+
if ( !isset( $http['response'] ) ) {
|
| 128 |
+
// Timed out
|
| 129 |
+
$http['response'] = new WP_Error( 'http_request_timed_out', __( 'Request timed out', 'query-monitor' ) );
|
| 130 |
+
$http['end'] = floatval( $http['start'] + $http['args']['timeout'] );
|
| 131 |
+
}
|
| 132 |
+
|
| 133 |
+
if ( is_wp_error( $http['response'] ) ) {
|
| 134 |
+
if ( 'http_request_not_executed' != $http['response']->get_error_code() )
|
| 135 |
+
$this->data['errors']['error'][] = $key;
|
| 136 |
+
} else {
|
| 137 |
+
if ( intval( wp_remote_retrieve_response_code( $http['response'] ) ) >= 400 )
|
| 138 |
+
$this->data['errors']['warning'][] = $key;
|
| 139 |
+
}
|
| 140 |
+
|
| 141 |
+
}
|
| 142 |
+
|
| 143 |
+
}
|
| 144 |
+
|
| 145 |
}
|
| 146 |
|
| 147 |
function register_qm_collector_http( array $qm ) {
|
collectors/php_errors.php
CHANGED
|
@@ -112,6 +112,8 @@ function register_qm_collector_php_errors( array $qm ) {
|
|
| 112 |
function qm_php_errors_return_value( $return ) {
|
| 113 |
if ( QM_Util::is_ajax() )
|
| 114 |
return true;
|
|
|
|
|
|
|
| 115 |
# If Xdebug is enabled we'll return false so Xdebug's error handler can do its thing.
|
| 116 |
if ( function_exists( 'xdebug_is_enabled' ) and xdebug_is_enabled() )
|
| 117 |
return false;
|
| 112 |
function qm_php_errors_return_value( $return ) {
|
| 113 |
if ( QM_Util::is_ajax() )
|
| 114 |
return true;
|
| 115 |
+
if ( isset( $_SERVER['HTTP_X_REQUESTED_WITH'] ) and 'xmlhttprequest' == strtolower( $_SERVER['HTTP_X_REQUESTED_WITH'] ) )
|
| 116 |
+
return true;
|
| 117 |
# If Xdebug is enabled we'll return false so Xdebug's error handler can do its thing.
|
| 118 |
if ( function_exists( 'xdebug_is_enabled' ) and xdebug_is_enabled() )
|
| 119 |
return false;
|
dispatchers/Html.php
CHANGED
|
@@ -90,13 +90,6 @@ class QM_Dispatcher_Html extends QM_Dispatcher {
|
|
| 90 |
|
| 91 |
public function before_output() {
|
| 92 |
|
| 93 |
-
# @TODO document why this is needed
|
| 94 |
-
# Flush the output buffer to avoid crashes
|
| 95 |
-
if ( !is_feed() ) {
|
| 96 |
-
while ( ob_get_length() )
|
| 97 |
-
ob_end_flush();
|
| 98 |
-
}
|
| 99 |
-
|
| 100 |
require_once $this->qm->plugin_path( 'output/Html.php' );
|
| 101 |
|
| 102 |
foreach ( glob( $this->qm->plugin_path( 'output/html/*.php' ) ) as $output ) {
|
| 90 |
|
| 91 |
public function before_output() {
|
| 92 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 93 |
require_once $this->qm->plugin_path( 'output/Html.php' );
|
| 94 |
|
| 95 |
foreach ( glob( $this->qm->plugin_path( 'output/html/*.php' ) ) as $output ) {
|
output/headers/php_errors.php
CHANGED
|
@@ -37,7 +37,7 @@ class QM_Output_Headers_PHP_Errors extends QM_Output_Headers {
|
|
| 37 |
|
| 38 |
# @TODO we should calculate the component during process() so we don't need to do it
|
| 39 |
# separately in each output.
|
| 40 |
-
$component =
|
| 41 |
$output_error = array(
|
| 42 |
'type' => $error->type,
|
| 43 |
'message' => $error->message,
|
| 37 |
|
| 38 |
# @TODO we should calculate the component during process() so we don't need to do it
|
| 39 |
# separately in each output.
|
| 40 |
+
$component = $error->trace->get_component();
|
| 41 |
$output_error = array(
|
| 42 |
'type' => $error->type,
|
| 43 |
'message' => $error->message,
|
output/html/db_queries.php
CHANGED
|
@@ -201,8 +201,10 @@ class QM_Output_Html_DB_Queries extends QM_Output_Html {
|
|
| 201 |
$ltime = number_format_i18n( $row['ltime'], 10 );
|
| 202 |
$td = $this->collector->is_expensive( $row ) ? ' qm-expensive' : '';
|
| 203 |
|
|
|
|
|
|
|
| 204 |
if ( 'SELECT' != $row['type'] )
|
| 205 |
-
$
|
| 206 |
|
| 207 |
if ( is_wp_error( $row['result'] ) ) {
|
| 208 |
$error = $row['result']->get_error_message();
|
|
@@ -232,7 +234,7 @@ class QM_Output_Html_DB_Queries extends QM_Output_Html {
|
|
| 232 |
echo "<tr{$attr}>";
|
| 233 |
|
| 234 |
if ( isset( $cols['sql'] ) )
|
| 235 |
-
echo "<td valign='top' class='qm-row-sql qm-ltr qm-sql'>{$
|
| 236 |
|
| 237 |
if ( isset( $cols['caller'] ) ) {
|
| 238 |
echo "<td valign='top' class='qm-row-caller qm-ltr qm-has-toggle'>";
|
|
@@ -245,7 +247,7 @@ class QM_Output_Html_DB_Queries extends QM_Output_Html {
|
|
| 245 |
$stack = implode( '<br>', $stack );
|
| 246 |
|
| 247 |
if ( !empty( $stack ) ) {
|
| 248 |
-
echo '<
|
| 249 |
echo '<div class="qm-toggled">' . $stack . '</div>';
|
| 250 |
}
|
| 251 |
|
| 201 |
$ltime = number_format_i18n( $row['ltime'], 10 );
|
| 202 |
$td = $this->collector->is_expensive( $row ) ? ' qm-expensive' : '';
|
| 203 |
|
| 204 |
+
$sql = QM_Util::format_sql( $row['sql'] );
|
| 205 |
+
|
| 206 |
if ( 'SELECT' != $row['type'] )
|
| 207 |
+
$sql = "<span class='qm-nonselectsql'>{$sql}</span>";
|
| 208 |
|
| 209 |
if ( is_wp_error( $row['result'] ) ) {
|
| 210 |
$error = $row['result']->get_error_message();
|
| 234 |
echo "<tr{$attr}>";
|
| 235 |
|
| 236 |
if ( isset( $cols['sql'] ) )
|
| 237 |
+
echo "<td valign='top' class='qm-row-sql qm-ltr qm-sql'>{$sql}</td>";
|
| 238 |
|
| 239 |
if ( isset( $cols['caller'] ) ) {
|
| 240 |
echo "<td valign='top' class='qm-row-caller qm-ltr qm-has-toggle'>";
|
| 247 |
$stack = implode( '<br>', $stack );
|
| 248 |
|
| 249 |
if ( !empty( $stack ) ) {
|
| 250 |
+
echo '<a href="#" class="qm-toggle">+</a>';
|
| 251 |
echo '<div class="qm-toggled">' . $stack . '</div>';
|
| 252 |
}
|
| 253 |
|
output/html/environment.php
CHANGED
|
@@ -26,17 +26,18 @@ class QM_Output_Html_Environment extends QM_Output_Html {
|
|
| 26 |
|
| 27 |
$data = $this->collector->get_data();
|
| 28 |
|
| 29 |
-
echo '<div
|
|
|
|
|
|
|
| 30 |
echo '<table cellspacing="0">';
|
| 31 |
echo '<thead>';
|
| 32 |
echo '<tr>';
|
| 33 |
-
echo '<th colspan="
|
| 34 |
echo '</tr>';
|
| 35 |
echo '</thead>';
|
| 36 |
echo '<tbody>';
|
| 37 |
|
| 38 |
echo '<tr>';
|
| 39 |
-
echo '<td rowspan="' . ( 3 + count( $data['php']['variables'] ) ) . '">PHP</td>';
|
| 40 |
echo '<td>version</td>';
|
| 41 |
echo "<td>{$data['php']['version']}</td>";
|
| 42 |
echo '</tr>';
|
|
@@ -50,7 +51,7 @@ class QM_Output_Html_Environment extends QM_Output_Html {
|
|
| 50 |
$append = '';
|
| 51 |
|
| 52 |
if ( $val['after'] != $val['before'] )
|
| 53 |
-
$append .= '<br
|
| 54 |
|
| 55 |
echo '<tr>';
|
| 56 |
echo "<td>{$key}</td>";
|
|
@@ -58,13 +59,17 @@ class QM_Output_Html_Environment extends QM_Output_Html {
|
|
| 58 |
echo '</tr>';
|
| 59 |
}
|
| 60 |
|
| 61 |
-
$error_levels = implode( '<br
|
| 62 |
|
| 63 |
echo '<tr>';
|
| 64 |
echo '<td>error_reporting</td>';
|
| 65 |
echo "<td>{$data['php']['error_reporting']}<br><span class='qm-info'>{$error_levels}</span></td>";
|
| 66 |
echo '</tr>';
|
| 67 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 68 |
if ( isset( $data['db'] ) ) {
|
| 69 |
|
| 70 |
foreach ( $data['db'] as $id => $db ) {
|
|
@@ -72,10 +77,18 @@ class QM_Output_Html_Environment extends QM_Output_Html {
|
|
| 72 |
if ( 1 == count( $data['db'] ) )
|
| 73 |
$name = 'MySQL';
|
| 74 |
else
|
| 75 |
-
$name =
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 76 |
|
| 77 |
echo '<tr>';
|
| 78 |
-
echo '<td rowspan="' . ( 5 + count( $db['variables'] ) ) . '">' . $name . '</td>';
|
| 79 |
echo '<td>version</td>';
|
| 80 |
echo '<td>' . $db['version'] . '</td>';
|
| 81 |
echo '</tr>';
|
|
@@ -122,7 +135,7 @@ class QM_Output_Html_Environment extends QM_Output_Html {
|
|
| 122 |
$prepend .= ' <span class="qm-info">(<a href="' . esc_url( sprintf( $search, $key ) ) . '" target="_blank" title="' . esc_attr( sprintf( $warn, $key ) ) . '">' . __( 'Help', 'query-monitor' ) . '</a>)</span>';
|
| 123 |
|
| 124 |
if ( is_numeric( $val ) and ( $val >= ( 1024*1024 ) ) )
|
| 125 |
-
$prepend .= '<br
|
| 126 |
|
| 127 |
$class = ( $show_warning ) ? 'qm-warn' : '';
|
| 128 |
|
|
@@ -141,30 +154,46 @@ class QM_Output_Html_Environment extends QM_Output_Html {
|
|
| 141 |
|
| 142 |
}
|
| 143 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 144 |
}
|
| 145 |
|
| 146 |
}
|
| 147 |
|
|
|
|
|
|
|
|
|
|
| 148 |
echo '<tr>';
|
| 149 |
-
echo '<
|
| 150 |
-
|
| 151 |
-
|
|
|
|
| 152 |
|
| 153 |
foreach ( $data['wp'] as $key => $val ) {
|
| 154 |
|
| 155 |
-
|
| 156 |
-
echo "<tr>";
|
| 157 |
-
|
| 158 |
echo "<td>{$key}</td>";
|
| 159 |
echo "<td>{$val}</td>";
|
| 160 |
echo '</tr>';
|
| 161 |
|
| 162 |
-
$first = false;
|
| 163 |
-
|
| 164 |
}
|
| 165 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 166 |
echo '<tr>';
|
| 167 |
-
echo '<td rowspan="4">' . __( 'Server', 'query-monitor' ) . '</td>';
|
| 168 |
echo '<td>software</td>';
|
| 169 |
echo "<td>{$data['server']['name']}</td>";
|
| 170 |
echo '</tr>';
|
|
@@ -188,6 +217,8 @@ class QM_Output_Html_Environment extends QM_Output_Html {
|
|
| 188 |
echo '</table>';
|
| 189 |
echo '</div>';
|
| 190 |
|
|
|
|
|
|
|
| 191 |
}
|
| 192 |
|
| 193 |
public function admin_menu( array $menu ) {
|
| 26 |
|
| 27 |
$data = $this->collector->get_data();
|
| 28 |
|
| 29 |
+
echo '<div id="' . $this->collector->id() . '">';
|
| 30 |
+
|
| 31 |
+
echo '<div class="qm qm-half">';
|
| 32 |
echo '<table cellspacing="0">';
|
| 33 |
echo '<thead>';
|
| 34 |
echo '<tr>';
|
| 35 |
+
echo '<th colspan="2">PHP</th>';
|
| 36 |
echo '</tr>';
|
| 37 |
echo '</thead>';
|
| 38 |
echo '<tbody>';
|
| 39 |
|
| 40 |
echo '<tr>';
|
|
|
|
| 41 |
echo '<td>version</td>';
|
| 42 |
echo "<td>{$data['php']['version']}</td>";
|
| 43 |
echo '</tr>';
|
| 51 |
$append = '';
|
| 52 |
|
| 53 |
if ( $val['after'] != $val['before'] )
|
| 54 |
+
$append .= '<br><span class="qm-info">' . sprintf( __( 'Overridden at runtime from %s', 'query-monitor' ), $val['before'] ) . '</span>';
|
| 55 |
|
| 56 |
echo '<tr>';
|
| 57 |
echo "<td>{$key}</td>";
|
| 59 |
echo '</tr>';
|
| 60 |
}
|
| 61 |
|
| 62 |
+
$error_levels = implode( '<br>', $this->collector->get_error_levels( $data['php']['error_reporting'] ) );
|
| 63 |
|
| 64 |
echo '<tr>';
|
| 65 |
echo '<td>error_reporting</td>';
|
| 66 |
echo "<td>{$data['php']['error_reporting']}<br><span class='qm-info'>{$error_levels}</span></td>";
|
| 67 |
echo '</tr>';
|
| 68 |
|
| 69 |
+
echo '</tbody>';
|
| 70 |
+
echo '</table>';
|
| 71 |
+
echo '</div>';
|
| 72 |
+
|
| 73 |
if ( isset( $data['db'] ) ) {
|
| 74 |
|
| 75 |
foreach ( $data['db'] as $id => $db ) {
|
| 77 |
if ( 1 == count( $data['db'] ) )
|
| 78 |
$name = 'MySQL';
|
| 79 |
else
|
| 80 |
+
$name = 'MySQL: ' . $id;
|
| 81 |
+
|
| 82 |
+
echo '<div class="qm qm-half">';
|
| 83 |
+
echo '<table cellspacing="0">';
|
| 84 |
+
echo '<thead>';
|
| 85 |
+
echo '<tr>';
|
| 86 |
+
echo '<th colspan="2">' . esc_html( $name ) . '</th>';
|
| 87 |
+
echo '</tr>';
|
| 88 |
+
echo '</thead>';
|
| 89 |
+
echo '<tbody>';
|
| 90 |
|
| 91 |
echo '<tr>';
|
|
|
|
| 92 |
echo '<td>version</td>';
|
| 93 |
echo '<td>' . $db['version'] . '</td>';
|
| 94 |
echo '</tr>';
|
| 135 |
$prepend .= ' <span class="qm-info">(<a href="' . esc_url( sprintf( $search, $key ) ) . '" target="_blank" title="' . esc_attr( sprintf( $warn, $key ) ) . '">' . __( 'Help', 'query-monitor' ) . '</a>)</span>';
|
| 136 |
|
| 137 |
if ( is_numeric( $val ) and ( $val >= ( 1024*1024 ) ) )
|
| 138 |
+
$prepend .= '<br><span class="qm-info">~' . size_format( $val ) . '</span>';
|
| 139 |
|
| 140 |
$class = ( $show_warning ) ? 'qm-warn' : '';
|
| 141 |
|
| 154 |
|
| 155 |
}
|
| 156 |
|
| 157 |
+
echo '</tbody>';
|
| 158 |
+
echo '</table>';
|
| 159 |
+
echo '</div>';
|
| 160 |
+
|
| 161 |
}
|
| 162 |
|
| 163 |
}
|
| 164 |
|
| 165 |
+
echo '<div class="qm qm-half qm-clear">';
|
| 166 |
+
echo '<table cellspacing="0">';
|
| 167 |
+
echo '<thead>';
|
| 168 |
echo '<tr>';
|
| 169 |
+
echo '<th colspan="2">WordPress</th>';
|
| 170 |
+
echo '</tr>';
|
| 171 |
+
echo '</thead>';
|
| 172 |
+
echo '<tbody>';
|
| 173 |
|
| 174 |
foreach ( $data['wp'] as $key => $val ) {
|
| 175 |
|
| 176 |
+
echo '<tr>';
|
|
|
|
|
|
|
| 177 |
echo "<td>{$key}</td>";
|
| 178 |
echo "<td>{$val}</td>";
|
| 179 |
echo '</tr>';
|
| 180 |
|
|
|
|
|
|
|
| 181 |
}
|
| 182 |
|
| 183 |
+
echo '</tbody>';
|
| 184 |
+
echo '</table>';
|
| 185 |
+
echo '</div>';
|
| 186 |
+
|
| 187 |
+
echo '<div class="qm qm-half">';
|
| 188 |
+
echo '<table cellspacing="0">';
|
| 189 |
+
echo '<thead>';
|
| 190 |
+
echo '<tr>';
|
| 191 |
+
echo '<th colspan="2">' . __( 'Server', 'query-monitor' ) . '</th>';
|
| 192 |
+
echo '</tr>';
|
| 193 |
+
echo '</thead>';
|
| 194 |
+
echo '<tbody>';
|
| 195 |
+
|
| 196 |
echo '<tr>';
|
|
|
|
| 197 |
echo '<td>software</td>';
|
| 198 |
echo "<td>{$data['server']['name']}</td>";
|
| 199 |
echo '</tr>';
|
| 217 |
echo '</table>';
|
| 218 |
echo '</div>';
|
| 219 |
|
| 220 |
+
echo '</div>';
|
| 221 |
+
|
| 222 |
}
|
| 223 |
|
| 224 |
public function admin_menu( array $menu ) {
|
output/html/http.php
CHANGED
|
@@ -47,44 +47,34 @@ class QM_Output_Html_HTTP extends QM_Output_Html {
|
|
| 47 |
|
| 48 |
echo '<tbody>';
|
| 49 |
|
| 50 |
-
foreach ( $data['http'] as $row ) {
|
| 51 |
$funcs = array();
|
| 52 |
|
| 53 |
-
|
|
|
|
| 54 |
|
| 55 |
-
|
| 56 |
-
$
|
|
|
|
| 57 |
$stime = number_format_i18n( $ltime, 4 );
|
| 58 |
-
$ltime = number_format_i18n( $ltime, 10 );
|
| 59 |
-
|
| 60 |
-
if ( is_wp_error( $row['response'] ) ) {
|
| 61 |
-
$response = $row['response']->get_error_message();
|
| 62 |
-
$css = 'qm-warn';
|
| 63 |
-
} else {
|
| 64 |
-
$response = wp_remote_retrieve_response_code( $row['response'] );
|
| 65 |
-
$msg = wp_remote_retrieve_response_message( $row['response'] );
|
| 66 |
-
$css = '';
|
| 67 |
-
|
| 68 |
-
if ( empty( $response ) )
|
| 69 |
-
$response = __( 'n/a', 'query-monitor' );
|
| 70 |
-
else
|
| 71 |
-
$response = esc_html( $response . ' ' . $msg );
|
| 72 |
-
|
| 73 |
-
if ( intval( $response ) >= 400 )
|
| 74 |
-
$css = 'qm-warn';
|
| 75 |
|
| 76 |
-
|
| 77 |
|
|
|
|
|
|
|
|
|
|
| 78 |
} else {
|
|
|
|
|
|
|
|
|
|
| 79 |
|
| 80 |
-
|
|
|
|
|
|
|
|
|
|
| 81 |
|
| 82 |
-
$
|
| 83 |
-
|
| 84 |
-
$ltime = '';
|
| 85 |
-
$stime = number_format_i18n( $row['args']['timeout'], 4 );
|
| 86 |
-
$response = __( 'Request timed out', 'query-monitor' );
|
| 87 |
-
$css = 'qm-warn';
|
| 88 |
|
| 89 |
}
|
| 90 |
|
|
@@ -100,21 +90,21 @@ class QM_Output_Html_HTTP extends QM_Output_Html {
|
|
| 100 |
|
| 101 |
$stack = $row['trace']->get_stack();
|
| 102 |
|
| 103 |
-
foreach ( $stack as & $
|
| 104 |
foreach ( array( 'WP_Http', 'wp_remote_', 'fetch_rss', 'fetch_feed', 'SimplePie', 'download_url' ) as $skip ) {
|
| 105 |
-
if ( 0 === strpos( $
|
| 106 |
-
$
|
| 107 |
break;
|
| 108 |
}
|
| 109 |
}
|
| 110 |
}
|
| 111 |
|
| 112 |
-
$component =
|
| 113 |
|
| 114 |
-
$stack = implode( '<br
|
| 115 |
echo "
|
| 116 |
<tr class='{$css}'>\n
|
| 117 |
-
<td valign='top' class='qm-url qm-ltr'>{$method}<br
|
| 118 |
<td valign='top'>{$response}</td>\n
|
| 119 |
<td valign='top'>{$transport}</td>\n
|
| 120 |
<td valign='top' class='qm-ltr'>{$stack}</td>\n
|
| 47 |
|
| 48 |
echo '<tbody>';
|
| 49 |
|
| 50 |
+
foreach ( $data['http'] as $key => $row ) {
|
| 51 |
$funcs = array();
|
| 52 |
|
| 53 |
+
$ltime = ( $row['end'] - $row['start'] );
|
| 54 |
+
$total_time += $ltime;
|
| 55 |
|
| 56 |
+
if ( empty( $ltime ) )
|
| 57 |
+
$stime = '';
|
| 58 |
+
else
|
| 59 |
$stime = number_format_i18n( $ltime, 4 );
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 60 |
|
| 61 |
+
$ltime = number_format_i18n( $ltime, 10 );
|
| 62 |
|
| 63 |
+
if ( is_wp_error( $row['response'] ) ) {
|
| 64 |
+
$response = $row['response']->get_error_message();
|
| 65 |
+
$css = 'qm-warn';
|
| 66 |
} else {
|
| 67 |
+
$response = wp_remote_retrieve_response_code( $row['response'] );
|
| 68 |
+
$msg = wp_remote_retrieve_response_message( $row['response'] );
|
| 69 |
+
$css = '';
|
| 70 |
|
| 71 |
+
if ( empty( $response ) )
|
| 72 |
+
$response = __( 'n/a', 'query-monitor' );
|
| 73 |
+
else
|
| 74 |
+
$response = esc_html( $response . ' ' . $msg );
|
| 75 |
|
| 76 |
+
if ( intval( $response ) >= 400 )
|
| 77 |
+
$css = 'qm-warn';
|
|
|
|
|
|
|
|
|
|
|
|
|
| 78 |
|
| 79 |
}
|
| 80 |
|
| 90 |
|
| 91 |
$stack = $row['trace']->get_stack();
|
| 92 |
|
| 93 |
+
foreach ( $stack as & $frame ) {
|
| 94 |
foreach ( array( 'WP_Http', 'wp_remote_', 'fetch_rss', 'fetch_feed', 'SimplePie', 'download_url' ) as $skip ) {
|
| 95 |
+
if ( 0 === strpos( $frame, $skip ) ) {
|
| 96 |
+
$frame = sprintf( '<span class="qm-na">%s</span>', $frame );
|
| 97 |
break;
|
| 98 |
}
|
| 99 |
}
|
| 100 |
}
|
| 101 |
|
| 102 |
+
$component = $row['trace']->get_component();
|
| 103 |
|
| 104 |
+
$stack = implode( '<br>', $stack );
|
| 105 |
echo "
|
| 106 |
<tr class='{$css}'>\n
|
| 107 |
+
<td valign='top' class='qm-url qm-ltr'>{$method}<br>{$url}</td>\n
|
| 108 |
<td valign='top'>{$response}</td>\n
|
| 109 |
<td valign='top'>{$transport}</td>\n
|
| 110 |
<td valign='top' class='qm-ltr'>{$stack}</td>\n
|
output/html/overview.php
CHANGED
|
@@ -62,9 +62,9 @@ class QM_Output_Html_Overview extends QM_Output_Html {
|
|
| 62 |
echo '<div class="qm" id="' . $this->collector->id() . '">';
|
| 63 |
echo '<table cellspacing="0">';
|
| 64 |
|
| 65 |
-
$memory_usage .= '<br
|
| 66 |
|
| 67 |
-
$time_usage .= '<br
|
| 68 |
|
| 69 |
echo '<thead>';
|
| 70 |
echo '<tr>';
|
|
@@ -88,7 +88,7 @@ class QM_Output_Html_Overview extends QM_Output_Html {
|
|
| 88 |
foreach ( $db_query_num as $type_name => $type_count )
|
| 89 |
$db_query_types[] = sprintf( '%1$s: %2$s', $type_name, number_format_i18n( $type_count ) );
|
| 90 |
|
| 91 |
-
echo implode( '<br
|
| 92 |
|
| 93 |
echo '</td>';
|
| 94 |
}
|
| 62 |
echo '<div class="qm" id="' . $this->collector->id() . '">';
|
| 63 |
echo '<table cellspacing="0">';
|
| 64 |
|
| 65 |
+
$memory_usage .= '<br><span class="qm-info">' . sprintf( __( '%1$s%% of %2$s kB limit', 'query-monitor' ), number_format_i18n( $data['memory_usage'], 1 ), number_format_i18n( $data['memory_limit'] / 1024 ) ) . '</span>';
|
| 66 |
|
| 67 |
+
$time_usage .= '<br><span class="qm-info">' . sprintf( __( '%1$s%% of %2$ss limit', 'query-monitor' ), number_format_i18n( $data['time_usage'], 1 ), number_format_i18n( $data['time_limit'] ) ) . '</span>';
|
| 68 |
|
| 69 |
echo '<thead>';
|
| 70 |
echo '<tr>';
|
| 88 |
foreach ( $db_query_num as $type_name => $type_count )
|
| 89 |
$db_query_types[] = sprintf( '%1$s: %2$s', $type_name, number_format_i18n( $type_count ) );
|
| 90 |
|
| 91 |
+
echo implode( '<br>', $db_query_types );
|
| 92 |
|
| 93 |
echo '</td>';
|
| 94 |
}
|
output/html/php_errors.php
CHANGED
|
@@ -67,12 +67,12 @@ class QM_Output_Html_PHP_Errors extends QM_Output_Html {
|
|
| 67 |
echo '<tr>';
|
| 68 |
|
| 69 |
$stack = $error->trace->get_stack();
|
| 70 |
-
$component =
|
| 71 |
|
| 72 |
if ( empty( $stack ) )
|
| 73 |
$stack = '<em>' . __( 'none', 'query-monitor' ) . '</em>';
|
| 74 |
else
|
| 75 |
-
$stack = implode( '<br
|
| 76 |
|
| 77 |
$message = str_replace( "href='function.", "target='_blank' href='http://php.net/function.", $error->message );
|
| 78 |
|
| 67 |
echo '<tr>';
|
| 68 |
|
| 69 |
$stack = $error->trace->get_stack();
|
| 70 |
+
$component = $error->trace->get_component();
|
| 71 |
|
| 72 |
if ( empty( $stack ) )
|
| 73 |
$stack = '<em>' . __( 'none', 'query-monitor' ) . '</em>';
|
| 74 |
else
|
| 75 |
+
$stack = implode( '<br>', $stack );
|
| 76 |
|
| 77 |
$message = str_replace( "href='function.", "target='_blank' href='http://php.net/function.", $error->message );
|
| 78 |
|
output/html/transients.php
CHANGED
|
@@ -64,9 +64,9 @@ class QM_Output_Html_Transients extends QM_Output_Html {
|
|
| 64 |
}
|
| 65 |
}
|
| 66 |
|
| 67 |
-
$component =
|
| 68 |
|
| 69 |
-
$stack = implode( '<br
|
| 70 |
echo "
|
| 71 |
<tr>\n
|
| 72 |
<td valign='top'>{$transient}</td>\n
|
| 64 |
}
|
| 65 |
}
|
| 66 |
|
| 67 |
+
$component = $row['trace']->get_component();
|
| 68 |
|
| 69 |
+
$stack = implode( '<br>', $stack );
|
| 70 |
echo "
|
| 71 |
<tr>\n
|
| 72 |
<td valign='top'>{$transient}</td>\n
|
query-monitor.php
CHANGED
|
@@ -2,8 +2,8 @@
|
|
| 2 |
/*
|
| 3 |
Plugin Name: Query Monitor
|
| 4 |
Description: Monitoring of database queries, hooks, conditionals and more.
|
| 5 |
-
Version: 2.6.
|
| 6 |
-
Plugin URI: https://github.com/johnbillion/
|
| 7 |
Author: John Blackbourn
|
| 8 |
Author URI: https://johnblackbourn.com/
|
| 9 |
Text Domain: query-monitor
|
|
@@ -32,18 +32,18 @@ foreach ( array( 'Backtrace', 'Collector', 'Plugin', 'Util', 'Dispatcher', 'Outp
|
|
| 32 |
|
| 33 |
class QueryMonitor extends QM_Plugin {
|
| 34 |
|
| 35 |
-
protected $collectors
|
| 36 |
-
protected $dispatchers
|
| 37 |
-
protected $did_footer
|
| 38 |
|
| 39 |
protected function __construct( $file ) {
|
| 40 |
|
| 41 |
# Actions
|
| 42 |
add_action( 'init', array( $this, 'action_init' ) );
|
| 43 |
-
add_action( 'admin_footer', array( $this, 'action_footer' )
|
| 44 |
-
add_action( 'wp_footer', array( $this, 'action_footer' )
|
| 45 |
-
add_action( 'login_footer', array( $this, 'action_footer' )
|
| 46 |
-
add_action( 'shutdown', array( $this, 'action_shutdown' ),
|
| 47 |
|
| 48 |
# Filters
|
| 49 |
add_filter( 'pre_update_option_active_plugins', array( $this, 'filter_active_plugins' ) );
|
| 2 |
/*
|
| 3 |
Plugin Name: Query Monitor
|
| 4 |
Description: Monitoring of database queries, hooks, conditionals and more.
|
| 5 |
+
Version: 2.6.2
|
| 6 |
+
Plugin URI: https://github.com/johnbillion/query-monitor
|
| 7 |
Author: John Blackbourn
|
| 8 |
Author URI: https://johnblackbourn.com/
|
| 9 |
Text Domain: query-monitor
|
| 32 |
|
| 33 |
class QueryMonitor extends QM_Plugin {
|
| 34 |
|
| 35 |
+
protected $collectors = array();
|
| 36 |
+
protected $dispatchers = array();
|
| 37 |
+
protected $did_footer = false;
|
| 38 |
|
| 39 |
protected function __construct( $file ) {
|
| 40 |
|
| 41 |
# Actions
|
| 42 |
add_action( 'init', array( $this, 'action_init' ) );
|
| 43 |
+
add_action( 'admin_footer', array( $this, 'action_footer' ) );
|
| 44 |
+
add_action( 'wp_footer', array( $this, 'action_footer' ) );
|
| 45 |
+
add_action( 'login_footer', array( $this, 'action_footer' ) );
|
| 46 |
+
add_action( 'shutdown', array( $this, 'action_shutdown' ), 9999 );
|
| 47 |
|
| 48 |
# Filters
|
| 49 |
add_filter( 'pre_update_option_active_plugins', array( $this, 'filter_active_plugins' ) );
|
readme.txt
CHANGED
|
@@ -3,7 +3,7 @@ Contributors: johnbillion
|
|
| 3 |
Tags: debug, debugging, development, developer, performance, profiler, profiling, queries
|
| 4 |
Requires at least: 3.5
|
| 5 |
Tested up to: 3.8
|
| 6 |
-
Stable tag: 2.6.
|
| 7 |
License: GPLv2 or later
|
| 8 |
|
| 9 |
View debugging and performance information on database queries, hooks, conditionals, HTTP requests, redirects and more.
|
|
@@ -120,6 +120,11 @@ I know!
|
|
| 120 |
|
| 121 |
== Changelog ==
|
| 122 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 123 |
= 2.6.1 =
|
| 124 |
* Remove a file that was accidentally committed to the wordpress.org repo
|
| 125 |
|
| 3 |
Tags: debug, debugging, development, developer, performance, profiler, profiling, queries
|
| 4 |
Requires at least: 3.5
|
| 5 |
Tested up to: 3.8
|
| 6 |
+
Stable tag: 2.6.2
|
| 7 |
License: GPLv2 or later
|
| 8 |
|
| 9 |
View debugging and performance information on database queries, hooks, conditionals, HTTP requests, redirects and more.
|
| 120 |
|
| 121 |
== Changelog ==
|
| 122 |
|
| 123 |
+
= 2.6.2 =
|
| 124 |
+
* Fix two fundamental stability and compatibility issues (great news)
|
| 125 |
+
* Various visual tweaks
|
| 126 |
+
* Handle some uncommon use cases of the HTTP API
|
| 127 |
+
|
| 128 |
= 2.6.1 =
|
| 129 |
* Remove a file that was accidentally committed to the wordpress.org repo
|
| 130 |
|
screenshot-1.png
DELETED
|
Binary file
|
screenshot-2.png
DELETED
|
Binary file
|
screenshot-3.png
DELETED
|
Binary file
|
screenshot-4.png
DELETED
|
Binary file
|
screenshot-5.png
DELETED
|
Binary file
|
screenshot-6.png
DELETED
|
Binary file
|
screenshot-7.png
DELETED
|
Binary file
|
