diff --git a/db_tracking.php b/db_tracking.php index df1106e83b..29d8cc85b1 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -67,9 +67,9 @@ require_once './libraries/db_links.inc.php'; $all_tables_query = ' SELECT table_name, MAX(version) as version FROM ' . PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . '.' . PMA_backquote($GLOBALS['cfg']['Server']['tracking']) . - ' WHERE ' . PMA_backquote('db_name') . ' = \'' . PMA_sqlAddSlashes($_REQUEST['db']) . '\' ' . - ' GROUP BY '. PMA_backquote('table_name') . - ' ORDER BY '. PMA_backquote('table_name') .' ASC'; + ' WHERE db_name = \'' . PMA_sqlAddSlashes($_REQUEST['db']) . '\' ' . + ' GROUP BY table_name' . + ' ORDER BY table_name ASC'; $all_tables_result = PMA_query_as_controluser($all_tables_query); diff --git a/js/functions.js b/js/functions.js index 58ad805911..d1c554436c 100644 --- a/js/functions.js +++ b/js/functions.js @@ -902,26 +902,6 @@ function goToUrl(selObj, goToLocation) eval("document.location.href = '" + goToLocation + "pos=" + selObj.options[selObj.selectedIndex].value + "'"); } -/** - * getElement - */ -function getElement(e,f) -{ - if(document.layers){ - f=(f)?f:self; - if(f.document.layers[e]) { - return f.document.layers[e]; - } - for(W=0;W") + var $temp_div = $("
") $temp_div.html(data.error); - $error = $temp_div.find("code").addClass("error"); + var $error = $temp_div.find("code").addClass("error"); PMA_ajaxShowMessage($error); } }) // end $.post() @@ -2023,7 +2003,7 @@ $(document).ready(function() { **/ $("#copyTable.ajax input[name='submit_copy']").live('click', function(event) { event.preventDefault(); - $form = $("#copyTable"); + var $form = $("#copyTable"); if($form.find("input[name='switch_to_new']").attr('checked')) { $form.append(''); $form.removeClass('ajax'); @@ -2052,15 +2032,53 @@ $(document).ready(function() { window.parent.frame_navigation.location.reload(); } } else { - $temp_div = $("
") + var $temp_div = $("
"); $temp_div.html(data.error); - $error = $temp_div.find("code").addClass("error"); + var $error = $temp_div.find("code").addClass("error"); PMA_ajaxShowMessage($error); } }) // end $.post() } });//end of copyTable ajax submit + /** + *Ajax events for actions in the "Table maintenance" + **/ + $("#tbl_maintenance.ajax li a.maintain_action").live('click', function(event) { + event.preventDefault(); + var $link = $(this); + var href = $link.attr("href"); + href = href.split('?'); + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } + if ($("#result_query").length != 0) { + $("#result_query").remove(); + } + //variables which stores the common attributes + $.post(href[0], href[1]+"&ajax_request=true", function(data) { + if (data.success == undefined) { + var $temp_div = $("
"); + $temp_div.html(data); + var $success = $temp_div.find("#result_query .success"); + PMA_ajaxShowMessage($success); + $("
").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data); + PMA_init_slider(); + $("#sqlqueryresults").children("fieldset").remove(); + } else if (data.success == true ) { + PMA_ajaxShowMessage(data.message); + $("
").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data.sql_query); + } else { + var $temp_div = $("
"); + $temp_div.html(data.error); + var $error = $temp_div.find("code").addClass("error"); + PMA_ajaxShowMessage($error); + } + }) // end $.post() + });//end of table maintanance ajax click + }, 'top.frame_content'); //end $(document).ready for 'Table operations' @@ -2983,7 +3001,7 @@ $(document).ready(function() { $("#drop_tbl_anchor").live('click', function(event) { event.preventDefault(); - //context is top.frame_content, so we need to use window.parent.db to access the db var + //context is top.frame_content, so we need to use window.parent.table to access the table var /** * @var question String containing the question to be asked for confirmation */ @@ -3011,10 +3029,10 @@ $(document).ready(function() { * @see $cfg['AjaxEnable'] */ $(document).ready(function() { - $("#truncate_tbl_anchor").live('click', function(event) { + $("#truncate_tbl_anchor.ajax").live('click', function(event) { event.preventDefault(); - //context is top.frame_content, so we need to use window.parent.db to access the db var + //context is top.frame_content, so we need to use window.parent.table to access the table var /** * @var question String containing the question to be asked for confirmation */ @@ -3024,13 +3042,26 @@ $(document).ready(function() { PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function(data) { - //Database deleted successfully, refresh both the frames - window.parent.refreshNavigation(); - window.parent.refreshMain(); + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } + if ($("#result_query").length != 0) { + $("#result_query").remove(); + } + if (data.success == true) { + PMA_ajaxShowMessage(data.message); + $("
").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data.sql_query); + } else { + var $temp_div = $("
") + $temp_div.html(data.error); + var $error = $temp_div.find("code").addClass("error"); + PMA_ajaxShowMessage($error); + } }) // end $.get() }); // end $.PMA_confirm() - }); //end of Drop Table Ajax action -}) // end of $(document).ready() for Drop Table + }); //end of Truncate Table Ajax action +}) // end of $(document).ready() for Truncate Table /** * Attach CodeMirror2 editor to SQL edit area. diff --git a/js/makegrid.js b/js/makegrid.js index 91fa8a50b4..1fd07c1309 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -19,22 +19,22 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi * Constant ***********/ minColWidth: 15, - - + + /*********** * Variables, assigned with default value, changed later ***********/ actionSpan: 5, // number of colspan in Actions header in a table tableCreateTime: null, // table creation time, used for saving column order and visibility to server, only available in "Browse tab" - + // Column reordering variables colOrder: new Array(), // array of column order - + // Column visibility variables colVisib: new Array(), // array of column visibility showAllColText: '', // string, text for "show all" button under column visibility list visibleHeadersCount: 0, // number of visible data headers - + // Table hint variables qtip: null, // qtip API reorderHint: '', // string, hint for column reordering @@ -45,7 +45,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi showSortHint: false, showMarkHint: false, showColVisibHint: false, - + // Grid editing isCellEditActive: false, // true if current focus is in edit cell isEditCellTextEditable: false, // true if current edit cell is editable in the text input box (not textarea) @@ -60,14 +60,14 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi lastXHR : null, // last XHR object used in AJAX request isSaving: false, // true when currently saving edited data, used to handle double posting caused by pressing ENTER in grid edit text box in Chrome browser alertNonUnique: '', // string, alert shown when saving edited nonunique table - + // Common hidden inputs token: null, server: null, db: null, table: null, - - + + /************ * Functions ************/ @@ -93,7 +93,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.hideEditCell(); } }, - + /** * Start to reorder column. Called when clicking on table header. * @@ -113,10 +113,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $(g.cPointer).css({ top: objPos.top }); - + // get the column index, zero-based var n = g.getHeaderIdx(obj); - + g.colReorder = { x0: e.pageX, y0: e.pageY, @@ -133,7 +133,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.hideEditCell(); } }, - + /** * Handle mousemove event when dragging. * @@ -151,7 +151,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $(g.cCpy) .css('left', g.colReorder.objLeft + dx) .show(); - + // pointer animation var hoveredCol = g.getHoveredCol(e); if (hoveredCol) { @@ -175,7 +175,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } } }, - + /** * Stop the dragging action. * @@ -191,7 +191,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi var n = g.colRsz.n; // do the resizing g.resize(n, nw); - + g.reposRsz(); g.reposDrop(); g.colRsz = false; @@ -210,7 +210,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } g.refreshRestoreButton(); } - + // animate new column position $(g.cCpy).stop(true, true) .animate({ @@ -225,7 +225,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $('body').css('cursor', 'inherit'); $('body').noSelect(false); }, - + /** * Resize column n to new width "nw" * @@ -239,7 +239,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi .css('width', nw); }); }, - + /** * Reposition column resize bars. */ @@ -254,7 +254,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } $(g.cRsz).css('height', $(g.t).height()); }, - + /** * Shift column from index oldn to newn. * @@ -277,7 +277,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi }); // reposition the column resize bars g.reposRsz(); - + // adjust the column visibility list if (newn < oldn) { $(g.cList).find('.lDiv div:eq(' + newn + ')') @@ -297,7 +297,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.colVisib.splice(newn, 0, tmp); } }, - + /** * Find currently hovered table column's header (excluding actions column). * @@ -316,7 +316,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi }); return hoveredCol; }, - + /** * Get a zero-based index from a tag in a table. * @@ -326,7 +326,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi getHeaderIdx: function(obj) { return $(obj).parents('tr').find('th.draggable').index(obj); }, - + /** * Reposition the columns back to normal order. */ @@ -348,7 +348,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } g.refreshRestoreButton(); }, - + /** * Send column preferences (column order and visibility) to the server. */ @@ -379,7 +379,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi }); } }, - + /** * Refresh restore button state. * Make restore button disabled if the table is similar with initial state. @@ -402,7 +402,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $('.restore_column').show(); } }, - + /** * Update current hint using the boolean values (showReorderHint, showSortHint, etc.). * It will hide the hint if all the boolean values is false. @@ -429,23 +429,23 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi text += text.length > 0 ? '
' : ''; text += g.colVisibHint; } - + // hide the hint if no text and the event is mouseenter g.qtip.disable(!text && e.type == 'mouseenter'); - + g.qtip.updateContent(text, false); } else { g.hideHint(); } }, - + hideHint: function() { if (g.qtip) { g.qtip.hide(); g.qtip.disable(true); } }, - + /** * Toggle column's visibility. * After calling this function and it returns true, afterToggleCol() must be called. @@ -479,7 +479,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } return true; }, - + /** * This must be called if toggleCol() returns is true. * @@ -491,12 +491,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.reposRsz(); g.reposDrop(); g.sendColPrefs(); - + // check visible first row headers count g.visibleHeadersCount = $(g.t).find('tr:first th.draggable:visible').length; g.refreshRestoreButton(); }, - + /** * Show columns' visibility list. * @@ -518,7 +518,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $(obj).addClass('coldrop-hover'); } }, - + /** * Hide columns' visibility list. */ @@ -526,7 +526,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $(g.cList).hide(); $(g.cDrop).find('.coldrop-hover').removeClass('coldrop-hover'); }, - + /** * Reposition the column visibility drop-down arrow. */ @@ -541,7 +541,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi }); } }, - + /** * Show all hidden columns. */ @@ -553,7 +553,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } g.afterToggleCol(); }, - + /** * Show edit cell, if it can be shown * @@ -570,7 +570,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi // reposition the cEdit element $(g.cEdit).css({ top: $cell.position().top, - left: $cell.position().left, + left: $cell.position().left }) .show() .find('input') @@ -582,7 +582,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi var value = $cell.is(':not(.null)') ? PMA_getCellValue(cell) : ''; $(g.cEdit).find('input') .val(value); - + g.currentEditCell = cell; $(g.cEdit).find('input[type=text]').focus(); $(g.cEdit).find('*').removeAttr('disabled'); @@ -593,7 +593,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } } }, - + /** * Remove edit cell and the edit area, if it is shown. * @@ -609,13 +609,13 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.saveOrPostEditedCell(); return; } - + // cancel any previous request if (g.lastXHR != null) { g.lastXHR.abort(); g.lastXHR = null; } - + if (data) { if (g.currentEditCell) { // save value of currently edited cell // replace current edited field with the new value @@ -649,19 +649,19 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $this_field.find('span').html(value); }); } - + // refresh the grid g.reposRsz(); g.reposDrop(); } - + // hide the cell editing area $(g.cEdit).hide(); $(g.cEdit).find('input[type=text]').blur(); g.isCellEditActive = false; g.currentEditCell = null; }, - + /** * Show drop-down edit area when edit cell is focused. */ @@ -690,10 +690,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi * @var curr_value String current value of the field (for fields that are of type enum or set). */ var curr_value = $td.find('span').text(); - + // empty all edit area, then rebuild it based on $td classes $editArea.empty(); - + // add goto link, if this cell contains a link if ($td.find('a').length > 0) { var gotoLink = document.createElement('div'); @@ -702,7 +702,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi .append($td.find('a').clone()); $editArea.append(gotoLink); } - + g.wasEditedCellNull = false; if ($td.is(':not(.not_null)')) { // append a null checkbox @@ -713,7 +713,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $checkbox.attr('checked', true); g.wasEditedCellNull = true; } - + // if the select/editor is changed un-check the 'checkbox_null__'. if ($td.is('.enum, .set')) { $editArea.find('select').live('change', function(e) { @@ -734,7 +734,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $checkbox.attr('checked', false); }) } - + // if 'checkbox_null__' is clicked empty the corresponding select/editor. $checkbox.click(function(e) { if ($td.is('.enum')) { @@ -755,7 +755,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $(g.cEdit).find('input[type=text]').val(''); }) } - + if($td.is('.relation')) { /** @lends jQuery */ //handle relations @@ -763,7 +763,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi // initialize the original data $td.data('original_data', null); - + /** * @var post_params Object containing parameters for the POST request */ @@ -787,11 +787,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $td.data('original_data', value); // update the text input field, in case where the "Relational display column" is checked $(g.cEdit).find('input[type=text]').val(value); - + $editArea.append(data.dropdown); $editArea.append('
' + g.cellEditHint + '
'); }) // end $.post() - + $editArea.find('select').live('change', function(e) { $(g.cEdit).find('input[type=text]').val($(this).val()); }) @@ -820,7 +820,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $editArea.append(data.dropdown); $editArea.append('
' + g.cellEditHint + '
'); }) // end $.post() - + $editArea.find('select').live('change', function(e) { $(g.cEdit).find('input[type=text]').val($(this).val()); }) @@ -850,7 +850,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $editArea.append(data.select); $editArea.append('
' + g.cellEditHint + '
'); }) // end $.post() - + $editArea.find('select').live('change', function(e) { $(g.cEdit).find('input[type=text]').val($(this).val()); }) @@ -879,7 +879,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi * @var sql_query String containing the SQL query used to retrieve value of truncated/transformed data */ var sql_query = 'SELECT `' + field_name + '` FROM `' + g.table + '` WHERE ' + PMA_urldecode(where_clause); - + // Make the Ajax call and get the data, wrap it and insert it g.lastXHR = $.post('sql.php', { 'token' : g.token, @@ -896,7 +896,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi // get the truncated data length g.maxTruncatedLen = $(g.currentEditCell).text().length - 3; } - + $td.data('original_data', data.value); $(g.cEdit).find('input[type=text]').val(data.value); $editArea.append(''); @@ -925,11 +925,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $editArea.append('
' + g.cellEditHint + '
'); g.isEditCellTextEditable = true; } - + $editArea.show(); } }, - + /** * Post the content of edited cell. */ @@ -938,7 +938,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi return; } g.isSaving = true; - + /** * @var relation_fields Array containing the name/value pairs of relational fields */ @@ -981,19 +981,19 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi var me_fields_name = Array(); var me_fields = Array(); var me_fields_null = Array(); - + // alert user if edited table is not unique if (!is_unique) { alert(g.alertNonUnique); } - + // loop each edited row $('.to_be_saved').parents('tr').each(function() { var $tr = $(this); var where_clause = $tr.find('.where_clause').val(); full_where_clause.push(PMA_urldecode(where_clause)); var condition_array = jQuery.parseJSON($tr.find('.condition_array').val()); - + /** * multi edit variables, for current row * @TODO array indices are still not correct, they should be md5 of field's name @@ -1008,7 +1008,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi * @var $this_field Object referring to the td that is being edited */ var $this_field = $(this); - + /** * @var field_name String containing the name of this field. * @see getFieldName() @@ -1024,21 +1024,21 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi transformation_fields = true; } this_field_params[field_name] = $this_field.data('value'); - + /** * @var is_null String capturing whether 'checkbox_null__' is checked. */ var is_null = this_field_params[field_name] === null; - + fields_name.push(field_name); - + if (is_null) { fields_null.push('on'); fields.push(''); } else { fields_null.push(''); fields.push($this_field.data('value')); - + var cell_index = $this_field.index('.to_be_saved'); if($this_field.is(":not(.relation, .enum, .set, .bit)")) { if($this_field.is('.transformed')) { @@ -1060,9 +1060,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } } } - + }); // end of loop for every edited cells in a row - + // save new_clause var new_clause = ''; for (var field in condition_array) { @@ -1073,16 +1073,16 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $tr.data('new_clause', new_clause); // save condition_array $tr.find('.condition_array').val(JSON.stringify(condition_array)); - + me_fields_name.push(fields_name); me_fields.push(fields); me_fields_null.push(fields_null); - + }); // end of loop for every edited rows - + rel_fields_list = $.param(relation_fields); transform_fields_list = $.param(transform_fields); - + // Make the Ajax post after setting all parameters /** * @var post_params Object containing parameters for the POST request @@ -1105,7 +1105,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi 'goto' : 'sql.php', 'submit_type' : 'save' }; - + if (!g.saveCellsAtOnce) { $(g.cEdit).find('*').attr('disabled', 'disabled'); var $editArea = $(g.cEdit).find('.edit_area'); @@ -1114,7 +1114,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $('.save_edited').addClass('saving_edited_data') .find('input').attr('disabled', 'disabled'); // disable the save button } - + $.ajax({ type: 'POST', url: 'tbl_replace.php', @@ -1138,7 +1138,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi var old_clause = $where_clause.attr('value'); var decoded_old_clause = PMA_urldecode(old_clause); var decoded_new_clause = PMA_urldecode(new_clause); - + $where_clause.attr('value', new_clause); // update Edit, Copy, and Delete links also $(this).parent('tr').find('a').each(function() { @@ -1158,7 +1158,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi var $checkbox = $(this); var checkbox_name = $checkbox.attr('name'); var checkbox_value = $checkbox.attr('value'); - + $checkbox.attr('name', checkbox_name.replace(old_clause, new_clause)); $checkbox.attr('value', checkbox_value.replace(decoded_old_clause, decoded_new_clause)); }); @@ -1171,7 +1171,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $('#sqlqueryresults').prepend(data.sql_query); } g.hideEditCell(true, data); - + // remove the "Save edited cells" button $('.save_edited').hide(); // update saved fields @@ -1179,7 +1179,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi .removeClass('to_be_saved') .data('value', null) .data('original_data', null); - + g.isCellEdited = false; } else { PMA_ajaxShowMessage(data.error); @@ -1187,7 +1187,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } }) // end $.ajax() }, - + /** * Save edited cell, so it can be posted later. */ @@ -1251,7 +1251,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi need_to_post = true; } } - + if (need_to_post) { $(g.currentEditCell).addClass('to_be_saved') .data('value', this_field_params[field_name]); @@ -1260,10 +1260,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } g.isCellEdited = true; } - + return need_to_post; }, - + /** * Save or post currently edited cell, depending on the "saveCellsAtOnce" configuration. */ @@ -1283,7 +1283,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } } }, - + /** * Initialize column resize feature. */ @@ -1291,10 +1291,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi // create column resizer div g.cRsz = document.createElement('div'); g.cRsz.className = 'cRsz'; - + // get data columns in the first row of the table var $firstRowCols = $(g.t).find('tr:first th.draggable'); - + // create column borders $firstRowCols.each(function() { var cb = document.createElement('div'); // column border @@ -1305,32 +1305,32 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $(g.cRsz).append(cb); }); g.reposRsz(); - + // attach to global div $(g.gDiv).prepend(g.cRsz); }, - + /** * Initialize column reordering feature. */ initColReorder: function() { g.cCpy = document.createElement('div'); // column copy, to store copy of dragged column header g.cPointer = document.createElement('div'); // column pointer, used when reordering column - + // adjust g.cCpy g.cCpy.className = 'cCpy'; $(g.cCpy).hide(); - + // adjust g.cPointer g.cPointer.className = 'cPointer'; $(g.cPointer).css('visibility', 'hidden'); // set visibility to hidden instead of calling hide() to force browsers to cache the image in cPointer class - + // assign column reordering hint g.reorderHint = PMA_messages['strColOrderHint']; - + // get data columns in the first row of the table var $firstRowCols = $(g.t).find('tr:first th.draggable'); - + // initialize column order $col_order = $('#col_order'); // check if column order is passed from PHP if ($col_order.length > 0) { @@ -1344,7 +1344,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.colOrder.push(i); } } - + // register events $(t).find('th.draggable') .mousedown(function(e) { @@ -1367,41 +1367,41 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $('.restore_column').click(function() { g.restoreColOrder(); }); - + // attach to global div $(g.gDiv).append(g.cPointer); $(g.gDiv).append(g.cCpy); - + // prevent default "dragstart" event when dragging a link $(t).find('th a').bind('dragstart', function() { return false; }); - + // refresh the restore column button state g.refreshRestoreButton(); }, - + /** * Initialize column visibility feature. */ initColVisib: function() { g.cDrop = document.createElement('div'); // column drop-down arrows g.cList = document.createElement('div'); // column visibility list - + // adjust g.cDrop g.cDrop.className = 'cDrop'; - + // adjust g.cList g.cList.className = 'cList'; $(g.cList).hide(); - + // assign column visibility related hints g.colVisibHint = PMA_messages['strColVisibHint']; g.showAllColText = PMA_messages['strShowAllCol']; - + // get data columns in the first row of the table var $firstRowCols = $(g.t).find('tr:first th.draggable'); - + // initialize column visibility $col_visib = $('#col_visib'); // check if column visibility is passed from PHP if ($col_visib.length > 0) { @@ -1415,15 +1415,15 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.colVisib.push(1); } } - + // get data columns in the first row of the table var $firstRowCols = $(t).find('tr:first th.draggable'); - + // make sure we have more than one column if ($firstRowCols.length > 1) { var $colVisibTh = $(g.t).find('th:not(.draggable)'); PMA_createqTip($colVisibTh); - + // create column visibility drop-down arrow(s) $colVisibTh.each(function() { var $th = $(this); @@ -1445,7 +1445,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi .mouseleave(function(e) { g.showColVisibHint = false; }); - + // add column visibility control g.cList.innerHTML = '
'; var $listDiv = $(g.cList).find('div'); @@ -1479,41 +1479,41 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi }); } } - + // hide column visibility list if we move outside the list $(t).find('td, th.draggable').mouseenter(function() { g.hideColList(); }); - + // attach to global div $(g.gDiv).append(g.cDrop); $(g.gDiv).append(g.cList); - + // some adjustment g.reposDrop(); }, - + /** * Initialize grid editing feature. */ initGridEdit: function() { // create cell edit wrapper element g.cEdit = document.createElement('div'); - + // adjust g.cEdit g.cEdit.className = 'cEdit'; $(g.cEdit).html('
'); $(g.cEdit).hide(); - + // assign cell editing hint g.cellEditHint = PMA_messages['strCellEditHint']; g.saveCellWarning = PMA_messages['strSaveCellWarning']; g.alertNonUnique = PMA_messages['strAlertNonUnique']; g.gotoLinkText = PMA_messages['strGoToLink']; - + // initialize cell editing configuration g.saveCellsAtOnce = $('#save_cells_at_once').val(); - + // register events $(t).find('td.data') .click(function(e) { @@ -1567,60 +1567,60 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi return g.saveCellWarning; } }); - + // attach to global div $(g.gDiv).append(g.cEdit); - + // add hint for grid editing feature when hovering "Edit" link in each table row PMA_createqTip($(g.t).find('.edit_row_anchor a'), PMA_messages['strGridEditFeatureHint']); } } - + /****************** * Initialize grid ******************/ - + // wrap all data cells, except actions cell, with span $(t).find('th, td:not(:has(span))') .wrapInner(''); - + // create grid elements g.gDiv = document.createElement('div'); // create global div - + // initialize the table variable g.t = t; - + // get data columns in the first row of the table var $firstRowCols = $(t).find('tr:first th.draggable'); - + // initialize visible headers count g.visibleHeadersCount = $firstRowCols.filter(':visible').length; - + // assign first column (actions) span if (! $(t).find('tr:first th:first').hasClass('draggable')) { // action header exist g.actionSpan = $(t).find('tr:first th:first').prop('colspan'); } else { g.actionSpan = 0; } - + // assign table create time // #table_create_time will only available if we are in "Browse" tab g.tableCreateTime = $('#table_create_time').val(); - + // assign the hints g.sortHint = PMA_messages['strSortHint']; g.markHint = PMA_messages['strColMarkHint']; - + // assign common hidden inputs var $common_hidden_inputs = $('.common_hidden_inputs'); g.token = $common_hidden_inputs.find('input[name=token]').val(); g.server = $common_hidden_inputs.find('input[name=server]').val(); g.db = $common_hidden_inputs.find('input[name=db]').val(); g.table = $common_hidden_inputs.find('input[name=table]').val(); - + // add table class $(t).addClass('pma_table'); - + // link the global div $(t).before(g.gDiv); $(g.gDiv).append(t); @@ -1646,10 +1646,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi { g.initGridEdit(); } - + // create qtip for each with draggable class PMA_createqTip($(t).find('th.draggable')); - + // register events for hint tooltip $(t).find('th.draggable a') .attr('title', '') // hide default tooltip for sorting @@ -1677,7 +1677,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.dragEnd(e); }); } - + // bind event to update currently hovered qtip API $(t).find('th') .mouseenter(function(e) { @@ -1687,7 +1687,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi .mouseleave(function(e) { g.updateHint(e); }); - + // some adjustment $(t).removeClass('data'); $(g.gDiv).addClass('data'); diff --git a/js/server_status.js b/js/server_status.js index 870f9b1205..bcb25b8f90 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -15,6 +15,9 @@ // Add a tablesorter parser to properly handle thousands seperated numbers and SI prefixes $(function() { + // Show all javascript related parts of the page + $('.jsfeature').show(); + jQuery.tablesorter.addParser({ id: "fancyNumber", is: function(s) { @@ -110,7 +113,7 @@ $(function() { menuResize(); // Load Server status monitor if (ui.tab.hash == '#statustabs_charting' && ! monitorLoaded) { - $('div#statustabs_charting').append( + $('div#statustabs_charting').append( //PMA_messages['strLoadingMonitor'] + ' ' + '' ); @@ -144,9 +147,6 @@ $(function() { tabStatus[$(this).attr('id')] = 'static'; }); - // Display button links - $('div.buttonlinks').show(); - // Handles refresh rate changing $('.buttonlinks select').change(function() { var chart = tabChart[$(this).parents('div.ui-tabs-panel').attr('id')]; diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index c0cdf74de9..14832f0d18 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1869,4 +1869,9 @@ $(function() { $('a[href="#clearMonitorConfig"]').show(); } +}); + +// Run the monitor once loaded +$(function() { + $('a[href="#pauseCharts"]').trigger('click'); }); \ No newline at end of file diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index b9c0d75364..796b543ba2 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -35,7 +35,7 @@ Array.min = function (array) { /** ** Checks if a string contains only numeric value - ** @param n: String (to be checked) + ** @param n: String (to be checked) **/ function isNumeric(n) { return !isNaN(parseFloat(n)) && isFinite(n); @@ -43,7 +43,7 @@ function isNumeric(n) { /** ** Checks if an object is empty - ** @param n: Object (to be checked) + ** @param n: Object (to be checked) **/ function isEmpty(obj) { var name; @@ -59,15 +59,15 @@ function isEmpty(obj) { ** @param type String Field type(datetime/timestamp/time/date) **/ function getDate(val,type) { - if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { - return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val) - } - else if(type.toString().search(/time/i) != -1) { + if (type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { + return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val) + } + else if (type.toString().search(/time/i) != -1) { return Highcharts.dateFormat('%H:%M:%S', val + 19800000) - } + } else if (type.toString().search(/date/i) != -1) { return Highcharts.dateFormat('%Y-%m-%e', val) - } + } } /** @@ -76,30 +76,30 @@ function getDate(val,type) { ** @param type Sring Field type(datetime/timestamp/time/date) **/ function getTimeStamp(val,type) { - if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { - return getDateFromFormat(val,'yyyy-MM-dd HH:mm:ss', val) - } - else if(type.toString().search(/time/i) != -1) { - return getDateFromFormat('1970-01-01 ' + val,'yyyy-MM-dd HH:mm:ss') - } + if (type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { + return getDateFromFormat(val,'yyyy-MM-dd HH:mm:ss', val) + } + else if (type.toString().search(/time/i) != -1) { + return getDateFromFormat('1970-01-01 ' + val,'yyyy-MM-dd HH:mm:ss') + } else if (type.toString().search(/date/i) != -1) { - return getDateFromFormat(val,'yyyy-MM-dd') - } + return getDateFromFormat(val,'yyyy-MM-dd') + } } /** ** Classifies the field type into numeric,timeseries or text ** @param field: field type (as in database structure) - **/ + **/ function getType(field) { - if(field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1) - return 'numeric'; - else if(field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1) - return 'time'; - else - return 'text'; + if (field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1) + return 'numeric'; + else if (field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1) + return 'time'; + else + return 'text'; } -/** +/** ** Converts a categorical array into numeric array ** @param array categorical values array **/ @@ -131,7 +131,7 @@ $(document).ready(function() { cache: 'false' }); - var cursorMode = ($("input[name='mode']:checked").val() == 'edit') ? 'crosshair' : 'pointer'; + var cursorMode = ($("input[name='mode']:checked").val() == 'edit') ? 'crosshair' : 'pointer'; var currentChart = null; var currentData = null; var xLabel = $('#tableid_0').val(); @@ -140,7 +140,7 @@ $(document).ready(function() { var yType = $('#types_1').val(); var dataLabel = $('#dataLabel').val(); - // Get query result + // Get query result var data = jQuery.parseJSON($('#querydata').html()); /** @@ -164,16 +164,16 @@ $(document).ready(function() { /** * Input form validation - **/ + **/ $('#inputFormSubmitId').click(function() { - if ($('#tableid_0').get(0).selectedIndex == 0 || $('#tableid_1').get(0).selectedIndex == 0) - PMA_ajaxShowMessage(PMA_messages['strInputNull']); - else if (xLabel == yLabel) + if ($('#tableid_0').get(0).selectedIndex == 0 || $('#tableid_1').get(0).selectedIndex == 0) + PMA_ajaxShowMessage(PMA_messages['strInputNull']); + else if (xLabel == yLabel) PMA_ajaxShowMessage(PMA_messages['strSameInputs']); }); /** - ** 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 **/ $('
') @@ -191,177 +191,177 @@ $(document).ready(function() { } else { $link.text(PMA_messages['strHideSearchCriteria']); } - // avoid default click action - return false; - }); - - /** + // avoid default click action + return false; + }); + + /** ** Set dialog properties for the data display form **/ $("#dataDisplay").dialog({ autoOpen: false, - title: 'Data point content', + title: 'Data point content', modal: false, //false otherwise other dialogues like timepicker may not function properly height: $('#dataDisplay').height() + 80, width: $('#dataDisplay').width() + 80 }); /* - * Handle submit of zoom_display_form + * Handle submit of zoom_display_form */ - + $("#submitForm").click(function(event) { - + //Prevent default submission of form event.preventDefault(); - - //Find changed values by comparing form values with selectedRow Object - var newValues = new Array();//Stores the values changed from original + + //Find changed values by comparing form values with selectedRow Object + var newValues = new Array();//Stores the values changed from original var it = 4; var xChange = false; var yChange = false; - for (key in selectedRow) { - if (key != 'where_clause'){ - var oldVal = selectedRow[key]; - var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val(); - if (oldVal != newVal){ - selectedRow[key] = newVal; - newValues[key] = newVal; - if(key == xLabel) { - xChange = true; - data[currentData][xLabel] = newVal; - } - else if(key == yLabel) { - yChange = true; - data[currentData][yLabel] = newVal; - } - } - } - it++ - }//End data update - - //Update the chart series and replot + for (key in selectedRow) { + if (key != 'where_clause'){ + var oldVal = selectedRow[key]; + var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val(); + if (oldVal != newVal){ + selectedRow[key] = newVal; + newValues[key] = newVal; + if (key == xLabel) { + xChange = true; + data[currentData][xLabel] = newVal; + } + else if (key == yLabel) { + yChange = true; + data[currentData][yLabel] = newVal; + } + } + } + it++ + }//End data update + + //Update the chart series and replot if (xChange || yChange) { - var newSeries = new Array(); - newSeries[0] = new Object(); + var newSeries = new Array(); + newSeries[0] = new Object(); newSeries[0].marker = { symbol: 'circle' }; - //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]; - if(xType == 'numeric') { - currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] }); - currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6,Array.max(xCord) + 6); + //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]; + if (xType == 'numeric') { + 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({ x : getTimeStamp(selectedRow[xLabel],$('#types_0').val())}); - } - else { - var tempX = getCord(xCord); - var tempY = getCord(yCord); - var i = 0; - newSeries[0].data = new Array(); - xCord = tempX[2]; - yCord = tempY[2]; + else if (xType == 'time') { + currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel],$('#types_0').val())}); + } + else { + var tempX = getCord(xCord); + var tempY = getCord(yCord); + var i = 0; + newSeries[0].data = new Array(); + xCord = tempX[2]; + yCord = tempY[2]; - $.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 } ); - else + $.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 } ); + else newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - i++; + i++; }); - currentSettings.xAxis.labels = { formatter : function() { - if(tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; + currentSettings.xAxis.labels = { formatter : function() { + if (tempX[1][this.value] && tempX[1][this.value].length > 10) + return tempX[1][this.value].substring(0,10) + else + return tempX[1][this.value]; } } - currentSettings.series = newSeries; + currentSettings.series = newSeries; currentChart = PMA_createChart(currentSettings); - } - - } - if(yChange) { - - yCord[currentData] = selectedRow[yLabel]; - if(yType == 'numeric') { - 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({ y : getTimeStamp(selectedRow[yLabel],$('#types_1').val())}); - } - else { - var tempX = getCord(xCord); - var tempY = getCord(yCord); - var i = 0; - newSeries[0].data = new Array(); - xCord = tempX[2]; - yCord = tempY[2]; - $.each(data,function(key,value) { - if(xType != 'text' ) + } + if (yChange) { + + yCord[currentData] = selectedRow[yLabel]; + if (yType == 'numeric') { + 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({ y : getTimeStamp(selectedRow[yLabel],$('#types_1').val())}); + } + else { + var tempX = getCord(xCord); + var tempY = getCord(yCord); + var i = 0; + newSeries[0].data = new Array(); + xCord = tempX[2]; + yCord = tempY[2]; + + $.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 } ); - else + else newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - i++; + i++; }); - currentSettings.yAxis.labels = { formatter : function() { - if(tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; + currentSettings.yAxis.labels = { formatter : function() { + if (tempY[1][this.value] && tempY[1][this.value].length > 10) + return tempY[1][this.value].substring(0,10) + else + return tempY[1][this.value]; } } - currentSettings.series = newSeries; - currentChart = PMA_createChart(currentSettings); - } - } - currentChart.series[0].data[currentData].select(); + currentSettings.series = newSeries; + currentChart = PMA_createChart(currentSettings); + } + } + currentChart.series[0].data[currentData].select(); } - //End plot update + //End plot update - //Generate SQL query for update - if (!isEmpty(newValues)) { + //Generate SQL query for update + if (!isEmpty(newValues)) { var sql_query = 'UPDATE `' + window.parent.table + '` SET '; - for (key in newValues) { - if(key != 'where_clause') { - sql_query += '`' + key + '`=' ; - var value = newValues[key]; - if(!isNumeric(value) && value != null) - sql_query += '\'' + value + '\' ,'; - else - sql_query += value + ' ,'; - } - } - sql_query = sql_query.substring(0, sql_query.length - 1); - sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']); - - //Post SQL query to sql.php - $.post('sql.php', { + for (key in newValues) { + if (key != 'where_clause') { + sql_query += '`' + key + '`=' ; + var value = newValues[key]; + if (!isNumeric(value) && value != null) + sql_query += '\'' + value + '\' ,'; + else + sql_query += value + ' ,'; + } + } + sql_query = sql_query.substring(0, sql_query.length - 1); + sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']); + + //Post SQL query to sql.php + $.post('sql.php', { 'token' : window.parent.token, 'db' : window.parent.db, 'ajax_request' : true, 'sql_query' : sql_query, - 'inline_edit' : false - }, function(data) { - if(data.success == true) { - $('#sqlqueryresults').html(data.sql_query); - $("#sqlqueryresults").trigger('appendAnchor'); - } - else - PMA_ajaxShowMessage(data.error); - })//End $.post - }//End database update - $("#dataDisplay").dialog("close"); - });//End submit handler + 'inline_edit' : false + }, function(data) { + if (data.success == true) { + $('#sqlqueryresults').html(data.sql_query); + $("#sqlqueryresults").trigger('appendAnchor'); + } + else + PMA_ajaxShowMessage(data.error); + })//End $.post + }//End database update + $("#dataDisplay").dialog("close"); + });//End submit handler /* * Generate plot using Highcharts - */ + */ if (data != null) { $('#zoom_search_form') @@ -369,87 +369,87 @@ $(document).ready(function() { .hide(); $('#togglesearchformlink') .text(PMA_messages['strShowSearchCriteria']) - $('#togglesearchformdiv').show(); + $('#togglesearchformdiv').show(); var selectedRow; - var columnNames = new Array(); - var colorCodes = ['#FF0000','#00FFFF','#0000FF','#0000A0','#FF0080','#800080','#FFFF00','#00FF00','#FF00FF']; - var series = new Array(); - var xCord = new Array(); - var yCord = new Array(); - var xCat = new Array(); - var yCat = new Array(); - var tempX, tempY; - var it = 0; + var columnNames = new Array(); + var colorCodes = ['#FF0000','#00FFFF','#0000FF','#0000A0','#FF0080','#800080','#FFFF00','#00FF00','#FF00FF']; + var series = new Array(); + var xCord = new Array(); + var yCord = new Array(); + var xCat = new Array(); + var yCat = new Array(); + var tempX, tempY; + var it = 0; // Set the basic plot settings var currentSettings = { chart: { - renderTo: 'querychart', - type: 'scatter', - zoomType: 'xy', - width:$('#resizer').width() -3, - height:$('#resizer').height()-20 - }, - credits: { - enabled: false + renderTo: 'querychart', + type: 'scatter', + zoomType: 'xy', + width:$('#resizer').width() -3, + height:$('#resizer').height()-20 }, - exporting: { enabled: false }, + credits: { + enabled: false + }, + exporting: { enabled: false }, label: { text: $('#dataLabel').val() }, - plotOptions: { - series: { - allowPointSelect: true, + plotOptions: { + series: { + allowPointSelect: true, cursor: 'pointer', - showInLegend: false, + showInLegend: false, dataLabels: { - enabled: false, + enabled: false }, - point: { + point: { events: { click: function() { - var id = this.id; - var fid = 4; - currentData = id; - // Make AJAX request to tbl_zoom_select.php for getting the complete row info - var post_params = { + var id = this.id; + var fid = 4; + currentData = id; + // Make AJAX request to tbl_zoom_select.php for getting the complete row info + var post_params = { 'ajax_request' : true, 'get_data_row' : true, 'db' : window.parent.db, 'table' : window.parent.table, 'where_clause' : data[id]['where_clause'], - 'token' : window.parent.token, + 'token' : window.parent.token } $.post('tbl_zoom_select.php', post_params, function(data) { - // Row is contained in data.row_info, now fill the displayResultForm with row values - for ( key in data.row_info) { - if (data.row_info[key] == null) - $('#fields_null_id_' + fid).attr('checked', true); - else - $('#fieldID_' + fid).val(data.row_info[key]); - fid++; - } - selectedRow = new Object(); - selectedRow = data.row_info; + // Row is contained in data.row_info, now fill the displayResultForm with row values + for ( key in data.row_info) { + if (data.row_info[key] == null) + $('#fields_null_id_' + fid).attr('checked', true); + else + $('#fieldID_' + fid).val(data.row_info[key]); + fid++; + } + selectedRow = new Object(); + selectedRow = data.row_info; }); - $("#dataDisplay").dialog("open"); - }, + $("#dataDisplay").dialog("open"); + } } - } - } - }, - tooltip: { - formatter: function() { - return this.point.name; - } - }, + } + } + }, + tooltip: { + formatter: function() { + return this.point.name; + } + }, title: { text: 'Query Results' }, - xAxis: { - title: { text: $('#tableid_0').val() }, + xAxis: { + title: { text: $('#tableid_0').val() } }, yAxis: { - min: null, - title: { text: $('#tableid_1').val() }, - }, + min: null, + title: { text: $('#tableid_1').val() } + } } $('#resizer').resizable({ @@ -461,145 +461,145 @@ $(document).ready(function() { ); } }); - - // Classify types as either numeric,time,text - xType = getType(xType); - yType = getType(yType); - //Set the axis type based on the field - currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear'; - currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear'; + // Classify types as either numeric,time,text + xType = getType(xType); + yType = getType(yType); + + //Set the axis type based on the field + currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear'; + currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear'; // Formulate series data for plot series[0] = new Object(); series[0].data = new Array(); - series[0].marker = { + series[0].marker = { symbol: 'circle' }; - if (xType != 'text' && yType != 'text') { - $.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()); + if (xType != 'text' && yType != 'text') { + $.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 } ); - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - it++; + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + it++; }); - if(xType == 'numeric') { - currentSettings.xAxis.max = Array.max(xCord) + 6 - currentSettings.xAxis.min = Array.min(xCord) - 6 - } - else { - currentSettings.xAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_0').val()); - }} + if (xType == 'numeric') { + currentSettings.xAxis.max = Array.max(xCord) + 6 + currentSettings.xAxis.min = Array.min(xCord) - 6 } - if(yType == 'numeric') { - currentSettings.yAxis.max = Array.max(yCord) + 6 - currentSettings.yAxis.min = Array.min(yCord) - 6 - } - else { - currentSettings.yAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_1').val()); - }} + else { + currentSettings.xAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_0').val()); + }} + } + if (yType == 'numeric') { + currentSettings.yAxis.max = Array.max(yCord) + 6 + currentSettings.yAxis.min = Array.min(yCord) - 6 + } + else { + currentSettings.yAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_1').val()); + }} } } - - else if (xType =='text' && yType !='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - - tempX = getCord(xCord); - $.each(data,function(key,value) { - var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); + + else if (xType =='text' && yType !='text') { + $.each(data,function(key,value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + + 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 } ); - it++; + it++; }); - - currentSettings.xAxis.labels = { formatter : function() { - if(tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; - } + + currentSettings.xAxis.labels = { formatter : function() { + if (tempX[1][this.value] && tempX[1][this.value].length > 10) + return tempX[1][this.value].substring(0,10) + else + return tempX[1][this.value]; + } } - if(yType == 'numeric') { - currentSettings.yAxis.max = Array.max(yCord) + 6 - currentSettings.yAxis.min = Array.min(yCord) - 6 - } - else { - currentSettings.yAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_1').val()); - }} + if (yType == 'numeric') { + currentSettings.yAxis.max = Array.max(yCord) + 6 + currentSettings.yAxis.min = Array.min(yCord) - 6 } - xCord = tempX[2]; - } - - else if (xType !='text' && yType =='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - tempY = getCord(yCord); - $.each(data,function(key,value) { - var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); + else { + currentSettings.yAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_1').val()); + }} + } + xCord = tempX[2]; + } + + else if (xType !='text' && yType =='text') { + $.each(data,function(key,value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + 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 } ); - it++; + it++; }); - if(xType == 'numeric') { - currentSettings.xAxis.max = Array.max(xCord) + 6 - currentSettings.xAxis.min = Array.min(xCord) - 6 - } - else { - currentSettings.xAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_0').val()); - }} + if (xType == 'numeric') { + currentSettings.xAxis.max = Array.max(xCord) + 6 + currentSettings.xAxis.min = Array.min(xCord) - 6 } - currentSettings.yAxis.labels = { formatter : function() { - if(tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; - } + else { + currentSettings.xAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_0').val()); + }} } - yCord = tempY[2]; - } - - else if (xType =='text' && yType =='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - tempX = getCord(xCord); - tempY = getCord(yCord); - $.each(data,function(key,value) { + currentSettings.yAxis.labels = { formatter : function() { + if (tempY[1][this.value] && tempY[1][this.value].length > 10) + return tempY[1][this.value].substring(0,10) + else + return tempY[1][this.value]; + } + } + yCord = tempY[2]; + } + + else if (xType =='text' && yType =='text') { + $.each(data,function(key,value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + 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 } ); - it++; + it++; }); - currentSettings.xAxis.labels = { formatter : function() { - if(tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; - } - } - currentSettings.yAxis.labels = { formatter : function() { - if(tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; - } - } - xCord = tempX[2]; - yCord = tempY[2]; + currentSettings.xAxis.labels = { formatter : function() { + if (tempX[1][this.value] && tempX[1][this.value].length > 10) { + return tempX[1][this.value].substring(0,10) + } else { + return tempX[1][this.value]; + } + }}; + currentSettings.yAxis.labels = { formatter : function() { + if (tempY[1][this.value] && tempY[1][this.value].length > 10) { + return tempY[1][this.value].substring(0,10); + } else { + return tempY[1][this.value]; + } + }}; + xCord = tempX[2]; + yCord = tempY[2]; - } + } - currentSettings.series = series; + currentSettings.series = series; currentChart = PMA_createChart(currentSettings); - scrollToChart(); + scrollToChart(); } }); diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php index bf4fd41b73..26696bd340 100644 --- a/libraries/Advisor.class.php +++ b/libraries/Advisor.class.php @@ -85,6 +85,9 @@ class Advisor /** * Escapes percent string to be used in format string. + * + * @param string $str + * @return string */ function escapePercent($str) { @@ -93,6 +96,10 @@ class Advisor /** * Wrapper function for translating. + * + * @param string $str + * @param mixed $param + * @return string */ function translate($str, $param = null) { @@ -109,6 +116,9 @@ class Advisor /** * Splits justification to text and formula. + * + * @param string $rule + * @return array */ function splitJustification($rule) { diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 803e0c0aff..f3908564d2 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -334,6 +334,7 @@ class PMA_Config * should be called on object creation * * @param string $source config file + * @return bool */ function load($source = null) { @@ -698,6 +699,8 @@ class PMA_Config * $cfg['PmaAbsoluteUri'] is a required directive else cookies won't be * set properly and, depending on browsers, inserting or updating a * record might fail + * + * @return bool */ function checkPmaAbsoluteUri() { @@ -937,7 +940,7 @@ class PMA_Config } /** - * @static + * @return bool */ public function isHttps() { @@ -964,6 +967,8 @@ class PMA_Config * * Please note that this just detects what we see, so * it completely ignores things like reverse proxies. + * + * @return bool */ function detectHttps() { @@ -1012,7 +1017,7 @@ class PMA_Config } /** - * @static + * @return string */ public function getCookiePath() { diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index 1a9cdb0169..ac132fa2fc 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -127,6 +127,7 @@ class PMA_Error_Handler * * @todo finish! * @param PMA_Error $error + * @return bool */ protected function _logError($error) { diff --git a/libraries/File.class.php b/libraries/File.class.php index 66a88b8043..592127b3e5 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -189,6 +189,7 @@ class PMA_File /** * @access public + * @return bool */ function isUploaded() { @@ -591,7 +592,7 @@ class PMA_File } /** - * + * @return bool */ function open() { @@ -688,6 +689,8 @@ class PMA_File * http://bugs.php.net/bug.php?id=29532 * bzip reads a maximum of 8192 bytes on windows systems * @todo this function is unused + * @param int $max_size + * @return bool|string */ function getNextChunk($max_size = null) { diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 748a3e7392..1e1b31fe46 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -90,6 +90,7 @@ require_once './libraries/List.class.php'; * * @todo we could also search mysql tables if all fail? * @param string $like_db_name usally a db_name containing wildcards + * @return array */ protected function _retrieve($like_db_name = null) { diff --git a/libraries/PMA.php b/libraries/PMA.php index 4f148b7df4..ea2c27e8d2 100644 --- a/libraries/PMA.php +++ b/libraries/PMA.php @@ -44,6 +44,9 @@ class PMA * magic access to protected/inaccessible members/properties * * @see http://php.net/language.oop5.overloading + * + * @param string $param + * @return mixed */ public function __get($param) { @@ -66,6 +69,9 @@ class PMA * magic access to protected/inaccessible members/properties * * @see http://php.net/language.oop5.overloading + * + * @param string $param + * @param mixed $value */ public function __set($param, $value) { diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 6e205cf308..60618d5da3 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -926,7 +926,7 @@ class PMA_Table if ($GLOBALS['cfgRelation']['commwork']) { // Get all comments and MIME-Types for current table $comments_copy_query = 'SELECT - column_name, ' . PMA_backquote('comment') . ($GLOBALS['cfgRelation']['mimework'] ? ', mimetype, transformation, transformation_options' : '') . ' + column_name, comment' . ($GLOBALS['cfgRelation']['mimework'] ? ', mimetype, transformation, transformation_options' : '') . ' FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['column_info']) . ' WHERE db_name = \'' . PMA_sqlAddSlashes($source_db) . '\' AND @@ -936,7 +936,7 @@ class PMA_Table // Write every comment as new copied entry. [MIME] while ($comments_copy_row = PMA_DBI_fetch_assoc($comments_copy_rs)) { $new_comment_query = 'REPLACE INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['column_info']) - . ' (db_name, table_name, column_name, ' . PMA_backquote('comment') . ($GLOBALS['cfgRelation']['mimework'] ? ', mimetype, transformation, transformation_options' : '') . ') ' + . ' (db_name, table_name, column_name, comment' . ($GLOBALS['cfgRelation']['mimework'] ? ', mimetype, transformation, transformation_options' : '') . ') ' . ' VALUES(' . '\'' . PMA_sqlAddSlashes($target_db) . '\',' . '\'' . PMA_sqlAddSlashes($target_table) . '\',' diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index f6b08a06d4..87f6a3e9b5 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -130,6 +130,7 @@ class PMA_Theme * checks image path for existance - if not found use img from original theme * * @access public + * @return bool */ function checkImgPath() { @@ -282,6 +283,7 @@ class PMA_Theme * * @access public * @param string $type left, right or print + * @return bool */ function loadCss(&$type) { diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index 174c031650..93f5ecfc6d 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -38,7 +38,7 @@ class PMA_Theme_Manager var $active_theme = ''; /** - * @var object PMA_Theme active theme + * @var PMA_Theme PMA_Theme active theme */ var $theme = null; @@ -193,6 +193,7 @@ class PMA_Theme_Manager /** * save theme in cookie * + * @return bool true */ function setThemeCookie() { @@ -224,6 +225,8 @@ class PMA_Theme_Manager /** * read all themes + * + * @return bool true */ function loadThemes() { @@ -259,6 +262,7 @@ class PMA_Theme_Manager * checks if given theme name is a known theme * * @param string $theme name fo theme to check for + * @return bool */ function checkTheme($theme) { @@ -273,6 +277,7 @@ class PMA_Theme_Manager * returns HTML selectbox, with or without form enclosed * * @param boolean $form whether enclosed by from tags or not + * @return string */ function getHtmlSelectBox($form = true) { @@ -351,6 +356,9 @@ class PMA_Theme_Manager /** * prints css data + * + * @param string $type + * @return bool */ function printCss($type) { diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index cbb4be6fef..0dcf8f4e59 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -219,8 +219,8 @@ class PMA_Tracker $sql_query = " SELECT tracking_active FROM " . self::$pma_table . - " WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddSlashes($dbname) . "' " . - " AND " . PMA_backquote('table_name') . " = '" . PMA_sqlAddSlashes($tablename) . "' " . + " WHERE db_name = '" . PMA_sqlAddSlashes($dbname) . "' " . + " AND table_name = '" . PMA_sqlAddSlashes($tablename) . "' " . " ORDER BY version DESC"; $row = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query)); @@ -254,7 +254,7 @@ class PMA_Tracker * @param string $tablename name of table * @param string $version version * @param string $tracking_set set of tracking statements - * @param string $is_view if table is a view + * @param bool $is_view if table is a view * * @return int result of version insertion */ @@ -468,11 +468,11 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version - * @param string $type type of data(DDL || DML) - * @param string || array $new_data the new tracking data + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version + * @param string $type type of data(DDL || DML) + * @param string|array $new_data the new tracking data * * @return bool result of change */ @@ -889,7 +889,6 @@ class PMA_Tracker /** * Analyzes a given SQL statement and saves tracking data. * - * * @static * @param string $query a SQL query */ @@ -897,7 +896,7 @@ class PMA_Tracker { // If query is marked as untouchable, leave if (strstr($query, "/*NOTRACK*/")) { - return false; + return; } if (! (substr($query, -1) == ';')) { @@ -911,7 +910,7 @@ class PMA_Tracker // $dbname can be empty, for example when coming from Synchronize // and this is a query for the remote server if (empty($dbname)) { - return false; + return; } // If we found a valid statement diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 4615c55ff9..c2e50c0671 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -80,6 +80,7 @@ if (function_exists('mcrypt_encrypt')) { * Returns blowfish secret or generates one if needed. * * @access public + * @return string */ function PMA_get_blowfish_secret() { diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php index 46faa7f02b..195a1be622 100644 --- a/libraries/blobstreaming.lib.php +++ b/libraries/blobstreaming.lib.php @@ -4,6 +4,11 @@ * @package BLOBStreaming */ +/** + * Initializes PBMS database + * + * @return bool + */ function initPBMSDatabase() { $query = "create database IF NOT EXISTS pbms;"; // If no other choice then try this. @@ -398,6 +403,11 @@ function PMA_BS_CreateReferenceLink($bs_reference, $db_name) * BLOB streaming on a per table or database basis. So in anticipation of this * PMA_BS_IsTablePBMSEnabled() passes in the table and database name even though * they are not currently needed. + * + * @param string $db_name + * @param string $tbl_name + * @param string $tbl_type + * @return bool */ function PMA_BS_IsTablePBMSEnabled($db_name, $tbl_name, $tbl_type) { diff --git a/libraries/blowfish.php b/libraries/blowfish.php index 69abf5215d..0c04106831 100644 --- a/libraries/blowfish.php +++ b/libraries/blowfish.php @@ -321,6 +321,7 @@ class Horde_Cipher_blowfish * Set the key to be used for en/decryption. * * @param string $key The key to use. + * @return bool */ public function setKey($key) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 777baa05f9..eb01c499e7 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2958,10 +2958,9 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) * function that generates a json output for an ajax request and ends script * execution * - * @param bool $message message string containing the html of the message - * @param bool $success success whether the ajax request was successfull - * @param array $extra_data extra_data optional - any other data as part of the json request - * + * @param PMA_Message|string $message message string containing the html of the message + * @param bool $success success whether the ajax request was successfull + * @param array $extra_data extra_data optional - any other data as part of the json request */ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) { diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php index 37258787a2..e3010fcf2e 100644 --- a/libraries/config/FormDisplay.class.php +++ b/libraries/config/FormDisplay.class.php @@ -467,10 +467,10 @@ class FormDisplay } $this->errors = array(); - foreach ($forms as $form) { + foreach ($forms as $form_name) { /* @var $form Form */ - if (isset($this->forms[$form])) { - $form = $this->forms[$form]; + if (isset($this->forms[$form_name])) { + $form = $this->forms[$form_name]; } else { continue; } diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index 179e752a08..d2702eb128 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -65,10 +65,10 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false /** * Creates a clickable column header for table information * - * @param string title to use for the link - * @param string corresponds to sortable data name mapped in libraries/db_info.inc.php - * @param string initial sort order - * @returns string link to be displayed in the table header + * @param string $title title to use for the link + * @param string $sort corresponds to sortable data name mapped in libraries/db_info.inc.php + * @param string $initial_sort_order + * @return string link to be displayed in the table header */ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC') { diff --git a/libraries/file_listing.php b/libraries/file_listing.php index 720ba821fa..5d9058acea 100644 --- a/libraries/file_listing.php +++ b/libraries/file_listing.php @@ -10,9 +10,9 @@ /** * Returns array of filtered file names * - * @param string directory to list - * @param string regular expression to match files - * @returns array sorted file list on success, false on failure + * @param string $dir directory to list + * @param string $expression regular expression to match files + * @return array sorted file list on success, false on failure */ function PMA_getDirContent($dir, $expression = '') { @@ -39,10 +39,10 @@ function PMA_getDirContent($dir, $expression = '') /** * Returns options of filtered file names * - * @param string directory to list - * @param string regullar expression to match files - * @param string currently active choice - * @returns array sorted file list on success, false on failure + * @param string $dir directory to list + * @param string $extensions regullar expression to match files + * @param string $active currently active choice + * @return array sorted file list on success, false on failure */ function PMA_getFileSelectOptions($dir, $extensions = '', $active = '') { @@ -64,7 +64,7 @@ function PMA_getFileSelectOptions($dir, $extensions = '', $active = '') /** * Get currently supported decompressions. * - * @returns string | separated list of extensions usable in PMA_getDirContent + * @return string | separated list of extensions usable in PMA_getDirContent */ function PMA_supportedDecompressions() { diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php index aafd1690b4..993ca9d921 100644 --- a/libraries/grab_globals.lib.php +++ b/libraries/grab_globals.lib.php @@ -16,8 +16,9 @@ if (! defined('PHPMYADMIN')) { * copy values from one array to another, usually from a superglobal into $GLOBALS * * @param array $array values from - * @param array $target values to - * @param boolean $sanitize prevent importing key names in $_import_blacklist + * @param array &$target values to + * @param bool $sanitize prevent importing key names in $_import_blacklist + * @return bool */ function PMA_recursive_extract($array, &$target, $sanitize = true) { diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php index 4ba089a5ec..4710940c23 100644 --- a/libraries/import/docsql.php +++ b/libraries/import/docsql.php @@ -66,7 +66,7 @@ if ($data === true && !$error && !$timeout_passed) { $qry = ' INSERT INTO ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . ' - (db_name, table_name, column_name, ' . PMA_backquote('comment') . ') + (db_name, table_name, column_name, comment) VALUES ( \'' . PMA_sqlAddSlashes($GLOBALS['db']) . '\', \'' . PMA_sqlAddSlashes(trim($tab)) . '\', diff --git a/libraries/import/upload/apc.php b/libraries/import/upload/apc.php index 5250c92255..5fe34bb220 100644 --- a/libraries/import/upload/apc.php +++ b/libraries/import/upload/apc.php @@ -15,6 +15,9 @@ $ID_KEY = 'APC_UPLOAD_PROGRESS'; * Returns upload status. * * This is implementation for APC extension. + * + * @param string $id + * @return array|null */ function PMA_getUploadStatus($id) { @@ -22,7 +25,7 @@ function PMA_getUploadStatus($id) global $ID_KEY; if (trim($id) == "") { - return; + return null; } if (! array_key_exists($id, $_SESSION[$SESSION_KEY])) { $_SESSION[$SESSION_KEY][$id] = array( diff --git a/libraries/import/upload/noplugin.php b/libraries/import/upload/noplugin.php index fa7796c686..00dcb11443 100644 --- a/libraries/import/upload/noplugin.php +++ b/libraries/import/upload/noplugin.php @@ -15,6 +15,9 @@ $ID_KEY = 'noplugin'; * Returns upload status. * * This is implementation when no webserver support exists, so it returns just zeroes. + * + * @param string $id + * @return array|null */ function PMA_getUploadStatus($id) { @@ -22,7 +25,7 @@ function PMA_getUploadStatus($id) global $ID_KEY; if (trim($id) == "") { - return; + return null; } if (! array_key_exists($id, $_SESSION[$SESSION_KEY])) { $_SESSION[$SESSION_KEY][$id] = array( diff --git a/libraries/import/upload/uploadprogress.php b/libraries/import/upload/uploadprogress.php index a3ec60b1de..d5c361c1d4 100644 --- a/libraries/import/upload/uploadprogress.php +++ b/libraries/import/upload/uploadprogress.php @@ -14,6 +14,9 @@ $ID_KEY = "UPLOAD_IDENTIFIER"; * Returns upload status. * * This is implementation for uploadprogress extension. + * + * @param string $id + * @return array|null */ function PMA_getUploadStatus($id) { @@ -21,7 +24,7 @@ function PMA_getUploadStatus($id) global $ID_KEY; if (trim($id) == "") { - return; + return null; } if (! array_key_exists($id, $_SESSION[$SESSION_KEY])) { diff --git a/libraries/mime.lib.php b/libraries/mime.lib.php index f394b8fcfd..e9eb386dde 100644 --- a/libraries/mime.lib.php +++ b/libraries/mime.lib.php @@ -9,6 +9,9 @@ /** * Tries to detect MIME type of content. + * + * @param string &$test + * @return string */ function PMA_detectMIME(&$test) { diff --git a/libraries/rte/rte_export.lib.php b/libraries/rte/rte_export.lib.php index d4d8f99a2f..8cac214ce6 100644 --- a/libraries/rte/rte_export.lib.php +++ b/libraries/rte/rte_export.lib.php @@ -70,16 +70,17 @@ function PMA_RTN_handleExport() { global $_GET, $db; - if (! empty($_GET['export_item']) && ! empty($_GET['item_name'])) { - $item_name = $_GET['item_name']; - $type = PMA_DBI_fetch_value( - "SELECT ROUTINE_TYPE " . - "FROM INFORMATION_SCHEMA.ROUTINES " . - "WHERE ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' " . - "AND SPECIFIC_NAME='" . PMA_sqlAddSlashes($item_name) . "';" - ); - $export_data = PMA_DBI_get_definition($db, $type, $item_name); - PMA_RTE_handleExport($item_name, $export_data); + if ( ! empty($_GET['export_item']) + && ! empty($_GET['item_name']) + && ! empty($_GET['item_type']) + ) { + if ($_GET['item_type'] == 'FUNCTION' || $_GET['item_type'] == 'PROCEDURE') { + $export_data = PMA_DBI_get_definition( + $db, + $_GET['item_type'], + $_GET['item_name']); + PMA_RTE_handleExport($_GET['item_name'], $export_data); + } } } // end PMA_RTN_handleExport() diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php index 3b6177dbbd..19e8e64b1e 100644 --- a/libraries/rte/rte_list.lib.php +++ b/libraries/rte/rte_list.lib.php @@ -117,7 +117,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') $sql_drop = sprintf('DROP %s IF EXISTS %s', $routine['ROUTINE_TYPE'], PMA_backquote($routine['SPECIFIC_NAME'])); - + $type_link = "item_type={$routine['ROUTINE_TYPE']}"; $retval = " \n"; $retval .= " \n"; @@ -136,6 +136,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') . $url_query . '&edit_item=1' . '&item_name=' . urlencode($routine['SPECIFIC_NAME']) + . '&' . $type_link . '">' . $titles['Edit'] . "\n"; } else { $retval .= " {$titles['NoEdit']}\n"; @@ -150,6 +151,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') // otherwise we can execute it directly. $routine_details = PMA_RTN_getDataFromName( $routine['SPECIFIC_NAME'], + $routine['ROUTINE_TYPE'], false ); if ($routine !== false) { @@ -168,6 +170,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') . $url_query . '&' . $execute_action . '=1' . '&item_name=' . urlencode($routine['SPECIFIC_NAME']) + . '&' . $type_link . '">' . $titles['Execute'] . "\n"; } } else { @@ -180,15 +183,16 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') . $url_query . '&export_item=1' . '&item_name=' . urlencode($routine['SPECIFIC_NAME']) + . '&' . $type_link . '">' . $titles['Export'] . "\n"; $retval .= " \n"; $retval .= " \n"; - if (PMA_currentUserHasPrivilege('EVENT', $db)) { + if (PMA_currentUserHasPrivilege('ALTER ROUTINE', $db)) { $retval .= ' ' . $titles['Drop'] . "\n"; } else { $retval .= " {$titles['NoDrop']}\n"; diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 3e6360321f..8cd052923e 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -304,7 +304,9 @@ function PMA_RTN_handleEditor() $extra_data = array(); if ($message->isSuccess()) { $columns = "`SPECIFIC_NAME`, `ROUTINE_NAME`, `ROUTINE_TYPE`, `DTD_IDENTIFIER`, `ROUTINE_DEFINITION`"; - $where = "ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' AND ROUTINE_NAME='" . PMA_sqlAddSlashes($_REQUEST['item_name']) . "'"; + $where = "ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' " + . "AND ROUTINE_NAME='" . PMA_sqlAddSlashes($_REQUEST['item_name']) . "'" + . "AND ROUTINE_TYPE='" . PMA_sqlAddSlashes($_REQUEST['item_type']) . "'"; $routine = PMA_DBI_fetch_single_row("SELECT $columns FROM `INFORMATION_SCHEMA`.`ROUTINES` WHERE $where;"); $extra_data['name'] = htmlspecialchars(strtoupper($_REQUEST['item_name'])); $extra_data['new_row'] = PMA_RTN_getRowForList($routine); @@ -343,7 +345,7 @@ function PMA_RTN_handleEditor() } else if (! empty($_REQUEST['edit_item'])) { $title = __("Edit routine"); if (! $operation && ! empty($_REQUEST['item_name']) && empty($_REQUEST['editor_process_edit'])) { - $routine = PMA_RTN_getDataFromName($_REQUEST['item_name']); + $routine = PMA_RTN_getDataFromName($_REQUEST['item_name'], $_REQUEST['item_type']); if ($routine !== false) { $routine['item_original_name'] = $routine['item_name']; $routine['item_original_type'] = $routine['item_type']; @@ -501,12 +503,13 @@ function PMA_RTN_getDataFromRequest() * the "Edit routine" form given the name of a routine. * * @param string $name The name of the routine. + * @param string $type Type of routine (ROUTINE|PROCEDURE) * @param bool $all Whether to return all data or just * the info about parameters. * * @return array Data necessary to create the routine editor. */ -function PMA_RTN_getDataFromName($name, $all = true) +function PMA_RTN_getDataFromName($name, $type, $all = true) { global $param_directions, $param_sqldataaccess, $db; @@ -517,7 +520,8 @@ function PMA_RTN_getDataFromName($name, $all = true) . "ROUTINE_DEFINITION, IS_DETERMINISTIC, SQL_DATA_ACCESS, " . "ROUTINE_COMMENT, SECURITY_TYPE"; $where = "ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' " - . "AND SPECIFIC_NAME='" . PMA_sqlAddSlashes($name) . "'"; + . "AND SPECIFIC_NAME='" . PMA_sqlAddSlashes($name) . "'" + . "AND ROUTINE_TYPE='" . PMA_sqlAddSlashes($type) . "'"; $query = "SELECT $fields FROM INFORMATION_SCHEMA.ROUTINES WHERE $where;"; $routine = PMA_DBI_fetch_single_row($query); @@ -1002,7 +1006,7 @@ function PMA_RTN_getQueryFromRequest() $warned_about_dir = false; $warned_about_name = false; $warned_about_length = false; - if (! empty($_REQUEST['item_param_name']) + if ( ! empty($_REQUEST['item_param_name']) && ! empty($_REQUEST['item_param_type']) && ! empty($_REQUEST['item_param_length']) && is_array($_REQUEST['item_param_name']) @@ -1124,7 +1128,7 @@ function PMA_RTN_handleExecute() */ if (! empty($_REQUEST['execute_routine']) && ! empty($_REQUEST['item_name'])) { // Build the queries - $routine = PMA_RTN_getDataFromName($_REQUEST['item_name'], false); + $routine = PMA_RTN_getDataFromName($_REQUEST['item_name'], $_REQUEST['item_type'], false); if ($routine !== false) { $queries = array(); $end_query = array(); @@ -1279,7 +1283,7 @@ function PMA_RTN_handleExecute() /** * Display the execute form for a routine. */ - $routine = PMA_RTN_getDataFromName($_GET['item_name'], false); + $routine = PMA_RTN_getDataFromName($_GET['item_name'], $_GET['item_type'], true); if ($routine !== false) { $form = PMA_RTN_getExecuteForm($routine); if ($GLOBALS['is_ajax_request'] == true) { @@ -1336,6 +1340,8 @@ function PMA_RTN_getExecuteForm($routine) $retval .= "
\n"; $retval .= " TableDragInit(); } function TableDragInit() { - myid = getElement('pdflayout'); + myid = $('#pdflayout')[0]; } @@ -681,9 +682,9 @@ class PMA_User_Schema */ $master_tables = 'SELECT COUNT(master_table), master_table' . ' FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation']) - . ' WHERE master_db = \'' . $db . '\'' + . ' WHERE master_db = \'' . PMA_sqlAddSlashes($db) . '\'' . ' GROUP BY master_table' - . ' ORDER BY ' . PMA_backquote('COUNT(master_table)') . ' DESC '; + . ' ORDER BY COUNT(master_table) DESC'; $master_tables_rs = PMA_query_as_controluser($master_tables, false, PMA_DBI_QUERY_STORE); if ($master_tables_rs && PMA_DBI_num_rows($master_tables_rs) > 0) { /* first put all the master tables at beginning diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index cfe4424a6e..cf7bab266a 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -280,13 +280,12 @@ class Table_Stats /** * Sets the width of the table * - * @param string font The font name - * @param integer fontSize The font size + * @param string $font font name + * @param integer $fontSize font size * @global object The current Visio XML document - * @access private * @see PMA_VISIO */ - function _setWidthTable($font,$fontSize) + private function _setWidthTable($font,$fontSize) { global $visio; diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index f4030ef66c..62b1ea7d83 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -11,6 +11,9 @@ if (! defined('PHPMYADMIN')) { /** * Returns language name + * + * @param string $tmplang + * @return string */ function PMA_langName($tmplang) { @@ -182,6 +185,8 @@ function PMA_langDetect($str, $envType) * traditional) must be detected before 'zh' (chinese simplified) for * example. * + * @param string $lang + * @return array */ function PMA_langDetails($lang) { diff --git a/libraries/sysinfo.lib.php b/libraries/sysinfo.lib.php index bc0192f34c..96ac0e2939 100644 --- a/libraries/sysinfo.lib.php +++ b/libraries/sysinfo.lib.php @@ -9,6 +9,9 @@ * @package phpMyAdmin */ +/** + * @return array + */ function getSysInfo() { $supported = array('Linux','WINNT'); diff --git a/po/cs.po b/po/cs.po index 001bedb185..354fabe743 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-08-15 10:09+0200\n" +"POT-Creation-Date: 2011-08-15 09:43+0200\n" "PO-Revision-Date: 2011-08-11 11:38+0200\n" "Last-Translator: Michal Čihař \n" "Language-Team: czech \n" @@ -1127,10 +1127,9 @@ msgid "Query statistics" msgstr "Statistika dotazů" #: js/messages.php:93 -#, fuzzy #| msgid "Failed to read configuration file" msgid "Local monitor configuration icompatible" -msgstr "Nepodařilo se načíst konfigurační soubor" +msgstr "Lokální nastavení monitoru není kompatibilní" #: js/messages.php:94 msgid "" @@ -1141,22 +1140,19 @@ msgid "" msgstr "" #: js/messages.php:96 -#, fuzzy #| msgid "Query cache" msgid "Query cache efficiency" -msgstr "Vyrovnávací paměť dotazů" +msgstr "Úspěšnost vyrovnávací paměti dotazů" #: js/messages.php:97 po/advisory_rules.php:70 -#, fuzzy #| msgid "Query cache" msgid "Query cache usage" -msgstr "Vyrovnávací paměť dotazů" +msgstr "Využití vyrovnávací paměti dotazů" #: js/messages.php:98 -#, fuzzy #| msgid "Query cache" msgid "Query cache used" -msgstr "Vyrovnávací paměť dotazů" +msgstr "Využito vyrovnávací paměti dotazů" #: js/messages.php:100 msgid "System CPU Usage" diff --git a/po/de.po b/po/de.po index 822ed74348..b1bd55893e 100644 --- a/po/de.po +++ b/po/de.po @@ -12907,18 +12907,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "" -#~| "The Advisor system can provide recommendations on server variables by " -#~| "analyzing the server status variables. \n" -#~| " Do note however that this system provides recommendations based " -#~| "on fairly simple calculations and by rule of thumb and \n" -#~| " may not necessarily work for your system.\n" -#~| " Prior to changing any of the configuration, be sure to know what " -#~| "you are changing and how to undo the change. Wrong tuning\n" -#~| " can have a very negative effect on performance.\n" -#~| " The best way to tune the system would be to change only one " -#~| "setting at a time, observe or benchmark your database, and \n" -#~| " undo the change if there was no clearly measurable improvement." #~ msgid "" #~ "The Advisor system can provide recommendations on server variables by " #~ "analyzing the server status variables.

Do note however that this " diff --git a/po/es.po b/po/es.po index 8f2c69f206..ba4b090bec 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-15 10:09+0200\n" -"PO-Revision-Date: 2011-08-10 16:45+0200\n" +"PO-Revision-Date: 2011-08-16 00:04+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -1133,10 +1133,9 @@ msgid "Query statistics" msgstr "Estadísticas de Consulta" #: js/messages.php:93 -#, fuzzy #| msgid "Failed to read configuration file" msgid "Local monitor configuration icompatible" -msgstr "No se pudo leer el archivo de configuración" +msgstr "Configuración de monitorización local incompatible" #: js/messages.php:94 msgid "" @@ -1145,24 +1144,26 @@ msgid "" "likely that your current configuration will not work anymore. Please reset " "your configuration to default in the Settings menu." msgstr "" +"La configuración de distribución de gráficos en el almacenamiento local del " +"navegador no es compatible con la nueva versión del sistema de " +"monitorización. Es probable que la configuración no funcione. Porfavor, " +"reinicie la configuración a la predeterminada en el menú " +"Configuración." #: js/messages.php:96 -#, fuzzy #| msgid "Query cache" msgid "Query cache efficiency" -msgstr "Cache de consultas" +msgstr "Eficiencia del caché de consultas" #: js/messages.php:97 po/advisory_rules.php:70 -#, fuzzy #| msgid "Query cache" msgid "Query cache usage" -msgstr "Cache de consultas" +msgstr "Uso del caché de consultas" #: js/messages.php:98 -#, fuzzy #| msgid "Query cache" msgid "Query cache used" -msgstr "Cache de consultas" +msgstr "Caché de consultas utilizado" #: js/messages.php:100 msgid "System CPU Usage" @@ -1508,50 +1509,45 @@ msgid "Import" msgstr "Importar" #: js/messages.php:192 -#, fuzzy #| msgid "Update Query" msgid "Analyse Query" -msgstr "Modificar la consulta" +msgstr "Analizar consulta" #: js/messages.php:196 -#, fuzzy #| msgid "Advisor" msgid "Advisor system" -msgstr "Consejero" +msgstr "Sistema de consejos" #: js/messages.php:197 msgid "Possible performance issues" -msgstr "" +msgstr "Posibles problemas de performance" #: js/messages.php:198 msgid "Issue" -msgstr "" +msgstr "Problema" #: js/messages.php:199 -#, fuzzy #| msgid "Documentation" msgid "Recommendation" -msgstr "Documentación" +msgstr "Recomendación" #: js/messages.php:200 -#, fuzzy #| msgid "Details" msgid "Rule details" -msgstr "Detalles" +msgstr "Detalles de la regla" #: js/messages.php:201 -#, fuzzy #| msgid "Authentication" msgid "Justification" -msgstr "Autentificación" +msgstr "Justificación" #: js/messages.php:202 msgid "Used variable / formula" -msgstr "" +msgstr "Variable/fórmula utilizada" #: js/messages.php:203 msgid "Test" -msgstr "" +msgstr "Prueba" #: js/messages.php:208 libraries/tbl_properties.inc.php:763 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545 @@ -1693,48 +1689,48 @@ msgid "Show search criteria" msgstr "Mostrar criterio de búsqueda" #: js/messages.php:262 libraries/tbl_select.lib.php:138 -#, fuzzy #| msgid "Search" msgid "Zoom Search" -msgstr "Buscar" +msgstr "Ampliar búsqueda" #: js/messages.php:264 msgid "Each point represents a data row." -msgstr "" +msgstr "Cada punto representa una fila de datos." #: js/messages.php:266 msgid "Hovering over a point will show its label." -msgstr "" +msgstr "Ubicar el cursor sobre un punto mostrará su etiqueta." #: js/messages.php:268 msgid "Drag and select an area in the plot to zoom into it." -msgstr "" +msgstr "Arrastre y seleccione un área en el gráfico para ampliarla." #: js/messages.php:270 msgid "Click reset zoom link to come back to original state." -msgstr "" +msgstr "Pulse el enlace de restaurar ampliación para volver al estado original." #: js/messages.php:272 msgid "Click a data point to view and possibly edit the data row." msgstr "" +"Pulse en un punto de datos para ver y posiblemente editar la fila de datos." #: js/messages.php:274 msgid "The plot can be resized by dragging it along the bottom right corner." msgstr "" +"El gráfico puede redimensionarse arrastrando la esquina inferior derecha." #: js/messages.php:276 msgid "Strings are converted into integer for plotting" -msgstr "" +msgstr "Las cadenas son conventidas a enteros para graficarlas" #: js/messages.php:278 -#, fuzzy #| msgid "Add/Delete columns" msgid "Select two columns" -msgstr "Añadir/borrar columnas" +msgstr "Seleccionar dos columnas" #: js/messages.php:279 msgid "Select two different columns" -msgstr "" +msgstr "Seleccionar dos columnas distintas" #: js/messages.php:282 tbl_change.php:307 tbl_indexes.php:211 #: tbl_indexes.php:238 @@ -1816,12 +1812,13 @@ msgstr "" msgid "" "You can also edit most columns
by clicking directly on their content." msgstr "" +"Puede editar la mayoría de las columnas pulsando directamente en su " +"contenido." #: js/messages.php:307 -#, fuzzy #| msgid "Go to view" msgid "Go to link" -msgstr "Ir a la vista" +msgstr "Ir al enlace" #: js/messages.php:310 msgid "Generate password" @@ -2315,6 +2312,8 @@ msgid "" "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]" "['MaxTableUiprefs'] %s)" msgstr "" +"Falló la limpieza de las preferencia de interfaz de tablas (ver " +"$cfg['Servers'][$i]['MaxTableUiprefs'] %s)" #: libraries/Theme.class.php:144 #, php-format @@ -4535,12 +4534,14 @@ msgid "" "This configuration make sure that we only keep N (N = MaxTableUiprefs) " "newest record in \"table_uiprefs\" and automatically delete older records" msgstr "" +"Esta configuración asegura que sólo se mantengan los N (N = MaxTableUiprefs) " +"registros más recientes en «table_uiprefs» y los registros anteriores sean " +"eliminados" #: libraries/config/messages.inc.php:399 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximum number of records saved in \"table_uiprefs\" table" -msgstr "Número máximo de tablas mostradas en una lista de tablas" +msgstr "Número máximo de regustros almacenados en la tabla «table_uiprefs»" #: libraries/config/messages.inc.php:400 msgid "Try to connect without password" @@ -8047,10 +8048,9 @@ msgid "Operator" msgstr "Operador" #: libraries/tbl_select.lib.php:131 -#, fuzzy #| msgid "Search" msgid "Table Search" -msgstr "Buscar" +msgstr "Búsqueda de tablas" #: libraries/transformations/application_octetstream__download.inc.php:10 msgid "" @@ -8407,10 +8407,9 @@ msgid "No databases" msgstr "No hay bases de datos" #: navigation.php:270 -#, fuzzy #| msgid "filter tables by name" msgid "Filter tables by name" -msgstr "filtar tablas por nombre" +msgstr "Filtrar tablas por nombre" #: navigation.php:303 navigation.php:304 msgctxt "short form" @@ -9509,22 +9508,22 @@ msgid "Related links:" msgstr "Enlaces relacionados:" #: server_status.php:800 -#, fuzzy #| msgid "Query analyzer" msgid "Run analyzer" -msgstr "Analizador de consultas" +msgstr "Ejecutar analizador" #: server_status.php:801 -#, fuzzy #| msgid "Introduction" msgid "Instructions" -msgstr "Introducción" +msgstr "Instrucciones" #: server_status.php:808 msgid "" "The Advisor system can provide recommendations on server variables by " "analyzing the server status variables." msgstr "" +"El sistema de consejos puede proveer recomendaciones para las variables del " +"servidor analizando las variables de estado del servidor." #: server_status.php:810 msgid "" @@ -9532,6 +9531,9 @@ msgid "" "calculations and by rule of thumb which may not necessarily apply to your " "system." msgstr "" +"Notar, sin embargo, que este sistema provee recomendaciones basadas en " +"cálculos simples y reglas generales que no serán necesariamente válidas en " +"su sistema." #: server_status.php:812 msgid "" @@ -9539,6 +9541,9 @@ msgid "" "changing (by reading the documentation) and how to undo the change. Wrong " "tuning can have a very negative effect on performance." msgstr "" +"Antes de cambiar una configuración asegúrese de entender lo que está " +"cambiando (leyendo la documentación) y cómo revertir el cambio. Ajustes " +"incorrectos pueden tener un gran efecto negativo en performance." #: server_status.php:814 msgid "" @@ -9546,6 +9551,9 @@ msgid "" "time, observe or benchmark your database, and undo the change if there was " "no clearly measurable improvement." msgstr "" +"La mejor forma de ajustar el sistema sería cambiar sólo una configuración a " +"la vez, observar y medir la base de datos, y revertir el cambio si no hubo " +"una mejora diferenciable." #. l10n: Questions is the name of a MySQL Status variable #: server_status.php:836 @@ -10427,13 +10435,11 @@ msgstr "" "utilizar las funcionalidades para graficación del servidor." #: server_status.php:1507 -#, fuzzy #| msgid "Pause monitor" msgid "Using the monitor:" -msgstr "Pausar monitorización" +msgstr "Utilizando el monitorizador:" #: server_status.php:1509 -#, fuzzy #| msgid "" #| "Using the monitor:
Ok, you are good to go! Once you click " #| "'Start monitor' your browser will refresh all displayed charts in a " @@ -10450,19 +10456,13 @@ msgid "" "change the refresh rate under 'Settings', or remove any chart using the cog " "icon on each respective chart." msgstr "" -"Utilizando el monitorizador:
¡Ya está listo! Una vez que pulse " -"en 'Iniciar monitorización' el navegador actualizará a intervalos regulares " -"todos los gráficos mostrados. Puede agregar gráficos y cambiar la velocidad " -"de actualización en la sección 'Configuración' o eliminar cualquier gráfico " -"utilizando el icono de rueda dentada en cada gráfico.

Para mostrar las " -"consultas de los registros, seleccione el intervalo de tiempo " -"correspondiente en cualquier gráfico manteniendo pulsado el botón izquierdo " -"y arrastrando sobre el gráfico. Una vez confirmado, esto cargará una tabla " -"de consultas agrupadas donde podrá pulsar en cualquier sentencia SELECT para " -"analizarla.

" +"¡Ya está listo! Una vez que pulse en 'Iniciar monitorización' el navegador " +"actualizará a intervalos regulares todos los gráficos mostrados. Puede " +"agregar gráficos y cambiar la velocidad de actualización en la sección " +"'Configuración' o eliminar cualquier gráfico utilizando el icono de rueda " +"dentada en cada gráfico." #: server_status.php:1511 -#, fuzzy #| msgid "" #| "Using the monitor:
Ok, you are good to go! Once you click " #| "'Start monitor' your browser will refresh all displayed charts in a " @@ -10479,23 +10479,17 @@ msgid "" "confirmed, this will load a table of grouped queries, there you may click on " "any occuring SELECT statements to further analyze them." msgstr "" -"Utilizando el monitorizador:
¡Ya está listo! Una vez que pulse " -"en 'Iniciar monitorización' el navegador actualizará a intervalos regulares " -"todos los gráficos mostrados. Puede agregar gráficos y cambiar la velocidad " -"de actualización en la sección 'Configuración' o eliminar cualquier gráfico " -"utilizando el icono de rueda dentada en cada gráfico.

Para mostrar las " -"consultas de los registros, seleccione el intervalo de tiempo " -"correspondiente en cualquier gráfico manteniendo pulsado el botón izquierdo " -"y arrastrando sobre el gráfico. Una vez confirmado, esto cargará una tabla " -"de consultas agrupadas donde podrá pulsar en cualquier sentencia SELECT para " -"analizarla.

" +"Para mostrar las consultas de los registros, seleccione el intervalo de " +"tiempo correspondiente en cualquier gráfico manteniendo pulsado el botón " +"izquierdo y arrastrando sobre el gráfico. Una vez confirmado, esto cargará " +"una tabla de consultas agrupadas donde podrá pulsar en cualquier sentencia " +"SELECT para analizarla." #: server_status.php:1518 msgid "Please note:" -msgstr "" +msgstr "Notar que:" #: server_status.php:1520 -#, fuzzy #| msgid "" #| "Please note: Enabling the general_log may increase the server load " #| "by 5-15%. Also be aware that generating statistics from the logs is a " @@ -10508,12 +10502,11 @@ msgid "" "it is advisable to select only a small time span and to disable the " "general_log and empty its table once monitoring is not required any more." msgstr "" -"Notar que: Activar «general_log» puede aumentar la carga en el " -"servidor hasta un 5-15%. También esté al tanto que generar estadísticas de " -"los registros es una tarea muy intensiva por lo que se recomienda " -"seleccionar un período de tiempo lo más pequeño posible y desactivar " -"«general_log» y vaciar sus tablas una vez que ya no se necesite " -"monitorizar. " +"Activar «general_log» puede aumentar la carga en el servidor hasta un 5-15%. " +"También esté al tanto que generar estadísticas de los registros es una " +"tarea muy intensiva por lo que se recomienda seleccionar un período de " +"tiempo lo más pequeño posible y desactivar «general_log» y vaciar sus tablas " +"una vez que ya no se necesite monitorizar. " #: server_status.php:1533 #, fuzzy @@ -10578,18 +10571,15 @@ msgid "Remove variable data in INSERT statements for better grouping" msgstr "Eliminar datos variables en sentencias INSERT para mejor agrupación" #: server_status.php:1608 -#, fuzzy #| msgid "" #| "

Choose from which log you want the statistics to be generated from. Results are grouped by query text." msgid "Choose from which log you want the statistics to be generated from." -msgstr "" -"

Elegir el registro del que deseagenerar estadísticas.

Los resultados " -"se agruparán por el texto de la consulta." +msgstr "Elegir el registro del que desea generar estadísticas." #: server_status.php:1610 msgid "Results are grouped by query text." -msgstr "" +msgstr "Los resultados se agruparán por el texto de la consulta." #: server_status.php:1615 msgid "Query analyzer" @@ -11752,38 +11742,35 @@ msgid "Create version" msgstr "Crear versión" #: tbl_zoom_select.php:140 -#, fuzzy #| msgid "Do a \"query by example\" (wildcard: \"%\")" msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns" -msgstr "Hacer una \"consulta basada en ejemplo\" (comodín: \"%\")" +msgstr "" +"Hacer una \"consulta basada en ejemplo\" (comodín: \"%\") para dos columnas " +"distintas" #: tbl_zoom_select.php:151 -#, fuzzy #| msgid "Hide search criteria" msgid "Additional search criteria" -msgstr "Ocultar criterio de búsqueda" +msgstr "Criterios de búsqueda adicionales" #: tbl_zoom_select.php:281 -#, fuzzy #| msgid "Label" msgid "Data Label" -msgstr "Etiqueta" +msgstr "Etiqueta de datos" #: tbl_zoom_select.php:297 -#, fuzzy #| msgid "Maximum number of rows to display" msgid "Maximum rows to plot" -msgstr "Máximo número de filas a mostrar" +msgstr "Máximo número de filas a graficar" #: tbl_zoom_select.php:388 msgid "Browse/Edit the points" -msgstr "" +msgstr "Navegar/editar los puntos" #: tbl_zoom_select.php:394 -#, fuzzy #| msgid "Control user" msgid "How to use" -msgstr "Controlar al usuario" +msgstr "Forma de utilización" #: themes.php:28 msgid "Get more themes!" @@ -11827,79 +11814,90 @@ msgstr "Cambiar el nombre de la vista a" #: po/advisory_rules.php:5 msgid "Uptime below one day" -msgstr "" +msgstr "Tiempo de actividad menor a un día" #: po/advisory_rules.php:6 msgid "Uptime is less than 1 day, performance tuning may not be accurate." msgstr "" +"El tiempo de actividad es menor a 1 día, los ajustes de performance puede no " +"ser precisos." #: po/advisory_rules.php:7 msgid "" "To have more accurate averages it is recommended to let the server run for " "longer than a day before running this analyzer" msgstr "" +"Para conseguir promedios más precisos es recomendable dejar el servidor " +"ejecutando por más de un día antes de ejecutar el analizador" #: po/advisory_rules.php:8 #, php-format msgid "The uptime is only %s" -msgstr "" +msgstr "El tiempo de actividad es sólo %s" #: po/advisory_rules.php:10 -#, fuzzy #| msgid "Questions" msgid "Questions below 1,000" -msgstr "Preguntas" +msgstr "Menos de 1000 consultas" #: po/advisory_rules.php:11 msgid "" "Fewer than 1,000 questions have been run against this server. The " "recommendations may not be accurate." msgstr "" +"Se han ejecutado menos de 1000 consultas en este servidor. Las " +"recomendaciones pueden no ser precisas." #: po/advisory_rules.php:12 msgid "" "Let the server run for a longer time until it has executed a greater amount " "of queries." msgstr "" +"Espere más tiempo hasta que el servidor haya ejecutado una mayor cantidad de " +"consultas." #: po/advisory_rules.php:13 -#, fuzzy, php-format +#, php-format #| msgid "Current connection" msgid "Current amount of Questions: %s" -msgstr "Conexión actual" +msgstr "Cantidad de consultas actuales: %s" #: po/advisory_rules.php:15 -#, fuzzy #| msgid "Show SQL queries" msgid "Percentage of slow queries" -msgstr "Mostrar las consultas SQL" +msgstr "Porcentajes de consultas lentas" #: po/advisory_rules.php:16 msgid "" "There is a lot of slow queries compared to the overall amount of Queries." -msgstr "" +msgstr "Hay muchas consultas lentas en comparación con el total de consultas." #: po/advisory_rules.php:17 po/advisory_rules.php:22 msgid "" "You might want to increase {long_query_time} or optimize the queries listed " "in the slow query log" msgstr "" +"Podría aumentar «{long_query_time}» u optimizar las consultas que aparecen " +"en el registro de consultas lentas." #: po/advisory_rules.php:18 #, php-format msgid "The slow query rate should be below 5%%, your value is %s%%." msgstr "" +"El porcentaje de consultas lentas debería de ser menor a 5%%, el valor " +"actual es %s%%." #: po/advisory_rules.php:20 -#, fuzzy #| msgid "Flush query cache" msgid "Slow query rate" -msgstr "Vaciar el cache de consultas" +msgstr "Frecuencia de consultas lentas" #: po/advisory_rules.php:21 msgid "" "There is a high percentage of slow queries compared to the server uptime." msgstr "" +"Hay un gran cantidad de consultas lentas respecto del tiempo de actividad " +"del servidor." #: po/advisory_rules.php:23 #, php-format @@ -11907,18 +11905,21 @@ msgid "" "You have a slow query rate of %s per hour, you should have less than 1%% per " "hour." msgstr "" +"Hay una frecuencia de consultas lentas de %s por hora, debería de tener " +"menos de 1%% por hora." #: po/advisory_rules.php:25 -#, fuzzy #| msgid "SQL queries" msgid "Long query time" -msgstr "Consultas SQL" +msgstr "Tiempo de consultas lentas" #: po/advisory_rules.php:26 msgid "" "long_query_time is set to 10 seconds or more, thus only slow queries that " "take above 10 seconds are logged." msgstr "" +"«long_query_time» está configurado a 10 segundos o más, por lo que sólo " +"aquellas consultas que tomen más 10 segundos serán registradas." #: po/advisory_rules.php:27 msgid "" @@ -12959,18 +12960,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "" -#~| "The Advisor system can provide recommendations on server variables by " -#~| "analyzing the server status variables.\n" -#~| " Do note however that this system provides recommendations based " -#~| "on fairly simple calculations and by rule of thumb and\n" -#~| " may not necessarily work for your system.\n" -#~| " Prior to changing any of the configuration, be sure to know what " -#~| "you are changing and how to undo the change. Wrong tuning\n" -#~| " can have a very negative effect on performance.\n" -#~| " The best way to tune the system would be to change only one " -#~| "setting at a time, observe or benchmark your database, and\n" -#~| " undo the change if there was no clearly measurable improvement." #~ msgid "" #~ "The Advisor system can provide recommendations on server variables by " #~ "analyzing the server status variables.

Do note however that this " diff --git a/po/ja.po b/po/ja.po index c84ddfa8ad..546d556e64 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-15 10:09+0200\n" -"PO-Revision-Date: 2011-08-13 12:52+0200\n" +"PO-Revision-Date: 2011-08-16 11:21+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -11596,7 +11596,7 @@ msgstr "" #: po/advisory_rules.php:8 #, php-format msgid "The uptime is only %s" -msgstr "" +msgstr "%s しか稼動していません。" #: po/advisory_rules.php:10 msgid "Questions below 1,000" @@ -11614,7 +11614,7 @@ msgstr "" msgid "" "Let the server run for a longer time until it has executed a greater amount " "of queries." -msgstr "" +msgstr "実行されたクエリが十分な量になるまで、長時間サーバを稼動させたほうがいいでしょう。" #: po/advisory_rules.php:13 #, php-format @@ -11650,7 +11650,7 @@ msgstr "遅いクエリの割合" #: po/advisory_rules.php:21 msgid "" "There is a high percentage of slow queries compared to the server uptime." -msgstr "遅いクエリの割合が高い場合は、サーバの稼働時間と比較してあります。" +msgstr "遅いクエリの割合が高いので、サーバの稼働時間と比較してあります。" #: po/advisory_rules.php:23 #, php-format @@ -11699,10 +11699,12 @@ msgid "" "Enable slow query logging by setting {log_slow_queries} to 'ON'. This will " "help troubleshooting badly performing queries." msgstr "" +"{log_slow_queries} " +"を「ON」に設定することで、遅いクエリのログへの記録が有効になります。これは、パフォーマンスの悪いクエリの切り分けに役立つでしょう。" #: po/advisory_rules.php:33 msgid "log_slow_queries is set to 'OFF'" -msgstr "" +msgstr "log_slow_queries が「OFF」に設定されています。" #: po/advisory_rules.php:35 #, fuzzy @@ -11824,7 +11826,7 @@ msgstr "" #: po/advisory_rules.php:68 msgid "query_cache_size is set to 0 or query_cache_type is set to 'OFF'" -msgstr "" +msgstr "query_cache_size が 0 に設定されているか、query_cache_type が「OFF」に設定されています。" #: po/advisory_rules.php:71 msgid "Suboptimal caching method." @@ -11992,7 +11994,7 @@ msgstr "" #: po/advisory_rules.php:103 msgid "query_cache_limit is set to 1 MiB" -msgstr "" +msgstr "query_cache_limit は 1 MiB に設定されています。" #: po/advisory_rules.php:105 #, fuzzy @@ -12102,11 +12104,11 @@ msgstr "" #: po/advisory_rules.php:130 msgid "Rate of reading fixed position" -msgstr "" +msgstr "決まった位置を読み込む割合" #: po/advisory_rules.php:131 msgid "The rate of reading data from a fixed position is high." -msgstr "" +msgstr "決まった位置のデータを読み込む割合が高いです。" #: po/advisory_rules.php:132 msgid "" @@ -12114,37 +12116,37 @@ msgid "" "scan, including join queries that do not use indexes. Add indexes where " "applicable." msgstr "" +"多くのクエリがインデックスを使用しない結合クエリを含んでいるために、結果のソート、テーブルの全スキャン、のいずれかもしくは両方を必要としていることを示し" +"ています。該当箇所にインデックスを追加してください。" #: po/advisory_rules.php:133 #, php-format msgid "" "Rate of reading fixed position average: %s, this value should be less than 1 " "per hour" -msgstr "" +msgstr "決まった位置を読み込む割合の平均：%s。推奨値は、1 時間当たり 1 未満です。" #: po/advisory_rules.php:135 -#, fuzzy #| msgid "Where to show the table row links" msgid "Rate of reading next table row" -msgstr "テーブルの行リンクを表示する場所" +msgstr "テーブルの次行を読み込む割合" #: po/advisory_rules.php:136 -#, fuzzy #| msgid "Where to show the table row links" msgid "The rate of reading the next table row is high." -msgstr "テーブルの行リンクを表示する場所" +msgstr "テーブルの次行を読み込む割合が高いです。" #: po/advisory_rules.php:137 msgid "" "This indicates that many queries are doing full table scans. Add indexes " "where applicable." -msgstr "" +msgstr "多くのクエリがテーブルの全スキャンを行っていることを示しています。該当箇所にインデックスを追加してください。" #: po/advisory_rules.php:138 #, php-format msgid "" "Rate of reading next table row: %s, this value should be less than 1 per hour" -msgstr "" +msgstr "テーブルの次行を読み込む割合：%s。推奨値は、1 時間当たり 1 未満です。" #: po/advisory_rules.php:140 msgid "tmp_table_size vs. max_heap_table_size" @@ -12240,7 +12242,7 @@ msgstr "" #: po/advisory_rules.php:158 msgid "key_buffer_size is 0" -msgstr "" +msgstr "key_buffer_size は 0 です。" #: po/advisory_rules.php:160 #, fuzzy, php-format @@ -12296,27 +12298,27 @@ msgid "Index reads from memory: %s%%, this value should be above 95%%" msgstr "" #: po/advisory_rules.php:175 -#, fuzzy #| msgid "Create table" msgid "Rate of table open" -msgstr "テーブルを作成" +msgstr "テーブルを開く割合" #: po/advisory_rules.php:176 -#, fuzzy #| msgid "The current number of pending writes." msgid "The rate of opening tables is high." -msgstr "現在保留されている書き込みの数" +msgstr "テーブルを開く割合が高いです。" #: po/advisory_rules.php:177 msgid "" "Opening tables requires disk I/O which is costly. Increasing " "{table_open_cache} might avoid this." msgstr "" +"テーブルを開くことは、コストがかかるディスクへの入出力を必要とします。{table_open_cache} " +"大きくすることで、これを緩和できることがあります。" #: po/advisory_rules.php:178 #, php-format msgid "Opened table rate: %s, this value should be less than 10 per hour" -msgstr "" +msgstr "テーブルを開く割合: %s。推奨値は 1 時間当たり 10 未満です。" #: po/advisory_rules.php:180 #, fuzzy @@ -12335,6 +12337,8 @@ msgid "" "Consider increasing {open_files_limit}, and check the error log when " "restarting after changing open_files_limit." msgstr "" +"{open_files_limit} 増やすことを検討してください。open_files_limit " +"を変更して再起動した場合は、エラーログを確認するようにしてください。" #: po/advisory_rules.php:183 #, php-format @@ -12343,21 +12347,19 @@ msgid "" msgstr "" #: po/advisory_rules.php:185 -#, fuzzy #| msgid "Format of imported file" msgid "Rate of open files" -msgstr "インポートするファイルの形式" +msgstr "ファイルを開く割合" #: po/advisory_rules.php:186 -#, fuzzy #| msgid "The number of pending log file fsyncs." msgid "The rate of opening files is high." -msgstr "保留中のログファイルへの fsync 回数" +msgstr "ファイルを開く割合が高いです。" #: po/advisory_rules.php:188 #, php-format msgid "Opened files rate: %s, this value should be less than 5 per hour" -msgstr "" +msgstr "ファイルを開く割合: %s。推奨値は 1 時間当たり 5 未満です。" #: po/advisory_rules.php:190 #, fuzzy, php-format @@ -12390,10 +12392,9 @@ msgid "Table lock wait rate: %s, this value should be less than 1 per hour" msgstr "" #: po/advisory_rules.php:200 -#, fuzzy #| msgid "Key cache" msgid "Thread cache" -msgstr "キーキャッシュ" +msgstr "スレッドキャッシュ" #: po/advisory_rules.php:201 msgid "" @@ -12407,7 +12408,7 @@ msgstr "" #: po/advisory_rules.php:203 msgid "The thread cache is set to 0" -msgstr "" +msgstr "スレッドキャッシュは 0 に設定されています。" #: po/advisory_rules.php:205 #, fuzzy, php-format diff --git a/po/tr.po b/po/tr.po index 24adccfb63..b0ec0df2bd 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-15 10:09+0200\n" -"PO-Revision-Date: 2011-08-15 09:36+0200\n" +"PO-Revision-Date: 2011-08-16 08:21+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -116,8 +116,8 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" -"%s dosyası bu sistemde mevcut değil, lütfen daha fazla bilgi için www." -"phpmyadmin.net adresini ziyaret edin." +"Bu sistemde %s dosyası mevcut değil, lütfen daha fazla bilgi için " +"www.phpmyadmin.net adresini ziyaret edin." #: db_create.php:58 #, php-format @@ -1663,48 +1663,50 @@ msgid "Show search criteria" msgstr "Arama kriterini göster" #: js/messages.php:262 libraries/tbl_select.lib.php:138 -#, fuzzy #| msgid "Search" msgid "Zoom Search" -msgstr "Ara" +msgstr "Yakınlaştırma Arama" #: js/messages.php:264 msgid "Each point represents a data row." -msgstr "" +msgstr "Her nokta bir veri satırını temsil eder." #: js/messages.php:266 msgid "Hovering over a point will show its label." -msgstr "" +msgstr "Noktanın üzerinde durmak etiketini gösterecektir." #: js/messages.php:268 msgid "Drag and select an area in the plot to zoom into it." -msgstr "" +msgstr "Çizim içinde yakınlaştırmak için sürükleyin ve bir alan seçin." #: js/messages.php:270 msgid "Click reset zoom link to come back to original state." msgstr "" +"Orijinal durumuna geri gelmek için yakınlaştırmayı sıfırla bağlantısına " +"tıklayın." #: js/messages.php:272 msgid "Click a data point to view and possibly edit the data row." msgstr "" +"Veri satırını mümkün olduğunca düzenlemek ve görmek için veri noktasına " +"tıklayın." #: js/messages.php:274 msgid "The plot can be resized by dragging it along the bottom right corner." -msgstr "" +msgstr "Çizim en alt sağ köşe boyunca sürüklenerek yeniden boyutlandırılabilir." #: js/messages.php:276 msgid "Strings are converted into integer for plotting" -msgstr "" +msgstr "Satırlar çizim yapmak için tam sayıya dönüştürülür" #: js/messages.php:278 -#, fuzzy #| msgid "Add/Delete columns" msgid "Select two columns" -msgstr "Sütun Ekle/Sil" +msgstr "İki sütun seçin" #: js/messages.php:279 msgid "Select two different columns" -msgstr "" +msgstr "İki farklı sütun seçin" #: js/messages.php:282 tbl_change.php:307 tbl_indexes.php:211 #: tbl_indexes.php:238 @@ -1785,12 +1787,13 @@ msgstr "" msgid "" "You can also edit most columns
by clicking directly on their content." msgstr "" +"Aynı zamanda çoğu sütunu içeriğine
doğrudan tıklayarak " +"düzenleyebilirsiniz." #: js/messages.php:307 -#, fuzzy #| msgid "Go to view" msgid "Go to link" -msgstr "Görünüme git" +msgstr "Bağlantıya git" #: js/messages.php:310 msgid "Generate password" @@ -2277,6 +2280,8 @@ msgid "" "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]" "['MaxTableUiprefs'] %s)" msgstr "" +"Tablo KA tercihlerini temizleme başarısız " +"($cfg['Servers'][$i]['MaxTableUiprefs'] %s bakın)" #: libraries/Theme.class.php:144 #, php-format @@ -4468,12 +4473,14 @@ msgid "" "This configuration make sure that we only keep N (N = MaxTableUiprefs) " "newest record in \"table_uiprefs\" and automatically delete older records" msgstr "" +"Bu yapılandırma \"table_uiprefs\" içinde sadece N (N = MaxTableUiprefs) en " +"yeni kayıtları tutuğumuzdan ve otomatik olarak eski kayıtları sildiğimizden " +"emin olur" #: libraries/config/messages.inc.php:399 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximum number of records saved in \"table_uiprefs\" table" -msgstr "Tablo listesinde görüntülenecek olan en fazla tablo sayısıdır" +msgstr "En fazla kayıt sayısı \"table_uiprefs\" tablosuna kaydedildi" #: libraries/config/messages.inc.php:400 msgid "Try to connect without password" @@ -7934,10 +7941,9 @@ msgid "Operator" msgstr "İşletici" #: libraries/tbl_select.lib.php:131 -#, fuzzy #| msgid "Search" msgid "Table Search" -msgstr "Ara" +msgstr "Tablo Arama" #: libraries/transformations/application_octetstream__download.inc.php:10 msgid "" @@ -9371,6 +9377,8 @@ msgid "" "The Advisor system can provide recommendations on server variables by " "analyzing the server status variables." msgstr "" +"Danışman sistemi sunucu durumu değişkenlerini çözümleyerek sunucu " +"değişkenlerinde öneriler sağlayabilir." #: server_status.php:810 msgid "" @@ -10241,13 +10249,11 @@ msgstr "" "sunucu çizelgeleme özelliklerini kullanabilirsiniz." #: server_status.php:1507 -#, fuzzy #| msgid "Pause monitor" msgid "Using the monitor:" -msgstr "İzlemeyi duraklat" +msgstr "İzleyici kullanımı:" #: server_status.php:1509 -#, fuzzy #| msgid "" #| "Using the monitor:
Ok, you are good to go! Once you click " #| "'Start monitor' your browser will refresh all displayed charts in a " @@ -10264,19 +10270,13 @@ msgid "" "change the refresh rate under 'Settings', or remove any chart using the cog " "icon on each respective chart." msgstr "" -"İzleyici kullanımı:
Tamam, ilerlemeye hazırsınız! Bir kere " -"'İzlemeyi başlat'a tıkladığınızda tarayıcınız tüm görüntülenen çizelgeleri " -"düzenli aralıklarla yenileyecek. 'Ayarlar' altında çizelgeleri ekleyebilir " -"ve yenileme oranını değiştirebilirsiniz veya her çizelgenin kendi dişli çark " -"simgesini kullanarak herhangi bir çizelgeyi kaldırabilirsiniz. " -"

Günlüklerden sorguları görüntülemek için herhangi bir çizelgede sol fare " -"tuşunu basılı tutarak ve çizelge üzerinde kaydırarak ilgili zaman aralığını " -"seçin. Bir kere onaylandı mı bu, gruplanmış sorguların tablolarını " -"yükleyecek. Daha fazla çözümlemesi için herhangi bir meydana gelen SELECT " -"ifadesine tıklayabilirsiniz.

" +"Tamam, ilerlemeye hazırsınız! Bir kere 'İzlemeyi başlat'a tıkladığınızda " +"tarayıcınız tüm görüntülenen çizelgeleri düzenli aralıklarla yenileyecek. " +"'Ayarlar' altında çizelgeleri ekleyebilir ve yenileme oranını " +"değiştirebilirsiniz veya her çizelgenin kendi dişli çark simgesini " +"kullanarak herhangi bir çizelgeyi kaldırabilirsiniz." #: server_status.php:1511 -#, fuzzy #| msgid "" #| "Using the monitor:
Ok, you are good to go! Once you click " #| "'Start monitor' your browser will refresh all displayed charts in a " @@ -10293,23 +10293,17 @@ msgid "" "confirmed, this will load a table of grouped queries, there you may click on " "any occuring SELECT statements to further analyze them." msgstr "" -"İzleyici kullanımı:
Tamam, ilerlemeye hazırsınız! Bir kere " -"'İzlemeyi başlat'a tıkladığınızda tarayıcınız tüm görüntülenen çizelgeleri " -"düzenli aralıklarla yenileyecek. 'Ayarlar' altında çizelgeleri ekleyebilir " -"ve yenileme oranını değiştirebilirsiniz veya her çizelgenin kendi dişli çark " -"simgesini kullanarak herhangi bir çizelgeyi kaldırabilirsiniz. " -"

Günlüklerden sorguları görüntülemek için herhangi bir çizelgede sol fare " +"Günlüklerden sorguları görüntülemek için herhangi bir çizelgede sol fare " "tuşunu basılı tutarak ve çizelge üzerinde kaydırarak ilgili zaman aralığını " "seçin. Bir kere onaylandı mı bu, gruplanmış sorguların tablolarını " "yükleyecek. Daha fazla çözümlemesi için herhangi bir meydana gelen SELECT " -"ifadesine tıklayabilirsiniz.

" +"ifadesine tıklayabilirsiniz." #: server_status.php:1518 msgid "Please note:" -msgstr "" +msgstr "Lütfen unutmayın:" #: server_status.php:1520 -#, fuzzy #| msgid "" #| "Please note: Enabling the general_log may increase the server load " #| "by 5-15%. Also be aware that generating statistics from the logs is a " @@ -10322,11 +10316,11 @@ msgid "" "it is advisable to select only a small time span and to disable the " "general_log and empty its table once monitoring is not required any more." msgstr "" -"Lütfen unutmayın: general_log'u etkinleştirmek sunucu yükünü %5-15 " -"arttırabilir. Aynı zamanda günlükten oluşturulan istatistiklerin yoğun görev " -"yükü olduğundan haberiniz olsun bu yüzden sadece küçük zaman aralıkları " -"seçmek ve general_log'u etkisizleştirmek tavsiye edilir ve tablolarını bir " -"defa boşaltmak daha fazla izlemeyi gerektirmez." +"general_log'u etkinleştirmek sunucu yükünü %5-15 arttırabilir. Aynı zamanda " +"günlükten oluşturulan istatistiklerin yoğun görev yükü olduğundan haberiniz " +"olsun bu yüzden sadece küçük zaman aralıkları seçmek ve general_log'u " +"etkisizleştirmek tavsiye edilir ve tablolarını bir defa boşaltmak daha fazla " +"izlemeyi gerektirmez." #: server_status.php:1533 msgid "Preset chart" @@ -10389,18 +10383,15 @@ msgid "Remove variable data in INSERT statements for better grouping" msgstr "Daha iyi gruplama için INSERT ifadelerindeki değişken veriyi kaldır" #: server_status.php:1608 -#, fuzzy #| msgid "" #| "

Choose from which log you want the statistics to be generated from. Results are grouped by query text." msgid "Choose from which log you want the statistics to be generated from." -msgstr "" -"

İstatistiklerin oluşturulmasını istediğinizden seçin.

Sonuçlar sorgu " -"metnine göre gruplandırılır." +msgstr "İstatistiklerin oluşturulmasını istediğiniz yerden günlüğü seçin." #: server_status.php:1610 msgid "Results are grouped by query text." -msgstr "" +msgstr "Sonuçlar sorgu metnine göre gruplandırılır." #: server_status.php:1615 msgid "Query analyzer" @@ -11555,38 +11546,33 @@ msgid "Create version" msgstr "Sürüm oluştur" #: tbl_zoom_select.php:140 -#, fuzzy #| msgid "Do a \"query by example\" (wildcard: \"%\")" msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns" -msgstr "\"Örnek sorgu\" yap. (joker: \"%\")" +msgstr "İki farklı sütun için \"örneğe göre sorgu\" (joker: \"%\") yap" #: tbl_zoom_select.php:151 -#, fuzzy #| msgid "Hide search criteria" msgid "Additional search criteria" -msgstr "Arama kriterini gizle" +msgstr "İlave arama kriteri" #: tbl_zoom_select.php:281 -#, fuzzy #| msgid "Label" msgid "Data Label" -msgstr "Etiket" +msgstr "Veri Etiketi" #: tbl_zoom_select.php:297 -#, fuzzy #| msgid "Maximum number of rows to display" msgid "Maximum rows to plot" -msgstr "Görüntülemek için en fazla satır sayısı" +msgstr "Çizim için en fazla satır" #: tbl_zoom_select.php:388 msgid "Browse/Edit the points" -msgstr "" +msgstr "Noktalara gözat/düzenle" #: tbl_zoom_select.php:394 -#, fuzzy #| msgid "Control user" msgid "How to use" -msgstr "Denetim kullanıcısı" +msgstr "Nasıl kullanılır" #: themes.php:28 msgid "Get more themes!" @@ -11917,7 +11903,7 @@ msgstr "Sorgu önbelleği verimi (%)" #: po/advisory_rules.php:76 msgid "Query cache not running efficiently, it has a low hit rate." -msgstr "" +msgstr "Sorgu önbelleği verimli çalışmıyor, düşük tavan oranına sahip." #: po/advisory_rules.php:77 msgid "Consider increasing {query_cache_limit}." @@ -12022,7 +12008,7 @@ msgstr "" #: po/advisory_rules.php:98 #, php-format msgid "Current query cache size: %s" -msgstr "" +msgstr "Şu anki sorgu önbelleği boyutu: %s" #: po/advisory_rules.php:100 msgid "Query cache min result size" @@ -12047,7 +12033,7 @@ msgstr "" #: po/advisory_rules.php:103 msgid "query_cache_limit is set to 1 MiB" -msgstr "" +msgstr "query_cache_limit 1 MiB'a ayarlı" #: po/advisory_rules.php:105 msgid "Percentage of sorts that cause temporary tables" @@ -12086,7 +12072,7 @@ msgstr "Satırları sırala" #: po/advisory_rules.php:116 msgid "There are lots of rows being sorted." -msgstr "" +msgstr "Birçok sıralanmış satır var." #: po/advisory_rules.php:117 msgid "" @@ -12275,16 +12261,16 @@ msgid "key_buffer_size is 0" msgstr "" #: po/advisory_rules.php:160 -#, fuzzy, php-format +#, php-format #| msgid "Max % MyISAM key buffer ever used" msgid "Max %% MyISAM key buffer ever used" -msgstr "Şimdiye kadar kullanılan en fazla MyISAM anahtar arabelleği" +msgstr "Şimdiye kadar kullanılan en fazla %% MyISAM anahtar arabelleği" #: po/advisory_rules.php:161 po/advisory_rules.php:166 -#, fuzzy, php-format +#, php-format #| msgid "Max % MyISAM key buffer ever used" msgid "MyISAM key buffer (index cache) %% used is low." -msgstr "Şimdiye kadar kullanılan en fazla MyISAM anahtar arabelleği" +msgstr "Kullanılan MyISAM anahtar arabelleği (indeks önbelleği) %% düşük." #: po/advisory_rules.php:162 po/advisory_rules.php:167 msgid "" @@ -12380,10 +12366,10 @@ msgid "Opened files rate: %s, this value should be less than 5 per hour" msgstr "" #: po/advisory_rules.php:190 -#, fuzzy, php-format +#, php-format #| msgid "Immediate table locks %" msgid "Immediate table locks %%" -msgstr "Acil tablo kilitleri %" +msgstr "Acil tablo kilitleri %%" #: po/advisory_rules.php:191 po/advisory_rules.php:196 msgid "Too many table locks were not granted immediately." @@ -12426,10 +12412,10 @@ msgid "The thread cache is set to 0" msgstr "" #: po/advisory_rules.php:205 -#, fuzzy, php-format +#, php-format #| msgid "Thread cache hit rate %" msgid "Thread cache hit rate %%" -msgstr "İşlem önbelleği tavan oranı %" +msgstr "İşlem önbelleği tavan oranı %%" #: po/advisory_rules.php:206 msgid "Thread cache is not efficient." diff --git a/po/zh_CN.po b/po/zh_CN.po index d8ee9f605f..4902bd6b5a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12325,18 +12325,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "" -#~| "The Advisor system can provide recommendations on server variables by " -#~| "analyzing the server status variables.\n" -#~| " Do note however that this system provides recommendations based " -#~| "on fairly simple calculations and by rule of thumb and\n" -#~| " may not necessarily work for your system.\n" -#~| " Prior to changing any of the configuration, be sure to know what " -#~| "you are changing and how to undo the change. Wrong tuning\n" -#~| " can have a very negative effect on performance.\n" -#~| " The best way to tune the system would be to change only one " -#~| "setting at a time, observe or benchmark your database, and\n" -#~| " undo the change if there was no clearly measurable improvement." #~ msgid "" #~ "The Advisor system can provide recommendations on server variables by " #~ "analyzing the server status variables.

Do note however that this " diff --git a/scripts/compress-js b/scripts/compress-js index ea43782eae..445cae49fb 100755 --- a/scripts/compress-js +++ b/scripts/compress-js @@ -4,6 +4,7 @@ set -e for file in `find js -name '*.js' -not -name '*min.js'` ; do mkdir -p sources/`dirname $file` - mv $file sources/$file - java -jar ./scripts/google-javascript-compiler/compiler.jar --js sources/$file --js_output_file $file + java -jar ./scripts/google-javascript-compiler/compiler.jar --js $file --js_output_file $file.tmp + cp -a $file sources/$file + mv $file.tmp $file done diff --git a/scripts/signon-script.php b/scripts/signon-script.php index e57ca1f1f5..201d21762f 100644 --- a/scripts/signon-script.php +++ b/scripts/signon-script.php @@ -16,6 +16,9 @@ * This function returns username and password. * * It can optionally use configured username as parameter. + * + * @param string $user + * @return array */ function get_login_credentials($user) { diff --git a/server_status.php b/server_status.php index ee7691007e..b5c9c7c2ce 100644 --- a/server_status.php +++ b/server_status.php @@ -731,7 +731,7 @@ echo __('Runtime Information'); @@ -753,7 +753,7 @@ echo __('Runtime Information'); @@ -778,7 +778,7 @@ echo __('Runtime Information');

- +
@@ -796,7 +796,7 @@ echo __('Runtime Information');
- +
@@ -871,16 +871,16 @@ function printQueryStatistics() echo sprintf(__('Questions since startup: %s'), PMA_formatNumber($total_queries, 0)) . ' '; echo PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_Questions'); ?> -
+
'; + echo '
'; echo 'ø ' . __('per minute') . ': '; echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0); - echo '
'; + echo '
'; if ($total_queries / $server_status['Uptime'] >= 1) { echo 'ø ' . __('per second') . ': '; @@ -909,6 +909,7 @@ function printQueryStatistics() /* l10n: # = Amount of queries */ echo __('#'); ?> + ø % @@ -934,11 +935,11 @@ function printQueryStatistics() ?> - + + htmlspecialchars(PMA_formatNumber($value * $hour_factor, 4, 1, true)); ?> % + htmlspecialchars(PMA_formatNumber($value * $perc_factor, 0, 2)); ?>% 1000) { - echo PMA_formatNumber($value, 3, 1); + echo htmlspecialchars(PMA_formatNumber($value, 3, 1)); } elseif (is_numeric($value) && $value == (int) $value) { - echo PMA_formatNumber($value, 3, 0); + echo htmlspecialchars(PMA_formatNumber($value, 3, 0)); } elseif (is_numeric($value)) { - echo PMA_formatNumber($value, 3, 1); + echo htmlspecialchars(PMA_formatNumber($value, 3, 1)); } else { echo htmlspecialchars($value); } @@ -1496,13 +1497,13 @@ function printMonitor() - +
'; refreshList('gridChartRefresh', 5, Array(2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200)); - ?>
+ ?>

@@ -1530,7 +1531,7 @@ function printMonitor()

- + @@ -1539,7 +1540,7 @@ function printMonitor() } else { ?>

- Loading + Loading
@@ -1570,14 +1570,14 @@ function printMonitor()

- +
- +
-
+

+

-
+

+

@@ -1686,7 +1686,7 @@ function printMonitor() function refreshList($name, $defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20, 40, 60, 120, 300, 600)) { ?> - -

    +
      > 'Go', )); ?> -
    • +
      • @@ -614,7 +614,7 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) { $this_url_params = array_merge($url_params, array('sql_query' => 'ALTER TABLE ' . PMA_backquote($GLOBALS['table']) . ' ENGINE = InnoDB')); ?> -
    • +
      • @@ -627,7 +627,7 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) { 'table_maintenance' => 'Go', )); ?> -
    • +
      • @@ -640,7 +640,7 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) { 'table_maintenance' => 'Go', )); ?> -
    • +
      • @@ -653,7 +653,7 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) { 'table_maintenance' => 'Go', )); ?> -
    • +
      • @@ -668,7 +668,7 @@ $this_url_params = array_merge($url_params, 'reload' => 1, )); ?> -
    • +
      • @@ -692,7 +692,7 @@ if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_ 'message_to_show' => sprintf(__('Table %s has been emptied'), htmlspecialchars($table)), )); ?> -
    • > +
    • >
      • diff --git a/tbl_tracking.php b/tbl_tracking.php index 76ed16ab33..b601348ea4 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -575,8 +575,8 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { $sql_query = " SELECT DISTINCT db_name, table_name FROM " . PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . "." . PMA_backquote($GLOBALS['cfg']['Server']['tracking']) . - " WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddSlashes($GLOBALS['db']) . "' " . - " ORDER BY ". PMA_backquote('db_name') . ", " . PMA_backquote('table_name'); + " WHERE db_name = '" . PMA_sqlAddSlashes($GLOBALS['db']) . "' " . + " ORDER BY db_name, table_name"; $sql_result = PMA_query_as_controluser($sql_query); @@ -615,9 +615,9 @@ if (PMA_DBI_num_rows($sql_result) > 0) { $sql_query = " SELECT * FROM " . PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . "." . PMA_backquote($GLOBALS['cfg']['Server']['tracking']) . - " WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddSlashes($_REQUEST['db']) . "' ". - " AND " . PMA_backquote('table_name') . " = '" . PMA_sqlAddSlashes($_REQUEST['table']) ."' ". - " ORDER BY ". PMA_backquote('version') . " DESC "; + " WHERE db_name = '" . PMA_sqlAddSlashes($_REQUEST['db']) . "' ". + " AND table_name = '" . PMA_sqlAddSlashes($_REQUEST['table']) ."' ". + " ORDER BY version DESC "; $sql_result = PMA_query_as_controluser($sql_query); diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php index 748ddfe9f8..39cc66409e 100644 --- a/test/libraries/common/PMA_expandUserString_test.php +++ b/test/libraries/common/PMA_expandUserString_test.php @@ -59,6 +59,8 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase /** * Data provider + * + * @return array */ public function provider() { diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php index ab789f48bc..eeb79c4cd0 100644 --- a/test/libraries/common/PMA_extractFieldSpec_test.php +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -30,6 +30,8 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase /** * Data provider + * + * @return array */ public function provider() { diff --git a/test/libraries/common/PMA_foreignKeySupported_test.php b/test/libraries/common/PMA_foreignKeySupported_test.php index e0ebd2e8d5..f9c30499d1 100644 --- a/test/libraries/common/PMA_foreignKeySupported_test.php +++ b/test/libraries/common/PMA_foreignKeySupported_test.php @@ -17,6 +17,8 @@ class PMA_foreignKeySupported_test extends PHPUnit_Framework_TestCase { /** * data provider for foreign key supported test + * + * @return array */ public function foreignkeySupportedDataProvider() { return array( diff --git a/test/libraries/common/PMA_formatNumberByteDown_test.php b/test/libraries/common/PMA_formatNumberByteDown_test.php index f0265c6233..18ab8ba96d 100644 --- a/test/libraries/common/PMA_formatNumberByteDown_test.php +++ b/test/libraries/common/PMA_formatNumberByteDown_test.php @@ -47,8 +47,9 @@ class PMA_formatNumberByteDown_test extends PHPUnit_Framework_TestCase /** * format number data provider + * + * @return array */ - public function formatNumberDataProvider() { return array( array(10, 2, 2, '10 '), @@ -72,6 +73,8 @@ class PMA_formatNumberByteDown_test extends PHPUnit_Framework_TestCase /** * format byte down data provider + * + * @return array */ public function formatByteDownDataProvider() { return array( diff --git a/test/libraries/common/PMA_localisedDateTimespan_test.php b/test/libraries/common/PMA_localisedDateTimespan_test.php index 92f980cc87..4ed29093e3 100644 --- a/test/libraries/common/PMA_localisedDateTimespan_test.php +++ b/test/libraries/common/PMA_localisedDateTimespan_test.php @@ -54,6 +54,8 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase /** * data provider for localised date test + * + * @return array */ public function localisedDateDataProvider() { return array( @@ -72,8 +74,9 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase /** * data provider for localised timestamp test + * + * @return array */ - public function timespanFormatDataProvider() { return array( array(1258, '0 days, 0 hours, 20 minutes and 58 seconds'), diff --git a/test/libraries/common/PMA_printableBitValue_test.php b/test/libraries/common/PMA_printableBitValue_test.php index d211981d67..20d4f4ff1f 100644 --- a/test/libraries/common/PMA_printableBitValue_test.php +++ b/test/libraries/common/PMA_printableBitValue_test.php @@ -18,8 +18,9 @@ class PMA_printableBitValue_test extends PHPUnit_Framework_TestCase /** * data provider for printable bit value test + * + * @return array */ - public function printableBitValueDataProvider() { return array( array('testtest', 64, '0111010001100101011100110111010001110100011001010111001101110100'), diff --git a/test/libraries/common/PMA_quoting_slashing_test.php b/test/libraries/common/PMA_quoting_slashing_test.php index 4ebecc0867..d4e7104bdf 100644 --- a/test/libraries/common/PMA_quoting_slashing_test.php +++ b/test/libraries/common/PMA_quoting_slashing_test.php @@ -35,6 +35,8 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase /** * data provider for unQuote test + * + * @return array */ public function unQuoteProvider() { return array( @@ -55,6 +57,8 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase /** * data provider for unQuote test with chosen quote + * + * @return array */ public function unQuoteSelectedProvider() { return array( @@ -75,6 +79,8 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase /** * data provider for backquote test + * + * @return array */ public function backquoteDataProvider() { return array( diff --git a/test/libraries/common/PMA_stringOperations_test.php b/test/libraries/common/PMA_stringOperations_test.php index ca43335389..3664b44070 100644 --- a/test/libraries/common/PMA_stringOperations_test.php +++ b/test/libraries/common/PMA_stringOperations_test.php @@ -41,8 +41,9 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase /** * data provider for flipstring test + * + * @return array */ - public function flipStringDataProvider() { return array( array('test', "t
      \ne
      \ns
      \nt"), @@ -61,8 +62,9 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase /** * data provider for userDir test + * + * @return array */ - public function userDirDataProvider() { return array( array('/var/pma_tmp/%u/', "/var/pma_tmp/root/"), @@ -83,8 +85,9 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase /** * data provider for replace binary content test + * + * @return array */ - public function replaceBinaryContentsDataProvider() { return array( array("\x000", '\00'), @@ -104,8 +107,9 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase /** * data provider for duplicate first newline test + * + * @return array */ - public function duplicateFirstNewlineDataProvider() { return array( array('test', 'test'), diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 10a315523a..bd42d6d114 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1126,6 +1126,9 @@ img.sortableIcon { .buttonlinks { float: ; white-space: nowrap; +} + +.jsfeature { display: none; /* Made visible with js */ } diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 1eef0720c8..263947a120 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1353,6 +1353,9 @@ img.sortableIcon { .buttonlinks { float: ; white-space: nowrap; +} + +.jsfeature { display: none; /* Made visible with js */ }