").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};function mc(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,n.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?("undefined"!=typeof e.getBoundingClientRect&&(d=e.getBoundingClientRect()),c=mc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Qa})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return Y(this,function(a,d,e){var f=mc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ua(l.pixelPosition,function(a,c){return c?(c=Sa(a,b),Oa.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({
+padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return Y(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var nc=a.jQuery,oc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=oc),b&&a.jQuery===n&&(a.jQuery=nc),n},b||(a.jQuery=a.$=n),n});
diff --git a/htdocs/includes/DebugBar/Resources/widgets.css b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets.css
similarity index 84%
rename from htdocs/includes/DebugBar/Resources/widgets.css
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets.css
index e8ad62ec475..b4d7b08727e 100644
--- a/htdocs/includes/DebugBar/Resources/widgets.css
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets.css
@@ -28,13 +28,14 @@ pre.phpdebugbar-widgets-code-block {
border-right: 1px solid #aaa;
text-align: right;
}
+
/* -------------------------------------- */
ul.phpdebugbar-widgets-list {
margin: 0;
padding: 0;
list-style: none;
- font-family: monospace;
+ font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
}
ul.phpdebugbar-widgets-list li.phpdebugbar-widgets-list-item {
padding: 3px 6px;
@@ -56,7 +57,7 @@ div.phpdebugbar-widgets-messages {
padding-bottom: 20px;
}
div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugbar-widgets-value.phpdebugbar-widgets-warning:before {
- font-family: FontAwesome;
+ font-family: PhpDebugbarFontAwesome;
content: "\f071";
margin-right: 8px;
font-size: 11px;
@@ -66,12 +67,15 @@ div.phpdebugbar-widgets-messages {
color: red;
}
div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugbar-widgets-value.phpdebugbar-widgets-error:before {
- font-family: FontAwesome;
+ font-family: PhpDebugbarFontAwesome;
content: "\f057";
margin-right: 8px;
font-size: 11px;
color: red;
}
+ div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item pre.sf-dump {
+ display: inline;
+ }
div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugbar-widgets-collector,
div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugbar-widgets-label {
float: right;
@@ -93,9 +97,6 @@ div.phpdebugbar-widgets-messages {
bottom: 0;
width: 100%;
background: #fff;
- }
- div.phpdebugbar-widgets-messages div.phpdebugbar-widgets-toolbar i.fa-search {
- margin-left: 7px;
}
div.phpdebugbar-widgets-messages div.phpdebugbar-widgets-toolbar input {
border: 0;
@@ -111,7 +112,7 @@ div.phpdebugbar-widgets-messages {
float: right;
font-size: 12px;
padding: 2px 4px;
- background: #3d6c99;
+ background: #7cacd5;
margin: 0 2px;
border-radius: 4px;
color: #fff;
@@ -148,9 +149,13 @@ dl.phpdebugbar-widgets-kvlist {
/* -------------------------------------- */
-dl.phpdebugbar-widgets-varlist {
- font-family: monospace;
+dl.phpdebugbar-widgets-varlist,
+dl.phpdebugbar-widgets-htmlvarlist {
+ font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
}
+ dl.phpdebugbar-widgets-htmlvarlist dd {
+ cursor: initial;
+ }
/* -------------------------------------- */
@@ -172,20 +177,21 @@ ul.phpdebugbar-widgets-timeline {
ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-collector {
position: absolute;
font-size: 12px;
- font-family: monospace;
+ font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
color: #555;
top: 4px;
left: 5px;
background: none;
text-shadow: none;
font-weight: normal;
+ white-space: pre;
}
ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-collector {
left: initial;
right: 5px;
}
ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-value {
- display: block;
+ display: block;
position: absolute;
height: 10px;
background: #3db9ec;
@@ -198,7 +204,7 @@ ul.phpdebugbar-widgets-timeline {
width: 70%;
margin: 10px;
border: 1px solid #ddd;
- font-family: monospace;
+ font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
border-collapse: collapse;
}
ul.phpdebugbar-widgets-timeline table.phpdebugbar-widgets-params td {
@@ -239,5 +245,17 @@ div.phpdebugbar-widgets-exceptions li.phpdebugbar-widgets-list-item {
margin: 10px;
padding: 5px;
border: 1px solid #ddd;
- font-family: monospace;
+ font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
}
+
+div.phpdebugbar-widgets-exceptions a.phpdebugbar-widgets-editor-link:before {
+ font-family: PhpDebugbarFontAwesome;
+ margin-right: 4px;
+ font-size: 12px;
+ font-style: normal;
+}
+
+div.phpdebugbar-widgets-exceptions a.phpdebugbar-widgets-editor-link:before {
+ content: "\f08e";
+ margin-left: 4px;
+}
diff --git a/htdocs/includes/DebugBar/Resources/widgets.js b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets.js
similarity index 85%
rename from htdocs/includes/DebugBar/Resources/widgets.js
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets.js
index 025a9618b74..74fe3ca0535 100644
--- a/htdocs/includes/DebugBar/Resources/widgets.js
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets.js
@@ -65,7 +65,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
return code;
};
- /**
+ /**
* Creates a
element with a block of code
*
* @param {String} code
@@ -118,7 +118,6 @@ if (typeof(PhpDebugBar) == 'undefined') {
return pre;
};
-
// ------------------------------------------------------------------
// Generic widgets
// ------------------------------------------------------------------
@@ -250,7 +249,28 @@ if (typeof(PhpDebugBar) == 'undefined') {
});
// ------------------------------------------------------------------
-
+
+ /**
+ * An extension of KVListWidget where the data represents a list
+ * of variables whose contents are HTML; this is useful for showing
+ * variable output from VarDumper's HtmlDumper.
+ *
+ * Options:
+ * - data
+ */
+ var HtmlVariableListWidget = PhpDebugBar.Widgets.HtmlVariableListWidget = KVListWidget.extend({
+
+ className: csscls('kvlist htmlvarlist'),
+
+ itemRenderer: function(dt, dd, key, value) {
+ $('').attr('title', key).text(key).appendTo(dt);
+ dd.html(value);
+ }
+
+ });
+
+ // ------------------------------------------------------------------
+
/**
* Iframe widget
*
@@ -296,38 +316,42 @@ if (typeof(PhpDebugBar) == 'undefined') {
var self = this;
this.$list = new ListWidget({ itemRenderer: function(li, value) {
- var m = value.message;
- if (m.length > 100) {
- m = m.substr(0, 100) + "...";
- }
-
- var val = $('').addClass(csscls('value')).text(m).appendTo(li);
- if (!value.is_string || value.message.length > 100) {
- var prettyVal = value.message;
- if (!value.is_string) {
- prettyVal = null;
+ if (value.message_html) {
+ var val = $('').addClass(csscls('value')).html(value.message_html).appendTo(li);
+ } else {
+ var m = value.message;
+ if (m.length > 100) {
+ m = m.substr(0, 100) + "...";
}
- li.css('cursor', 'pointer').click(function() {
- if (val.hasClass(csscls('pretty'))) {
- val.text(m).removeClass(csscls('pretty'));
- } else {
- prettyVal = prettyVal || createCodeBlock(value.message, 'php');
- val.addClass(csscls('pretty')).empty().append(prettyVal);
+
+ var val = $('').addClass(csscls('value')).text(m).appendTo(li);
+ if (!value.is_string || value.message.length > 100) {
+ var prettyVal = value.message;
+ if (!value.is_string) {
+ prettyVal = null;
}
- });
+ li.css('cursor', 'pointer').click(function () {
+ if (val.hasClass(csscls('pretty'))) {
+ val.text(m).removeClass(csscls('pretty'));
+ } else {
+ prettyVal = prettyVal || createCodeBlock(value.message, 'php');
+ val.addClass(csscls('pretty')).empty().append(prettyVal);
+ }
+ });
+ }
}
+ if (value.collector) {
+ $('').addClass(csscls('collector')).text(value.collector).prependTo(li);
+ }
if (value.label) {
val.addClass(csscls(value.label));
- $('').addClass(csscls('label')).text(value.label).appendTo(li);
- }
- if (value.collector) {
- $('').addClass(csscls('collector')).text(value.collector).appendTo(li);
+ $('').addClass(csscls('label')).text(value.label).prependTo(li);
}
}});
this.$list.$el.appendTo(this.$el);
- this.$toolbar = $('
').addClass(csscls('toolbar')).appendTo(this.$el);
+ this.$toolbar = $('
').addClass(csscls('toolbar')).appendTo(this.$el);
$('')
.on('change', function() { self.set('search', this.value); })
@@ -466,7 +490,17 @@ if (typeof(PhpDebugBar) == 'undefined') {
this.$list = new ListWidget({ itemRenderer: function(li, e) {
$('').addClass(csscls('message')).text(e.message).appendTo(li);
if (e.file) {
- $('').addClass(csscls('filename')).text(e.file + "#" + e.line).appendTo(li);
+ var header = $('').addClass(csscls('filename')).text(e.file + "#" + e.line);
+ if (e.xdebug_link) {
+ if (e.xdebug_link.ajax) {
+ $('').on('click', function () {
+ $.ajax(e.xdebug_link.url);
+ }).addClass(csscls('editor-link')).appendTo(header);
+ } else {
+ $('').addClass(csscls('editor-link')).appendTo(header);
+ }
+ }
+ header.appendTo(li);
}
if (e.type) {
$('').addClass(csscls('type')).text(e.type).appendTo(li);
diff --git a/htdocs/includes/DebugBar/Resources/widgets/mails/widget.css b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.css
similarity index 74%
rename from htdocs/includes/DebugBar/Resources/widgets/mails/widget.css
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.css
index a43957a60ce..8e91858be63 100644
--- a/htdocs/includes/DebugBar/Resources/widgets/mails/widget.css
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.css
@@ -8,5 +8,5 @@ div.phpdebugbar-widgets-mails li.phpdebugbar-widgets-list-item pre.phpdebugbar-w
margin: 10px;
padding: 5px;
border: 1px solid #ddd;
- font-family: monospace;
+ font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
}
diff --git a/htdocs/includes/DebugBar/Resources/widgets/mails/widget.js b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.js
similarity index 100%
rename from htdocs/includes/DebugBar/Resources/widgets/mails/widget.js
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.js
diff --git a/htdocs/includes/DebugBar/Resources/widgets/sqlqueries/widget.css b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.css
similarity index 64%
rename from htdocs/includes/DebugBar/Resources/widgets/sqlqueries/widget.css
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.css
index 322f2ba7004..04fd0afb357 100644
--- a/htdocs/includes/DebugBar/Resources/widgets/sqlqueries/widget.css
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.css
@@ -1,5 +1,5 @@
div.phpdebugbar-widgets-sqlqueries .phpdebugbar-widgets-status {
- font-family: monospace;
+ font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
padding: 6px 6px;
border-bottom: 1px solid #ddd;
font-weight: bold;
@@ -11,28 +11,37 @@ div.phpdebugbar-widgets-sqlqueries li.phpdebugbar-widgets-list-item.phpdebugbar-
color: red;
}
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-database,
div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-duration,
div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-memory,
div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-row-count,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-copy-clipboard,
div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-stmt-id {
float: right;
margin-left: 8px;
color: #888;
}
+div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-status span.phpdebugbar-widgets-database,
div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-status span.phpdebugbar-widgets-duration,
div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-status span.phpdebugbar-widgets-memory,
div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-status span.phpdebugbar-widgets-row-count,
+div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-status span.phpdebugbar-widgets-copy-clipboard,
div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-status span.phpdebugbar-widgets-stmt-id {
color: #555;
}
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-database:before,
div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-duration:before,
div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-memory:before,
div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-row-count:before,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-copy-clipboard:before,
div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-stmt-id:before {
- font-family: FontAwesome;
+ font-family: PhpDebugbarFontAwesome;
margin-right: 4px;
font-size: 12px;
}
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-database:before {
+ content: "\f1c0";
+}
div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-duration:before {
content: "\f017";
}
@@ -45,12 +54,15 @@ div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-row-count:before {
div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-stmt-id:before {
content: "\f08d";
}
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-copy-clipboard:before {
+ content: "\f0c5";
+}
div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-params {
display: none;
width: 70%;
margin: 10px;
border: 1px solid #ddd;
- font-family: monospace;
+ font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
border-collapse: collapse;
}
div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-params td {
@@ -80,3 +92,27 @@ div.phpdebugbar-widgets-sqlqueries li.phpdebugbar-widgets-list-item.phpdebugbar-
div.phpdebugbar-widgets-sqlqueries li.phpdebugbar-widgets-list-item.phpdebugbar-widgets-sql-duplicate:hover {
background-color: #ffc;
}
+
+div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-toolbar {
+ display:none;
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+ background: #fff;
+ z-index: 1;
+}
+
+div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-toolbar a.phpdebugbar-widgets-filter {
+ float: right;
+ font-size: 12px;
+ padding: 2px 4px;
+ background: #7cacd5;
+ margin: 0 2px;
+ border-radius: 4px;
+ color: #fff;
+ text-decoration: none;
+}
+div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-toolbar a.phpdebugbar-widgets-filter.phpdebugbar-widgets-excluded {
+ background: #eee;
+ color: #888;
+}
diff --git a/htdocs/includes/DebugBar/Resources/widgets/sqlqueries/widget.js b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.js
similarity index 54%
rename from htdocs/includes/DebugBar/Resources/widgets/sqlqueries/widget.js
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.js
index 80be93b80cc..514915c7613 100644
--- a/htdocs/includes/DebugBar/Resources/widgets/sqlqueries/widget.js
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.js
@@ -12,10 +12,52 @@
className: csscls('sqlqueries'),
+ onFilterClick: function(el) {
+ $(el).toggleClass(csscls('excluded'));
+
+ var excludedLabels = [];
+ this.$toolbar.find(csscls('.filter') + csscls('.excluded')).each(function() {
+ excludedLabels.push(this.rel);
+ });
+
+ this.$list.$el.find("li[connection=" + $(el).attr("rel") + "]").toggle();
+
+ this.set('exclude', excludedLabels);
+ },
+ onCopyToClipboard: function (el) {
+ var code = $(el).parent('li').find('code').get(0);
+ var copy = function () {
+ try {
+ document.execCommand('copy');
+ alert('Query copied to the clipboard');
+ } catch (err) {
+ console.log('Oops, unable to copy');
+ }
+ };
+ var select = function (node) {
+ if (document.selection) {
+ var range = document.body.createTextRange();
+ range.moveToElementText(node);
+ range.select();
+ } else if (window.getSelection) {
+ var range = document.createRange();
+ range.selectNodeContents(node);
+ window.getSelection().removeAllRanges();
+ window.getSelection().addRange(range);
+ }
+ copy();
+ window.getSelection().removeAllRanges();
+ };
+ select(code);
+ },
render: function() {
this.$status = $('').addClass(csscls('status')).appendTo(this.$el);
- this.$list = new PhpDebugBar.Widgets.ListWidget({ itemRenderer: function(li, stmt) {
+ this.$toolbar = $('').addClass(csscls('toolbar')).appendTo(this.$el);
+
+ var filters = [], self = this;
+
+ this.$list = new PhpDebugBar.Widgets.ListWidget({ itemRenderer: function(li, stmt) {
$('').addClass(csscls('params')).appendTo(li);
for (var key in stmt.params) {
if (typeof stmt.params[key] !== 'function') {
table.append('
| ' + key + ' | ' + stmt.params[key] + ' |
');
+ '">' + stmt.params[key] + '');
}
}
li.css('cursor', 'pointer').click(function() {
@@ -52,11 +120,15 @@
this.$list.$el.appendTo(this.$el);
this.bindAttr('data', function(data) {
+ // the PDO collector maybe is empty
+ if (data.length <= 0) {
+ return false;
+ }
this.$list.set('data', data.statements);
this.$status.empty();
// Search for duplicate statements.
- for (var sql = {}, duplicate = 0, i = 0; i < data.statements.length; i++) {
+ for (var sql = {}, unique = 0, duplicate = 0, i = 0; i < data.statements.length; i++) {
var stmt = data.statements[i].sql;
if (data.statements[i].params && !$.isEmptyObject(data.statements[i].params)) {
stmt += ' {' + $.param(data.statements[i].params, false) + '}';
@@ -67,11 +139,13 @@
// Add classes to all duplicate SQL statements.
for (var stmt in sql) {
if (sql[stmt].keys.length > 1) {
- duplicate++;
+ duplicate += sql[stmt].keys.length;
for (var i = 0; i < sql[stmt].keys.length; i++) {
this.$list.$el.find('.' + csscls('list-item')).eq(sql[stmt].keys[i])
- .addClass(csscls('sql-duplicate')).addClass(csscls('sql-duplicate-'+duplicate));
+ .addClass(csscls('sql-duplicate'));
}
+ } else {
+ unique++;
}
}
@@ -80,7 +154,8 @@
t.append(", " + data.nb_failed_statements + " of which failed");
}
if (duplicate) {
- t.append(", " + duplicate + " of which were duplicated");
+ t.append(", " + duplicate + " of which were duplicates");
+ t.append(", " + unique + " unique");
}
if (data.accumulated_duration_str) {
this.$status.append($('
').addClass(csscls('duration')).text(data.accumulated_duration_str));
diff --git a/htdocs/includes/DebugBar/Resources/widgets/templates/widget.css b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.css
similarity index 83%
rename from htdocs/includes/DebugBar/Resources/widgets/templates/widget.css
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.css
index 1fa9878d7ed..29f6ab979bc 100644
--- a/htdocs/includes/DebugBar/Resources/widgets/templates/widget.css
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.css
@@ -1,6 +1,6 @@
div.phpdebugbar-widgets-templates div.phpdebugbar-widgets-status {
- font-family: monospace;
+ font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
padding: 6px 6px;
border-bottom: 1px solid #ddd;
font-weight: bold;
@@ -25,8 +25,10 @@ div.phpdebugbar-widgets-templates div.phpdebugbar-widgets-status span.phpdebugba
div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-render-time:before,
div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-memory:before,
div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-param-count:before,
-div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-type:before {
- font-family: FontAwesome;
+div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-type:before,
+div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
+{
+ font-family: PhpDebugbarFontAwesome;
margin-right: 4px;
font-size: 12px;
}
@@ -42,12 +44,16 @@ div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-param-count:before {
div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-type:before {
content: "\f121";
}
+div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before {
+ content: "\f08e";
+ margin-left: 4px;
+}
div.phpdebugbar-widgets-templates table.phpdebugbar-widgets-params {
display: none;
width: 70%;
margin: 10px;
border: 1px solid #ddd;
- font-family: monospace;
+ font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
border-collapse: collapse;
}
div.phpdebugbar-widgets-templates table.phpdebugbar-widgets-params td {
diff --git a/htdocs/includes/DebugBar/Resources/widgets/templates/widget.js b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.js
similarity index 71%
rename from htdocs/includes/DebugBar/Resources/widgets/templates/widget.js
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.js
index 362d4a45a24..c21a45b34f1 100644
--- a/htdocs/includes/DebugBar/Resources/widgets/templates/widget.js
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.js
@@ -17,6 +17,16 @@
this.$list = new PhpDebugBar.Widgets.ListWidget({ itemRenderer: function(li, tpl) {
$('
').addClass(csscls('name')).text(tpl.name).appendTo(li);
+
+ if (typeof tpl.xdebug_link !== 'undefined') {
+ if (tpl.xdebug_link.ajax) {
+ $('
').on('click', function () {
+ $.ajax(tpl.xdebug_link.url);
+ }).addClass(csscls('editor-link')).appendTo(li);
+ } else {
+ $('
').addClass(csscls('editor-link')).appendTo(li);
+ }
+ }
if (tpl.render_time_str) {
$('
').addClass(csscls('render-time')).text(tpl.render_time_str).appendTo(li);
}
@@ -47,13 +57,15 @@
}
}});
this.$list.$el.appendTo(this.$el);
+ this.$callgraph = $('
').addClass(csscls('callgraph')).appendTo(this.$el);
this.bindAttr('data', function(data) {
this.$list.set('data', data.templates);
this.$status.empty();
+ this.$callgraph.empty();
var sentence = data.sentence || "templates were rendered";
- $('
').text(data.templates.length + " " + sentence).appendTo(this.$status);
+ $('
').text(data.nb_templates + " " + sentence).appendTo(this.$status);
if (data.accumulated_render_time_str) {
this.$status.append($('
').addClass(csscls('render-time')).text(data.accumulated_render_time_str));
@@ -61,6 +73,15 @@
if (data.memory_usage_str) {
this.$status.append($('
').addClass(csscls('memory')).text(data.memory_usage_str));
}
+ if (data.nb_blocks > 0) {
+ $('
').text(data.nb_blocks + " blocks were rendered").appendTo(this.$status);
+ }
+ if (data.nb_macros > 0) {
+ $('
').text(data.nb_macros + " macros were rendered").appendTo(this.$status);
+ }
+ if (typeof data.callgraph !== 'undefined') {
+ this.$callgraph.html(data.callgraph);
+ }
});
}
diff --git a/htdocs/includes/DebugBar/StandardDebugBar.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/StandardDebugBar.php
similarity index 100%
rename from htdocs/includes/DebugBar/StandardDebugBar.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/StandardDebugBar.php
diff --git a/htdocs/includes/DebugBar/Storage/FileStorage.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/FileStorage.php
similarity index 90%
rename from htdocs/includes/DebugBar/Storage/FileStorage.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/FileStorage.php
index b37234976e2..98923e272b3 100644
--- a/htdocs/includes/DebugBar/Storage/FileStorage.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/FileStorage.php
@@ -25,6 +25,9 @@ class FileStorage implements StorageInterface
$this->dirname = rtrim($dirname, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
}
+ /**
+ * {@inheritdoc}
+ */
public function save($id, $data)
{
if (!file_exists($this->dirname)) {
@@ -33,11 +36,17 @@ class FileStorage implements StorageInterface
file_put_contents($this->makeFilename($id), json_encode($data));
}
+ /**
+ * {@inheritdoc}
+ */
public function get($id)
{
return json_decode(file_get_contents($this->makeFilename($id)), true);
}
+ /**
+ * {@inheritdoc}
+ */
public function find(array $filters = array(), $max = 20, $offset = 0)
{
//Loop through all .json files and remember the modified time and id.
@@ -81,6 +90,10 @@ class FileStorage implements StorageInterface
/**
* Filter the metadata for matches.
+ *
+ * @param array $meta
+ * @param array $filters
+ * @return bool
*/
protected function filter($meta, $filters)
{
@@ -92,6 +105,9 @@ class FileStorage implements StorageInterface
return true;
}
+ /**
+ * {@inheritdoc}
+ */
public function clear()
{
foreach (new \DirectoryIterator($this->dirname) as $file) {
@@ -101,6 +117,10 @@ class FileStorage implements StorageInterface
}
}
+ /**
+ * @param string $id
+ * @return string
+ */
public function makeFilename($id)
{
return $this->dirname . basename($id). ".json";
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/MemcachedStorage.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/MemcachedStorage.php
new file mode 100644
index 00000000000..c1ef873421b
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/MemcachedStorage.php
@@ -0,0 +1,158 @@
+memcached = $memcached;
+ $this->keyNamespace = $keyNamespace;
+ $this->expiration = $expiration;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function save($id, $data)
+ {
+ $key = $this->createKey($id);
+ $this->memcached->set($key, $data, $this->expiration);
+ if (!$this->memcached->append($this->keyNamespace, "|$key")) {
+ $this->memcached->set($this->keyNamespace, $key, $this->expiration);
+ } else if ($this->expiration) {
+ // append doesn't support updating expiration, so do it here:
+ $this->memcached->touch($this->keyNamespace, $this->expiration);
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get($id)
+ {
+ return $this->memcached->get($this->createKey($id));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function find(array $filters = array(), $max = 20, $offset = 0)
+ {
+ if (!($keys = $this->memcached->get($this->keyNamespace))) {
+ return array();
+ }
+
+ $results = array();
+ $keys = array_reverse(explode('|', $keys)); // Reverse so newest comes first
+ $keyPosition = 0; // Index in $keys to try to get next items from
+ $remainingItems = $max + $offset; // Try to obtain this many remaining items
+ // Loop until we've found $remainingItems matching items or no more items may exist.
+ while ($remainingItems > 0 && $keyPosition < count($keys)) {
+ // Consume some keys from $keys:
+ $itemsToGet = array_slice($keys, $keyPosition, $remainingItems);
+ $keyPosition += $remainingItems;
+ // Try to get them, and filter them:
+ $newItems = $this->memcachedGetMulti($itemsToGet, Memcached::GET_PRESERVE_ORDER);
+ if ($newItems) {
+ foreach ($newItems as $data) {
+ $meta = $data['__meta'];
+ if ($this->filter($meta, $filters)) {
+ $remainingItems--;
+ // Keep the result only if we've discarded $offset items first
+ if ($offset <= 0) {
+ $results[] = $meta;
+ } else {
+ $offset--;
+ }
+ }
+ }
+ }
+ }
+ return $results;
+ }
+
+ /**
+ * Filter the metadata for matches.
+ *
+ * @param array $meta
+ * @param array $filters
+ * @return bool
+ */
+ protected function filter($meta, $filters)
+ {
+ foreach ($filters as $key => $value) {
+ if (!isset($meta[$key]) || fnmatch($value, $meta[$key]) === false) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function clear()
+ {
+ if (!($keys = $this->memcached->get($this->keyNamespace))) {
+ return;
+ }
+ $this->memcached->delete($this->keyNamespace);
+ $this->memcached->deleteMulti(explode('|', $keys));
+ }
+
+ /**
+ * @param string $id
+ * @return string
+ */
+ protected function createKey($id)
+ {
+ return md5("{$this->keyNamespace}.$id");
+ }
+
+ /**
+ * The memcached getMulti function changed in version 3.0.0 to only have two parameters.
+ *
+ * @param array $keys
+ * @param int $flags
+ */
+ protected function memcachedGetMulti($keys, $flags)
+ {
+ if ($this->newGetMultiSignature === null) {
+ $this->newGetMultiSignature = (new ReflectionMethod('Memcached', 'getMulti'))->getNumberOfParameters() === 2;
+ }
+ if ($this->newGetMultiSignature) {
+ return $this->memcached->getMulti($keys, $flags);
+ } else {
+ $null = null;
+ return $this->memcached->getMulti($keys, $null, $flags);
+ }
+ }
+}
diff --git a/htdocs/includes/DebugBar/Storage/PdoStorage.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/PdoStorage.php
similarity index 86%
rename from htdocs/includes/DebugBar/Storage/PdoStorage.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/PdoStorage.php
index e7695ef69fa..ef9d568d275 100644
--- a/htdocs/includes/DebugBar/Storage/PdoStorage.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/PdoStorage.php
@@ -24,12 +24,13 @@ class PdoStorage implements StorageInterface
protected $sqlQueries = array(
'save' => "INSERT INTO %tablename% (id, data, meta_utime, meta_datetime, meta_uri, meta_ip, meta_method) VALUES (?, ?, ?, ?, ?, ?, ?)",
'get' => "SELECT data FROM %tablename% WHERE id = ?",
- 'find' => "SELECT data FROM %tablename% %where% LIMIT %limit% OFFSET %offset%",
+ 'find' => "SELECT data FROM %tablename% %where% ORDER BY meta_datetime DESC LIMIT %limit% OFFSET %offset%",
'clear' => "DELETE FROM %tablename%"
);
/**
- * @param string $dirname Directories where to store files
+ * @param \PDO $pdo The PDO instance
+ * @param string $tableName
* @param array $sqlQueries
*/
public function __construct(PDO $pdo, $tableName = 'phpdebugbar', array $sqlQueries = array())
@@ -49,6 +50,9 @@ class PdoStorage implements StorageInterface
$this->sqlQueries = array_merge($this->sqlQueries, $queries);
}
+ /**
+ * {@inheritdoc}
+ */
public function save($id, $data)
{
$sql = $this->getSqlQuery('save');
@@ -57,6 +61,9 @@ class PdoStorage implements StorageInterface
$stmt->execute(array($id, serialize($data), $meta['utime'], $meta['datetime'], $meta['uri'], $meta['ip'], $meta['method']));
}
+ /**
+ * {@inheritdoc}
+ */
public function get($id)
{
$sql = $this->getSqlQuery('get');
@@ -68,6 +75,9 @@ class PdoStorage implements StorageInterface
return null;
}
+ /**
+ * {@inheritdoc}
+ */
public function find(array $filters = array(), $max = 20, $offset = 0)
{
$where = array();
@@ -100,11 +110,21 @@ class PdoStorage implements StorageInterface
return $results;
}
+ /**
+ * {@inheritdoc}
+ */
public function clear()
{
$this->pdo->exec($this->getSqlQuery('clear'));
}
+ /**
+ * Get a SQL Query for a task, with the variables replaced
+ *
+ * @param string $name
+ * @param array $vars
+ * @return string
+ */
protected function getSqlQuery($name, array $vars = array())
{
$sql = $this->sqlQueries[$name];
diff --git a/htdocs/includes/DebugBar/Storage/RedisStorage.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/RedisStorage.php
similarity index 51%
rename from htdocs/includes/DebugBar/Storage/RedisStorage.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/RedisStorage.php
index 42d8e3ce4dc..f145369660b 100644
--- a/htdocs/includes/DebugBar/Storage/RedisStorage.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/RedisStorage.php
@@ -10,8 +10,6 @@
namespace DebugBar\Storage;
-use Predis\Client;
-
/**
* Stores collected data into Redis
*/
@@ -22,35 +20,57 @@ class RedisStorage implements StorageInterface
protected $hash;
/**
- * @param string $dirname Directories where to store files
+ * @param \Predis\Client $redis Redis Client
+ * @param string $hash
*/
- public function __construct(Client $redis, $hash = 'phpdebugbar')
+ public function __construct($redis, $hash = 'phpdebugbar')
{
$this->redis = $redis;
$this->hash = $hash;
}
+ /**
+ * {@inheritdoc}
+ */
public function save($id, $data)
{
- $this->redis->hset($this->hash, $id, serialize($data));
+ $this->redis->hset("$this->hash:meta", $id, serialize($data['__meta']));
+ unset($data['__meta']);
+ $this->redis->hset("$this->hash:data", $id, serialize($data));
}
+ /**
+ * {@inheritdoc}
+ */
public function get($id)
{
- return unserialize($this->redis->hget($this->hash, $id));
+ return array_merge(unserialize($this->redis->hget("$this->hash:data", $id)),
+ array('__meta' => unserialize($this->redis->hget("$this->hash:meta", $id))));
}
+ /**
+ * {@inheritdoc}
+ */
public function find(array $filters = array(), $max = 20, $offset = 0)
{
$results = array();
- foreach ($this->redis->hgetall($this->hash) as $id => $data) {
- if ($data = unserialize($data)) {
- $meta = $data['__meta'];
- if ($this->filter($meta, $filters)) {
- $results[] = $meta;
+ $cursor = "0";
+ do {
+ list($cursor, $data) = $this->redis->hscan("$this->hash:meta", $cursor);
+
+ foreach ($data as $meta) {
+ if ($meta = unserialize($meta)) {
+ if ($this->filter($meta, $filters)) {
+ $results[] = $meta;
+ }
}
}
- }
+ } while($cursor);
+
+ usort($results, function ($a, $b) {
+ return $a['utime'] < $b['utime'];
+ });
+
return array_slice($results, $offset, $max);
}
@@ -67,6 +87,9 @@ class RedisStorage implements StorageInterface
return true;
}
+ /**
+ * {@inheritdoc}
+ */
public function clear()
{
$this->redis->del($this->hash);
diff --git a/htdocs/includes/DebugBar/Storage/StorageInterface.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/StorageInterface.php
similarity index 100%
rename from htdocs/includes/DebugBar/Storage/StorageInterface.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/StorageInterface.php
diff --git a/htdocs/includes/DebugBar/Storage/pdo_storage_schema.sql b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/pdo_storage_schema.sql
similarity index 100%
rename from htdocs/includes/DebugBar/Storage/pdo_storage_schema.sql
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/pdo_storage_schema.sql
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index ee44af0a8dd..46a759f7170 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6256,6 +6256,15 @@ div.tabsElem a.tab {
}
+/* ============================================================================== */
+/* CSS style for debugbar */
+/* ============================================================================== */
+
+span.phpdebugbar-tooltip.phpdebugbar-tooltip-extra-wide, span.phpdebugbar-tooltip.phpdebugbar-tooltip-wide {
+ width: 250px !important;
+}
+
+
/* ============================================================================== */
/* CSS style used for jFlot */
/* ============================================================================== */
@@ -6268,7 +6277,6 @@ div.tabsElem a.tab {
}
-
/* ============================================================================== */
/* CSS style used for small screen */
/* ============================================================================== */