Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
This commit is contained in:
Thilanka Kaushalya
commit
5bd6aa27ad
22
ChangeLog
22
ChangeLog
@ -39,6 +39,9 @@ phpMyAdmin - ChangeLog
|
||||
+ [interface] Improved support for events
|
||||
+ [interface] Improved support for triggers
|
||||
+ [interface] Improved server monitoring
|
||||
+ AJAX for table Structure column Add
|
||||
|
||||
3.4.5.0 (not yet released)
|
||||
|
||||
3.4.4.0 (not yet released)
|
||||
- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes
|
||||
@ -57,6 +60,13 @@ phpMyAdmin - ChangeLog
|
||||
- bug #3374374 [interface] Fix footnote for inexact count while browsing
|
||||
- bug #3372807 [interface] Fix security warning link in setup
|
||||
- bug #3374347 [display] Backquotes in normal text on import page
|
||||
- bug #3358750 [core] With Suhosin, urls are too long in edit links
|
||||
|
||||
3.4.3.2 (2011-07-23)
|
||||
- [security] Fixed XSS vulnerability, see PMASA-2011-9
|
||||
- [security] Fixed local file inclusion vulnerability, see PMASA-2011-10
|
||||
- [security] Fixed local file inclusion vulnerability and code execution, see PMASA-2011-11
|
||||
- [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-12
|
||||
|
||||
3.4.3.1 (2011-07-02)
|
||||
- [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5
|
||||
@ -152,7 +162,7 @@ phpMyAdmin - ChangeLog
|
||||
+ patch #2974341 [structure] Clicking on table name in db Structure should
|
||||
Browse the table if possible, thanks to bhdouglass - dougboybhd
|
||||
+ patch #2975533 [search] New search operators, thanks to
|
||||
Martynas MickeviÄius
|
||||
Martynas Mickevičius
|
||||
+ patch #2967320 [designer] Colored relations based on the primary key,
|
||||
thanks to GreenRover - greenrover
|
||||
- [core] Provide way for vendors to easily change paths to config files.
|
||||
@ -306,7 +316,7 @@ phpMyAdmin - ChangeLog
|
||||
|
||||
3.3.7.0 (2010-09-07)
|
||||
- patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after
|
||||
a page size increase, thanks to Martin Schönberger - mad05
|
||||
a page size increase, thanks to Martin Schönberger - mad05
|
||||
|
||||
3.3.6.0 (2010-08-28)
|
||||
- bug #3033063 [core] Navi gets wrong db name
|
||||
@ -327,7 +337,7 @@ phpMyAdmin - ChangeLog
|
||||
|
||||
3.3.5.0 (2010-07-26)
|
||||
- patch #2932113 [information_schema] Slow export when having lots of
|
||||
databases, thanks to Stéphane Pontier - shadow_walker
|
||||
databases, thanks to Stéphane Pontier - shadow_walker
|
||||
- bug #3022705 [import] Import button does not work in Catalan when there
|
||||
is no progress bar possible
|
||||
- bug [replication] Do not offer information_schema in the list of databases
|
||||
@ -367,9 +377,9 @@ phpMyAdmin - ChangeLog
|
||||
- patch #2984893 [engines] InnoDB storage page emits a warning,
|
||||
thanks to Madhura Jayaratne - madhuracj
|
||||
- bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work,
|
||||
thanks to Björn Wiberg - bwiberg
|
||||
thanks to Björn Wiberg - bwiberg
|
||||
- bug #2983066 [interface] Flush table on table operations shows the query twice,
|
||||
thanks to Martynas MickeviÄius - BlinK_
|
||||
thanks to Martynas Mickevičius - BlinK_
|
||||
- bug #2983060, patch #2987900 [interface] Fix initial state of tables in
|
||||
designer, thanks to Sutharshan Balachandren.
|
||||
- bug #2983062, patch #2989408 [engines] Fix warnings when changing table
|
||||
@ -448,7 +458,7 @@ phpMyAdmin - ChangeLog
|
||||
+ rfe #2839504 [engines] Support InnoDB plugin's new row formats
|
||||
+ [core] Added ability for synchronizing databases among servers.
|
||||
+ [lang] #2843101 Dutch update, thanks to scavenger2008
|
||||
+ [lang] Galician update, thanks to Xosé Calvo - xosecalvo
|
||||
+ [lang] Galician update, thanks to Xosé Calvo - xosecalvo
|
||||
+ [export] Added MediaWiki export module,
|
||||
thanks to Derek Schaefer - drummingds1
|
||||
+ [lang] Turkish update, thanks to Burak Yavuz
|
||||
|
||||
260
js/functions.js
260
js/functions.js
@ -210,7 +210,13 @@ function confirmLink(theLink, theSqlQuery)
|
||||
|
||||
var is_confirmed = confirm(PMA_messages['strDoYouReally'] + ' :\n' + theSqlQuery);
|
||||
if (is_confirmed) {
|
||||
if ( typeof(theLink.href) != 'undefined' ) {
|
||||
if ( $(theLink).hasClass('formLinkSubmit') ) {
|
||||
var name = 'is_js_confirmed';
|
||||
if($(theLink).attr('href').indexOf('usesubform') != -1)
|
||||
name = 'subform[' + $(theLink).attr('href').substr('#').match(/usesubform\[(\d+)\]/i)[1] + '][is_js_confirmed]';
|
||||
|
||||
$(theLink).parents('form').append('<input type="hidden" name="' + name + '" value="1" />');
|
||||
} else if ( typeof(theLink.href) != 'undefined' ) {
|
||||
theLink.href += '&is_js_confirmed=1';
|
||||
} else if ( typeof(theLink.form) != 'undefined' ) {
|
||||
theLink.form.action += '?is_js_confirmed=1';
|
||||
@ -265,59 +271,51 @@ function confirmQuery(theForm1, sqlQuery1)
|
||||
return true;
|
||||
}
|
||||
|
||||
// The replace function (js1.2) isn't supported
|
||||
else if (typeof(sqlQuery1.value.replace) == 'undefined') {
|
||||
return true;
|
||||
}
|
||||
|
||||
// js1.2+ -> validation with regular expressions
|
||||
else {
|
||||
// "DROP DATABASE" statement isn't allowed
|
||||
if (PMA_messages['strNoDropDatabases'] != '') {
|
||||
var drop_re = new RegExp('(^|;)\\s*DROP\\s+(IF EXISTS\\s+)?DATABASE\\s', 'i');
|
||||
if (drop_re.test(sqlQuery1.value)) {
|
||||
alert(PMA_messages['strNoDropDatabases']);
|
||||
theForm1.reset();
|
||||
sqlQuery1.focus();
|
||||
return false;
|
||||
} // end if
|
||||
// "DROP DATABASE" statement isn't allowed
|
||||
if (PMA_messages['strNoDropDatabases'] != '') {
|
||||
var drop_re = new RegExp('(^|;)\\s*DROP\\s+(IF EXISTS\\s+)?DATABASE\\s', 'i');
|
||||
if (drop_re.test(sqlQuery1.value)) {
|
||||
alert(PMA_messages['strNoDropDatabases']);
|
||||
theForm1.reset();
|
||||
sqlQuery1.focus();
|
||||
return false;
|
||||
} // end if
|
||||
} // end if
|
||||
|
||||
// Confirms a "DROP/DELETE/ALTER/TRUNCATE" statement
|
||||
//
|
||||
// TODO: find a way (if possible) to use the parser-analyser
|
||||
// for this kind of verification
|
||||
// For now, I just added a ^ to check for the statement at
|
||||
// beginning of expression
|
||||
// Confirms a "DROP/DELETE/ALTER/TRUNCATE" statement
|
||||
//
|
||||
// TODO: find a way (if possible) to use the parser-analyser
|
||||
// for this kind of verification
|
||||
// For now, I just added a ^ to check for the statement at
|
||||
// beginning of expression
|
||||
|
||||
var do_confirm_re_0 = new RegExp('^\\s*DROP\\s+(IF EXISTS\\s+)?(TABLE|DATABASE|PROCEDURE)\\s', 'i');
|
||||
var do_confirm_re_1 = new RegExp('^\\s*ALTER\\s+TABLE\\s+((`[^`]+`)|([A-Za-z0-9_$]+))\\s+DROP\\s', 'i');
|
||||
var do_confirm_re_2 = new RegExp('^\\s*DELETE\\s+FROM\\s', 'i');
|
||||
var do_confirm_re_3 = new RegExp('^\\s*TRUNCATE\\s', 'i');
|
||||
var do_confirm_re_0 = new RegExp('^\\s*DROP\\s+(IF EXISTS\\s+)?(TABLE|DATABASE|PROCEDURE)\\s', 'i');
|
||||
var do_confirm_re_1 = new RegExp('^\\s*ALTER\\s+TABLE\\s+((`[^`]+`)|([A-Za-z0-9_$]+))\\s+DROP\\s', 'i');
|
||||
var do_confirm_re_2 = new RegExp('^\\s*DELETE\\s+FROM\\s', 'i');
|
||||
var do_confirm_re_3 = new RegExp('^\\s*TRUNCATE\\s', 'i');
|
||||
|
||||
if (do_confirm_re_0.test(sqlQuery1.value)
|
||||
|| do_confirm_re_1.test(sqlQuery1.value)
|
||||
|| do_confirm_re_2.test(sqlQuery1.value)
|
||||
|| do_confirm_re_3.test(sqlQuery1.value)) {
|
||||
var message = (sqlQuery1.value.length > 100)
|
||||
? sqlQuery1.value.substr(0, 100) + '\n ...'
|
||||
: sqlQuery1.value;
|
||||
var is_confirmed = confirm(PMA_messages['strDoYouReally'] + ' :\n' + message);
|
||||
// statement is confirmed -> update the
|
||||
// "is_js_confirmed" form field so the confirm test won't be
|
||||
// run on the server side and allows to submit the form
|
||||
if (is_confirmed) {
|
||||
theForm1.elements['is_js_confirmed'].value = 1;
|
||||
return true;
|
||||
}
|
||||
// statement is rejected -> do not submit the form
|
||||
else {
|
||||
window.focus();
|
||||
sqlQuery1.focus();
|
||||
return false;
|
||||
} // end if (handle confirm box result)
|
||||
} // end if (display confirm box)
|
||||
} // end confirmation stuff
|
||||
if (do_confirm_re_0.test(sqlQuery1.value)
|
||||
|| do_confirm_re_1.test(sqlQuery1.value)
|
||||
|| do_confirm_re_2.test(sqlQuery1.value)
|
||||
|| do_confirm_re_3.test(sqlQuery1.value)) {
|
||||
var message = (sqlQuery1.value.length > 100)
|
||||
? sqlQuery1.value.substr(0, 100) + '\n ...'
|
||||
: sqlQuery1.value;
|
||||
var is_confirmed = confirm(PMA_messages['strDoYouReally'] + ' :\n' + message);
|
||||
// statement is confirmed -> update the
|
||||
// "is_js_confirmed" form field so the confirm test won't be
|
||||
// run on the server side and allows to submit the form
|
||||
if (is_confirmed) {
|
||||
theForm1.elements['is_js_confirmed'].value = 1;
|
||||
return true;
|
||||
}
|
||||
// statement is rejected -> do not submit the form
|
||||
else {
|
||||
window.focus();
|
||||
sqlQuery1.focus();
|
||||
return false;
|
||||
} // end if (handle confirm box result)
|
||||
} // end if (display confirm box)
|
||||
|
||||
return true;
|
||||
} // end of the 'confirmQuery()' function
|
||||
@ -360,47 +358,31 @@ function checkSqlQuery(theForm)
|
||||
var sqlQuery = theForm.elements['sql_query'];
|
||||
var isEmpty = 1;
|
||||
|
||||
// The replace function (js1.2) isn't supported -> basic tests
|
||||
if (typeof(sqlQuery.value.replace) == 'undefined') {
|
||||
isEmpty = (sqlQuery.value == '') ? 1 : 0;
|
||||
if (isEmpty && typeof(theForm.elements['sql_file']) != 'undefined') {
|
||||
isEmpty = (theForm.elements['sql_file'].value == '') ? 1 : 0;
|
||||
}
|
||||
if (isEmpty && typeof(theForm.elements['sql_localfile']) != 'undefined') {
|
||||
isEmpty = (theForm.elements['sql_localfile'].value == '') ? 1 : 0;
|
||||
}
|
||||
if (isEmpty && typeof(theForm.elements['id_bookmark']) != 'undefined') {
|
||||
isEmpty = (theForm.elements['id_bookmark'].value == null || theForm.elements['id_bookmark'].value == '');
|
||||
var space_re = new RegExp('\\s+');
|
||||
if (typeof(theForm.elements['sql_file']) != 'undefined' &&
|
||||
theForm.elements['sql_file'].value.replace(space_re, '') != '') {
|
||||
return true;
|
||||
}
|
||||
if (typeof(theForm.elements['sql_localfile']) != 'undefined' &&
|
||||
theForm.elements['sql_localfile'].value.replace(space_re, '') != '') {
|
||||
return true;
|
||||
}
|
||||
if (isEmpty && typeof(theForm.elements['id_bookmark']) != 'undefined' &&
|
||||
(theForm.elements['id_bookmark'].value != null || theForm.elements['id_bookmark'].value != '') &&
|
||||
theForm.elements['id_bookmark'].selectedIndex != 0
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
// Checks for "DROP/DELETE/ALTER" statements
|
||||
if (sqlQuery.value.replace(space_re, '') != '') {
|
||||
if (confirmQuery(theForm, sqlQuery)) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
// js1.2+ -> validation with regular expressions
|
||||
else {
|
||||
var space_re = new RegExp('\\s+');
|
||||
if (typeof(theForm.elements['sql_file']) != 'undefined' &&
|
||||
theForm.elements['sql_file'].value.replace(space_re, '') != '') {
|
||||
return true;
|
||||
}
|
||||
if (typeof(theForm.elements['sql_localfile']) != 'undefined' &&
|
||||
theForm.elements['sql_localfile'].value.replace(space_re, '') != '') {
|
||||
return true;
|
||||
}
|
||||
if (isEmpty && typeof(theForm.elements['id_bookmark']) != 'undefined' &&
|
||||
(theForm.elements['id_bookmark'].value != null || theForm.elements['id_bookmark'].value != '') &&
|
||||
theForm.elements['id_bookmark'].selectedIndex != 0
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
// Checks for "DROP/DELETE/ALTER" statements
|
||||
if (sqlQuery.value.replace(space_re, '') != '') {
|
||||
if (confirmQuery(theForm, sqlQuery)) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
theForm.reset();
|
||||
isEmpty = 1;
|
||||
}
|
||||
theForm.reset();
|
||||
isEmpty = 1;
|
||||
|
||||
if (isEmpty) {
|
||||
sqlQuery.select();
|
||||
@ -423,19 +405,9 @@ function checkSqlQuery(theForm)
|
||||
*/
|
||||
function emptyCheckTheField(theForm, theFieldName)
|
||||
{
|
||||
var isEmpty = 1;
|
||||
var theField = theForm.elements[theFieldName];
|
||||
// Whether the replace function (js1.2) is supported or not
|
||||
var isRegExp = (typeof(theField.value.replace) != 'undefined');
|
||||
|
||||
if (!isRegExp) {
|
||||
isEmpty = (theField.value == '') ? 1 : 0;
|
||||
} else {
|
||||
var space_re = new RegExp('\\s+');
|
||||
isEmpty = (theField.value.replace(space_re, '') == '') ? 1 : 0;
|
||||
}
|
||||
|
||||
return isEmpty;
|
||||
var space_re = new RegExp('\\s+');
|
||||
return (theField.value.replace(space_re, '') == '') ? 1 : 0;
|
||||
} // end of the 'emptyCheckTheField()' function
|
||||
|
||||
|
||||
@ -1457,6 +1429,8 @@ function PMA_createTableDialog( div, url , target) {
|
||||
* - the current response value of the GET request, JSON parsed
|
||||
* - the previous response value of the GET request, JSON parsed
|
||||
* - the number of added points
|
||||
* error: Callback function when the get request fails. TODO: Apply callback on timeouts aswell
|
||||
* }
|
||||
*
|
||||
* @return object The created highcharts instance
|
||||
*/
|
||||
@ -1467,7 +1441,7 @@ function PMA_createChart(passedSettings) {
|
||||
chart: {
|
||||
type: 'spline',
|
||||
marginRight: 10,
|
||||
backgroundColor: 'transparent',
|
||||
backgroundColor: 'none',
|
||||
events: {
|
||||
/* Live charting support */
|
||||
load: function() {
|
||||
@ -1488,7 +1462,13 @@ function PMA_createChart(passedSettings) {
|
||||
thisChart.options.realtime.url,
|
||||
thisChart.options.realtime.postData,
|
||||
function(data) {
|
||||
curValue = jQuery.parseJSON(data);
|
||||
try {
|
||||
curValue = jQuery.parseJSON(data);
|
||||
} catch (err) {
|
||||
if(thisChart.options.realtime.error)
|
||||
thisChart.options.realtime.error(err);
|
||||
return;
|
||||
}
|
||||
|
||||
if(lastValue==null) diff = curValue.x - thisChart.xAxis[0].getExtremes().max;
|
||||
else diff = parseInt(curValue.x - lastValue.x);
|
||||
@ -1578,6 +1558,53 @@ function PMA_createChart(passedSettings) {
|
||||
return new Highcharts.Chart(settings);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Creates a Profiling Chart. Used in sql.php and server_status.js
|
||||
*/
|
||||
function PMA_createProfilingChart(data, options) {
|
||||
return PMA_createChart($.extend(true, {
|
||||
chart: {
|
||||
renderTo: 'profilingchart',
|
||||
type: 'pie'
|
||||
},
|
||||
title: { text:'', margin:0 },
|
||||
series: [{
|
||||
type: 'pie',
|
||||
name: PMA_messages['strQueryExecutionTime'],
|
||||
data: data
|
||||
}],
|
||||
plotOptions: {
|
||||
pie: {
|
||||
allowPointSelect: true,
|
||||
cursor: 'pointer',
|
||||
dataLabels: {
|
||||
enabled: true,
|
||||
distance: 35,
|
||||
formatter: function() {
|
||||
return '<b>'+ this.point.name +'</b><br/>'+ Highcharts.numberFormat(this.percentage, 2) +' %';
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
tooltip: {
|
||||
formatter: function() {
|
||||
return '<b>'+ this.point.name +'</b><br/>'+PMA_prettyProfilingNum(this.y)+'<br/>('+Highcharts.numberFormat(this.percentage, 2) +' %)';
|
||||
}
|
||||
}
|
||||
},options));
|
||||
}
|
||||
|
||||
// Formats a profiling duration nicely. Used in PMA_createProfilingChart() and server_status.js
|
||||
function PMA_prettyProfilingNum(num, acc) {
|
||||
if(!acc) acc = 1;
|
||||
acc = Math.pow(10,acc);
|
||||
if(num*1000 < 0.1) num = Math.round(acc*(num*1000*1000))/acc + 'µ'
|
||||
else if(num < 0.1) num = Math.round(acc*(num*1000))/acc + 'm'
|
||||
|
||||
return num + 's';
|
||||
}
|
||||
|
||||
/**
|
||||
* jQuery function that uses jQueryUI's dialogs to confirm with user. Does not
|
||||
* return a jQuery object yet and hence cannot be chained
|
||||
@ -2143,7 +2170,7 @@ $(document).ready(function() {
|
||||
$("#popup_background").css({"opacity":"0.7"});
|
||||
$("#popup_background").fadeIn("fast");
|
||||
$("#enum_editor").fadeIn("fast");
|
||||
/**Replacing the column name in the enum editor hearder*/
|
||||
/**Replacing the column name in the enum editor header*/
|
||||
var column_name = $("#append_fields_form").find("input[id=field_0_1]").attr("value");
|
||||
var h3_text = $("#enum_editor h3").html();
|
||||
$("#enum_editor h3").html(h3_text.split('"')[0]+'"'+column_name+'"');
|
||||
@ -2742,22 +2769,15 @@ $(document).ready(function() {
|
||||
/**
|
||||
* Enables the text generated by PMA_linkOrButton() to be clickable
|
||||
*/
|
||||
$('.clickprevimage')
|
||||
.css('color', function(index) {
|
||||
return $('a').css('color');
|
||||
})
|
||||
.css('cursor', function(index) {
|
||||
return $('a').css('cursor');
|
||||
}) //todo: hover effect
|
||||
.live('click',function(e) {
|
||||
$this_span = $(this);
|
||||
if ($this_span.closest('td').is('.inline_edit_anchor')) {
|
||||
// this would bind a second click event to the inline edit
|
||||
// anchor and would disturb its behavior
|
||||
} else {
|
||||
$this_span.parent().find('input:image').click();
|
||||
}
|
||||
});
|
||||
$('a[class~="formLinkSubmit"]').live('click',function(e) {
|
||||
|
||||
if($(this).attr('href').indexOf('=') != -1) {
|
||||
var data = $(this).attr('href').substr($(this).attr('href').indexOf('#')+1).split('=',2);
|
||||
$(this).parents('form').append('<input type="hidden" name="' + data[0] + '" value="' + data[1] + '"/>');
|
||||
}
|
||||
$(this).parents('form').submit();
|
||||
return false;
|
||||
});
|
||||
|
||||
$('#update_recent_tables').ready(function() {
|
||||
if (window.parent.frame_navigation != undefined
|
||||
|
||||
2149
js/jquery/jquery.qtip-1.0.0-rc3.js
Normal file
2149
js/jquery/jquery.qtip-1.0.0-rc3.js
Normal file
File diff suppressed because it is too large
Load Diff
15
js/jquery/jquery.qtip-1.0.0.min.js
vendored
15
js/jquery/jquery.qtip-1.0.0.min.js
vendored
File diff suppressed because one or more lines are too long
@ -10,21 +10,31 @@
|
||||
*/
|
||||
|
||||
/* Options:
|
||||
$('table').sortableTable({
|
||||
ignoreRect: { top, left, width, height } - relative coordinates on each element. If the user clicks
|
||||
in this area, it is not seen as a drag&drop request. Useful for toolbars etc.
|
||||
events: {
|
||||
start: callback function when the user starts dragging
|
||||
drop: callback function after an element has been dropped
|
||||
}
|
||||
})
|
||||
|
||||
$('table').sortableTable({
|
||||
ignoreRect: { top, left, width, height } - relative coordinates on each element. If the user clicks
|
||||
in this area, it is not seen as a drag&drop request. Useful for toolbars etc.
|
||||
events: {
|
||||
start: callback function when the user starts dragging
|
||||
drop: callback function after an element has been dropped
|
||||
}
|
||||
})
|
||||
*/
|
||||
|
||||
/* Commands:
|
||||
$('table').sortableTable('init') - equivalent to $('table').sortableTable()
|
||||
$('table').sortableTable('refresh') - if the table has been changed, refresh correctly assigns all events again
|
||||
$('table').sortableTable('destroy') - removes all events from the table
|
||||
|
||||
$('table').sortableTable('init') - equivalent to $('table').sortableTable()
|
||||
$('table').sortableTable('refresh') - if the table has been changed, refresh correctly assigns all events again
|
||||
$('table').sortableTable('destroy') - removes all events from the table
|
||||
|
||||
*/
|
||||
|
||||
/* Setup:
|
||||
|
||||
Can be applied on any table, there is just one convention.
|
||||
Each cell (<td>) has to contain one and only one element (preferably div or span)
|
||||
which is the actually draggable element.
|
||||
*/
|
||||
(function($) {
|
||||
jQuery.fn.sortableTable = function(method) {
|
||||
|
||||
|
||||
@ -111,10 +111,10 @@ $js_messages['strNone'] = __('None');
|
||||
$js_messages['strResumeMonitor'] = __('Resume monitor');
|
||||
$js_messages['strPauseMonitor'] = __('Pause monitor');
|
||||
/* Monitor: Instructions Dialog */
|
||||
$js_messages['strBothLogOn'] = __('general_log and slow_query_log is enabled.');
|
||||
$js_messages['strBothLogOn'] = __('general_log and slow_query_log are enabled.');
|
||||
$js_messages['strGenLogOn'] = __('general_log is enabled.');
|
||||
$js_messages['strSlowLogOn'] = __('slow_query_log is enabled.');
|
||||
$js_messages['strBothLogOff'] = __('slow_query_log and general_log is disabled.');
|
||||
$js_messages['strBothLogOff'] = __('slow_query_log and general_log are disabled.');
|
||||
$js_messages['strLogOutNotTable'] = __('log_output is not set to TABLE.');
|
||||
$js_messages['strLogOutIsTable'] = __('log_output is set to TABLE.');
|
||||
$js_messages['strSmallerLongQueryTimeAdvice'] = __('slow_query_log is enabled, but the server logs only queries that take longer than %d seconds. It is advisable to set this long_query_time 0-2 seconds, depending on your system.');
|
||||
@ -137,9 +137,6 @@ $js_messages['strChartTitle'] = __('Chart Title');
|
||||
$js_messages['strDifferential'] = __('Differential');
|
||||
$js_messages['strDividedBy'] = __('Divided by %s:');
|
||||
|
||||
$js_messages['strSelectedTimeRange'] = __('Selected time range:');
|
||||
$js_messages['strGroupInserts'] = __('Group together INSERTs into same table');
|
||||
$js_messages['strLogAnalyseInfo'] = __('<p>Choose from which log you want the statistics to be generated from.</p> Results are grouped by query text.');
|
||||
$js_messages['strFromSlowLog'] = __('From slow log');
|
||||
$js_messages['strFromGeneralLog'] = __('From general log');
|
||||
$js_messages['strAnalysingLogs'] = __('Analysing & loading logs. This may take a while.');
|
||||
@ -150,6 +147,15 @@ $js_messages['strLogDataLoaded'] = __('Log data loaded. Queries executed in this
|
||||
$js_messages['strJumpToTable'] = __('Jump to Log table');
|
||||
$js_messages['strNoDataFound'] = __('Log analysed, but not data found in this time span.');
|
||||
|
||||
/* l10n: A collection of available filters */
|
||||
$js_messages['strFilters'] = __('Filters');
|
||||
/* l10n: Filter as in "Start Filtering" */
|
||||
$js_messages['strFilter'] = __('Filter');
|
||||
$js_messages['strFilterByWordRegexp'] = __('Filter queries by word/regexp:');
|
||||
$js_messages['strIgnoreWhereAndGroup'] = __('Group queries, ignoring variable data in WHERE statements');
|
||||
$js_messages['strSumRows'] = __('Sum of grouped rows:');
|
||||
$js_messages['strTotal'] = __('Total:');
|
||||
|
||||
/* For inline query editing */
|
||||
$js_messages['strGo'] = __('Go');
|
||||
$js_messages['strCancel'] = __('Cancel');
|
||||
@ -199,6 +205,7 @@ $js_messages['strSave'] = __('Save');
|
||||
$js_messages['strHide'] = __('Hide');
|
||||
$js_messages['strNoRowSelected'] = __('No rows selected');
|
||||
$js_messages['strChangeTbl'] = __('Change');
|
||||
$js_messages['strQueryExecutionTime'] = __('Query execution time');
|
||||
|
||||
/* For tbl_select.js */
|
||||
$js_messages['strHideSearchCriteria'] = __('Hide search criteria');
|
||||
|
||||
1140
js/server_status.js
1140
js/server_status.js
File diff suppressed because it is too large
Load Diff
53
js/sql.js
53
js/sql.js
@ -55,6 +55,7 @@ function getFieldName($this_field) {
|
||||
function appendInlineAnchor() {
|
||||
// TODO: remove two lines below if vertical display mode has been completely removed
|
||||
var disp_mode = $("#top_direction_dropdown").val();
|
||||
|
||||
if (disp_mode != 'vertical') {
|
||||
$('.edit_row_anchor').each(function() {
|
||||
|
||||
@ -65,8 +66,9 @@ function appendInlineAnchor() {
|
||||
|
||||
var $img_object = $cloned_anchor.find('img').attr('title', PMA_messages['strInlineEdit']);
|
||||
if ($img_object.length != 0) {
|
||||
var img_class = $img_object.attr('class').replace(/b_edit/,'b_inline_edit');
|
||||
$img_object.attr('class', img_class);
|
||||
$img_object.removeClass('ic_b_edit');
|
||||
$img_object.addClass('ic_b_inline_edit');
|
||||
|
||||
$cloned_anchor.find('a').attr('href', '#');
|
||||
var $edit_span = $cloned_anchor.find('span:contains("' + PMA_messages['strEdit'] + '")');
|
||||
var $span = $cloned_anchor.find('a').find('span');
|
||||
@ -85,8 +87,8 @@ function appendInlineAnchor() {
|
||||
// the link was too big so <input type="image"> is there
|
||||
$img_object = $cloned_anchor.find('input:image').attr('title', PMA_messages['strInlineEdit']);
|
||||
if ($img_object.length > 0) {
|
||||
var img_class = $img_object.attr('class').replace(/b_edit/,'b_inline_edit');
|
||||
$img_object.attr('class', img_class);
|
||||
$img_object.removeClass('ic_b_edit');
|
||||
$img_object.addClass('ic_b_inline_edit');
|
||||
}
|
||||
$cloned_anchor
|
||||
.find('.clickprevimage')
|
||||
@ -445,8 +447,8 @@ $(document).ready(function() {
|
||||
// If icons are displayed. See $cfg['PropertiesIconic']
|
||||
if ($img_object.length > 0) {
|
||||
$img_object.attr('title', PMA_messages['strSave']);
|
||||
var img_class = $img_object.attr('class').replace(/b_inline_edit/,'b_save');
|
||||
$img_object.attr('class', img_class);
|
||||
$img_object.removeClass('ic_b_inline_edit');
|
||||
$img_object.addClass('ic_b_save');
|
||||
$this_children.prepend($img_object);
|
||||
}
|
||||
|
||||
@ -465,8 +467,8 @@ $(document).ready(function() {
|
||||
// If icons are displayed. See $cfg['PropertiesIconic']
|
||||
if ($img_object.length > 0) {
|
||||
$img_object.attr('title', PMA_messages['strHide']);
|
||||
var img_class = $img_object.attr('class').replace(/b_save/,'b_close');
|
||||
$img_object.attr('class', img_class);
|
||||
$img_object.removeClass('ic_b_save');
|
||||
$img_object.addClass('ic_b_close');
|
||||
$hide_span.prepend($img_object);
|
||||
}
|
||||
|
||||
@ -1230,47 +1232,20 @@ $(document).ready(function() {
|
||||
/*
|
||||
* Profiling Chart
|
||||
*/
|
||||
function createProfilingChart() {
|
||||
function makeProfilingChart() {
|
||||
if ($('#profilingchart').length == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
var cdata = new Array();
|
||||
var data = new Array();
|
||||
$.each(jQuery.parseJSON($('#profilingchart').html()),function(key,value) {
|
||||
cdata.push([key,parseFloat(value)]);
|
||||
data.push([key,parseFloat(value)]);
|
||||
});
|
||||
|
||||
// Prevent the user from seeing the JSON code
|
||||
$('div#profilingchart').html('').show();
|
||||
|
||||
PMA_createChart({
|
||||
chart: {
|
||||
renderTo: 'profilingchart',
|
||||
backgroundColor: $('#sqlqueryresults fieldset').css('background-color')
|
||||
},
|
||||
title: { text:'', margin:0 },
|
||||
series: [{
|
||||
type:'pie',
|
||||
name: 'Query execution time',
|
||||
data: cdata
|
||||
}],
|
||||
plotOptions: {
|
||||
pie: {
|
||||
allowPointSelect: true,
|
||||
cursor: 'pointer',
|
||||
dataLabels: {
|
||||
enabled: true,
|
||||
distance: 35,
|
||||
formatter: function() {
|
||||
return '<b>'+ this.point.name +'</b><br/>'+ Highcharts.numberFormat(this.percentage, 2) +' %';
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
tooltip: {
|
||||
formatter: function() { return '<b>'+ this.point.name +'</b><br/>'+this.y+'s<br/>('+Highcharts.numberFormat(this.percentage, 2) +' %)'; }
|
||||
}
|
||||
});
|
||||
PMA_createProfilingChart(data);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -143,7 +143,9 @@ function Swekey_auth_error()
|
||||
return "Internal Error: CA File $caFile not found";
|
||||
|
||||
$result = null;
|
||||
parse_str($_SERVER['QUERY_STRING']);
|
||||
$swekey_id = $_GET['swekey_id'];
|
||||
$swekey_otp = $_GET['swekey_otp'];
|
||||
|
||||
if (isset($swekey_id)) {
|
||||
unset($_SESSION['SWEKEY']['AUTHENTICATED_SWEKEY']);
|
||||
if (! isset($_SESSION['SWEKEY']['RND_TOKEN'])) {
|
||||
@ -166,7 +168,7 @@ function Swekey_auth_error()
|
||||
$result = __('No valid authentication key plugged');
|
||||
if ($_SESSION['SWEKEY']['CONF_DEBUG'])
|
||||
{
|
||||
$result .= "<br>".$swekey_id;
|
||||
$result .= "<br>" . htmlspecialchars($swekey_id);
|
||||
}
|
||||
unset($_SESSION['SWEKEY']['CONF_LOADED']); // reload the conf file
|
||||
}
|
||||
@ -184,19 +186,19 @@ function Swekey_auth_error()
|
||||
if (! isset($swekey_id)) {
|
||||
?>
|
||||
<script>
|
||||
if (key.length != 32)
|
||||
{
|
||||
window.location.search="?swekey_id=" + key;
|
||||
}
|
||||
else
|
||||
{
|
||||
var url = "" + window.location;
|
||||
if (url.indexOf("?") > 0)
|
||||
url = url.substr(0, url.indexOf("?"));
|
||||
Swekey_SetUnplugUrl(key, "pma_login", url + "?session_to_unset=<?php echo session_id();?>");
|
||||
var otp = Swekey_GetOtp(key, <?php echo '"'.$_SESSION['SWEKEY']['RND_TOKEN'].'"';?>);
|
||||
window.location.search="?swekey_id=" + key + "&swekey_otp=" + otp;
|
||||
}
|
||||
if (key.length != 32)
|
||||
{
|
||||
window.location.search="?swekey_id=" + key + "&token=<?php echo $_SESSION[' PMA_token ']; ?>";
|
||||
}
|
||||
else
|
||||
{
|
||||
var url = "" + window.location;
|
||||
if (url.indexOf("?") > 0)
|
||||
url = url.substr(0, url.indexOf("?"));
|
||||
Swekey_SetUnplugUrl(key, "pma_login", url + "?session_to_unset=<?php echo session_id();?>&token=<?php echo $_SESSION[' PMA_token ']; ?>");
|
||||
var otp = Swekey_GetOtp(key, <?php echo '"'.$_SESSION['SWEKEY']['RND_TOKEN'].'"';?>);
|
||||
window.location.search="?swekey_id=" + key + "&swekey_otp=" + otp + "&token=<?php echo $_SESSION[' PMA_token ']; ?>";
|
||||
}
|
||||
</script>
|
||||
<?php
|
||||
return __('Authenticating...');
|
||||
|
||||
@ -66,9 +66,10 @@ function PMA_pow($base, $exp, $use_function = false)
|
||||
* @param string $alternate alternate text
|
||||
* @param boolean $container include in container
|
||||
* @param boolean $force_text whether to force alternate text to be displayed
|
||||
* @param boolean $noSprite If true, the image source will be not replaced with a CSS Sprite
|
||||
* @return html img tag
|
||||
*/
|
||||
function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = false)
|
||||
function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = false, $noSprite = false)
|
||||
{
|
||||
$include_icon = false;
|
||||
$include_text = false;
|
||||
@ -80,9 +81,7 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f
|
||||
$include_icon = true;
|
||||
}
|
||||
|
||||
if ($force_text
|
||||
|| ! (true === $GLOBALS['cfg']['PropertiesIconic'])
|
||||
|| ! $include_icon) {
|
||||
if ($force_text || true !== $GLOBALS['cfg']['PropertiesIconic']) {
|
||||
// $cfg['PropertiesIconic'] is false or both
|
||||
// OR we have no $include_icon
|
||||
$include_text = true;
|
||||
@ -97,9 +96,14 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f
|
||||
$button .= '<span class="nowrap">';
|
||||
|
||||
if ($include_icon) {
|
||||
$button .= '<img src="themes/dot.gif"'
|
||||
. ' title="' . $alternate . '" alt="' . $alternate . '"'
|
||||
. ' class="icon ic_' . str_replace('.png','',$icon) . '" />';
|
||||
if($noSprite) {
|
||||
$button .= '<img src="' . $GLOBALS['pmaThemeImage'] . $icon . '"'
|
||||
. ' class="icon" width="16" height="16" />';
|
||||
} else {
|
||||
$button .= '<img src="themes/dot.gif"'
|
||||
. ' title="' . $alternate . '" alt="' . $alternate . '"'
|
||||
. ' class="icon ic_' . str_replace(array('.gif','.png'),array('',''),$icon) . '" />';
|
||||
}
|
||||
}
|
||||
|
||||
if ($include_icon && $include_text) {
|
||||
@ -474,7 +478,7 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice')
|
||||
|
||||
// footnotemarker used in js/tooltip.js
|
||||
return '<sup class="footnotemarker">' . $nr . '</sup>' .
|
||||
'<img class="footnotemarker ic_b_help footnote_' . $nr . '" src="themes/dot.gif" alt="" />';
|
||||
'<img class="footnotemarker footnote_' . $nr . ' ic_b_help" src="themes/dot.gif" alt="" />';
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1648,6 +1652,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
|
||||
return '';
|
||||
}
|
||||
|
||||
|
||||
if (! is_array($tag_params)) {
|
||||
$tmp = $tag_params;
|
||||
$tag_params = array();
|
||||
@ -1669,11 +1674,17 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
|
||||
$tag_params_strings[] = $par_name . '="' . $par_value . '"';
|
||||
}
|
||||
|
||||
$displayed_message = '';
|
||||
// Add text if not already added
|
||||
if (stristr($message, '<img') && (!$strip_img || $GLOBALS['cfg']['PropertiesIconic'] === true) && strip_tags($message)==$message) {
|
||||
$displayed_message = '<span>' . htmlspecialchars(preg_replace('/^.*\salt="([^"]*)".*$/si', '\1', $message)) . '</span>';
|
||||
}
|
||||
|
||||
if ($url_length <= $GLOBALS['cfg']['LinkLengthLimit']) {
|
||||
// no whitespace within an <a> else Safari will make it part of the link
|
||||
$ret = "\n" . '<a href="' . $url . '" '
|
||||
. implode(' ', $tag_params_strings) . '>'
|
||||
. $message . '</a>' . "\n";
|
||||
. $message . $displayed_message . '</a>' . "\n";
|
||||
} else {
|
||||
// no spaces (linebreaks) at all
|
||||
// or after the hidden fields
|
||||
@ -1702,7 +1713,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
|
||||
. ' method="post"' . $target . ' style="display: inline;">';
|
||||
$subname_open = '';
|
||||
$subname_close = '';
|
||||
$submit_name = '';
|
||||
$submit_link = '#';
|
||||
} else {
|
||||
$query_parts[] = 'redirect=' . $url_parts['path'];
|
||||
if (empty($GLOBALS['subform_counter'])) {
|
||||
@ -1712,7 +1723,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
|
||||
$ret = '';
|
||||
$subname_open = 'subform[' . $GLOBALS['subform_counter'] . '][';
|
||||
$subname_close = ']';
|
||||
$submit_name = ' name="usesubform[' . $GLOBALS['subform_counter'] . ']"';
|
||||
$submit_link = '#usesubform[' . $GLOBALS['subform_counter'] . ']=1';
|
||||
}
|
||||
foreach ($query_parts as $query_pair) {
|
||||
list($eachvar, $eachval) = explode('=', $query_pair);
|
||||
@ -1721,35 +1732,10 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
|
||||
. htmlspecialchars(urldecode($eachval)) . '" />';
|
||||
} // end while
|
||||
|
||||
if (stristr($message, '<img')) {
|
||||
if ($strip_img) {
|
||||
$message = trim(strip_tags($message));
|
||||
$ret .= '<input type="submit"' . $submit_name . ' '
|
||||
. implode(' ', $tag_params_strings)
|
||||
. ' value="' . htmlspecialchars($message) . '" />';
|
||||
} else {
|
||||
$displayed_message = htmlspecialchars(
|
||||
preg_replace('/^.*\salt="([^"]*)".*$/si', '\1',
|
||||
$message));
|
||||
$ret .= '<input type="image"' . $submit_name . ' '
|
||||
. implode(' ', $tag_params_strings)
|
||||
. ' src="' . preg_replace(
|
||||
'/^.*\ssrc="([^"]*)".*$/si', '\1', $message) . '"'
|
||||
. ' value="' . $displayed_message . '" title="' . $displayed_message . '" />';
|
||||
// Here we cannot obey PropertiesIconic completely as a
|
||||
// generated link would have a length over LinkLengthLimit
|
||||
// but we can at least show the message.
|
||||
// If PropertiesIconic is false or 'both'
|
||||
if ($GLOBALS['cfg']['PropertiesIconic'] !== true) {
|
||||
$ret .= ' <span class="clickprevimage">' . $displayed_message . '</span>';
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$message = trim(strip_tags($message));
|
||||
$ret .= '<input type="submit"' . $submit_name . ' '
|
||||
. implode(' ', $tag_params_strings)
|
||||
. ' value="' . htmlspecialchars($message) . '" />';
|
||||
}
|
||||
$ret .= "\n" . '<a href="' . $submit_link . '" class="formLinkSubmit" '
|
||||
. implode(' ', $tag_params_strings) . '>'
|
||||
. $message . ' ' . $displayed_message . '</a>' . "\n";
|
||||
|
||||
if ($new_form) {
|
||||
$ret .= '</form>';
|
||||
}
|
||||
|
||||
@ -2635,8 +2635,11 @@ $cfg['CheckConfigurationPermissions'] = true;
|
||||
* Limit for length of URL in links. When length would be above this limit, it
|
||||
* is replaced by form with button.
|
||||
* This is required as some web servers (IIS) have problems with long URLs.
|
||||
* The recommended limit is 2000
|
||||
* (see http://www.boutell.com/newfaq/misc/urllength.html) but we put
|
||||
* 1000 to accommodate Suhosin, see bug #3358750.
|
||||
*/
|
||||
$cfg['LinkLengthLimit'] = 2000;
|
||||
$cfg['LinkLengthLimit'] = 1000;
|
||||
|
||||
/**
|
||||
* Disable the table maintenance mass operations, like optimizing or
|
||||
|
||||
@ -17,35 +17,9 @@
|
||||
*/
|
||||
function PMA_lang($lang_key)
|
||||
{
|
||||
static $search, $replace;
|
||||
|
||||
// some quick cache'ing
|
||||
if ($search === null) {
|
||||
$replace_pairs = array(
|
||||
'<' => '<',
|
||||
'>' => '>',
|
||||
'[em]' => '<em>',
|
||||
'[/em]' => '</em>',
|
||||
'[strong]' => '<strong>',
|
||||
'[/strong]' => '</strong>',
|
||||
'[code]' => '<code>',
|
||||
'[/code]' => '</code>',
|
||||
'[kbd]' => '<kbd>',
|
||||
'[/kbd]' => '</kbd>',
|
||||
'[br]' => '<br />',
|
||||
'[sup]' => '<sup>',
|
||||
'[/sup]' => '</sup>');
|
||||
if (defined('PMA_SETUP')) {
|
||||
$replace_pairs['[a@Documentation.html'] = '[a@../Documentation.html';
|
||||
}
|
||||
$search = array_keys($replace_pairs);
|
||||
$replace = array_values($replace_pairs);
|
||||
}
|
||||
$message = isset($GLOBALS["strConfig$lang_key"]) ? $GLOBALS["strConfig$lang_key"] : $lang_key;
|
||||
$message = str_replace($search, $replace, $message);
|
||||
// replace [a@"$1"]$2[/a] with <a href="$1">$2</a>
|
||||
$message = preg_replace('#\[a@("?)([^\]]+)\1\]([^\[]+)\[/a\]#e',
|
||||
"PMA_lang_link_replace('$2', '$3')", $message);
|
||||
|
||||
$message = PMA_sanitize($message);
|
||||
|
||||
if (func_num_args() == 1) {
|
||||
return $message;
|
||||
|
||||
@ -33,7 +33,7 @@ if (! isset($page_title)) {
|
||||
$is_superuser = function_exists('PMA_isSuperuser') && PMA_isSuperuser();
|
||||
|
||||
$GLOBALS['js_include'][] = 'functions.js';
|
||||
$GLOBALS['js_include'][] = 'jquery/jquery.qtip-1.0.0.min.js';
|
||||
$GLOBALS['js_include'][] = 'jquery/jquery.qtip-1.0.0-rc3.js';
|
||||
$params = array('lang' => $GLOBALS['lang']);
|
||||
if (isset($GLOBALS['db'])) {
|
||||
$params['db'] = $GLOBALS['db'];
|
||||
|
||||
@ -6,6 +6,66 @@
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
/**
|
||||
* Checks whether given link is valid
|
||||
*
|
||||
* @param string $url URL to check.
|
||||
*
|
||||
* @return boolean True if string can be used as link.
|
||||
*/
|
||||
function PMA_checkLink($url)
|
||||
{
|
||||
$valid_starts = array(
|
||||
'http://',
|
||||
'https://',
|
||||
);
|
||||
if (defined('PMA_SETUP')) {
|
||||
$valid_starts[] = '../Documentation.html';
|
||||
} else {
|
||||
$valid_starts[] = './Documentation.html';
|
||||
}
|
||||
foreach ($valid_starts as $val) {
|
||||
if (substr($url, 0, strlen($val)) == $val) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Callback function for replacing [a@link@target] links in bb code.
|
||||
*
|
||||
* @param array $found Array of preg matches
|
||||
*
|
||||
* @return string Replaced string
|
||||
*/
|
||||
function PMA_replaceBBLink($found)
|
||||
{
|
||||
/* Check for valid link */
|
||||
if (! PMA_checkLink($found[1])) {
|
||||
return $found[0];
|
||||
}
|
||||
/* a-z and _ allowed in target */
|
||||
if (! empty($found[3]) && preg_match('/[^a-z_]+/i', $found[3])) {
|
||||
return $found[0];
|
||||
}
|
||||
|
||||
/* Construct target */
|
||||
$target = '';
|
||||
if (! empty($found[3])) {
|
||||
$target = ' target="' . $found[3] . '"';
|
||||
}
|
||||
|
||||
/* Construct url */
|
||||
if (substr($found[1], 0, 4) == 'http') {
|
||||
$url = PMA_linkURL($found[1]);
|
||||
} else {
|
||||
$url = $found[1];
|
||||
}
|
||||
|
||||
return '<a href="' . $url . '"' . $target . '>';
|
||||
}
|
||||
|
||||
/**
|
||||
* Sanitizes $message, taking into account our special codes
|
||||
* for formatting.
|
||||
@ -18,8 +78,9 @@
|
||||
*
|
||||
* <a title="<?php echo PMA_sanitize($foo, true); ?>">bar</a>
|
||||
*
|
||||
* @param string the message
|
||||
* @param boolean whether to escape html in result
|
||||
* @param string $message the message
|
||||
* @param boolean $escape whether to escape html in result
|
||||
* @param boolean $safe whether string is safe (can keep < and > chars)
|
||||
*
|
||||
* @return string the sanitized message
|
||||
*
|
||||
@ -30,6 +91,7 @@ function PMA_sanitize($message, $escape = false, $safe = false)
|
||||
if (!$safe) {
|
||||
$message = strtr($message, array('<' => '<', '>' => '>'));
|
||||
}
|
||||
/* Interpret bb code */
|
||||
$replace_pairs = array(
|
||||
'[i]' => '<em>', // deprecated by em
|
||||
'[/i]' => '</em>', // deprecated by em
|
||||
@ -50,34 +112,21 @@ function PMA_sanitize($message, $escape = false, $safe = false)
|
||||
'[sup]' => '<sup>',
|
||||
'[/sup]' => '</sup>',
|
||||
);
|
||||
/* Adjust links for setup, which lives in subfolder */
|
||||
if (defined('PMA_SETUP')) {
|
||||
$replace_pairs['[a@Documentation.html'] = '[a@../Documentation.html';
|
||||
} else {
|
||||
$replace_pairs['[a@Documentation.html'] = '[a@./Documentation.html';
|
||||
}
|
||||
$message = strtr($message, $replace_pairs);
|
||||
|
||||
$pattern = '/\[a@([^"@]*)@([^]"]*)\]/';
|
||||
/* Match links in bb code ([a@url@target], where @target is options) */
|
||||
$pattern = '/\[a@([^]"@]*)(@([^]"]*))?\]/';
|
||||
|
||||
if (preg_match_all($pattern, $message, $founds, PREG_SET_ORDER)) {
|
||||
$valid_links = array(
|
||||
'http', // default http:// links (and https://)
|
||||
'./Do', // ./Documentation
|
||||
);
|
||||
|
||||
foreach ($founds as $found) {
|
||||
// only http... and ./Do... allowed
|
||||
if (! in_array(substr($found[1], 0, 4), $valid_links)) {
|
||||
return $message;
|
||||
}
|
||||
// a-z and _ allowed in target
|
||||
if (! empty($found[2]) && preg_match('/[^a-z_]+/i', $found[2])) {
|
||||
return $message;
|
||||
}
|
||||
}
|
||||
|
||||
if (substr($found[1], 0, 4) == 'http') {
|
||||
$message = preg_replace($pattern, '<a href="' . PMA_linkURL($found[1]) . '" target="\2">', $message);
|
||||
} else {
|
||||
$message = preg_replace($pattern, '<a href="\1" target="\2">', $message);
|
||||
}
|
||||
}
|
||||
/* Find and replace all links */
|
||||
$message = preg_replace_callback($pattern, 'PMA_replaceBBLink', $message);
|
||||
|
||||
/* Possibly escape result */
|
||||
if ($escape) {
|
||||
$message = htmlspecialchars($message);
|
||||
}
|
||||
|
||||
@ -562,10 +562,13 @@ class PMA_User_Schema
|
||||
require_once './libraries/transformations.lib.php';
|
||||
require_once './libraries/Index.class.php';
|
||||
/**
|
||||
* default is PDF
|
||||
* default is PDF, otherwise validate it's only letters a-z
|
||||
*/
|
||||
global $db,$export_type;
|
||||
$export_type = isset($export_type) ? $export_type : 'pdf';
|
||||
if (!isset($export_type) || !preg_match('/^[a-zA-Z]+$/', $export_type)) {
|
||||
$export_type = 'pdf';
|
||||
}
|
||||
|
||||
PMA_DBI_select_db($db);
|
||||
|
||||
include("./libraries/schema/".ucfirst($export_type)."_Relation_Schema.class.php");
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
958
po/be@latin.po
958
po/be@latin.po
File diff suppressed because it is too large
Load Diff
1046
po/en_GB.po
1046
po/en_GB.po
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
1003
po/pt_BR.po
1003
po/pt_BR.po
File diff suppressed because it is too large
Load Diff
959
po/sr@latin.po
959
po/sr@latin.po
File diff suppressed because it is too large
Load Diff
960
po/uz@latin.po
960
po/uz@latin.po
File diff suppressed because it is too large
Load Diff
957
po/zh_CN.po
957
po/zh_CN.po
File diff suppressed because it is too large
Load Diff
957
po/zh_TW.po
957
po/zh_TW.po
File diff suppressed because it is too large
Load Diff
@ -37,7 +37,9 @@ include_once("./libraries/schema/Export_Relation_Schema.class.php");
|
||||
* default is PDF
|
||||
*/
|
||||
global $db,$export_type;
|
||||
$export_type = isset($export_type) ? $export_type : 'pdf';
|
||||
if (!isset($export_type) || !preg_match('/^[a-zA-Z]+$/', $export_type)) {
|
||||
$export_type = 'pdf';
|
||||
}
|
||||
PMA_DBI_select_db($db);
|
||||
|
||||
$path = PMA_securePath(ucfirst($export_type));
|
||||
|
||||
@ -20,21 +20,6 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true)
|
||||
|
||||
require_once './libraries/common.inc.php';
|
||||
|
||||
/**
|
||||
* Function to output refresh rate selection.
|
||||
*/
|
||||
function PMA_choose_refresh_rate() {
|
||||
echo '<option value="5">' . __('Refresh rate') . '</option>';
|
||||
foreach (array(1, 2, 5, 20, 40, 60, 120, 300, 600) as $rate) {
|
||||
if ($rate % 60 == 0) {
|
||||
$minrate = $rate / 60;
|
||||
echo '<option value="' . $rate . '">' . sprintf(_ngettext('%d minute', '%d minutes', $minrate), $minrate) . '</option>';
|
||||
} else {
|
||||
echo '<option value="' . $rate . '">' . sprintf(_ngettext('%d second', '%d seconds', $rate), $rate) . '</option>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Ajax request
|
||||
*/
|
||||
@ -43,22 +28,6 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
|
||||
// Send with correct charset
|
||||
header('Content-Type: text/html; charset=UTF-8');
|
||||
|
||||
if (isset($_REQUEST['logging_vars'])) {
|
||||
if (isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) {
|
||||
$value = PMA_sqlAddslashes($_REQUEST['varValue']);
|
||||
if (!is_numeric($value)) $value="'".$value."'";
|
||||
|
||||
if (!preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName']))
|
||||
PMA_DBI_query('SET GLOBAL ' . $_REQUEST['varName'] . ' = '.$value);
|
||||
|
||||
}
|
||||
|
||||
$loggingVars = PMA_DBI_fetch_result(
|
||||
"SHOW GLOBAL VARIABLES WHERE Variable_name IN (
|
||||
'general_log', 'slow_query_log', 'long_query_time', 'log_output')", 0, 1);
|
||||
exit(json_encode($loggingVars));
|
||||
}
|
||||
|
||||
// real-time charting data
|
||||
if (isset($_REQUEST['chart_data'])) {
|
||||
switch($_REQUEST['type']) {
|
||||
@ -203,10 +172,14 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
|
||||
exit(json_encode($return));
|
||||
}
|
||||
|
||||
if ($_REQUEST['type'] == 'general') {
|
||||
$q = 'SELECT TIME(event_time) as event_time, user_host, thread_id, server_id, argument, count(argument) as \'#\' FROM `mysql`.`general_log` WHERE command_type=\'Query\' '.
|
||||
if($_REQUEST['type'] == 'general') {
|
||||
$limitTypes = (isset($_REQUEST['limitTypes']) && $_REQUEST['limitTypes'])
|
||||
? 'AND argument REGEXP \'^(INSERT|SELECT|UPDATE|DELETE)\' ' : '';
|
||||
|
||||
$q = 'SELECT TIME(event_time) as event_time, user_host, thread_id, server_id, argument, count(argument) as \'#\' '.
|
||||
'FROM `mysql`.`general_log` WHERE command_type=\'Query\' '.
|
||||
'AND event_time > FROM_UNIXTIME('.$start.') AND event_time < FROM_UNIXTIME('.$end.') '.
|
||||
'AND argument REGEXP \'^(INSERT|SELECT|UPDATE|DELETE)\' GROUP by argument'; // HAVING count > 1';
|
||||
$limitTypes . 'GROUP by argument'; // HAVING count > 1';
|
||||
|
||||
$result = PMA_DBI_try_query($q);
|
||||
|
||||
@ -215,38 +188,47 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
|
||||
$insertTables = array();
|
||||
$insertTablesFirst = -1;
|
||||
$i = 0;
|
||||
$removeVars = isset($_REQUEST['removeVariables']) && $_REQUEST['removeVariables'];
|
||||
|
||||
while ($row = PMA_DBI_fetch_assoc($result)) {
|
||||
preg_match('/^(\w+)\s/',$row['argument'],$match);
|
||||
$type = strtolower($match[1]);
|
||||
// Ignore undefined index warning, just increase counter by one
|
||||
@$return['sum'][$type] += $row['#'];
|
||||
|
||||
if ($type=='insert' || $type=='update') {
|
||||
// Group inserts if selected
|
||||
if ($type=='insert' && isset($_REQUEST['groupInserts']) && $_REQUEST['groupInserts'] && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',$row['argument'],$matches)) {
|
||||
$insertTables[$matches[2]]++;
|
||||
if ($insertTables[$matches[2]] > 1) {
|
||||
$return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]];
|
||||
if(!isset($return['sum'][$type])) $return['sum'][$type] = 0;
|
||||
$return['sum'][$type] += $row['#'];
|
||||
|
||||
// Add a ... to the end of this query to indicate that there's been other queries
|
||||
if ($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.')
|
||||
$return['rows'][$insertTablesFirst]['argument'] .= '<br/>...';
|
||||
switch($type) {
|
||||
case 'insert':
|
||||
// Group inserts if selected
|
||||
if($removeVars && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',$row['argument'],$matches)) {
|
||||
$insertTables[$matches[2]]++;
|
||||
if ($insertTables[$matches[2]] > 1) {
|
||||
$return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]];
|
||||
|
||||
// Group this value, thus do not add to the result list
|
||||
continue;
|
||||
} else {
|
||||
$insertTablesFirst = $i;
|
||||
$insertTables[$matches[2]] += $row['#'] - 1;
|
||||
// Add a ... to the end of this query to indicate that there's been other queries
|
||||
if($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.')
|
||||
$return['rows'][$insertTablesFirst]['argument'] .= '<br/>...';
|
||||
|
||||
// Group this value, thus do not add to the result list
|
||||
continue 2;
|
||||
} else {
|
||||
$insertTablesFirst = $i;
|
||||
$insertTables[$matches[2]] += $row['#'] - 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
// No break here
|
||||
|
||||
// Cut off big selects, but append byte count therefor
|
||||
if (strlen($row['argument']) > 180) {
|
||||
$row['argument'] = substr($row['argument'],0,160) . '... [' .
|
||||
PMA_formatByteDown(strlen($row['argument']), 2).']';
|
||||
}
|
||||
case 'update':
|
||||
// Cut off big inserts and updates, but append byte count therefor
|
||||
if(strlen($row['argument']) > 180)
|
||||
$row['argument'] = substr($row['argument'],0,160) . '... [' .
|
||||
PMA_formatByteDown(strlen($row['argument']), 2).']';
|
||||
|
||||
break;
|
||||
|
||||
default: break;
|
||||
}
|
||||
|
||||
$return['rows'][] = $row;
|
||||
$i++;
|
||||
}
|
||||
@ -259,6 +241,49 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
|
||||
exit(json_encode($return));
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_REQUEST['logging_vars'])) {
|
||||
if(isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) {
|
||||
$value = PMA_sqlAddslashes($_REQUEST['varValue']);
|
||||
if(!is_numeric($value)) $value="'".$value."'";
|
||||
|
||||
if(! preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName']))
|
||||
PMA_DBI_query('SET GLOBAL '.$_REQUEST['varName'].' = '.$value);
|
||||
|
||||
}
|
||||
|
||||
$loggingVars = PMA_DBI_fetch_result('SHOW GLOBAL VARIABLES WHERE Variable_name IN ("general_log","slow_query_log","long_query_time","log_output")', 0, 1);
|
||||
exit(json_encode($loggingVars));
|
||||
}
|
||||
|
||||
if(isset($_REQUEST['query_analyzer'])) {
|
||||
$return = array();
|
||||
|
||||
if ($profiling = PMA_profilingSupported())
|
||||
PMA_DBI_query('SET PROFILING=1;');
|
||||
|
||||
// Do not cache query
|
||||
$query = preg_replace('/^(\s*SELECT)/i','\\1 SQL_NO_CACHE',$_REQUEST['query']);
|
||||
|
||||
$result = PMA_DBI_try_query('EXPLAIN ' . $query);
|
||||
$return['explain'] = PMA_DBI_fetch_assoc($result);
|
||||
|
||||
// In case an error happened
|
||||
$return['error'] = PMA_DBI_getError();
|
||||
|
||||
PMA_DBI_free_result($result);
|
||||
|
||||
if($profiling) {
|
||||
$return['profiling'] = array();
|
||||
$result = PMA_DBI_try_query('SELECT seq,state,duration FROM INFORMATION_SCHEMA.PROFILING WHERE QUERY_ID=1 ORDER BY seq');
|
||||
while ($row = PMA_DBI_fetch_assoc($result)) {
|
||||
$return['profiling'][]= $row;
|
||||
}
|
||||
PMA_DBI_free_result($result);
|
||||
}
|
||||
|
||||
exit(json_encode($return));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -287,6 +312,8 @@ $GLOBALS['js_include'][] = 'highcharts/exporting.js';
|
||||
$GLOBALS['js_include'][] = 'canvg/flashcanvas.js';
|
||||
$GLOBALS['js_include'][] = 'canvg/canvg.js';
|
||||
$GLOBALS['js_include'][] = 'canvg/rgbcolor.js';
|
||||
$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
|
||||
$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
|
||||
|
||||
/**
|
||||
* flush status variables if requested
|
||||
@ -1429,8 +1456,27 @@ function printMonitor() {
|
||||
<div id="loadingLogsDialog" title="<?php echo __('Loading logs'); ?>" style="display:none;">
|
||||
</div>
|
||||
|
||||
<div id="logAnalyseDialog" title="<?php echo __('Log statistics'); ?>">
|
||||
<div id="logAnalyseDialog" title="<?php echo __('Log statistics'); ?>" style="display:none;">
|
||||
<p> <?php echo __('Selected time range:'); ?>
|
||||
<input type="text" name="dateStart" class="datetimefield" value="" /> -
|
||||
<input type="text" name="dateEnd" class="datetimefield" value="" /></p>
|
||||
<input type="checkbox" id="limitTypes" value="1" checked="checked" />
|
||||
<label for="limitTypes">
|
||||
<?php echo __('Only retrieve SELECT,INSERT,UPDATE and DELETE Statements'); ?>
|
||||
</label>
|
||||
<br/>
|
||||
<input type="checkbox" id="removeVariables" value="1" checked="checked" />
|
||||
<label for="removeVariables">
|
||||
<?php echo __('Remove variable data in INSERT statements for better grouping'); ?>
|
||||
</label>
|
||||
|
||||
<?php echo __('<p>Choose from which log you want the statistics to be generated from.</p> Results are grouped by query text.'); ?>
|
||||
</div>
|
||||
|
||||
<div id="queryAnalyzerDialog" title="<?php echo __('Query analyzer'); ?>" style="display:none;">
|
||||
<textarea id="sqlquery"> </textarea>
|
||||
<p></p>
|
||||
<div class="placeHolder"></div>
|
||||
</div>
|
||||
|
||||
<table border="0" class="clearfloat" id="chartGrid">
|
||||
|
||||
6
sql.php
6
sql.php
@ -779,8 +779,8 @@ if (0 == $num_rows || $is_affected) {
|
||||
$edited_values = array();
|
||||
parse_str($_REQUEST['transform_fields_list'], $edited_values);
|
||||
|
||||
foreach ($mime_map as $transformation) {
|
||||
$include_file = $transformation['transformation'];
|
||||
foreach($mime_map as $transformation) {
|
||||
$include_file = PMA_securePath($transformation['transformation']);
|
||||
$column_name = $transformation['column_name'];
|
||||
$column_data = $edited_values[$column_name];
|
||||
|
||||
@ -932,7 +932,7 @@ else {
|
||||
<script type="text/javascript">
|
||||
pma_token = '<?php echo $_SESSION[' PMA_token ']; ?>';
|
||||
url_query = '<?php echo isset($url_query)?$url_query:PMA_generate_common_url($db);?>';
|
||||
$(document).ready(createProfilingChart);
|
||||
$(document).ready(makeProfilingChart);
|
||||
</script>
|
||||
<?php
|
||||
echo '<fieldset><legend>' . __('Profiling') . '</legend>' . "\n";
|
||||
|
||||
@ -69,7 +69,7 @@ if ($multi_tables) {
|
||||
$tbl_list .= (empty($tbl_list) ? '' : ', ')
|
||||
. PMA_backquote($table);
|
||||
}
|
||||
echo '<strong>'. __('Show tables') . ': ' . $tbl_list . '</strong>' . "\n";
|
||||
echo '<strong>'. __('Show tables') . ': ' . htmlspecialchars($tbl_list) . '</strong>' . "\n";
|
||||
echo '<hr />' . "\n";
|
||||
} // end if
|
||||
|
||||
@ -84,7 +84,7 @@ foreach ($the_tables as $key => $table) {
|
||||
}
|
||||
$counter++;
|
||||
echo '<div' . $breakstyle . '>' . "\n";
|
||||
echo '<h1>' . $table . '</h1>' . "\n";
|
||||
echo '<h1>' . htmlspecialchars($table) . '</h1>' . "\n";
|
||||
|
||||
/**
|
||||
* Gets table informations
|
||||
|
||||
@ -10,34 +10,92 @@
|
||||
* Include to test
|
||||
*/
|
||||
require_once 'libraries/sanitizing.lib.php';
|
||||
require_once 'libraries/url_generating.lib.php';
|
||||
require_once 'libraries/core.lib.php';
|
||||
|
||||
class PMA_sanitize_test extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
/**
|
||||
* Tests for proper escaping of XSS.
|
||||
*/
|
||||
public function testXssInHref()
|
||||
{
|
||||
$this->assertEquals('[a@javascript:alert(\'XSS\');@target]link</a>',
|
||||
PMA_sanitize('[a@javascript:alert(\'XSS\');@target]link[/a]'));
|
||||
}
|
||||
|
||||
/*
|
||||
/**
|
||||
* Tests correct generating of link redirector.
|
||||
*/
|
||||
public function testLink()
|
||||
{
|
||||
$this->assertEquals('<a href="http://www.phpmyadmin.net/" target="target">link</a>',
|
||||
unset($GLOBALS['server']);
|
||||
unset($GLOBALS['lang']);
|
||||
$this->assertEquals('<a href="./url.php?url=http%3A%2F%2Fwww.phpmyadmin.net%2F" target="target">link</a>',
|
||||
PMA_sanitize('[a@http://www.phpmyadmin.net/@target]link[/a]'));
|
||||
}
|
||||
*/
|
||||
|
||||
/**
|
||||
* Tests links to documentation.
|
||||
*/
|
||||
public function testLinkDoc()
|
||||
{
|
||||
$this->assertEquals('<a href="./Documentation.html">doc</a>',
|
||||
PMA_sanitize('[a@./Documentation.html]doc[/a]'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests link target validation.
|
||||
*/
|
||||
public function testInvalidTarget()
|
||||
{
|
||||
$this->assertEquals('[a@./Documentation.html@INVALID9]doc</a>',
|
||||
PMA_sanitize('[a@./Documentation.html@INVALID9]doc[/a]'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests XSS escaping after valid link.
|
||||
*/
|
||||
public function testLinkDocXss()
|
||||
{
|
||||
$this->assertEquals('[a@./Documentation.html" onmouseover="alert(foo)"]doc</a>',
|
||||
PMA_sanitize('[a@./Documentation.html" onmouseover="alert(foo)"]doc[/a]'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests proper handling of multi link code.
|
||||
*/
|
||||
public function testLinkAndXssInHref()
|
||||
{
|
||||
$this->assertEquals('<a href="./Documentation.html">doc</a>[a@javascript:alert(\'XSS\');@target]link</a>',
|
||||
PMA_sanitize('[a@./Documentation.html]doc[/a][a@javascript:alert(\'XSS\');@target]link[/a]'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Test escaping of HTML tags
|
||||
*/
|
||||
public function testHtmlTags()
|
||||
{
|
||||
$this->assertEquals('<div onclick="">',
|
||||
PMA_sanitize('<div onclick="">'));
|
||||
}
|
||||
|
||||
public function testBbcoe()
|
||||
/**
|
||||
* Tests basic BB code.
|
||||
*/
|
||||
public function testBBCode()
|
||||
{
|
||||
$this->assertEquals('<strong>strong</strong>',
|
||||
PMA_sanitize('[b]strong[/b]'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests output escaping.
|
||||
*/
|
||||
public function testEscape()
|
||||
{
|
||||
$this->assertEquals('<strong>strong</strong>',
|
||||
PMA_sanitize('[strong]strong[/strong]', true));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
@ -87,6 +87,9 @@ button {
|
||||
.ic_b_browse { background-position: 0 -18px; }
|
||||
.ic_b_sbrowse { background-position: 0 -660px; width: 10px; height: 10px; }
|
||||
.ic_b_view { background-position: 0 -1044px; }
|
||||
.ic_b_minus { background-position: 0 -440px; width: 9px; height: 9px; }
|
||||
.ic_b_plus { background-position: 0 -523px; width: 9px; height: 9px; }
|
||||
.ic_b_snewtbl { background-position: 0 -726px; width: 10px; height: 10px; }
|
||||
|
||||
/******************************************************************************/
|
||||
/* classes */
|
||||
|
||||
BIN
themes/original/img/s_sortable.png
Normal file
BIN
themes/original/img/s_sortable.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 258 B |
@ -92,6 +92,11 @@ button {
|
||||
.ic_s_loggoff { background-position: -1698px 0; }
|
||||
.ic_b_browse, .ic_b_sbrowse { background-position: -34px 0; }
|
||||
.ic_b_view { background-position: -1077px 0; }
|
||||
.ic_b_plus { background-position: -573px 0; }
|
||||
.ic_b_minus { background-position: -471px 0; }
|
||||
|
||||
.ic_b_views, .ic_s_views { background-position: -1094px 0; }
|
||||
.ic_b_snewtbl { background-position: -788px 0; }
|
||||
|
||||
/******************************************************************************/
|
||||
/* classes */
|
||||
|
||||
@ -1308,6 +1308,12 @@ div#tablestatistics table {
|
||||
|
||||
/* serverstatus */
|
||||
|
||||
div#logTable table td.analyzableQuery:hover {
|
||||
text-decoration: underline;
|
||||
color: #235a81;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
h3#serverstatusqueries span {
|
||||
font-size:60%;
|
||||
display:inline;
|
||||
@ -1425,10 +1431,33 @@ div#logTable table {
|
||||
width:100%;
|
||||
}
|
||||
|
||||
div#queryAnalyzerDialog {
|
||||
min-width: 700px;
|
||||
}
|
||||
|
||||
div#queryAnalyzerDialog div.CodeMirror-scroll {
|
||||
height:auto;
|
||||
}
|
||||
|
||||
div#queryAnalyzerDialog div#queryProfiling {
|
||||
height: 250px;
|
||||
}
|
||||
|
||||
div#queryAnalyzerDialog td.explain {
|
||||
width: 250px;
|
||||
}
|
||||
|
||||
div#queryAnalyzerDialog table.queryNums {
|
||||
display: none;
|
||||
border:0;
|
||||
text-align:left;
|
||||
}
|
||||
|
||||
.smallIndent {
|
||||
padding-left: 7px;
|
||||
}
|
||||
|
||||
|
||||
/* end serverstatus */
|
||||
|
||||
/* server variables */
|
||||
|
||||
BIN
themes/pmahomme/img/pause.png
Normal file
BIN
themes/pmahomme/img/pause.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 329 B |
BIN
themes/pmahomme/img/play.png
Normal file
BIN
themes/pmahomme/img/play.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 395 B |
Loading…
Reference in New Issue
Block a user
