gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into drizzle

Browse Source 
Conflicts:
	server_status.php
This commit is contained in:
Piotr Przybylski 2011-06-17 20:41:42 +02:00
commit ae42913629
81 changed files with 37663 additions and 36734 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
+ rfe #939233 [interface] Flexible column width
+ [interface] Mouse-based column reordering in query results
+ AJAX for Insert to a table from database Structure page
- Patch #3316969 PMA_ajaxShowMessage() does not respect timeout
3.4.3.0 (not yet released)
- bug #3311170 [sync] Missing helper icons in Synchronize
@ -30,6 +31,8 @@ phpMyAdmin - ChangeLog
- patch #3313326 [interface] Some tooltips do not disappear
- bug #3315720 [search] Fix search in non unicode tables
- bug #3315741 [display] Inline query edit broken
- patch #3317206 [privileges] Generate password option missing on new accounts
- bug #3317293 [edit] Inline edit places HTML line breaks in edit area
3.4.2.0 (2011-06-07)
- bug #3301249 [interface] Iconic table operations does not remove inline edit label

5
db_datadict.php
View File

@ -58,9 +58,8 @@ PMA_DBI_select_db($db);
$rowset = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE);
$count = 0;
while ($row = PMA_DBI_fetch_assoc($rowset)) {
$myfieldname = 'Tables_in_' . htmlspecialchars($db);
$table = $row[$myfieldname];
while ($row = PMA_DBI_fetch_row($rowset)) {
$table = $row[0];
$comments = PMA_getComments($db, $table);
echo '<div>' . "\n";

161
js/functions.js
View File

@ -15,10 +15,9 @@ var sql_box_locked = false;
var only_once_elements = new Array();
/**
* @var ajax_message_init boolean boolean that stores status of
* notification for PMA_ajaxShowNotification
* @var int ajax_message_count Number of AJAX messages shown since page load
*/
var ajax_message_init = false;
var ajax_message_count = 0;
/**
* @var codemirror_editor object containing CodeMirror editor
@ -31,7 +30,6 @@ var codemirror_editor = false;
var chart_activeTimeouts = new Object();
/**
* Add a hidden field to the form to indicate that this will be an
* Ajax request (only if this hidden field does not exist)
@ -659,10 +657,10 @@ $(document).ready(function() {
* so that it works also for pages reached via AJAX)
*/
$(document).ready(function() {
$('tr.odd, tr.even').live('hover',function() {
$('tr.odd, tr.even').live('hover',function(event) {
var $tr = $(this);
$tr.toggleClass('hover');
$tr.children().toggleClass('hover');
$tr.toggleClass('hover',event.type=='mouseover');
$tr.children().toggleClass('hover',event.type=='mouseover');
});
})
@ -1244,83 +1242,64 @@ $(document).ready(function(){
* optional, defaults to 'Loading...'
* @param var timeout number of milliseconds for the message to be visible
* optional, defaults to 5000
* @return jQuery object jQuery Element that holds the message div
* @return jQuery object jQuery Element that holds the message div
*/
function PMA_ajaxShowMessage(message, timeout) {
//Handle the case when a empty data.message is passed. We don't want the empty message
if(message == '') {
//Handle the case when a empty data.message is passed. We don't want the empty message
if (message == '') {
return true;
} else if (! message) {
// If the message is undefined, show the default
message = PMA_messages['strLoading'];
}
/**
* @var msg String containing the message that has to be displayed
* @default PMA_messages['strLoading']
*/
if(!message) {
var msg = PMA_messages['strLoading'];
}
else {
var msg = message;
}
/**
* @var timeout Number of milliseconds for which {@link msg} will be visible
* @var timeout Number of milliseconds for which the message will be visible
* @default 5000 ms
*/
if(!timeout) {
var to = 5000;
}
else {
var to = timeout;
if (! timeout) {
timeout = 5000;
}
if( !ajax_message_init) {
//For the first time this function is called, append a new div
$(function(){
$('<div id="loading_parent"></div>')
.insertBefore("#serverinfo");
$('<span id="loading" class="ajax_notification"></span>')
.appendTo("#loading_parent")
.html(msg)
.fadeIn('medium')
.delay(to)
.fadeOut('medium', function(){
$(this)
.html("") //Clear the message
.hide();
});
}, 'top.frame_content');
ajax_message_init = true;
// Create a parent element for the AJAX messages, if necessary
if ($('#loading_parent').length == 0) {
$('<div id="loading_parent"></div>')
.insertBefore("#serverinfo");
}
else {
//Otherwise, just show the div again after inserting the message
$("#loading")
.stop(true, true)
.html(msg)
// Update message count to create distinct message elements every time
ajax_message_count++;
// Remove all old messages, if any
$(".ajax_notification[id^=ajax_message_num]").remove();
/**
* @var $retval a jQuery object containing the reference
* to the created AJAX message
*/
var $retval = $('<span class="ajax_notification" id="ajax_message_num_' + ajax_message_count + '"></span>')
.hide()
.appendTo("#loading_parent")
.html(message)
.fadeIn('medium')
.delay(to)
.delay(timeout)
.fadeOut('medium', function() {
$(this)
.html("")
.hide();
})
}
$(this).remove();
});
return $("#loading");
return $retval;
}
/**
* Removes the message shown for an Ajax operation when it's completed
*/
function PMA_ajaxRemoveMessage($this_msgbox) {
$this_msgbox
.stop(true, true)
.fadeOut('medium', function() {
$this_msgbox.hide();
});
if ($this_msgbox != 'undefined' && $this_msgbox instanceof jQuery) {
$this_msgbox
.stop(true, true)
.fadeOut('medium');
}
}
/**
@ -1411,31 +1390,41 @@ function PMA_createChart(passedSettings) {
events: {
load: function() {
var thisChart = this;
var lastValue=null, curValue=null;
var numLoadedPoints=0, otherSum=0;
var lastValue = null, curValue = null;
var numLoadedPoints = 0, otherSum = 0;
var diff;
// No realtime updates for graphs that are being exported, and disabled when no callback is set
if(thisChart.options.chart.forExport==true || !passedSettings.realtime || !passedSettings.realtime.callback) return;
if(thisChart.options.chart.forExport == true ||
! passedSettings.realtime ||
! passedSettings.realtime.callback) return;
thisChart.options.realtime.timeoutCallBack = function() {
$.get(passedSettings.realtime.url,{ajax_request:1, chart_data:1, type:passedSettings.realtime.type},function(data) {
curValue = jQuery.parseJSON(data);
//if(lastValue==null) lastValue = curValue;
if(lastValue==null) diff = curValue.x - thisChart.xAxis[0].getExtremes().max;
else diff = parseInt(curValue.x - lastValue.x);
thisChart.xAxis[0].setExtremes(thisChart.xAxis[0].getExtremes().min+diff, thisChart.xAxis[0].getExtremes().max+diff, false);
passedSettings.realtime.callback(thisChart,curValue,lastValue,numLoadedPoints);
lastValue = curValue;
numLoadedPoints++;
// Timeout has been cleared => don't start a new timeout
if(chart_activeTimeouts[container]==null) return;
chart_activeTimeouts[container] = setTimeout(thisChart.options.realtime.timeoutCallBack, thisChart.options.realtime.refreshRate);
$.post(passedSettings.realtime.url,
{ ajax_request: true, chart_data: 1, type: passedSettings.realtime.type },
function(data) {
curValue = jQuery.parseJSON(data);
if(lastValue==null) diff = curValue.x - thisChart.xAxis[0].getExtremes().max;
else diff = parseInt(curValue.x - lastValue.x);
thisChart.xAxis[0].setExtremes(
thisChart.xAxis[0].getExtremes().min+diff,
thisChart.xAxis[0].getExtremes().max+diff,
false
);
passedSettings.realtime.callback(thisChart,curValue,lastValue,numLoadedPoints);
lastValue = curValue;
numLoadedPoints++;
// Timeout has been cleared => don't start a new timeout
if(chart_activeTimeouts[container]==null) return;
chart_activeTimeouts[container] = setTimeout(
thisChart.options.realtime.timeoutCallBack,
thisChart.options.realtime.refreshRate
);
});
}
@ -1469,8 +1458,8 @@ function PMA_createChart(passedSettings) {
},
tooltip: {
formatter: function() {
return '<b>'+ this.series.name +'</b><br/>'+
Highcharts.dateFormat('%Y-%m-%d %H:%M:%S', this.x) +'<br/>'+
return '<b>' + this.series.name +'</b><br/>' +
Highcharts.dateFormat('%Y-%m-%d %H:%M:%S', this.x) + '<br/>' +
Highcharts.numberFormat(this.y, 2);
}
},

13
js/messages.php
View File

@ -61,6 +61,8 @@ $js_messages['strRemovingSelectedUsers'] = __('Removing Selected Users');
$js_messages['strClose'] = __('Close');
/* for server_status.js */
$js_messages['strEdit'] = __('Edit');
$js_messages['strLiveTrafficChart'] = __('Live traffic chart');
$js_messages['strLiveConnChart'] = __('Live conn./process chart');
$js_messages['strLiveQueryChart'] = __('Live query chart');
@ -75,6 +77,17 @@ $js_messages['strThousandsSeperator'] = __(',');
/* l10n: Decimal separator */
$js_messages['strDecimalSeperator'] = __('.');
$js_messages['strChartKBSent'] = __('KiB sent since last refresh');
$js_messages['strChartKBReceived'] = __('KiB received since last refresh');
$js_messages['strChartServerTraffic'] = __('Server traffic (in KiB)');
$js_messages['strChartConnections'] = __('Connections since last refresh');
$js_messages['strChartProcesses'] = __('Processes');
$js_messages['strChartConnectionsTitle'] = __('Connections / Processes');
$js_messages['strChartIssuedQueries'] = __('Issued queries since last refresh');
$js_messages['strChartIssuedQueriesTitle'] = __('Issued queries');
$js_messages['strChartQueryPie'] = __('Query statistics');
/* For inline query editing */
$js_messages['strGo'] = __('Go');
$js_messages['strCancel'] = __('Cancel');

191
js/server_status.js
View File

@ -21,9 +21,13 @@ $(function() {
return /^[0-9]?[0-9,\.]*\s?(k|M|G|T|%)?$/.test(s);
},
format: function(s) {
var num = jQuery.tablesorter.formatFloat( s.replace(PMA_messages['strThousandsSeperator'],'').replace(PMA_messages['strDecimalSeperator'],'.') );
var num = jQuery.tablesorter.formatFloat(
s.replace(PMA_messages['strThousandsSeperator'],'')
.replace(PMA_messages['strDecimalSeperator'],'.')
);
var factor = 1;
switch (s.charAt(s.length-1)) {
switch (s.charAt(s.length - 1)) {
case '%': factor = -2; break;
// Todo: Complete this list (as well as in the regexp a few lines up)
case 'k': factor = 3; break;
@ -31,7 +35,8 @@ $(function() {
case 'G': factor = 9; break;
case 'T': factor = 12; break;
}
return num*Math.pow(10,factor);
return num * Math.pow(10,factor);
},
type: "numeric"
});
@ -45,12 +50,16 @@ $(function() {
var odd_row=false;
var text=''; // Holds filter text
var queryPieChart = null;
/* Chart configuration */
/* Chart configuration */
// Defines what the tabs are currently displaying (realtime or data)
var tabStatus = new Object();
// Holds the current chart instances for each tab
var tabChart = new Object();
$.ajaxSetup({
cache:false
});
// Add tabs
$('#serverStatusTabs').tabs({
@ -69,12 +78,23 @@ $(function() {
tabStatus[$(this).attr('id')] = 'static';
});
// Handles refresh rate changing
$('.statuslinks select').change(function() {
var chart=tabChart[$(this).parents('div.ui-tabs-panel').attr('id')];
chart.options.realtime.refreshRate = 1000*parseInt(this.value);
chart.xAxis[0].setExtremes(new Date().getTime() - chart.options.realtime.numMaxPoints * chart.options.realtime.refreshRate, chart.xAxis[0].getExtremes().max, true);
chart.xAxis[0].setExtremes(
new Date().getTime() - chart.options.realtime.numMaxPoints * chart.options.realtime.refreshRate,
chart.xAxis[0].getExtremes().max,
true
);
// Clear current timeout and set timeout with the new refresh rate
clearTimeout(chart_activeTimeouts[chart.options.chart.renderTo]);
chart_activeTimeouts[chart.options.chart.renderTo] = setTimeout(chart.options.realtime.timeoutCallBack, chart.options.realtime.refreshRate);
chart_activeTimeouts[chart.options.chart.renderTo] = setTimeout(
chart.options.realtime.timeoutCallBack,
chart.options.realtime.refreshRate
);
});
// Ajax refresh of variables (always the first element in each tab)
@ -107,26 +127,32 @@ $(function() {
if(tabstat=='static' || tabstat=='liveconnections') {
var settings = {
series: [{name:'kB sent since last refresh',data:[]},{name:'kB received since last refresh',data:[]}],
title: {text:'Server traffic (in kB)'},
realtime:{ url:'server_status.php?'+url_query,
series: [
{ name: PMA_messages['strChartKBSent'], data: [] },
{ name: PMA_messages['strChartKBReceived'], data: [] }
],
title: { text: PMA_messages['strChartServerTraffic'] },
realtime: { url:'server_status.php?' + url_query,
type: 'traffic',
callback: function(chartObj, curVal, lastVal,numLoadedPoints) {
callback: function(chartObj, curVal, lastVal, numLoadedPoints) {
if(lastVal==null) return;
chartObj.series[0].addPoint(
{ x:curVal.x, y:(curVal.y_sent-lastVal.y_sent)/1024},
false, numLoadedPoints >= chartObj.options.realtime.numMaxPoints
{ x: curVal.x, y: (curVal.y_sent - lastVal.y_sent) / 1024 },
false,
numLoadedPoints >= chartObj.options.realtime.numMaxPoints
);
chartObj.series[1].addPoint(
{ x:curVal.x, y:(curVal.y_received-lastVal.y_received)/1024},
true, numLoadedPoints >= chartObj.options.realtime.numMaxPoints
{ x: curVal.x, y: (curVal.y_received - lastVal.y_received) / 1024 },
true,
numLoadedPoints >= chartObj.options.realtime.numMaxPoints
);
}
}
}
}
setupLiveChart($tab,this,settings);
if(tabstat=='liveconnections') $tab.find('.statuslinks a.liveconnectionsLink').html(PMA_messages['strLiveConnChart']);
if(tabstat == 'liveconnections')
$tab.find('.statuslinks a.liveconnectionsLink').html(PMA_messages['strLiveConnChart']);
tabStatus[$tab.attr('id')]='livetraffic';
} else {
$(this).html(PMA_messages['strLiveTrafficChart']);
@ -141,28 +167,34 @@ $(function() {
var $tab=$(this).parents('div.ui-tabs-panel');
var tabstat = tabStatus[$tab.attr('id')];
if(tabstat=='static' || tabstat=='livetraffic') {
if(tabstat == 'static' || tabstat == 'livetraffic') {
var settings = {
series: [{name:'Connections since last refresh', data:[]},{name:'Processes', data:[]}],
title: {text:'Connections / Processes'},
realtime:{ url:'server_status.php?'+url_query,
series: [
{ name: PMA_messages['strChartConnections'], data: [] },
{ name: PMA_messages['strChartProcesses'], data: [] }
],
title: { text: PMA_messages['strChartConnectionsTitle'] },
realtime: { url:'server_status.php?'+url_query,
type: 'proc',
callback: function(chartObj, curVal, lastVal,numLoadedPoints) {
if(lastVal==null) return;
chartObj.series[0].addPoint(
{ x:curVal.x, y:curVal.y_conn-lastVal.y_conn },
false, numLoadedPoints >= chartObj.options.realtime.numMaxPoints
{ x: curVal.x, y: curVal.y_conn - lastVal.y_conn },
false,
numLoadedPoints >= chartObj.options.realtime.numMaxPoints
);
chartObj.series[1].addPoint(
{ x:curVal.x, y:curVal.y_proc },
true, numLoadedPoints >= chartObj.options.realtime.numMaxPoints
{ x: curVal.x, y: curVal.y_proc },
true,
numLoadedPoints >= chartObj.options.realtime.numMaxPoints
);
}
}
}
};
setupLiveChart($tab,this,settings);
if(tabstat=='livetraffic') $tab.find('.statuslinks a.livetrafficLink').html(PMA_messages['strLiveTrafficChart']);
if(tabstat == 'livetraffic')
$tab.find('.statuslinks a.livetrafficLink').html(PMA_messages['strLiveTrafficChart']);
tabStatus[$tab.attr('id')]='liveconnections';
} else {
$(this).html(PMA_messages['strLiveConnChart']);
@ -172,62 +204,63 @@ $(function() {
return false;
});
// Live query charting
// Live query statistics
$('.statuslinks a.livequeriesLink').click(function() {
var $tab=$(this).parents('div.ui-tabs-panel');
var settings=null;
var $tab = $(this).parents('div.ui-tabs-panel');
var settings = null;
if(tabStatus[$tab.attr('id')]=='static') {
if(tabStatus[$tab.attr('id')] == 'static') {
settings = {
series: [{name:'Issued queries since last refresh', data:[]}],
title: {text:'Issued queries'},
series: [ { name: PMA_messages['strChartIssuedQueries'], data: [] } ],
title: { text: PMA_messages['strChartIssuedQueriesTitle'] },
tooltip: { formatter:function() { return this.point.name; } },
realtime:{ url:'server_status.php?'+url_query,
realtime: { url:'server_status.php?'+url_query,
type: 'queries',
callback: function(chartObj, curVal, lastVal,numLoadedPoints) {
if(lastVal==null) return;
if(lastVal == null) return;
chartObj.series[0].addPoint(
{ x:curVal.x, y:curVal.y-lastVal.y, name:sortedQueriesPointInfo(curVal,lastVal) },
true, numLoadedPoints >= chartObj.options.realtime.numMaxPoints
{ x: curVal.x, y: curVal.y - lastVal.y, name: sortedQueriesPointInfo(curVal,lastVal) },
true,
numLoadedPoints >= chartObj.options.realtime.numMaxPoints
);
}
}
}
};
} else {
$(this).html(PMA_messages['strLiveQueryChart']);
}
setupLiveChart($tab,this,settings);
tabStatus[$tab.attr('id')]='livequeries';
tabStatus[$tab.attr('id')] = 'livequeries';
return false;
});
function setupLiveChart($tab,link,settings) {
if(settings!=null) {
if(settings != null) {
// Loading a chart with existing chart => remove old chart first
if(tabStatus[$tab.attr('id')]!='static') {
clearTimeout(chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"]);
chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"]=null;
if(tabStatus[$tab.attr('id')] != 'static') {
clearTimeout(chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]);
chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"] = null;
tabChart[$tab.attr('id')].destroy();
// Also reset the select list
$tab.find('.statuslinks select').get(0).selectedIndex=0;
$tab.find('.statuslinks select').get(0).selectedIndex = 0;
}
if(!settings.chart) settings.chart = {};
settings.chart.renderTo=$tab.attr('id')+"_chart_cnt";
if(! settings.chart) settings.chart = {};
settings.chart.renderTo = $tab.attr('id') + "_chart_cnt";
$tab.find('.tabInnerContent')
.hide()
.after('<div style="clear:both; min-width:500px; height:400px; padding-bottom:80px;" id="'+$tab.attr('id')+'_chart_cnt"></div>');
tabChart[$tab.attr('id')]=PMA_createChart(settings);
.after('<div class="liveChart" id="' + $tab.attr('id') + '_chart_cnt"></div>');
tabChart[$tab.attr('id')] = PMA_createChart(settings);
$(link).html(PMA_messages['strStaticData']);
$tab.find('.statuslinks a.tabRefresh').hide();
$tab.find('.statuslinks select').show();
} else {
clearTimeout(chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"]);
chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"]=null;
clearTimeout(chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]);
chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]=null;
$tab.find('.tabInnerContent').show();
$tab.find('div#'+$tab.attr('id')+'_chart_cnt').remove();
$tab.find('div#'+$tab.attr('id') + '_chart_cnt').remove();
tabStatus[$tab.attr('id')]='static';
tabChart[$tab.attr('id')].destroy();
$tab.find('.statuslinks a.tabRefresh').show();
@ -243,9 +276,10 @@ $(function() {
});
$('#filterText').keyup(function(e) {
if($(this).val().length==0) textFilter=null;
else textFilter = new RegExp("(^|_)"+$(this).val(),'i');
text=$(this).val();
if($(this).val().length == 0) textFilter = null;
else textFilter = new RegExp("(^|_)" + $(this).val(),'i');
text = $(this).val();
filterVariables();
});
@ -258,11 +292,11 @@ $(function() {
function initTab(tab,data) {
switch(tab.attr('id')) {
case 'statustabs_traffic':
if(data!=null) tab.find('.tabInnerContent').html(data);
if(data != null) tab.find('.tabInnerContent').html(data);
initTooltips();
break;
case 'statustabs_queries':
if(data!=null) {
if(data != null) {
queryPieChart.destroy();
tab.find('.tabInnerContent').html(data);
}
@ -273,10 +307,9 @@ $(function() {
cdata.push([key,parseInt(value)]);
});
queryPieChart=PMA_createChart({
queryPieChart = PMA_createChart({
chart: {
renderTo: 'serverstatusquerieschart'
},
title: {
text:'',
@ -284,7 +317,7 @@ $(function() {
},
series: [{
type:'pie',
name: 'Query statistics',
name: PMA_messages['strChartQueryPie'],
data: cdata
}],
plotOptions: {
@ -293,20 +326,22 @@ $(function() {
cursor: 'pointer',
dataLabels: {
enabled: true,
formatter: function() {
return '<b>'+ this.point.name +'</b><br> '+ Highcharts.numberFormat(this.percentage, 2) +' %';
formatter: function() {
return '<b>'+ this.point.name +'</b><br/> ' + Highcharts.numberFormat(this.percentage, 2) + ' %';
}
}
}
},
tooltip: {
formatter: function() { return '<b>'+ this.point.name +'</b><br/>'+Highcharts.numberFormat(this.y, 2)+'<br/>('+Highcharts.numberFormat(this.percentage, 2) +' %)'; }
formatter: function() {
return '<b>' + this.point.name + '</b><br/>' + Highcharts.numberFormat(this.y, 2) + '<br/>(' + Highcharts.numberFormat(this.percentage, 2) + ' %)';
}
}
});
break;
case 'statustabs_allvars':
if(data!=null) {
if(data != null) {
tab.find('.tabInnerContent').html(data);
filterVariables();
}
@ -329,7 +364,7 @@ $(function() {
});
$('#serverstatusqueriesdetails tr:first th')
.append('<img class="sortableIcon" src="'+pma_theme_image+'cleardot.gif" alt="">');
.append('<img class="sortableIcon" src="' + pma_theme_image + 'cleardot.gif" alt="">');
break;
@ -343,7 +378,7 @@ $(function() {
});
$('#serverstatusvariables tr:first th')
.append('<img class="sortableIcon" src="'+pma_theme_image+'cleardot.gif" alt="">');
.append('<img class="sortableIcon" src="' + pma_theme_image + 'cleardot.gif" alt="">');
break;
}
@ -351,14 +386,14 @@ $(function() {
/* Filters the status variables by name/category/alert in the variables tab */
function filterVariables() {
var useful_links=0;
var useful_links = 0;
var section = text;
if(categoryFilter.length>0) section = categoryFilter;
if(categoryFilter.length > 0) section = categoryFilter;
if(section.length>1) {
if(section.length > 1) {
$('#linkSuggestions span').each(function() {
if($(this).attr('class').indexOf('status_'+section)!=-1) {
if($(this).attr('class').indexOf('status_'+section) != -1) {
useful_links++;
$(this).css('display','');
} else {
@ -369,16 +404,16 @@ $(function() {
});
}
if(useful_links>0)
if(useful_links > 0)
$('#linkSuggestions').css('display','');
else $('#linkSuggestions').css('display','none');
odd_row=false;
$('#serverstatusvariables th.name').each(function() {
if((textFilter==null || textFilter.exec($(this).text()))
&& (!alertFilter || $(this).next().find('span.attention').length>0)
&& (categoryFilter.length==0 || $(this).parent().hasClass('s_'+categoryFilter))) {
odd_row = !odd_row;
if((textFilter == null || textFilter.exec($(this).text()))
&& (! alertFilter || $(this).next().find('span.attention').length>0)
&& (categoryFilter.length == 0 || $(this).parent().hasClass('s_'+categoryFilter))) {
odd_row = ! odd_row;
$(this).parent().css('display','');
if(odd_row) {
$(this).parent().addClass('odd');
@ -406,22 +441,22 @@ $(function() {
if(value-lastQueries.pointInfo[key] > 0) {
queryKeys.push(key);
queryValues.push(value-lastQueries.pointInfo[key]);
sumTotal+=value-lastQueries.pointInfo[key];
sumTotal += value-lastQueries.pointInfo[key];
}
});
var numQueries = queryKeys.length;
var pointInfo = '<b>' + PMA_messages['strTotal'] + ': ' + sumTotal + '</b><br>';
while(queryKeys.length > 0) {
max=0;
for(var i=0; i<queryKeys.length; i++) {
max = 0;
for(var i=0; i < queryKeys.length; i++) {
if(queryValues[i] > max) {
max = queryValues[i];
maxIdx = i;
}
}
if(numQueries > 8 && num>=6)
sumOther+=queryValues[maxIdx];
if(numQueries > 8 && num >= 6)
sumOther += queryValues[maxIdx];
else pointInfo += queryKeys[maxIdx].substr(4).replace('_',' ') + ': ' + queryValues[maxIdx] + '<br>';
queryKeys.splice(maxIdx,1);

132
js/server_variables.js
View File

@ -1,42 +1,92 @@
$(function() {
var textFilter=null;
var odd_row=false;
// Filter options are invisible for disabled js users
$('fieldset#tableFilter').css('display','');
$('#filterText').keyup(function(e) {
if($(this).val().length==0) textFilter=null;
else textFilter = new RegExp("(^| )"+$(this).val(),'i');
filterVariables();
});
function filterVariables() {
odd_row=false;
var mark_next=false;
var firstCell;
$('table.filteredData tbody tr').each(function() {
firstCell = $(this).children(':first');
if(mark_next || textFilter==null || textFilter.exec(firstCell.text())) {
// If current row is 'marked', also display next row
if($(this).hasClass('marked') && !mark_next)
mark_next=true;
else mark_next=false;
odd_row = !odd_row;
$(this).css('display','');
if(odd_row) {
$(this).addClass('odd');
$(this).removeClass('even');
} else {
$(this).addClass('even');
$(this).removeClass('odd');
}
} else {
$(this).css('display','none');
}
});
}
$(function() {
var textFilter=null;
var odd_row=false;
var testString = 'abcdefghijklmnopqrstuvwxyz0123456789,ABCEFGHIJKLMOPQRSTUVWXYZ';
var $tmpDiv;
var charWidth;
/*** This code snippet takes care that the table stays readable. It cuts off long strings when the window is resized ***/
$('table.data').after($tmpDiv=$('<span>'+testString+'</span>'));
charWidth = $tmpDiv.width() / testString.length;
$tmpDiv.remove();
$(window).resize(limitTableWidth);
limitTableWidth();
function limitTableWidth() {
var fulltext;
var charDiff;
var maxTableWidth;
var $tmpTable;
$('table.data').after($tmpTable=$('<table id="testTable" style="width:100%;"><tr><td>'+testString+'</td></tr></table>'));
maxTableWidth = $('#testTable').width();
$tmpTable.remove();
charDiff = ($('table.data').width()-maxTableWidth) / charWidth;
if($('body').innerWidth() < $('table.data').width()+10 || $('body').innerWidth() > $('table.data').width()+20) {
var maxChars=0;
$('table.data tbody tr td:nth-child(2)').each(function() {
maxChars=Math.max($(this).text().length,maxChars);
});
// Do not resize smaller if there's only 50 chars displayed already
if(charDiff > 0 && maxChars < 50) return;
$('table.data tbody tr td:nth-child(2)').each(function() {
if((charDiff>0 && $(this).text().length > maxChars-charDiff) || (charDiff<0 && $(this).find('abbr.cutoff').length>0)) {
if($(this).find('abbr.cutoff').length > 0)
fulltext = $(this).find('abbr.cutoff').attr('title');
else {
fulltext = $(this).text();
// Do not cut off elements with html in it and hope they are not too long
if(fulltext.length != $(this).html().length) return 0;
}
if(fulltext.length < maxChars-charDiff)
$(this).html(fulltext);
else $(this).html('<abbr class="cutoff" title="'+fulltext+'">'+fulltext.substr(0,maxChars-charDiff-3)+'...</abbr>');
}
});
}
}
// Filter options are invisible for disabled js users
$('fieldset#tableFilter').css('display','');
$('#filterText').keyup(function(e) {
if($(this).val().length==0) textFilter=null;
else textFilter = new RegExp("(^| )"+$(this).val(),'i');
filterVariables();
});
function filterVariables() {
odd_row=false;
var mark_next=false;
var firstCell;
$('table.filteredData tbody tr').each(function() {
firstCell = $(this).children(':first');
if(mark_next || textFilter==null || textFilter.exec(firstCell.text())) {
// If current row is 'marked', also display next row
if($(this).hasClass('marked') && !mark_next)
mark_next=true;
else mark_next=false;
odd_row = !odd_row;
$(this).css('display','');
if(odd_row) {
$(this).addClass('odd');
$(this).removeClass('even');
} else {
$(this).addClass('even');
$(this).removeClass('odd');
}
} else {
$(this).css('display','none');
}
});
}
});

4
js/sql.js
View File

@ -712,8 +712,10 @@ $(document).ready(function() {
// and store the current value in a hidden span
if($this_field.is(':not(.truncated, .transformed, .relation, .enum, .set, .null)')) {
// handle non-truncated, non-transformed, non-relation values
value = data_value.replace("<br>", "\n");
// We don't need to get any more data, just wrap the value
$this_field_span.append('<textarea>'+data_value+'</textarea>');
$this_field_span.append('<textarea>' + value + '</textarea>');
$this_field.data('original_data', data_value);
}
else if($this_field.is('.truncated, .transformed')) {

2
libraries/Theme_Manager.class.php
View File

@ -288,7 +288,7 @@ class PMA_Theme_Manager
$theme_preview_href = '<a href="' . $theme_preview_path . '" target="themes" onclick="'
. "window.open('" . $theme_preview_path . "','themes','left=10,top=20,width=510,height=350,scrollbars=yes,status=yes,resizable=yes');"
. '">';
$select_box .= $theme_preview_href . __('Theme / Style') . '</a>:' . "\n";
$select_box .= $theme_preview_href . __('Theme') . '</a>:' . "\n";
$select_box .= '<select name="set_theme" xml:lang="en" dir="ltr"'
.' onchange="this.form.submit();" >';

63
libraries/server_variables_doc.php
View File

@ -6,6 +6,7 @@
* string $anchor: anchor to the documentation page
* string $chapter: chapter of "HTML, one page per chapter" documentation
* string $type: type of system variable
* string $format: if set to 'byte' it will format the variable with PMA_formatByteDown()
*/
$VARIABLE_DOC_LINKS = array();
$VARIABLE_DOC_LINKS['auto_increment_increment'] = array('auto_increment_increment','replication-options-master','sysvar');
@ -16,11 +17,11 @@ $VARIABLE_DOC_LINKS['back_log'] = array('back_log','server-system-variables','sy
$VARIABLE_DOC_LINKS['basedir'] = array('basedir','server-options','option_mysqld');
$VARIABLE_DOC_LINKS['big_tables'] = array('big-tables','server-options','option_mysqld');
$VARIABLE_DOC_LINKS['bind_address'] = array('bind-address','server-options','option_mysqld');
$VARIABLE_DOC_LINKS['binlog_cache_size'] = array('binlog_cache_size','replication-options-binary-log','sysvar');
$VARIABLE_DOC_LINKS['binlog_cache_size'] = array('binlog_cache_size','replication-options-binary-log','sysvar','byte');
$VARIABLE_DOC_LINKS['binlog_direct_non_transactional_updates'] = array('binlog_direct_non_transactional_updates','replication-options-binary-log','sysvar');
$VARIABLE_DOC_LINKS['binlog_format'] = array('binlog-format','server-options','sysvar');
$VARIABLE_DOC_LINKS['binlog_stmt_cache_size'] = array('binlog_stmt_cache_size','replication-options-binary-log','sysvar');
$VARIABLE_DOC_LINKS['bulk_insert_buffer_size'] = array('bulk_insert_buffer_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['binlog_stmt_cache_size'] = array('binlog_stmt_cache_size','replication-options-binary-log','sysvar','byte');
$VARIABLE_DOC_LINKS['bulk_insert_buffer_size'] = array('bulk_insert_buffer_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['character_set_client'] = array('character_set_client','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['character_set_connection'] = array('character_set_connection','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['character_set_database'] = array('character_set_database','server-system-variables','sysvar');
@ -84,11 +85,11 @@ $VARIABLE_DOC_LINKS['init_file'] = array('init-file','server-options','option_my
$VARIABLE_DOC_LINKS['init_slave'] = array('init_slave','replication-options-slave','sysvar');
$VARIABLE_DOC_LINKS['innodb_adaptive_flushing'] = array('innodb_adaptive_flushing','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_adaptive_hash_index'] = array('innodb_adaptive_hash_index','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_additional_mem_pool_size'] = array('innodb_additional_mem_pool_size','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_additional_mem_pool_size'] = array('innodb_additional_mem_pool_size','innodb-parameters','sysvar','byte');
$VARIABLE_DOC_LINKS['innodb_autoextend_increment'] = array('innodb_autoextend_increment','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_autoinc_lock_mode'] = array('innodb_autoinc_lock_mode','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_buffer_pool_instances'] = array('innodb_buffer_pool_instances','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_buffer_pool_size'] = array('innodb_buffer_pool_size','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_buffer_pool_size'] = array('innodb_buffer_pool_size','innodb-parameters','sysvar','byte');
$VARIABLE_DOC_LINKS['innodb_change_buffering'] = array('innodb_change_buffering','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_checksums'] = array('innodb_checksums','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_commit_concurrency'] = array('innodb_commit_concurrency','innodb-parameters','sysvar');
@ -107,8 +108,8 @@ $VARIABLE_DOC_LINKS['innodb_force_recovery'] = array('innodb_force_recovery','in
$VARIABLE_DOC_LINKS['innodb_io_capacity'] = array('innodb_io_capacity','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_lock_wait_timeout'] = array('innodb_lock_wait_timeout','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_locks_unsafe_for_binlog'] = array('innodb_locks_unsafe_for_binlog','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_log_buffer_size'] = array('innodb_log_buffer_size','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_log_file_size'] = array('innodb_log_file_size','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_log_buffer_size'] = array('innodb_log_buffer_size','innodb-parameters','sysvar','byte');
$VARIABLE_DOC_LINKS['innodb_log_file_size'] = array('innodb_log_file_size','innodb-parameters','sysvar','byte');
$VARIABLE_DOC_LINKS['innodb_log_files_in_group'] = array('innodb_log_files_in_group','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_log_group_home_dir'] = array('innodb_log_group_home_dir','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['innodb_max_dirty_pages_pct'] = array('innodb_max_dirty_pages_pct','innodb-parameters','sysvar');
@ -138,15 +139,15 @@ $VARIABLE_DOC_LINKS['innodb_version'] = array('innodb_version','innodb-parameter
$VARIABLE_DOC_LINKS['innodb_write_io_threads'] = array('innodb_write_io_threads','innodb-parameters','sysvar');
$VARIABLE_DOC_LINKS['insert_id'] = array('insert_id','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['interactive_timeout'] = array('interactive_timeout','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['join_buffer_size'] = array('join_buffer_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['join_buffer_size'] = array('join_buffer_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['keep_files_on_create'] = array('keep_files_on_create','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['key_buffer_size'] = array('key_buffer_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['key_buffer_size'] = array('key_buffer_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['key_cache_age_threshold'] = array('key_cache_age_threshold','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['key_cache_block_size'] = array('key_cache_block_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['key_cache_block_size'] = array('key_cache_block_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['key_cache_division_limit'] = array('key_cache_division_limit','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['language'] = array('language','server-options','option_mysqld');
$VARIABLE_DOC_LINKS['large_files_support'] = array('large_files_support','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['large_page_size'] = array('large_page_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['large_page_size'] = array('large_page_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['large_pages'] = array('large-pages','server-options','option_mysqld');
$VARIABLE_DOC_LINKS['last_insert_id'] = array('last_insert_id','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['lc_messages'] = array('lc-messages','server-options','option_mysqld');
@ -172,19 +173,19 @@ $VARIABLE_DOC_LINKS['lower_case_file_system'] = array('lower_case_file_system','
$VARIABLE_DOC_LINKS['lower_case_table_names'] = array('lower_case_table_names','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['master-bind'] = array('','replication-options',0);
$VARIABLE_DOC_LINKS['max_allowed_packet'] = array('max_allowed_packet','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['max_binlog_cache_size'] = array('max_binlog_cache_size','replication-options-binary-log','sysvar');
$VARIABLE_DOC_LINKS['max_binlog_size'] = array('max_binlog_size','replication-options-binary-log','sysvar');
$VARIABLE_DOC_LINKS['max_binlog_stmt_cache_size'] = array('max_binlog_stmt_cache_size','replication-options-binary-log','sysvar');
$VARIABLE_DOC_LINKS['max_binlog_cache_size'] = array('max_binlog_cache_size','replication-options-binary-log','sysvar','byte');
$VARIABLE_DOC_LINKS['max_binlog_size'] = array('max_binlog_size','replication-options-binary-log','sysvar','byte');
$VARIABLE_DOC_LINKS['max_binlog_stmt_cache_size'] = array('max_binlog_stmt_cache_size','replication-options-binary-log','sysvar','byte');
$VARIABLE_DOC_LINKS['max_connect_errors'] = array('max_connect_errors','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['max_connections'] = array('max_connections','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['max_delayed_threads'] = array('max_delayed_threads','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['max_error_count'] = array('max_error_count','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['max_heap_table_size'] = array('max_heap_table_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['max_heap_table_size'] = array('max_heap_table_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['max_insert_delayed_threads'] = array('max_insert_delayed_threads','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['max_join_size'] = array('max_join_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['max_length_for_sort_data'] = array('max_length_for_sort_data','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['max_prepared_stmt_count'] = array('max_prepared_stmt_count','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['max_relay_log_size'] = array('max_relay_log_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['max_relay_log_size'] = array('max_relay_log_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['max_seeks_for_key'] = array('max_seeks_for_key','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['max_sort_length'] = array('max_sort_length','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['max_sp_recursion_depth'] = array('max_sp_recursion_depth','server-system-variables','sysvar');
@ -193,12 +194,12 @@ $VARIABLE_DOC_LINKS['max_user_connections'] = array('max_user_connections','serv
$VARIABLE_DOC_LINKS['max_write_lock_count'] = array('max_write_lock_count','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['memlock'] = array('memlock','server-options','option_mysqld');
$VARIABLE_DOC_LINKS['min_examined_row_limit'] = array('min-examined-row-limit','server-options','option_mysqld');
$VARIABLE_DOC_LINKS['myisam_data_pointer_size'] = array('myisam_data_pointer_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['myisam_max_sort_file_size'] = array('myisam_max_sort_file_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['myisam_mmap_size'] = array('myisam_mmap_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['myisam_data_pointer_size'] = array('myisam_data_pointer_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['myisam_max_sort_file_size'] = array('myisam_max_sort_file_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['myisam_mmap_size'] = array('myisam_mmap_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['myisam_recover_options'] = array('myisam_recover_options','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['myisam_repair_threads'] = array('myisam_repair_threads','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['myisam_sort_buffer_size'] = array('myisam_sort_buffer_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['myisam_sort_buffer_size'] = array('myisam_sort_buffer_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['myisam_stats_method'] = array('myisam_stats_method','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['myisam_use_mmap'] = array('myisam_use_mmap','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['named_pipe'] = array('named_pipe','server-system-variables','sysvar');
@ -234,25 +235,25 @@ $VARIABLE_DOC_LINKS['performance_schema_max_thread_instances'] = array('performa
$VARIABLE_DOC_LINKS['pid_file'] = array('pid-file','server-options','option_mysqld');
$VARIABLE_DOC_LINKS['plugin_dir'] = array('plugin_dir','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['port'] = array('port','server-options','option_mysqld');
$VARIABLE_DOC_LINKS['preload_buffer_size'] = array('preload_buffer_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['preload_buffer_size'] = array('preload_buffer_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['profiling'] = array('profiling','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['profiling_history_size'] = array('profiling_history_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['protocol_version'] = array('protocol_version','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['proxy_user'] = array('proxy_user','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['pseudo_thread_id'] = array('pseudo_thread_id','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['query_alloc_block_size'] = array('query_alloc_block_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['query_alloc_block_size'] = array('query_alloc_block_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['query_cache_limit'] = array('query_cache_limit','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['query_cache_min_res_unit'] = array('query_cache_min_res_unit','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['query_cache_size'] = array('query_cache_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['query_cache_size'] = array('query_cache_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['query_cache_type'] = array('query_cache_type','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['query_cache_wlock_invalidate'] = array('query_cache_wlock_invalidate','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['query_prealloc_size'] = array('query_prealloc_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['query_prealloc_size'] = array('query_prealloc_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['rand_seed1'] = array('rand_seed1','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['rand_seed2'] = array('rand_seed2','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['range_alloc_block_size'] = array('range_alloc_block_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['read_buffer_size'] = array('read_buffer_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['range_alloc_block_size'] = array('range_alloc_block_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['read_buffer_size'] = array('read_buffer_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['read_only'] = array('read_only','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['read_rnd_buffer_size'] = array('read_rnd_buffer_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['read_rnd_buffer_size'] = array('read_rnd_buffer_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['relay-log-index'] = array('relay-log-index','replication-options-slave','option_mysqld');
$VARIABLE_DOC_LINKS['relay_log_index'] = array('relay_log_index','replication-options-slave','sysvar');
$VARIABLE_DOC_LINKS['relay_log_info_file'] = array('relay_log_info_file','replication-options-slave','sysvar');
@ -291,7 +292,7 @@ $VARIABLE_DOC_LINKS['slow_launch_time'] = array('slow_launch_time','server-syste
$VARIABLE_DOC_LINKS['slow_query_log'] = array('slow-query-log','server-options','server-system-variables');
$VARIABLE_DOC_LINKS['slow_query_log_file'] = array('slow_query_log_file','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['socket'] = array('socket','server-options','option_mysqld');
$VARIABLE_DOC_LINKS['sort_buffer_size'] = array('sort_buffer_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['sort_buffer_size'] = array('sort_buffer_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['sql_auto_is_null'] = array('sql_auto_is_null','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['sql_big_selects'] = array('sql_big_selects','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['sql_big_tables'] = array('big-tables','server-options','server-system-variables');
@ -332,10 +333,10 @@ $VARIABLE_DOC_LINKS['time_format'] = array('time_format','server-system-variable
$VARIABLE_DOC_LINKS['time_zone'] = array('time_zone','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['timed_mutexes'] = array('timed_mutexes','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['timestamp'] = array('timestamp','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['tmp_table_size'] = array('tmp_table_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['tmp_table_size'] = array('tmp_table_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['tmpdir'] = array('tmpdir','server-options','option_mysqld');
$VARIABLE_DOC_LINKS['transaction_alloc_block_size'] = array('transaction_alloc_block_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['transaction_prealloc_size'] = array('transaction_prealloc_size','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['transaction_alloc_block_size'] = array('transaction_alloc_block_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['transaction_prealloc_size'] = array('transaction_prealloc_size','server-system-variables','sysvar','byte');
$VARIABLE_DOC_LINKS['tx_isolation'] = array('tx_isolation','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['unique_checks'] = array('unique_checks','server-system-variables','sysvar');
$VARIABLE_DOC_LINKS['updatable_views_with_limit'] = array('updatable_views_with_limit','server-system-variables','sysvar');

1044
po/af.po
View File

File diff suppressed because it is too large Load Diff

1211
po/ar.po
View File

File diff suppressed because it is too large Load Diff

1076
po/az.po
View File

File diff suppressed because it is too large Load Diff

1189
po/be.po
View File

File diff suppressed because it is too large Load Diff

1226
po/be@latin.po
View File

File diff suppressed because it is too large Load Diff

1136
po/bg.po
View File

File diff suppressed because it is too large Load Diff

1464
po/bn.po
View File

File diff suppressed because it is too large Load Diff

1052
po/bs.po
View File

File diff suppressed because it is too large Load Diff

1168
po/ca.po
View File

File diff suppressed because it is too large Load Diff

1164
po/cs.po
View File

File diff suppressed because it is too large Load Diff

1204
po/cy.po
View File

File diff suppressed because it is too large Load Diff

1735
po/da.po
View File

File diff suppressed because it is too large Load Diff

1054
po/de.po
View File

File diff suppressed because it is too large Load Diff

1150
po/el.po
View File

File diff suppressed because it is too large Load Diff

1270
po/en_GB.po
View File

File diff suppressed because it is too large Load Diff

1112
po/es.po
View File

File diff suppressed because it is too large Load Diff

1071
po/et.po
View File

File diff suppressed because it is too large Load Diff

1062
po/eu.po
View File

File diff suppressed because it is too large Load Diff

1068
po/fa.po
View File

File diff suppressed because it is too large Load Diff

1319
po/fi.po
View File

File diff suppressed because it is too large Load Diff

1044
po/fr.po
View File

File diff suppressed because it is too large Load Diff

1104
po/gl.po
View File

File diff suppressed because it is too large Load Diff

1199
po/he.po
View File

File diff suppressed because it is too large Load Diff

1156
po/hi.po
View File

File diff suppressed because it is too large Load Diff

1208
po/hr.po
View File

File diff suppressed because it is too large Load Diff

1072
po/hu.po
View File

File diff suppressed because it is too large Load Diff

1061
po/id.po
View File

File diff suppressed because it is too large Load Diff

1052
po/it.po
View File

File diff suppressed because it is too large Load Diff

1079
po/ja.po
View File

File diff suppressed because it is too large Load Diff

1505
po/ka.po
View File

File diff suppressed because it is too large Load Diff

1072
po/ko.po
View File

File diff suppressed because it is too large Load Diff

1052
po/lt.po
View File

File diff suppressed because it is too large Load Diff

1069
po/lv.po
View File

File diff suppressed because it is too large Load Diff

1112
po/mk.po
View File

File diff suppressed because it is too large Load Diff

978
po/ml.po
View File

File diff suppressed because it is too large Load Diff

1092
po/mn.po
View File

File diff suppressed because it is too large Load Diff

1068
po/ms.po
View File

File diff suppressed because it is too large Load Diff

1056
po/nb.po
View File

File diff suppressed because it is too large Load Diff

1064
po/nl.po
View File

File diff suppressed because it is too large Load Diff

977
po/phpmyadmin.pot
View File

File diff suppressed because it is too large Load Diff

1094
po/pl.po
View File

File diff suppressed because it is too large Load Diff

1065
po/pt.po
View File

File diff suppressed because it is too large Load Diff

1182
po/pt_BR.po
View File

File diff suppressed because it is too large Load Diff

1354
po/ro.po
View File

File diff suppressed because it is too large Load Diff

1117
po/ru.po
View File

File diff suppressed because it is too large Load Diff

1298
po/si.po
View File

File diff suppressed because it is too large Load Diff

1153
po/sk.po
View File

File diff suppressed because it is too large Load Diff

1107
po/sl.po
View File

File diff suppressed because it is too large Load Diff

1069
po/sq.po
View File

File diff suppressed because it is too large Load Diff

1204
po/sr.po
View File

File diff suppressed because it is too large Load Diff

1204
po/sr@latin.po
View File

File diff suppressed because it is too large Load Diff

1116
po/sv.po
View File

File diff suppressed because it is too large Load Diff

992
po/ta.po
View File

File diff suppressed because it is too large Load Diff

1057
po/te.po
View File

File diff suppressed because it is too large Load Diff

1193
po/th.po
View File

File diff suppressed because it is too large Load Diff

1119
po/tr.po
View File

File diff suppressed because it is too large Load Diff

1214
po/tt.po
View File

File diff suppressed because it is too large Load Diff

1186
po/ug.po
View File

File diff suppressed because it is too large Load Diff

1051
po/uk.po
View File

File diff suppressed because it is too large Load Diff

1156
po/ur.po
View File

File diff suppressed because it is too large Load Diff

1246
po/uz.po
View File

File diff suppressed because it is too large Load Diff

1138
po/uz@latin.po
View File

File diff suppressed because it is too large Load Diff

1140
po/zh_CN.po
View File

File diff suppressed because it is too large Load Diff

1293
po/zh_TW.po
View File

File diff suppressed because it is too large Load Diff

4
scripts/update-po
View File

@ -1,6 +1,6 @@
#!/bin/sh
# vim: expandtab sw=4 ts=4 sts=4:
export LC_COLLATE=C
export LANG=C
LOCS=`ls po/*.po | sed 's@.*/\(.*\)\.po@\1@'`
xgettext \
-d phpmyadmin \
@ -12,7 +12,7 @@ xgettext \
--debug \
--keyword=__ --keyword=_pgettext:1c,2 --keyword=_ngettext:1,2 \
--copyright-holder="phpMyAdmin devel team" \
`find . -name '*.php' | sort`
`find . -name '*.php' -not -path './test/*' | sort`
ver=`sed -n "/PMA_VERSION', '/ s/.*PMA_VERSION', '\(.*\)'.*/\1/p" libraries/Config.class.php`

2
server_privileges.php
View File

@ -1698,7 +1698,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
unset ($row);
echo ' <fieldset id="fieldset_add_user">' . "\n"
. ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1">' . "\n"
. ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1" class="' . $conditional_class . '">' . "\n"
. PMA_getIcon('b_usradd.png')
. ' ' . __('Add user') . '</a>' . "\n"
. ' </fieldset>' . "\n";

210
server_status.php
View File

@ -15,17 +15,32 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) {
define('PMA_NO_VARIABLES_IMPORT', true);
}
if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true)
$GLOBALS['is_header_sent'] = 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, 1, 20, 40, 60, 120, 300, 600) as $key => $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
*/
if (isset($_REQUEST['ajax_request'])) {
// Prevent ajax requests from being cached
header('Cache-Control: no-cache, must-revalidate'); // HTTP/1.1
header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
// Send correct charset
if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
// Send with correct charset
header('Content-Type: text/html; charset=UTF-8');
// real-time charting data
@ -36,21 +51,43 @@ if (isset($_REQUEST['ajax_request'])) {
$result = PMA_DBI_query('SHOW PROCESSLIST');
$num_procs = PMA_DBI_num_rows($result);
$ret = Array('x'=>(microtime(true)*1000),'y_proc'=>$num_procs,'y_conn'=>$c['Connections']);
$ret = array(
'x' => microtime(true)*1000,
'y_proc' => $num_procs,
'y_conn' => $c['Connections']
);
exit(json_encode($ret));
case 'queries':
$queries = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name LIKE "Com_%" AND Value>0', 0, 1);
if (PMA_DRIZZLE) {
$sql = "SELECT 'Com_' || variable_name, variable_value
FROM data_dictionary.GLOBAL_STATEMENTS
WHERE variable_value > 0";
$queries = PMA_DBI_fetch_result($sql, 0, 1);
} else {
$queries = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name LIKE "Com_%" AND Value>0', 0, 1);
}
cleanDeprecated($queries);
// admin commands are not queries
unset($queries['Com_admin_commands']);
$sum=array_sum($queries);
$ret = Array('x'=>(microtime(true)*1000),'y'=>$sum,'pointInfo'=>$queries);
$ret = array(
'x' => microtime(true)*1000,
'y' => $sum,
'pointInfo' => $queries
);
exit(json_encode($ret));
case 'traffic':
$traffic = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name="Bytes_received" OR Variable_name="Bytes_sent"', 0, 1);
$ret = Array('x'=>(microtime(true)*1000),'y_sent'=>$traffic['Bytes_sent'],'y_received'=>$traffic['Bytes_received']);
$ret = array(
'x' => microtime(true)*1000,
'y_sent' => $traffic['Bytes_sent'],
'y_received' => $traffic['Bytes_received']
);
exit(json_encode($ret));
}
@ -307,13 +344,13 @@ $links['innodb']['doc'] = 'innodb';
// Variable to contain all com_ variables (query statistics)
$used_queries = Array();
$used_queries = array();
// Variable to map variable names to their respective section name (used for js category filtering)
$allocationMap = Array();
$allocationMap = array();
// Variable to mark used sections
$categoryUsed = Array();
$categoryUsed = array();
// sort vars into arrays
foreach ($server_status as $name => $value) {
@ -323,7 +360,7 @@ foreach ($server_status as $name => $value) {
$allocationMap[$name] = $section;
$categoryUsed[$section] = true;
$section_found = true;
if($section=='com' && $value>0) $used_queries[$name] = $value;
if($section == 'com' && $value > 0) $used_queries[$name] = $value;
break; // Only exits inner loop
}
}
@ -402,17 +439,7 @@ echo __('Runtime Information');
<?php echo __('Refresh'); ?>
</a>
<select name="trafficChartRefresh" style="display:none;">
<option value="5"><?php echo __('Refresh rate'); ?></option>
<option value="1">1 <?php echo __('second'); ?></option>
<option value="2">2 <?php echo __('seconds'); ?></option>
<option value="5">5 <?php echo __('seconds'); ?></option>
<option value="10">10 <?php echo __('seconds'); ?></option>
<option value="20">20 <?php echo __('seconds'); ?></option>
<option value="40">40 <?php echo __('seconds'); ?></option>
<option value="60">1 <?php echo __('minutes'); ?></option>
<option value="120">2 <?php echo __('minutes'); ?></option>
<option value="300">5 <?php echo __('minutes'); ?></option>
<option value="600">10 <?php echo __('minutes'); ?></option>
<?php PMA_choose_refresh_rate(); ?>
</select>
<a class="tabChart livetrafficLink" href="#">
@ -435,17 +462,7 @@ echo __('Runtime Information');
<?php echo __('Refresh'); ?>
</a>
<select name="queryChartRefresh" style="display:none;">
<option value="5"><?php echo __('Refresh rate'); ?></option>
<option value="1">1 <?php echo __('second'); ?></option>
<option value="2">2 <?php echo __('seconds'); ?></option>
<option value="5">5 <?php echo __('seconds'); ?></option>
<option value="10">10 <?php echo __('seconds'); ?></option>
<option value="20">20 <?php echo __('seconds'); ?></option>
<option value="40">40 <?php echo __('seconds'); ?></option>
<option value="60">1 <?php echo __('minutes'); ?></option>
<option value="120">2 <?php echo __('minutes'); ?></option>
<option value="300">5 <?php echo __('minutes'); ?></option>
<option value="600">10 <?php echo __('minutes'); ?></option>
<?php PMA_choose_refresh_rate(); ?>
</select>
<a class="tabChart livequeriesLink" href="#">
<?php echo __('Live query chart'); ?>
@ -476,7 +493,7 @@ echo __('Runtime Information');
<select id="filterCategory" name="filterCategory">
<option value=''><?php echo __('Filter by category...'); ?></option>
<?php
foreach($sections as $section_id=>$section_name) {
foreach($sections as $section_id => $section_name) {
if (isset($categoryUsed[$section_id])) {
?>
<option value='<?php echo $section_id; ?>'><?php echo $section_name; ?></option>
@ -494,7 +511,7 @@ echo __('Runtime Information');
echo '<span class="status_'.$section_name.'"> ';
$i=0;
foreach ($section_links as $link_name => $link_url) {
if($i>0) echo ', ';
if($i > 0) echo ', ';
if ('doc' == $link_name) {
echo PMA_showMySQLDocu($link_url, $link_url);
} else {
@ -520,30 +537,32 @@ echo __('Runtime Information');
function printQueryStatistics() {
global $server_status, $used_queries, $url_query, $PMA_PHP_SELF;
$hour_factor = 3600 / $server_status['Uptime'];
$hour_factor = 3600 / $server_status['Uptime'];
$total_queries = array_sum($used_queries);
?>
<h3 id="serverstatusqueries"><?php echo
//sprintf(__('<b>Query statistics</b>: Since its startup, %s queries have been sent to the server.'),
//PMA_formatNumber($server_status['Questions'], 0));
sprintf('Queries since startup: %s',PMA_formatNumber($total_queries, 0));
//echo PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_Questions');
<h3 id="serverstatusqueries">
<?php
echo sprintf('Queries since startup: %s',PMA_formatNumber($total_queries, 0));
?>
<br>
<span style="font-size:60%; display:inline;">
&oslash; <?php echo __('per hour'); ?>:
<?php echo PMA_formatNumber($total_queries * $hour_factor, 0); ?><br>
<br>
<span>
<?php
echo '&oslash;'.__('per hour').':';
echo PMA_formatNumber($total_queries * $hour_factor, 0);
echo '<br>';
&oslash; <?php echo __('per minute'); ?>:
<?php echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0); ?><br>
<?php if($total_queries / $server_status['Uptime'] >= 1) {
?>
&oslash; <?php echo __('per second'); ?>:
<?php echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0); ?><br>
echo '&oslash;'.__('per minute').':';
echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0);
echo '<br>';
if($total_queries / $server_status['Uptime'] >= 1) {
echo '&oslash;'.__('per second').':';
echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0);
?>
</span><br>
</h3>
<?php
}
@ -551,11 +570,11 @@ function printQueryStatistics() {
arsort($used_queries);
$odd_row = true;
$count_displayed_rows = 0;
$perc_factor = 100 / $total_queries //(- $server_status['Connections']);
$count_displayed_rows = 0;
$perc_factor = 100 / $total_queries; //(- $server_status['Connections']);
?>
</h3>
<table id="serverstatusqueriesdetails" class="data sortable">
<col class="namecol" />
<col class="valuecol" span="3" />
@ -572,7 +591,7 @@ function printQueryStatistics() {
<tbody>
<?php
$chart_json = Array();
$chart_json = array();
$query_sum = array_sum($used_queries);
$other_sum = 0;
foreach ($used_queries as $name => $value) {
@ -581,7 +600,7 @@ function printQueryStatistics() {
// For the percentage column, use Questions - Connections, because
// the number of connections is not an item of the Query types
// but is included in Questions. Then the total of the percentages is 100.
$name = str_replace(Array('Com_','_'), Array('',' '), $name);
$name = str_replace(Array('Com_', '_'), Array('', ' '), $name);
if($value < $query_sum * 0.02)
$other_sum += $value;
@ -601,21 +620,12 @@ function printQueryStatistics() {
</tbody>
</table>
<div id="serverstatusquerieschart" style="width:500px; height:350px; ">
<div id="serverstatusquerieschart">
<?php
/*// Generate the graph if this is an ajax request
if(isset($_REQUEST['ajax_request'])) {
echo createQueryChart();
} else {
echo '<a href="'.$PMA_PHP_SELF.'?'.$url_query.'&amp;query_chart=1#serverstatusqueries"'
.'title="' . __('Show query chart') . '">['.__('Show query chart').']</a>';
}*/
if($other_sum>0)
if($other_sum > 0)
$chart_json[__('Other')] = $other_sum;
echo json_encode($chart_json);
?>
</div>
<?php
@ -634,10 +644,11 @@ function printServerTraffic() {
'SELECT UNIX_TIMESTAMP() - ' . $server_status['Uptime']);
?>
<h3><?php /* echo __('<b>Server traffic</b>: These tables show the network traffic statistics of this MySQL server since its startup.');*/
echo sprintf(__('Network traffic since startup: %s'),
implode(' ', PMA_formatByteDown( $server_status['Bytes_received'] + $server_status['Bytes_sent'], 3, 1))
);
<h3><?php
echo sprintf(
__('Network traffic since startup: %s'),
implode(' ', PMA_formatByteDown( $server_status['Bytes_received'] + $server_status['Bytes_sent'], 3, 1))
);
?>
</h3>
@ -659,7 +670,7 @@ function printServerTraffic() {
} elseif ($server_slave_status) {
echo __('This MySQL server works as <b>slave</b> in <b>replication</b> process.');
}
echo __('For further information about replication status on the server, please visit the <a href=#replication>replication section</a>.');
echo __('For further information about replication status on the server, please visit the <a href="#replication">replication section</a>.');
echo '</p>';
}
@ -814,7 +825,7 @@ function printServerTraffic() {
<th><?php echo __('Status'); ?></th>
<th><?php
echo __('SQL query');
if (!PMA_DRIZZLE) { ?>
if (! PMA_DRIZZLE) { ?>
<a href="<?php echo $full_text_link; ?>"
title="<?php echo empty($full) ? __('Show Full Queries') : __('Truncate Shown Queries'); ?>">
<img src="<?php echo $GLOBALS['pmaThemeImage'] . 's_' . (empty($_REQUEST['full']) ? 'full' : 'partial'); ?>text.png"
@ -865,7 +876,7 @@ function printVariablesTable() {
/**
* Messages are built using the message name
*/
$strShowStatus = Array(
$strShowStatus = array(
'Aborted_connects' => __('The number of failed attempts to connect to the MySQL server.'),
'Binlog_cache_disk_use' => __('The number of transactions that used the temporary binary log cache but that exceeded the value of binlog_cache_size and used a temporary file to store statements from the transaction.'),
'Binlog_cache_use' => __('The number of transactions that used the temporary binary log cache.'),
@ -1043,19 +1054,12 @@ function printVariablesTable() {
<th><?php echo __('Description'); ?></th>
</tr>
</thead>
<!--<tfoot>
<tr class="tblFooters">
<th colspan="3" class="tblFooters">
</th>
</tr>
</tfoot>-->
<tbody>
<?php
$odd_row = false;
foreach ($server_status as $name => $value) {
$odd_row = !$odd_row;
// $allocations
?>
<tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; echo isset($allocationMap[$name])?' s_'.$allocationMap[$name]:''; ?>">
<th class="name"><?php echo htmlspecialchars($name) . PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_' . $name); ?>
@ -1111,44 +1115,6 @@ function printVariablesTable() {
<?php
}
function createQueryChart($com_vars=FALSE) {
/**
* Chart generation
*/
require_once './libraries/chart.lib.php';
if(!$com_vars)
if (PMA_DRIZZLE) {
$sql = "SELECT 'Com_' || variable_name, variable_value
FROM data_dictionary.GLOBAL_STATEMENTS";
$com_vars = PMA_DBI_fetch_result($sql, 0, 1);
} else {
$com_vars = PMA_DBI_fetch_result("SHOW GLOBAL STATUS LIKE 'Com\_%'", 0, 1);
}
// admin commands are not queries (e.g. they include COM_PING, which is excluded from $server_status['Questions'])
unset($com_vars['Com_admin_commands']);
arsort($com_vars);
$merge_minimum = array_sum($com_vars) * 0.005;
$merged_value = 0;
// remove zero values from the end, as well as merge together every value that is below 0.5%
// variable empty for Drizzle
if ($com_vars) {
while (($last_element=end($com_vars)) <= $merge_minimum) {
array_pop($com_vars);
$merged_value += $last_element;
}
$com_vars['Other'] = $merged_value;
return PMA_chart_status($com_vars);
}
return '';
}
/**
* cleanup of some deprecated values
*/

6
server_variables.php
View File

@ -86,8 +86,10 @@ foreach ($serverVars as $name => $value) {
<th nowrap="nowrap">
<?php echo htmlspecialchars(str_replace('_', ' ', $name)); ?></th>
<td class="value"><?php
if (strlen($value) < 16 && is_numeric($value)) {
echo PMA_formatNumber($value, 0);
if (is_numeric($value)) {
if(isset($VARIABLE_DOC_LINKS[$name][3]) && $VARIABLE_DOC_LINKS[$name][3]=='byte')
echo '<abbr title="'.PMA_formatNumber($value, 0).'">'.implode(' ',PMA_formatByteDown($value,3,3)).'</abbr>';
else echo PMA_formatNumber($value, 0);
$is_numeric = true;
} else {
echo htmlspecialchars($value);

2
test/theme.php
View File

@ -156,7 +156,7 @@ echo sprintf(__('Welcome to %s'),
<form method="post" action="theme.php" target="_parent">
<fieldset>
<legend><?php echo __('Theme / Style'); ?></legend>
<legend><?php echo __('Theme'); ?></legend>
<?php
echo $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox(false);
?>

4
themes.php
View File

@ -17,7 +17,7 @@ $path_to_themes = $cfg['ThemePath'] . '/';
require './libraries/header_http.inc.php';
/* HTML header */
$page_title = 'phpMyAdmin - ' . __('Theme / Style');
$page_title = 'phpMyAdmin - ' . __('Theme');
require './libraries/header_meta_style.inc.php';
?>
<script type="text/javascript" language="javascript">
@ -37,7 +37,7 @@ function takeThis(what){
</head>
<body id="bodythemes">
<h1>phpMyAdmin - <?php echo __('Theme / Style'); ?></h1>
<h1>phpMyAdmin - <?php echo __('Theme'); ?></h1>
<p><a href="<?php echo PMA_linkURL('http://www.phpmyadmin.net/home_page/themes.php'); ?>#pma_<?php echo preg_replace('/([0-9]*)\.([0-9]*)\..*/', '\1_\2', PMA_VERSION); ?>"><?php echo __('Get more themes!'); ?></a></p>
<?php
$_SESSION['PMA_Theme_Manager']->printPreviews();

19
themes/original/css/theme_right.css.php
View File

@ -258,6 +258,10 @@ td.null {
text-align: <?php echo $right; ?>;
}
table .valueHeader {
text-align: <?php echo $right; ?>;
white-space: normal;
}
table .value {
text-align: <?php echo $right; ?>;
white-space: normal;
@ -960,6 +964,11 @@ img.sortableIcon {
background-repeat:no-repeat;
}
h3#serverstatusqueries span {
font-size:60%;
display:inline;
}
table#serverstatusqueriesdetails th img.sortableIcon, table#serverstatusvariables th img.sortableIcon {
background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_sortable.png);
}
@ -990,6 +999,8 @@ div#serverstatus table caption a.top {
div#serverstatusquerieschart {
float:<?php echo $right; ?>;
width:500px;
height:350px;
}
div#serverstatus table#serverstatusqueriesdetails {
@ -1035,6 +1046,14 @@ div#serverstatus table tbody td.descr a:after,
div#serverstatus table .tblFooters a:after {
content: ']';
}
div.liveChart {
clear:both;
min-width:500px;
height:400px;
padding-bottom:80px;
}
/* end serverstatus */
/* querywindow */

33
themes/pmahomme/css/theme_right.css.php
View File

@ -432,6 +432,10 @@ td.null {
text-align: <?php echo $right; ?>;
}
table .valueHeader {
text-align: <?php echo $right; ?>;
white-space: normal;
}
table .value {
text-align: <?php echo $right; ?>;
white-space: normal;
@ -1166,6 +1170,11 @@ img.sortableIcon {
background-repeat:no-repeat;
}
h3#serverstatusqueries span {
font-size:60%;
display:inline;
}
table#serverstatusqueriesdetails th.headerSortUp img.sortableIcon, table#serverstatusvariables th.headerSortUp img.sortableIcon {
background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asc.png);
}
@ -1175,7 +1184,7 @@ table#serverstatusqueriesdetails th.headerSortDown img.sortableIcon, table#serve
.statuslinks {
float: <?php echo $right; ?>;
white-space: nowrap;
white-space: nowrap;
}
/* Also used for the variables page */
@ -1193,6 +1202,8 @@ div#serverstatus table caption a.top {
div#serverstatusquerieschart {
float:<?php echo $right; ?>;
width:500px;
height:350px;
}
div#serverstatus table#serverstatusqueriesdetails {
@ -1225,8 +1236,28 @@ div#serverstatus table tbody td.descr a,
div#serverstatus table .tblFooters a {
white-space: nowrap;
}
div.liveChart {
clear:both;
min-width:500px;
height:400px;
padding-bottom:80px;
}
/* end serverstatus */
/* server variables */
a.editIcon {
float: <?php echo $left; ?>;
font-family:sans-serif;
}
table#serverVariables td {
height:18px;
}
/* end server variables */
/* querywindow */
body#bodyquerywindow {
margin: 0;