diff options
| author | Rouslan Placella <rouslan@placella.com> | 2012-04-22 03:12:30 +0400 |
|---|---|---|
| committer | Rouslan Placella <rouslan@placella.com> | 2012-04-22 03:12:30 +0400 |
| commit | ff66fdbdf9ed414dfa75c7e66f738887dd9efc25 (patch) | |
| tree | b86f946b150e3919cafce790faf716905b930c38 | |
| parent | da0e04d179e8e11f3a0023e17305857c6fe6fbbd (diff) | |
Remove stray trailing whitespaces
36 files changed, 317 insertions, 317 deletions
diff --git a/db_structure.php b/db_structure.php index beb4e9bb81..d2035abc20 100644 --- a/db_structure.php +++ b/db_structure.php @@ -367,7 +367,7 @@ foreach ($tables as $keyname => $each_table) { . '&message_to_show=' . urlencode(sprintf(__('Table %s has been emptied'), htmlspecialchars($each_table['TABLE_NAME']))) .'">'; - + $empty_table .= $titles['Empty']; $empty_table .= '</a>'; } else { diff --git a/js/date.js b/js/date.js index 3f228f7c69..90ced470ad 100644 --- a/js/date.js +++ b/js/date.js @@ -11,7 +11,7 @@ // use. That means, you can include it in your product, or your web // site, or any other form where the code is actually being used. You // may not put the plain javascript up on your site for download or -// include it in your javascript libraries for download. +// include it in your javascript libraries for download. // If you wish to share this code with others, please just point them // to the URL instead. // Please DO NOT link directly to my .js files from your site. Copy @@ -23,14 +23,14 @@ // May 17, 2003: Fixed bug in parseDate() for dates <1970 // March 11, 2003: Added parseDate() function // March 11, 2003: Added "NNN" formatting option. Doesn't match up -// perfectly with SimpleDateFormat formats, but +// perfectly with SimpleDateFormat formats, but // backwards-compatability was required. // ------------------------------------------------------------------ -// These functions use the same 'format' strings as the +// These functions use the same 'format' strings as the // java.text.SimpleDateFormat class, with minor exceptions. // The format string consists of the following abbreviations: -// +// // Field | Full Form | Short Form // -------------+--------------------+----------------------- // Year | yyyy (4 digits) | yy (2 digits), y (2 or 4 digits) @@ -153,7 +153,7 @@ function formatDate(date,format) { } return result; } - + // ------------------------------------------------------------------ // Utility functions for parsing in getDateFromFormat() // ------------------------------------------------------------------ @@ -172,12 +172,12 @@ function _getInt(str,i,minlength,maxlength) { } return null; } - + // ------------------------------------------------------------------ // getDateFromFormat( date_string , format_string ) // // This function takes a date string and a format string. It matches -// If the date string matches the format string, it returns the +// If the date string matches the format string, it returns the // getTime() of the date. If it does not match, it returns 0. // ------------------------------------------------------------------ function getDateFromFormat(val,format) { @@ -197,7 +197,7 @@ function getDateFromFormat(val,format) { var mm=now.getMinutes(); var ss=now.getSeconds(); var ampm=""; - + while (i_format < format.length) { // Get next token from format string c=format.charAt(i_format); diff --git a/js/db_operations.js b/js/db_operations.js index 8ea2bc02f4..c9c0289232 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -49,7 +49,7 @@ $(function() { $.get(url, $("#rename_db_form").serialize() + '&is_js_confirmed=1', function(data) { if(data.success == true) { - + PMA_ajaxShowMessage(data.message); window.parent.db = data.newname; @@ -88,7 +88,7 @@ $(function() { var $msgbox = PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase']); var $form = $(this); - + PMA_prepareForAjaxRequest($form); $.get($form.attr('action'), $form.serialize(), function(data) { @@ -110,7 +110,7 @@ $(function() { else { $('#floating_menubar').after(data.error); } - + PMA_ajaxRemoveMessage($msgbox); }) // end $.get }) // end copy database @@ -137,5 +137,5 @@ $(function() { } }) // end $.get() }) // end change charset - + }, 'top.frame_content'); diff --git a/js/db_structure.js b/js/db_structure.js index ccdcc69176..94e7af4f4e 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -42,7 +42,7 @@ function PMA_adjustTotals() { var sizeSum = 0; var overheadSum = 0; var rowSumApproximated = false; - + $allTr.each(function () { var $this = $(this); // Get the number of rows for this SQL table @@ -295,8 +295,8 @@ $(function() { /** * @var question String containing the question to be asked for confirmation */ - var question = - PMA_messages.strTruncateTableStrongWarning + ' ' + var question = + PMA_messages.strTruncateTableStrongWarning + ' ' + $.sprintf(PMA_messages.strDoYouReally, 'TRUNCATE ' + curr_table_name); $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function(url) { @@ -354,8 +354,8 @@ $(function() { */ var question; if (! is_view) { - question = - PMA_messages.strDropTableStrongWarning + ' ' + question = + PMA_messages.strDropTableStrongWarning + ' ' + $.sprintf(PMA_messages.strDoYouReally, 'DROP TABLE ' + curr_table_name); } else { question = diff --git a/js/functions.js b/js/functions.js index bfa3d52762..0662bb318e 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2230,8 +2230,8 @@ $(function() { /** * @var question String containing the question to be asked for confirmation */ - var question = - PMA_messages.strDropDatabaseStrongWarning + ' ' + var question = + PMA_messages.strDropDatabaseStrongWarning + ' ' + $.sprintf(PMA_messages.strDoYouReally, 'DROP DATABASE ' + escapeHtml(window.parent.db)); $(this).PMA_confirm(question, $(this).attr('href'), function(url) { @@ -2358,7 +2358,7 @@ $(function() { $(this).remove(); }, buttons : button_options, - beforeClose: function(ev, ui) { + beforeClose: function(ev, ui) { $('#change_password_anchor.dialog_active').removeClass('dialog_active').addClass('ajax'); } }) @@ -3223,8 +3223,8 @@ $(function() { /** * @var question String containing the question to be asked for confirmation */ - var question = - PMA_messages.strDropTableStrongWarning + ' ' + var question = + PMA_messages.strDropTableStrongWarning + ' ' + $.sprintf(PMA_messages.strDoYouReally, 'DROP TABLE ' + window.parent.table); $(this).PMA_confirm(question, $(this).attr('href'), function(url) { @@ -3252,8 +3252,8 @@ $(function() { /** * @var question String containing the question to be asked for confirmation */ - var question = - PMA_messages.strTruncateTableStrongWarning + ' ' + var question = + PMA_messages.strTruncateTableStrongWarning + ' ' + $.sprintf(PMA_messages.strDoYouReally, 'TRUNCATE ' + window.parent.table); $(this).PMA_confirm(question, $(this).attr('href'), function(url) { diff --git a/js/get_image.js.php b/js/get_image.js.php index 60888c88f7..de8488a39f 100644 --- a/js/get_image.js.php +++ b/js/get_image.js.php @@ -68,7 +68,7 @@ function PMA_getImage(image, alternate, attributes) { // this is private alt: '', title: '', - src: (typeof PMA_TEST_THEME == 'undefined' ? '' : '../') + src: (typeof PMA_TEST_THEME == 'undefined' ? '' : '../') + 'themes/dot.gif' }, isSprite: true, diff --git a/js/gis_data_editor.js b/js/gis_data_editor.js index 19a0d15a03..477b3988a9 100644 --- a/js/gis_data_editor.js +++ b/js/gis_data_editor.js @@ -173,7 +173,7 @@ function openGISEditor() { $gis_editor.css({"top": popupOffsetTop, "left": popupOffsetLeft, "width": popupWidth, "height": popupHeight}); $backgrouond.css({"opacity":"0.7"}); - $gis_editor.append('<div id="gis_data_editor"><img class="ajaxIcon" id="loadingMonitorIcon" src="' + $gis_editor.append('<div id="gis_data_editor"><img class="ajaxIcon" id="loadingMonitorIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt=""></div>' ); diff --git a/js/makegrid.js b/js/makegrid.js index 3635f82221..00f49ea8a9 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -719,7 +719,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi // empty all edit area, then rebuild it based on $td classes $editArea.empty(); - + // add show data row link if the data resulted by 'browse distinct values' in table structure if ($td.find('input').hasClass('data_browse_link')) { var showDataRowLink = document.createElement('div'); @@ -960,11 +960,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.isEditCellTextEditable = true; } else if ($td.is('.datefield, .datetimefield, .timestampfield')) { var $input_field = $(g.cEdit).find('.edit_box'); - + // remember current datetime value in $input_field, if it is not null var is_null = $td.is('.null'); var current_datetime_value = !is_null ? $input_field.val() : ''; - + var showTimeOption = true; if ($td.is('.datefield')) { showTimeOption = false; @@ -977,12 +977,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $(g.cEdit).find('.null_div input[type=checkbox]').prop('checked', false); } }); - + // cancel any click on the datepicker element $editArea.find('> *').click(function(e) { e.stopPropagation(); }); - + // force to restore modified $input_field value after adding datepicker // (after adding a datepicker, the input field doesn't display the time anymore, only the date) if (!is_null) { diff --git a/js/server_databases.js b/js/server_databases.js index ed23bb116e..5fdff9344b 100644 --- a/js/server_databases.js +++ b/js/server_databases.js @@ -40,7 +40,7 @@ $(function() { /** * @var question String containing the question to be asked for confirmation */ - var question = + var question = PMA_messages.strDropDatabaseStrongWarning + ' ' + $.sprintf(PMA_messages.strDoYouReally, selected_dbs.join('<br />')); diff --git a/js/server_privileges.js b/js/server_privileges.js index c86e55d957..471c7a87f0 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -374,7 +374,7 @@ $(function() { 'ajax_request':true, 'edit_user_dialog': true, 'token': token - }, + }, function(data) { var $div = $('<div id="edit_user_dialog"></div>') .append(data) @@ -493,8 +493,8 @@ $(function() { button_options[PMA_messages['strClose']] = function() { $(this).dialog("close"); }; - $.post($(this.form).prop('action'), - $(this.form).serialize() + '&submit_mult=export&ajax_request=true', + $.post($(this.form).prop('action'), + $(this.form).serialize() + '&submit_mult=export&ajax_request=true', function(data) { var $ajaxDialog = $('<div />') .append(data.message) diff --git a/js/server_status.js b/js/server_status.js index 87836c62e7..2a19f42993 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -93,9 +93,9 @@ $(function() { var pos = $cnt.offset(); // Hide if the mouseclick is outside the popupcontent - if (event.pageX < pos.left - || event.pageY < pos.top - || event.pageX > pos.left + $cnt.outerWidth() + if (event.pageX < pos.left + || event.pageY < pos.top + || event.pageX > pos.left + $cnt.outerWidth() || event.pageY > pos.top + $cnt.outerHeight() ) { $cnt.hide().removeClass('openedPopup'); @@ -138,7 +138,7 @@ $(function() { $('#serverStatusTabs').tabs({ // Tab persistence cookie: { name: 'pma_serverStatusTabs', expires: 1 }, - show: function(event, ui) { + show: function(event, ui) { // Fixes line break in the menu bar when the page overflows and scrollbar appears menuResize(); @@ -156,7 +156,7 @@ $(function() { // Delay loading a bit so the tab loads and the user gets to see a ajax loading icon setTimeout(function() { var scripts = [ - 'js/jquery/timepicker.js', + 'js/jquery/timepicker.js', 'js/jquery/jquery.json-2.2.js', 'js/jquery/jquery.sortableTable.js']; if (cfg_CodemirrorEnable) { @@ -165,7 +165,7 @@ $(function() { scripts.push('js/server_status_monitor.js'); loadJavascript(scripts); }, 50); - + monitorLoaded = true; } @@ -477,7 +477,7 @@ $(function() { dataLabels: { enabled: true, formatter: function() { - return '<b>' + this.point.name +'</b><br/> ' + + return '<b>' + this.point.name +'</b><br/> ' + Highcharts.numberFormat(this.percentage, 2) + ' %'; } } @@ -485,8 +485,8 @@ $(function() { }, tooltip: { formatter: function() { - return '<b>' + this.point.name + '</b><br/>' + - Highcharts.numberFormat(this.y, 2) + '<br/>(' + + return '<b>' + this.point.name + '</b><br/>' + + Highcharts.numberFormat(this.y, 2) + '<br/>(' + Highcharts.numberFormat(this.percentage, 2) + ' %)'; } } @@ -625,7 +625,7 @@ $(function() { if (sumOther>0) { pointInfo += PMA_messages['strOther'] + ': ' + sumOther; } - + return pointInfo; } @@ -633,58 +633,58 @@ $(function() { $('a[href="#openAdvisorInstructions"]').click(function() { var dlgBtns = {}; - + dlgBtns[PMA_messages['strClose']] = function() { $(this).dialog('close'); }; - + $('#advisorInstructionsDialog').attr('title', PMA_messages['strAdvisorSystem']); $('#advisorInstructionsDialog').dialog({ width: 700, - buttons: dlgBtns + buttons: dlgBtns }); }); $('a[href="#startAnalyzer"]').click(function() { var $cnt = $('#statustabs_advisor .tabInnerContent'); $cnt.html('<img class="ajaxIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">'); - + $.get('server_status.php?' + url_query, { ajax_request: true, advisor: true }, function(data) { var $tbody, $tr, str, even = true; data = $.parseJSON(data); - + $cnt.html(''); - + if (data.parse.errors.length > 0) { $cnt.append('<b>Rules file not well formed, following errors were found:</b><br />- '); $cnt.append(data.parse.errors.join('<br/>- ')); $cnt.append('<p></p>'); } - + if (data.run.errors.length > 0) { $cnt.append('<b>Errors occured while executing rule expressions:</b><br />- '); $cnt.append(data.run.errors.join('<br/>- ')); $cnt.append('<p></p>'); } - + if (data.run.fired.length > 0) { $cnt.append('<p><b>' + PMA_messages['strPerformanceIssues'] + '</b></p>'); $cnt.append('<table class="data" id="rulesFired" border="0"><thead><tr>' + - '<th>' + PMA_messages['strIssuse'] + '</th><th>' + PMA_messages['strRecommendation'] + - '</th></tr></thead><tbody></tbody></table>'); + '<th>' + PMA_messages['strIssuse'] + '</th><th>' + PMA_messages['strRecommendation'] + + '</th></tr></thead><tbody></tbody></table>'); $tbody = $cnt.find('table#rulesFired'); - + var rc_stripped; - + $.each(data.run.fired, function(key, value) { // recommendation may contain links, don't show those in overview table (clicking on them redirects the user) rc_stripped = $.trim($('<div>').html(value.recommendation).text()); - $tbody.append($tr = $('<tr class="linkElem noclick ' + (even ? 'even' : 'odd') + '"><td>' + - value.issue + '</td><td>' + rc_stripped + ' </td></tr>')); + $tbody.append($tr = $('<tr class="linkElem noclick ' + (even ? 'even' : 'odd') + '"><td>' + + value.issue + '</td><td>' + rc_stripped + ' </td></tr>')); even = !even; $tr.data('rule', value); - + $tr.click(function() { var rule = $(this).data('rule'); $('div#emptyDialog').dialog({title: PMA_messages['strRuleDetails']}); @@ -695,18 +695,18 @@ $(function() { '<p><b>' + PMA_messages['strFormula'] + ':</b><br />' + rule.formula + '</p>' + '<p><b>' + PMA_messages['strTest'] + ':</b><br />' + rule.test + '</p>' ); - + var dlgBtns = {}; - dlgBtns[PMA_messages['strClose']] = function() { - $(this).dialog('close'); + dlgBtns[PMA_messages['strClose']] = function() { + $(this).dialog('close'); }; - + $('div#emptyDialog').dialog({ width: 600, buttons: dlgBtns }); }); }); } }); - + return false; }); }); diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 2f64c4a6fd..c275688bfd 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -22,15 +22,15 @@ $(function() { $('div#logAnalyseDialog .datetimefield').each(function() { PMA_addDatepicker($(this)); }); - + /**** Monitor charting implementation ****/ /* Saves the previous ajax response for differential values */ var oldChartData = null; // Holds about to created chart var newChart = null; var chartSpacing; - - // Whenever the monitor object (runtime.charts) or the settings object (monitorSettings) + + // Whenever the monitor object (runtime.charts) or the settings object (monitorSettings) // changes in a way incompatible to the previous version, increase this number // It will reset the users monitor and settings object in his localStorage to the default configuration var monitorProtocolVersion = '1.0'; @@ -55,7 +55,7 @@ $(function() { xmin: -1, xmax: -1 }; - + var monitorSettings = null; var defaultMonitorSettings = { @@ -69,7 +69,7 @@ $(function() { // Allows drag and drop rearrange and print/edit icons on charts var editMode = false; - + /* List of preconfigured charts that the user may select */ var presetCharts = { // Query cache efficiency @@ -93,20 +93,20 @@ $(function() { } ] } }; - + /* Add OS specific system info charts to the preset chart list */ switch(server_os) { - case 'WINNT': - $.extend(presetCharts, { + case 'WINNT': + $.extend(presetCharts, { 'cpu': { title: PMA_messages['strSystemCPUUsage'], - nodes: [ { - name: PMA_messages['strAverageLoad'], - dataPoints: [{ type: 'cpu', name: 'loadavg'}], + nodes: [ { + name: PMA_messages['strAverageLoad'], + dataPoints: [{ type: 'cpu', name: 'loadavg'}], unit: '%' } ] }, - + 'memory': { title: PMA_messages['strSystemMemory'], nodes: [ { @@ -122,7 +122,7 @@ $(function() { unit: PMA_messages['strMiB'] } ] }, - + 'swap': { title: PMA_messages['strSystemSwap'], nodes: [ { @@ -139,7 +139,7 @@ $(function() { } }); break; - + case 'Linux': $.extend(presetCharts, { 'cpu': { @@ -367,7 +367,7 @@ $(function() { // To many cells in one row => put into next row $tr.find('td').each(function() { if (numColumns > monitorSettings.columns) { - if ($tr.next().length == 0) { + if ($tr.next().length == 0) { $tr.after('<tr></tr>'); } $tr.next().prepend($(this)); @@ -462,14 +462,14 @@ $(function() { $(this).dialog("close"); }; - + dlgButtons[PMA_messages['strClose']] = function() { newChart = null; $('span#clearSeriesLink').hide(); $('#seriesPreview').html(''); $(this).dialog("close"); }; - + var $presetList = $('div#addChartDialog select[name="presetCharts"]'); if ($presetList.html().length == 0) { $.each(presetCharts, function(key, value) { @@ -480,7 +480,7 @@ $(function() { $('input[name="chartTitle"]').val(presetCharts[$(this).val()].title); }); } - + $('div#addChartDialog').dialog({ width: 'auto', height: 'auto', @@ -491,7 +491,7 @@ $(function() { return false; }); - + $('a[href="#exportMonitorConfig"]').click(function() { var gridCopy = {}; @@ -501,15 +501,15 @@ $(function() { gridCopy[key].settings = elem.settings; gridCopy[key].title = elem.title; }); - + var exportData = { monitorCharts: gridCopy, monitorSettings: monitorSettings }; var $form; - + $('body').append($form = $('<form method="post" action="file_echo.php?' + url_query + '&filename=1" style="display:none;"></form>')); - + $form.append('<input type="hidden" name="monitorconfig" value="' + encodeURI($.toJSON(exportData)) + '">'); $form.submit(); $form.remove(); @@ -519,16 +519,16 @@ $(function() { $('div#emptyDialog').dialog({title: PMA_messages['strImportDialogTitle']}); $('div#emptyDialog').html(PMA_messages['strImportDialogMessage'] + ':<br/><form action="file_echo.php?' + url_query + '&import=1" method="post" enctype="multipart/form-data">' + '<input type="file" name="file"> <input type="hidden" name="import" value="1"> </form>'); - + var dlgBtns = {}; - + dlgBtns[PMA_messages['strImport']] = function() { var $iframe, $form; $('body').append($iframe = $('<iframe id="monitorConfigUpload" style="display:none;"></iframe>')); var d = $iframe[0].contentWindow.document; d.open(); d.close(); mew = d; - + $iframe.load(function() { var json; @@ -542,14 +542,14 @@ $(function() { $('div#emptyDialog').dialog('close'); return; } - + // Basic check, is this a monitor config json? if (!json || ! json.monitorCharts || ! json.monitorCharts) { alert(PMA_messages['strFailedParsingConfig']); $('div#emptyDialog').dialog('close'); return; } - + // If json ok, try applying config try { window.localStorage['monitorCharts'] = $.toJSON(json.monitorCharts); @@ -562,20 +562,20 @@ $(function() { window.localStorage.removeItem('monitorSettings'); rebuildGrid(); } - + $('div#emptyDialog').dialog('close'); }); - + $("body", d).append($form = $('div#emptyDialog').find('form')); $form.submit(); $('div#emptyDialog').append('<img class="ajaxIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">'); }; - + dlgBtns[PMA_messages['strCancel']] = function() { $(this).dialog('close'); }; - - + + $('div#emptyDialog').dialog({ width: 'auto', height: 'auto', @@ -604,7 +604,7 @@ $(function() { } return false; }); - + $('a[href="#monitorInstructionsDialog"]').click(function() { var $dialog = $('div#monitorInstructionsDialog'); @@ -656,7 +656,7 @@ $(function() { + $.sprintf(PMA_messages['strSmallerLongQueryTimeAdvice'], logVars['long_query_time']) + '<br />'; } - + if (logVars['long_query_time'] < 2) { str += PMA_getImage('s_success.png') + ' ' + $.sprintf(PMA_messages['strLongQueryTimeSet'], logVars['long_query_time']) @@ -675,7 +675,7 @@ $(function() { if (logVars['log_output'] == 'TABLE') { varValue = 'FILE'; } - + str += '- <a class="set" href="#log_output-' + varValue + '">' + $.sprintf(PMA_messages['strSetLogOutput'], varValue) + ' </a><br />'; @@ -729,8 +729,8 @@ $(function() { } ); }; - - + + loadLogVars(); return false; @@ -739,7 +739,7 @@ $(function() { $('input[name="chartType"]').change(function() { $('#chartVariableSettings').toggle(this.checked && this.value == 'variable'); var title = $('input[name="chartTitle"]').val(); - if (title == PMA_messages['strChartTitle'] + if (title == PMA_messages['strChartTitle'] || title == $('label[for="' + $('input[name="chartTitle"]').data('lastRadio') + '"]').text() ) { $('input[name="chartTitle"]') @@ -788,7 +788,7 @@ $(function() { if ($('input#variableInput').val() == "") { return false; } - + if (newChart == null) { $('#seriesPreview').html(''); @@ -864,11 +864,11 @@ $(function() { var dlgBtns = {}; dlgBtns[PMA_messages['strClose']] = function() { $(this).dialog('close'); }; - $('div#emptyDialog').dialog({ + $('div#emptyDialog').dialog({ width: 400, - buttons: dlgBtns + buttons: dlgBtns }); - } + } } if (runtime.charts == null) { @@ -893,13 +893,13 @@ $(function() { /* Calculate how much spacing there is between each chart */ $('table#chartGrid').html('<tr><td></td><td></td></tr><tr><td></td><td></td></tr>'); chartSpacing = { - width: $('table#chartGrid td:nth-child(2)').offset().left + width: $('table#chartGrid td:nth-child(2)').offset().left - $('table#chartGrid td:nth-child(1)').offset().left, - height: $('table#chartGrid tr:nth-child(2) td:nth-child(2)').offset().top + height: $('table#chartGrid tr:nth-child(2) td:nth-child(2)').offset().top - $('table#chartGrid tr:nth-child(1) td:nth-child(1)').offset().top }; $('table#chartGrid').html(''); - + /* Add all charts - in correct order */ var keys = []; $.each(runtime.charts, function(key, value) { @@ -918,11 +918,11 @@ $(function() { // Empty cells should keep their size so you can drop onto them $('table#chartGrid tr td').css('width', chartSize().width + 'px'); - + buildRequiredDataList(); refreshChartGrid(); } - + /* Destroys all monitor related resources */ function destroyGrid() { if (runtime.charts) { @@ -932,22 +932,22 @@ $(function() { } catch(err) {} }); } - + try { runtime.refreshRequest.abort(); } catch(err) {} - try { + try { clearTimeout(runtime.refreshTimeout); } catch(err) {} - + $('table#chartGrid').html(''); runtime.charts = null; runtime.chartAI = 0; monitorSettings = null; } - - /* Calls destroyGrid() and initGrid(), but before doing so it saves the chart + + /* Calls destroyGrid() and initGrid(), but before doing so it saves the chart * data from each chart and restores it after the monitor is initialized again */ function rebuildGrid() { var oldData = null; @@ -961,10 +961,10 @@ $(function() { } }); } - + destroyGrid(); initGrid(); - + if (oldData) { $.each(runtime.charts, function(key, chartObj) { for (var j = 0, l = chartObj.nodes.length; j < l; j++) { @@ -973,7 +973,7 @@ $(function() { } } }); - } + } } /* Calculactes the dynamic chart size that depends on the column width */ @@ -1019,12 +1019,12 @@ $(function() { loadLog('slow'); $(this).dialog("close"); }; - + dlgBtns[PMA_messages['strFromGeneralLog']] = function() { loadLog('general'); $(this).dialog("close"); }; - + function loadLog(type) { var dateStart = Date.parse($('#logAnalyseDialog input[name="dateStart"]').prop('value')) || min; var dateEnd = Date.parse($('#logAnalyseDialog input[name="dateEnd"]').prop('value')) || max; @@ -1037,7 +1037,7 @@ $(function() { limitTypes: $('input#limitTypes').prop('checked') }); } - + $('#logAnalyseDialog').dialog({ width: 'auto', height: 'auto', @@ -1095,7 +1095,7 @@ $(function() { chartObj.chart = PMA_createChart(settings); chartObj.numPoints = 0; - + if (initialize != true) { runtime.charts['c' + runtime.chartAI] = chartObj; buildRequiredDataList(); @@ -1113,7 +1113,7 @@ $(function() { if (! htmlnode ) { return; } - + var chart = null; var chartKey = null; $.each(runtime.charts, function(key, value) { @@ -1123,7 +1123,7 @@ $(function() { return false; } }); - + if (chart == null) { return; } @@ -1133,19 +1133,19 @@ $(function() { for (var i = 0; i<chart.nodes.length; i++) { htmlStr += '<li><i>' + chart.nodes[i].dataPoints[0].name + ': </i><br/><input type="text" name="chartSerie-' + i + '" value="' + chart.nodes[i].name + '" /></li>'; } - + dlgBtns = {}; dlgBtns[PMA_messages['strSave']] = function() { runtime.charts[chartKey].title = $('div#emptyDialog input[name="chartTitle"]').val(); runtime.charts[chartKey].chart.setTitle({ text: runtime.charts[chartKey].title }); - + $('div#emptyDialog input[name*="chartSerie"]').each(function() { var $t = $(this); var idx = $t.attr('name').split('-')[1]; runtime.charts[chartKey].nodes[idx].name = $t.val(); runtime.charts[chartKey].chart.series[idx].name = $t.val(); }); - + $(this).dialog('close'); saveMonitor(); }; @@ -1161,14 +1161,14 @@ $(function() { buttons: dlgBtns }); } - + /* Removes a chart from the grid */ function removeChart(chartObj) { var htmlnode = chartObj.options.chart.renderTo; if (! htmlnode ) { return; } - + $.each(runtime.charts, function(key, value) { if (value.chart.options.chart.renderTo == htmlnode) { delete runtime.charts[key]; @@ -1192,10 +1192,10 @@ $(function() { function refreshChartGrid() { /* Send to server */ runtime.refreshRequest = $.post('server_status.php?' + url_query, { - ajax_request: true, - chart_data: 1, - type: 'chartgrid', - requiredData: $.toJSON(runtime.dataList) + ajax_request: true, + chart_data: 1, + type: 'chartgrid', + requiredData: $.toJSON(runtime.dataList) }, function(data) { var chartData; try { @@ -1205,7 +1205,7 @@ $(function() { } var value, i = 0; var diff; - + /* Update values in each graph */ $.each(runtime.charts, function(orderKey, elem) { var key = elem.chartID; @@ -1230,7 +1230,7 @@ $(function() { elem.chart.xAxis[0].setExtremes(runtime.xmin, runtime.xmax, false); /* Calculate y value */ - + // If transform function given, use it if (elem.nodes[j].transformFn) { value = chartValueTransform( @@ -1246,7 +1246,7 @@ $(function() { value = parseFloat(chartData[key][j][0].value); if (elem.nodes[j].display == 'differential') { - if (oldChartData == null || oldChartData[key] == null) { + if (oldChartData == null || oldChartData[key] == null) { continue; } value -= oldChartData[key][j][0].value; @@ -1256,7 +1256,7 @@ $(function() { value = value / elem.nodes[j].valueDivisor; } } - + // Set y value, if defined if (value != undefined) { elem.chart.series[j].addPoint( @@ -1280,9 +1280,9 @@ $(function() { runtime.refreshTimeout = setTimeout(refreshChartGrid, monitorSettings.gridRefresh); }); } - + /* Function that supplies special value transform functions for chart values */ - function chartValueTransform(name, cur, prev) { + function chartValueTransform(name, cur, prev) { switch(name) { case 'cpu-linux': if (prev == null) { @@ -1323,7 +1323,7 @@ $(function() { */ function buildRequiredDataList() { runtime.dataList = {}; - // Store an own id, because the property name is subject of reordering, + // Store an own id, because the property name is subject of reordering, // thus destroying our mapping with runtime.charts <=> runtime.dataList var chartID = 0; $.each(runtime.charts, function(key, chart) { @@ -1347,10 +1347,10 @@ $(function() { if (! opts.limitTypes) { opts.limitTypes = false; } - + $('#emptyDialog').dialog({title: PMA_messages['strAnalysingLogsTitle']}); - $('#emptyDialog').html(PMA_messages['strAnalysingLogs'] + - ' <img class="ajaxIcon" src="' + pmaThemeImage + + $('#emptyDialog').html(PMA_messages['strAnalysingLogs'] + + ' <img class="ajaxIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">'); var dlgBtns = {}; @@ -1378,14 +1378,14 @@ $(function() { removeVariables: opts.removeVariables, limitTypes: opts.limitTypes }, - function(data) { + function(data) { var logData; try { logData = $.parseJSON(data); } catch(err) { return serverResponseError(); } - + if (logData.rows.length != 0) { runtime.logDataCols = buildLogTable(logData); @@ -1434,26 +1434,26 @@ $(function() { $(this).dialog("close"); $(document).scrollTop($('div#logTable').offset().top); }; - + $('#emptyDialog').dialog( "option", "buttons", dlgBtns); - + } else { $('#emptyDialog').dialog({title: PMA_messages['strNoDataFoundTitle']}); $('#emptyDialog').html('<p>' + PMA_messages['strNoDataFound'] + '</p>'); - + var dlgBtns = {}; - dlgBtns[PMA_messages['strClose']] = function() { - $(this).dialog("close"); + dlgBtns[PMA_messages['strClose']] = function() { + $(this).dialog("close"); }; - + $('#emptyDialog').dialog( "option", "buttons", dlgBtns ); } } ); - /* Handles the actions performed when the user uses any of the log table filters + /* Handles the actions performed when the user uses any of the log table filters * which are the filter by name and grouping with ignoring data in WHERE clauses - * + * * @param boolean Should be true when the users enabled or disabled to group queries ignoring data in WHERE clauses */ function filterQueries(varFilterChange) { @@ -1465,7 +1465,7 @@ $(function() { } else { textFilter = new RegExp(val, 'i'); } - + var rowSum = 0, totalSum = 0, i = 0, q; var noVars = $('div#logTable input#noWHEREData').prop('checked'); var equalsFilter = /([^=]+)=(\d+|((\'|"|).*?[^\\])\4((\s+)|$))/gi; @@ -1476,7 +1476,7 @@ $(function() { var sumColumnName = runtime.logDataCols[runtime.logDataCols.length - 1]; var isSlowLog = opts.src == 'slow'; var columnSums = {}; - + // For the slow log we have to count many columns (query_time, lock_time, rows_examined, rows_sent, etc.) var countRow = function(query, row) { var cells = row.match(/<td>(.*?)<\/td>/gi); @@ -1491,16 +1491,16 @@ $(function() { columnSums[query][2] += parseInt(cells[4].replace(/(<td>|<\/td>)/gi, '')); columnSums[query][3] += parseInt(cells[5].replace(/(<td>|<\/td>)/gi, '')); }; - + // We just assume the sql text is always in the second last column, and that the total count is right of it $('div#logTable table tbody tr td:nth-child(' + (runtime.logDataCols.length - 1) + ')').each(function() { var $t = $(this); - // If query is a SELECT and user enabled or disabled to group queries ignoring data in where statements, we + // If query is a SELECT and user enabled or disabled to group queries ignoring data in where statements, we // need to re-calculate the sums of each row if (varFilterChange && $t.html().match(/^SELECT/i)) { if (noVars) { // Group on => Sum up identical columns, and hide all but 1 - + q = $t.text().replace(equalsFilter, '$1=...$6').trim(); q = q.replace(functionFilter, ' $1(...)'); @@ -1562,7 +1562,7 @@ $(function() { hide = false; i++; }); - + // We finished summarizing counts => Update count values of all grouped entries if (varFilterChange) { if (noVars) { @@ -1571,11 +1571,11 @@ $(function() { if (filteredQueries[key] <= 1) { return; } - + row = $table.children('tr:nth-child(' + (value + 1) + ')'); numCol = row.children(':nth-child(' + (runtime.logDataCols.length) + ')'); numCol.text(filteredQueries[key]); - + if (isSlowLog) { row.children('td:nth-child(3)').text(secToTime(columnSums[key][0])); row.children('td:nth-child(4)').text(secToTime(columnSums[key][1])); @@ -1584,9 +1584,9 @@ $(function() { } }); } - - $('div#logTable table').trigger("update"); - setTimeout(function() { + + $('div#logTable table').trigger("update"); + setTimeout(function() { $('div#logTable table').trigger('sorton', [[[runtime.logDataCols.length - 1, 1]]]); }, 0); } @@ -1604,14 +1604,14 @@ $(function() { var time = timeStr.split(':'); return parseInt(time[0]*3600) + parseInt(time[1]*60) + parseInt(time[2]); } - + /* Turns a number into a timespan (100 into 00:01:40) */ function secToTime(timeInt) { var hours = Math.floor(timeInt / 3600); timeInt -= hours*3600; var minutes = Math.floor(timeInt / 60); timeInt -= minutes*60; - + if (hours < 10) { hours = '0' + hours; } @@ -1621,10 +1621,10 @@ $(function() { if (timeInt < 10) { timeInt = '0' + timeInt; } - + return hours + ':' + minutes + ':' + timeInt; } - + /* Constructs the log table out of the retrieved server data */ function buildLogTable(data) { var rows = data.rows; @@ -1641,7 +1641,7 @@ $(function() { } return value; }; - + for (var i = 0, l = rows.length; i < l; i++) { if (i == 0) { $.each(rows[0], function(key, value) { @@ -1706,7 +1706,7 @@ $(function() { return cols; } - + /* Opens the query analyzer dialog */ function openQueryAnalyzer() { var rowData = $(this).parent().data('query'); @@ -1726,11 +1726,11 @@ $(function() { var profilingChart = null; var dlgBtns = {}; - - dlgBtns[PMA_messages['strAnalyzeQuery']] = function() { - loadQueryAnalysis(rowData); + + dlgBtns[PMA_messages['strAnalyzeQuery']] = function() { + loadQueryAnalysis(rowData); }; - dlgBtns[PMA_messages['strClose']] = function() { + dlgBtns[PMA_messages['strClose']] = function() { if (profilingChart != null) { profilingChart.destroy(); } @@ -1751,13 +1751,13 @@ $(function() { buttons: dlgBtns }); } - + /* Loads and displays the analyzed query data */ function loadQueryAnalysis(rowData) { var db = rowData.db || ''; - + $('div#queryAnalyzerDialog div.placeHolder').html( - PMA_messages['strAnalyzing'] + ' <img class="ajaxIcon" src="' + + PMA_messages['strAnalyzing'] + ' <img class="ajaxIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">'); $.post('server_status.php?' + url_query, { @@ -1777,7 +1777,7 @@ $(function() { // Float sux, I'll use table :( $('div#queryAnalyzerDialog div.placeHolder') .html('<table width="100%" border="0"><tr><td class="explain"></td><td class="chart"></td></tr></table>'); - + var explain = '<b>' + PMA_messages['strExplainOutput'] + '</b> ' + explain_docu; if (data.explain.length > 1) { explain += ' ('; @@ -1794,7 +1794,7 @@ $(function() { explain += '<div class="explain-' + i + '"' + (i>0? 'style="display:none;"' : '' ) + '>'; $.each(data.explain[i], function(key, value) { value = (value == null)?'null':value; - + if (key == 'type' && value.toLowerCase() == 'all') { value = '<span class="attention">' + value + '</span>'; } @@ -1805,17 +1805,17 @@ $(function() { }); explain += '</div>'; } - + explain += '<p><b>' + PMA_messages['strAffectedRows'] + '</b> ' + data.affectedRows; $('div#queryAnalyzerDialog div.placeHolder td.explain').append(explain); - + $('div#queryAnalyzerDialog div.placeHolder a[href*="#showExplain"]').click(function() { var id = $(this).attr('href').split('-')[1]; $(this).parent().find('div[class*="explain"]').hide(); $(this).parent().find('div[class*="explain-' + id + '"]').show(); }); - + if (data.profiling) { var chartData = []; var numberTable = '<table class="queryNums"><thead><tr><th>' + PMA_messages['strStatus'] + '</th><th>' + PMA_messages['strTime'] + '</th></tr></thead><tbody>'; @@ -1831,12 +1831,12 @@ $(function() { } numberTable += '<tr><td><b>' + PMA_messages['strTotalTime'] + '</b></td><td>' + PMA_prettyProfilingNum(totalTime, 2) + '</td></tr>'; numberTable += '</tbody></table>'; - + $('div#queryAnalyzerDialog div.placeHolder td.chart').append( '<b>' + PMA_messages['strProfilingResults'] + ' ' + profiling_docu + '</b> ' + '(<a href="#showNums">' + PMA_messages['strTable'] + '</a>, <a href="#showChart">' + PMA_messages['strChart'] + '</a>)<br/>' + numberTable + ' <div id="queryProfiling"></div>'); - + $('div#queryAnalyzerDialog div.placeHolder a[href="#showNums"]').click(function() { $('div#queryAnalyzerDialog div#queryProfiling').hide(); $('div#queryAnalyzerDialog table.queryNums').show(); diff --git a/js/server_synchronize.js b/js/server_synchronize.js index 922cfd05f5..adbd450b01 100644 --- a/js/server_synchronize.js +++ b/js/server_synchronize.js @@ -1,6 +1,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * for server_synchronize.php + * for server_synchronize.php * */ @@ -247,13 +247,13 @@ function ApplySelectedChanges(token) /** - * Validates a partial form (source part or target part) + * Validates a partial form (source part or target part) * - * @param which 'src' or 'trg' - * @return boolean whether the partial form is valid + * @param which 'src' or 'trg' + * @return boolean whether the partial form is valid * */ -function validateSourceOrTarget(which) +function validateSourceOrTarget(which) { var partial_form_is_ok = true; @@ -264,20 +264,20 @@ function validateSourceOrTarget(which) || $("input[name='" + which + "_db']").val() == '' // must have at least a host or a socket || ($("input[name='" + which + "_host']").val() == '' - && $("input[name='" + which + "_socket']").val() == '') + && $("input[name='" + which + "_socket']").val() == '') // port can be empty ) { - partial_form_is_ok = false; + partial_form_is_ok = false; } } return partial_form_is_ok; -} +} /** * Displays an error message if any text field * is left empty other than the port field, unless * we are dealing with the "current connection" choice * -* @return boolean whether the form is valid +* @return boolean whether the form is valid */ function validateConnectionParams() { diff --git a/js/server_variables.js b/js/server_variables.js index f81266d003..3fcfc58833 100644 --- a/js/server_variables.js +++ b/js/server_variables.js @@ -26,7 +26,7 @@ $(function() { // Filter options are invisible for disabled js users $('fieldset#tableFilter').css('display',''); - + $('#filterText').keyup(function(e) { if ($(this).val().length == 0) { textFilter=null; @@ -43,7 +43,7 @@ $(function() { $('#filterText').val(name).trigger('keyup'); } } - + /* Table width limiting */ $('table.data').after($tmpDiv=$('<span>'+testString+'</span>')); charWidth = $tmpDiv.width() / testString.length; @@ -51,9 +51,9 @@ $(function() { $(window).resize(limitTableWidth); limitTableWidth(); - - /* This function chops of long variable values to keep the table from overflowing horizontally - * It does so by taking a test string and calculating an average font width and removing 'excess width / average font width' + + /* This function chops of long variable values to keep the table from overflowing horizontally + * It does so by taking a test string and calculating an average font width and removing 'excess width / average font width' * chars, so it is not very accurate. */ function limitTableWidth() { @@ -96,12 +96,12 @@ $(function() { }); } } - + /* Filters the rows by the user given regexp */ function filterVariables() { var mark_next = false, firstCell; odd_row = false; - + $('table.filteredData tbody tr').each(function() { firstCell = $(this).children(':first'); @@ -128,7 +128,7 @@ $(function() { /** - * Event handler for sqlqueryform.ajax button_submit_query + * Event handler for sqlqueryform.ajax button_submit_query * * @memberOf jQuery */ @@ -136,12 +136,12 @@ $(function() { var $form = $(this).closest("form"); // the Go button related to query submission was clicked, // instead of the one related to Bookmarks, so empty the - // id_bookmark selector to avoid misinterpretation in + // id_bookmark selector to avoid misinterpretation in // import.php about what needs to be done $form.find("select[name=id_bookmark]").val(""); // let normal event propagation happen }); - + /** * Event handler for hitting enter on sqlqueryform bookmark_variable * (the Variable textfield in Bookmarked SQL query section) @@ -154,8 +154,8 @@ $(function() { if (keycode == 13) { // keycode for enter key // When you press enter in the sqlqueryform, which // has 2 submit buttons, the default is to run the - // #button_submit_query, because of the tabindex - // attribute. + // #button_submit_query, because of the tabindex + // attribute. // This submits #button_submit_bookmark instead, // because when you are in the Bookmarked SQL query // section and hit enter, you expect it to do the diff --git a/js/tbl_change.js b/js/tbl_change.js index 0f57135598..bd473085fb 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -255,7 +255,7 @@ $(function() { * Uncheck the null checkbox as geometry data is placed on the input field */ $("input[name='gis_data[save]']").live('click', function(event) { - var input_name = $('form#gis_data_editor_form').find("input[name='input_name']").val(); + var input_name = $('form#gis_data_editor_form').find("input[name='input_name']").val(); var $null_checkbox = $("input[name='" + input_name + "']").parents('tr').find('.checkbox_null'); $null_checkbox.prop('checked', false); }); @@ -282,7 +282,7 @@ $(function() { /** * Reset the auto_increment column to 0 when selecting any of the - * insert options in submit_type-dropdown. Only perform the reset + * insert options in submit_type-dropdown. Only perform the reset * when we are in edit-mode, and not in insert-mode(no previous value * available). */ diff --git a/js/tbl_chart.js b/js/tbl_chart.js index 85909505d7..4c89d6ba49 100644 --- a/js/tbl_chart.js +++ b/js/tbl_chart.js @@ -265,7 +265,7 @@ function PMA_queryChart(data, passedSettings) }; if (passedSettings.chart.type == 'pie') { - settings.tooltip.formatter = function() { + settings.tooltip.formatter = function() { return '<b>' + columnNames[0] + '</b><br/>' + this.y; }; } diff --git a/js/tbl_gis_visualization.js b/js/tbl_gis_visualization.js index 2d2109bf8d..6ddc14d5ee 100644 --- a/js/tbl_gis_visualization.js +++ b/js/tbl_gis_visualization.js @@ -176,7 +176,7 @@ $(function() { if ($('table.gis_table').length > 0) { initGISVisualization(); } - + $('#choice').live('click', function() { if ($(this).prop('checked') == false) { $('#placeholder').show(); @@ -186,7 +186,7 @@ $(function() { $('#openlayersmap').show(); } }); - + $('#placeholder').live('mousewheel', function(event, delta) { if (delta > 0) { //zoom in diff --git a/js/tbl_select.js b/js/tbl_select.js index 74eb6ff6e1..bd50a10733 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -14,7 +14,7 @@ */ $(function() { /** - * Prepare a div containing a link, otherwise it's incorrectly displayed + * Prepare a div containing a link, otherwise it's incorrectly displayed * after a couple of clicks */ $('<div id="togglesearchformdiv"><a id="togglesearchformlink"></a></div>') @@ -38,7 +38,7 @@ $(function() { /** * Ajax event handler for Table Search - * + * * (see $GLOBALS['cfg']['AjaxEnable']) */ $("#tbl_search_form.ajax").live('submit', function(event) { @@ -60,13 +60,13 @@ $(function() { $("#sqlqueryresults").trigger('makegrid'); $('#tbl_search_form') // workaround for bug #3168569 - Issue on toggling the "Hide search criteria" in chrome. - .slideToggle() + .slideToggle() .hide(); $('#togglesearchformlink') // always start with the Show message .text(PMA_messages['strShowSearchCriteria']); $('#togglesearchformdiv') - // now it's time to show the div containing the link + // now it's time to show the div containing the link .show(); // needed for the display options slider in the results PMA_init_slider(); @@ -141,7 +141,7 @@ $(function() { } else { $editorSpan.hide(); } - + }); $('span.open_search_gis_editor').live('click', function(event) { diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index 516c0cb77a..a5db1c1562 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -349,7 +349,7 @@ $(function() { newSeries[0].marker = { symbol: 'circle' }; - //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. + //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. //Code includes a lot of checks so as to replot only when necessary if (xChange) { xCord[currentData] = selectedRow[xLabel]; @@ -357,7 +357,7 @@ $(function() { currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] }); currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6, Array.max(xCord) + 6); } else if (xType == 'time') { - currentChart.series[0].data[currentData].update({ + currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel], $('#types_0').val()) }); } else { @@ -370,20 +370,20 @@ $(function() { $.each(data, function(key, value) { if (yType != 'text') { - newSeries[0].data.push({ - name: value[dataLabel], - x: tempX[0][i], - y: value[yLabel], - marker: {fillColor: colorCodes[i % 8]}, - id: i + newSeries[0].data.push({ + name: value[dataLabel], + x: tempX[0][i], + y: value[yLabel], + marker: {fillColor: colorCodes[i % 8]}, + id: i }); } else { - newSeries[0].data.push({ - name: value[dataLabel], - x: tempX[0][i], - y: tempY[0][i], - marker: {fillColor: colorCodes[i % 8]}, - id: i + newSeries[0].data.push({ + name: value[dataLabel], + x: tempX[0][i], + y: tempY[0][i], + marker: {fillColor: colorCodes[i % 8]}, + id: i }); } i++; @@ -408,7 +408,7 @@ $(function() { currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] }); currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6, Array.max(yCord) + 6); } else if (yType == 'time') { - currentChart.series[0].data[currentData].update({ + currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel], $('#types_1').val()) }); } else { @@ -421,20 +421,20 @@ $(function() { $.each(data, function(key, value) { if (xType != 'text' ) { - newSeries[0].data.push({ - name: value[dataLabel], - x: value[xLabel], - y: tempY[0][i], - marker: {fillColor: colorCodes[i % 8]}, - id: i + newSeries[0].data.push({ + name: value[dataLabel], + x: value[xLabel], + y: tempY[0][i], + marker: {fillColor: colorCodes[i % 8]}, + id: i }); } else { - newSeries[0].data.push({ - name: value[dataLabel], - x: tempX[0][i], - y: tempY[0][i], - marker: {fillColor: colorCodes[i % 8]}, - id: i + newSeries[0].data.push({ + name: value[dataLabel], + x: tempX[0][i], + y: tempY[0][i], + marker: {fillColor: colorCodes[i % 8]}, + id: i }); } i++; @@ -685,12 +685,12 @@ $(function() { $.each(data, function(key, value) { var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel], $('#types_0').val()); var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel], $('#types_1').val()); - series[0].data.push({ - name: value[dataLabel], - x: xVal, - y: yVal, - marker: {fillColor: colorCodes[it % 8]}, - id: it + series[0].data.push({ + name: value[dataLabel], + x: xVal, + y: yVal, + marker: {fillColor: colorCodes[it % 8]}, + id: it }); xCord.push(value[xLabel]); yCord.push(value[yLabel]); @@ -722,12 +722,12 @@ $(function() { tempX = getCord(xCord); $.each(data, function(key, value) { var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel], $('#types_1').val()); - series[0].data.push({ - name: value[dataLabel], - x: tempX[0][it], - y: yVal, - marker: {fillColor: colorCodes[it % 8]}, - id: it + series[0].data.push({ + name: value[dataLabel], + x: tempX[0][it], + y: yVal, + marker: {fillColor: colorCodes[it % 8]}, + id: it }); it++; }); @@ -761,12 +761,12 @@ $(function() { tempY = getCord(yCord); $.each(data, function(key, value) { var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel], $('#types_0').val()); - series[0].data.push({ - name: value[dataLabel], - y: tempY[0][it], - x: xVal, - marker: {fillColor: colorCodes[it % 8]}, - id: it + series[0].data.push({ + name: value[dataLabel], + y: tempY[0][it], + x: xVal, + marker: {fillColor: colorCodes[it % 8]}, + id: it }); it++; }); @@ -799,12 +799,12 @@ $(function() { tempX = getCord(xCord); tempY = getCord(yCord); $.each(data, function(key, value) { - series[0].data.push({ - name: value[dataLabel], - x: tempX[0][it], - y: tempY[0][it], - marker: {fillColor: colorCodes[it % 8]}, - id: it + series[0].data.push({ + name: value[dataLabel], + x: tempX[0][it], + y: tempY[0][it], + marker: {fillColor: colorCodes[it % 8]}, + id: it }); it++; }); diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 55b0a0882e..10f7634c12 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -818,7 +818,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $GLOBALS['PMA_Config']->setCookie('pma_lang', $GLOBALS['lang']); if (isset($GLOBALS['collation_connection'])) { $GLOBALS['PMA_Config']->setCookie( - 'pma_collation_connection', + 'pma_collation_connection', $GLOBALS['collation_connection']); } diff --git a/libraries/config.values.php b/libraries/config.values.php index 8273055e97..b1b90e7a12 100644 --- a/libraries/config.values.php +++ b/libraries/config.values.php @@ -73,7 +73,7 @@ $cfg_db['QueryWindowDefTab'] = array( 'history', // SQL history 'full'); // All (SQL and SQL history) $cfg_db['InitialSlidersState'] = array( - 'open' => __('Open'), + 'open' => __('Open'), 'closed' => __('Closed'), 'disabled' => __('Disabled')); $cfg_db['Import']['format'] = array( diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index 144c9b1c2d..1e9e98a140 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -79,7 +79,7 @@ function PMA_import_uploadprogressCheck() */ function PMA_import_sessionCheck() { - if (PMA_PHP_INT_VERSION < 50400 + if (PMA_PHP_INT_VERSION < 50400 || ! ini_get('session.upload_progress.enabled') || ! function_exists('curl_exec')) { return false; diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 04c0a48082..09010a3db7 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1041,7 +1041,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') { echo ' vbottom'; } - echo '" data-column="' . htmlspecialchars($fields_meta[$i]->name) . '">' + echo '" data-column="' . htmlspecialchars($fields_meta[$i]->name) . '">' . $order_link . $comments . '</th>'; } $vertical_display['desc'][] = ' <th ' @@ -2787,7 +2787,7 @@ function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $m { global $db; - + $result = ' class="' . PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_truncated, $transform_function, $default_function) . '">'; if (isset($analyzed_sql[0]['select_expr']) && is_array($analyzed_sql[0]['select_expr'])) { @@ -2866,12 +2866,12 @@ function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $m } else { $result .= ($transform_function != $default_function ? $transform_function($data, $transform_options, $meta) : $transform_function($data, array(), $meta)); } - + // create hidden field if results from structure table if (isset($_GET['browse_distinct']) && ($_GET['browse_distinct'] == 1)) { - + $where_comparison = " = '" . $data . "'"; - + $_url_params_for_show_data_row = array( 'db' => $db, 'table' => $meta->orgtable, @@ -2881,11 +2881,11 @@ function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $m . ' WHERE ' . PMA_backquote($meta->orgname) . $where_comparison, ); - + $result .= '<input type="hidden" class="data_browse_link" value="' . PMA_generate_common_url($_url_params_for_show_data_row). '" />'; - + } - + $result .= '</td>' . "\n"; return $result; diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php index 00a3b5b628..dce4e8bf96 100644 --- a/libraries/export/mediawiki.php +++ b/libraries/export/mediawiki.php @@ -170,7 +170,7 @@ if (isset($plugin_list)) { * @param string $table table name * @param string $crlf the end of line sequence * @param string $error_url the url to go back in case of error - * + * * @param bool $relation whether to include relation comments * @param bool $comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated @@ -187,15 +187,15 @@ if (isset($plugin_list)) { * @access public */ function PMA_exportStructure( - $db, - $table, - $crlf, - $error_url, - $relation = false, - $comments = false, - $mime = false, - $dates = false, - $export_mode, + $db, + $table, + $crlf, + $error_url, + $relation = false, + $comments = false, + $mime = false, + $dates = false, + $export_mode, $export_type ) { switch($export_mode) { @@ -211,7 +211,7 @@ if (isset($plugin_list)) { ); // Begin the table construction - $output .= "{| class=\"wikitable\" style=\"text-align:center;\"" + $output .= "{| class=\"wikitable\" style=\"text-align:center;\"" . PMA_exportCRLF(); // Add the table name @@ -274,10 +274,10 @@ if (isset($plugin_list)) { * @access public */ function PMA_exportData( - $db, - $table, - $crlf, - $error_url, + $db, + $table, + $crlf, + $error_url, $sql_query ) { // Print data comment @@ -286,7 +286,7 @@ if (isset($plugin_list)) { // Begin the table construction // Use the "wikitable" class for style // Use the "sortable" class for allowing tables to be sorted by column - $output .= "{| class=\"wikitable sortable\" style=\"text-align:center;\"" + $output .= "{| class=\"wikitable sortable\" style=\"text-align:center;\"" . PMA_exportCRLF(); // Add the table name diff --git a/libraries/header.inc.php b/libraries/header.inc.php index f3b24026a4..c6160eee07 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -57,7 +57,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { include_once './libraries/header_http.inc.php'; include_once './libraries/header_meta_style.inc.php'; include_once './libraries/header_scripts.inc.php'; - + /* remove vertical scroll bar bug in ie */ ?> <!--[if IE 6]> <style type="text/css"> diff --git a/libraries/import/upload/session.php b/libraries/import/upload/session.php index 50e2cf6dcf..e6ee0dc8e3 100644 --- a/libraries/import/upload/session.php +++ b/libraries/import/upload/session.php @@ -45,7 +45,7 @@ function PMA_getUploadStatus($id) $status = false; $sessionkey = ini_get('session.upload_progress.prefix') . $id; - + if (isset($_SESSION[$sessionkey])) { $status = $_SESSION[$sessionkey]; } diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 91d416cab0..5f9b7334b4 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -308,10 +308,10 @@ if (!empty($submit_mult) && !empty($what)) { </fieldset> <fieldset class="tblFooters"><?php // Display option to disable foreign key checks while dropping tables - if ($what == 'drop_tbl') { ?> + if ($what == 'drop_tbl') { ?> <div id="foreignkeychk"> <span class="fkc_switch"><?php echo __('Foreign key check:'); ?></span> - <span class="checkbox"><input type="checkbox" name="fk_check" value="1" id="fkc_checkbox"<?php + <span class="checkbox"><input type="checkbox" name="fk_check" value="1" id="fkc_checkbox"<?php $default_fk_check_value = (PMA_DBI_fetch_value('SHOW VARIABLES LIKE \'foreign_key_checks\';', 0, 1) == 'ON') ? 1 : 0; echo ($default_fk_check_value) ? ' checked=\"checked\"' : '' ?>/></span> <span id="fkc_status" class="fkc_switch"><?php echo ($default_fk_check_value) ? __('(Enabled)') : __('(Disabled)'); ?></span> @@ -504,7 +504,7 @@ if (!empty($submit_mult) && !empty($what)) { } $result = PMA_DBI_try_query($sql_query); if(!isset($_REQUEST['fk_check']) && $query_type == 'drop_tbl' && $default_fk_check_value) { - PMA_DBI_query('SET FOREIGN_KEY_CHECKS = 1;'); + PMA_DBI_query('SET FOREIGN_KEY_CHECKS = 1;'); } if ($result && !empty($sql_query_views)) { $sql_query .= ' ' . $sql_query_views . ';'; diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index 6a86e30116..aab0377654 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -10,7 +10,7 @@ * filenames or functions should not be used. * * Please provide a comment for your function, what it does and what parameters are available. - * + * * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { @@ -272,9 +272,9 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, /** * Replaces "[__BUFFER__]" occurences found in $options['string'] with the text - * in $buffer, after performing a regular expression search and replace on + * in $buffer, after performing a regular expression search and replace on * $buffer using $options['regex'] and $options['regex_replace']. - * + * * @param string $buffer text that will be replaced in $options['string'], * after being formatted * @param array $options the options required to format $buffer diff --git a/server_databases.php b/server_databases.php index b822e792e9..0b8b3dbd4e 100644 --- a/server_databases.php +++ b/server_databases.php @@ -90,7 +90,7 @@ if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type'])) $action = 'server_databases.php'; $submit_mult = 'drop_db'; $err_url = 'server_databases.php?' . PMA_generate_common_url(); - if (isset($_REQUEST['selected_dbs']) + if (isset($_REQUEST['selected_dbs']) && !isset($_REQUEST['is_js_confirmed'])) { $selected_db = $_REQUEST['selected_dbs']; } diff --git a/tbl_change.php b/tbl_change.php index aa71791995..a44dfc9e58 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -380,7 +380,7 @@ foreach ($rows as $row_id => $vrow) { $m_rows = $o_rows + 1; //store the default value for CharEditing $default_char_editing = $cfg['CharEditing']; - + $odd_row = true; for ($i = 0; $i < $fields_cnt; $i++) { if (! isset($table_fields[$i]['processed'])) { @@ -594,7 +594,7 @@ foreach ($rows as $row_id => $vrow) { $special_chars_encoded = PMA_duplicateFirstNewline($special_chars); // this will select the UNHEX function while inserting if (($field['is_binary'] || ($field['is_blob'] && ! $cfg['ProtectBinary'])) - && (isset($_SESSION['tmp_user_values']['display_binary_as_hex']) + && (isset($_SESSION['tmp_user_values']['display_binary_as_hex']) && $_SESSION['tmp_user_values']['display_binary_as_hex']) && $cfg['ShowFunctionFields'] ) { @@ -960,8 +960,8 @@ foreach ($rows as $row_id => $vrow) { * This case happens for CHAR or VARCHAR columns which have * a size larger than the maximum size for input field. */ - $cfg['CharEditing'] = 'textarea'; - } + $cfg['CharEditing'] = 'textarea'; + } } else { /** * This case happens for example for INT or DATE columns; diff --git a/tbl_chart.php b/tbl_chart.php index 01d32f3f5d..7002405007 100644 --- a/tbl_chart.php +++ b/tbl_chart.php @@ -101,7 +101,7 @@ url_query = '<?php echo $url_query;?>'; <label for="select_chartXAxis"><?php echo __('X-Axis:'); ?></label> <select name="chartXAxis" id="select_chartXAxis"> <?php - + foreach ($keys as $idx => $key) { if ($yaxis == -1 && (($idx == count($data[0]) - 1) || preg_match("/(date|time)/i", $key))) { echo '<option value="' . htmlspecialchars($idx) . '" selected="selected">' . htmlspecialchars($key) . '</option>'; @@ -110,7 +110,7 @@ url_query = '<?php echo $url_query;?>'; echo '<option value="' . htmlspecialchars($idx) . '">' . htmlspecialchars($key) . '</option>'; } } - + ?> </select><br /> <label for="select_chartSeries"><?php echo __('Series:'); ?></label> @@ -125,7 +125,7 @@ url_query = '<?php echo $url_query;?>'; <?php } ?> - + </div> <div style="float:left; padding-left:40px;"> <label for="xaxis_label"><?php echo __('X-Axis label:'); ?></label> diff --git a/tbl_select.php b/tbl_select.php index a793580228..507bd963c7 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -39,7 +39,7 @@ $post_params = array( 'names', 'order', 'orderField', - 'param', + 'param', 'session_max_rows', 'table', 'types', diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 0c72b1640a..b886267e38 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -99,8 +99,8 @@ if (isset($_REQUEST['change_tbl_info']) && $_REQUEST['change_tbl_info'] == true) $key = array_search($field, $fields_list); $extra_data['field_type'] = $fields_type[$key]; $extra_data['field_collation'] = $fields_collation[$key]; - - // HTML for operators + + // HTML for operators $html = '<select name="zoomFunc[]">'; if (strncasecmp($fields_type[$key], 'enum', 4) == 0) { foreach ($GLOBALS['cfg']['EnumOperators'] as $fc) { diff --git a/test/classes/PMA_Theme_test.php b/test/classes/PMA_Theme_test.php index ef7ef786a6..38a2f68e22 100644 --- a/test/classes/PMA_Theme_test.php +++ b/test/classes/PMA_Theme_test.php @@ -83,7 +83,7 @@ class PMA_ThemeTest extends PHPUnit_Framework_TestCase $prevConfPath = $GLOBALS['cfg']['ThemePath']; $GLOBALS['cfg']['ThemePath'] = 'nowhere'; $this->object->setPath('path/to/nowhere'); - + $this->object->checkImgPath(); } diff --git a/test/libraries/common/PMA_whichCrlf_test.php b/test/libraries/common/PMA_whichCrlf_test.php index ce12717755..d635a43a4f 100644 --- a/test/libraries/common/PMA_whichCrlf_test.php +++ b/test/libraries/common/PMA_whichCrlf_test.php @@ -15,7 +15,7 @@ require_once 'libraries/common.lib.php'; class PMA_whichCrlf_test extends PHPUnit_Framework_TestCase { - + /** * @using runkit pecl extension * if not define PMA_USR_OS, then define it as Win |